From fd0218a6fd1cda41ee82d3511668c607e0fd3424 Mon Sep 17 00:00:00 2001
From: tk <fiyne1a@dingtalk.com>
Date: Tue, 3 Jun 2025 17:19:55 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E2=99=BB=EF=B8=8F=20=E6=A1=86?=
 =?UTF-8?q?=E6=9E=B6=E4=BB=A3=E7=A0=81=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Services/RepositoryService.cs                |  5 ++++-
 .../DbMaps/Sys/Sys_UserProfile.cs                | 16 ++++++++--------
 .../Dto/Sys/UserProfile/CreateUserProfileReq.cs  | 10 +++++-----
 .../Dto/Sys/UserProfile/QueryUserProfileRsp.cs   |  8 ++++----
 .../Enums/{Sexes.cs => Genders.cs}               |  2 +-
 .../admin/src/components/scTable/index.vue       |  8 +++++++-
 .../admin/src/views/sys/config/index.vue         |  1 +
 src/frontend/admin/src/views/sys/dept/index.vue  |  1 +
 .../admin/src/views/sys/dic/list/index.vue       |  1 +
 .../admin/src/views/sys/doc/list/index.vue       |  1 +
 .../admin/src/views/sys/job/all/index.vue        |  1 +
 .../admin/src/views/sys/job/record/index.vue     |  1 +
 .../admin/src/views/sys/log/login/index.vue      |  1 +
 .../admin/src/views/sys/log/operation/index.vue  |  1 +
 src/frontend/admin/src/views/sys/msg/index.vue   |  1 +
 src/frontend/admin/src/views/sys/role/index.vue  |  1 +
 src/frontend/admin/src/views/sys/user/index.vue  |  1 +
 src/frontend/admin/src/views/sys/user/save.vue   |  8 ++++----
 18 files changed, 44 insertions(+), 24 deletions(-)
 rename src/backend/NetAdmin/NetAdmin.Infrastructure/Enums/{Sexes.cs => Genders.cs} (95%)

diff --git a/src/backend/NetAdmin/NetAdmin.Application/Services/RepositoryService.cs b/src/backend/NetAdmin/NetAdmin.Application/Services/RepositoryService.cs
index 6e4b59c8..3cd0731c 100644
--- a/src/backend/NetAdmin/NetAdmin.Application/Services/RepositoryService.cs
+++ b/src/backend/NetAdmin/NetAdmin.Application/Services/RepositoryService.cs
@@ -49,13 +49,16 @@ public abstract class RepositoryService<TEntity, TPrimary, TLogger>(BasicReposit
     ///     导出实体
     /// </summary>
     protected static async Task<IActionResult> ExportAsync<TQuery, TExport>( //
-        Func<QueryReq<TQuery>, ISelect<TEntity>> selector, QueryReq<TQuery> query, string fileName, Expression<Func<TEntity, object>> listExp = null)
+        Func<QueryReq<TQuery>, ISelect<TEntity>> selector, QueryReq<TQuery> query, string fileName, Expression<Func<TEntity, object>> listExp = null
+      , Func<object, object>                     listHandle = null)
         where TQuery : DataAbstraction, new()
     {
         var select = selector(query).WithNoLockNoWait().Take(Numbers.MAX_LIMIT_EXPORT);
 
         object list = listExp == null ? await select.ToListAsync().ConfigureAwait(false) : await select.ToListAsync(listExp).ConfigureAwait(false);
 
+        list = listHandle?.Invoke(list) ?? list;
+
         return await GetExportFileStreamAsync<TExport>(fileName, list).ConfigureAwait(false);
     }
 
