feat: ✨ 用户选择器 (#189)

Co-authored-by: tk <fiyne1a@dingtalk.com>
2025-04-20 05:02:50 +08:00 · 2024-11-06 11:48:36 +08:00 · 2024-11-06 11:48:36 +08:00 · 8479f69bdc
commit 8479f69bdc
parent a454f2ab2d
18 changed files with 46 additions and 20 deletions
--- a/package.json
+++ b/package.json
@ -11,4 +11,4 @@
      "path": "node_modules/cz-git"
    }
  }
-}
+}
--- a/src/backend/NetAdmin.Infrastructure/NetAdmin.Infrastructure.csproj
+++ b/src/backend/NetAdmin.Infrastructure/NetAdmin.Infrastructure.csproj
@ -5,8 +5,8 @@
    <ItemGroup>
        <PackageReference Include="FreeSql.DbContext.NS" Version="3.2.833-ns4"/>
        <PackageReference Include="FreeSql.Provider.Sqlite.NS" Version="3.2.833-ns4"/>
-        <PackageReference Include="Gurion" Version="1.1.0"/>
-        <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.11.0"/>
+        <PackageReference Include="Gurion" Version="1.2.0"/>
+        <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.12.0-3.final"/>
        <PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="9.0.0-rc.2.24474.3"/>
        <PackageReference Include="Minio" Version="6.0.3"/>
        <PackageReference Include="NSExt" Version="2.2.0"/>
--- a/src/backend/NetAdmin.Infrastructure/NetAdminSettings.Development.json
+++ b/src/backend/NetAdmin.Infrastructure/NetAdminSettings.Development.json
@ -1,6 +1,5 @@
 {
  "AppSettings": {
-    "InjectSpecificationDocument": true,
-    "InjectMiniProfiler": true
+    "InjectSpecificationDocument": true
  }
 }
--- a/src/backend/NetAdmin.Infrastructure/NetAdminSettings.Remote.json
+++ b/src/backend/NetAdmin.Infrastructure/NetAdminSettings.Remote.json
@ -1,6 +1,5 @@
 {
  "AppSettings": {
-    "InjectSpecificationDocument": true,
-    "InjectMiniProfiler": true
+    "InjectSpecificationDocument": true
  }
 }
--- a/src/backend/NetAdmin.Infrastructure/NetAdminSettings.Test.json
+++ b/src/backend/NetAdmin.Infrastructure/NetAdminSettings.Test.json
@ -1,6 +1,5 @@
 {
  "AppSettings": {
-    "InjectSpecificationDocument": true,
-    "InjectMiniProfiler": true
+    "InjectSpecificationDocument": true
  }
 }
