Pre Merge pull request !60 from mrtse/dev-v5

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

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",

apps/web-antd/src/locales/langs/zh-CN/page.json

@@ -5,7 +5,7 @@
     "codeLogin": "验证码登录",
     "qrcodeLogin": "二维码登录",
     "forgetPassword": "忘记密码",
-    "tenantname": "租户",
+    "tenantName": "租户",
     "username": "账号",
     "password": "密码",
     "usernameTip": "请输入用户名",

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'),

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',
   };
 }

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 {