From 5514bdc25e25bd4a4954740ea9baef112796c8ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=9C=E9=B9=B0?= <liuxp1987@126.com>
Date: Wed, 1 Oct 2025 11:00:02 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20PostgreSQL=20=E5=B9=B6?=
 =?UTF-8?q?=E5=90=AF=E7=94=A8=20=E9=A9=BC=E5=B3=B0=E8=BD=AC=E4=B8=8B?=
 =?UTF-8?q?=E5=88=92=E7=BA=BF=20=E6=97=B6=EF=BC=8C=E6=8A=A5=E6=9F=90?=
 =?UTF-8?q?=E4=BA=9B=E5=AD=97=E6=AE=B5=E4=B8=8D=E5=AD=98=E5=9C=A8=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin.NET.Core/Service/APIJSON/SelectTable.cs      |  9 +++++++--
 .../Service/Config/SysTenantConfigService.cs           | 10 ++++++++--
 .../Service/Config/SysUserConfigService.cs             | 10 ++++++++--
 3 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/Admin.NET/Admin.NET.Core/Service/APIJSON/SelectTable.cs b/Admin.NET/Admin.NET.Core/Service/APIJSON/SelectTable.cs
index 9b6f0ecd8..8b83cb9de 100644
--- a/Admin.NET/Admin.NET.Core/Service/APIJSON/SelectTable.cs
+++ b/Admin.NET/Admin.NET.Core/Service/APIJSON/SelectTable.cs
@@ -473,12 +473,17 @@ public class SelectTable : ISingleton
             // 判断列表是否有权限  sum(1)、sum(*)、Count(1)这样的值直接有效
             if (colName == "*" || int.TryParse(colName, out int colNumber) || (IsCol(subtable, colName) && _identitySvc.ColIsRole(colName, selectrole.Split(','))))
             {
+                // 字段名加引号，防止和SQL关键字冲突(mysql为反引号)
+                string qm = "\"";
+                if (tb.Context.CurrentConnectionConfig.DbType is SqlSugar.DbType.MySql)
+                    qm = "`";
+
                 if (ziduan.Length > 1)
                 {
                     if (ziduan[1].Length > 20)
                         throw new Exception("别名不能超过20个字符");
 
-                    str.Append(ziduan[0] + " as `" + ReplaceSQLChar(ziduan[1]) + "`,");
+                    str.Append(ziduan[0] + " as " + qm + ReplaceSQLChar(ziduan[1]) + qm + ",");
                 }
                 // 不对函数加``，解决sum(*)、Count(1)等不能使用的问题
                 else if (ziduan[0].Contains('('))
@@ -486,7 +491,7 @@ public class SelectTable : ISingleton
                     str.Append(ziduan[0] + ",");
                 }
                 else
-                    str.Append("`" + ziduan[0] + "`" + ",");
+                    str.Append(qm + ziduan[0] + qm + ",");
             }
         }
         if (string.IsNullOrEmpty(str.ToString()))
diff --git a/Admin.NET/Admin.NET.Core/Service/Config/SysTenantConfigService.cs b/Admin.NET/Admin.NET.Core/Service/Config/SysTenantConfigService.cs
index 7aca210f3..b92e4efbd 100644
--- a/Admin.NET/Admin.NET.Core/Service/Config/SysTenantConfigService.cs
+++ b/Admin.NET/Admin.NET.Core/Service/Config/SysTenantConfigService.cs
@@ -27,8 +27,14 @@ public class SysTenantConfigService : IDynamicApiController, ITransient
         _sysCacheService = sysCacheService;
         _sysConfigRep = sysConfigRep;
         _sysConfigDataRep = sysConfigDataRep;
-        VSysConfig = _sysConfigRep.AsQueryable().InnerJoin(_sysConfigDataRep.AsQueryable().WhereIF(!_userManager.SuperAdmin, cv => cv.TenantId == _userManager.TenantId),
-            (c, cv) => c.Id == cv.ConfigId).Select<SysConfig>().MergeTable();
+        VSysConfig = _sysConfigRep.AsQueryable()
+            .InnerJoin(
+                _sysConfigDataRep.AsQueryable().WhereIF(!_userManager.SuperAdmin, cv => cv.TenantId == _userManager.TenantId),
+                (c, cv) => c.Id == cv.ConfigId
+            )
+            //.Select<SysConfig>().MergeTable();
+            // 解决PostgreSQL下并启用驼峰转下划线时,报字段不存在,SqlSugar在Select后生成的sql, as后没转下划线导致.
+            .SelectMergeTable((c, cv) => new SysConfig { Id = c.Id.SelectAll(), Value = cv.Value });
     }
 
     /// <summary>