diff --git a/src/backend/NetAdmin/NetAdmin.Domain/DbMaps/Sys/Sys_UserProfile.cs b/src/backend/NetAdmin/NetAdmin.Domain/DbMaps/Sys/Sys_UserProfile.cs
index 73c04daf..76b90340 100644
--- a/src/backend/NetAdmin/NetAdmin.Domain/DbMaps/Sys/Sys_UserProfile.cs
+++ b/src/backend/NetAdmin/NetAdmin.Domain/DbMaps/Sys/Sys_UserProfile.cs
@@ -112,6 +112,14 @@ public record Sys_UserProfile : VersionEntity, IRegister
     [JsonIgnore]
     public virtual string EmergencyContactName { get; init; }
 
+    /// <summary>
+    ///     性别
+    /// </summary>
+    [Column]
+    [CsvIgnore]
+    [JsonIgnore]
+    public virtual Genders? Gender { get; init; }
+
     /// <summary>
     ///     毕业学校
     /// </summary>
@@ -201,14 +209,6 @@ public record Sys_UserProfile : VersionEntity, IRegister
     [JsonIgnore]
     public virtual string RealName { get; init; }
 
-    /// <summary>
-    ///     性别
-    /// </summary>
-    [Column]
-    [CsvIgnore]
-    [JsonIgnore]
-    public virtual Sexes? Sex { get; init; }
-
     /// <summary>
     ///     用户基本信息
     /// </summary>
diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/UserProfile/CreateUserProfileReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/UserProfile/CreateUserProfileReq.cs
index b5c3480e..2d03bdbf 100644
--- a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/UserProfile/CreateUserProfileReq.cs
+++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/UserProfile/CreateUserProfileReq.cs
@@ -58,6 +58,11 @@ public record CreateUserProfileReq : Sys_UserProfile
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public override string EmergencyContactName { get; init; }
 
+    /// <inheritdoc cref="Sys_UserProfile.Gender" />
+    [EnumDataType(typeof(Genders), ErrorMessageResourceType = typeof(Ln), ErrorMessageResourceName = nameof(Ln.性别不正确))]
+    [JsonIgnore(Condition = JsonIgnoreCondition.Never)]
+    public override Genders? Gender { get; init; }
+
     /// <inheritdoc cref="Sys_UserProfile.GraduateSchool" />
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public override string GraduateSchool { get; init; }
@@ -104,9 +109,4 @@ public record CreateUserProfileReq : Sys_UserProfile
     /// <inheritdoc cref="Sys_UserProfile.RealName" />
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public override string RealName { get; init; }
-
-    /// <inheritdoc cref="Sys_UserProfile.Sex" />
-    [EnumDataType(typeof(Sexes), ErrorMessageResourceType = typeof(Ln), ErrorMessageResourceName = nameof(Ln.性别不正确))]
-    [JsonIgnore(Condition = JsonIgnoreCondition.Never)]
-    public override Sexes? Sex { get; init; }
 }
\ No newline at end of file
diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/UserProfile/QueryUserProfileRsp.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/UserProfile/QueryUserProfileRsp.cs
index 07ea21ad..9556084f 100644
--- a/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/UserProfile/QueryUserProfileRsp.cs
+++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/UserProfile/QueryUserProfileRsp.cs
@@ -57,6 +57,10 @@ public sealed record QueryUserProfileRsp : Sys_UserProfile
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public override string EmergencyContactName { get; init; }
 
+    /// <inheritdoc cref="Sys_UserProfile.Gender" />
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    public override Genders? Gender { get; init; }
+
     /// <inheritdoc cref="Sys_UserProfile.GraduateSchool" />
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public override string GraduateSchool { get; init; }
@@ -103,10 +107,6 @@ public sealed record QueryUserProfileRsp : Sys_UserProfile
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public override string RealName { get; init; }
 
-    /// <inheritdoc cref="Sys_UserProfile.Sex" />
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    public override Sexes? Sex { get; init; }
-
     /// <inheritdoc cref="IFieldVersion.Version" />
     [JsonIgnore(Condition = JsonIgnoreCondition.Never)]
     public override long Version { get; init; }
