From 6628ca5372f1384ebc0c849fd2cad4c1f12775b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=99=E6=84=8F?= Date: Fri, 28 Mar 2025 22:29:02 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E5=BC=80=E5=90=AF=E5=A4=9A=E8=AF=AD=E8=A8=80=E5=88=87=E6=8D=A2?= =?UTF-8?q?=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Admin.NET/Admin.NET.Core/Const/ConfigConst.cs | 5 +++++ .../Admin.NET.Core/SeedData/SysConfigSeedData.cs | 1 + .../Admin.NET.Core/Service/Tenant/SysTenantService.cs | 4 +++- Web/src/layout/navBars/topBar/user.vue | 2 +- Web/src/stores/themeConfig.ts | 2 ++ Web/src/types/pinia.d.ts | 11 ++++++----- Web/src/utils/sysInfo.ts | 2 ++ Web/src/views/login/index.vue | 2 +- 8 files changed, 21 insertions(+), 8 deletions(-) diff --git a/Admin.NET/Admin.NET.Core/Const/ConfigConst.cs b/Admin.NET/Admin.NET.Core/Const/ConfigConst.cs index eb96c08c..b3104f1e 100644 --- a/Admin.NET/Admin.NET.Core/Const/ConfigConst.cs +++ b/Admin.NET/Admin.NET.Core/Const/ConfigConst.cs @@ -116,6 +116,11 @@ public class ConfigConst /// public const string SysUpgrade = "sys_upgrade"; + /// + /// 开启多语言切换 + /// + public const string SysI18NSwitch = "sys_i18n_switch"; + /// /// 支付宝授权页面地址 /// diff --git a/Admin.NET/Admin.NET.Core/SeedData/SysConfigSeedData.cs b/Admin.NET/Admin.NET.Core/SeedData/SysConfigSeedData.cs index 67dd0b64..28c99c76 100644 --- a/Admin.NET/Admin.NET.Core/SeedData/SysConfigSeedData.cs +++ b/Admin.NET/Admin.NET.Core/SeedData/SysConfigSeedData.cs @@ -38,6 +38,7 @@ public class SysConfigSeedData : ISqlSugarEntitySeedData new SysConfig{ Id=1300000000251, Name="密码时间有效期", Code=ConfigConst.SysPasswordExpirationTime, Value="0", SysFlag=YesNoEnum.Y, Remark="默认0表示永不过期，否则表示过期天数", OrderNo=200, GroupCode=ConfigConst.SysDefaultGroup, CreateTime=DateTime.Parse("2024-12-17 00:00:00") }, new SysConfig{ Id=1300000000261, Name="密码历史记录验证", Code=ConfigConst.SysPasswordRecord, Value="False", SysFlag=YesNoEnum.Y, Remark="是否验证历史密码禁止再次使用", OrderNo=210, GroupCode=ConfigConst.SysDefaultGroup, CreateTime=DateTime.Parse("2024-12-17 00:00:00") }, new SysConfig{ Id=1300000000271, Name="显示系统更新日志", Code=ConfigConst.SysUpgrade, Value="True", SysFlag=YesNoEnum.Y, Remark="是否显示系统更新日志", OrderNo=220, GroupCode=ConfigConst.SysDefaultGroup, CreateTime=DateTime.Parse("2024-12-20 00:00:00") }, + new SysConfig{ Id=1300000000281, Name="开启多语言切换", Code=ConfigConst.SysI18NSwitch, Value="True", SysFlag=YesNoEnum.Y, Remark="是否显示多语言切换按钮", OrderNo=230, GroupCode=ConfigConst.SysDefaultGroup, CreateTime=DateTime.Parse("2024-12-20 00:00:00") }, ]; } } \ No newline at end of file diff --git a/Admin.NET/Admin.NET.Core/Service/Tenant/SysTenantService.cs b/Admin.NET/Admin.NET.Core/Service/Tenant/SysTenantService.cs index f0bba617..aa2f11a3 100644 --- a/Admin.NET/Admin.NET.Core/Service/Tenant/SysTenantService.cs +++ b/Admin.NET/Admin.NET.Core/Service/Tenant/SysTenantService.cs @@ -586,6 +586,7 @@ public class SysTenantService : IDynamicApiController, ITransient var forceChangePassword = await _sysConfigService.GetConfigValueByCode(ConfigConst.SysForceChangePassword); // 强制修改密码 var passwordExpirationTime = await _sysConfigService.GetConfigValueByCode(ConfigConst.SysPasswordExpirationTime); // 密码有效期 + var i18NSwitch = await _sysConfigService.GetConfigValueByCode(ConfigConst.SysI18NSwitch); // 开启多语言切换 var publicKey = App.GetConfig("Cryptogram:PublicKey", true); // 获取密码加解密公钥配置 return new @@ -608,7 +609,8 @@ public class SysTenantService : IDynamicApiController, ITransient ForceChangePassword = forceChangePassword, PasswordExpirationTime = passwordExpirationTime, PublicKey = publicKey, - CarouselFiles = carouselFiles + CarouselFiles = carouselFiles, + I18NSwitch = i18NSwitch, }; } diff --git a/Web/src/layout/navBars/topBar/user.vue b/Web/src/layout/navBars/topBar/user.vue index d73de065..c57d2774 100644 --- a/Web/src/layout/navBars/topBar/user.vue +++ b/Web/src/layout/navBars/topBar/user.vue @@ -12,7 +12,7 @@ - +
diff --git a/Web/src/stores/themeConfig.ts b/Web/src/stores/themeConfig.ts index 0ee78284..12e26376 100644 --- a/Web/src/stores/themeConfig.ts +++ b/Web/src/stores/themeConfig.ts @@ -152,6 +152,8 @@ export const useThemeConfig = defineStore('themeConfig', { icp: '省ICP备12345678号', // Icp地址 icpUrl: 'https://beian.miit.gov.cn', + // 是否开启多语言切换 + i18NSwitch: true, }, }), actions: { diff --git a/Web/src/types/pinia.d.ts b/Web/src/types/pinia.d.ts index c0b62549..5c71cd39 100644 --- a/Web/src/types/pinia.d.ts +++ b/Web/src/types/pinia.d.ts @@ -99,10 +99,11 @@ declare interface ThemeConfigState { logoUrl: string; // 系统 logo 地址 icp: string; // Icp备案号 icpUrl: string; // Icp地址 - version: string; // 版本号 - secondVer: boolean; // 是否开启二级验证 - captcha: boolean; // 是否开启验证码 - forceChangePassword: boolean; // 是否开启强制修改密码 - passwordExpirationTime: number; // 是否验证密码有效期 + version?: string; // 版本号 + secondVer?: boolean; // 是否开启二级验证 + captcha?: boolean; // 是否开启验证码 + forceChangePassword?: boolean; // 是否开启强制修改密码 + passwordExpirationTime?: number; // 是否验证密码有效期 + i18NSwitch: boolean; // 是否开启多语言切换 }; } diff --git a/Web/src/utils/sysInfo.ts b/Web/src/utils/sysInfo.ts index 837a6f78..833aa112 100644 --- a/Web/src/utils/sysInfo.ts +++ b/Web/src/utils/sysInfo.ts @@ -54,6 +54,8 @@ export async function loadSysInfo(tenantid: number) { themeConfig.value.forceChangePassword = data.forceChangePassword; // 是否验证密码有效期 themeConfig.value.passwordExpirationTime = data.passwordExpirationTime; + // 开启多语言切换 + themeConfig.value.i18NSwitch = data.i18NSwitch; // 密码加解密公匙 window.__env__.VITE_SM_PUBLIC_KEY = data.publicKey; diff --git a/Web/src/views/login/index.vue b/Web/src/views/login/index.vue index 0b8a00dd..a759b74d 100644 --- a/Web/src/views/login/index.vue +++ b/Web/src/views/login/index.vue @@ -46,7 +46,7 @@ -
+