refactor: ♻️ 框架代码同步

Author: tk

src/backend/NetAdmin/NetAdmin.Application/Services/RepositoryService.cs

@@ -49,13 +49,16 @@ protected static async Task<IActionResult> ExportAsync<TQuery, TExport>( //
     ///     导出实体
     /// </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);
     }
 

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>

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; }
 }

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; }

…n/NetAdmin.Infrastructure/Enums/Sexes.cs …NetAdmin.Infrastructure/Enums/Genders.cssrc/backend/NetAdmin/NetAdmin.Infrastructure/Enums/Sexes.cs renamed to src/backend/NetAdmin/NetAdmin.Infrastructure/Enums/Genders.cs src/backend/NetAdmin/NetAdmin.Infrastructure/Enums/Sexes.cs renamed to 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>
     ///     男

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,

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"

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"

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"

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"