diff --git a/src/backend/NetAdmin/NetAdmin.Infrastructure/Enums/Sexes.cs b/src/backend/NetAdmin/NetAdmin.Infrastructure/Enums/Genders.cs
similarity index 95%
rename from src/backend/NetAdmin/NetAdmin.Infrastructure/Enums/Sexes.cs
rename to src/backend/NetAdmin/NetAdmin.Infrastructure/Enums/Genders.cs
index 9abb48a6..1b25dc1d 100644
--- a/src/backend/NetAdmin/NetAdmin.Infrastructure/Enums/Sexes.cs
+++ b/src/backend/NetAdmin/NetAdmin.Infrastructure/Enums/Genders.cs
@@ -4,7 +4,7 @@ namespace NetAdmin.Infrastructure.Enums;
 ///     性别
 /// </summary>
 [Export]
-public enum Sexes
+public enum Genders
 {
     /// <summary>
     ///     男
diff --git a/src/frontend/admin/src/components/scTable/index.vue b/src/frontend/admin/src/components/scTable/index.vue
index eb6a5773..23497443 100644
--- a/src/frontend/admin/src/components/scTable/index.vue
+++ b/src/frontend/admin/src/components/scTable/index.vue
@@ -121,7 +121,12 @@
     </div>
     <scContextmenu @command="contextMenuCommand" @visible-change="contextMenuVisibleChange" ref="contextmenu">
         <scContextmenuItem
-            v-for="(menu, index) in contextMenus.filter((x) => x === current.column?.property)"
+            v-for="(menu, index) in contextMenus.filter((x) => {
+                if (current.column?.property === x) {
+                    return true
+                }
+                return this.contextMulti && !!this.contextMulti[current.column?.property]?.find((y) => y === x)
+            })"
             :command="menu"
             :key="index"
             :title="`${menu}`">