diff --git a/Admin.NET/Admin.NET.Core/Service/Config/SysUserConfigService.cs b/Admin.NET/Admin.NET.Core/Service/Config/SysUserConfigService.cs
index 259650ab1..897f31be9 100644
--- a/Admin.NET/Admin.NET.Core/Service/Config/SysUserConfigService.cs
+++ b/Admin.NET/Admin.NET.Core/Service/Config/SysUserConfigService.cs
@@ -27,8 +27,14 @@ public class SysUserConfigService : IDynamicApiController, ITransient
         _sysCacheService = sysCacheService;
         _sysConfigRep = sysConfigRep;
         _sysConfigDataRep = sysConfigDataRep;
-        VSysConfig = _sysConfigRep.AsQueryable().LeftJoin(_sysConfigDataRep.AsQueryable().WhereIF(_userManager.SuperAdmin, cv => cv.UserId == _userManager.UserId),
-            (c, cv) => c.Id == cv.ConfigId).Select<SysConfig>().MergeTable();
+        VSysConfig = _sysConfigRep.AsQueryable()
+            .LeftJoin(
+                _sysConfigDataRep.AsQueryable().WhereIF(_userManager.SuperAdmin, cv => cv.UserId == _userManager.UserId),
+                (c, cv) => c.Id == cv.ConfigId
+            )
+            //.Select<SysConfig>().MergeTable();
+            // 解决PostgreSQL下并启用驼峰转下划线时,报字段不存在,SqlSugar在Select后生成的sql, as后没转下划线导致.
+            .SelectMergeTable((c, cv) => new SysConfig { Id = c.Id.SelectAll(), Value = cv.Value });
     }
 
     /// <summary>
-- 
Gitee


From 86241b72f27a71ec0274d1c8e5d2954c6ec8fcf4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=9C=E9=B9=B0?= <liuxp1987@126.com>
Date: Thu, 2 Oct 2025 11:01:27 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F=E7=BB=86=E8=8A=82=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../codeGen/component/editCodeGenDialog.vue   | 59 ++++++++++++-------
 .../codeGen/component/genConfigDialog.vue     | 10 +++-
 .../codeGen/component/previewDialog.vue       | 12 +++-
 Web/src/views/system/database/index.vue       |  2 +-
 4 files changed, 55 insertions(+), 28 deletions(-)

diff --git a/Web/src/views/system/codeGen/component/editCodeGenDialog.vue b/Web/src/views/system/codeGen/component/editCodeGenDialog.vue
index aab6ed6d9..e8ffb446f 100644
--- a/Web/src/views/system/codeGen/component/editCodeGenDialog.vue
+++ b/Web/src/views/system/codeGen/component/editCodeGenDialog.vue
@@ -117,12 +117,12 @@
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
 						<el-form-item label="生成方式" prop="generateType">
-              <g-sys-dict v-model="state.ruleForm.generateType" code="code_gen_create_type" render-as="select" class="w100" filterable />
+                            <g-sys-dict v-model="state.ruleForm.generateType" code="code_gen_create_type" render-as="select" class="w100" filterable />
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
 						<el-form-item label="支持打印" prop="printType">
-              <g-sys-dict v-model="state.ruleForm.printType" code="code_gen_print_type" render-as="select" @change="printTypeChanged" class="w100" filterable />
+                            <g-sys-dict v-model="state.ruleForm.printType" code="code_gen_print_type" render-as="select" @change="printTypeChanged" class="w100" filterable />
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20" v-if="state.ruleForm.printType == 'custom'">
@@ -136,29 +136,24 @@
 						<div style="color: #b1b3b8">数据唯一性配置</div>
 					</el-divider>
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
-						<el-button icon="ele-Plus" type="primary" plain @click="() => state.ruleForm.tableUniqueList?.push({})"> 增加配置 </el-button>
+						<el-button icon="ele-Plus" text type="primary" plain @click="() => state.ruleForm.tableUniqueList?.push({})"> 增加配置 </el-button>
 						<span style="font-size: 12px; color: gray; padding-left: 5px"> 保证字段值的唯一性，排除null值 </span>
 					</el-col>
-					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
+					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="unique-box">
 						<template v-if="state.ruleForm.tableUniqueList != undefined && state.ruleForm.tableUniqueList.length > 0">
