From 85d02a89974370260d5ae9f39670f17ac9abe535 Mon Sep 17 00:00:00 2001 From: zuohuaijun Date: Mon, 19 Aug 2024 23:21:33 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=F0=9F=98=8E=E5=A2=9E=E5=8A=A0=E8=B4=A6?= =?UTF-8?q?=E5=8F=B7=E3=80=81=E8=8F=9C=E5=8D=95=E3=80=81=E6=9C=BA=E6=9E=84?= =?UTF-8?q?=E3=80=81=E8=81=8C=E4=BD=8D=E3=80=81=E5=AD=97=E5=85=B8=E5=80=BC?= =?UTF-8?q?=E5=A4=8D=E5=88=B6=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin.NET.Core/Admin.NET.Core.csproj | 6 ++--- Web/package.json | 6 ++--- Web/src/views/system/dict/index.vue | 15 +++++++++++-- Web/src/views/system/menu/index.vue | 22 ++++++++++++------- Web/src/views/system/org/index.vue | 22 ++++++++++++------- Web/src/views/system/pos/index.vue | 22 ++++++++++++------- Web/src/views/system/user/index.vue | 18 ++++++++++++--- 7 files changed, 76 insertions(+), 35 deletions(-) diff --git a/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj b/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj index 0b9ad045..25c51ba5 100644 --- a/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj +++ b/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj @@ -17,7 +17,7 @@ - + @@ -36,10 +36,10 @@ - + - + diff --git a/Web/package.json b/Web/package.json index 868899fc..eb7c7206 100644 --- a/Web/package.json +++ b/Web/package.json @@ -2,7 +2,7 @@ "name": "admin.net.pro", "type": "module", "version": "2.4.33", - "lastBuildTime": "2024.08.16", + "lastBuildTime": "2024.08.19", "description": "Admin.NET 站在巨人肩膀上的 .NET 通用权限开发框架", "author": "zuohuaijun", "license": "MIT", @@ -41,7 +41,7 @@ "js-table2excel": "^1.1.2", "jsplumb": "^2.15.6", "lodash-es": "^4.17.21", - "md-editor-v3": "^4.18.1", + "md-editor-v3": "^4.19.1", "mitt": "^3.0.1", "monaco-editor": "^0.50.0", "mqtt": "^4.3.8", @@ -64,7 +64,7 @@ "vue-demi": "0.14.6", "vue-draggable-plus": "^0.5.3", "vue-grid-layout": "3.0.0-beta1", - "vue-i18n": "^9.13.1", + "vue-i18n": "^9.14.0", "vue-json-pretty": "^2.4.0", "vue-plugin-hiprint": "0.0.57-beta28", "vue-router": "^4.4.3", diff --git a/Web/src/views/system/dict/index.vue b/Web/src/views/system/dict/index.vue index c8907361..25dc4c67 100644 --- a/Web/src/views/system/dict/index.vue +++ b/Web/src/views/system/dict/index.vue @@ -115,6 +115,9 @@ + + + @@ -140,7 +143,7 @@ import ModifyRecord from '/@/components/table/modifyRecord.vue'; import { getAPI } from '/@/utils/axios-utils'; import { SysDictTypeApi, SysDictDataApi } from '/@/api-services/api'; -import { SysDictType, PageDictTypeInput, SysDictData, PageDictDataInput } from '/@/api-services/models'; +import { SysDictType, PageDictTypeInput, SysDictData, PageDictDataInput, UpdateDictDataInput } from '/@/api-services/models'; const xGridDictType = ref(); const xGridDictData = ref(); @@ -287,7 +290,7 @@ const optionsDictData = useVxeTable( { field: 'orderNo', title: '排序', width: 80, showOverflow: 'tooltip' }, { field: 'status', title: '状态', width: 80, showOverflow: 'tooltip', slots: { default: 'row_status' } }, { field: '', title: '修改记录', width: 100, showOverflow: 'tooltip', slots: { default: 'row_record' } }, - { title: '操作', fixed: 'right', width: 100, showOverflow: true, slots: { default: 'row_buttons' } }, + { title: '操作', fixed: 'right', width: 120, showOverflow: true, slots: { default: 'row_buttons' } }, ], }, // vxeGrid配置参数(此处可覆写任何参数)，参考vxe-table官方文档 @@ -344,6 +347,14 @@ const handleEditDictData = (row: any) => { editRefDictData.value?.openDialog(row); }; +// 打开复制字典值页面 +const openCopyDictData = (row: any) => { + state.title = '复制字典值'; + var copyRow = JSON.parse(JSON.stringify(row)) as UpdateDictDataInput; + copyRow.id = 0; + editRefDictData.value?.openDialog(copyRow); +}; + // 删除字典值 const handleDeleteDictData = (row: any) => { ElMessageBox.confirm(`确定删除字典值：【${row.value}】?`, '提示', { diff --git a/Web/src/views/system/menu/index.vue b/Web/src/views/system/menu/index.vue index 595bf3f5..6375aae5 100644 --- a/Web/src/views/system/menu/index.vue +++ b/Web/src/views/system/menu/index.vue @@ -62,12 +62,9 @@ @@ -88,7 +85,7 @@ import ModifyRecord from '/@/components/table/modifyRecord.vue'; import { getAPI } from '/@/utils/axios-utils'; import { SysMenuApi } from '/@/api-services/api'; -import { SysMenu } from '/@/api-services/models'; +import { SysMenu, UpdateMenuInput } from '/@/api-services/models'; const xGrid = ref(); const editMenuRef = ref>(); @@ -117,7 +114,7 @@ const options = useVxeTable( { field: 'orderNo', title: '排序', width: 80, showOverflow: 'tooltip' }, { field: 'status', title: '状态', width: 100, showOverflow: 'tooltip', slots: { default: 'row_status' } }, { field: '', title: '修改记录', width: 100, showOverflow: 'tooltip', slots: { default: 'row_record' } }, - { title: '操作', fixed: 'right', width: 100, showOverflow: true, slots: { default: 'row_buttons' } }, + { title: '操作', fixed: 'right', width: 210, showOverflow: true, slots: { default: 'row_buttons' } }, ], }, // vxeGrid配置参数(此处可覆写任何参数)，参考vxe-table官方文档 @@ -170,6 +167,15 @@ const handleEdit = (row: any) => { editMenuRef.value?.openDialog(row); }; +// 打开复制页面 +const openCopyMenu = (row: any) => { + state.title = '复制菜单'; + var copyRow = JSON.parse(JSON.stringify(row)) as UpdateMenuInput; + copyRow.id = 0; + copyRow.title = ''; + editMenuRef.value?.openDialog(copyRow); +}; + // 删除当前行 const handleDelete = (row: any) => { ElMessageBox.confirm(`确定删除菜单：【${row.title}】?`, '提示', { diff --git a/Web/src/views/system/org/index.vue b/Web/src/views/system/org/index.vue index a1178058..b937d65d 100644 --- a/Web/src/views/system/org/index.vue +++ b/Web/src/views/system/org/index.vue @@ -61,12 +61,9 @@ @@ -91,7 +88,7 @@ import ModifyRecord from '/@/components/table/modifyRecord.vue'; import { getAPI } from '/@/utils/axios-utils'; import { SysDictDataApi, SysOrgApi } from '/@/api-services'; -import { SysOrg } from '/@/api-services/models'; +import { SysOrg, UpdateOrgInput } from '/@/api-services/models'; const xGrid = ref(); const editOrgRef = ref>(); @@ -123,7 +120,7 @@ const options = useVxeTable( { field: 'orderNo', title: '排序', width: 80, showOverflow: 'tooltip' }, { field: 'status', title: '状态', width: 80, showOverflow: 'tooltip', slots: { default: 'row_status' } }, { field: '', title: '修改记录', width: 100, showOverflow: 'tooltip', slots: { default: 'row_record' } }, - { title: '操作', fixed: 'right', width: 100, showOverflow: true, slots: { default: 'row_buttons' } }, + { title: '操作', fixed: 'right', width: 210, showOverflow: true, slots: { default: 'row_buttons' } }, ], }, // vxeGrid配置参数(此处可覆写任何参数)，参考vxe-table官方文档 @@ -195,6 +192,15 @@ const handleEdit = (row: any) => { editOrgRef.value?.openDialog(row); }; +// 打开复制页面 +const openCopyOrg = (row: any) => { + state.title = '复制机构'; + var copyRow = JSON.parse(JSON.stringify(row)) as UpdateOrgInput; + copyRow.id = 0; + copyRow.name = ''; + editOrgRef.value?.openDialog(copyRow); +}; + // 删除 const handleDelete = (row: any) => { ElMessageBox.confirm(`确定删除机构：【${row.name}】?`, '提示', { diff --git a/Web/src/views/system/pos/index.vue b/Web/src/views/system/pos/index.vue index 0e32ba6c..fc000c57 100644 --- a/Web/src/views/system/pos/index.vue +++ b/Web/src/views/system/pos/index.vue @@ -45,12 +45,9 @@ @@ -71,7 +68,7 @@ import ModifyRecord from '/@/components/table/modifyRecord.vue'; import { getAPI } from '/@/utils/axios-utils'; import { SysPosApi } from '/@/api-services/api'; -import { PagePosOutput, PagePosInput } from '/@/api-services/models'; +import { PagePosOutput, PagePosInput, UpdatePosInput } from '/@/api-services/models'; const xGrid = ref(); const editPosRef = ref>(); @@ -103,7 +100,7 @@ const options = useVxeTable( { field: 'orderNo', title: '排序', width: 80, showOverflow: 'tooltip' }, { field: 'status', title: '状态', width: 80, showOverflow: 'tooltip', slots: { default: 'row_status' } }, { field: '', title: '修改记录', width: 100, showOverflow: 'tooltip', slots: { default: 'row_record' } }, - { title: '操作', fixed: 'right', width: 100, showOverflow: true, slots: { default: 'row_buttons' } }, + { title: '操作', fixed: 'right', width: 210, showOverflow: true, slots: { default: 'row_buttons' } }, ], }, // vxeGrid配置参数(此处可覆写任何参数)，参考vxe-table官方文档 @@ -157,6 +154,15 @@ const handleEdit = (row: any) => { editPosRef.value?.openDialog(row); }; +// 打开复制页面 +const openCopyMenu = (row: any) => { + state.title = '复制职位'; + var copyRow = JSON.parse(JSON.stringify(row)) as UpdatePosInput; + copyRow.id = 0; + copyRow.name = ''; + editPosRef.value?.openDialog(copyRow); +}; + // 删除 const handleDelete = (row: any) => { ElMessageBox.confirm(`确定删除职位：【${row.name}】?`, '提示', { diff --git a/Web/src/views/system/user/index.vue b/Web/src/views/system/user/index.vue index 9ffa027e..ee3020da 100644 --- a/Web/src/views/system/user/index.vue +++ b/Web/src/views/system/user/index.vue @@ -80,6 +80,9 @@ + + + 重置密码 解除锁定 @@ -108,10 +111,10 @@ import ModifyRecord from '/@/components/table/modifyRecord.vue'; import { getAPI } from '/@/utils/axios-utils'; import { SysUserApi, SysOrgApi } from '/@/api-services/api'; -import { SysOrg, PageTenantInput, UserOutput } from '/@/api-services/models'; +import { SysOrg, PageTenantInput, UserOutput, UpdateUserInput } from '/@/api-services/models'; const xGrid = ref(); -const treeRef = ref>(); +// const treeRef = ref>(); const editUserRef = ref>(); const state = reactive({ treeData: [] as Array, @@ -154,7 +157,7 @@ const options = useVxeTable( { field: 'status', title: '状态', width: 80, showOverflow: 'tooltip', slots: { default: 'row_status' } }, { field: 'orderNo', title: '排序', width: 80, showOverflow: 'tooltip' }, { field: '', title: '修改记录', width: 100, showOverflow: 'tooltip', slots: { default: 'row_record' } }, - { title: '操作', fixed: 'right', width: 280, showOverflow: true, slots: { default: 'row_buttons' } }, + { title: '操作', fixed: 'right', width: 300, showOverflow: true, slots: { default: 'row_buttons' } }, ], }, // vxeGrid配置参数(此处可覆写任何参数)，参考vxe-table官方文档 @@ -222,6 +225,15 @@ const handleEdit = (row: any) => { editUserRef.value?.openDialog(row); }; +// 打开复制页面 +const openCopyMenu = (row: any) => { + state.title = '复制账号'; + var copyRow = JSON.parse(JSON.stringify(row)) as UpdateUserInput; + copyRow.id = 0; + copyRow.account = ''; + editUserRef.value?.openDialog(copyRow); +}; + // 删除 const handleDelete = (row: any) => { ElMessageBox.confirm(`确定删除账号：【${row.account}】?`, '提示', { From e38e533221d33ceb22a039ae361bccce07e44e37 Mon Sep 17 00:00:00 2001 From: zuohuaijun Date: Tue, 20 Aug 2024 20:46:49 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=F0=9F=98=8E=20=E4=BC=98=E5=8C=96=E4=BA=8B?= =?UTF-8?q?=E4=BB=B6=E6=80=BB=E7=BA=BF=E6=95=B0=E6=8D=AE=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E5=82=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Admin.NET/Admin.NET.Core/EventBus/AppEventSubscriber.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Admin.NET/Admin.NET.Core/EventBus/AppEventSubscriber.cs b/Admin.NET/Admin.NET.Core/EventBus/AppEventSubscriber.cs index 92f27f51..18752629 100644 --- a/Admin.NET/Admin.NET.Core/EventBus/AppEventSubscriber.cs +++ b/Admin.NET/Admin.NET.Core/EventBus/AppEventSubscriber.cs @@ -26,8 +26,8 @@ public class AppEventSubscriber : IEventSubscriber, ISingleton, IDisposable [EventSubscribe(CommonConst.AddExLog)] public async Task CreateExLog(EventHandlerExecutingContext context) { - var rep = _serviceScope.ServiceProvider.GetRequiredService>(); - await rep.InsertAsync((SysLogEx)context.Source.Payload); + var db = _serviceScope.ServiceProvider.GetRequiredService(); + await db.CopyNew().Insertable((SysLogEx)context.Source.Payload).ExecuteCommandAsync(); } /// From 30082e0084fb69ec1acf30d446a5ae8699e1195f Mon Sep 17 00:00:00 2001 From: zuohuaijun Date: Tue, 20 Aug 2024 21:01:15 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=F0=9F=98=8E=20=E4=BC=98=E5=8C=96=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E7=94=9F=E6=88=90=E7=9B=B8=E5=85=B3=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin.NET.Core/Admin.NET.Core.csproj | 2 +- .../Entity/SysCodeGenTemplate.cs | 16 +++++++------ .../SeedData/SysCodeGenTemplate.cs | 4 ++-- .../CodeGen/SysCodeGenConfigService.cs | 4 +--- .../Service/CodeGen/SysCodeGenService.cs | 6 ++--- Admin.NET/Admin.NET.Core/Util/BaseInput.cs | 2 +- Admin.NET/Admin.NET.Core/Util/BaseOutput.cs | 24 +++++++++---------- 7 files changed, 29 insertions(+), 29 deletions(-) diff --git a/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj b/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj index 25c51ba5..3f0635be 100644 --- a/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj +++ b/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj @@ -39,7 +39,7 @@ - + diff --git a/Admin.NET/Admin.NET.Core/Entity/SysCodeGenTemplate.cs b/Admin.NET/Admin.NET.Core/Entity/SysCodeGenTemplate.cs index e3137261..75b00476 100644 --- a/Admin.NET/Admin.NET.Core/Entity/SysCodeGenTemplate.cs +++ b/Admin.NET/Admin.NET.Core/Entity/SysCodeGenTemplate.cs @@ -7,9 +7,9 @@ namespace Admin.NET.Core; /// -/// 代码生成模板配置 +/// 代码生成模板配置表 /// -[SugarTable(null, "代码生成模板配置")] +[SugarTable(null, "代码生成模板配置表")] [SysTable] public partial class SysCodeGenTemplate : EntityBase { @@ -21,27 +21,29 @@ public partial class SysCodeGenTemplate : EntityBase public string Name { get; set; } /// - /// 是否是内置模板（Y-是，N-否） + /// 代码生成类型 /// - [SugarColumn(ColumnDescription = "是否是内置模板")] - public CodeGenTypeEnum Type { get; set; } + [SugarColumn(ColumnDescription = "代码生成类型")] + public CodeGenTypeEnum Type { get; set; } = CodeGenTypeEnum.Backend; /// /// 是否是内置模板（Y-是，N-否） /// [SugarColumn(ColumnDescription = "是否是内置模板")] - public YesNoEnum SysFlag { get; set; } + public YesNoEnum SysFlag { get; set; } = YesNoEnum.Y; /// /// 输出位置 /// [SugarColumn(ColumnDescription = "输出位置", Length = 256)] + [Required, MaxLength(256)] public string OutputFile { get; set; } /// /// 描述 /// - [SugarColumn(ColumnDescription = "描述", Length = 200)] + [SugarColumn(ColumnDescription = "描述", Length = 256)] + [Required, MaxLength(256)] public string Describe { get; set; } /// diff --git a/Admin.NET/Admin.NET.Core/SeedData/SysCodeGenTemplate.cs b/Admin.NET/Admin.NET.Core/SeedData/SysCodeGenTemplate.cs index 1adc98aa..d5c51776 100644 --- a/Admin.NET/Admin.NET.Core/SeedData/SysCodeGenTemplate.cs +++ b/Admin.NET/Admin.NET.Core/SeedData/SysCodeGenTemplate.cs @@ -7,7 +7,7 @@ namespace Admin.NET.Core; /// -/// 系统配置表种子数据 +/// 代码生成模板配置表种子数据 /// public class SysCodeGenTemplateSeedData : ISqlSugarEntitySeedData { @@ -25,7 +25,7 @@ public class SysCodeGenTemplateSeedData : ISqlSugarEntitySeedData @@ -137,7 +135,7 @@ public class SysCodeGenConfigService : IDynamicApiController, ITransient orderNo += 10; // 每个配置排序间隔10 } // 多库代码生成---这里要切回主库 - var provider = _db.AsTenant().GetConnectionScope(SqlSugarConst.MainConfigId); + var provider = _db.AsTenant().GetConnectionScope(SqlSugarConst.MainConfigId); provider.Insertable(codeGenConfigs).ExecuteCommand(); } diff --git a/Admin.NET/Admin.NET.Core/Service/CodeGen/SysCodeGenService.cs b/Admin.NET/Admin.NET.Core/Service/CodeGen/SysCodeGenService.cs index 673ddcda..e5a596fc 100644 --- a/Admin.NET/Admin.NET.Core/Service/CodeGen/SysCodeGenService.cs +++ b/Admin.NET/Admin.NET.Core/Service/CodeGen/SysCodeGenService.cs @@ -84,7 +84,7 @@ public class SysCodeGenService : IDynamicApiController, ITransient var codeGen = input.Adapt(); await _db.Updateable(codeGen).ExecuteCommandAsync(); - // 更新配置表 + // 更新配置表 _codeGenConfigService.AddList(GetColumnList(input.Adapt()), codeGen); } @@ -377,13 +377,13 @@ public class SysCodeGenService : IDynamicApiController, ITransient if (templateList[i].Type == CodeGenTypeEnum.Frontend) tmpPath = Path.Combine(new DirectoryInfo(App.WebHostEnvironment.ContentRootPath).Parent!.Parent!.FullName, _codeGenOptions.FrontRootPath, "src"); else - tmpPath = Path.Combine(new DirectoryInfo(App.WebHostEnvironment.ContentRootPath).Parent!.FullName, input.NameSpace); + tmpPath = Path.Combine(new DirectoryInfo(App.WebHostEnvironment.ContentRootPath).Parent!.FullName, input.NameSpace); } else { tmpPath = templateList[i].Type == CodeGenTypeEnum.Frontend ? Path.Combine(outputPath, _codeGenOptions.FrontRootPath, "src") : Path.Combine(outputPath, input!.NameSpace!); } - targetFile = Path.Combine( tmpPath, targetFile); + targetFile = Path.Combine(tmpPath, targetFile); var dirPath = new DirectoryInfo(targetFile).Parent!.FullName; if (!Directory.Exists(dirPath)) diff --git a/Admin.NET/Admin.NET.Core/Util/BaseInput.cs b/Admin.NET/Admin.NET.Core/Util/BaseInput.cs index df81c995..9e81e0f7 100644 --- a/Admin.NET/Admin.NET.Core/Util/BaseInput.cs +++ b/Admin.NET/Admin.NET.Core/Util/BaseInput.cs @@ -64,7 +64,7 @@ public class PhoneInput /// /// 手机号码 /// - /// 13980134216 + /// 13980134216 [Required(ErrorMessage = "手机号码不能为空")] [DataValidation(ValidationTypes.PhoneNumber, ErrorMessage = "手机号码不正确")] public string Phone { get; set; } diff --git a/Admin.NET/Admin.NET.Core/Util/BaseOutput.cs b/Admin.NET/Admin.NET.Core/Util/BaseOutput.cs index 204c9251..809d97a1 100644 --- a/Admin.NET/Admin.NET.Core/Util/BaseOutput.cs +++ b/Admin.NET/Admin.NET.Core/Util/BaseOutput.cs @@ -13,37 +13,37 @@ public class BaseOutput { /// /// 创建时间 - /// + /// public virtual DateTime CreateTime { get; set; } - + /// /// 更新时间 - /// + /// public virtual DateTime UpdateTime { get; set; } - + ///// ///// 创建者Id - ///// + ///// //public virtual long CreateUserId { get; set; } - + ///// ///// 创建者部门Id - ///// + ///// //public virtual long CreateOrgId { get; set; } - + /// /// 创建者名称 - /// + /// public virtual string CreateUserName { get; set; } - + ///// ///// 修改者Id - ///// + ///// //public virtual long UpdateUserId { get; set; } /// /// 修改者名称 - /// + /// public virtual string UpdateUserName { get; set; } } From a3a358a1b1bb2b8305d7bb9e327c22eb78a0d017 Mon Sep 17 00:00:00 2001 From: zuohuaijun Date: Wed, 21 Aug 2024 10:41:07 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=F0=9F=98=8E1=E3=80=81=E5=B7=AE=E5=BC=82?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E7=A6=81=E6=AD=A2=E5=88=A0=E9=99=A4=20=202?= =?UTF-8?q?=E3=80=81=E5=8D=87=E7=BA=A7=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/Log/SysLogDiffService.cs | 11 --- Web/package.json | 10 +-- Web/src/api-services/apis/sys-code-gen-api.ts | 8 +- Web/src/api-services/apis/sys-log-diff-api.ts | 75 ------------------- Web/src/views/system/log/logdiff/index.vue | 14 +--- 5 files changed, 10 insertions(+), 108 deletions(-) diff --git a/Admin.NET/Admin.NET.Core/Service/Log/SysLogDiffService.cs b/Admin.NET/Admin.NET.Core/Service/Log/SysLogDiffService.cs index 0afa7f79..d2f8c45b 100644 --- a/Admin.NET/Admin.NET.Core/Service/Log/SysLogDiffService.cs +++ b/Admin.NET/Admin.NET.Core/Service/Log/SysLogDiffService.cs @@ -44,15 +44,4 @@ public class SysLogDiffService : IDynamicApiController, ITransient { return await _sysLogDiffRep.GetFirstAsync(u => u.Id == id); } - - /// - /// 清空差异日志 🔖 - /// - /// - [ApiDescriptionSettings(Name = "Clear"), HttpPost] - [DisplayName("清空差异日志")] - public void Clear() - { - _sysLogDiffRep.AsSugarClient().DbMaintenance.TruncateTable(); - } } \ No newline at end of file diff --git a/Web/package.json b/Web/package.json index eb7c7206..8b0cab80 100644 --- a/Web/package.json +++ b/Web/package.json @@ -2,7 +2,7 @@ "name": "admin.net.pro", "type": "module", "version": "2.4.33", - "lastBuildTime": "2024.08.19", + "lastBuildTime": "2024.08.21", "description": "Admin.NET 站在巨人肩膀上的 .NET 通用权限开发框架", "author": "zuohuaijun", "license": "MIT", @@ -70,7 +70,7 @@ "vue-router": "^4.4.3", "vue-signature-pad": "^3.0.2", "vue3-tree-org": "^4.2.2", - "vxe-pc-ui": "^4.0.96", + "vxe-pc-ui": "^4.1.0", "vxe-table": "^4.7.59", "vxe-table-plugin-element": "^4.0.4", "vxe-table-plugin-export-xlsx": "^4.0.5", @@ -84,8 +84,8 @@ "@types/node": "^20.14.14", "@types/nprogress": "^0.2.3", "@types/sortablejs": "^1.15.8", - "@typescript-eslint/eslint-plugin": "^8.1.0", - "@typescript-eslint/parser": "^8.1.0", + "@typescript-eslint/eslint-plugin": "^8.2.0", + "@typescript-eslint/parser": "^8.2.0", "@vitejs/plugin-vue": "^5.1.2", "@vitejs/plugin-vue-jsx": "^4.0.1", "@vue/compiler-sfc": "^3.4.38", @@ -99,7 +99,7 @@ "sass": "^1.77.8", "terser": "^5.31.6", "typescript": "^5.5.4", - "vite": "^5.4.1", + "vite": "^5.4.2", "vite-plugin-cdn-import": "^1.0.1", "vite-plugin-compression2": "^1.2.0", "vite-plugin-vue-setup-extend": "^0.4.0", diff --git a/Web/src/api-services/apis/sys-code-gen-api.ts b/Web/src/api-services/apis/sys-code-gen-api.ts index 8ff15afc..81fada14 100644 --- a/Web/src/api-services/apis/sys-code-gen-api.ts +++ b/Web/src/api-services/apis/sys-code-gen-api.ts @@ -423,7 +423,7 @@ export const SysCodeGenApiAxiosParamCreator = function (configuration?: Configur }, /** * - * @summary 代码生成到本地 🔖 + * @summary 执行代码生成 🔖 * @param {SysCodeGen} [body] * @param {*} [options] Override http request option. * @throws {RequiredError} @@ -688,7 +688,7 @@ export const SysCodeGenApiFp = function(configuration?: Configuration) { }, /** * - * @summary 代码生成到本地 🔖 + * @summary 执行代码生成 🔖 * @param {SysCodeGen} [body] * @param {*} [options] Override http request option. * @throws {RequiredError} @@ -818,7 +818,7 @@ export const SysCodeGenApiFactory = function (configuration?: Configuration, bas }, /** * - * @summary 代码生成到本地 🔖 + * @summary 执行代码生成 🔖 * @param {SysCodeGen} [body] * @param {*} [options] Override http request option. * @throws {RequiredError} @@ -945,7 +945,7 @@ export class SysCodeGenApi extends BaseAPI { } /** * - * @summary 代码生成到本地 🔖 + * @summary 执行代码生成 🔖 * @param {SysCodeGen} [body] * @param {*} [options] Override http request option. * @throws {RequiredError} diff --git a/Web/src/api-services/apis/sys-log-diff-api.ts b/Web/src/api-services/apis/sys-log-diff-api.ts index 8b546c08..0c3fb9ff 100644 --- a/Web/src/api-services/apis/sys-log-diff-api.ts +++ b/Web/src/api-services/apis/sys-log-diff-api.ts @@ -26,49 +26,6 @@ import { PageLogInput } from '../models'; */ export const SysLogDiffApiAxiosParamCreator = function (configuration?: Configuration) { return { - /** - * - * @summary 清空差异日志 🔖 - * @param {*} [options] Override http request option. - * @throws {RequiredError} - */ - apiSysLogDiffClearPost: async (options: AxiosRequestConfig = {}): Promise => { - const localVarPath = `/api/sysLogDiff/clear`; - // use dummy base URL string because the URL constructor only accepts absolute URLs. - const localVarUrlObj = new URL(localVarPath, 'https://example.com'); - let baseOptions; - if (configuration) { - baseOptions = configuration.baseOptions; - } - const localVarRequestOptions :AxiosRequestConfig = { method: 'POST', ...baseOptions, ...options}; - const localVarHeaderParameter = {} as any; - const localVarQueryParameter = {} as any; - - // authentication Bearer required - // http bearer authentication required - if (configuration && configuration.accessToken) { - const accessToken = typeof configuration.accessToken === 'function' - ? await configuration.accessToken() - : await configuration.accessToken; - localVarHeaderParameter["Authorization"] = "Bearer " + accessToken; - } - - const query = new URLSearchParams(localVarUrlObj.search); - for (const key in localVarQueryParameter) { - query.set(key, localVarQueryParameter[key]); - } - for (const key in options.params) { - query.set(key, options.params[key]); - } - localVarUrlObj.search = (new URLSearchParams(query)).toString(); - let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; - localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; - - return { - url: localVarUrlObj.pathname + localVarUrlObj.search + localVarUrlObj.hash, - options: localVarRequestOptions, - }; - }, /** * * @summary 获取差异日志详情 🔖 @@ -175,19 +132,6 @@ export const SysLogDiffApiAxiosParamCreator = function (configuration?: Configur */ export const SysLogDiffApiFp = function(configuration?: Configuration) { return { - /** - * - * @summary 清空差异日志 🔖 - * @param {*} [options] Override http request option. - * @throws {RequiredError} - */ - async apiSysLogDiffClearPost(options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise>> { - const localVarAxiosArgs = await SysLogDiffApiAxiosParamCreator(configuration).apiSysLogDiffClearPost(options); - return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { - const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; - return axios.request(axiosRequestArgs); - }; - }, /** * * @summary 获取差异日志详情 🔖 @@ -225,15 +169,6 @@ export const SysLogDiffApiFp = function(configuration?: Configuration) { */ export const SysLogDiffApiFactory = function (configuration?: Configuration, basePath?: string, axios?: AxiosInstance) { return { - /** - * - * @summary 清空差异日志 🔖 - * @param {*} [options] Override http request option. - * @throws {RequiredError} - */ - async apiSysLogDiffClearPost(options?: AxiosRequestConfig): Promise> { - return SysLogDiffApiFp(configuration).apiSysLogDiffClearPost(options).then((request) => request(axios, basePath)); - }, /** * * @summary 获取差异日志详情 🔖 @@ -264,16 +199,6 @@ export const SysLogDiffApiFactory = function (configuration?: Configuration, bas * @extends {BaseAPI} */ export class SysLogDiffApi extends BaseAPI { - /** - * - * @summary 清空差异日志 🔖 - * @param {*} [options] Override http request option. - * @throws {RequiredError} - * @memberof SysLogDiffApi - */ - public async apiSysLogDiffClearPost(options?: AxiosRequestConfig) : Promise> { - return SysLogDiffApiFp(this.configuration).apiSysLogDiffClearPost(options).then((request) => request(this.axios, this.basePath)); - } /** * * @summary 获取差异日志详情 🔖 diff --git a/Web/src/views/system/log/logdiff/index.vue b/Web/src/views/system/log/logdiff/index.vue index 3f028e37..52f6d4e5 100644 --- a/Web/src/views/system/log/logdiff/index.vue +++ b/Web/src/views/system/log/logdiff/index.vue @@ -30,9 +30,7 @@ - + @@ -85,7 +83,6 @@