@@ -214,6 +219,7 @@ export default {
         contextMenus: { type: Array },
         contextOpers: { type: Array, default: ['copy', 'add', 'view', 'edit', 'del'] },
         contextAdvs: { type: Array, default: [] },
+        contextMulti: { type: Object },
         tableName: { type: String, default: '' },
         beforePost: {
             type: Function,
diff --git a/src/frontend/admin/src/views/sys/config/index.vue b/src/frontend/admin/src/views/sys/config/index.vue
index a334af56..c8210237 100644
--- a/src/frontend/admin/src/views/sys/config/index.vue
+++ b/src/frontend/admin/src/views/sys/config/index.vue
@@ -60,6 +60,7 @@
         <el-main class="nopadding">
             <scTable
                 :context-menus="['id', 'userRegisterConfirm', 'userRegisterDept.name', 'userRegisterRole.name', 'enabled', 'createdTime']"
+                :context-multi="{ id: ['createdTime'] }"
                 :export-api="$API.sys_config.export"
                 :params="query"
                 :query-api="$API.sys_config.pagedQuery"
diff --git a/src/frontend/admin/src/views/sys/dept/index.vue b/src/frontend/admin/src/views/sys/dept/index.vue
index 88c578ad..d9c28351 100644
--- a/src/frontend/admin/src/views/sys/dept/index.vue
+++ b/src/frontend/admin/src/views/sys/dept/index.vue
@@ -67,6 +67,7 @@
         <el-main class="nopadding">
             <scTable
                 :context-menus="['id', 'name', 'sort', 'enabled', 'createdTime', 'summary']"
+                :context-multi="{ id: ['createdTime'] }"
                 :default-sort="{ prop: 'sort', order: 'descending' }"
                 :export-api="$API.sys_dept.export"
                 :params="query"
diff --git a/src/frontend/admin/src/views/sys/dic/list/index.vue b/src/frontend/admin/src/views/sys/dic/list/index.vue
index f59a97d6..425ad134 100644
--- a/src/frontend/admin/src/views/sys/dic/list/index.vue
+++ b/src/frontend/admin/src/views/sys/dic/list/index.vue
@@ -74,6 +74,7 @@
             <scTable
                 :before-post="(data) => data.dynamicFilter.filters.length > 0"
                 :context-menus="['key', 'value', 'enabled', 'createdTime', 'id', 'summary']"
+                :context-multi="{ id: ['createdTime'] }"
                 :default-sort="{ prop: 'id', order: 'descending' }"
                 :export-api="$API.sys_dic.exportContent"
                 :params="query"
diff --git a/src/frontend/admin/src/views/sys/doc/list/index.vue b/src/frontend/admin/src/views/sys/doc/list/index.vue
index d546b794..bfc4ce97 100644
--- a/src/frontend/admin/src/views/sys/doc/list/index.vue
+++ b/src/frontend/admin/src/views/sys/doc/list/index.vue
@@ -85,6 +85,7 @@
             <scTable
                 :before-post="(data) => data.dynamicFilter.filters.length > 0"
                 :context-menus="['title', 'enabled', 'createdTime', 'id', 'visibility']"
+                :context-multi="{ id: ['createdTime'] }"
                 :default-sort="{ prop: 'id', order: 'descending' }"
                 :export-api="$API.sys_doc.exportContent"
                 :params="query"
diff --git a/src/frontend/admin/src/views/sys/job/all/index.vue b/src/frontend/admin/src/views/sys/job/all/index.vue
index ea5bb47d..a37d0cb4 100644
--- a/src/frontend/admin/src/views/sys/job/all/index.vue
+++ b/src/frontend/admin/src/views/sys/job/all/index.vue
@@ -125,6 +125,7 @@
                     'createdTime',
                     'lastDuration',
                 ]"
+                :context-multi="{ id: ['createdTime'] }"
                 :default-sort="{ prop: 'lastExecTime', order: 'descending' }"
                 :export-api="$API.sys_job.export"
                 :page-size="100"
diff --git a/src/frontend/admin/src/views/sys/job/record/index.vue b/src/frontend/admin/src/views/sys/job/record/index.vue
index 4001f3eb..9efecb06 100644
--- a/src/frontend/admin/src/views/sys/job/record/index.vue
+++ b/src/frontend/admin/src/views/sys/job/record/index.vue
@@ -99,6 +99,7 @@
                     }
                 "
                 :context-menus="['id', 'duration', 'httpMethod', 'requestUrl', 'httpStatusCode', 'createdTime', 'jobId', 'responseBody']"
+                :context-multi="{ id: ['createdTime'] }"
                 :default-sort="{ prop: 'id', order: 'descending' }"
                 :export-api="$API.sys_job.exportRecord"
                 :params="query"
diff --git a/src/frontend/admin/src/views/sys/log/login/index.vue b/src/frontend/admin/src/views/sys/log/login/index.vue
index 60b36f97..dbe768c5 100644
--- a/src/frontend/admin/src/views/sys/log/login/index.vue
+++ b/src/frontend/admin/src/views/sys/log/login/index.vue
@@ -93,6 +93,7 @@
         <el-main class="nopadding">
             <scTable
                 :context-menus="['id', 'httpStatusCode', 'loginUserName', 'createdClientIp', 'createdUserAgent', 'createdTime']"
+                :context-multi="{ id: ['createdTime'] }"
                 :context-opers="['view']"
                 :default-sort="{ prop: 'id', order: 'descending' }"
                 :export-api="$API.sys_loginlog.export"
diff --git a/src/frontend/admin/src/views/sys/log/operation/index.vue b/src/frontend/admin/src/views/sys/log/operation/index.vue
index f8526584..762a8342 100644
--- a/src/frontend/admin/src/views/sys/log/operation/index.vue
+++ b/src/frontend/admin/src/views/sys/log/operation/index.vue
@@ -119,6 +119,7 @@
         <el-main class="nopadding">
             <scTable
                 :context-menus="['id', 'httpStatusCode', 'apiPathCrc32', 'ownerId', 'httpMethod', 'duration', 'createdClientIp', 'createdTime']"