-							<el-row :gutter="35" v-for="(v, k) in state.ruleForm.tableUniqueList" :key="k">
-								<el-col :xs="24" :sm="14" :md="14" :lg="14" :xl="14" class="mb20">
-									<el-form-item label="字段" :prop="`tableUniqueList[${k}].columns`" :rules="[{ required: true, message: `字段不能为空`, trigger: 'blur' }]">
-										<template #label>
-											<el-button icon="ele-Delete" type="danger" circle plain size="small" @click="() => state.ruleForm.tableUniqueList?.splice(k, 1)" />
-											<span class="ml5">字段</span>
-										</template>
-										<el-select v-model="state.ruleForm.tableUniqueList[k].columns" @change="(val: any) => changeTableUniqueColumn(val, k)" multiple filterable clearable collapse-tags collapse-tags-tooltip class="w100">
-											<el-option v-for="item in state.columnData" :key="item.propertyName" :label="item.propertyName + ' [' + item.columnComment + ']'" :value="item.propertyName" />
-										</el-select>
-									</el-form-item>
-								</el-col>
-								<el-col :xs="24" :sm="10" :md="10" :lg="10" :xl="10" class="mb20">
-									<el-form-item label="描述信息" :prop="`tableUniqueList[${k}].message`" :rules="[{ required: true, message: `描述信息不能为空`, trigger: 'blur' }]">
-										<el-input v-model="state.ruleForm.tableUniqueList[k].message" clearable placeholder="请输入" />
-									</el-form-item>
-								</el-col>
-							</el-row>
+                            <div v-for="(v, k) in state.ruleForm.tableUniqueList" :key="k" class="unique-line">
+                                <el-form-item label="字段" label-width="55" :prop="`tableUniqueList[${k}].columns`" :rules="[{ required: true, message: `字段不能为空`, trigger: 'blur' }]">
+									<el-select v-model="state.ruleForm.tableUniqueList[k].columns" @change="(val: any) => changeTableUniqueColumn(val, k)" multiple filterable clearable collapse-tags collapse-tags-tooltip class="w100">
+										<el-option v-for="item in state.columnData" :key="item.propertyName" :label="item.propertyName + ' [' + item.columnComment + ']'" :value="item.propertyName" />
+									</el-select>
+								</el-form-item>
+                                <el-form-item label="描述" label-width="55" :prop="`tableUniqueList[${k}].message`" :rules="[{ required: true, message: `描述信息不能为空`, trigger: 'blur' }]">
+									<el-input v-model="state.ruleForm.tableUniqueList[k].message" clearable placeholder="请输入" />
+								</el-form-item>
+                                <div class="delete-btn">
+                                    <el-button icon="ele-Delete" type="danger" circle plain size="small" @click="() => state.ruleForm.tableUniqueList?.splice(k, 1)" />
+                                </div>
+                            </div>
 						</template>
 					</el-col>
 				</el-row>
@@ -299,4 +294,24 @@ defineExpose({ openDialog });
 :deep(.el-dialog__body) {
 	min-height: 450px;
 }
+
+.unique-box {
+    display: grid;
+    gap: 20px;
+}
+.unique-line {
+    display: flex;
+    gap: 20px;
+    
+    .el-form-item {
+        margin-bottom: 0;
+        flex: 1;
+    }
+
+    .delete-btn {
+        align-self: center;
+        width: 24px;
+        margin-left: -10px;
+    }
+}
 </style>
diff --git a/Web/src/views/system/codeGen/component/genConfigDialog.vue b/Web/src/views/system/codeGen/component/genConfigDialog.vue
index 701b229c8..fe6bf5c64 100644
--- a/Web/src/views/system/codeGen/component/genConfigDialog.vue
+++ b/Web/src/views/system/codeGen/component/genConfigDialog.vue
@@ -7,7 +7,7 @@
 					<span> 生成配置 </span>
 				</div>
 			</template>
-			<el-table :data="state.tableData" style="width: 100%" v-loading="state.loading" border>
+			<el-table :data="state.tableData" style="width: 100%; height: 100%;" v-loading="state.loading" border>
 				<el-table-column type="index" label="序号" width="55" align="center" />
 				<el-table-column prop="propertyName" label="实体属性" show-overflow-tooltip />
 				<el-table-column prop="columnComment" label="描述" show-overflow-tooltip>
@@ -40,7 +40,7 @@
 						</el-select>
 					</template>
 				</el-table-column>
