diff --git a/apps/web-antd/.env b/apps/web-antd/.env index affa214833742ef89e4b8469a16dea674165fa9b..60ecdabb371849c41a59bbd1827022581609ae20 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_GLOB_TENANT_ENABLE=true # 验证码的开关 -VITE_APP_CAPTCHA_ENABLE=true +VITE_GLOB_CAPTCHA_ENABLE=false 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 64764728ac775e75c02121c1ca4849e88978d618..34d79bb45e1945bb8f3a23bd784545dfd4ee2a8c 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 92dcb51176882d0f74179c5484db2f98cd23f1e9..24c276160a42ad391478a9a5480345719380ba31 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 9505e923ba5d69b43bf91b5cf3a96453f0455e79..e9d3cab32a4f9ca750c6f1da2a636b90b7179803 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'), diff --git a/packages/effects/hooks/src/use-app-config.ts b/packages/effects/hooks/src/use-app-config.ts index fd2ae74d3e260bbdc295c48234450cfd8d60957d..a1fab3059ded55f1d276f9e65c658eea043c30e5 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_GLOB_CAPTCHA_ENABLE, + VITE_GLOB_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_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 8280443b3943a1d497d4cd516a2f2c990dcf7a6b..4608311f4cf4286eb8c9589c94b442ecbefa192e 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_GLOB_TENANT_ENABLE: string; + VITE_GLOB_CAPTCHA_ENABLE: string; } export interface ApplicationConfig {