From 5b21395ca6bd3cfa262d926c66236f29e8dfcaba Mon Sep 17 00:00:00 2001 From: mrtse Date: Wed, 8 Jan 2025 22:27:20 +0800 Subject: [PATCH 1/4] fix: i18n translate tenantName --- apps/web-antd/src/locales/langs/en-US/page.json | 2 +- apps/web-antd/src/locales/langs/zh-CN/page.json | 2 +- apps/web-antd/src/views/_core/authentication/login.vue | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/web-antd/src/locales/langs/en-US/page.json b/apps/web-antd/src/locales/langs/en-US/page.json index 64764728a..34d79bb45 100644 --- a/apps/web-antd/src/locales/langs/en-US/page.json +++ b/apps/web-antd/src/locales/langs/en-US/page.json @@ -5,7 +5,7 @@ "codeLogin": "Code Login", "qrcodeLogin": "Qr Code Login", "forgetPassword": "Forget Password", - "tenantname": "Tenant Name", + "tenantName": "Tenant Name", "username": "Username", "password": "Password", "usernameTip": "Please enter username", diff --git a/apps/web-antd/src/locales/langs/zh-CN/page.json b/apps/web-antd/src/locales/langs/zh-CN/page.json index 92dcb5117..24c276160 100644 --- a/apps/web-antd/src/locales/langs/zh-CN/page.json +++ b/apps/web-antd/src/locales/langs/zh-CN/page.json @@ -5,7 +5,7 @@ "codeLogin": "验证码登录", "qrcodeLogin": "二维码登录", "forgetPassword": "忘记密码", - "tenantname": "租户", + "tenantName": "租户", "username": "账号", "password": "密码", "usernameTip": "请输入用户名", diff --git a/apps/web-antd/src/views/_core/authentication/login.vue b/apps/web-antd/src/views/_core/authentication/login.vue index 9505e923b..e9d3cab32 100644 --- a/apps/web-antd/src/views/_core/authentication/login.vue +++ b/apps/web-antd/src/views/_core/authentication/login.vue @@ -37,13 +37,13 @@ const formSchema = computed((): VbenFormSchema[] => { { component: 'VbenInput', componentProps: { - placeholder: $t('authentication.tenantName'), + placeholder: $t('page.auth.tenantName'), }, fieldName: 'tenantName', - label: $t('authentication.tenantName'), + label: $t('page.auth.tenantName'), rules: z .string() - .min(1, { message: $t('authentication.tenantNameTip') }) + .min(1, { message: $t('page.auth.tenantNameTip') }) .default(import.meta.env.VITE_APP_DEFAULT_TENANT_NAME), dependencies: { triggerFields: ['tenantName'], @@ -56,7 +56,7 @@ const formSchema = computed((): VbenFormSchema[] => { { component: 'VbenInput', componentProps: { - placeholder: $t('authentication.usernameTip'), + placeholder: $t('authentication.username'), }, fieldName: 'username', label: $t('authentication.username'), -- Gitee From 923b7941fb3a620529df95a60549cac6c2b06aff Mon Sep 17 00:00:00 2001 From: mrtse Date: Thu, 9 Jan 2025 00:06:14 +0800 Subject: [PATCH 2/4] fix: global env invalid --- apps/web-antd/.env | 4 ++-- packages/effects/hooks/src/use-app-config.ts | 11 +++++++---- packages/types/global.d.ts | 4 ++-- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/apps/web-antd/.env b/apps/web-antd/.env index affa21483..7ced7e7d6 100644 --- a/apps/web-antd/.env +++ b/apps/web-antd/.env @@ -7,7 +7,7 @@ VITE_APP_NAMESPACE=yudao-vben-antd VITE_NITRO_MOCK=false # 租户开关 -VITE_APP_TENANT_ENABLE=true +VITE_GLOBAL_TENANT_ENABLE=true # 验证码的开关 -VITE_APP_CAPTCHA_ENABLE=true +VITE_GLOBAL_CAPTCHA_ENABLE=false diff --git a/packages/effects/hooks/src/use-app-config.ts b/packages/effects/hooks/src/use-app-config.ts index fd2ae74d3..f2e4b0cce 100644 --- a/packages/effects/hooks/src/use-app-config.ts +++ b/packages/effects/hooks/src/use-app-config.ts @@ -15,12 +15,15 @@ export function useAppConfig( ? window._VBEN_ADMIN_PRO_APP_CONF_ : (env as VbenAdminProAppConfigRaw); - const { VITE_APP_CAPTCHA_ENABLE, VITE_APP_TENANT_ENABLE, VITE_GLOB_API_URL } = - config; + const { + VITE_GLOBAL_CAPTCHA_ENABLE, + VITE_GLOBAL_TENANT_ENABLE, + VITE_GLOB_API_URL, + } = config; return { apiURL: VITE_GLOB_API_URL, - captchaEnable: VITE_APP_CAPTCHA_ENABLE, - tenantEnable: VITE_APP_TENANT_ENABLE, + captchaEnable: VITE_GLOBAL_CAPTCHA_ENABLE, + tenantEnable: VITE_GLOBAL_TENANT_ENABLE, }; } diff --git a/packages/types/global.d.ts b/packages/types/global.d.ts index 8280443b3..dcbd2cb39 100644 --- a/packages/types/global.d.ts +++ b/packages/types/global.d.ts @@ -9,8 +9,8 @@ declare module 'vue-router' { export interface VbenAdminProAppConfigRaw { VITE_GLOB_API_URL: string; - VITE_APP_TENANT_ENABLE: boolean; - VITE_APP_CAPTCHA_ENABLE: boolean; + VITE_GLOBAL_TENANT_ENABLE: boolean; + VITE_GLOBAL_CAPTCHA_ENABLE: boolean; } export interface ApplicationConfig { -- Gitee From 602bb1f6a0580a36a355d470adefca5fd05f4658 Mon Sep 17 00:00:00 2001 From: mrtse Date: Thu, 9 Jan 2025 08:55:47 +0800 Subject: [PATCH 3/4] fix: glob env invalid --- apps/web-antd/.env | 4 ++-- packages/effects/hooks/src/use-app-config.ts | 8 ++++---- packages/types/global.d.ts | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/apps/web-antd/.env b/apps/web-antd/.env index 7ced7e7d6..60ecdabb3 100644 --- a/apps/web-antd/.env +++ b/apps/web-antd/.env @@ -7,7 +7,7 @@ VITE_APP_NAMESPACE=yudao-vben-antd VITE_NITRO_MOCK=false # 租户开关 -VITE_GLOBAL_TENANT_ENABLE=true +VITE_GLOB_TENANT_ENABLE=true # 验证码的开关 -VITE_GLOBAL_CAPTCHA_ENABLE=false +VITE_GLOB_CAPTCHA_ENABLE=false diff --git a/packages/effects/hooks/src/use-app-config.ts b/packages/effects/hooks/src/use-app-config.ts index f2e4b0cce..343191afb 100644 --- a/packages/effects/hooks/src/use-app-config.ts +++ b/packages/effects/hooks/src/use-app-config.ts @@ -16,14 +16,14 @@ export function useAppConfig( : (env as VbenAdminProAppConfigRaw); const { - VITE_GLOBAL_CAPTCHA_ENABLE, - VITE_GLOBAL_TENANT_ENABLE, + VITE_GLOB_CAPTCHA_ENABLE, + VITE_GLOB_TENANT_ENABLE, VITE_GLOB_API_URL, } = config; return { apiURL: VITE_GLOB_API_URL, - captchaEnable: VITE_GLOBAL_CAPTCHA_ENABLE, - tenantEnable: VITE_GLOBAL_TENANT_ENABLE, + captchaEnable: VITE_GLOB_CAPTCHA_ENABLE, + tenantEnable: VITE_GLOB_TENANT_ENABLE, }; } diff --git a/packages/types/global.d.ts b/packages/types/global.d.ts index dcbd2cb39..a57b6da97 100644 --- a/packages/types/global.d.ts +++ b/packages/types/global.d.ts @@ -9,8 +9,8 @@ declare module 'vue-router' { export interface VbenAdminProAppConfigRaw { VITE_GLOB_API_URL: string; - VITE_GLOBAL_TENANT_ENABLE: boolean; - VITE_GLOBAL_CAPTCHA_ENABLE: boolean; + VITE_GLOB_TENANT_ENABLE: boolean; + VITE_GLOB_CAPTCHA_ENABLE: boolean; } export interface ApplicationConfig { -- Gitee From e4eb5a3a49531129a01f893128151bae3cc7dc74 Mon Sep 17 00:00:00 2001 From: mrtse Date: Thu, 9 Jan 2025 15:41:21 +0800 Subject: [PATCH 4/4] fix: env variable is string --- packages/effects/hooks/src/use-app-config.ts | 4 ++-- packages/types/global.d.ts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/effects/hooks/src/use-app-config.ts b/packages/effects/hooks/src/use-app-config.ts index 343191afb..a1fab3059 100644 --- a/packages/effects/hooks/src/use-app-config.ts +++ b/packages/effects/hooks/src/use-app-config.ts @@ -23,7 +23,7 @@ export function useAppConfig( return { apiURL: VITE_GLOB_API_URL, - captchaEnable: VITE_GLOB_CAPTCHA_ENABLE, - tenantEnable: VITE_GLOB_TENANT_ENABLE, + captchaEnable: VITE_GLOB_CAPTCHA_ENABLE === 'true', + tenantEnable: VITE_GLOB_TENANT_ENABLE === 'true', }; } diff --git a/packages/types/global.d.ts b/packages/types/global.d.ts index a57b6da97..4608311f4 100644 --- a/packages/types/global.d.ts +++ b/packages/types/global.d.ts @@ -9,8 +9,8 @@ declare module 'vue-router' { export interface VbenAdminProAppConfigRaw { VITE_GLOB_API_URL: string; - VITE_GLOB_TENANT_ENABLE: boolean; - VITE_GLOB_CAPTCHA_ENABLE: boolean; + VITE_GLOB_TENANT_ENABLE: string; + VITE_GLOB_CAPTCHA_ENABLE: string; } export interface ApplicationConfig { -- Gitee