From 8bb146314689102e608c1d1ab38434880fca0e9c Mon Sep 17 00:00:00 2001 From: suguangxu <274928232@qq.com> Date: Thu, 15 May 2025 12:30:20 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E7=A7=9F=E6=88=B7=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=EF=BC=9A=E5=A2=9E=E5=8A=A0=E9=85=8D=E7=BD=AE=E9=A1=B9VITE=5FTE?= =?UTF-8?q?NANT=5FINPUT=5FREQUIRED=E6=98=AF=E5=90=A6=E8=BE=93=E5=85=A5?= =?UTF-8?q?=E7=A7=9F=E6=88=B7=E7=99=BB=E5=BD=95=EF=BC=8C=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E5=90=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 3 +++ .env.production | 3 +++ src/utils/env.ts | 5 +++-- src/views/secondDev/LoginForm.vue | 2 +- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.env.development b/.env.development index 922164d..166b4e1 100644 --- a/.env.development +++ b/.env.development @@ -39,6 +39,9 @@ VITE_GLOB_API_URL_PREFIX = #租户开关 # VITE_TENANT_ENABLED = true +#是否需要输入租户 +# VITE_TENANT_INPUT_REQUIRED = true + # 屏蔽通知消息的轮询 VITE_DISABLE_NEWS=false # 禁用关闭页面提示 diff --git a/.env.production b/.env.production index f0c9ac6..3cb04fd 100644 --- a/.env.production +++ b/.env.production @@ -36,5 +36,8 @@ VITE_GLOB_API_URL_PREFIX = # 打包是否开启pwa功能 VITE_USE_PWA = false + #租户开关 VITE_TENANT_ENABLED = true +#是否需要输入租户 +# VITE_TENANT_INPUT_REQUIRED = true diff --git a/src/utils/env.ts b/src/utils/env.ts index b5218cf..73dfd80 100644 --- a/src/utils/env.ts +++ b/src/utils/env.ts @@ -22,7 +22,7 @@ export function getAppEnvConfig() { (import.meta.env as unknown as GlobEnvConfig) : window[ENV_NAME as any]) as unknown as GlobEnvConfig; - const { VITE_GLOB_APP_TITLE, VITE_GLOB_API_URL, VITE_GLOB_APP_SHORT_NAME, VITE_GLOB_API_URL_PREFIX, VITE_GLOB_REQUEST_TIMEOUT, VITE_GLOB_UPLOAD_URL, VITE_GLOB_UPLOAD_PREVIEW, VITE_GLOB_OUT_LINK_URL, VITE_GLOB_REPORT_URL, VITE_GLOB_PRINT_BASE_URL, VITE_TENANT_ENABLED } = ENV; + const { VITE_GLOB_APP_TITLE, VITE_GLOB_API_URL, VITE_GLOB_APP_SHORT_NAME, VITE_GLOB_API_URL_PREFIX, VITE_GLOB_REQUEST_TIMEOUT, VITE_GLOB_UPLOAD_URL, VITE_GLOB_UPLOAD_PREVIEW, VITE_GLOB_OUT_LINK_URL, VITE_GLOB_REPORT_URL, VITE_GLOB_PRINT_BASE_URL, VITE_TENANT_ENABLED, VITE_TENANT_INPUT_REQUIRED } = ENV; if (!/^[a-zA-Z\_]*$/.test(VITE_GLOB_APP_SHORT_NAME)) { warn(`VITE_GLOB_APP_SHORT_NAME Variables can only be characters/underscores, please modify in the environment variables and re-running.`); @@ -39,7 +39,8 @@ export function getAppEnvConfig() { VITE_GLOB_OUT_LINK_URL, VITE_GLOB_REPORT_URL, VITE_GLOB_PRINT_BASE_URL, - VITE_TENANT_ENABLED + VITE_TENANT_ENABLED, + VITE_TENANT_INPUT_REQUIRED }; } diff --git a/src/views/secondDev/LoginForm.vue b/src/views/secondDev/LoginForm.vue index a1e3165..c6839aa 100644 --- a/src/views/secondDev/LoginForm.vue +++ b/src/views/secondDev/LoginForm.vue @@ -34,7 +34,7 @@ - +