瀏覽代碼

😁前端页面调整与优化

zuohuaijun 3 年之前
父節點
當前提交
9be66c406d
共有 97 個文件被更改,包括 2363 次插入434 次删除
  1. 3 3
      Admin.NET/Admin.NET.Core/Service/Tenant/Dto/TenantInput.cs
  2. 2 2
      Admin.NET/Admin.NET.Core/Service/Tenant/Dto/TenantOutput.cs
  3. 6 6
      Admin.NET/Admin.NET.Core/Service/Tenant/SysTenantService.cs
  4. 557 45
      Web/pnpm-lock.yaml
  5. 7 0
      Web/src/api-services/apis/apijsonapi.ts
  6. 63 0
      Web/src/api-services/apis/sys-auth-api.ts
  7. 28 0
      Web/src/api-services/apis/sys-cache-api.ts
  8. 63 0
      Web/src/api-services/apis/sys-code-gen-api.ts
  9. 21 0
      Web/src/api-services/apis/sys-code-gen-config-api.ts
  10. 56 0
      Web/src/api-services/apis/sys-config-api.ts
  11. 14 0
      Web/src/api-services/apis/sys-const-api.ts
  12. 70 0
      Web/src/api-services/apis/sys-database-api.ts
  13. 63 0
      Web/src/api-services/apis/sys-dict-data-api.ts
  14. 56 0
      Web/src/api-services/apis/sys-dict-type-api.ts
  15. 21 0
      Web/src/api-services/apis/sys-enum-api.ts
  16. 49 0
      Web/src/api-services/apis/sys-file-api.ts
  17. 119 0
      Web/src/api-services/apis/sys-job-api.ts
  18. 14 0
      Web/src/api-services/apis/sys-log-diff-api.ts
  19. 21 0
      Web/src/api-services/apis/sys-log-ex-api.ts
  20. 21 0
      Web/src/api-services/apis/sys-log-op-api.ts
  21. 14 0
      Web/src/api-services/apis/sys-log-vis-api.ts
  22. 42 0
      Web/src/api-services/apis/sys-menu-api.ts
  23. 35 0
      Web/src/api-services/apis/sys-message-api.ts
  24. 56 0
      Web/src/api-services/apis/sys-notice-api.ts
  25. 14 0
      Web/src/api-services/apis/sys-online-user-api.ts
  26. 28 0
      Web/src/api-services/apis/sys-org-api.ts
  27. 42 0
      Web/src/api-services/apis/sys-plugin-api.ts
  28. 28 0
      Web/src/api-services/apis/sys-pos-api.ts
  29. 28 0
      Web/src/api-services/apis/sys-print-api.ts
  30. 42 0
      Web/src/api-services/apis/sys-region-api.ts
  31. 70 0
      Web/src/api-services/apis/sys-role-api.ts
  32. 28 0
      Web/src/api-services/apis/sys-server-api.ts
  33. 63 0
      Web/src/api-services/apis/sys-tenant-api.ts
  34. 84 0
      Web/src/api-services/apis/sys-user-api.ts
  35. 28 0
      Web/src/api-services/apis/sys-wechat-api.ts
  36. 42 0
      Web/src/api-services/apis/sys-wechat-pay-api.ts
  37. 28 0
      Web/src/api-services/apis/sys-wechat-user-api.ts
  38. 42 0
      Web/src/api-services/apis/sys-wx-open-api.ts
  39. 4 4
      Web/src/api-services/models/add-plugin-input.ts
  40. 2 2
      Web/src/api-services/models/add-tenant-input.ts
  41. 4 4
      Web/src/api-services/models/sys-plugin.ts
  42. 2 2
      Web/src/api-services/models/tenant-output.ts
  43. 4 4
      Web/src/api-services/models/update-plugin-input.ts
  44. 2 2
      Web/src/api-services/models/update-tenant-input.ts
  45. 1 1
      Web/src/layout/footer/index.vue
  46. 1 1
      Web/src/stores/themeConfig.ts
  47. 11 11
      Web/src/theme/element.scss
  48. 2 2
      Web/src/views/system/codeGen/component/editCodeGenDialog.vue
  49. 11 5
      Web/src/views/system/codeGen/component/fkDialog.vue
  50. 17 11
      Web/src/views/system/codeGen/component/genConfigDialog.vue
  51. 13 7
      Web/src/views/system/codeGen/component/treeDialog.vue
  52. 6 6
      Web/src/views/system/codeGen/index.vue
  53. 4 4
      Web/src/views/system/config/component/editConfig.vue
  54. 6 6
      Web/src/views/system/config/index.vue
  55. 12 12
      Web/src/views/system/database/component/addColumn.vue
  56. 12 12
      Web/src/views/system/database/component/addTable.vue
  57. 1 1
      Web/src/views/system/database/component/editColumn.vue
  58. 1 1
      Web/src/views/system/database/component/editTable.vue
  59. 2 2
      Web/src/views/system/database/component/genEntity.vue
  60. 6 6
      Web/src/views/system/database/index.vue
  61. 10 10
      Web/src/views/system/dict/component/dictDataDialog.vue
  62. 2 2
      Web/src/views/system/dict/component/editDictData.vue
  63. 2 2
      Web/src/views/system/dict/component/editDictType.vue
  64. 9 9
      Web/src/views/system/dict/index.vue
  65. 2 2
      Web/src/views/system/file/index.vue
  66. 10 10
      Web/src/views/system/job/component/editJobDetail.vue
  67. 2 2
      Web/src/views/system/job/component/editJobTrigger.vue
  68. 16 16
      Web/src/views/system/job/component/jobCluster.vue
  69. 19 19
      Web/src/views/system/job/index.vue
  70. 10 10
      Web/src/views/system/log/difflog/index.vue
  71. 16 16
      Web/src/views/system/log/exlog/index.vue
  72. 15 15
      Web/src/views/system/log/oplog/index.vue
  73. 11 11
      Web/src/views/system/log/vislog/index.vue
  74. 2 2
      Web/src/views/system/menu/component/editMenu.vue
  75. 8 8
      Web/src/views/system/menu/index.vue
  76. 1 1
      Web/src/views/system/notice/component/editNotice.vue
  77. 7 7
      Web/src/views/system/notice/index.vue
  78. 3 4
      Web/src/views/system/org/component/editOrg.vue
  79. 9 9
      Web/src/views/system/org/index.vue
  80. 2 2
      Web/src/views/system/plugin/component/editPlugin.vue
  81. 5 5
      Web/src/views/system/plugin/index.vue
  82. 2 2
      Web/src/views/system/pos/component/editPos.vue
  83. 7 7
      Web/src/views/system/pos/index.vue
  84. 2 2
      Web/src/views/system/print/component/editPrint.vue
  85. 2 2
      Web/src/views/system/print/index.vue
  86. 2 2
      Web/src/views/system/region/component/editRegion.vue
  87. 9 9
      Web/src/views/system/region/index.vue
  88. 2 2
      Web/src/views/system/role/component/editRole.vue
  89. 2 2
      Web/src/views/system/role/component/grantData.vue
  90. 8 8
      Web/src/views/system/role/index.vue
  91. 5 5
      Web/src/views/system/tenant/component/editTenant.vue
  92. 9 9
      Web/src/views/system/tenant/index.vue
  93. 26 26
      Web/src/views/system/user/component/editUser.vue
  94. 8 8
      Web/src/views/system/user/component/userCenter.vue
  95. 12 12
      Web/src/views/system/user/index.vue
  96. 2 2
      Web/src/views/system/weChatUser/component/editWeChatUser.vue
  97. 12 12
      Web/src/views/system/weChatUser/index.vue

+ 3 - 3
Admin.NET/Admin.NET.Core/Service/Tenant/Dto/TenantInput.cs

@@ -30,10 +30,10 @@ public class AddTenantInput : TenantOutput
     public override string Name { get; set; }
 
     /// <summary>
-    /// 管理员名称
+    /// 租管账号
     /// </summary>
-    [Required(ErrorMessage = "管理员名称不能为空"), MinLength(3, ErrorMessage = "管理员名称不能少于3个字符")]
-    public override string AdminName { get; set; }
+    [Required(ErrorMessage = "租管账号不能为空"), MinLength(3, ErrorMessage = "租管账号不能少于3个字符")]
+    public override string AdminAccount { get; set; }
 }
 
 public class UpdateTenantInput : AddTenantInput

+ 2 - 2
Admin.NET/Admin.NET.Core/Service/Tenant/Dto/TenantOutput.cs

@@ -8,9 +8,9 @@ public class TenantOutput : SysTenant
     public virtual string Name { get; set; }
 
     /// <summary>
-    /// 管理员
+    /// 管理员账号
     /// </summary>
-    public virtual string AdminName { get; set; }
+    public virtual string AdminAccount { get; set; }
 
     /// <summary>
     /// 电子邮箱

+ 6 - 6
Admin.NET/Admin.NET.Core/Service/Tenant/SysTenantService.cs

@@ -66,7 +66,7 @@ public class SysTenantService : IDynamicApiController, ITransient
                 OrgId = o.Id,
                 Name = o.Name,
                 UserId = u.Id,
-                AdminName = u.Account,
+                AdminAccount = u.Account,
                 Phone = u.Phone,
                 Email = u.Email,
                 TenantType = t.TenantType,
@@ -102,7 +102,7 @@ public class SysTenantService : IDynamicApiController, ITransient
         var isExist = await _sysOrgRep.IsAnyAsync(u => u.Name == input.Name);
         if (isExist) throw Oops.Oh(ErrorCodeEnum.D1300);
 
-        isExist = await _sysUserRep.AsQueryable().Filter(null, true).AnyAsync(u => u.Account == input.AdminName);
+        isExist = await _sysUserRep.AsQueryable().Filter(null, true).AnyAsync(u => u.Account == input.AdminAccount);
         if (isExist) throw Oops.Oh(ErrorCodeEnum.D1301);
 
         // ID隔离时设置与主库一致
@@ -185,9 +185,9 @@ public class SysTenantService : IDynamicApiController, ITransient
         var newUser = new SysUser
         {
             TenantId = tenantId,
-            Account = tenant.AdminName,
+            Account = tenant.AdminAccount,
             Password = CryptogramUtil.Encrypt(password),
-            NickName = tenant.AdminName,
+            NickName = "租管",
             Email = tenant.Email,
             Phone = tenant.Phone,
             AccountType = AccountTypeEnum.Admin,
@@ -271,7 +271,7 @@ public class SysTenantService : IDynamicApiController, ITransient
         var isExist = await _sysOrgRep.IsAnyAsync(u => u.Name == input.Name && u.Id != input.OrgId);
         if (isExist)
             throw Oops.Oh(ErrorCodeEnum.D1300);
-        isExist = await _sysUserRep.IsAnyAsync(u => u.Account == input.AdminName && u.Id != input.UserId);
+        isExist = await _sysUserRep.IsAnyAsync(u => u.Account == input.AdminAccount && u.Id != input.UserId);
         if (isExist)
             throw Oops.Oh(ErrorCodeEnum.D1301);
 
@@ -281,7 +281,7 @@ public class SysTenantService : IDynamicApiController, ITransient
         await _sysOrgRep.UpdateSetColumnsTrueAsync(u => new SysOrg() { Name = input.Name }, u => u.Id == input.OrgId);
 
         // 更新系统用户
-        await _sysUserRep.UpdateSetColumnsTrueAsync(u => new SysUser() { Account = input.AdminName, Phone = input.Phone, Email = input.Email }, u => u.Id == input.UserId);
+        await _sysUserRep.UpdateSetColumnsTrueAsync(u => new SysUser() { Account = input.AdminAccount, Phone = input.Phone, Email = input.Email }, u => u.Id == input.UserId);
 
         await UpdateTenantCache();
     }

文件差異過大導致無法顯示
+ 557 - 45
Web/pnpm-lock.yaml


+ 7 - 0
Web/src/api-services/apis/apijsonapi.ts