-				<el-table-column prop="whetherTable" label="列表显示" width="70" align="center" show-overflow-tooltip>
+				<el-table-column prop="whetherTable" label="显示" width="70" align="center" show-overflow-tooltip>
 					<template #default="scope">
 						<el-checkbox v-model="scope.row.whetherTable" true-value="Y" false-value="N" />
 					</template>
@@ -182,9 +182,13 @@ const submit = async () => {
 // 导出对象
 defineExpose({ openDialog });
 </script>
-<style scoped>
+<style lang="scss" scoped>
 .effect-type-container {
 	display: flex;
 	align-items: center;
 }
+
+:deep(.el-dialog__body) {
+	height: calc(100vh - 160px) !important;
+}
 </style>
diff --git a/Web/src/views/system/codeGen/component/previewDialog.vue b/Web/src/views/system/codeGen/component/previewDialog.vue
index f9ea56e62..6b6802eb0 100644
--- a/Web/src/views/system/codeGen/component/previewDialog.vue
+++ b/Web/src/views/system/codeGen/component/previewDialog.vue
@@ -17,7 +17,7 @@
 					</template>
 				</el-segmented>
 			</div>
-			<div ref="monacoEditorRef" style="width: 100%; height: 700px;" v-loading="state.loading"></div>
+			<div ref="monacoEditorRef" v-loading="state.loading" class="code-container"></div>
 			<template #footer>
 				<span class="dialog-footer">
 					<el-button icon="ele-Close" @click="cancel">关 闭</el-button>
@@ -125,7 +125,7 @@ const handleCopy = () => {
 defineExpose({ openDialog });
 </script>
 
-<style scoped>
+<style lang="scss" scoped>
 .cs-style .el-segmented {
 	--el-segmented-item-selected-bg-color: #5c2d91;
 }
@@ -135,4 +135,12 @@ defineExpose({ openDialog });
 .js-style .el-segmented {
 	--el-segmented-item-selected-bg-color: #e44d26;
 }
+:deep(.el-dialog__body) {
+	height: calc(100vh - 160px) !important;
+
+    .code-container {
+        width: 100%;
+        height: calc(100% - 48px);
+    }
+}
 </style>
diff --git a/Web/src/views/system/database/index.vue b/Web/src/views/system/database/index.vue
index b497a5843..42c1fa663 100644
--- a/Web/src/views/system/database/index.vue
+++ b/Web/src/views/system/database/index.vue
@@ -46,7 +46,7 @@
 		<el-card class="full-table" shadow="hover" style="margin-top: 5px">
 			<el-table :data="state.columnData" style="width: 100%" v-loading="state.loading1" border>
 				<el-table-column type="index" label="序号" width="55" align="center" />
-				<el-table-column prop="dbColumnName" label="字段名" align="center" show-overflow-tooltip />
+				<el-table-column prop="dbColumnName" label="字段名" show-overflow-tooltip />
 				<el-table-column prop="dataType" label="数据类型" align="center" show-overflow-tooltip />
 				<el-table-column prop="isPrimarykey" label="主键" width="70" align="center" show-overflow-tooltip>
 					<template #default="scope">
-- 
Gitee


From 93b7e601ec5186758d1cb775a93aed0c7b7b697f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=9C=E9=B9=B0?= <liuxp1987@126.com>
Date: Sat, 4 Oct 2025 23:08:25 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Admin.NET/Admin.NET.Core/Entity/EntityBase.cs      |  7 +++++++
 Admin.NET/Admin.NET.Core/Enum/GenderEnum.cs        | 14 +++++++-------
 .../Extension/RepositoryExtension.cs               |  8 ++++----
 Admin.NET/Admin.NET.Core/SqlSugar/SqlSugarSetup.cs |  9 +++++++++
 4 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/Admin.NET/Admin.NET.Core/Entity/EntityBase.cs b/Admin.NET/Admin.NET.Core/Entity/EntityBase.cs
index e2bef6c51..c39025bae 100644
--- a/Admin.NET/Admin.NET.Core/Entity/EntityBase.cs
+++ b/Admin.NET/Admin.NET.Core/Entity/EntityBase.cs
@@ -82,6 +82,7 @@ public abstract class EntityBase : EntityBaseId
 /// 框架实体基类（删除标志）
 /// </summary>
 [SugarIndex("index_{table}_D", nameof(IsDelete), OrderByType.Asc)]
+[SugarIndex("index_{table}_DT", nameof(DeleteTime), OrderByType.Asc)]
 public abstract class EntityBaseDel : EntityBase, IDeletedFilter
 {
     /// <summary>
@@ -89,6 +90,12 @@ public abstract class EntityBaseDel : EntityBase, IDeletedFilter
     /// </summary>
     [SugarColumn(ColumnDescription = "软删除")]
     public virtual bool IsDelete { get; set; } = false;
+
+    /// <summary>
+    /// 软删除时间
+    /// </summary>
+    [SugarColumn(ColumnDescription = "软删除时间")]
+    public virtual DateTime? DeleteTime { get; set; } 
 }
 
 /// <summary>
diff --git a/Admin.NET/Admin.NET.Core/Enum/GenderEnum.cs b/Admin.NET/Admin.NET.Core/Enum/GenderEnum.cs
index 6cdd89dd5..ceea59140 100644
--- a/Admin.NET/Admin.NET.Core/Enum/GenderEnum.cs
+++ b/Admin.NET/Admin.NET.Core/Enum/GenderEnum.cs
@@ -13,9 +13,9 @@ namespace Admin.NET.Core;
 public enum GenderEnum
 {
     /// <summary>
-    /// 未知的性别
+    /// 未知
     /// </summary>
-    [Description("未知的性别"), Theme("info")]
+    [Description("未知"), Theme("info")]
     Unknown = 0,
 
     /// <summary>
@@ -30,9 +30,9 @@ public enum GenderEnum
     [Description("女性"), Theme("danger")]
     Female = 2,
 
-    /// <summary>
-    /// 未说明的性别
-    /// </summary>
-    [Description("未说明的性别"), Theme("warning")]
-    Unspecified = 9
+    ///// <summary>
+    ///// 未说明的性别
+    ///// </summary>
+    //[Description("未说明的性别"), Theme("warning")]
+    //Unspecified = 9
 }
\ No newline at end of file
diff --git a/Admin.NET/Admin.NET.Core/Extension/RepositoryExtension.cs b/Admin.NET/Admin.NET.Core/Extension/RepositoryExtension.cs
index 6d4a2798d..e52918ed0 100644
--- a/Admin.NET/Admin.NET.Core/Extension/RepositoryExtension.cs
+++ b/Admin.NET/Admin.NET.Core/Extension/RepositoryExtension.cs
@@ -34,7 +34,7 @@ public static class RepositoryExtension
         return db.Updateable(entity).AS().ReSetValue(x => { x.IsDelete = true; })
             .IgnoreColumns(ignoreAllNullColumns: true)
             .EnableDiffLogEvent()   // 记录差异日志
-            .UpdateColumns(x => new { x.IsDelete, x.UpdateTime, x.UpdateUserId })  // 允许更新的字段-AOP拦截自动设置UpdateTime、UpdateUserId
+            .UpdateColumns(x => new { x.IsDelete, x.DeleteTime, x.UpdateTime, x.UpdateUserId })  // 允许更新的字段-AOP拦截自动设置UpdateTime、UpdateUserId
             .ExecuteCommand();
     }
 
@@ -62,7 +62,7 @@ public static class RepositoryExtension
         return db.Updateable(entity).AS().ReSetValue(x => { x.IsDelete = true; })
             .IgnoreColumns(ignoreAllNullColumns: true)
             .EnableDiffLogEvent()   // 记录差异日志
-            .UpdateColumns(x => new { x.IsDelete, x.UpdateTime, x.UpdateUserId })  // 允许更新的字段-AOP拦截自动设置UpdateTime、UpdateUserId
+            .UpdateColumns(x => new { x.IsDelete, x.DeleteTime, x.UpdateTime, x.UpdateUserId })  // 允许更新的字段-AOP拦截自动设置UpdateTime、UpdateUserId
             .ExecuteCommand();
     }
 
