From 251614416967d1f7841dc525ce1cb7065fd6a11c Mon Sep 17 00:00:00 2001
From: dhb52 <dhb52@126.com>
Date: Tue, 17 Oct 2023 22:58:53 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E5=A4=9A=E7=A7=9F?=
 =?UTF-8?q?=E6=88=B7=E5=BC=80=E5=85=B3=E3=80=81=E9=AA=8C=E8=AF=81=E7=A0=81?=
 =?UTF-8?q?=E5=BC=80=E5=85=B3=E9=85=8D=E7=BD=AE=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.dev                                 |  6 ++++++
 src/views/Login/SocialLogin.vue          | 10 +++++-----
 src/views/Login/components/LoginForm.vue | 10 +++++-----
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/.env.dev b/.env.dev
index 9200ece2..2244bf74 100644
--- a/.env.dev
+++ b/.env.dev
@@ -29,3 +29,9 @@ VITE_SOURCEMAP=false
 
 # 输出路径
 VITE_OUT_DIR=dist
+
+# 多租户开关(不配置默认true)
+# VITE_APP_TENANT_ENABLE= false
+
+# 验证码开关(不配置默认true)
+# VITE_APP_CAPTCHA_ENABLE = false
diff --git a/src/views/Login/SocialLogin.vue b/src/views/Login/SocialLogin.vue
index 6bbfc1df..33b3f297 100644
--- a/src/views/Login/SocialLogin.vue
+++ b/src/views/Login/SocialLogin.vue
@@ -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)
   }
diff --git a/src/views/Login/components/LoginForm.vue b/src/views/Login/components/LoginForm.vue
index 9bee2523..85a6190a 100644
--- a/src/views/Login/components/LoginForm.vue
+++ b/src/views/Login/components/LoginForm.vue
@@ -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)
   }
-- 
Gitee