diff --git a/Admin.NET/Admin.NET.Core/Service/Auth/SysAuthService.cs b/Admin.NET/Admin.NET.Core/Service/Auth/SysAuthService.cs index 8357dbf1..82443323 100644 --- a/Admin.NET/Admin.NET.Core/Service/Auth/SysAuthService.cs +++ b/Admin.NET/Admin.NET.Core/Service/Auth/SysAuthService.cs @@ -396,7 +396,8 @@ public class SysAuthService : IDynamicApiController, ITransient { // 关闭默认租户验证码验证 var tenantList = _sysCacheService.Get>(CacheConst.KeyTenant); - var tenant = tenantList.FirstOrDefault(u => u.Id == SqlSugarConst.DefaultTenantId); + var tenant = tenantList.FirstOrDefault(u => u.Id == SqlSugarConst.DefaultTenantId); + var tmpCaptcha = tenant.Captcha; tenant.Captcha = false; _sysCacheService.Set(CacheConst.KeyTenant, tenantList); @@ -407,8 +408,8 @@ public class SysAuthService : IDynamicApiController, ITransient TenantId = SqlSugarConst.DefaultTenantId }); - // 启用默认租户验证码验证 - tenant.Captcha = true; + // 恢复默认租户验证码状态 + tenant.Captcha = tmpCaptcha; _sysCacheService.Set(CacheConst.KeyTenant, tenantList); return 200; diff --git a/Admin.NET/Admin.NET.Core/Service/Tenant/SysTenantService.cs b/Admin.NET/Admin.NET.Core/Service/Tenant/SysTenantService.cs index a292cefa..f0bba617 100644 --- a/Admin.NET/Admin.NET.Core/Service/Tenant/SysTenantService.cs +++ b/Admin.NET/Admin.NET.Core/Service/Tenant/SysTenantService.cs @@ -683,6 +683,12 @@ public class SysTenantService : IDynamicApiController, ITransient u.Captcha, u.SecondVer }).ExecuteCommandAsync(); + + // 更新租户缓存 + var tenantList = _sysCacheService.Get>(CacheConst.KeyTenant); + var tmpTenant = tenantList.FirstOrDefault(u => u.Id == tenant.Id); + tmpTenant = tenant; + _sysCacheService.Set(CacheConst.KeyTenant, tenantList); } /// diff --git a/Web/package.json b/Web/package.json index b210c5c0..f0092d1c 100644 --- a/Web/package.json +++ b/Web/package.json @@ -2,7 +2,7 @@ "name": "admin.net.pro", "type": "module", "version": "2.4.33", - "lastBuildTime": "2025.03.26", + "lastBuildTime": "2025.03.27", "description": "Admin.NET 站在巨人肩膀上的 .NET 通用权限开发框架", "author": "zuohuaijun", "license": "MIT", @@ -77,8 +77,8 @@ "vue-signature-pad": "^3.0.2", "vue3-flag-icons": "^0.0.3", "vue3-tree-org": "^4.2.2", - "vxe-pc-ui": "^4.4.26", - "vxe-table": "^4.12.0", + "vxe-pc-ui": "^4.5.2", + "vxe-table": "^4.12.1", "vxe-table-plugin-element": "^4.0.4", "vxe-table-plugin-export-xlsx": "^4.0.7", "xe-utils": "^3.7.4", @@ -88,7 +88,7 @@ "@iconify/vue": "^4.3.0", "@plugin-web-update-notification/vite": "^2.0.0", "@types/lodash-es": "^4.17.12", - "@types/node": "^20.17.27", + "@types/node": "^20.17.28", "@types/nprogress": "^0.2.3", "@types/sortablejs": "^1.15.8", "@typescript-eslint/eslint-plugin": "^8.28.0", diff --git a/Web/src/stores/userInfo.ts b/Web/src/stores/userInfo.ts index bf218360..ebe0f4a5 100644 --- a/Web/src/stores/userInfo.ts +++ b/Web/src/stores/userInfo.ts @@ -39,8 +39,7 @@ export const useUserInfo = defineStore('userInfo', { .apiSysDictTypeAllDictListGet() .then((res) => res.data.result ?? {}); var dictListTemp = JSON.parse(JSON.stringify(dictList)); - console.log('dictListTemp', JSON.stringify(dictList)); - console.log(dictListTemp); + await Promise.all( Object.keys(dictList).map(async (key) => { dictList[key].forEach((da: any, index: any) => { @@ -187,5 +186,5 @@ export const useUserInfo = defineStore('userInfo', { const setDictLangMessageAsync = async (dict: any) => { dict.langMessage = `message.dictType.${dict.typeCode}_${dict.value}`; const text = t(dict.langMessage); - dict.label = ((text !== dict.langMessage) && (!text.endsWith(`${dict.typeCode}_${dict.value}`))) ? text : dict.label; + dict.label = text !== dict.langMessage && !text.endsWith(`${dict.typeCode}_${dict.value}`) ? text : dict.label; }; diff --git a/Web/src/theme/element.scss b/Web/src/theme/element.scss index 57ba0e5c..3233fba9 100644 --- a/Web/src/theme/element.scss +++ b/Web/src/theme/element.scss @@ -476,6 +476,25 @@ color: var(--el-color-danger) !important; } +// 级联选择-点击文本也生效 +.el-cascader-panel .el-radio { + width: 100%; + height: 100%; + z-index: 10; + position: absolute; + top: 0px; + right: -8px; +} + +.el-cascader-panel .el-checkbox { + width: 100%; + height: 100%; + z-index: 10; + position: absolute; + top: 0px; + right: 0px; +} + $--el-table-text-color: #fb6d49; // hack列表页