@@ -44,6 +44,13 @@ export const APIJSONApiAxiosParamCreator = function (configuration?: Configurati
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 

+ 63 - 0
Web/src/api-services/apis/sys-auth-api.ts

@@ -46,6 +46,13 @@ export const SysAuthApiAxiosParamCreator = function (configuration?: Configurati
             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) {
@@ -85,6 +92,13 @@ export const SysAuthApiAxiosParamCreator = function (configuration?: Configurati
             const localVarFormParams = new FormData();
 
             // 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;
+            }
 
 
             if (userName !== undefined) { 
@@ -132,6 +146,13 @@ export const SysAuthApiAxiosParamCreator = function (configuration?: Configurati
             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) {
@@ -168,6 +189,13 @@ export const SysAuthApiAxiosParamCreator = function (configuration?: Configurati
             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) {
@@ -209,6 +237,13 @@ export const SysAuthApiAxiosParamCreator = function (configuration?: Configurati
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 
@@ -249,6 +284,13 @@ export const SysAuthApiAxiosParamCreator = function (configuration?: Configurati
             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) {
@@ -291,6 +333,13 @@ export const SysAuthApiAxiosParamCreator = function (configuration?: Configurati
             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) {
@@ -327,6 +376,13 @@ export const SysAuthApiAxiosParamCreator = function (configuration?: Configurati
             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) {
@@ -363,6 +419,13 @@ export const SysAuthApiAxiosParamCreator = function (configuration?: Configurati
             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) {

+ 28 - 0
Web/src/api-services/apis/sys-cache-api.ts

@@ -50,6 +50,13 @@ export const SysCacheApiAxiosParamCreator = function (configuration?: Configurat
             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) {
@@ -92,6 +99,13 @@ export const SysCacheApiAxiosParamCreator = function (configuration?: Configurat
             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) {
@@ -128,6 +142,13 @@ export const SysCacheApiAxiosParamCreator = function (configuration?: Configurat
             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) {
@@ -170,6 +191,13 @@ export const SysCacheApiAxiosParamCreator = function (configuration?: Configurat
             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) {

+ 63 - 0
Web/src/api-services/apis/sys-code-gen-api.ts

@@ -53,6 +53,13 @@ export const SysCodeGenApiAxiosParamCreator = function (configuration?: Configur
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 
@@ -105,6 +112,13 @@ export const SysCodeGenApiAxiosParamCreator = function (configuration?: Configur
             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) {
@@ -141,6 +155,13 @@ export const SysCodeGenApiAxiosParamCreator = function (configuration?: Configur
             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) {
@@ -178,6 +199,13 @@ export const SysCodeGenApiAxiosParamCreator = function (configuration?: Configur
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 
@@ -223,6 +251,13 @@ export const SysCodeGenApiAxiosParamCreator = function (configuration?: Configur
             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;
+            }
 
             if (id !== undefined) {
                 localVarQueryParameter['Id'] = id;
@@ -264,6 +299,13 @@ export const SysCodeGenApiAxiosParamCreator = function (configuration?: Configur
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 
@@ -305,6 +347,13 @@ export const SysCodeGenApiAxiosParamCreator = function (configuration?: Configur
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 
@@ -351,6 +400,13 @@ export const SysCodeGenApiAxiosParamCreator = function (configuration?: Configur
             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) {
@@ -388,6 +444,13 @@ export const SysCodeGenApiAxiosParamCreator = function (configuration?: Configur
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 

+ 21 - 0
Web/src/api-services/apis/sys-code-gen-config-api.ts

@@ -71,6 +71,13 @@ export const SysCodeGenConfigApiAxiosParamCreator = function (configuration?: Co
             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;
+            }
 
             if (id !== undefined) {
                 localVarQueryParameter['Id'] = id;
@@ -242,6 +249,13 @@ export const SysCodeGenConfigApiAxiosParamCreator = function (configuration?: Co
             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;
+            }
 
             if (id !== undefined) {
                 localVarQueryParameter['Id'] = id;
@@ -387,6 +401,13 @@ export const SysCodeGenConfigApiAxiosParamCreator = function (configuration?: Co
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 

+ 56 - 0
Web/src/api-services/apis/sys-config-api.ts

@@ -50,6 +50,13 @@ export const SysConfigApiAxiosParamCreator = function (configuration?: Configura
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 
@@ -91,6 +98,13 @@ export const SysConfigApiAxiosParamCreator = function (configuration?: Configura
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 
@@ -132,6 +146,13 @@ export const SysConfigApiAxiosParamCreator = function (configuration?: Configura
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 
@@ -177,6 +198,13 @@ export const SysConfigApiAxiosParamCreator = function (configuration?: Configura
             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;
+            }
 
             if (id !== undefined) {
                 localVarQueryParameter['Id'] = id;
@@ -217,6 +245,13 @@ export const SysConfigApiAxiosParamCreator = function (configuration?: Configura
             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) {
@@ -253,6 +288,13 @@ export const SysConfigApiAxiosParamCreator = function (configuration?: Configura
             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) {
@@ -290,6 +332,13 @@ export const SysConfigApiAxiosParamCreator = function (configuration?: Configura
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 
@@ -331,6 +380,13 @@ export const SysConfigApiAxiosParamCreator = function (configuration?: Configura
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 

+ 14 - 0
Web/src/api-services/apis/sys-const-api.ts

@@ -48,6 +48,13 @@ export const SysConstApiAxiosParamCreator = function (configuration?: Configurat
             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) {
@@ -84,6 +91,13 @@ export const SysConstApiAxiosParamCreator = function (configuration?: Configurat
             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) {

+ 70 - 0
Web/src/api-services/apis/sys-database-api.ts

@@ -52,6 +52,13 @@ export const SysDatabaseApiAxiosParamCreator = function (configuration?: Configu
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 
@@ -93,6 +100,13 @@ export const SysDatabaseApiAxiosParamCreator = function (configuration?: Configu
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 
@@ -145,6 +159,13 @@ export const SysDatabaseApiAxiosParamCreator = function (configuration?: Configu
             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) {
@@ -182,6 +203,13 @@ export const SysDatabaseApiAxiosParamCreator = function (configuration?: Configu
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 
@@ -223,6 +251,13 @@ export const SysDatabaseApiAxiosParamCreator = function (configuration?: Configu
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 
@@ -264,6 +299,13 @@ export const SysDatabaseApiAxiosParamCreator = function (configuration?: Configu
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 
@@ -304,6 +346,13 @@ export const SysDatabaseApiAxiosParamCreator = function (configuration?: Configu
             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) {
@@ -346,6 +395,13 @@ export const SysDatabaseApiAxiosParamCreator = function (configuration?: Configu
             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) {
@@ -383,6 +439,13 @@ export const SysDatabaseApiAxiosParamCreator = function (configuration?: Configu
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 
@@ -424,6 +487,13 @@ export const SysDatabaseApiAxiosParamCreator = function (configuration?: Configu
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 

+ 63 - 0
Web/src/api-services/apis/sys-dict-data-api.ts

@@ -51,6 +51,13 @@ export const SysDictDataApiAxiosParamCreator = function (configuration?: Configu
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 
@@ -97,6 +104,13 @@ export const SysDictDataApiAxiosParamCreator = function (configuration?: Configu
             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) {
@@ -139,6 +153,13 @@ export const SysDictDataApiAxiosParamCreator = function (configuration?: Configu
             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;
+            }
 
             if (code !== undefined) {
                 localVarQueryParameter['Code'] = code;
@@ -184,6 +205,13 @@ export const SysDictDataApiAxiosParamCreator = function (configuration?: Configu
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 
@@ -230,6 +258,13 @@ export const SysDictDataApiAxiosParamCreator = function (configuration?: Configu
             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;
+            }
 
             if (status !== undefined) {
                 localVarQueryParameter['Status'] = status;
@@ -279,6 +314,13 @@ export const SysDictDataApiAxiosParamCreator = function (configuration?: Configu
             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;
+            }
 
             if (dictTypeId !== undefined) {
                 localVarQueryParameter['DictTypeId'] = dictTypeId;
@@ -320,6 +362,13 @@ export const SysDictDataApiAxiosParamCreator = function (configuration?: Configu
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 
@@ -361,6 +410,13 @@ export const SysDictDataApiAxiosParamCreator = function (configuration?: Configu
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 
@@ -402,6 +458,13 @@ export const SysDictDataApiAxiosParamCreator = function (configuration?: Configu
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 

+ 56 - 0
Web/src/api-services/apis/sys-dict-type-api.ts

@@ -52,6 +52,13 @@ export const SysDictTypeApiAxiosParamCreator = function (configuration?: Configu
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 
@@ -97,6 +104,13 @@ export const SysDictTypeApiAxiosParamCreator = function (configuration?: Configu
             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;
+            }
 
             if (code !== undefined) {
                 localVarQueryParameter['Code'] = code;
@@ -138,6 +152,13 @@ export const SysDictTypeApiAxiosParamCreator = function (configuration?: Configu
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 
@@ -184,6 +205,13 @@ export const SysDictTypeApiAxiosParamCreator = function (configuration?: Configu
             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;
+            }
 
             if (status !== undefined) {
                 localVarQueryParameter['Status'] = status;
@@ -228,6 +256,13 @@ export const SysDictTypeApiAxiosParamCreator = function (configuration?: Configu
             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) {
@@ -265,6 +300,13 @@ export const SysDictTypeApiAxiosParamCreator = function (configuration?: Configu
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 
@@ -306,6 +348,13 @@ export const SysDictTypeApiAxiosParamCreator = function (configuration?: Configu
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 
@@ -347,6 +396,13 @@ export const SysDictTypeApiAxiosParamCreator = function (configuration?: Configu
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 

+ 21 - 0
Web/src/api-services/apis/sys-enum-api.ts

@@ -53,6 +53,13 @@ export const SysEnumApiAxiosParamCreator = function (configuration?: Configurati
             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;
+            }
 
             if (entityName !== undefined) {
                 localVarQueryParameter['EntityName'] = entityName;
@@ -102,6 +109,13 @@ export const SysEnumApiAxiosParamCreator = function (configuration?: Configurati
             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;
+            }
 
             if (enumName !== undefined) {
                 localVarQueryParameter['EnumName'] = enumName;
@@ -142,6 +156,13 @@ export const SysEnumApiAxiosParamCreator = function (configuration?: Configurati
             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) {

+ 49 - 0
Web/src/api-services/apis/sys-file-api.ts

@@ -49,6 +49,13 @@ export const SysFileApiAxiosParamCreator = function (configuration?: Configurati
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 
@@ -90,6 +97,13 @@ export const SysFileApiAxiosParamCreator = function (configuration?: Configurati
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 
@@ -131,6 +145,13 @@ export const SysFileApiAxiosParamCreator = function (configuration?: Configurati
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 
@@ -173,6 +194,13 @@ export const SysFileApiAxiosParamCreator = function (configuration?: Configurati
             const localVarFormParams = new FormData();
 
             // 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;
+            }
 
 
             if (file !== undefined) { 
@@ -219,6 +247,13 @@ export const SysFileApiAxiosParamCreator = function (configuration?: Configurati
             const localVarFormParams = new FormData();
 
             // 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;
+            }
 
             if (path !== undefined) {
                 localVarQueryParameter['path'] = path;
@@ -268,6 +303,13 @@ export const SysFileApiAxiosParamCreator = function (configuration?: Configurati
             const localVarFormParams = new FormData();
 
             // 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;
+            }
 
             if (files) {
                 files.forEach((element) => {
@@ -314,6 +356,13 @@ export const SysFileApiAxiosParamCreator = function (configuration?: Configurati
             const localVarFormParams = new FormData();
 
             // 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;
+            }
 
 
             if (file !== undefined) { 

+ 119 - 0
Web/src/api-services/apis/sys-job-api.ts

@@ -54,6 +54,13 @@ export const SysJobApiAxiosParamCreator = function (configuration?: Configuratio
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 
@@ -95,6 +102,13 @@ export const SysJobApiAxiosParamCreator = function (configuration?: Configuratio
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 
@@ -135,6 +149,13 @@ export const SysJobApiAxiosParamCreator = function (configuration?: Configuratio
             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) {
@@ -172,6 +193,13 @@ export const SysJobApiAxiosParamCreator = function (configuration?: Configuratio
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 
@@ -213,6 +241,13 @@ export const SysJobApiAxiosParamCreator = function (configuration?: Configuratio
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 
@@ -253,6 +288,13 @@ export const SysJobApiAxiosParamCreator = function (configuration?: Configuratio
             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) {
@@ -290,6 +332,13 @@ export const SysJobApiAxiosParamCreator = function (configuration?: Configuratio
             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;
+            }
 
             if (jobId !== undefined) {
                 localVarQueryParameter['JobId'] = jobId;
@@ -331,6 +380,13 @@ export const SysJobApiAxiosParamCreator = function (configuration?: Configuratio
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 
@@ -371,6 +427,13 @@ export const SysJobApiAxiosParamCreator = function (configuration?: Configuratio
             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) {
@@ -408,6 +471,13 @@ export const SysJobApiAxiosParamCreator = function (configuration?: Configuratio
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 
@@ -449,6 +519,13 @@ export const SysJobApiAxiosParamCreator = function (configuration?: Configuratio
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 
@@ -489,6 +566,13 @@ export const SysJobApiAxiosParamCreator = function (configuration?: Configuratio
             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) {
@@ -525,6 +609,13 @@ export const SysJobApiAxiosParamCreator = function (configuration?: Configuratio
             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) {
@@ -562,6 +653,13 @@ export const SysJobApiAxiosParamCreator = function (configuration?: Configuratio
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 
@@ -603,6 +701,13 @@ export const SysJobApiAxiosParamCreator = function (configuration?: Configuratio
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 
@@ -644,6 +749,13 @@ export const SysJobApiAxiosParamCreator = function (configuration?: Configuratio
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 
@@ -685,6 +797,13 @@ export const SysJobApiAxiosParamCreator = function (configuration?: Configuratio
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 

+ 14 - 0
Web/src/api-services/apis/sys-log-diff-api.ts

@@ -44,6 +44,13 @@ export const SysLogDiffApiAxiosParamCreator = function (configuration?: Configur
             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) {
@@ -81,6 +88,13 @@ export const SysLogDiffApiAxiosParamCreator = function (configuration?: Configur
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 

+ 21 - 0
Web/src/api-services/apis/sys-log-ex-api.ts

@@ -45,6 +45,13 @@ export const SysLogExApiAxiosParamCreator = function (configuration?: Configurat
             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) {
@@ -82,6 +89,13 @@ export const SysLogExApiAxiosParamCreator = function (configuration?: Configurat
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 
@@ -123,6 +137,13 @@ export const SysLogExApiAxiosParamCreator = function (configuration?: Configurat
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 

+ 21 - 0
Web/src/api-services/apis/sys-log-op-api.ts

@@ -45,6 +45,13 @@ export const SysLogOpApiAxiosParamCreator = function (configuration?: Configurat
             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) {
@@ -82,6 +89,13 @@ export const SysLogOpApiAxiosParamCreator = function (configuration?: Configurat
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 
@@ -123,6 +137,13 @@ export const SysLogOpApiAxiosParamCreator = function (configuration?: Configurat
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 

+ 14 - 0
Web/src/api-services/apis/sys-log-vis-api.ts

@@ -44,6 +44,13 @@ export const SysLogVisApiAxiosParamCreator = function (configuration?: Configura
             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) {
@@ -81,6 +88,13 @@ export const SysLogVisApiAxiosParamCreator = function (configuration?: Configura
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 

+ 42 - 0
Web/src/api-services/apis/sys-menu-api.ts

@@ -49,6 +49,13 @@ export const SysMenuApiAxiosParamCreator = function (configuration?: Configurati
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 
@@ -90,6 +97,13 @@ export const SysMenuApiAxiosParamCreator = function (configuration?: Configurati
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 
@@ -132,6 +146,13 @@ export const SysMenuApiAxiosParamCreator = function (configuration?: Configurati
             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;
+            }
 
             if (title !== undefined) {
                 localVarQueryParameter['Title'] = title;
@@ -176,6 +197,13 @@ export const SysMenuApiAxiosParamCreator = function (configuration?: Configurati
             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) {
@@ -212,6 +240,13 @@ export const SysMenuApiAxiosParamCreator = function (configuration?: Configurati
             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) {
@@ -249,6 +284,13 @@ export const SysMenuApiAxiosParamCreator = function (configuration?: Configurati
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 

+ 35 - 0
Web/src/api-services/apis/sys-message-api.ts

@@ -43,6 +43,13 @@ export const SysMessageApiAxiosParamCreator = function (configuration?: Configur
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 
@@ -89,6 +96,13 @@ export const SysMessageApiAxiosParamCreator = function (configuration?: Configur
             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) {
@@ -126,6 +140,13 @@ export const SysMessageApiAxiosParamCreator = function (configuration?: Configur
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 
@@ -167,6 +188,13 @@ export const SysMessageApiAxiosParamCreator = function (configuration?: Configur
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 
@@ -208,6 +236,13 @@ export const SysMessageApiAxiosParamCreator = function (configuration?: Configur
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 

+ 56 - 0
Web/src/api-services/apis/sys-notice-api.ts

@@ -51,6 +51,13 @@ export const SysNoticeApiAxiosParamCreator = function (configuration?: Configura
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 
@@ -92,6 +99,13 @@ export const SysNoticeApiAxiosParamCreator = function (configuration?: Configura
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 
@@ -133,6 +147,13 @@ export const SysNoticeApiAxiosParamCreator = function (configuration?: Configura
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 
@@ -180,6 +201,13 @@ export const SysNoticeApiAxiosParamCreator = function (configuration?: Configura
             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;
+            }
 
             if (title !== undefined) {
                 localVarQueryParameter['Title'] = title;
@@ -245,6 +273,13 @@ export const SysNoticeApiAxiosParamCreator = function (configuration?: Configura
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 
@@ -286,6 +321,13 @@ export const SysNoticeApiAxiosParamCreator = function (configuration?: Configura
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 
@@ -326,6 +368,13 @@ export const SysNoticeApiAxiosParamCreator = function (configuration?: Configura
             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) {
@@ -363,6 +412,13 @@ export const SysNoticeApiAxiosParamCreator = function (configuration?: Configura
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 

+ 14 - 0
Web/src/api-services/apis/sys-online-user-api.ts

@@ -45,6 +45,13 @@ export const SysOnlineUserApiAxiosParamCreator = function (configuration?: Confi
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 
@@ -86,6 +93,13 @@ export const SysOnlineUserApiAxiosParamCreator = function (configuration?: Confi
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 

+ 28 - 0
Web/src/api-services/apis/sys-org-api.ts

@@ -47,6 +47,13 @@ export const SysOrgApiAxiosParamCreator = function (configuration?: Configuratio
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 
@@ -88,6 +95,13 @@ export const SysOrgApiAxiosParamCreator = function (configuration?: Configuratio
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 
@@ -136,6 +150,13 @@ export const SysOrgApiAxiosParamCreator = function (configuration?: Configuratio
             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;
+            }
 
             if (name !== undefined) {
                 localVarQueryParameter['Name'] = name;
@@ -189,6 +210,13 @@ export const SysOrgApiAxiosParamCreator = function (configuration?: Configuratio
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 

+ 42 - 0
Web/src/api-services/apis/sys-plugin-api.ts

@@ -48,6 +48,13 @@ export const SysPluginApiAxiosParamCreator = function (configuration?: Configura
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 
@@ -90,6 +97,13 @@ export const SysPluginApiAxiosParamCreator = function (configuration?: Configura
             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;
+            }
 
             if (assemblyName !== undefined) {
                 localVarQueryParameter['assemblyName'] = assemblyName;
@@ -135,6 +149,13 @@ export const SysPluginApiAxiosParamCreator = function (configuration?: Configura
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 
@@ -176,6 +197,13 @@ export const SysPluginApiAxiosParamCreator = function (configuration?: Configura
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 
@@ -222,6 +250,13 @@ export const SysPluginApiAxiosParamCreator = function (configuration?: Configura
             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) {
@@ -259,6 +294,13 @@ export const SysPluginApiAxiosParamCreator = function (configuration?: Configura
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 

+ 28 - 0
Web/src/api-services/apis/sys-pos-api.ts

@@ -46,6 +46,13 @@ export const SysPosApiAxiosParamCreator = function (configuration?: Configuratio
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 
@@ -87,6 +94,13 @@ export const SysPosApiAxiosParamCreator = function (configuration?: Configuratio
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 
@@ -129,6 +143,13 @@ export const SysPosApiAxiosParamCreator = function (configuration?: Configuratio
             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;
+            }
 
             if (name !== undefined) {
                 localVarQueryParameter['Name'] = name;
@@ -174,6 +195,13 @@ export const SysPosApiAxiosParamCreator = function (configuration?: Configuratio
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 

+ 28 - 0
Web/src/api-services/apis/sys-print-api.ts

@@ -47,6 +47,13 @@ export const SysPrintApiAxiosParamCreator = function (configuration?: Configurat
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 
@@ -88,6 +95,13 @@ export const SysPrintApiAxiosParamCreator = function (configuration?: Configurat
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 
@@ -129,6 +143,13 @@ export const SysPrintApiAxiosParamCreator = function (configuration?: Configurat
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 
@@ -170,6 +191,13 @@ export const SysPrintApiAxiosParamCreator = function (configuration?: Configurat
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 

+ 42 - 0
Web/src/api-services/apis/sys-region-api.ts

@@ -49,6 +49,13 @@ export const SysRegionApiAxiosParamCreator = function (configuration?: Configura
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 
@@ -90,6 +97,13 @@ export const SysRegionApiAxiosParamCreator = function (configuration?: Configura
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 
@@ -135,6 +149,13 @@ export const SysRegionApiAxiosParamCreator = function (configuration?: Configura
             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;
+            }
 
             if (id !== undefined) {
                 localVarQueryParameter['Id'] = id;
@@ -176,6 +197,13 @@ export const SysRegionApiAxiosParamCreator = function (configuration?: Configura
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 
@@ -216,6 +244,13 @@ export const SysRegionApiAxiosParamCreator = function (configuration?: Configura
             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) {
@@ -253,6 +288,13 @@ export const SysRegionApiAxiosParamCreator = function (configuration?: Configura
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 

+ 70 - 0
Web/src/api-services/apis/sys-role-api.ts

@@ -54,6 +54,13 @@ export const SysRoleApiAxiosParamCreator = function (configuration?: Configurati
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 
@@ -95,6 +102,13 @@ export const SysRoleApiAxiosParamCreator = function (configuration?: Configurati
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 
@@ -136,6 +150,13 @@ export const SysRoleApiAxiosParamCreator = function (configuration?: Configurati
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 
@@ -177,6 +198,13 @@ export const SysRoleApiAxiosParamCreator = function (configuration?: Configurati
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 
@@ -217,6 +245,13 @@ export const SysRoleApiAxiosParamCreator = function (configuration?: Configurati
             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) {
@@ -259,6 +294,13 @@ export const SysRoleApiAxiosParamCreator = function (configuration?: Configurati
             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;
+            }
 
             if (status !== undefined) {
                 localVarQueryParameter['Status'] = status;
@@ -309,6 +351,13 @@ export const SysRoleApiAxiosParamCreator = function (configuration?: Configurati
             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;
+            }
 
             if (status !== undefined) {
                 localVarQueryParameter['Status'] = status;
@@ -354,6 +403,13 @@ export const SysRoleApiAxiosParamCreator = function (configuration?: Configurati
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 
@@ -395,6 +451,13 @@ export const SysRoleApiAxiosParamCreator = function (configuration?: Configurati
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 
@@ -436,6 +499,13 @@ export const SysRoleApiAxiosParamCreator = function (configuration?: Configurati
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 

+ 28 - 0
Web/src/api-services/apis/sys-server-api.ts

@@ -42,6 +42,13 @@ export const SysServerApiAxiosParamCreator = function (configuration?: Configura
             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) {
@@ -78,6 +85,13 @@ export const SysServerApiAxiosParamCreator = function (configuration?: Configura
             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) {
@@ -114,6 +128,13 @@ export const SysServerApiAxiosParamCreator = function (configuration?: Configura
             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) {
@@ -150,6 +171,13 @@ export const SysServerApiAxiosParamCreator = function (configuration?: Configura
             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) {

+ 63 - 0
Web/src/api-services/apis/sys-tenant-api.ts

@@ -52,6 +52,13 @@ export const SysTenantApiAxiosParamCreator = function (configuration?: Configura
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 
@@ -93,6 +100,13 @@ export const SysTenantApiAxiosParamCreator = function (configuration?: Configura
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 
@@ -134,6 +148,13 @@ export const SysTenantApiAxiosParamCreator = function (configuration?: Configura
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 
@@ -175,6 +196,13 @@ export const SysTenantApiAxiosParamCreator = function (configuration?: Configura
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 
@@ -216,6 +244,13 @@ export const SysTenantApiAxiosParamCreator = function (configuration?: Configura
             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;
+            }
 
             if (userId !== undefined) {
                 localVarQueryParameter['UserId'] = userId;
@@ -257,6 +292,13 @@ export const SysTenantApiAxiosParamCreator = function (configuration?: Configura
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 
@@ -298,6 +340,13 @@ export const SysTenantApiAxiosParamCreator = function (configuration?: Configura
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 
@@ -339,6 +388,13 @@ export const SysTenantApiAxiosParamCreator = function (configuration?: Configura
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 
@@ -380,6 +436,13 @@ export const SysTenantApiAxiosParamCreator = function (configuration?: Configura
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 

+ 84 - 0
Web/src/api-services/apis/sys-user-api.ts

@@ -56,6 +56,13 @@ export const SysUserApiAxiosParamCreator = function (configuration?: Configurati
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 
@@ -96,6 +103,13 @@ export const SysUserApiAxiosParamCreator = function (configuration?: Configurati
             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) {
@@ -133,6 +147,13 @@ export const SysUserApiAxiosParamCreator = function (configuration?: Configurati
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 
@@ -174,6 +195,13 @@ export const SysUserApiAxiosParamCreator = function (configuration?: Configurati
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 
@@ -215,6 +243,13 @@ export const SysUserApiAxiosParamCreator = function (configuration?: Configurati
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 
@@ -256,6 +291,13 @@ export const SysUserApiAxiosParamCreator = function (configuration?: Configurati
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 
@@ -302,6 +344,13 @@ export const SysUserApiAxiosParamCreator = function (configuration?: Configurati
             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) {
@@ -344,6 +393,13 @@ export const SysUserApiAxiosParamCreator = function (configuration?: Configurati
             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) {
@@ -381,6 +437,13 @@ export const SysUserApiAxiosParamCreator = function (configuration?: Configurati
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 
@@ -422,6 +485,13 @@ export const SysUserApiAxiosParamCreator = function (configuration?: Configurati
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 
@@ -463,6 +533,13 @@ export const SysUserApiAxiosParamCreator = function (configuration?: Configurati
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 
@@ -504,6 +581,13 @@ export const SysUserApiAxiosParamCreator = function (configuration?: Configurati
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 

+ 28 - 0
Web/src/api-services/apis/sys-wechat-api.ts

@@ -47,6 +47,13 @@ export const SysWechatApiAxiosParamCreator = function (configuration?: Configura
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 
@@ -88,6 +95,13 @@ export const SysWechatApiAxiosParamCreator = function (configuration?: Configura
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 
@@ -129,6 +143,13 @@ export const SysWechatApiAxiosParamCreator = function (configuration?: Configura
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 
@@ -174,6 +195,13 @@ export const SysWechatApiAxiosParamCreator = function (configuration?: Configura
             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;
+            }
 
             if (code !== undefined) {
                 localVarQueryParameter['Code'] = code;

+ 42 - 0
Web/src/api-services/apis/sys-wechat-pay-api.ts

@@ -47,6 +47,13 @@ export const SysWechatPayApiAxiosParamCreator = function (configuration?: Config
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 
@@ -87,6 +94,13 @@ export const SysWechatPayApiAxiosParamCreator = function (configuration?: Config
             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) {
@@ -129,6 +143,13 @@ export const SysWechatPayApiAxiosParamCreator = function (configuration?: Config
             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) {
@@ -165,6 +186,13 @@ export const SysWechatPayApiAxiosParamCreator = function (configuration?: Config
             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) {
@@ -202,6 +230,13 @@ export const SysWechatPayApiAxiosParamCreator = function (configuration?: Config
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 
@@ -243,6 +278,13 @@ export const SysWechatPayApiAxiosParamCreator = function (configuration?: Config
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 

+ 28 - 0
Web/src/api-services/apis/sys-wechat-user-api.ts

@@ -46,6 +46,13 @@ export const SysWechatUserApiAxiosParamCreator = function (configuration?: Confi
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 
@@ -87,6 +94,13 @@ export const SysWechatUserApiAxiosParamCreator = function (configuration?: Confi
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 
@@ -128,6 +142,13 @@ export const SysWechatUserApiAxiosParamCreator = function (configuration?: Confi
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 
@@ -169,6 +190,13 @@ export const SysWechatUserApiAxiosParamCreator = function (configuration?: Confi
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 

+ 42 - 0
Web/src/api-services/apis/sys-wx-open-api.ts

@@ -48,6 +48,13 @@ export const SysWxOpenApiAxiosParamCreator = function (configuration?: Configura
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 
@@ -89,6 +96,13 @@ export const SysWxOpenApiAxiosParamCreator = function (configuration?: Configura
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 
@@ -129,6 +143,13 @@ export const SysWxOpenApiAxiosParamCreator = function (configuration?: Configura
             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) {
@@ -170,6 +191,13 @@ export const SysWxOpenApiAxiosParamCreator = function (configuration?: Configura
             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;
+            }
 
             if (jsCode !== undefined) {
                 localVarQueryParameter['JsCode'] = jsCode;
@@ -211,6 +239,13 @@ export const SysWxOpenApiAxiosParamCreator = function (configuration?: Configura
             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;
+            }
 
             localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 
@@ -261,6 +296,13 @@ export const SysWxOpenApiAxiosParamCreator = function (configuration?: Configura
             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;
+            }
 
             if (code !== undefined) {
                 localVarQueryParameter['Code'] = code;

+ 4 - 4
Web/src/api-services/models/add-plugin-input.ts

@@ -61,17 +61,17 @@ export interface AddPluginInput {
      */
     tenantId?: number | null;
     /**
-     * 程序集名称
+     * C#代码
      * @type {string}
      * @memberof AddPluginInput
      */
-    assemblyName: string;
+    csharpCode: string;
     /**
-     * C#代码
+     * 程序集名称
      * @type {string}
      * @memberof AddPluginInput
      */
-    csharpCode: string;
+    assemblyName?: string | null;
     /**
      * 排序
      * @type {number}

+ 2 - 2
Web/src/api-services/models/add-tenant-input.ts

@@ -135,9 +135,9 @@ export interface AddTenantInput {
      */
     name: string;
     /**
-     * 管理员名称
+     * 租管账号
      * @type {string}
      * @memberof AddTenantInput
      */
-    adminName: string;
+    adminAccount: string;
 }

+ 4 - 4
Web/src/api-services/models/sys-plugin.ts

@@ -67,17 +67,17 @@ export interface SysPlugin {
      */
     name: string;
     /**
-     * 程序集名称
+     * C#代码
      * @type {string}
      * @memberof SysPlugin
      */
-    assemblyName: string;
+    csharpCode: string;
     /**
-     * C#代码
+     * 程序集名称
      * @type {string}
      * @memberof SysPlugin
      */
-    csharpCode: string;
+    assemblyName?: string | null;
     /**
      * 排序
      * @type {number}

+ 2 - 2
Web/src/api-services/models/tenant-output.ts

@@ -123,11 +123,11 @@ export interface TenantOutput {
      */
     name?: string | null;
     /**
-     * 管理员
+     * 管理员账号
      * @type {string}
      * @memberof TenantOutput
      */
-    adminName?: string | null;
+    adminAccount?: string | null;
     /**
      * 电子邮箱
      * @type {string}

+ 4 - 4
Web/src/api-services/models/update-plugin-input.ts

@@ -61,17 +61,17 @@ export interface UpdatePluginInput {
      */
     tenantId?: number | null;
     /**
-     * 程序集名称
+     * C#代码
      * @type {string}
      * @memberof UpdatePluginInput
      */
-    assemblyName: string;
+    csharpCode: string;
     /**
-     * C#代码
+     * 程序集名称
      * @type {string}
      * @memberof UpdatePluginInput
      */
-    csharpCode: string;
+    assemblyName?: string | null;
     /**
      * 排序
      * @type {number}

+ 2 - 2
Web/src/api-services/models/update-tenant-input.ts

@@ -135,9 +135,9 @@ export interface UpdateTenantInput {
      */
     name: string;
     /**
-     * 管理员名称
+     * 租管账号
      * @type {string}
      * @memberof UpdateTenantInput
      */
-    adminName: string;
+    adminAccount: string;
 }

+ 1 - 1
Web/src/layout/footer/index.vue

@@ -2,7 +2,7 @@
 	<div class="layout-footer pb15">
 		<div class="layout-footer-warp">
 			<div>Admin.NET</div>
-			<div class="mt5">Copyright © 2022 Dilon All rights reserved.</div>
+			<div class="mt5">Copyright © 2022 ZUOHUAIJUN All rights reserved.</div>
 		</div>
 	</div>
 </template>

+ 1 - 1
Web/src/stores/themeConfig.ts

@@ -18,7 +18,7 @@ export const useThemeConfig = defineStore('themeConfig', {
 			 * 全局主题
 			 */
 			// 默认 primary 主题颜色
-			primary: '#DE2910', // '#11559C', // '#03663D'
+			primary: '#DE2910', //红色:#DE2910 //蓝色:#11559C //绿色:#057748
 			// 是否开启深色模式
 			isIsDark: false,
 

+ 11 - 11
Web/src/theme/element.scss

@@ -278,23 +278,23 @@
 	overflow-y: auto;
 	overflow-x: auto;
 }
-.el-dialog__title{
-	font-size: 14px;
-	color: #FFF;
-	font-weight: 700;
-}
+// .el-dialog__title{
+// 	font-size: 14px;
+// 	color: #FFF;
+// 	font-weight: 700;
+// }
 .el-dialog__header {
-	margin-right: 0;
-	padding-top: 10px;
+	margin: 0;
+	// padding-top: 10px;
+	padding: 8px 0px 8px 20px;
 	background: var(--el-color-primary);
 }
 .el-dialog__footer {
-	border-top: 1px solid var(--el-color-info-light-7);
+	// border-top: 1px solid var(--el-color-info-light-7);
 	padding-bottom: 10px;
   }
 .el-dialog__headerbtn{
-	height: 32px;
-	font-weight: 900;
+	height: 28px;
 	.el-dialog__close{
 		color: #FFF;
 	}
@@ -316,7 +316,7 @@
 		padding: 0;
 	}
 	// 表头背景色
-	--el-table-header-bg-color: var(--el-table-tr-bg-color);
+	--el-table-header-bg-color: var(--next-bg-main-color);
 	// 表头字体颜色
 	thead {
 		color: var(--el-text-color-regular);	

+ 2 - 2
Web/src/views/system/codeGen/component/editCodeGenDialog.vue

@@ -1,13 +1,13 @@
 <template>
 	<div class="sys-editCodeGen-container">
-		<el-dialog v-model="state.isShowDialog" draggable width="700px">
+		<el-dialog v-model="state.isShowDialog" draggable :close-on-click-modal="false" width="700px">
 			<template #header>
 				<div style="color: #fff">
 					<el-icon size="16" style="margin-right: 3px; display: inline; vertical-align: middle"> <ele-Edit /> </el-icon>
 					<span> {{ props.title }} </span>
 				</div>
 			</template>
-			<el-form :model="state.ruleForm" ref="ruleFormRef" label-width="80px">
+			<el-form :model="state.ruleForm" ref="ruleFormRef" label-width="60px">
 				<el-row :gutter="35">
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
 						<el-form-item label="库定位器" prop="configId">

+ 11 - 5
Web/src/views/system/codeGen/component/fkDialog.vue

@@ -1,25 +1,31 @@
 <template>
 	<div class="sys-codeGenFk-container">
-		<el-dialog v-model="state.isShowDialog" title="外键配置" draggable width="600px" destroy-on-close>
-			<el-form :model="state.ruleForm" ref="ruleFormRef" label-width="100px">
+		<el-dialog v-model="state.isShowDialog" draggable :close-on-click-modal="false" width="700px" destroy-on-close>
+			<template #header>
+				<div style="color: #fff">
+					<el-icon size="16" style="margin-right: 3px; display: inline; vertical-align: middle"> <ele-Edit /> </el-icon>
+					<span> 外键配置</span>
+				</div>
+			</template>
+			<el-form :model="state.ruleForm" ref="ruleFormRef" label-width="60px">
 				<el-row :gutter="35">
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
 						<el-form-item label="库定位器" prop="configId">
-							<el-select clearable v-model="state.ruleForm.configId" placeholder="库名" filterable @change="DbChanged()">
+							<el-select clearable v-model="state.ruleForm.configId" placeholder="库名" filterable @change="DbChanged()" class="w100">
 								<el-option v-for="item in state.dbData" :key="item.configId" :label="item.configId" :value="item.configId" />
 							</el-select>
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
 						<el-form-item label="数据库表" prop="tableName">
-							<el-select v-model="state.ruleForm.tableName" class="m-2" filterable clearable @change="TableChanged()">
+							<el-select v-model="state.ruleForm.tableName" filterable clearable @change="TableChanged()" class="w100">
 								<el-option v-for="item in state.tableData" :key="item.entityName" :label="item.tableName" :value="item.tableName" />
 							</el-select>
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
 						<el-form-item label="显示字段" prop="columnName">
-							<el-select v-model="state.ruleForm.columnName">
+							<el-select v-model="state.ruleForm.columnName" class="w100">
 								<el-option v-for="item in state.columnData" :key="item.columnName" :label="item.columnName" :value="item.columnName" />
 							</el-select>
 						</el-form-item>

+ 17 - 11
Web/src/views/system/codeGen/component/genConfigDialog.vue

@@ -1,23 +1,29 @@
 <template>
 	<div class="sys-codeGenConfig-container">
-		<el-dialog v-model="state.isShowDialog" title="配置" draggable width="100%">
+		<el-dialog v-model="state.isShowDialog" draggable :close-on-click-modal="false" width="1400px">
+			<template #header>
+				<div style="color: #fff">
+					<el-icon size="16" style="margin-right: 3px; display: inline; vertical-align: middle"> <ele-Edit /> </el-icon>
+					<span> 生成配置</span>
+				</div>
+			</template>
 			<el-table :data="state.tableData" style="width: 100%" v-loading="state.loading" border>
 				<el-table-column type="index" label="序号" width="55" align="center" />
-				<el-table-column prop="columnName" label="字段" show-overflow-tooltip />
-				<el-table-column prop="columnComment" label="描述" show-overflow-tooltip>
+				<el-table-column prop="columnName" label="字段" width="180" show-overflow-tooltip />
+				<el-table-column prop="columnComment" label="描述" width="180" show-overflow-tooltip>
 					<template #default="scope">
 						<el-input v-model="scope.row.columnComment" autocomplete="off" />
 					</template>
 				</el-table-column>
-				<el-table-column prop="netType" label="数据类型" show-overflow-tooltip />
-				<el-table-column prop="effectType" label="作用类型" show-overflow-tooltip>
+				<el-table-column prop="netType" label="数据类型" minWidth="120" show-overflow-tooltip />
+				<el-table-column prop="effectType" label="作用类型" width="120" show-overflow-tooltip>
 					<template #default="scope">
 						<el-select v-model="scope.row.effectType" class="m-2" placeholder="Select" :disabled="judgeColumns(scope.row)" @change="effectTypeChange(scope.row, scope.$index)">
 							<el-option v-for="item in state.effectTypeList" :key="item.code" :label="item.value" :value="item.code" />
 						</el-select>
 					</template>
 				</el-table-column>
-				<el-table-column prop="dictTypeCode" label="字典" show-overflow-tooltip>
+				<el-table-column prop="dictTypeCode" label="字典" width="180" show-overflow-tooltip>
 					<template #default="scope">
 						<el-select v-model="scope.row.dictTypeCode" class="m-2" :disabled="effectTypeEnable(scope.row)">
 							<el-option v-for="item in state.dictTypeCodeList" :key="item.code" :label="item.name" :value="item.code" />
@@ -25,27 +31,27 @@
 					</template>
 				</el-table-column>
 
-				<el-table-column prop="whetherTable" label="列表显示" align="center" show-overflow-tooltip>
+				<el-table-column prop="whetherTable" label="列表显示" width="80" align="center" show-overflow-tooltip>
 					<template #default="scope">
 						<el-checkbox v-model="scope.row.whetherTable" />
 					</template>
 				</el-table-column>
-				<el-table-column prop="whetherAddUpdate" label="增改" align="center" show-overflow-tooltip>
+				<el-table-column prop="whetherAddUpdate" label="增改" width="80" align="center" show-overflow-tooltip>
 					<template #default="scope">
 						<el-checkbox v-model="scope.row.whetherAddUpdate" :disabled="judgeColumns(scope.row)" />
 					</template>
 				</el-table-column>
-				<el-table-column prop="whetherRequired" label="必填" align="center" show-overflow-tooltip>
+				<el-table-column prop="whetherRequired" label="必填" width="80" align="center" show-overflow-tooltip>
 					<template #default="scope">
 						<el-checkbox v-model="scope.row.whetherRequired" :disabled="judgeColumns(scope.row)" />
 					</template>
 				</el-table-column>
-				<el-table-column prop="queryWhether" label="是否是查询" align="center" show-overflow-tooltip>
+				<el-table-column prop="queryWhether" label="是否是查询" minWidth="80" align="center" show-overflow-tooltip>
 					<template #default="scope">
 						<el-switch v-model="scope.row.queryWhether" :active-value="true" :inactive-value="false" />
 					</template>
 				</el-table-column>
-				<el-table-column prop="queryType" label="查询方式" show-overflow-tooltip>
+				<el-table-column prop="queryType" label="查询方式" minWidth="120" align="center" show-overflow-tooltip>
 					<template #default="scope">
 						<el-select v-model="scope.row.queryType" class="m-2" placeholder="Select" :disabled="!scope.row.queryWhether">
 							<el-option v-for="item in state.queryTypeList" :key="item.code" :label="item.value" :value="item.code" />

+ 13 - 7
Web/src/views/system/codeGen/component/treeDialog.vue

@@ -1,39 +1,45 @@
 <template>
 	<div class="sys-codeGenTree-container">
-		<el-dialog v-model="state.isShowDialog" title="树选择配置" draggable width="600px">
-			<el-form :model="state.ruleForm" ref="ruleFormRef" label-width="100px">
+		<el-dialog v-model="state.isShowDialog" draggable :close-on-click-modal="false" width="700px">
+			<template #header>
+				<div style="color: #fff">
+					<el-icon size="16" style="margin-right: 3px; display: inline; vertical-align: middle"> <ele-Edit /> </el-icon>
+					<span> 树选择配置 </span>
+				</div>
+			</template>
+			<el-form :model="state.ruleForm" ref="ruleFormRef" label-width="75px">
 				<el-row :gutter="35">
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
 						<el-form-item label="库定位器" prop="configId">
-							<el-select clearable v-model="state.ruleForm.configId" placeholder="库名" filterable @change="DbChanged()">
+							<el-select clearable v-model="state.ruleForm.configId" placeholder="库名" filterable @change="DbChanged()" class="w100">
 								<el-option v-for="item in state.dbData" :key="item.configId" :label="item.configId" :value="item.configId" />
 							</el-select>
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
 						<el-form-item label="数据库表" prop="tableName">
-							<el-select v-model="state.ruleForm.tableName" class="m-2" filterable clearable @change="TableChanged()">
+							<el-select v-model="state.ruleForm.tableName" class="w100" filterable clearable @change="TableChanged()">
 								<el-option v-for="item in state.tableData" :key="item.entityName" :label="item.tableName" :value="item.tableName" />
 							</el-select>
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
 						<el-form-item label="显示字段" prop="displayColumn">
-							<el-select v-model="state.ruleForm.displayColumn">
+							<el-select v-model="state.ruleForm.displayColumn" class="w100">
 								<el-option v-for="item in state.columnData" :key="item.columnName" :label="item.columnName" :value="item.columnName" />
 							</el-select>
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
 						<el-form-item label="选择值字段" prop="valueColumn">
-							<el-select v-model="state.ruleForm.valueColumn">
+							<el-select v-model="state.ruleForm.valueColumn" class="w100">
 								<el-option v-for="item in state.columnData" :key="item.columnName" :label="item.columnName" :value="item.columnName" />
 							</el-select>
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
 						<el-form-item label="父级字段" prop="pidColumn">
-							<el-select v-model="state.ruleForm.pidColumn">
+							<el-select v-model="state.ruleForm.pidColumn" class="w100">
 								<el-option v-for="item in state.columnData" :key="item.columnName" :label="item.columnName" :value="item.columnName" />
 							</el-select>
 						</el-form-item>

+ 6 - 6
Web/src/views/system/codeGen/index.vue

@@ -23,12 +23,12 @@
 		<el-card class="full-table" shadow="hover" style="margin-top: 8px">
 			<el-table :data="state.tableData" style="width: 100%" v-loading="state.loading" border>
 				<el-table-column type="index" label="序号" width="55" align="center" />
-				<el-table-column prop="configId" label="库定位器" show-overflow-tooltip />
-				<el-table-column prop="tableName" label="表名称" show-overflow-tooltip />
-				<el-table-column prop="busName" label="业务名" show-overflow-tooltip />
-				<el-table-column prop="nameSpace" label="命名空间" show-overflow-tooltip />
-				<el-table-column prop="authorName" label="作者姓名" show-overflow-tooltip />
-				<el-table-column prop="generateType" label="生成方式" show-overflow-tooltip>
+				<el-table-column prop="configId" label="库定位器" align="center" show-overflow-tooltip />
+				<el-table-column prop="tableName" label="表名称" align="center" show-overflow-tooltip />
+				<el-table-column prop="busName" label="业务名" header-align="center" show-overflow-tooltip />
+				<el-table-column prop="nameSpace" label="命名空间" header-align="center" show-overflow-tooltip />
+				<el-table-column prop="authorName" label="作者姓名" align="center" show-overflow-tooltip />
+				<el-table-column prop="generateType" label="生成方式" align="center" show-overflow-tooltip>
 					<template #default="scope">
 						<el-tag v-if="scope.row.generateType == 100"> 下载压缩包 </el-tag>
 						<el-tag v-else-if="scope.row.generateType == 111"> 下载压缩包(前端) </el-tag>

+ 4 - 4
Web/src/views/system/config/component/editConfig.vue

@@ -1,13 +1,13 @@
 <template>
 	<div class="sys-config-container">
-		<el-dialog v-model="state.isShowDialog" draggable width="600px">
+		<el-dialog v-model="state.isShowDialog" draggable :close-on-click-modal="false" width="700px">
 			<template #header>
 				<div style="color: #fff">
 					<el-icon size="16" style="margin-right: 3px; display: inline; vertical-align: middle"> <ele-Edit /> </el-icon>
 					<span> {{ props.title }} </span>
 				</div>
 			</template>
-			<el-form :model="state.ruleForm" ref="ruleFormRef" label-width="80px">
+			<el-form :model="state.ruleForm" ref="ruleFormRef" label-width="70px">
 				<el-row :gutter="35">
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
 						<el-form-item label="配置名称" prop="name" :rules="[{ required: true, message: '配置名称不能为空', trigger: 'blur' }]">
@@ -21,7 +21,7 @@
 					</el-col>
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
 						<el-form-item label="值" prop="value" :rules="[{ required: true, message: '值不能为空', trigger: 'blur' }]">
-							<el-select v-model="state.ruleForm.value" placeholder="值" clearable filterable allow-create default-first-option style="width: 100%">
+							<el-select v-model="state.ruleForm.value" placeholder="值" clearable filterable allow-create default-first-option class="w100">
 								<el-option label="True" value="True" />
 								<el-option label="False" value="False" />
 							</el-select>
@@ -36,7 +36,7 @@
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
-						<el-form-item label="分组编码" prop="groupCode">
+						<el-form-item label="分组编码">
 							<el-input v-model="state.ruleForm.groupCode" placeholder="分组编码" clearable :disabled="state.ruleForm.sysFlag == 1" />
 						</el-form-item>
 					</el-col>

+ 6 - 6
Web/src/views/system/config/index.vue

@@ -51,14 +51,14 @@ const tb = reactive<TableDemoState>({
 	tableData: {
 		// 表头内容(必传,注意格式)
 		columns: [
-			{ prop: 'name', width: 200, label: '配置名称', align: 'left', sortable: 'custom', isCheck: true, hideCheck: true },
-			{ prop: 'code', width: 200, label: '配置编码', align: 'left', toolTip: true, sortable: 'custom', isCheck: true },
-			{ prop: 'value', width: 200, label: '属性值', align: 'left', isCheck: true },
+			{ prop: 'name', width: 200, label: '配置名称', headerAlign: 'center', sortable: 'custom', isCheck: true, hideCheck: true },
+			{ prop: 'code', width: 200, label: '配置编码', headerAlign: 'center', toolTip: true, sortable: 'custom', isCheck: true },
+			{ prop: 'value', width: 150, label: '属性值', headerAlign: 'center', isCheck: true },
 			{ prop: 'sysFlag', width: 100, label: '内置参数', align: 'center', isCheck: true },
-			{ prop: 'groupCode', width: 110, label: '分组编码', align: 'center', sortable: 'custom', isCheck: true },
+			{ prop: 'groupCode', width: 120, label: '分组编码', align: 'center', sortable: 'custom', isCheck: true },
 			{ prop: 'orderNo', width: 80, label: '排序', align: 'center', sortable: 'custom', isCheck: true },
 			{ prop: 'remark', label: '备注', align: '', headerAlign: 'center', showOverflowTooltip: true, isCheck: true },
-			{ prop: 'action', width: 130, label: '操作', type: 'action', align: 'center', isCheck: true, fixed: 'right', hideCheck: true },
+			{ prop: 'action', width: 140, label: '操作', type: 'action', align: 'center', isCheck: true, fixed: 'right', hideCheck: true },
 		],
 		// 配置项(必传)
 		config: {
@@ -67,7 +67,7 @@ const tb = reactive<TableDemoState>({
 			isSerialNo: true, // 是否显示表格序号
 			isSelection: true, // 是否勾选表格多选
 			showSelection: auth('sysConfig:batchDelete'), //是否显示表格多选
-			pageSize: 10, // 每页条数
+			pageSize: 20, // 每页条数
 			hideExport: false, //是否隐藏导出按钮
 			exportFileName: '系统参数', //导出报表的文件名,不填写取应用名称
 		},

+ 12 - 12
Web/src/views/system/database/component/addColumn.vue

@@ -1,13 +1,13 @@
 <template>
 	<div class="sys-dbColumn-container">
-		<el-dialog v-model="state.isShowDialog" draggable :close-on-click-modal="false" width="500px">
+		<el-dialog v-model="state.isShowDialog" draggable :close-on-click-modal="false" width="700px">
 			<template #header>
 				<div style="color: #fff">
 					<el-icon size="16" style="margin-right: 3px; display: inline; vertical-align: middle"> <ele-Edit /> </el-icon>
 					<span> 增加列 </span>
 				</div>
 			</template>
-			<el-form :model="state.ruleForm" ref="ruleFormRef" label-width="60px">
+			<el-form :model="state.ruleForm" ref="ruleFormRef" label-width="50px">
 				<el-row :gutter="35">
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
 						<el-form-item label="列名" prop="dbColumnName" :rules="[{ required: true, message: '名称不能为空', trigger: 'blur' }]">
@@ -20,40 +20,40 @@
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
-						<el-form-item label="主键" prop="isPrimarykey">
-							<el-select v-model="state.ruleForm.isPrimarykey">
+						<el-form-item label="主键">
+							<el-select v-model="state.ruleForm.isPrimarykey" class="w100">
 								<el-option v-for="item in yesNoSelect" :key="item.value" :label="item.label" :value="item.value" />
 							</el-select>
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
-						<el-form-item label="自增" prop="isIdentity">
-							<el-select v-model="state.ruleForm.isIdentity" class="m-2">
+						<el-form-item label="自增">
+							<el-select v-model="state.ruleForm.isIdentity" class="w100">
 								<el-option v-for="item in yesNoSelect" :key="item.value" :label="item.label" :value="item.value" />
 							</el-select>
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
-						<el-form-item label="类型" prop="dataType">
-							<el-select v-model="state.ruleForm.dataType">
+						<el-form-item label="类型">
+							<el-select v-model="state.ruleForm.dataType" class="w100">
 								<el-option v-for="item in dataTypeList" :key="item.value" :label="item.value" :value="item.value" />
 							</el-select>
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
-						<el-form-item label="可空" prop="isNullable">
-							<el-select v-model="state.ruleForm.isNullable">
+						<el-form-item label="可空">
+							<el-select v-model="state.ruleForm.isNullable" class="w100">
 								<el-option v-for="item in yesNoSelect" :key="item.value" :label="item.label" :value="item.value" />
 							</el-select>
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
-						<el-form-item label="长度" prop="length">
+						<el-form-item label="长度">
 							<el-input-number v-model="state.ruleForm.length" class="w100" controls-position="right" />
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
-						<el-form-item label="小数位" prop="decimalDigits">
+						<el-form-item label="小数位">
 							<el-input-number v-model="state.ruleForm.decimalDigits" class="w100" controls-position="right" />
 						</el-form-item>
 					</el-col>

+ 12 - 12
Web/src/views/system/database/component/addTable.vue

@@ -8,7 +8,7 @@
 				</div>
 			</template>
 			<el-divider content-position="left">数据表信息</el-divider>
-			<el-form :model="state.ruleForm" ref="ruleFormRef" label-width="80px">
+			<el-form :model="state.ruleForm" ref="ruleFormRef" label-width="60px">
 				<el-row :gutter="35">
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
 						<el-form-item label="表名称" prop="tableName" :rules="[{ required: true, message: '名称不能为空', trigger: 'blur' }]">
@@ -24,55 +24,55 @@
 			</el-form>
 			<el-divider content-position="left">数据列信息</el-divider>
 			<el-table :data="state.tableData" style="width: 100%" max-height="400">
-				<el-table-column fixed prop="dbColumnName" label="字段名" width="200">
+				<el-table-column prop="dbColumnName" label="字段名" width="220" fixed>
 					<template #default="scope">
 						<el-input v-model="scope.row.dbColumnName" autocomplete="off" />
 					</template>
 				</el-table-column>
-				<el-table-column prop="columnDescription" label="描述" width="200">
+				<el-table-column prop="columnDescription" label="描述" width="220">
 					<template #default="scope">
 						<el-input v-model="scope.row.columnDescription" autocomplete="off" />
 					</template>
 				</el-table-column>
-				<el-table-column prop="isPrimarykey" label="主键">
+				<el-table-column prop="isPrimarykey" label="主键" width="100">
 					<template #default="scope">
 						<el-select v-model="scope.row.isPrimarykey" class="m-2" placeholder="Select">
 							<el-option v-for="item in yesNoSelect" :key="item.value" :label="item.label" :value="item.value" />
 						</el-select>
 					</template>
 				</el-table-column>
-				<el-table-column prop="isIdentity" label="自增">
+				<el-table-column prop="isIdentity" label="自增" width="100">
 					<template #default="scope">
 						<el-select v-model="scope.row.isIdentity" class="m-2" placeholder="Select">
 							<el-option v-for="item in yesNoSelect" :key="item.value" :label="item.label" :value="item.value" />
 						</el-select>
 					</template>
 				</el-table-column>
-				<el-table-column prop="dataType" label="类型">
+				<el-table-column prop="dataType" label="类型" width="150">
 					<template #default="scope">
 						<el-select v-model="scope.row.dataType" class="m-2" placeholder="Select">
 							<el-option v-for="item in dataTypeList" :key="item.value" :label="item.value" :value="item.value" />
 						</el-select>
 					</template>
 				</el-table-column>
-				<el-table-column prop="isNullable" label="可空">
+				<el-table-column prop="isNullable" label="可空" width="100">
 					<template #default="scope">
 						<el-select v-model="scope.row.isNullable" class="m-2" placeholder="Select">
 							<el-option v-for="item in yesNoSelect" :key="item.value" :label="item.label" :value="item.value" />
 						</el-select>
 					</template>
 				</el-table-column>
-				<el-table-column prop="length" label="长度">
+				<el-table-column prop="length" label="长度" width="100">
 					<template #default="scope">
-						<el-input-number v-model="scope.row.length" controls-position="right" />
+						<el-input-number v-model="scope.row.length" controls-position="right" class="w100" />
 					</template>
 				</el-table-column>
-				<el-table-column prop="decimalDigits" label="小数位">
+				<el-table-column prop="decimalDigits" label="小数位" width="100">
 					<template #default="scope">
-						<el-input-number v-model="scope.row.decimalDigits" controls-position="right" />
+						<el-input-number v-model="scope.row.decimalDigits" controls-position="right" class="w100" />
 					</template>
 				</el-table-column>
-				<el-table-column fixed="right" label="操作" align="center" width="200">
+				<el-table-column label="操作" minWidth="200" align="center" fixed="right">
 					<template #default="scope">
 						<el-button link type="primary" icon="el-icon-delete" @click.prevent="handleColDelete(scope.$index)">删除</el-button>
 						<el-button v-if="state.tableData.length > 1" link type="primary" icon="ele-Top" @click.prevent="handleColUp(scope.row, scope.$index)">上移</el-button>

+ 1 - 1
Web/src/views/system/database/component/editColumn.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="sys-dbColumn-container">
-		<el-dialog v-model="state.isShowDialog" draggable width="500px">
+		<el-dialog v-model="state.isShowDialog" draggable :close-on-click-modal="false" width="700px">
 			<template #header>
 				<div style="color: #fff">
 					<el-icon size="16" style="margin-right: 3px; display: inline; vertical-align: middle"> <ele-Edit /> </el-icon>

+ 1 - 1
Web/src/views/system/database/component/editTable.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="sys-dbTable-container">
-		<el-dialog v-model="state.isShowDialog" draggable width="500px">
+		<el-dialog v-model="state.isShowDialog" draggable :close-on-click-modal="false" width="700px">
 			<template #header>
 				<div style="color: #fff">
 					<el-icon size="16" style="margin-right: 3px; display: inline; vertical-align: middle"> <ele-Edit /> </el-icon>

+ 2 - 2
Web/src/views/system/database/component/genEntity.vue

@@ -1,13 +1,13 @@
 <template>
 	<div class="sys-dbEntity-container">
-		<el-dialog v-model="state.isShowDialog" draggable width="500px">
+		<el-dialog v-model="state.isShowDialog" draggable :close-on-click-modal="false" width="700px">
 			<template #header>
 				<div style="color: #fff">
 					<el-icon size="16" style="margin-right: 3px; display: inline; vertical-align: middle"> <ele-Cpu /> </el-icon>
 					<span> 生成实体 </span>
 				</div>
 			</template>
-			<el-form :model="state.ruleForm" ref="ruleFormRef" label-width="80px">
+			<el-form :model="state.ruleForm" ref="ruleFormRef" label-width="60px">
 				<el-row :gutter="35">
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
 						<el-form-item label="表名" prop="tableName" :rules="[{ required: true, message: '表名不能为空', trigger: 'blur' }]">

+ 6 - 6
Web/src/views/system/database/index.vue

@@ -2,12 +2,12 @@
 	<div class="sys-database-container">
 		<el-card shadow="hover" :body-style="{ paddingBottom: '0' }">
 			<el-form :model="state.queryParams" ref="queryForm" :inline="true" v-loading="state.loading">
-				<el-form-item label="库名" prop="configId">
+				<el-form-item label="库名">
 					<el-select v-model="state.configId" placeholder="库名" filterable @change="handleQueryTable">
 						<el-option v-for="item in state.dbData" :key="item" :label="item" :value="item" />
 					</el-select>
 				</el-form-item>
-				<el-form-item label="表名" prop="tableName">
+				<el-form-item label="表名">
 					<el-select v-model="state.tableName" placeholder="表名" filterable clearable @change="handleQueryColumn">
 						<el-option v-for="item in state.tableData" :key="item.name" :label="item.name + '[' + item.description + ']'" :value="item.name" />
 					</el-select>
@@ -25,8 +25,8 @@
 		<el-card class="full-table" shadow="hover" style="margin-top: 8px">
 			<el-table :data="state.columnData" style="width: 100%" v-loading="state.loading1" border>
 				<el-table-column type="index" label="序号" width="55" align="center" />
-				<el-table-column prop="dbColumnName" label="字段名" show-overflow-tooltip />
-				<el-table-column prop="dataType" label="数据类型" show-overflow-tooltip />
+				<el-table-column prop="dbColumnName" label="字段名" align="center" show-overflow-tooltip />
+				<el-table-column prop="dataType" label="数据类型" align="center" show-overflow-tooltip />
 				<el-table-column prop="isPrimarykey" label="主键" width="70" align="center" show-overflow-tooltip>
 					<template #default="scope">
 						<el-tag type="success" v-if="scope.row.isPrimarykey === true">是</el-tag>
@@ -47,8 +47,8 @@
 				</el-table-column>
 				<el-table-column prop="length" label="长度" width="70" align="center" show-overflow-tooltip />
 				<el-table-column prop="decimalDigits" label="精度" width="70" align="center" show-overflow-tooltip />
-				<el-table-column prop="defaultValue" label="默认值" show-overflow-tooltip />
-				<el-table-column prop="columnDescription" label="描述" show-overflow-tooltip />
+				<el-table-column prop="defaultValue" label="默认值" align="center" show-overflow-tooltip />
+				<el-table-column prop="columnDescription" label="描述" header-align="center" show-overflow-tooltip />
 				<el-table-column label="操作" width="140" fixed="right" align="center" show-overflow-tooltip>
 					<template #default="scope">
 						<el-button icon="ele-Edit" size="small" text type="primary" @click="openEditColumn(scope.row)"> 编辑 </el-button>

+ 10 - 10
Web/src/views/system/dict/component/dictDataDialog.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="sys-dictData-container">
-		<el-dialog v-model="state.isShowDialog" draggable width="850px">
+		<el-dialog v-model="state.isShowDialog" draggable :close-on-click-modal="false" width="900px">
 			<template #header>
 				<div style="color: #fff">
 					<el-icon size="16" style="margin-right: 3px; display: inline; vertical-align: middle"> <ele-Edit /> </el-icon>
@@ -9,11 +9,11 @@
 			</template>
 			<el-card shadow="hover" :body-style="{ paddingBottom: '0' }">
 				<el-form :model="state.queryParams" ref="queryForm" :inline="true">
-					<el-form-item label="字典值" prop="value">
-						<el-input placeholder="字典值" @keyup.enter="handleQuery" v-model="state.queryParams.value" />
+					<el-form-item label="字典值">
+						<el-input v-model="state.queryParams.value" placeholder="字典值" />
 					</el-form-item>
-					<el-form-item label="编码" prop="code">
-						<el-input placeholder="编码" @keyup.enter="handleQuery" v-model="state.queryParams.code" />
+					<el-form-item label="编码">
+						<el-input v-model="state.queryParams.code" placeholder="编码" />
 					</el-form-item>
 					<el-form-item>
 						<el-button-group>
@@ -30,8 +30,8 @@
 			<el-card class="full-table" shadow="hover" style="margin-top: 8px">
 				<el-table :data="state.dictDataData" style="width: 100%" v-loading="state.loading" border>
 					<el-table-column type="index" label="序号" width="55" align="center" />
-					<el-table-column prop="value" label="字典值" show-overflow-tooltip />
-					<el-table-column prop="code" label="编码" show-overflow-tooltip />
+					<el-table-column prop="value" label="字典值" header-align="center" show-overflow-tooltip />
+					<el-table-column prop="code" label="编码" header-align="center" show-overflow-tooltip />
 					<el-table-column prop="status" label="状态" width="70" align="center" show-overflow-tooltip>
 						<template #default="scope">
 							<el-tag type="success" v-if="scope.row.status === 1">启用</el-tag>
@@ -39,8 +39,8 @@
 						</template>
 					</el-table-column>
 					<el-table-column prop="orderNo" label="排序" width="70" align="center" show-overflow-tooltip />
-					<el-table-column prop="createTime" label="修改时间" align="center" show-overflow-tooltip />
-					<el-table-column prop="remark" label="备注" show-overflow-tooltip />
+					<el-table-column prop="createTime" label="修改时间" width="130" align="center" show-overflow-tooltip />
+					<el-table-column prop="remark" label="备注" header-align="center" show-overflow-tooltip />
 					<el-table-column label="操作" width="140" fixed="right" align="center" show-overflow-tooltip>
 						<template #default="scope">
 							<el-button icon="ele-Edit" size="small" text type="primary" @click="openEditDictData(scope.row)"> 编辑 </el-button>
@@ -87,7 +87,7 @@ const state = reactive({
 	},
 	tableParams: {
 		page: 1,
-		pageSize: 10,
+		pageSize: 20,
 		total: 0 as any,
 	},
 	editDictDataTitle: '',

+ 2 - 2
Web/src/views/system/dict/component/editDictData.vue

@@ -1,13 +1,13 @@
 <template>
 	<div class="sys-dictData-container">
-		<el-dialog v-model="state.isShowDialog" draggable width="600px">
+		<el-dialog v-model="state.isShowDialog" draggable :close-on-click-modal="false" width="700px">
 			<template #header>
 				<div style="color: #fff">
 					<el-icon size="16" style="margin-right: 3px; display: inline; vertical-align: middle"> <ele-Edit /> </el-icon>
 					<span> {{ props.title }} </span>
 				</div>
 			</template>
-			<el-form :model="state.ruleForm" ref="ruleFormRef" label-width="80px">
+			<el-form :model="state.ruleForm" ref="ruleFormRef" label-width="70px">
 				<el-row :gutter="35">
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
 						<el-form-item label="字典值" prop="value" :rules="[{ required: true, message: '字典值不能为空', trigger: 'blur' }]">

+ 2 - 2
Web/src/views/system/dict/component/editDictType.vue

@@ -1,13 +1,13 @@
 <template>
 	<div class="sys-dictType-container">
-		<el-dialog v-model="state.isShowDialog" draggable width="600px">
+		<el-dialog v-model="state.isShowDialog" draggable :close-on-click-modal="false" width="700px">
 			<template #header>
 				<div style="color: #fff">
 					<el-icon size="16" style="margin-right: 3px; display: inline; vertical-align: middle"> <ele-Edit /> </el-icon>
 					<span> {{ props.title }} </span>
 				</div>
 			</template>
-			<el-form :model="state.ruleForm" ref="ruleFormRef" label-width="80px">
+			<el-form :model="state.ruleForm" ref="ruleFormRef" label-width="70px">
 				<el-row :gutter="35">
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
 						<el-form-item label="字典名称" prop="name" :rules="[{ required: true, message: '字典名称不能为空', trigger: 'blur' }]">

+ 9 - 9
Web/src/views/system/dict/index.vue

@@ -2,11 +2,11 @@
 	<div class="sys-dict-container">
 		<el-card shadow="hover" :body-style="{ paddingBottom: '0' }">
 			<el-form :model="state.queryParams" ref="queryForm" :inline="true">
-				<el-form-item label="字典名称" prop="name">
-					<el-input placeholder="字典名称" clearable @keyup.enter="handleQuery" v-model="state.queryParams.name" />
+				<el-form-item label="字典名称">
+					<el-input v-model="state.queryParams.name" placeholder="字典名称" clearable />
 				</el-form-item>
-				<el-form-item label="字典编码" prop="code">
-					<el-input placeholder="字典编码" clearable @keyup.enter="handleQuery" v-model="state.queryParams.code" />
+				<el-form-item label="字典编码">
+					<el-input v-model="state.queryParams.code" placeholder="字典编码" clearable />
 				</el-form-item>
 				<el-form-item>
 					<el-button-group>
@@ -23,8 +23,8 @@
 		<el-card class="full-table" shadow="hover" style="margin-top: 8px">
 			<el-table :data="state.dictTypeData" style="width: 100%" v-loading="state.loading" border>
 				<el-table-column type="index" label="序号" width="55" align="center" />
-				<el-table-column prop="name" label="字典名称" show-overflow-tooltip />
-				<el-table-column prop="code" label="字典编码" show-overflow-tooltip />
+				<el-table-column prop="name" label="字典名称" header-align="center" show-overflow-tooltip />
+				<el-table-column prop="code" label="字典编码" header-align="center" show-overflow-tooltip />
 				<el-table-column prop="status" label="状态" width="70" align="center" show-overflow-tooltip>
 					<template #default="scope">
 						<el-tag type="success" v-if="scope.row.status === 1">启用</el-tag>
@@ -33,8 +33,8 @@
 				</el-table-column>
 				<el-table-column prop="orderNo" label="排序" width="70" align="center" show-overflow-tooltip />
 				<el-table-column prop="createTime" label="修改时间" align="center" show-overflow-tooltip />
-				<el-table-column prop="remark" label="备注" show-overflow-tooltip />
-				<el-table-column label="操作" width="210" fixed="right" align="center" show-overflow-tooltip>
+				<el-table-column prop="remark" label="备注" header-align="center" show-overflow-tooltip />
+				<el-table-column label="操作" width="200" fixed="right" align="center" show-overflow-tooltip>
 					<template #default="scope">
 						<el-button icon="ele-Edit" size="small" text type="primary" @click="openEditDictType(scope.row)" v-auth="'sysDictType:update'"> 编辑 </el-button>
 						<el-button icon="ele-Memo" size="small" text type="primary" @click="openDictDataDialog(scope.row)" v-auth="'sysDictType:page'"> 字典 </el-button>
@@ -81,7 +81,7 @@ const state = reactive({
 	},
 	tableParams: {
 		page: 1,
-		pageSize: 10,
+		pageSize: 20,
 		total: 0 as any,
 	},
 	editDictTypeTitle: '',

+ 2 - 2
Web/src/views/system/file/index.vue

@@ -3,7 +3,7 @@
 		<el-card shadow="hover" :body-style="{ paddingBottom: '0' }">
 			<el-form :model="state.queryParams" ref="queryForm" :inline="true">
 				<el-form-item label="文件名称" prop="fileName">
-					<el-input placeholder="文件名称" clearable @keyup.enter="handleQuery" v-model="state.queryParams.fileName" />
+					<el-input v-model="state.queryParams.fileName" placeholder="文件名称" clearable />
 				</el-form-item>
 				<el-form-item label="开始时间" prop="name">
 					<el-date-picker v-model="state.queryParams.startTime" type="datetime" placeholder="开始时间" value-format="YYYY-MM-DD HH:mm:ss" />
@@ -26,7 +26,7 @@
 		<el-card class="full-table" shadow="hover" style="margin-top: 8px">
 			<el-table :data="state.fileData" style="width: 100%" v-loading="state.loading" border>
 				<el-table-column type="index" label="序号" width="55" align="center" />
-				<el-table-column prop="fileName" label="名称" />
+				<el-table-column prop="fileName" label="名称" header-align="center" show-overflow-tooltip />
 				<el-table-column prop="suffix" label="后缀" align="center" show-overflow-tooltip>
 					<template #default="scope">
 						<el-tag round>{{ scope.row.suffix }}</el-tag>

+ 10 - 10
Web/src/views/system/job/component/editJobDetail.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="sys-jobDetail-container">
-		<el-dialog v-model="state.isShowDialog" draggable :close-on-click-modal="false" width="800px">
+		<el-dialog v-model="state.isShowDialog" draggable :close-on-click-modal="false" width="900px">
 			<template #header>
 				<div style="color: #fff">
 					<el-icon size="16" style="margin-right: 3px; display: inline; vertical-align: middle"> <ele-Edit /> </el-icon>
@@ -9,7 +9,7 @@
 			</template>
 			<el-tabs v-model="state.selectedTabName">
 				<el-tab-pane label="作业信息">
-					<el-form :model="state.ruleForm" ref="ruleFormRef" label-width="130px">
+					<el-form :model="state.ruleForm" ref="ruleFormRef" label-width="90px">
 						<el-row :gutter="35">
 							<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
 								<el-form-item label="作业编号" prop="jobId" :rules="[{ required: true, message: '作业编号不能为空', trigger: 'blur' }]">
@@ -22,7 +22,7 @@
 								</el-form-item>
 							</el-col>
 							<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
-								<el-form-item label="创建类型" prop="createType">
+								<el-form-item label="创建类型">
 									<el-radio-group v-model="state.ruleForm.createType" :disabled="isEdit">
 										<el-radio :label="JobCreateTypeEnum.NUMBER_0" v-show="isEdit">内置</el-radio>
 										<el-radio :label="JobCreateTypeEnum.NUMBER_1">脚本</el-radio>
@@ -31,7 +31,7 @@
 								</el-form-item>
 							</el-col>
 							<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
-								<el-form-item label="执行方式" prop="concurrent">
+								<el-form-item label="执行方式">
 									<el-radio-group v-model="state.ruleForm.concurrent">
 										<el-radio :label="true">并行</el-radio>
 										<el-radio :label="false">串行</el-radio>
@@ -42,7 +42,7 @@
 								<el-form-item prop="includeAnnotations">
 									<template v-slot:label>
 										<div>
-											扫描特性触发器
+											扫描触发器
 											<el-tooltip raw-content content="此参数只在新增作业时生效<br/>扫描定义在作业上的触发器" placement="top">
 												<SvgIcon name="fa fa-question-circle-o" :size="16" style="vertical-align: middle" />
 											</el-tooltip>
@@ -55,22 +55,22 @@
 								</el-form-item>
 							</el-col>
 							<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
-								<el-form-item label="描述信息" prop="description">
+								<el-form-item label="描述信息">
 									<el-input v-model="state.ruleForm.description" placeholder="描述信息" clearable type="textarea" :autosize="{ minRows: 1, maxRows: 3 }" />
 								</el-form-item>
 							</el-col>
 							<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20" v-if="!isHttpCreateType">
-								<el-form-item label="额外数据" prop="properties">
+								<el-form-item label="额外数据">
 									<el-input v-model="state.ruleForm.properties" placeholder="额外数据" clearable type="textarea" :autosize="{ minRows: 3, maxRows: 6 }" />
 								</el-form-item>
 							</el-col>
 							<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20" v-if="isHttpCreateType">
-								<el-form-item label="请求地址" prop="requestUri">
+								<el-form-item label="请求地址">
 									<el-input v-model="state.httpJobMessage.requestUri" placeholder="请求地址" clearable />
 								</el-form-item>
 							</el-col>
 							<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20" v-if="isHttpCreateType">
-								<el-form-item label="请求方法" prop="httpMethod">
+								<el-form-item label="请求方法">
 									<el-radio-group v-model="state.httpJobMessage.httpMethod">
 										<el-radio :label="httpMethodDef.get">Get</el-radio>
 										<el-radio :label="httpMethodDef.post">Post</el-radio>
@@ -80,7 +80,7 @@
 								</el-form-item>
 							</el-col>
 							<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20" v-if="isHttpCreateType">
-								<el-form-item label="请求报文体" prop="body">
+								<el-form-item label="请求报文体">
 									<el-input v-model="state.httpJobMessage.body" placeholder="请求报文体" clearable type="textarea" :autosize="{ minRows: 3, maxRows: 6 }" />
 								</el-form-item>
 							</el-col>

+ 2 - 2
Web/src/views/system/job/component/editJobTrigger.vue

@@ -1,13 +1,13 @@
 <template>
 	<div class="sys-jobTrigger-container">
-		<el-dialog v-model="state.isShowDialog" draggable :close-on-click-modal="false" width="800px">
+		<el-dialog v-model="state.isShowDialog" draggable :close-on-click-modal="false" width="700px">
 			<template #header>
 				<div style="color: #fff">
 					<el-icon size="16" style="margin-right: 3px; display: inline; vertical-align: middle"> <ele-Edit /> </el-icon>
 					<span> {{ props.title }} </span>
 				</div>
 			</template>
-			<el-form :model="state.ruleForm" ref="ruleFormRef" label-width="130px">
+			<el-form :model="state.ruleForm" ref="ruleFormRef" label-width="105px">
 				<el-row :gutter="35">
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
 						<el-form-item label="触发器编号" prop="triggerId" :rules="[{ required: true, message: '触发器编号不能为空', trigger: 'blur' }]">

+ 16 - 16
Web/src/views/system/job/component/jobCluster.vue

@@ -1,21 +1,21 @@
 <template>
 	<div class="sys-jobCluster-container">
-		<el-drawer v-model="state.isVisible" title="作业集群" size="30%">
-			<el-card shadow="hover" style="margin: 8px">
-				<el-table :data="state.jobClusterList" style="width: 100%" v-loading="state.loading" border>
-					<el-table-column type="index" label="序号" width="55" align="center" />
-					<el-table-column prop="clusterId" label="集群编号" show-overflow-tooltip />
-					<el-table-column prop="status" label="状态" align="center" show-overflow-tooltip>
-						<template #default="scope">
-							<el-tag v-if="scope.row.status == 0"> 宕机 </el-tag>
-							<el-tag v-if="scope.row.status == 1"> 工作中 </el-tag>
-							<el-tag v-if="scope.row.status == 2"> 等待被唤醒 </el-tag>
-						</template>
-					</el-table-column>
-					<el-table-column prop="description" label="描述" show-overflow-tooltip />
-					<el-table-column prop="updatedTime " label="更新时间" show-overflow-tooltip />
-				</el-table>
-			</el-card>
+		<el-drawer v-model="state.isVisible" title="作业集群" size="40%">
+			<!-- <el-card shadow="hover" style="margin: 8px"> -->
+			<el-table :data="state.jobClusterList" style="width: 100%; margin: 8px" v-loading="state.loading" border>
+				<el-table-column type="index" label="序号" width="55" align="center" />
+				<el-table-column prop="clusterId" label="集群编号" header-align="center" show-overflow-tooltip />
+				<el-table-column prop="status" label="状态" align="center" show-overflow-tooltip>
+					<template #default="scope">
+						<el-tag v-if="scope.row.status == 0"> 宕机 </el-tag>
+						<el-tag v-if="scope.row.status == 1"> 工作中 </el-tag>
+						<el-tag v-if="scope.row.status == 2"> 等待被唤醒 </el-tag>
+					</template>
+				</el-table-column>
+				<el-table-column prop="description" label="描述" header-align="center" show-overflow-tooltip />
+				<el-table-column prop="updatedTime " label="更新时间" align="center" show-overflow-tooltip />
+			</el-table>
+			<!-- </el-card> -->
 		</el-drawer>
 	</div>
 </template>

+ 19 - 19
Web/src/views/system/job/index.vue

@@ -2,11 +2,11 @@
 	<div class="sys-job-container">
 		<el-card shadow="hover" :body-style="{ paddingBottom: '0' }">
 			<el-form :model="state.queryParams" ref="queryForm" :inline="true">
-				<el-form-item label="作业编号" prop="jobId">
-					<el-input placeholder="作业编号" clearable @keyup.enter="handleQuery" v-model="state.queryParams.jobId" />
+				<el-form-item label="作业编号">
+					<el-input v-model="state.queryParams.jobId" placeholder="作业编号" clearable />
 				</el-form-item>
-				<el-form-item label="描述信息" prop="description">
-					<el-input placeholder="描述信息" clearable @keyup.enter="handleQuery" v-model="state.queryParams.description" />
+				<el-form-item label="描述信息">
+					<el-input v-model="state.queryParams.description" placeholder="描述信息" clearable />
 				</el-form-item>
 				<el-form-item>
 					<el-button-group>
@@ -46,12 +46,12 @@
 					<template #default="scope">
 						<el-table style="margin-left: 48px; width: calc(100% - 48px)" :data="(scope.row as JobOutput).jobTriggers" border size="small">
 							<el-table-column type="index" label="序号" width="55" align="center" fixed />
-							<el-table-column prop="triggerId" label="触发器编号" width="120" fixed show-overflow-tooltip />
-							<el-table-column prop="triggerType" label="类型" show-overflow-tooltip />
+							<el-table-column prop="triggerId" label="触发器编号" width="120" header-align="center" fixed show-overflow-tooltip />
+							<el-table-column prop="triggerType" label="类型" header-align="center" show-overflow-tooltip />
 							<!-- <el-table-column prop="assemblyName" label="程序集" show-overflow-tooltip /> -->
-							<el-table-column prop="args" label="参数" show-overflow-tooltip />
-							<el-table-column prop="description" label="描述" width="120" show-overflow-tooltip />
-							<el-table-column prop="status" label="状态" width="100" align="center" show-overflow-tooltip>
+							<el-table-column prop="args" label="参数" header-align="center" show-overflow-tooltip />
+							<el-table-column prop="description" label="描述" width="120" header-align="center" show-overflow-tooltip />
+							<el-table-column prop="status" label="状态" width="80" align="center" show-overflow-tooltip>
 								<template #default="scope">
 									<el-tag type="warning" effect="plain" v-if="(scope.row as SysJobTrigger).status == 0"> 积压 </el-tag>
 									<el-tag type="" effect="plain" v-if="(scope.row as SysJobTrigger).status == 1"> 就绪 </el-tag>
@@ -70,8 +70,8 @@
 							</el-table-column>
 							<el-table-column prop="startTime" label="起始时间" width="100" align="center" show-overflow-tooltip />
 							<el-table-column prop="endTime" label="结束时间" width="100" align="center" show-overflow-tooltip />
-							<el-table-column prop="lastRunTime" label="最近运行时间" width="140" align="center" show-overflow-tooltip />
-							<el-table-column prop="nextRunTime" label="下一次运行时间" width="140" align="center" show-overflow-tooltip />
+							<el-table-column prop="lastRunTime" label="最近运行时间" width="130" align="center" show-overflow-tooltip />
+							<el-table-column prop="nextRunTime" label="下一次运行时间" width="130" align="center" show-overflow-tooltip />
 							<el-table-column prop="numberOfRuns" label="触发次数" width="100" align="center" show-overflow-tooltip />
 							<el-table-column prop="maxNumberOfRuns" label="最大触发次数" width="120" align="center" show-overflow-tooltip />
 							<el-table-column prop="numberOfErrors" label="出错次数" width="100" align="center" show-overflow-tooltip />
@@ -96,7 +96,7 @@
 									<el-tag type="info" v-else> 否 </el-tag>
 								</template>
 							</el-table-column>
-							<el-table-column prop="updatedTime" label="更新时间" width="140" align="center" show-overflow-tooltip />
+							<el-table-column prop="updatedTime" label="更新时间" width="130" align="center" show-overflow-tooltip />
 							<el-table-column label="操作" width="140" align="center" show-overflow-tooltip fixed="right">
 								<template #default="scope">
 									<el-tooltip content="启动触发器">
@@ -117,7 +117,7 @@
 					</template>
 				</el-table-column>
 				<el-table-column type="index" label="序号" width="55" align="center" fixed />
-				<el-table-column prop="jobDetail.jobId" label="作业编号" width="180" fixed>
+				<el-table-column prop="jobDetail.jobId" label="作业编号" width="180" header-align="center" fixed>
 					<template #default="scope">
 						<div style="display: flex; align-items: center">
 							<el-icon><timer /></el-icon>
@@ -125,10 +125,10 @@
 						</div>
 					</template>
 				</el-table-column>
-				<el-table-column prop="jobDetail.groupName" label="组名称" width="100" show-overflow-tooltip />
-				<el-table-column prop="jobDetail.jobType" label="类型" show-overflow-tooltip />
+				<el-table-column prop="jobDetail.groupName" label="组名称" width="100" align="center" show-overflow-tooltip />
+				<el-table-column prop="jobDetail.jobType" label="类型" header-align="center" show-overflow-tooltip />
 				<!-- <el-table-column prop="jobDetail.assemblyName" label="程序集" show-overflow-tooltip /> -->
-				<el-table-column prop="jobDetail.description" label="描述" show-overflow-tooltip />
+				<el-table-column prop="jobDetail.description" label="描述" header-align="center" show-overflow-tooltip />
 				<el-table-column prop="jobDetail.concurrent" label="执行方式" width="90" align="center" show-overflow-tooltip>
 					<template #default="scope">
 						<el-tag type="success" v-if="(scope.row as JobOutput).jobDetail?.concurrent == true"> 并行 </el-tag>
@@ -148,7 +148,7 @@
 						<el-tag v-else> 否 </el-tag>
 					</template>
 				</el-table-column> -->
-				<el-table-column prop="jobDetail.properties" label="额外数据" show-overflow-tooltip>
+				<el-table-column prop="jobDetail.properties" label="额外数据" header-align="center" show-overflow-tooltip>
 					<template #default="scope">
 						<span v-if="(scope.row as JobOutput).jobDetail?.createType != JobCreateTypeEnum.NUMBER_2"> {{ (scope.row as JobOutput).jobDetail?.properties }} </span>
 						<div v-else style="text-align: center">
@@ -171,7 +171,7 @@
 						</div>
 					</template>
 				</el-table-column>
-				<el-table-column prop="jobDetail.updatedTime" label="更新时间" width="160" align="center" show-overflow-tooltip />
+				<el-table-column prop="jobDetail.updatedTime" label="更新时间" width="130" align="center" show-overflow-tooltip />
 				<el-table-column label="操作" width="170" fixed="right" align="center" show-overflow-tooltip>
 					<template #default="scope">
 						<el-tooltip content="增加触发器">
@@ -237,7 +237,7 @@ const state = reactive({
 	},
 	tableParams: {
 		page: 1,
-		pageSize: 10,
+		pageSize: 20,
 		total: 0 as any,
 	},
 	editJobDetailTitle: '',

+ 10 - 10
Web/src/views/system/log/difflog/index.vue

@@ -2,10 +2,10 @@
 	<div class="sys-difflog-container">
 		<el-card shadow="hover" :body-style="{ paddingBottom: '0' }">
 			<el-form :model="state.queryParams" ref="queryForm" :inline="true">
-				<el-form-item label="开始时间" prop="name">
+				<el-form-item label="开始时间">
 					<el-date-picker v-model="state.queryParams.startTime" type="datetime" placeholder="开始时间" value-format="YYYY-MM-DD HH:mm:ss" :shortcuts="shortcuts" />
 				</el-form-item>
-				<el-form-item label="结束时间" prop="code">
+				<el-form-item label="结束时间">
 					<el-date-picker v-model="state.queryParams.endTime" type="datetime" placeholder="结束时间" value-format="YYYY-MM-DD HH:mm:ss" :shortcuts="shortcuts" />
 				</el-form-item>
 				<el-form-item>
@@ -23,14 +23,14 @@
 		<el-card class="full-table" shadow="hover" style="margin-top: 8px">
 			<el-table :data="state.logData" style="width: 100%" v-loading="state.loading" border>
 				<el-table-column type="index" label="序号" width="55" align="center" />
-				<el-table-column prop="diffType" label="差异操作" show-overflow-tooltip />
-				<el-table-column prop="sql" label="Sql语句" show-overflow-tooltip />
-				<el-table-column prop="parameters" label="参数" show-overflow-tooltip />
-				<el-table-column prop="elapsed" label="耗时(ms)" show-overflow-tooltip />
-				<el-table-column prop="message" label="日志消息" show-overflow-tooltip />
-				<el-table-column prop="beforeData" label="操作前记录" show-overflow-tooltip />
-				<el-table-column prop="afterData" label="操作后记录" show-overflow-tooltip />
-				<el-table-column prop="businessData" label="业务对象" show-overflow-tooltip />
+				<el-table-column prop="diffType" label="差异操作" header-align="center" show-overflow-tooltip />
+				<el-table-column prop="sql" label="Sql语句" header-align="center" show-overflow-tooltip />
+				<el-table-column prop="parameters" label="参数" header-align="center" show-overflow-tooltip />
+				<el-table-column prop="elapsed" label="耗时(ms)" header-align="center" show-overflow-tooltip />
+				<el-table-column prop="message" label="日志消息" header-align="center" show-overflow-tooltip />
+				<el-table-column prop="beforeData" label="操作前记录" header-align="center" show-overflow-tooltip />
+				<el-table-column prop="afterData" label="操作后记录" header-align="center" show-overflow-tooltip />
+				<el-table-column prop="businessData" label="业务对象" header-align="center" show-overflow-tooltip />
 				<el-table-column prop="createTime" label="操作时间" align="center" show-overflow-tooltip />
 			</el-table>
 			<el-pagination

+ 16 - 16
Web/src/views/system/log/exlog/index.vue

@@ -2,10 +2,10 @@
 	<div class="sys-exlog-container" v-loading="state.loading">
 		<el-card shadow="hover" :body-style="{ paddingBottom: '0' }">
 			<el-form :model="state.queryParams" ref="queryForm" :inline="true">
-				<el-form-item label="开始时间" prop="name">
+				<el-form-item label="开始时间">
 					<el-date-picker v-model="state.queryParams.startTime" type="datetime" placeholder="开始时间" value-format="YYYY-MM-DD HH:mm:ss" :shortcuts="shortcuts" />
 				</el-form-item>
-				<el-form-item label="结束时间" prop="code">
+				<el-form-item label="结束时间">
 					<el-date-picker v-model="state.queryParams.endTime" type="datetime" placeholder="结束时间" value-format="YYYY-MM-DD HH:mm:ss" :shortcuts="shortcuts" />
 				</el-form-item>
 				<el-form-item>
@@ -24,11 +24,11 @@
 		<el-card class="full-table" shadow="hover" style="margin-top: 8px">
 			<el-table :data="state.logData" @sort-change="sortChange" style="width: 100%" border :row-class-name="tableRowClassName">
 				<el-table-column type="index" label="序号" width="55" align="center" />
-				<el-table-column prop="controllerName" label="模块名称" width="100" show-overflow-tooltip />
-				<el-table-column prop="displayTitle" label="显示名称" width="150" show-overflow-tooltip />
-				<el-table-column prop="actionName" label="方法名称" width="100" show-overflow-tooltip />
+				<el-table-column prop="controllerName" label="模块名称" width="100" header-align="center" show-overflow-tooltip />
+				<el-table-column prop="displayTitle" label="显示名称" width="150" header-align="center" show-overflow-tooltip />
+				<el-table-column prop="actionName" label="方法名称" width="100" header-align="center" show-overflow-tooltip />
 				<el-table-column prop="httpMethod" label="请求方式" width="90" align="center" show-overflow-tooltip />
-				<el-table-column prop="requestUrl" label="请求地址" width="200" show-overflow-tooltip />
+				<el-table-column prop="requestUrl" label="请求地址" width="300" header-align="center" show-overflow-tooltip />
 				<!-- <el-table-column prop="requestParam" label="请求参数" show-overflow-tooltip />
 				<el-table-column prop="returnResult" label="返回结果" show-overflow-tooltip /> -->
 				<el-table-column prop="logLevel" label="级别" width="70" align="center" show-overflow-tooltip>
@@ -42,23 +42,23 @@
 				</el-table-column>
 				<el-table-column prop="eventId" label="事件Id" width="70" align="center" show-overflow-tooltip />
 				<el-table-column prop="threadId" label="线程Id" sortable="custom" width="90" align="center" show-overflow-tooltip />
-				<el-table-column prop="traceId" label="请求跟踪Id" width="150" sortable="custom" show-overflow-tooltip />
-				<el-table-column prop="account" label="账号名称" width="100" show-overflow-tooltip />
-				<el-table-column prop="realName" label="真实姓名" width="100" show-overflow-tooltip />
-				<el-table-column prop="remoteIp" label="IP地址" width="120" show-overflow-tooltip />
-				<el-table-column prop="location" label="登录地点" width="150" show-overflow-tooltip />
-				<el-table-column prop="browser" label="浏览器" show-overflow-tooltip />
-				<el-table-column prop="os" label="操作系统" width="150" show-overflow-tooltip />
+				<el-table-column prop="traceId" label="请求跟踪Id" width="150" header-align="center" sortable="custom" show-overflow-tooltip />
+				<el-table-column prop="account" label="账号名称" width="100" align="center" show-overflow-tooltip />
+				<el-table-column prop="realName" label="真实姓名" width="100" align="center" show-overflow-tooltip />
+				<el-table-column prop="remoteIp" label="IP地址" width="120" align="center" show-overflow-tooltip />
+				<el-table-column prop="location" label="登录地点" width="150" align="center" show-overflow-tooltip />
+				<el-table-column prop="browser" label="浏览器" width="120" align="center" show-overflow-tooltip />
+				<el-table-column prop="os" label="操作系统" width="120" align="center" show-overflow-tooltip />
 				<el-table-column prop="status" label="状态" width="70" align="center" show-overflow-tooltip>
 					<template #default="scope">
 						<el-tag type="success" v-if="scope.row.status === '200'">成功</el-tag>
 						<el-tag type="danger" v-else>失败</el-tag>
 					</template>
 				</el-table-column>
-				<el-table-column prop="elapsed" label="耗时(ms)" width="100" align="center" show-overflow-tooltip />
-				<el-table-column prop="exception" label="异常对象" width="150" show-overflow-tooltip />
+				<el-table-column prop="elapsed" label="耗时(ms)" width="80" align="center" show-overflow-tooltip />
+				<el-table-column prop="exception" label="异常对象" width="150" header-align="center" show-overflow-tooltip />
 				<!-- <el-table-column prop="message" label="日志消息" width="160" fixed="right" show-overflow-tooltip /> -->
-				<el-table-column prop="logDateTime" label="日志时间" width="160" align="center" fixed="right" show-overflow-tooltip />
+				<el-table-column prop="logDateTime" label="日志时间" width="130" align="center" fixed="right" show-overflow-tooltip />
 				<el-table-column label="操作" width="80" align="center" fixed="right" show-overflow-tooltip>
 					<template #default="scope">
 						<el-button icon="ele-InfoFilled" size="small" text type="primary" @click="viewDetail(scope.row)" v-auth="'sysOplog:page'">详情 </el-button>

+ 15 - 15
Web/src/views/system/log/oplog/index.vue

@@ -2,10 +2,10 @@
 	<div class="sys-oplog-container" v-loading="state.loading">
 		<el-card shadow="hover" :body-style="{ paddingBottom: '0' }">
 			<el-form :model="state.queryParams" ref="queryForm" :inline="true">
-				<el-form-item label="开始时间" prop="name">
+				<el-form-item label="开始时间">
 					<el-date-picker v-model="state.queryParams.startTime" type="datetime" placeholder="开始时间" value-format="YYYY-MM-DD HH:mm:ss" :shortcuts="shortcuts" />
 				</el-form-item>
-				<el-form-item label="结束时间" prop="code">
+				<el-form-item label="结束时间">
 					<el-date-picker v-model="state.queryParams.endTime" type="datetime" placeholder="结束时间" value-format="YYYY-MM-DD HH:mm:ss" :shortcuts="shortcuts" />
 				</el-form-item>
 				<el-form-item>
@@ -24,11 +24,11 @@
 		<el-card class="full-table" shadow="hover" style="margin-top: 8px">
 			<el-table :data="state.logData" @sort-change="sortChange" style="width: 100%" border :row-class-name="tableRowClassName">
 				<el-table-column type="index" label="序号" width="55" align="center" />
-				<el-table-column prop="controllerName" label="模块名称" width="100" show-overflow-tooltip />
-				<el-table-column prop="displayTitle" label="显示名称" width="150" show-overflow-tooltip />
-				<el-table-column prop="actionName" label="方法名称" width="100" show-overflow-tooltip />
+				<el-table-column prop="controllerName" label="模块名称" width="100" header-align="center" show-overflow-tooltip />
+				<el-table-column prop="displayTitle" label="显示名称" width="150" header-align="center" show-overflow-tooltip />
+				<el-table-column prop="actionName" label="方法名称" width="150" header-align="center" show-overflow-tooltip />
 				<el-table-column prop="httpMethod" label="请求方式" width="90" align="center" show-overflow-tooltip />
-				<el-table-column prop="requestUrl" label="请求地址" width="200" show-overflow-tooltip />
+				<el-table-column prop="requestUrl" label="请求地址" width="300" header-align="center" show-overflow-tooltip />
 				<!-- <el-table-column prop="requestParam" label="请求参数" show-overflow-tooltip />
 				<el-table-column prop="returnResult" label="返回结果" show-overflow-tooltip /> -->
 				<el-table-column prop="logLevel" label="级别" width="70" align="center" show-overflow-tooltip>
@@ -42,23 +42,23 @@
 				</el-table-column>
 				<el-table-column prop="eventId" label="事件Id" width="70" align="center" show-overflow-tooltip />
 				<el-table-column prop="threadId" label="线程Id" sortable="custom" width="90" align="center" show-overflow-tooltip />
-				<el-table-column prop="traceId" label="请求跟踪Id" width="150" sortable="custom" show-overflow-tooltip />
-				<el-table-column prop="account" label="账号名称" width="100" show-overflow-tooltip />
-				<el-table-column prop="realName" label="真实姓名" width="100" show-overflow-tooltip />
-				<el-table-column prop="remoteIp" label="IP地址" width="120" show-overflow-tooltip />
-				<el-table-column prop="location" label="登录地点" width="150" show-overflow-tooltip />
-				<el-table-column prop="browser" label="浏览器" show-overflow-tooltip />
-				<el-table-column prop="os" label="操作系统" width="150" show-overflow-tooltip />
+				<el-table-column prop="traceId" label="请求跟踪Id" width="150" header-align="center" sortable="custom" show-overflow-tooltip />
+				<el-table-column prop="account" label="账号名称" width="100" align="center" show-overflow-tooltip />
+				<el-table-column prop="realName" label="真实姓名" width="100" align="center" show-overflow-tooltip />
+				<el-table-column prop="remoteIp" label="IP地址" width="120" align="center" show-overflow-tooltip />
+				<el-table-column prop="location" label="登录地点" width="120" align="center" show-overflow-tooltip />
+				<el-table-column prop="browser" label="浏览器" width="120" align="center" show-overflow-tooltip />
+				<el-table-column prop="os" label="操作系统" width="120" align="center" show-overflow-tooltip />
 				<el-table-column prop="status" label="状态" width="70" align="center" show-overflow-tooltip>
 					<template #default="scope">
 						<el-tag type="success" v-if="scope.row.status === '200'">成功</el-tag>
 						<el-tag type="danger" v-else>失败</el-tag>
 					</template>
 				</el-table-column>
-				<el-table-column prop="elapsed" label="耗时(ms)" width="100" align="center" show-overflow-tooltip />
+				<el-table-column prop="elapsed" label="耗时(ms)" width="80" align="center" show-overflow-tooltip />
 				<!-- <el-table-column prop="exception" label="异常对象" width="150" show-overflow-tooltip /> -->
 				<!-- <el-table-column prop="message" label="日志消息" width="160" fixed="right" show-overflow-tooltip /> -->
-				<el-table-column prop="logDateTime" label="日志时间" width="160" align="center" fixed="right" show-overflow-tooltip />
+				<el-table-column prop="logDateTime" label="日志时间" width="130" align="center" fixed="right" show-overflow-tooltip />
 				<el-table-column label="操作" width="80" align="center" fixed="right" show-overflow-tooltip>
 					<template #default="scope">
 						<el-button icon="ele-InfoFilled" size="small" text type="primary" @click="viewDetail(scope.row)" v-auth="'sysOplog:page'">详情 </el-button>

+ 11 - 11
Web/src/views/system/log/vislog/index.vue

@@ -2,7 +2,7 @@
 	<div class="sys-vislog-container">
 		<el-card shadow="hover" :body-style="{ paddingBottom: '0' }">
 			<el-form :model="state.queryParams" ref="queryForm" :inline="true">
-				<el-form-item label="开始时间" prop="name">
+				<el-form-item label="开始时间">
 					<el-date-picker v-model="state.queryParams.startTime" type="datetime" placeholder="开始时间" value-format="YYYY-MM-DD HH:mm:ss" :shortcuts="shortcuts" />
 				</el-form-item>
 				<el-form-item label="结束时间" prop="code">
@@ -23,22 +23,22 @@
 		<el-card class="full-table" shadow="hover" style="margin-top: 8px">
 			<el-table :data="state.logData" style="width: 100%" v-loading="state.loading" border>
 				<el-table-column type="index" label="序号" width="55" align="center" />
-				<el-table-column prop="displayTitle" label="显示名称" width="150" show-overflow-tooltip />
-				<el-table-column prop="actionName" label="方法名称" width="100" show-overflow-tooltip />
-				<el-table-column prop="account" label="账号名称" width="100" show-overflow-tooltip />
-				<el-table-column prop="realName" label="真实姓名" width="100" show-overflow-tooltip />
-				<el-table-column prop="remoteIp" label="IP地址" width="120" show-overflow-tooltip />
-				<el-table-column prop="location" label="登录地点" width="150" show-overflow-tooltip />
-				<el-table-column prop="browser" label="浏览器" show-overflow-tooltip />
-				<el-table-column prop="os" label="操作系统" width="150" show-overflow-tooltip />
+				<el-table-column prop="displayTitle" label="显示名称" width="150" align="center" show-overflow-tooltip />
+				<el-table-column prop="actionName" label="方法名称" width="150" header-align="center" show-overflow-tooltip />
+				<el-table-column prop="account" label="账号名称" width="100" align="center" show-overflow-tooltip />
+				<el-table-column prop="realName" label="真实姓名" width="100" align="center" show-overflow-tooltip />
+				<el-table-column prop="remoteIp" label="IP地址" align="center" show-overflow-tooltip />
+				<el-table-column prop="location" label="登录地点" align="center" show-overflow-tooltip />
+				<el-table-column prop="browser" label="浏览器" align="center" show-overflow-tooltip />
+				<el-table-column prop="os" label="操作系统" width="120" align="center" show-overflow-tooltip />
 				<el-table-column prop="status" label="状态" width="70" align="center" show-overflow-tooltip>
 					<template #default="scope">
 						<el-tag type="success" v-if="scope.row.status === '200'">成功</el-tag>
 						<el-tag type="danger" v-else>失败</el-tag>
 					</template>
 				</el-table-column>
-				<el-table-column prop="elapsed" label="耗时(ms)" width="100" align="center" show-overflow-tooltip />
-				<el-table-column prop="logDateTime" label="日志时间" width="160" align="center" fixed="right" show-overflow-tooltip />
+				<el-table-column prop="elapsed" label="耗时(ms)" width="80" align="center" show-overflow-tooltip />
+				<el-table-column prop="logDateTime" label="日志时间" width="130" align="center" fixed="right" show-overflow-tooltip />
 			</el-table>
 			<el-pagination
 				v-model:currentPage="state.tableParams.page"

+ 2 - 2
Web/src/views/system/menu/component/editMenu.vue

@@ -1,13 +1,13 @@
 <template>
 	<div class="sys-menu-container">
-		<el-dialog v-model="state.isShowDialog" draggable :close-on-click-modal="false" width="769px">
+		<el-dialog v-model="state.isShowDialog" draggable :close-on-click-modal="false" width="700px">
 			<template #header>
 				<div style="color: #fff">
 					<el-icon size="16" style="margin-right: 3px; display: inline; vertical-align: middle"> <ele-Edit /> </el-icon>
 					<span> {{ props.title }} </span>
 				</div>
 			</template>
-			<el-form :model="state.ruleForm" ref="ruleFormRef" label-width="80px">
+			<el-form :model="state.ruleForm" ref="ruleFormRef" label-width="70px">
 				<el-row :gutter="35">
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
 						<el-form-item label="上级菜单">

+ 8 - 8
Web/src/views/system/menu/index.vue

@@ -2,10 +2,10 @@
 	<div class="sys-menu-container">
 		<el-card shadow="hover" :body-style="{ paddingBottom: '0' }">
 			<el-form :model="state.queryParams" ref="queryForm" :inline="true">
-				<el-form-item label="菜单名称" prop="title">
-					<el-input placeholder="菜单名称" clearable @keyup.enter="handleQuery" v-model="state.queryParams.title" />
+				<el-form-item label="菜单名称">
+					<el-input v-model="state.queryParams.title" placeholder="菜单名称" clearable />
 				</el-form-item>
-				<el-form-item label="类型" prop="type">
+				<el-form-item label="类型">
 					<el-select v-model="state.queryParams.type" placeholder="类型" clearable>
 						<el-option label="目录" :value="1" />
 						<el-option label="菜单" :value="2" />
@@ -26,7 +26,7 @@
 
 		<el-card class="full-table" shadow="hover" style="margin-top: 8px">
 			<el-table :data="state.menuData" v-loading="state.loading" row-key="id" :tree-props="{ children: 'children', hasChildren: 'hasChildren' }" border>
-				<el-table-column label="菜单名称" show-overflow-tooltip>
+				<el-table-column label="菜单名称" header-align="center" show-overflow-tooltip>
 					<template #default="scope">
 						<SvgIcon :name="scope.row.icon" />
 						<span class="ml10">{{ $t(scope.row.title) }}</span>
@@ -39,9 +39,9 @@
 						<el-tag type="info" v-else>按钮</el-tag>
 					</template>
 				</el-table-column>
-				<el-table-column prop="path" label="路由路径" show-overflow-tooltip />
-				<el-table-column prop="component" label="组件路径" show-overflow-tooltip />
-				<el-table-column prop="permission" label="权限标识" show-overflow-tooltip />
+				<el-table-column prop="path" label="路由路径" header-align="center" show-overflow-tooltip />
+				<el-table-column prop="component" label="组件路径" align="center" show-overflow-tooltip />
+				<el-table-column prop="permission" label="权限标识" align="center" show-overflow-tooltip />
 				<el-table-column prop="orderNo" label="排序" width="70" align="center" show-overflow-tooltip />
 				<el-table-column label="状态" width="80" align="center" show-overflow-tooltip>
 					<template #default="scope">
@@ -105,7 +105,7 @@ const resetQuery = () => {
 // 打开新增页面
 const openAddMenu = () => {
 	state.editMenuTitle = '添加菜单';
-	editMenuRef.value?.openDialog({ type: 2 });
+	editMenuRef.value?.openDialog({ type: 2, isHide: false, isKeepAlive: true, isAffix: false, isIframe: false, status: 1, orderNo: 100 });
 };
 
 // 打开编辑页面

+ 1 - 1
Web/src/views/system/notice/component/editNotice.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="sys-notice-container">
-		<el-dialog v-model="state.isShowDialog" draggable :close-on-click-modal="false" width="800px">
+		<el-dialog v-model="state.isShowDialog" draggable :close-on-click-modal="false" width="900px">
 			<template #header>
 				<div style="color: #fff">
 					<el-icon size="16" style="margin-right: 3px; display: inline; vertical-align: middle"> <ele-Edit /> </el-icon>

+ 7 - 7
Web/src/views/system/notice/index.vue

@@ -2,11 +2,11 @@
 	<div class="sys-notice-container">
 		<el-card shadow="hover" :body-style="{ paddingBottom: '0' }">
 			<el-form :model="state.queryParams" ref="queryForm" :inline="true">
-				<el-form-item label="标题" prop="title">
-					<el-input placeholder="标题" clearable @keyup.enter="handleQuery" v-model="state.queryParams.title" />
+				<el-form-item label="标题">
+					<el-input v-model="state.queryParams.title" placeholder="标题" clearable />
 				</el-form-item>
-				<el-form-item label="类型" prop="type">
-					<el-select v-model="state.queryParams.type" placeholder="类型" clearable style="width: 100%">
+				<el-form-item label="类型">
+					<el-select v-model="state.queryParams.type" placeholder="类型" clearable>
 						<el-option label="通知" :value="1" />
 						<el-option label="公告" :value="2" />
 					</el-select>
@@ -26,8 +26,8 @@
 		<el-card class="full-table" shadow="hover" style="margin-top: 8px">
 			<el-table :data="state.noticeData" style="width: 100%" v-loading="state.loading" border>
 				<el-table-column type="index" label="序号" width="55" align="center" />
-				<el-table-column prop="title" label="标题" show-overflow-tooltip />
-				<el-table-column prop="content" label="内容" show-overflow-tooltip>
+				<el-table-column prop="title" label="标题" header-align="center" show-overflow-tooltip />
+				<el-table-column prop="content" label="内容" header-align="center" show-overflow-tooltip>
 					<template #default="scope"> {{ removeHtml(scope.row.content) }} </template>
 				</el-table-column>
 				<el-table-column prop="type" label="类型" width="100" align="center" show-overflow-tooltip>
@@ -91,7 +91,7 @@ const state = reactive({
 	},
 	tableParams: {
 		page: 1,
-		pageSize: 10,
+		pageSize: 20,
 		total: 0 as any,
 	},
 	editNoticeTitle: '',

+ 3 - 4
Web/src/views/system/org/component/editOrg.vue

@@ -1,13 +1,13 @@
 <template>
 	<div class="sys-org-container">
-		<el-dialog v-model="state.isShowDialog" draggable width="600px">
+		<el-dialog v-model="state.isShowDialog" draggable :close-on-click-modal="false" width="700px">
 			<template #header>
 				<div style="color: #fff">
 					<el-icon size="16" style="margin-right: 3px; display: inline; vertical-align: middle"> <ele-Edit /> </el-icon>
 					<span> {{ props.title }} </span>
 				</div>
 			</template>
-			<el-form :model="state.ruleForm" ref="ruleFormRef" label-width="80px">
+			<el-form :model="state.ruleForm" ref="ruleFormRef" label-width="70px">
 				<el-row :gutter="35">
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
 						<el-form-item label="上级机构">
@@ -37,7 +37,7 @@
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
-						<el-form-item label="机构类型" prop="orgType">
+						<el-form-item label="机构类型">
 							<el-select v-model="state.ruleForm.orgType" filterable clearable class="w100">
 								<el-option v-for="item in state.orgTypeList" :key="item.value" :label="item.value" :value="item.code" />
 							</el-select>
@@ -75,7 +75,6 @@
 
 <script lang="ts" setup name="sysEditOrg">
 import { onMounted, reactive, ref } from 'vue';
-import mittBus from '/@/utils/mitt';
 
 import { getAPI } from '/@/utils/axios-utils';
 import { SysOrgApi, SysDictDataApi } from '/@/api-services/api';

+ 9 - 9
Web/src/views/system/org/index.vue

@@ -8,13 +8,13 @@
 			<el-col :span="20" :xs="24">
 				<el-card shadow="hover" :body-style="{ paddingBottom: '0' }">
 					<el-form :model="state.queryParams" ref="queryForm" :inline="true">
-						<el-form-item label="机构名称" prop="name">
-							<el-input placeholder="机构名称" clearable @keyup.enter="handleQuery" v-model="state.queryParams.name" />
+						<el-form-item label="机构名称">
+							<el-input v-model="state.queryParams.name" placeholder="机构名称" clearable />
 						</el-form-item>
-						<el-form-item label="机构编码" prop="code">
-							<el-input placeholder="机构编码" clearable @keyup.enter="handleQuery" v-model="state.queryParams.code" />
+						<el-form-item label="机构编码">
+							<el-input v-model="state.queryParams.code" placeholder="机构编码" clearable />
 						</el-form-item>
-						<el-form-item label="机构类型" prop="orgType">
+						<el-form-item label="机构类型">
 							<el-select v-model="state.queryParams.orgType" filterable clearable class="w100">
 								<el-option v-for="item in state.orgTypeList" :key="item.value" :label="item.value" :value="item.code" />
 							</el-select>
@@ -33,9 +33,9 @@
 
 				<el-card class="full-table" shadow="hover" style="margin-top: 8px">
 					<el-table :data="state.orgData" style="width: 100%" v-loading="state.loading" row-key="id" default-expand-all :tree-props="{ children: 'children', hasChildren: 'hasChildren' }" border>
-						<el-table-column prop="name" label="机构名称" show-overflow-tooltip />
-						<el-table-column prop="code" label="机构编码" show-overflow-tooltip />
-						<el-table-column prop="orgType" label="机构类型" :formatter="dictFormatter" show-overflow-tooltip />
+						<el-table-column prop="name" label="机构名称" header-align="center" show-overflow-tooltip />
+						<el-table-column prop="code" label="机构编码" align="center" show-overflow-tooltip />
+						<el-table-column prop="orgType" label="机构类型" align="center" :formatter="dictFormatter" show-overflow-tooltip />
 						<el-table-column prop="orderNo" label="排序" width="70" align="center" show-overflow-tooltip />
 						<el-table-column label="状态" width="70" align="center" show-overflow-tooltip>
 							<template #default="scope">
@@ -44,7 +44,7 @@
 							</template>
 						</el-table-column>
 						<el-table-column prop="createTime" label="修改时间" align="center" show-overflow-tooltip />
-						<el-table-column prop="remark" label="备注" show-overflow-tooltip />
+						<el-table-column prop="remark" label="备注" header-align="center" show-overflow-tooltip />
 						<el-table-column label="操作" width="140" fixed="right" align="center" show-overflow-tooltip>
 							<template #default="scope">
 								<el-button icon="ele-Edit" size="small" text type="primary" @click="openEditOrg(scope.row)" v-auth="'sysOrg:update'"> 编辑 </el-button>

+ 2 - 2
Web/src/views/system/plugin/component/editPlugin.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="sys-plugin-container">
-		<el-dialog v-model="state.isShowDialog" draggable :close-on-click-modal="false" width="800px">
+		<el-dialog v-model="state.isShowDialog" draggable :close-on-click-modal="false" width="900px">
 			<template #header>
 				<div style="color: #fff">
 					<el-icon size="16" style="margin-right: 3px; display: inline; vertical-align: middle"> <ele-Edit /> </el-icon>
@@ -9,7 +9,7 @@
 			</template>
 			<el-tabs v-model="state.selectedTabName">
 				<el-tab-pane label="插件信息">
-					<el-form :model="state.ruleForm" ref="ruleFormRef" label-width="80px" style="height: 500px">
+					<el-form :model="state.ruleForm" ref="ruleFormRef" label-width="75px" style="height: 500px">
 						<el-row :gutter="35">
 							<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
 								<el-form-item label="功能名称" prop="name" :rules="[{ required: true, message: '功能名称不能为空', trigger: 'blur' }]">

+ 5 - 5
Web/src/views/system/plugin/index.vue

@@ -2,8 +2,8 @@
 	<div class="sys-plugin-container">
 		<el-card shadow="hover" :body-style="{ paddingBottom: '0' }">
 			<el-form :model="state.queryParams" ref="queryForm" :inline="true">
-				<el-form-item label="功能名称" prop="name">
-					<el-input placeholder="功能名称" clearable @keyup.enter="handleQuery" v-model="state.queryParams.name" />
+				<el-form-item label="功能名称">
+					<el-input v-model="state.queryParams.name" placeholder="功能名称" clearable />
 				</el-form-item>
 				<el-form-item>
 					<el-button-group>
@@ -22,8 +22,8 @@
 				<el-table-column type="index" label="序号" width="55" align="center" fixed />
 				<el-table-column prop="name" label="功能名称" header-align="center" show-overflow-tooltip />
 				<el-table-column prop="assemblyName" label="程序集名称" header-align="center" show-overflow-tooltip />
-				<el-table-column prop="orderNo" label="排序" align="center" show-overflow-tooltip />
-				<el-table-column label="状态" align="center" show-overflow-tooltip>
+				<el-table-column prop="orderNo" label="排序" width="70" align="center" show-overflow-tooltip />
+				<el-table-column label="状态" width="70" align="center" show-overflow-tooltip>
 					<template #default="scope">
 						<el-tag type="success" v-if="scope.row.status === 1">启用</el-tag>
 						<el-tag type="danger" v-else>禁用</el-tag>
@@ -73,7 +73,7 @@ const state = reactive({
 	},
 	tableParams: {
 		page: 1,
-		pageSize: 10,
+		pageSize: 20,
 		total: 0 as any,
 	},
 	editPluginTitle: '',

+ 2 - 2
Web/src/views/system/pos/component/editPos.vue

@@ -1,13 +1,13 @@
 <template>
 	<div class="sys-pos-container">
-		<el-dialog v-model="state.isShowDialog" draggable width="600px">
+		<el-dialog v-model="state.isShowDialog" draggable :close-on-click-modal="false" width="700px">
 			<template #header>
 				<div style="color: #fff">
 					<el-icon size="16" style="margin-right: 3px; display: inline; vertical-align: middle"> <ele-Edit /> </el-icon>
 					<span> {{ props.title }} </span>
 				</div>
 			</template>
-			<el-form :model="state.ruleForm" ref="ruleFormRef" label-width="80px">
+			<el-form :model="state.ruleForm" ref="ruleFormRef" label-width="70px">
 				<el-row :gutter="35">
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
 						<el-form-item label="职位名称" prop="name" :rules="[{ required: true, message: '职位名称不能为空', trigger: 'blur' }]">

+ 7 - 7
Web/src/views/system/pos/index.vue

@@ -2,11 +2,11 @@
 	<div class="sys-pos-container">
 		<el-card shadow="hover" :body-style="{ paddingBottom: '0' }">
 			<el-form :model="state.queryParams" ref="queryForm" :inline="true">
-				<el-form-item label="职位名称" prop="name">
-					<el-input placeholder="职位名称" clearable @keyup.enter="handleQuery" v-model="state.queryParams.name" />
+				<el-form-item label="职位名称">
+					<el-input v-model="state.queryParams.name" placeholder="职位名称" clearable />
 				</el-form-item>
-				<el-form-item label="职位编码" prop="code">
-					<el-input placeholder="职位编码" clearable @keyup.enter="handleQuery" v-model="state.queryParams.code" />
+				<el-form-item label="职位编码">
+					<el-input v-model="state.queryParams.code" placeholder="职位编码" clearable />
 				</el-form-item>
 				<el-form-item>
 					<el-button-group>
@@ -23,8 +23,8 @@
 		<el-card class="full-table" shadow="hover" style="margin-top: 8px">
 			<el-table :data="state.posData" style="width: 100%" v-loading="state.loading" border>
 				<el-table-column type="index" label="序号" width="55" align="center" />
-				<el-table-column prop="name" label="职位名称" show-overflow-tooltip />
-				<el-table-column prop="code" label="职位编码" show-overflow-tooltip />
+				<el-table-column prop="name" label="职位名称" align="center" show-overflow-tooltip />
+				<el-table-column prop="code" label="职位编码" align="center" show-overflow-tooltip />
 				<el-table-column prop="orderNo" label="排序" width="70" align="center" show-overflow-tooltip />
 				<el-table-column label="状态" width="70" align="center" show-overflow-tooltip>
 					<template #default="scope">
@@ -33,7 +33,7 @@
 					</template>
 				</el-table-column>
 				<el-table-column prop="createTime" label="修改时间" align="center" show-overflow-tooltip />
-				<el-table-column prop="remark" label="备注" show-overflow-tooltip />
+				<el-table-column prop="remark" label="备注" header-align="center" show-overflow-tooltip />
 				<el-table-column label="操作" width="140" fixed="right" align="center" show-overflow-tooltip>
 					<template #default="scope">
 						<el-button icon="ele-Edit" size="small" text type="primary" @click="openEditPos(scope.row)" v-auth="'sysPos:update'"> 编辑 </el-button>

+ 2 - 2
Web/src/views/system/print/component/editPrint.vue

@@ -19,7 +19,7 @@
 					<span>{{ props.title }}</span>
 				</div>
 			</template>
-			<el-form :model="state.ruleForm" ref="ruleFormRef" label-width="80px">
+			<el-form :model="state.ruleForm" ref="ruleFormRef" label-width="70px">
 				<el-row :gutter="35">
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
 						<el-form-item label="模板名称" prop="name" :rules="[{ required: true, message: '模板名称不能为空', trigger: 'blur' }]">
@@ -67,7 +67,7 @@ import { SysPrintApi } from '/@/api-services/api';
 import { UpdatePrintInput } from '/@/api-services/models';
 
 const props = defineProps({
-	title: String
+	title: String,
 });
 const emits = defineEmits(['handleQuery']);
 let svPrint = ref();

+ 2 - 2
Web/src/views/system/print/index.vue

@@ -2,8 +2,8 @@
 	<div class="sys-print-container">
 		<el-card shadow="hover" :body-style="{ paddingBottom: '0' }">
 			<el-form :model="state.queryParams" ref="queryForm" :inline="true">
-				<el-form-item label="模板名称" prop="name">
-					<el-input placeholder="模板名称" clearable @keyup.enter="handleQuery" v-model="state.queryParams.name" />
+				<el-form-item label="模板名称">
+					<el-input v-model="state.queryParams.name" placeholder="模板名称" clearable />
 				</el-form-item>
 				<el-form-item>
 					<el-button-group>

+ 2 - 2
Web/src/views/system/region/component/editRegion.vue

@@ -1,13 +1,13 @@
 <template>
 	<div class="sys-region-container">
-		<el-dialog v-model="state.isShowDialog" draggable width="600px">
+		<el-dialog v-model="state.isShowDialog" draggable :close-on-click-modal="false" width="700px">
 			<template #header>
 				<div style="color: #fff">
 					<el-icon size="16" style="margin-right: 3px; display: inline; vertical-align: middle"> <ele-Edit /> </el-icon>
 					<span> {{ props.title }} </span>
 				</div>
 			</template>
-			<el-form :model="state.ruleForm" ref="ruleFormRef" label-width="80px">
+			<el-form :model="state.ruleForm" ref="ruleFormRef" label-width="70px">
 				<el-row :gutter="35">
 					<!-- <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
 						<el-form-item label="上级名称">

+ 9 - 9
Web/src/views/system/region/index.vue

@@ -8,11 +8,11 @@
 			<el-col :span="18" :xs="24">
 				<el-card shadow="hover" :body-style="{ paddingBottom: '0' }">
 					<el-form :model="state.queryParams" ref="queryForm" :inline="true">
-						<el-form-item label="行政名称" prop="name">
-							<el-input placeholder="行政名称" clearable @keyup.enter="handleQuery" v-model="state.queryParams.name" />
+						<el-form-item label="行政名称">
+							<el-input v-model="state.queryParams.name" placeholder="行政名称" clearable />
 						</el-form-item>
-						<el-form-item label="行政代码" prop="code">
-							<el-input placeholder="行政代码" clearable @keyup.enter="handleQuery" v-model="state.queryParams.code" />
+						<el-form-item label="行政代码">
+							<el-input v-model="state.queryParams.code" placeholder="行政代码" clearable />
 						</el-form-item>
 						<el-form-item>
 							<el-button-group>
@@ -29,11 +29,11 @@
 
 				<el-card class="full-table" shadow="hover" style="margin-top: 8px">
 					<el-table :data="state.regionData" style="width: 100%" v-loading="state.loading" row-key="id" default-expand-all :tree-props="{ children: 'children', hasChildren: 'hasChildren' }" border>
-						<el-table-column prop="name" label="行政名称" show-overflow-tooltip />
-						<el-table-column prop="code" label="行政代码" show-overflow-tooltip />
-						<el-table-column prop="cityCode" label="区号" show-overflow-tooltip />
+						<el-table-column prop="name" label="行政名称" align="center" show-overflow-tooltip />
+						<el-table-column prop="code" label="行政代码" align="center" show-overflow-tooltip />
+						<el-table-column prop="cityCode" label="区号" align="center" show-overflow-tooltip />
 						<el-table-column prop="orderNo" label="排序" width="70" align="center" show-overflow-tooltip />
-						<el-table-column prop="remark" label="备注" show-overflow-tooltip />
+						<el-table-column prop="remark" label="备注" header-align="center" show-overflow-tooltip />
 						<el-table-column label="操作" width="140" fixed="right" align="center" show-overflow-tooltip>
 							<template #default="scope">
 								<el-button icon="ele-Edit" size="small" text type="primary" @click="openEditRegion(scope.row)" v-auth="'sysRegion:update'"> 编辑 </el-button>
@@ -83,7 +83,7 @@ const state = reactive({
 	},
 	tableParams: {
 		page: 1,
-		pageSize: 10,
+		pageSize: 20,
 		total: 0 as any,
 	},
 	editRegionTitle: '',

+ 2 - 2
Web/src/views/system/role/component/editRole.vue

@@ -1,13 +1,13 @@
 <template>
 	<div class="sys-role-container">
-		<el-dialog v-model="state.isShowDialog" draggable :close-on-click-modal="false" width="769px">
+		<el-dialog v-model="state.isShowDialog" draggable :close-on-click-modal="false" width="700px">
 			<template #header>
 				<div style="color: #fff">
 					<el-icon size="16" style="margin-right: 3px; display: inline; vertical-align: middle"> <ele-Edit /> </el-icon>
 					<span>{{ props.title }}</span>
 				</div>
 			</template>
-			<el-form :model="state.ruleForm" ref="ruleFormRef" label-width="80px">
+			<el-form :model="state.ruleForm" ref="ruleFormRef" label-width="70px">
 				<el-row :gutter="35">
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
 						<el-form-item label="角色名称" prop="name" :rules="[{ required: true, message: '角色名称不能为空', trigger: 'blur' }]">

+ 2 - 2
Web/src/views/system/role/component/grantData.vue

@@ -10,14 +10,14 @@
 			<el-form :model="state.ruleForm" label-position="top">
 				<el-row :gutter="35">
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl1="24" class="mb20">
-						<el-form-item prop="dataScope" label="数据范围:">
+						<el-form-item label="数据范围:">
 							<el-select v-model="state.ruleForm.dataScope" placeholder="数据范围" style="width: 100%">
 								<el-option v-for="d in state.dataScopeType" :key="d.value" :label="d.label" :value="d.value" />
 							</el-select>
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl1="24" v-show="state.ruleForm.dataScope === 5">
-						<el-form-item prop="orgIdList" label="机构列表:">
+						<el-form-item label="机构列表:">
 							<OrgTree ref="orgTreeRef" class="w100" />
 						</el-form-item>
 					</el-col>

+ 8 - 8
Web/src/views/system/role/index.vue

@@ -2,11 +2,11 @@
 	<div class="sys-role-container">
 		<el-card shadow="hover" :body-style="{ paddingBottom: '0' }">
 			<el-form :model="state.queryParams" ref="queryForm" :inline="true">
-				<el-form-item label="角色名称" prop="name">
-					<el-input placeholder="角色名称" clearable @keyup.enter="handleQuery" v-model="state.queryParams.name" />
+				<el-form-item label="角色名称">
+					<el-input v-model="state.queryParams.name" placeholder="角色名称" clearable />
 				</el-form-item>
-				<el-form-item label="角色编码" prop="code">
-					<el-input placeholder="角色编码" clearable @keyup.enter="handleQuery" v-model="state.queryParams.code" />
+				<el-form-item label="角色编码">
+					<el-input v-model="state.queryParams.code" placeholder="角色编码" clearable />
 				</el-form-item>
 				<el-form-item>
 					<el-button-group>
@@ -23,8 +23,8 @@
 		<el-card class="full-table" shadow="hover" style="margin-top: 8px">
 			<el-table :data="state.roleData" style="width: 100%" v-loading="state.loading" border>
 				<el-table-column type="index" label="序号" width="55" align="center" fixed />
-				<el-table-column prop="name" label="角色名称" show-overflow-tooltip />
-				<el-table-column prop="code" label="角色编码" show-overflow-tooltip />
+				<el-table-column prop="name" label="角色名称" align="center" show-overflow-tooltip />
+				<el-table-column prop="code" label="角色编码" align="center" show-overflow-tooltip />
 				<el-table-column label="数据范围" align="center" show-overflow-tooltip>
 					<template #default="scope">
 						<el-tag effect="plain" v-if="scope.row.dataScope === 1">全部数据</el-tag>
@@ -42,7 +42,7 @@
 					</template>
 				</el-table-column>
 				<el-table-column prop="createTime" label="修改时间" align="center" show-overflow-tooltip />
-				<el-table-column prop="remark" label="备注" show-overflow-tooltip />
+				<el-table-column prop="remark" label="备注" header-align="center" show-overflow-tooltip />
 				<el-table-column label="操作" width="110" fixed="right" align="center" show-overflow-tooltip>
 					<template #default="scope">
 						<el-button icon="ele-Edit" size="small" text type="primary" @click="openEditRole(scope.row)" v-auth="'sysRole:update'"> 编辑 </el-button>
@@ -98,7 +98,7 @@ const state = reactive({
 	},
 	tableParams: {
 		page: 1,
-		pageSize: 10,
+		pageSize: 20,
 		total: 0 as any,
 	},
 	editRoleTitle: '',

+ 5 - 5
Web/src/views/system/tenant/component/editTenant.vue

@@ -1,13 +1,13 @@
 <template>
 	<div class="sys-tenant-container">
-		<el-dialog v-model="state.isShowDialog" draggable :close-on-click-modal="false" width="769px">
+		<el-dialog v-model="state.isShowDialog" draggable :close-on-click-modal="false" width="700px">
 			<template #header>
 				<div style="color: #fff">
 					<el-icon size="16" style="margin-right: 3px; display: inline; vertical-align: middle"> <ele-Edit /> </el-icon>
 					<span> {{ props.title }} </span>
 				</div>
 			</template>
-			<el-form :model="state.ruleForm" ref="ruleFormRef" label-width="100px">
+			<el-form :model="state.ruleForm" ref="ruleFormRef" label-width="75px">
 				<el-row :gutter="35">
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
 						<el-form-item label="租户类型" :rules="[{ required: true, message: '租户类型不能为空', trigger: 'blur' }]">
@@ -23,8 +23,8 @@
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
-						<el-form-item label="管理员" prop="adminName" :rules="[{ required: true, message: '管理员不能为空', trigger: 'blur' }]">
-							<el-input v-model="state.ruleForm.adminName" placeholder="管理员" clearable />
+						<el-form-item label="租管账号" prop="adminAccount" :rules="[{ required: true, message: '租管账号不能为空', trigger: 'blur' }]">
+							<el-input v-model="state.ruleForm.adminAccount" placeholder="租管账号" clearable />
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
@@ -49,7 +49,7 @@
 					</el-col> -->
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
 						<el-form-item label="数据库类型">
-							<el-select v-model="state.ruleForm.dbType" placeholder="数据库类型" clearable style="width: 100%" :disabled="state.ruleForm.tenantType == 0 && state.ruleForm.tenantType != undefined">
+							<el-select v-model="state.ruleForm.dbType" placeholder="数据库类型" clearable class="w100" :disabled="state.ruleForm.tenantType == 0 && state.ruleForm.tenantType != undefined">
 								<el-option label="MySql" :value="0" />
 								<el-option label="SqlServer" :value="1" />
 								<el-option label="Sqlite" :value="2" />

+ 9 - 9
Web/src/views/system/tenant/index.vue

@@ -2,11 +2,11 @@
 	<div class="sys-tenant-container">
 		<el-card shadow="hover" :body-style="{ paddingBottom: '0' }">
 			<el-form :model="state.queryParams" ref="queryForm" :inline="true">
-				<el-form-item label="租户名称" prop="name">
-					<el-input placeholder="租户名称" clearable @keyup.enter="handleQuery" v-model="state.queryParams.name" />
+				<el-form-item label="租户名称">
+					<el-input v-model="state.queryParams.name" placeholder="租户名称" clearable />
 				</el-form-item>
-				<el-form-item label="联系电话" prop="phone">
-					<el-input placeholder="联系电话" clearable @keyup.enter="handleQuery" v-model="state.queryParams.phone" />
+				<el-form-item label="联系电话">
+					<el-input v-model="state.queryParams.phone" placeholder="联系电话" clearable />
 				</el-form-item>
 				<el-form-item>
 					<el-button-group>
@@ -23,9 +23,9 @@
 		<el-card class="full-table" shadow="hover" style="margin-top: 8px">
 			<el-table :data="state.tenantData" style="width: 100%" v-loading="state.loading" border>
 				<el-table-column type="index" label="序号" width="55" align="center" fixed />
-				<el-table-column prop="name" label="租户名称" width="160" show-overflow-tooltip />
-				<el-table-column prop="adminName" label="管理员" width="120" show-overflow-tooltip />
-				<el-table-column prop="phone" label="电话" width="120" show-overflow-tooltip />
+				<el-table-column prop="name" label="租户名称" width="160" align="center" show-overflow-tooltip />
+				<el-table-column prop="adminAccount" label="租管账号" align="center" width="120" show-overflow-tooltip />
+				<el-table-column prop="phone" label="电话" width="120" align="center" show-overflow-tooltip />
 				<!-- <el-table-column prop="host" label="主机" show-overflow-tooltip /> -->
 				<!-- <el-table-column prop="email" label="邮箱" show-overflow-tooltip /> -->
 				<el-table-column prop="tenantType" label="租户类型" width="100" align="center" show-overflow-tooltip>
@@ -60,10 +60,10 @@
 					</template>
 				</el-table-column>
 				<!-- <el-table-column prop="configId" label="数据库标识" show-overflow-tooltip /> -->
-				<el-table-column prop="connection" label="数据库连接" width="300" show-overflow-tooltip />
+				<el-table-column prop="connection" label="数据库连接" width="300" header-align="center" show-overflow-tooltip />
 				<el-table-column prop="orderNo" label="排序" width="70" align="center" show-overflow-tooltip />
 				<el-table-column prop="createTime" label="修改时间" width="160" align="center" show-overflow-tooltip />
-				<el-table-column prop="remark" label="备注" show-overflow-tooltip />
+				<el-table-column prop="remark" label="备注" header-align="center" show-overflow-tooltip />
 				<el-table-column label="操作" width="180" fixed="right" align="center" show-overflow-tooltip>
 					<template #default="scope">
 						<el-button icon="ele-Coin" size="small" text type="danger" @click="createTenant(scope.row)" v-auth="'sysTenant:createDb'" :disabled="scope.row.tenantType == 0"> 创建库 </el-button>

+ 26 - 26
Web/src/views/system/user/component/editUser.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="sys-user-container">
-		<el-dialog v-model="state.isShowDialog" draggable :close-on-click-modal="false" width="769px">
+		<el-dialog v-model="state.isShowDialog" draggable :close-on-click-modal="false" width="700px">
 			<template #header>
 				<div style="color: #fff">
 					<el-icon size="16" style="margin-right: 3px; display: inline; vertical-align: middle"> <ele-Edit /> </el-icon>
@@ -9,7 +9,7 @@
 			</template>
 			<el-tabs v-loading="state.loading" v-model="state.selectedTabName">
 				<el-tab-pane label="基础信息">
-					<el-form :model="state.ruleForm" ref="ruleFormRef" label-width="100px">
+					<el-form :model="state.ruleForm" ref="ruleFormRef" label-width="70px">
 						<el-row :gutter="35">
 							<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
 								<el-form-item label="账号名称" prop="account" :rules="[{ required: true, message: '账号名称不能为空', trigger: 'blur' }]">
@@ -22,7 +22,7 @@
 								</el-form-item>
 							</el-col>
 							<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
-								<el-form-item label="昵称" prop="nickName">
+								<el-form-item label="昵称">
 									<el-input v-model="state.ruleForm.nickName" placeholder="昵称" clearable />
 								</el-form-item>
 							</el-col>
@@ -33,11 +33,11 @@
 							</el-col>
 							<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
 								<el-form-item label="出生日期" prop="birthday" :rules="[{ required: true, message: '出生日期不能为空', trigger: 'blur' }]">
-									<el-date-picker v-model="state.ruleForm.birthday" type="date" placeholder="出生日期" format="YYYY-MM-DD" value-format="YYYY-MM-DD" style="width: 100%" />
+									<el-date-picker v-model="state.ruleForm.birthday" type="date" placeholder="出生日期" format="YYYY-MM-DD" value-format="YYYY-MM-DD" class="w100" />
 								</el-form-item>
 							</el-col>
 							<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
-								<el-form-item label="性别" prop="sex">
+								<el-form-item label="性别">
 									<el-radio-group v-model="state.ruleForm.sex">
 										<el-radio :label="1">男</el-radio>
 										<el-radio :label="2">女</el-radio>
@@ -78,19 +78,19 @@
 							</el-col>
 							<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
 								<el-form-item label="职位" prop="posId" :rules="[{ required: true, message: '职位名称不能为空', trigger: 'blur' }]">
-									<el-select v-model="state.ruleForm.posId" placeholder="职位" style="width: 100%">
+									<el-select v-model="state.ruleForm.posId" placeholder="职位" class="w100">
 										<el-option v-for="d in state.posData" :key="d.id" :label="d.name" :value="d.id" />
 									</el-select>
 								</el-form-item>
 							</el-col>
 							<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
-								<el-form-item label="工号" prop="jobNum">
+								<el-form-item label="工号">
 									<el-input v-model="state.ruleForm.jobNum" placeholder="工号" clearable />
 								</el-form-item>
 							</el-col>
 							<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
-								<el-form-item label="入职日期" prop="joinDate">
-									<el-date-picker v-model="state.ruleForm.joinDate" type="date" placeholder="入职日期" format="YYYY-MM-DD" value-format="YYYY-MM-DD" style="width: 100%" />
+								<el-form-item label="入职日期">
+									<el-date-picker v-model="state.ruleForm.joinDate" type="date" placeholder="入职日期" format="YYYY-MM-DD" value-format="YYYY-MM-DD" class="w100" />
 								</el-form-item>
 							</el-col>
 							<el-divider border-style="dashed" content-position="center">
@@ -126,24 +126,24 @@
 										</el-col>
 										<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
 											<el-form-item label="职位" :prop="`extOrgIdList[${k}].posId`" :rules="[{ required: true, message: `职位不能为空`, trigger: 'blur' }]">
-												<el-select v-model="state.ruleForm.extOrgIdList[k].posId" placeholder="职位名称" style="width: 100%">
+												<el-select v-model="state.ruleForm.extOrgIdList[k].posId" placeholder="职位名称" class="w100">
 													<el-option v-for="d in state.posData" :key="d.id" :label="d.name" :value="d.id" />
 												</el-select>
 											</el-form-item>
 										</el-col>
 									</el-row>
 								</template>
-								<el-empty description="空" v-else></el-empty>
+								<el-empty :image-size="80" description="空数据" v-else></el-empty>
 							</el-col>
 						</el-row>
 					</el-form>
 				</el-tab-pane>
 				<el-tab-pane label="档案信息">
-					<el-form :model="state.ruleForm" label-width="100px">
+					<el-form :model="state.ruleForm" label-width="75px">
 						<el-row :gutter="35">
 							<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
 								<el-form-item label="证件类型" prop="cardType">
-									<el-select v-model="state.ruleForm.cardType" placeholder="证件类型" style="width: 100%">
+									<el-select v-model="state.ruleForm.cardType" placeholder="证件类型" class="w100">
 										<el-option label="身份证" :value="0" />
 										<el-option label="护照" :value="1" />
 										<el-option label="出生证" :value="2" />
@@ -153,33 +153,33 @@
 								</el-form-item>
 							</el-col>
 							<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
-								<el-form-item label="证件号码" prop="idCardNum">
+								<el-form-item label="证件号码">
 									<el-input v-model="state.ruleForm.idCardNum" placeholder="证件号码" clearable />
 								</el-form-item>
 							</el-col>
 							<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
-								<el-form-item label="民族" prop="nation">
+								<el-form-item label="民族">
 									<el-input v-model="state.ruleForm.nation" placeholder="民族" clearable />
 								</el-form-item>
 							</el-col>
 							<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
-								<el-form-item label="邮箱" prop="email">
+								<el-form-item label="邮箱">
 									<el-input v-model="state.ruleForm.email" placeholder="邮箱" clearable />
 								</el-form-item>
 							</el-col>
 							<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
-								<el-form-item label="地址" prop="nation">
+								<el-form-item label="地址">
 									<el-input v-model="state.ruleForm.address" placeholder="地址" clearable type="textarea" />
 								</el-form-item>
 							</el-col>
 							<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
-								<el-form-item label="毕业学校" prop="college">
+								<el-form-item label="毕业学校">
 									<el-input v-model="state.ruleForm.college" placeholder="毕业学校" clearable />
 								</el-form-item>
 							</el-col>
 							<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
-								<el-form-item label="文化程度" prop="cultureLevel">
-									<el-select v-model="state.ruleForm.cultureLevel" placeholder="文化程度" style="width: 100%">
+								<el-form-item label="文化程度">
+									<el-select v-model="state.ruleForm.cultureLevel" placeholder="文化程度" class="w100">
 										<el-option label="小学" :value="0" />
 										<el-option label="初中" :value="1" />
 										<el-option label="高中" :value="2" />
@@ -192,32 +192,32 @@
 								</el-form-item>
 							</el-col>
 							<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
-								<el-form-item label="政治面貌" prop="politicalOutlook">
+								<el-form-item label="政治面貌">
 									<el-input v-model="state.ruleForm.politicalOutlook" placeholder="政治面貌" clearable />
 								</el-form-item>
 							</el-col>
 							<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
-								<el-form-item label="办公电话" prop="officePhone">
+								<el-form-item label="办公电话">
 									<el-input v-model="state.ruleForm.officePhone" placeholder="办公电话" clearable />
 								</el-form-item>
 							</el-col>
 							<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
-								<el-form-item label="紧急联系人" prop="emergencyContact">
+								<el-form-item label="紧急联系人">
 									<el-input v-model="state.ruleForm.emergencyContact" placeholder="紧急联系人" clearable />
 								</el-form-item>
 							</el-col>
 							<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
-								<el-form-item label="联系人电话" prop="emergencyPhone">
+								<el-form-item label="联系人电话">
 									<el-input v-model="state.ruleForm.emergencyPhone" placeholder="联系人电话" clearable />
 								</el-form-item>
 							</el-col>
 							<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
-								<el-form-item label="联系人地址" prop="emergencyAddress">
+								<el-form-item label="联系人地址">
 									<el-input v-model="state.ruleForm.emergencyAddress" placeholder="紧急联系人" clearable type="textarea" />
 								</el-form-item>
 							</el-col>
 							<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
-								<el-form-item label="备注" prop="remark">
+								<el-form-item label="备注">
 									<el-input v-model="state.ruleForm.remark" placeholder="备注" clearable type="textarea" />
 								</el-form-item>
 							</el-col>

+ 8 - 8
Web/src/views/system/user/component/userCenter.vue

@@ -54,7 +54,7 @@
 				<el-card shadow="hover">
 					<el-tabs>
 						<el-tab-pane label="基础信息">
-							<el-form :model="state.ruleFormBase" ref="ruleFormBaseRef" label-width="100px">
+							<el-form :model="state.ruleFormBase" ref="ruleFormBaseRef" label-width="70px">
 								<el-row :gutter="35">
 									<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
 										<el-form-item label="真实姓名" prop="realName" :rules="[{ required: true, message: '真实姓名不能为空', trigger: 'blur' }]">
@@ -62,7 +62,7 @@
 										</el-form-item>
 									</el-col>
 									<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
-										<el-form-item label="昵称" prop="nickName">
+										<el-form-item label="昵称">
 											<el-input v-model="state.ruleFormBase.nickName" placeholder="昵称" clearable />
 										</el-form-item>
 									</el-col>
@@ -72,17 +72,17 @@
 										</el-form-item>
 									</el-col>
 									<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
-										<el-form-item label="邮箱" prop="email">
+										<el-form-item label="邮箱">
 											<el-input v-model="state.ruleFormBase.email" placeholder="邮箱" clearable />
 										</el-form-item>
 									</el-col>
 									<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
 										<el-form-item label="出生日期" prop="birthday" :rules="[{ required: true, message: '出生日期不能为空', trigger: 'blur' }]">
-											<el-date-picker v-model="state.ruleFormBase.birthday" type="date" placeholder="出生日期" format="YYYY-MM-DD" value-format="YYYY-MM-DD" style="width: 100%" />
+											<el-date-picker v-model="state.ruleFormBase.birthday" type="date" placeholder="出生日期" format="YYYY-MM-DD" value-format="YYYY-MM-DD" class="w100" />
 										</el-form-item>
 									</el-col>
 									<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
-										<el-form-item label="性别" prop="sex">
+										<el-form-item label="性别">
 											<el-radio-group v-model="state.ruleFormBase.sex">
 												<el-radio :label="1">男</el-radio>
 												<el-radio :label="2">女</el-radio>
@@ -90,12 +90,12 @@
 										</el-form-item>
 									</el-col>
 									<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
-										<el-form-item label="地址" prop="nation">
+										<el-form-item label="地址">
 											<el-input v-model="state.ruleFormBase.address" placeholder="地址" clearable type="textarea" />
 										</el-form-item>
 									</el-col>
 									<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
-										<el-form-item label="备注" prop="remark">
+										<el-form-item label="备注">
 											<el-input v-model="state.ruleFormBase.remark" placeholder="备注" clearable type="textarea" />
 										</el-form-item>
 									</el-col>
@@ -111,7 +111,7 @@
 							<OrgTree ref="orgTreeRef" />
 						</el-tab-pane>
 						<el-tab-pane label="修改密码">
-							<el-form ref="ruleFormPasswordRef" :model="state.ruleFormPassword" label-width="80px">
+							<el-form ref="ruleFormPasswordRef" :model="state.ruleFormPassword" label-width="70px">
 								<el-form-item label="当前密码" prop="passwordOld" :rules="[{ required: true, message: '当前密码不能为空', trigger: 'blur' }]">
 									<el-input v-model="state.ruleFormPassword.passwordOld" type="password" autocomplete="off" />
 								</el-form-item>

+ 12 - 12
Web/src/views/system/user/index.vue

@@ -8,14 +8,14 @@
 			<el-col :span="20" :xs="24">
 				<el-card shadow="hover" :body-style="{ paddingBottom: '0' }">
 					<el-form :model="state.queryParams" ref="queryForm" :inline="true">
-						<el-form-item label="账号" prop="account">
-							<el-input placeholder="账号" clearable @keyup.enter="handleQuery" v-model="state.queryParams.account" />
+						<el-form-item label="账号">
+							<el-input v-model="state.queryParams.account" placeholder="账号" clearable />
 						</el-form-item>
-						<!-- <el-form-item label="姓名" prop="realName">
-							<el-input placeholder="姓名" clearable @keyup.enter="handleQuery" v-model="state.queryParams.realName" />
+						<!-- <el-form-item label="姓名">
+							<el-input v-model="state.queryParams.realName" placeholder="姓名" clearable  />
 						</el-form-item> -->
-						<el-form-item label="手机号码" prop="phone">
-							<el-input placeholder="手机号码" clearable @keyup.enter="handleQuery" v-model="state.queryParams.phone" />
+						<el-form-item label="手机号码">
+							<el-input v-model="state.queryParams.phone" placeholder="手机号码" clearable />
 						</el-form-item>
 						<el-form-item>
 							<el-button-group>
@@ -32,14 +32,14 @@
 				<el-card class="full-table" shadow="hover" style="margin-top: 8px">
 					<el-table :data="state.userData" style="width: 100%" v-loading="state.loading" border>
 						<el-table-column type="index" label="序号" width="55" align="center" fixed />
-						<el-table-column prop="account" label="账号" width="120" fixed show-overflow-tooltip />
-						<el-table-column prop="nickName" label="昵称" width="120" show-overflow-tooltip />
+						<el-table-column prop="account" label="账号" width="120" align="center" fixed show-overflow-tooltip />
+						<el-table-column prop="nickName" label="昵称" width="120" align="center" show-overflow-tooltip />
 						<el-table-column label="头像" width="80" align="center" show-overflow-tooltip>
 							<template #default="scope">
 								<el-avatar :src="scope.row.avatar" size="small">{{ scope.row.nickName?.slice(0, 1) ?? scope.row.realName?.slice(0, 1) }} </el-avatar>
 							</template>
 						</el-table-column>
-						<el-table-column prop="realName" label="姓名" width="120" show-overflow-tooltip />
+						<el-table-column prop="realName" label="姓名" width="120" align="center" show-overflow-tooltip />
 						<el-table-column label="出生日期" width="100" align="center" show-overflow-tooltip>
 							<template #default="scope">
 								{{ formatDate(new Date(scope.row.birthday), 'YYYY-mm-dd') }}
@@ -58,8 +58,8 @@
 							</template>
 						</el-table-column>
 						<el-table-column prop="orderNo" label="排序" width="70" align="center" show-overflow-tooltip />
-						<el-table-column prop="createTime" label="修改时间" width="160" show-overflow-tooltip />
-						<el-table-column prop="remark" label="备注" show-overflow-tooltip />
+						<el-table-column prop="createTime" label="修改时间" width="160" align="center" show-overflow-tooltip />
+						<el-table-column prop="remark" label="备注" header-align="center" show-overflow-tooltip />
 						<el-table-column label="操作" width="110" align="center" fixed="right" show-overflow-tooltip>
 							<template #default="scope">
 								<el-button icon="ele-Edit" size="small" text type="primary" @click="openEditUser(scope.row)" v-auth="'sysUser:update'"> 编辑 </el-button>
@@ -120,7 +120,7 @@ const state = reactive({
 	},
 	tableParams: {
 		page: 1,
-		pageSize: 10,
+		pageSize: 20,
 		total: 0 as any,
 	},
 	editUserTitle: '',

+ 2 - 2
Web/src/views/system/weChatUser/component/editWeChatUser.vue

@@ -1,13 +1,13 @@
 <template>
 	<div class="weChatUser-container">
-		<el-dialog v-model="state.isShowDialog" draggable width="600px">
+		<el-dialog v-model="state.isShowDialog" draggable :close-on-click-modal="false" width="700px">
 			<template #header>
 				<div style="color: #fff">
 					<el-icon size="16" style="margin-right: 3px; display: inline; vertical-align: middle"> <ele-Edit /> </el-icon>
 					<span> {{ props.title }} </span>
 				</div>
 			</template>
-			<el-form :model="state.ruleForm" ref="ruleFormRef" label-width="80px">
+			<el-form :model="state.ruleForm" ref="ruleFormRef" label-width="70px">
 				<el-row :gutter="35">
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
 						<el-form-item label="昵称" prop="nickName" :rules="[{ required: true, message: '昵称不能为空', trigger: 'blur' }]">

+ 12 - 12
Web/src/views/system/weChatUser/index.vue

@@ -2,11 +2,11 @@
 	<div class="weChatUser-container">
 		<el-card shadow="hover" :body-style="{ paddingBottom: '0' }">
 			<el-form :model="state.queryParams" ref="queryForm" :inline="true">
-				<el-form-item label="微信昵称" prop="nickName">
-					<el-input placeholder="微信昵称" clearable @keyup.enter="handleQuery" v-model="state.queryParams.nickName" />
+				<el-form-item label="微信昵称">
+					<el-input v-model="state.queryParams.nickName" placeholder="微信昵称" clearable />
 				</el-form-item>
-				<el-form-item label="手机号码" prop="mobile">
-					<el-input placeholder="手机号码" clearable @keyup.enter="handleQuery" v-model="state.queryParams.mobile" />
+				<el-form-item label="手机号码">
+					<el-input v-model="state.queryParams.mobile" placeholder="手机号码" clearable />
 				</el-form-item>
 				<el-form-item>
 					<el-button-group>
@@ -20,8 +20,8 @@
 		<el-card class="full-table" shadow="hover" style="margin-top: 8px">
 			<el-table :data="state.weChatUserData" style="width: 100%" v-loading="state.loading" border>
 				<el-table-column type="index" label="序号" width="55" align="center" />
-				<el-table-column prop="openId" label="OpenId" show-overflow-tooltip />
-				<el-table-column prop="unionId" label="UnionId" show-overflow-tooltip />
+				<el-table-column prop="openId" label="OpenId" align="center" show-overflow-tooltip />
+				<el-table-column prop="unionId" label="UnionId" align="center" show-overflow-tooltip />
 				<el-table-column prop="platformType" label="平台类型" width="110" align="center" show-overflow-tooltip>
 					<template #default="scope">
 						<el-tag v-if="scope.row.platformType === 1"> 微信公众号 </el-tag>
@@ -32,22 +32,22 @@
 						<el-tag v-if="scope.row.platformType === 6"> 头条系小程序 </el-tag>
 					</template>
 				</el-table-column>
-				<el-table-column prop="nickName" label="昵称" show-overflow-tooltip />
+				<el-table-column prop="nickName" label="昵称" align="center" show-overflow-tooltip />
 				<el-table-column prop="avatar" label="头像" width="70" align="center">
 					<template #default="scope">
 						<el-avatar :src="scope.row.avatar" :size="24" style="vertical-align: middle" />
 					</template>
 				</el-table-column>
-				<el-table-column prop="mobile" label="手机号码" show-overflow-tooltip />
+				<el-table-column prop="mobile" label="手机号码" align="center" show-overflow-tooltip />
 				<el-table-column prop="sex" label="性别" width="60" align="center" show-overflow-tooltip>
 					<template #default="scope">
 						<el-tag v-if="scope.row.sex === 0"> 男 </el-tag>
 						<el-tag type="danger" v-else> 女 </el-tag>
 					</template>
 				</el-table-column>
-				<el-table-column prop="city" label="城市" show-overflow-tooltip />
-				<el-table-column prop="province" label="省" show-overflow-tooltip />
-				<el-table-column prop="country" label="国家" show-overflow-tooltip />
+				<el-table-column prop="city" label="城市" align="center" show-overflow-tooltip />
+				<el-table-column prop="province" label="省" align="center" show-overflow-tooltip />
+				<el-table-column prop="country" label="国家" align="center" show-overflow-tooltip />
 				<el-table-column label="操作" width="140" fixed="right" align="center" show-overflow-tooltip>
 					<template #default="scope">
 						<el-button icon="ele-Edit" size="small" text type="primary" @click="openEditWeChatUser(scope.row)" v-auth="'sysWechatUser:update'"> 编辑 </el-button>
@@ -91,7 +91,7 @@ const state = reactive({
 	},
 	tableParams: {
 		page: 1,
-		pageSize: 10,
+		pageSize: 20,
 		total: 0 as any,
 	},
 	editWeChatUserTitle: '',

部分文件因文件數量過多而無法顯示