+                :context-multi="{ id: ['createdTime'] }"
                 :context-opers="[]"
                 :default-sort="{ prop: 'createdTime', order: 'descending' }"
                 :export-api="$API.sys_requestlog.export"
diff --git a/src/frontend/admin/src/views/sys/msg/index.vue b/src/frontend/admin/src/views/sys/msg/index.vue
index b3a1fa1a..03eb33a7 100644
--- a/src/frontend/admin/src/views/sys/msg/index.vue
+++ b/src/frontend/admin/src/views/sys/msg/index.vue
@@ -58,6 +58,7 @@
         <el-main class="nopadding">
             <scTable
                 :context-menus="['id', 'createdUserName', 'msgType', 'title', 'summary', 'createdTime']"
+                :context-multi="{ id: ['createdTime'] }"
                 :default-sort="{ prop: 'id', order: 'descending' }"
                 :export-api="$API.sys_sitemsg.export"
                 :params="query"
diff --git a/src/frontend/admin/src/views/sys/role/index.vue b/src/frontend/admin/src/views/sys/role/index.vue
index 08dc32a4..6d9dfce2 100644
--- a/src/frontend/admin/src/views/sys/role/index.vue
+++ b/src/frontend/admin/src/views/sys/role/index.vue
@@ -115,6 +115,7 @@
         <el-main class="nopadding">
             <scTable
                 :context-menus="['id', 'name', 'sort', 'enabled', 'ignorePermissionControl', 'dataScope', 'displayDashboard', 'createdTime']"
+                :context-multi="{ id: ['createdTime'] }"
                 :default-sort="{ prop: 'sort', order: 'descending' }"
                 :export-api="$API.sys_role.export"
                 :params="query"
diff --git a/src/frontend/admin/src/views/sys/user/index.vue b/src/frontend/admin/src/views/sys/user/index.vue
index a73704e4..1c6c1543 100644
--- a/src/frontend/admin/src/views/sys/user/index.vue
+++ b/src/frontend/admin/src/views/sys/user/index.vue
@@ -93,6 +93,7 @@
                 <el-col :lg="20">
                     <scTable
                         :context-menus="['id', 'userName', 'mobile', 'email', 'enabled', 'createdTime', 'lastLoginTime']"
+                        :context-multi="{ id: ['createdTime'] }"
                         :context-opers="['view', 'edit']"
                         :default-sort="{ prop: 'id', order: 'descending' }"
                         :export-api="$API.sys_user.export"
diff --git a/src/frontend/admin/src/views/sys/user/save.vue b/src/frontend/admin/src/views/sys/user/save.vue
index 3419c31e..a53c7693 100644
--- a/src/frontend/admin/src/views/sys/user/save.vue
+++ b/src/frontend/admin/src/views/sys/user/save.vue
@@ -86,9 +86,9 @@
                         </el-col>
 
                         <el-col :lg="12">
-                            <el-form-item :label="$t('性别')" prop="profile.sex">
-                                <el-select v-model="form.profile.sex" clearable filterable>
-                                    <el-option v-for="(item, i) in $GLOBAL.enums.sexes" :key="i" :label="item[1]" :value="i" />
+                            <el-form-item :label="$t('性别')" prop="profile.gender">
+                                <el-select v-model="form.profile.gender" clearable filterable>
+                                    <el-option v-for="(item, i) in $GLOBAL.enums.genders" :key="i" :label="item[1]" :value="i" />
                                 </el-select>
                             </el-form-item>
                         </el-col>
@@ -104,7 +104,7 @@
                         </el-col>
 
                         <el-col :lg="12">
-                            <el-form-item :label="$t('婚姻状况')" prop="profile.sex">
+                            <el-form-item :label="$t('婚姻状况')" prop="profile.gender">
                                 <el-select v-model="form.profile.marriageStatus" clearable filterable>
                                     <el-option v-for="(item, i) in $GLOBAL.enums.marriageStatues" :key="i" :label="item[1]" :value="i" />
                                 </el-select>