From 923b7941fb3a620529df95a60549cac6c2b06aff Mon Sep 17 00:00:00 2001 From: mrtse Date: Thu, 9 Jan 2025 00:06:14 +0800 Subject: [PATCH] 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 {