😎清理代码

This commit is contained in:
zuohuaijun 2025-01-17 00:57:07 +08:00
parent e0b2d37fad
commit 30a3dec26c
10 changed files with 46 additions and 44 deletions

View File

@ -49,7 +49,7 @@
<PackageReference Include="SSH.NET" Version="2024.2.0" /> <PackageReference Include="SSH.NET" Version="2024.2.0" />
<PackageReference Include="System.Linq.Dynamic.Core" Version="1.5.1" /> <PackageReference Include="System.Linq.Dynamic.Core" Version="1.5.1" />
<PackageReference Include="System.Net.Http" Version="4.3.4" /> <PackageReference Include="System.Net.Http" Version="4.3.4" />
<PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1164" /> <PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1165" />
<PackageReference Include="UAParser" Version="3.1.47" /> <PackageReference Include="UAParser" Version="3.1.47" />
<PackageReference Include="Yitter.IdGenerator" Version="1.0.14" /> <PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />
</ItemGroup> </ItemGroup>

View File

@ -33,7 +33,7 @@ public partial class SysConfig : EntityBase
/// 属性值 /// 属性值
/// </summary> /// </summary>
[SugarColumn(ColumnDescription = "属性值", Length = 512)] [SugarColumn(ColumnDescription = "属性值", Length = 512)]
[MaxLength(256)] [MaxLength(512)]
public string? Value { get; set; } public string? Value { get; set; }
/// <summary> /// <summary>

View File

@ -15,21 +15,21 @@ namespace Admin.NET.Core;
public partial class SysConfigValue : EntityTenant public partial class SysConfigValue : EntityTenant
{ {
/// <summary> /// <summary>
/// 配置Id /// 系统配置Id
/// </summary> /// </summary>
[SugarColumn(ColumnDescription = "配置Id")] [SugarColumn(ColumnDescription = "系统配置Id")]
public long ConfigId { get; set; } public long ConfigId { get; set; }
/// <summary> /// <summary>
/// 属性默认值 /// 系统配置
/// </summary>
[MaxLength(64)]
[SugarColumn(ColumnDescription = "属性默认值", Length = 512)]
public string? Value { get; set; }
/// <summary>
/// 配置
/// </summary> /// </summary>
[Navigate(NavigateType.OneToOne, nameof(ConfigId))] [Navigate(NavigateType.OneToOne, nameof(ConfigId))]
public SysConfig Config { get; set; } public SysConfig Config { get; set; }
/// <summary>
/// 参数默认值
/// </summary>
[MaxLength(64)]
[SugarColumn(ColumnDescription = "参数默认值", Length = 512)]
public string? Value { get; set; }
} }

View File

@ -34,7 +34,6 @@ public class AddConfigInput : SysConfig
public class UpdateConfigInput : AddConfigInput public class UpdateConfigInput : AddConfigInput
{ {
} }
public class UpdateDefaultValueInput : BaseIdInput public class UpdateDefaultValueInput : BaseIdInput

View File

@ -4,7 +4,6 @@
// //
// 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动!任何基于本项目二次开发而产生的一切法律纠纷和责任,我们不承担任何责任! // 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动!任何基于本项目二次开发而产生的一切法律纠纷和责任,我们不承担任何责任!
using Newtonsoft.Json;
using Newtonsoft.Json.Converters; using Newtonsoft.Json.Converters;
using Npgsql; using Npgsql;

View File