@@ -90,7 +90,7 @@ public static class RepositoryExtension
         return db.Updateable(entity).AS().ReSetValue(x => { x.IsDelete = true; })
             .IgnoreColumns(ignoreAllNullColumns: true)
             .EnableDiffLogEvent()   // 记录差异日志
-            .UpdateColumns(x => new { x.IsDelete, x.UpdateTime, x.UpdateUserId })  // 允许更新的字段-AOP拦截自动设置UpdateTime、UpdateUserId
+            .UpdateColumns(x => new { x.IsDelete, x.DeleteTime, x.UpdateTime, x.UpdateUserId })  // 允许更新的字段-AOP拦截自动设置UpdateTime、UpdateUserId
             .ExecuteCommandAsync();
     }
 
@@ -118,7 +118,7 @@ public static class RepositoryExtension
         return db.Updateable(entity).AS().ReSetValue(x => { x.IsDelete = true; })
             .IgnoreColumns(ignoreAllNullColumns: true)
             .EnableDiffLogEvent()   // 记录差异日志
-            .UpdateColumns(x => new { x.IsDelete, x.UpdateTime, x.UpdateUserId })  // 允许更新的字段-AOP拦截自动设置UpdateTime、UpdateUserId
+            .UpdateColumns(x => new { x.IsDelete, x.DeleteTime, x.UpdateTime, x.UpdateUserId })  // 允许更新的字段-AOP拦截自动设置UpdateTime、UpdateUserId
             .ExecuteCommandAsync();
     }
 
