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

perf: 优化多租户开关、验证码开关配置逻辑

pull/278/head
dhb52 2023-10-17 22:58:53 +08:00
parent 0089d59d36
commit 2516144169
3 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.env.dev
View File

@ -29,3 +29,9 @@ VITE_SOURCEMAP=false
# 输出路径
VITE_OUT_DIR=dist
# 多租户开关(不配置默认true)
# VITE_APP_TENANT_ENABLE= false
# 验证码开关(不配置默认true)
# VITE_APP_CAPTCHA_ENABLE = false

10
src/views/Login/SocialLogin.vue
View File

@ -64,7 +64,7 @@
</el-form-item>
</el-col>
<el-col :span="24" style="padding-right: 10px; padding-left: 10px">
<el-form-item v-if="loginData.tenantEnable === 'true'" prop="tenantName">
<el-form-item v-if="loginData.tenantEnabled" prop="tenantName">
<el-input
v-model="loginData.loginForm.tenantName"
:placeholder="t('login.tenantNamePlaceholder')"
@ -193,8 +193,8 @@ const LoginRules = {
}
const loginData = reactive({
isShowPassword: false,
captchaEnable: import.meta.env.VITE_APP_CAPTCHA_ENABLE,
tenantEnable: import.meta.env.VITE_APP_TENANT_ENABLE,
captchaEnabled: import.meta.env.VITE_APP_CAPTCHA_ENABLE !== 'false',
tenantEnabled: import.meta.env.VITE_APP_TENANT_ENABLE !== 'false',
loginForm: {
tenantName: '芋道源码',
username: 'admin',
@ -207,7 +207,7 @@ const loginData = reactive({
// 获取验证码
const getCode = async () => {
// 情况一，未开启：则直接登录
if (loginData.captchaEnable === 'false') {
if (loginData.captchaEnabled) {
await handleLogin({})
} else {
// 情况二，已开启：则展示验证码；只有完成验证码的情况，才进行登录
@ -217,7 +217,7 @@ const getCode = async () => {
}
//获取租户ID
const getTenantId = async () => {
if (loginData.tenantEnable === 'true') {
if (loginData.tenantEnabled) {
const res = await LoginApi.getTenantIdByName(loginData.loginForm.tenantName)
authUtil.setTenantId(res)
}

10
src/views/Login/components/LoginForm.vue
View File

@ -16,7 +16,7 @@
</el-form-item>
</el-col>
<el-col :span="24" style="padding-right: 10px; padding-left: 10px">
<el-form-item v-if="loginData.tenantEnable === 'true'" prop="tenantName">
<el-form-item v-if="loginData.tenantEnabled" prop="tenantName">
<el-input
v-model="loginData.loginForm.tenantName"
:placeholder="t('login.tenantNamePlaceholder')"
@ -181,8 +181,8 @@ const LoginRules = {
}
const loginData = reactive({
isShowPassword: false,
captchaEnable: import.meta.env.VITE_APP_CAPTCHA_ENABLE,
tenantEnable: import.meta.env.VITE_APP_TENANT_ENABLE,
captchaEnabled: import.meta.env.VITE_APP_CAPTCHA_ENABLE !== 'false',
tenantEnabled: import.meta.env.VITE_APP_TENANT_ENABLE !== 'false',
loginForm: {
tenantName: '芋道源码',
username: 'admin',
@ -202,7 +202,7 @@ const socialList = [
// 获取验证码
const getCode = async () => {
// 情况一，未开启：则直接登录
if (loginData.captchaEnable === 'false') {
if (loginData.captchaEnabled) {
await handleLogin({})
} else {
// 情况二，已开启：则展示验证码；只有完成验证码的情况，才进行登录
@ -212,7 +212,7 @@ const getCode = async () => {
}
//获取租户ID
const getTenantId = async () => {
if (loginData.tenantEnable === 'true') {
if (loginData.tenantEnabled) {
const res = await LoginApi.getTenantIdByName(loginData.loginForm.tenantName)
authUtil.setTenantId(res)
}