@ -2,7 +2,7 @@
"name": "admin.net.pro", "name": "admin.net.pro",
"type": "module", "type": "module",
"version": "2.4.33", "version": "2.4.33",
"lastBuildTime": "2025.01.15", "lastBuildTime": "2025.01.17",
"description": "Admin.NET 站在巨人肩膀上的 .NET 通用权限开发框架", "description": "Admin.NET 站在巨人肩膀上的 .NET 通用权限开发框架",
"author": "zuohuaijun", "author": "zuohuaijun",
"license": "MIT", "license": "MIT",
@ -74,7 +74,7 @@
"vue-router": "^4.5.0", "vue-router": "^4.5.0",
"vue-signature-pad": "^3.0.2", "vue-signature-pad": "^3.0.2",
"vue3-tree-org": "^4.2.2", "vue3-tree-org": "^4.2.2",
"vxe-pc-ui": "^4.3.73", "vxe-pc-ui": "^4.3.74",
"vxe-table": "^4.10.0", "vxe-table": "^4.10.0",
"vxe-table-plugin-element": "^4.0.4", "vxe-table-plugin-element": "^4.0.4",
"vxe-table-plugin-export-xlsx": "^4.0.7", "vxe-table-plugin-export-xlsx": "^4.0.7",
@ -83,7 +83,7 @@
}, },
"devDependencies": { "devDependencies": {
"@iconify/vue": "^4.3.0", "@iconify/vue": "^4.3.0",
"@plugin-web-update-notification/vite": "^1.8.0", "@plugin-web-update-notification/vite": "^2.0.0",
"@types/lodash-es": "^4.17.12", "@types/lodash-es": "^4.17.12",
"@types/node": "^20.17.12", "@types/node": "^20.17.12",
"@types/nprogress": "^0.2.3", "@types/nprogress": "^0.2.3",

View File

@ -108,7 +108,8 @@
</el-col> </el-col>
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20"> <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
<el-form-item label="父级菜单" prop="menuPid"> <el-form-item label="父级菜单" prop="menuPid">
<el-cascader :options="state.menuData" <el-cascader
:options="state.menuData"
:props="cascaderProps" :props="cascaderProps"
placeholder="请选择上级菜单" placeholder="请选择上级菜单"
:disabled="!state.ruleForm.generateMenu" :disabled="!state.ruleForm.generateMenu"
@ -116,7 +117,8 @@
clearable clearable
class="w100" class="w100"
v-model="state.ruleForm.menuPid" v-model="state.ruleForm.menuPid"
@change="menuChange"> @change="menuChange"
>
<template #default="{ node, data }"> <template #default="{ node, data }">
<span>{{ data.title }}</span> <span>{{ data.title }}</span>
<span v-if="!node.isLeaf"> ({{ data.children.length }}) </span> <span v-if="!node.isLeaf"> ({{ data.children.length }}) </span>

View File

@ -93,10 +93,10 @@
<script lang="ts" setup name="sysEditConfig"> <script lang="ts" setup name="sysEditConfig">
import { reactive, ref } from 'vue'; import { reactive, ref } from 'vue';
import { ElMessage } from "element-plus"; import { ElMessage } from 'element-plus';
import { getAPI } from '/@/utils/axios-utils'; import { getAPI } from '/@/utils/axios-utils';
import { SysConfigApi } from '/@/api-services/api'; import { SysConfigApi } from '/@/api-services/api';
import { ConfigOutput } from "/@/api-services/models"; import { ConfigOutput } from '/@/api-services/models';
const props = defineProps({ const props = defineProps({
title: String, title: String,
@ -128,10 +128,12 @@ const cancel = () => {
// //
const updateDefault = () => { const updateDefault = () => {
getAPI(SysConfigApi).apiSysConfigUpdateDefaultPost({ getAPI(SysConfigApi)
.apiSysConfigUpdateDefaultPost({
id: state.ruleForm.id, id: state.ruleForm.id,
defaultValue: state.ruleForm.value defaultValue: state.ruleForm.value,
} as any).then((res: any) => { } as any)
.then((res: any) => {
if (res.data.code == 200) ElMessage.success('更新成功'); if (res.data.code == 200) ElMessage.success('更新成功');
}); });
}; };

View File

@ -1,7 +1,7 @@
<template> <template>
<div> <div>
<el-card shadow="hover" v-loading="state.isLoading"> <el-card shadow="hover" v-loading="state.isLoading">
<el-descriptions title="系统信息配置" :column="2" :border="true" size="default"> <el-descriptions title="系统信息配置" :column="2" :border="true" >
<template #title> <template #title>
<el-icon size="16" style="margin-right: 3px; display: inline; vertical-align: middle"> <ele-Setting /> </el-icon> <el-icon size="16" style="margin-right: 3px; display: inline; vertical-align: middle"> <ele-Setting /> </el-icon>
</template> </template>