--- a/src/backend/NetAdmin.Infrastructure/NetAdminSettings.json
+++ b/src/backend/NetAdmin.Infrastructure/NetAdminSettings.json
@ -1,8 +1,7 @@
 {
  // App基本配置
  "AppSettings": {
-    "InjectSpecificationDocument": false,
-    "InjectMiniProfiler": false
+    "InjectSpecificationDocument": false
  },
  //  Swagger文档配置 ------------------------------------------------------------------------------
  "SpecificationDocumentSettings": {
--- a/src/backend/NetAdmin.Infrastructure/Utils/JsonIgnoreRemover.cs
+++ b/src/backend/NetAdmin.Infrastructure/Utils/JsonIgnoreRemover.cs
@ -1,4 +1,4 @@
-namespace NetAdmin.Infrastructure.Utils;
+namespace NetAdmin.Infrastructure.Utils;

 /// <summary>
 ///     忽略 JsonIgnore 特性
--- a/src/backend/NetAdmin.SysComponent.Application/Services/Sys/UserService.cs
+++ b/src/backend/NetAdmin.SysComponent.Application/Services/Sys/UserService.cs
@ -246,7 +246,13 @@ public sealed class UserService(
    public async Task<IEnumerable<QueryUserRsp>> QueryAsync(QueryReq<QueryUserReq> req)
    {
        req.ThrowIfInvalid();
-        var list = await (await QueryInternalAsync(req).ConfigureAwait(false)).Take(req.Count).ToListAsync(_listUserExp).ConfigureAwait(false);
+        var list = await (await QueryInternalAsync(req, false).ConfigureAwait(false))
+                         #if DBTYPE_SQLSERVER
+                         .WithLock(SqlServerLock.NoLock | SqlServerLock.NoWait)
+                         #endif
+                         .Take(req.Count)
+                         .ToListAsync(a => new Sys_User { Id = a.Id, UserName = a.UserName })
+                         .ConfigureAwait(false);
        return list.Adapt<IEnumerable<QueryUserRsp>>();
    }

--- a/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Menu/CreateMenuReq.cs
+++ b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Menu/CreateMenuReq.cs
@ -42,7 +42,7 @@ public record CreateMenuReq : Sys_Menu

    /// <inheritdoc cref="Sys_Menu.ParentId" />
    [JsonIgnore(Condition = JsonIgnoreCondition.Never)]
-    public override long ParentId { get; init; } = 0;
+    public override long ParentId { get; init; }

    /// <inheritdoc cref="Sys_Menu.Path" />
    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
--- a/src/backend/NetAdmin.Tests/NetAdmin.Tests.csproj
+++ b/src/backend/NetAdmin.Tests/NetAdmin.Tests.csproj
@ -5,7 +5,7 @@
    <ItemGroup>
        <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.0-rc.2.24474.3"/>
        <PackageReference Include="xunit" Version="2.9.2"/>
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
+        <PackageReference Include="xunit.runner.visualstudio" Version="3.0.0-pre.42">
            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
            <PrivateAssets>all</PrivateAssets>
        </PackageReference>
--- a/src/frontend/admin/src/components/naSearch/index.vue
+++ b/src/frontend/admin/src/components/naSearch/index.vue
@ -71,6 +71,15 @@
                :style="item.style"
                clearable
                filterable />
+            <na-user-select
+                v-else-if="item.type === 'user-select' && (!item.condition || item.condition())"
+                v-model="form[item.field[0]][item.field[1]]"
+                v-role="item.role || '*/*/*'"
+                :class="item.class"
+                :placeholder="item.placeholder"
+                :style="item.style"
+                clearable
+                filterable />
        </template>

        <el-badge :hidden="vue.query.dynamicFilter.filters.length === 0" :value="vue.query.dynamicFilter.filters.length">
--- a/src/frontend/admin/src/components/naUserSelect/index.vue
+++ b/src/frontend/admin/src/components/naUserSelect/index.vue
@ -46,7 +46,7 @@ export default {
            immediate: true,
            deep: true,
            handler(n) {
-                this.user = n ?? {}
+                this.user = n
            },
        },
    },
--- a/src/frontend/admin/src/components/scDialog/index.vue
+++ b/src/frontend/admin/src/components/scDialog/index.vue
@ -72,6 +72,7 @@ export default {
        //最大化
        setFullscreen() {
            this.isFullscreen = !this.isFullscreen
+            this.$emit('onSetFullscreen', this.isFullscreen)
        },
    },
 }
--- a/src/frontend/admin/src/components/scEcharts/index.vue
+++ b/src/frontend/admin/src/components/scEcharts/index.vue
@ -63,6 +63,9 @@ export default {
            this.myChart = myChart
            window.addEventListener('resize', () => myChart.resize())
        },
+        resize(width) {
+            this.myChart.resize({ width: width || 'auto' })
+        },
    },
 }
 </script>
--- a/src/frontend/admin/src/components/scTable/index.vue
+++ b/src/frontend/admin/src/components/scTable/index.vue
@ -505,7 +505,7 @@ export default {
            this.loading = true
            try {
                await this.exportApi.post(this.getQueryParams())
-                this.$message.success(`数据已导出（上限2万条）`)
+                this.$message.success(`数据已导出（上限5万条）`)
            } catch {}
            this.loading = false
        },
--- a/src/frontend/admin/src/components/scTableSelect/index.vue
+++ b/src/frontend/admin/src/components/scTableSelect/index.vue
@ -158,7 +158,9 @@ export default {
                        }
                    })
                } else {
-                    const setrow = this.tableData.filter((item) => item[this.defaultProps.value] === this.defaultValue[this.defaultProps.value])
+                    const setrow = this.tableData.filter(
+                        (item) => item[this.defaultProps.value] === (this.defaultValue ?? {})[this.defaultProps.value],
+                    )
                    this.$refs.table.setCurrentRow(setrow[0])
                }
                this.$refs.table.setScrollTop(0)
@ -182,7 +184,7 @@ export default {
                        item.currentLabel = item.value[this.defaultProps.label]
                    })
                } else {
-                    this.$refs.select.states.selectedLabel = this.defaultValue[this.defaultProps.label]
+                    this.$refs.select.states.selectedLabel = (this.defaultValue ?? {})[this.defaultProps.label]
                }
            })
        },
--- a/src/frontend/admin/src/views/dev/code/index.vue
+++ b/src/frontend/admin/src/views/dev/code/index.vue
@ -118,7 +118,7 @@ export default {
                ///     模块说明
                moduleRemark: '',
                ///     模块类型
-                type: 'SysComponent',
+                type: 'NetAdmin.SysComponent',
            },
        }
    },
--- a/src/frontend/admin/src/views/sys/log/operation/index.vue
+++ b/src/frontend/admin/src/views/sys/log/operation/index.vue
@ -30,6 +30,15 @@
            <div class="left-panel">
                <na-search
                    :controls="[
+                        {
+                            type: 'remote-select',
+                            field: ['dy', 'ownerId'],
+                            api: $API.sys_user.query,
+                            config: { props: { label: 'userName', value: 'id' } },
+                            placeholder: '用户',
+                            style: 'width:15rem',
+                            condition: () => $GLOBAL.hasPermission('sys/log/operation/user'),
+                        },
                        {
                            multiple: true,
                            type: 'select',