diff --git a/Admin.NET/Admin.NET.Core/SqlSugar/SqlSugarSetup.cs b/Admin.NET/Admin.NET.Core/SqlSugar/SqlSugarSetup.cs
index 0078cc35f..ee084fbfb 100644
--- a/Admin.NET/Admin.NET.Core/SqlSugar/SqlSugarSetup.cs
+++ b/Admin.NET/Admin.NET.Core/SqlSugar/SqlSugarSetup.cs
@@ -245,6 +245,15 @@ public static class SqlSugarSetup
                     entityInfo.SetValue(App.User?.FindFirst(ClaimConst.UserId)?.Value);
                 else if (entityInfo.PropertyName == nameof(EntityBase.UpdateUserName))
                     entityInfo.SetValue(App.User?.FindFirst(ClaimConst.RealName)?.Value);
+                else if (entityInfo.PropertyName == nameof(EntityBaseDel.DeleteTime))
+                {
+                    dynamic entityValue = entityInfo.EntityValue;
+                    var isDelete = entityValue.IsDelete;
+                    if (isDelete == true)
+                    {
+                        entityInfo.SetValue(DateTime.Now);
+                    }
+                }
             }
         };
 
-- 
Gitee


From ef3a9a24b783e1a47084c8faceac98a3b3bc42d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=9C=E9=B9=B0?= <liuxp1987@126.com>
Date: Sat, 4 Oct 2025 23:09:58 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BB=86=E8=8A=82?=
 =?UTF-8?q?=E3=80=81=E5=90=8C=E6=AD=A5=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Web/src/api-services/models/sys-menu.ts       |   2 -
 Web/src/components/multiLangInput/index.vue   | 152 ++++++++++--------
 .../views/system/role/component/editRole.vue  |  11 +-
 3 files changed, 94 insertions(+), 71 deletions(-)

diff --git a/Web/src/api-services/models/sys-menu.ts b/Web/src/api-services/models/sys-menu.ts
index e65e0b5be..5e6f3ba1d 100644
--- a/Web/src/api-services/models/sys-menu.ts
+++ b/Web/src/api-services/models/sys-menu.ts
@@ -14,7 +14,6 @@
 
 import { MenuTypeEnum } from './menu-type-enum';
 import { StatusEnum } from './status-enum';
