From 8479f69bdccac93a497e039dd01e18333ec2bbdc Mon Sep 17 00:00:00 2001 From: nsnail Date: Wed, 6 Nov 2024 11:48:36 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E2=9C=A8=20=E7=94=A8=E6=88=B7=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E5=99=A8=20(#189)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: tk --- package.json | 2 +- .../NetAdmin.Infrastructure.csproj | 4 ++-- .../NetAdminSettings.Development.json | 3 +-- .../NetAdmin.Infrastructure/NetAdminSettings.Remote.json | 3 +-- .../NetAdmin.Infrastructure/NetAdminSettings.Test.json | 3 +-- .../NetAdmin.Infrastructure/NetAdminSettings.json | 3 +-- .../NetAdmin.Infrastructure/Utils/JsonIgnoreRemover.cs | 2 +- .../Services/Sys/UserService.cs | 8 +++++++- .../Dto/Sys/Menu/CreateMenuReq.cs | 2 +- src/backend/NetAdmin.Tests/NetAdmin.Tests.csproj | 2 +- src/frontend/admin/src/components/naSearch/index.vue | 9 +++++++++ src/frontend/admin/src/components/naUserSelect/index.vue | 2 +- src/frontend/admin/src/components/scDialog/index.vue | 1 + src/frontend/admin/src/components/scEcharts/index.vue | 3 +++ src/frontend/admin/src/components/scTable/index.vue | 2 +- .../admin/src/components/scTableSelect/index.vue | 6 ++++-- src/frontend/admin/src/views/dev/code/index.vue | 2 +- src/frontend/admin/src/views/sys/log/operation/index.vue | 9 +++++++++ 18 files changed, 46 insertions(+), 20 deletions(-) diff --git a/package.json b/package.json index 98807fa8..d8208104 100644 --- a/package.json +++ b/package.json @@ -11,4 +11,4 @@ "path": "node_modules/cz-git" } } -} +} \ No newline at end of file diff --git a/src/backend/NetAdmin.Infrastructure/NetAdmin.Infrastructure.csproj b/src/backend/NetAdmin.Infrastructure/NetAdmin.Infrastructure.csproj index 0667e5a9..18fe7cf0 100644 --- a/src/backend/NetAdmin.Infrastructure/NetAdmin.Infrastructure.csproj +++ b/src/backend/NetAdmin.Infrastructure/NetAdmin.Infrastructure.csproj @@ -5,8 +5,8 @@ - - + + diff --git a/src/backend/NetAdmin.Infrastructure/NetAdminSettings.Development.json b/src/backend/NetAdmin.Infrastructure/NetAdminSettings.Development.json index 838e24e0..dce35d64 100644 --- 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 } } \ No newline at end of file diff --git a/src/backend/NetAdmin.Infrastructure/NetAdminSettings.Remote.json b/src/backend/NetAdmin.Infrastructure/NetAdminSettings.Remote.json index 838e24e0..dce35d64 100644 --- 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 } } \ No newline at end of file diff --git a/src/backend/NetAdmin.Infrastructure/NetAdminSettings.Test.json b/src/backend/NetAdmin.Infrastructure/NetAdminSettings.Test.json index 838e24e0..dce35d64 100644 --- 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 } } \ No newline at end of file diff --git a/src/backend/NetAdmin.Infrastructure/NetAdminSettings.json b/src/backend/NetAdmin.Infrastructure/NetAdminSettings.json index 2fac885b..2fa43268 100644 --- 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": { diff --git a/src/backend/NetAdmin.Infrastructure/Utils/JsonIgnoreRemover.cs b/src/backend/NetAdmin.Infrastructure/Utils/JsonIgnoreRemover.cs index dc682860..cc99c836 100644 --- 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; /// /// 忽略 JsonIgnore 特性 diff --git a/src/backend/NetAdmin.SysComponent.Application/Services/Sys/UserService.cs b/src/backend/NetAdmin.SysComponent.Application/Services/Sys/UserService.cs index 6c8db5bb..c9762199 100644 --- 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> QueryAsync(QueryReq 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>(); } diff --git a/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Menu/CreateMenuReq.cs b/src/backend/NetAdmin.SysComponent.Domain/Dto/Sys/Menu/CreateMenuReq.cs index 9da10698..6709bea7 100644 --- 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 /// [JsonIgnore(Condition = JsonIgnoreCondition.Never)] - public override long ParentId { get; init; } = 0; + public override long ParentId { get; init; } /// [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)] diff --git a/src/backend/NetAdmin.Tests/NetAdmin.Tests.csproj b/src/backend/NetAdmin.Tests/NetAdmin.Tests.csproj index 1911d5a9..42b17220 100644 --- a/src/backend/NetAdmin.Tests/NetAdmin.Tests.csproj +++ b/src/backend/NetAdmin.Tests/NetAdmin.Tests.csproj @@ -5,7 +5,7 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/src/frontend/admin/src/components/naSearch/index.vue b/src/frontend/admin/src/components/naSearch/index.vue index c0b72b1c..cca51779 100644 --- 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 /> + diff --git a/src/frontend/admin/src/components/naUserSelect/index.vue b/src/frontend/admin/src/components/naUserSelect/index.vue index 05782757..4500b4e3 100644 --- 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 }, }, }, diff --git a/src/frontend/admin/src/components/scDialog/index.vue b/src/frontend/admin/src/components/scDialog/index.vue index 4dcda1ff..c8e4491e 100644 --- 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) }, }, } diff --git a/src/frontend/admin/src/components/scEcharts/index.vue b/src/frontend/admin/src/components/scEcharts/index.vue index afc22047..43389569 100644 --- 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' }) + }, }, } \ No newline at end of file diff --git a/src/frontend/admin/src/components/scTable/index.vue b/src/frontend/admin/src/components/scTable/index.vue index 45cffd5b..0c0e969f 100644 --- 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 }, diff --git a/src/frontend/admin/src/components/scTableSelect/index.vue b/src/frontend/admin/src/components/scTableSelect/index.vue index a1774739..5bd64233 100644 --- 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] } }) }, diff --git a/src/frontend/admin/src/views/dev/code/index.vue b/src/frontend/admin/src/views/dev/code/index.vue index af4e4489..3ac44596 100644 --- 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', }, } }, 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 11eeae79..d0c923d1 100644 --- 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 @@