geg-gas/geg-gas-web
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

多租户配置：增加配置项VITE_TENANT_INPUT_REQUIRED是否输入租户登录，默认否

Browse Source
This commit is contained in:
suguangxu
2025-05-15 12:30:20 +08:00
parent 9d7cc40b6a
commit 8bb1463146
4 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.env.development
View File

@ -39,6 +39,9 @@ VITE_GLOB_API_URL_PREFIX =
#租户开关 #租户开关
# VITE_TENANT_ENABLED = true # VITE_TENANT_ENABLED = true
#是否需要输入租户
# VITE_TENANT_INPUT_REQUIRED = true
# 屏蔽通知消息的轮询 # 屏蔽通知消息的轮询
VITE_DISABLE_NEWS=false VITE_DISABLE_NEWS=false
# 禁用关闭页面提示 # 禁用关闭页面提示

3
.env.production
View File

@ -36,5 +36,8 @@ VITE_GLOB_API_URL_PREFIX =
# 打包是否开启pwa功能 # 打包是否开启pwa功能
VITE_USE_PWA = false VITE_USE_PWA = false
#租户开关 #租户开关
VITE_TENANT_ENABLED = true VITE_TENANT_ENABLED = true
#是否需要输入租户
# VITE_TENANT_INPUT_REQUIRED = true

5
src/utils/env.ts
View File

@ -22,7 +22,7 @@ export function getAppEnvConfig() {
(import.meta.env as unknown as GlobEnvConfig) (import.meta.env as unknown as GlobEnvConfig)
: window[ENV_NAME as any]) 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)) { 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.`); 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_OUT_LINK_URL,
VITE_GLOB_REPORT_URL, VITE_GLOB_REPORT_URL,
VITE_GLOB_PRINT_BASE_URL, VITE_GLOB_PRINT_BASE_URL,
VITE_TENANT_ENABLED VITE_TENANT_ENABLED,
VITE_TENANT_INPUT_REQUIRED
}; };
} }

2
src/views/secondDev/LoginForm.vue
View File

@ -34,7 +34,7 @@
</Input> </Input>
</FormItem> </FormItem>
<FormItem v-if="getAppEnvConfig().VITE_TENANT_ENABLED && loginType =='pw'" name="tenantCode" class="enter-x"> <FormItem v-if="getAppEnvConfig().VITE_TENANT_ENABLED && getAppEnvConfig().VITE_TENANT_INPUT_REQUIRED &&loginType =='pw'" name="tenantCode" class="enter-x">
<label class="form-title"> {{ t('租户码') }}</label> <label class="form-title"> {{ t('租户码') }}</label>
<Input <Input
size="large" size="large"