-import { SysMenu } from './sys-menu';
  /**
  * 系统菜单表
  *
@@ -22,7 +21,6 @@ import { SysMenu } from './sys-menu';
  * @interface SysMenu
  */
 export interface SysMenu {
-
     /**
      * 雪花Id
      *
diff --git a/Web/src/components/multiLangInput/index.vue b/Web/src/components/multiLangInput/index.vue
index e58675d63..8f47105c6 100644
--- a/Web/src/components/multiLangInput/index.vue
+++ b/Web/src/components/multiLangInput/index.vue
@@ -1,6 +1,7 @@
 <template>
     <div class="multi-lang-input">
-    <el-input v-model="inputModelValue" :placeholder="`请输入 ${currentLangLabel}`" clearable @update:model-value="(val: string) => { emit('update:modelValue', val); }">
+        <el-input v-model="inputModelValue" :placeholder="`请输入 ${currentLangLabel}`" clearable
+            @update:model-value="(val: string) => emit('update:modelValue', val)">
             <template #append>
                 <el-button @click="openDialog" circle>
                     <template #icon>
@@ -15,7 +16,8 @@
                 <el-row :gutter="35">
                     <el-col v-for="lang in languages" :key="lang.code" :span="24" class="mb10">
                         <el-form-item :label="lang.label">
-                            <el-input v-model="multiLangValue[lang.code]" :placeholder="`请输入: ${lang.label}`" clearable />
+                            <el-input v-model="multiLangValue[lang.code]" :placeholder="`请输入: ${lang.label}`"
+                                clearable />
                         </el-form-item>
                     </el-col>
                 </el-row>
@@ -31,24 +33,18 @@
 </template>
 
 <script setup lang="ts">
-import { ref, computed, onMounted } from 'vue';
-import { useLangStore } from '/@/stores/useLangStore';
-import { Local } from '/@/utils/storage';
-import { getAPI } from '/@/utils/axios-utils';
-import { SysLangTextApi } from '/@/api-services/api';
-import { ElMessage } from 'element-plus';
-const emit = defineEmits<{ (e: 'update:modelValue', value?: string | null): void; }>();
-const ruleFormRef = ref();
-
-const fetchMultiLang = async () => {    
-    const result = await getAPI(SysLangTextApi).apiSysLangTextListPost({ entityName: props.entityName, entityId: props.entityId, fieldName: props.fieldName, pageSize: 200 }).then(res => res.data.result)
-    return result ?? [];
-};
+import { ref, computed, onMounted } from "vue";
+import { useLangStore } from "/@/stores/useLangStore";
+import { Local } from "/@/utils/storage";
+import { getAPI } from "/@/utils/axios-utils";
+import { SysLangTextApi } from "/@/api-services/api";
+import { ElMessage } from "element-plus";
+
+const emit = defineEmits<{
+    (e: "update:modelValue", value?: string | null): void;
+}>();
 
-const inputModelValue = computed({
-    get: () => props.modelValue,
-    set: (val) => emit('update:modelValue', val),
-});
+const ruleFormRef = ref();
 
 const props = defineProps<{
     modelValue?: string | null;
@@ -57,94 +53,109 @@ const props = defineProps<{
     fieldName: string;
 }>();
 
-// 全局语言
+const inputModelValue = computed({
+    get: () => props.modelValue,
+    set: (val) => emit("update:modelValue", val),
+});
 const langStore = useLangStore();
-const languages = ref<any>([] as any);
-
-// 当前语言（可根据用户设置或浏览器设置）
-const currentLang = ref('zh-CN');
-const activeLang = ref('zh-CN');
+const languages = ref<any[]>([]);
 
-// 是否弹框
+const currentLang = ref("zh-CN");
+const activeLang = ref("zh-CN");
 const dialogVisible = ref(false);
+const multiLangValue = ref<Record<string, string>>({});
 
-// 多语言对象
-const multiLangValue = ref<Record<string, string | null | undefined>>({});
-
-// 当前语言显示 Label
 const currentLangLabel = computed(() => {
     return (
-        languages.value.find((l: { code: string; }) => l.code === currentLang.value)?.Label || currentLang.value
+        languages.value.find((l) => l.code === currentLang.value)?.label ||
+        currentLang.value
     );
 });
 
-// 初始化语言
+const fetchMultiLang = async () => {
+    const result = await getAPI(SysLangTextApi)
+        .apiSysLangTextListPost({
+            entityName: props.entityName,
+            entityId: props.entityId,
+            fieldName: props.fieldName,
+            pageSize: 200,
+        })
+        .then((res) => res.data.result);
+    return result ?? [];
+};
+
 onMounted(async () => {
     if (langStore.languages.length === 0) {
         await langStore.loadLanguages();
     }
-    const themeConfig = Local.get('themeConfig');
+    languages.value = langStore.languages;
+
+    const themeConfig = Local.get("themeConfig");
     const globalI18n = themeConfig?.globalI18n;
+
     if (globalI18n) {
-        const matched = langStore.languages.find(l => l.code === globalI18n);
-        const langCode = matched?.code || 'zh-CN';
+        const matched = langStore.languages.find(
+            (l) => l.code === globalI18n || l.value === globalI18n
+        );
+        const langCode = matched?.code || "zh-CN";
         currentLang.value = langCode;
         activeLang.value = langCode;
-    }
-    languages.value = langStore.languages;
-
-    if (languages.value.length > 0) {
+    } else if (languages.value.length > 0) {
         currentLang.value = languages.value[0].code;
         activeLang.value = languages.value[0].code;
     }
 });
+
 const aiTranslation = async () => {
-    languages.value.forEach(async (element: { code: string; value: string | null; }) => {
-        if (element.code == currentLang.value) {
-            return;
-        }
-        multiLangValue.value[element.code] = '正在翻译...';
+    for (const element of languages.value) {
+        if (element.code === currentLang.value) continue;
+        multiLangValue.value[element.code] = "正在翻译...";
         try {
-            const text = await getAPI(SysLangTextApi).apiSysLangTextAiTranslateTextPost({ originalText: props.modelValue, targetLang: element.value }).then(res => res.data.result);
-            if (text) {
-                multiLangValue.value[element.code] = text;
-            } else {
-                multiLangValue.value[element.code] = '';
-            }
+            const text = await getAPI(SysLangTextApi)
+                .apiSysLangTextAiTranslateTextPost({
+                    originalText: props.modelValue,
+                    targetLang: element.code,
+                })
+                .then((res) => res.data.result);
+
+            multiLangValue.value[element.code] = text || "";
         } catch (e: any) {
-            multiLangValue.value[element.code] = '';
+            multiLangValue.value[element.code] = "";
             ElMessage.warning(e.message);
         }
-    });
-}
+    }
+};
 
-// 打开对话框（点击按钮）
 const openDialog = async () => {
     if (!props.entityId) {
-        ElMessage.warning('请先保存数据！');
+        ElMessage.warning("请先保存数据！");
         return;
     }
-    multiLangValue.value = {};
     const res = await fetchMultiLang();
-    multiLangValue.value[currentLang.value] = props.modelValue;
-    res.forEach((element: { langCode?: string | null; content?: string | null; }) => {
-        multiLangValue.value[element.langCode ?? 0] = element.content ?? '';
+
+    const newValues: Record<string, string> = {};
+    res.forEach((element: { langCode?: string | null; content?: string | null }) => {
+        if (element.langCode) {
+            newValues[element.langCode] = element.content ?? "";
+        }
     });
+
+    newValues[currentLang.value] = props.modelValue ?? "";
+
+    multiLangValue.value = newValues;
     dialogVisible.value = true;
     ruleFormRef.value?.resetFields();
 };
 
-// 关闭对话框（只是关闭）
 const closeDialog = () => {
     dialogVisible.value = false;
     multiLangValue.value = {};
     ruleFormRef.value?.resetFields();
 };
 
-// 确认按钮（更新 + 关闭）
 const confirmDialog = async () => {
     const langItems = Object.entries(multiLangValue.value)
-        .filter(([_, content]) => content && content.trim() !== '')
+        .filter(([_, content]) => content && content.trim() !== "")
         .map(([code, content]) => ({
             entityName: props.entityName,
             entityId: props.entityId,
@@ -154,19 +165,21 @@ const confirmDialog = async () => {
         }));
 
     if (langItems.length === 0) {
-        ElMessage.warning('请输入至少一条多语言内容！');
+        ElMessage.warning("请输入至少一条多语言内容！");
         return;
     }
 
     try {
         await getAPI(SysLangTextApi).apiSysLangTextBatchSavePost(langItems);
-        ElMessage.success('保存成功！');
-        // 同步当前语言内容到父组件 input
-        emit('update:modelValue', multiLangValue.value[currentLang.value]);
+        ElMessage.success("保存成功！");
+        emit(
+            "update:modelValue",
+            multiLangValue.value[currentLang.value] ?? props.modelValue
+        );
         dialogVisible.value = false;
     } catch (err) {
         console.error(err);
-        ElMessage.error('保存失败！');
+        ElMessage.error("保存失败！");
     }
     dialogVisible.value = false;
     ruleFormRef.value?.resetFields();
@@ -177,5 +190,8 @@ const confirmDialog = async () => {
 .multi-lang-input {
     width: 100%;
 }
-.mb10:last-child { margin-bottom: 0 !important; }
+
+.mb10:last-child {
+    margin-bottom: 0 !important;
+}
 </style>
diff --git a/Web/src/views/system/role/component/editRole.vue b/Web/src/views/system/role/component/editRole.vue
index 7c4d3e027..a326015d7 100644
--- a/Web/src/views/system/role/component/editRole.vue
+++ b/Web/src/views/system/role/component/editRole.vue
@@ -38,7 +38,7 @@
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
-						<el-form-item label="菜单权限" v-loading="state.loading">
+						<el-form-item label="菜单权限" v-loading="state.loading" class="tree-container">
 							<el-tree
 								ref="treeRef"
 								:data="state.menuData"
@@ -143,6 +143,15 @@ defineExpose({ openDialog });
 </script>
 
 <style lang="scss" scoped>
+.tree-container {
+    :deep(.el-form-item__content) {
+        border: 1px solid var(--el-border-color);
+        border-radius: var(--el-input-border-radius, var(--el-border-radius-base));
+        padding: 5px 0 5px 3px;
+    }
+    
+}
+
 .menu-data-tree {
 	width: 100%;
 	border: 1px solid var(--el-border-color);
-- 
Gitee