yudao
/
admin-vben
mirror of https://gitee.com/yudaocode/yudao-ui-admin-vben.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

pull/60/MERGE
mrtse 2025-01-09 08:51:24 +00:00 committed by Gitee
parent e4240806b7 e4eb5a3a49
commit 535b29e2fe
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
6 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/web-antd/.env
View File

@ -7,7 +7,7 @@ VITE_APP_NAMESPACE=yudao-vben-antd
VITE_NITRO_MOCK=false VITE_NITRO_MOCK=false
# 租户开关 # 租户开关
VITE_APP_TENANT_ENABLE=true VITE_GLOB_TENANT_ENABLE=true
# 验证码的开关 # 验证码的开关
VITE_APP_CAPTCHA_ENABLE=true VITE_GLOB_CAPTCHA_ENABLE=false

2
apps/web-antd/src/locales/langs/en-US/page.json
View File

@ -5,7 +5,7 @@
"codeLogin": "Code Login", "codeLogin": "Code Login",
"qrcodeLogin": "Qr Code Login", "qrcodeLogin": "Qr Code Login",
"forgetPassword": "Forget Password", "forgetPassword": "Forget Password",
"tenantname": "Tenant Name", "tenantName": "Tenant Name",
"username": "Username", "username": "Username",
"password": "Password", "password": "Password",
"usernameTip": "Please enter username", "usernameTip": "Please enter username",

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

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

8
apps/web-antd/src/views/_core/authentication/login.vue
View File

@ -37,13 +37,13 @@ const formSchema = computed((): VbenFormSchema[] => {
{ {
component: 'VbenInput', component: 'VbenInput',
componentProps: { componentProps: {
placeholder: $t('authentication.tenantName'), placeholder: $t('page.auth.tenantName'),
}, },
fieldName: 'tenantName', fieldName: 'tenantName',
label: $t('authentication.tenantName'), label: $t('page.auth.tenantName'),
rules: z rules: z
.string() .string()
.min(1, { message: $t('authentication.tenantNameTip') }) .min(1, { message: $t('page.auth.tenantNameTip') })
.default(import.meta.env.VITE_APP_DEFAULT_TENANT_NAME), .default(import.meta.env.VITE_APP_DEFAULT_TENANT_NAME),
dependencies: { dependencies: {
triggerFields: ['tenantName'], triggerFields: ['tenantName'],
@ -56,7 +56,7 @@ const formSchema = computed((): VbenFormSchema[] => {
{ {
component: 'VbenInput', component: 'VbenInput',
componentProps: { componentProps: {
placeholder: $t('authentication.usernameTip'), placeholder: $t('authentication.username'),
}, },
fieldName: 'username', fieldName: 'username',
label: $t('authentication.username'), label: $t('authentication.username'),

11
packages/effects/hooks/src/use-app-config.ts
View File

@ -15,12 +15,15 @@ export function useAppConfig(
? window._VBEN_ADMIN_PRO_APP_CONF_ ? window._VBEN_ADMIN_PRO_APP_CONF_
: (env as VbenAdminProAppConfigRaw); : (env as VbenAdminProAppConfigRaw);
const { VITE_APP_CAPTCHA_ENABLE, VITE_APP_TENANT_ENABLE, VITE_GLOB_API_URL } = const {
config; VITE_GLOB_CAPTCHA_ENABLE,
VITE_GLOB_TENANT_ENABLE,
VITE_GLOB_API_URL,
} = config;
return { return {
apiURL: VITE_GLOB_API_URL, apiURL: VITE_GLOB_API_URL,
captchaEnable: VITE_APP_CAPTCHA_ENABLE, captchaEnable: VITE_GLOB_CAPTCHA_ENABLE === 'true',
tenantEnable: VITE_APP_TENANT_ENABLE, tenantEnable: VITE_GLOB_TENANT_ENABLE === 'true',
}; };
} }

4
packages/types/global.d.ts vendored
View File

@ -9,8 +9,8 @@ declare module 'vue-router' {
export interface VbenAdminProAppConfigRaw { export interface VbenAdminProAppConfigRaw {
VITE_GLOB_API_URL: string; VITE_GLOB_API_URL: string;
VITE_APP_TENANT_ENABLE: boolean; VITE_GLOB_TENANT_ENABLE: string;
VITE_APP_CAPTCHA_ENABLE: boolean; VITE_GLOB_CAPTCHA_ENABLE: string;
} }
export interface ApplicationConfig { export interface ApplicationConfig {