From e442b72706398e377f1f32f0eb7c509be88e0d21 Mon Sep 17 00:00:00 2001
From: xingyu <xingyu4j@vip.qq.com>
Date: Tue, 6 Dec 2022 21:36:46 +0800
Subject: [PATCH] perf: use xbutton

---
 .../src/views/Login/components/MobileForm.vue | 31 ++++++++++++-------
 .../src/views/Login/components/QrCodeForm.vue | 10 +++---
 .../views/Login/components/RegisterForm.vue   | 13 +++++---
 3 files changed, 33 insertions(+), 21 deletions(-)

diff --git a/yudao-ui-admin-vue3/src/views/Login/components/MobileForm.vue b/yudao-ui-admin-vue3/src/views/Login/components/MobileForm.vue
index e7c639172..8f0cbdb3c 100644
--- a/yudao-ui-admin-vue3/src/views/Login/components/MobileForm.vue
+++ b/yudao-ui-admin-vue3/src/views/Login/components/MobileForm.vue
@@ -17,7 +17,7 @@
         </el-form-item>
       </el-col>
       <el-col :span="24" style="padding-left: 10px; padding-right: 10px">
-        <el-form-item prop="tenantName">
+        <el-form-item prop="tenantName" v-if="loginData.tenantEnable === 'true'">
           <el-input
             type="text"
             v-model="loginData.loginForm.tenantName"
@@ -69,16 +69,23 @@
       <!-- 登录按钮 / 返回按钮 -->
       <el-col :span="24" style="padding-left: 10px; padding-right: 10px">
         <el-form-item>
-          <el-button :loading="loginLoading" type="primary" class="w-[100%]" @click="signIn">
-            {{ t('login.login') }}
-          </el-button>
+          <XButton
+            :loading="loginLoading"
+            type="primary"
+            class="w-[100%]"
+            :title="t('login.login')"
+            @click="signIn()"
+          />
         </el-form-item>
       </el-col>
       <el-col :span="24" style="padding-left: 10px; padding-right: 10px">
         <el-form-item>
-          <el-button :loading="loginLoading" class="w-[100%]" @click="handleBackLogin">
-            {{ t('login.backLogin') }}
-          </el-button>
+          <XButton
+            :loading="loginLoading"
+            class="w-[100%]"
+            :title="t('login.backLogin')"
+            @click="handleBackLogin()"
+          />
         </el-form-item>
       </el-col>
     </el-row>
@@ -92,8 +99,8 @@ import type { RouteLocationNormalizedLoaded } from 'vue-router'
 import { useI18n } from '@/hooks/web/useI18n'
 import { useIcon } from '@/hooks/web/useIcon'
 import { useMessage } from '@/hooks/web/useMessage'
-import { setTenantId, setToken } from '@/utils/auth'
 import { required } from '@/utils/formRules'
+import { setTenantId, setToken } from '@/utils/auth'
 import { usePermissionStore } from '@/store/modules/permission'
 import { getTenantIdByNameApi, sendSmsCodeApi, smsLoginApi } from '@/api/login'
 import LoginFormTitle from './LoginFormTitle.vue'
@@ -119,7 +126,7 @@ const rules = {
 }
 const loginData = reactive({
   codeImg: '',
-  tenantEnable: true,
+  tenantEnable: import.meta.env.VITE_APP_TENANT_ENABLE,
   token: '',
   loading: {
     signIn: false
@@ -169,8 +176,10 @@ watch(
 )
 // 获取租户 ID
 const getTenantId = async () => {
-  const res = await getTenantIdByNameApi(loginData.loginForm.tenantName)
-  setTenantId(res)
+  if (loginData.tenantEnable === 'true') {
+    const res = await getTenantIdByNameApi(loginData.loginForm.tenantName)
+    setTenantId(res)
+  }
 }
 // 登录
 const signIn = async () => {
diff --git a/yudao-ui-admin-vue3/src/views/Login/components/QrCodeForm.vue b/yudao-ui-admin-vue3/src/views/Login/components/QrCodeForm.vue
index 62ea95128..e312480bd 100644
--- a/yudao-ui-admin-vue3/src/views/Login/components/QrCodeForm.vue
+++ b/yudao-ui-admin-vue3/src/views/Login/components/QrCodeForm.vue
@@ -11,9 +11,7 @@
     <el-divider class="enter-x">{{ t('login.qrcode') }}</el-divider>
     <el-col :span="24" style="padding-left: 10px; padding-right: 10px">
       <div class="w-[100%] mt-15px">
-        <el-button class="w-[100%]" @click="handleBackLogin">
-          {{ t('sys.login.backSignIn') }}
-        </el-button>
+        <XButton class="w-[100%]" :title="t('login.backLogin')" @click="handleBackLogin()" />
       </div>
     </el-col>
   </el-row>
@@ -21,11 +19,11 @@
 <script setup lang="ts">
 import { computed, unref } from 'vue'
 import { ElRow, ElCol, ElCard, ElDivider } from 'element-plus'
-import { useI18n } from '@/hooks/web/useI18n'
-import { useLoginState, LoginStateEnum } from './useLogin'
-import LoginFormTitle from './LoginFormTitle.vue'
 import { Qrcode } from '@/components/Qrcode'
 import logoImg from '@/assets/imgs/logo.png'
+import { useI18n } from '@/hooks/web/useI18n'
+import LoginFormTitle from './LoginFormTitle.vue'
+import { useLoginState, LoginStateEnum } from './useLogin'
 
 const { t } = useI18n()
 const { handleBackLogin, getLoginState } = useLoginState()
diff --git a/yudao-ui-admin-vue3/src/views/Login/components/RegisterForm.vue b/yudao-ui-admin-vue3/src/views/Login/components/RegisterForm.vue
index 863ca5bd5..1b86283e2 100644
--- a/yudao-ui-admin-vue3/src/views/Login/components/RegisterForm.vue
+++ b/yudao-ui-admin-vue3/src/views/Login/components/RegisterForm.vue
@@ -21,14 +21,19 @@
 
     <template #register>
       <div class="w-[100%]">
-        <el-button type="primary" class="w-[100%]" :loading="loading" @click="loginRegister">
-          {{ t('login.register') }}
-        </el-button>
+        <XButton
+          :loading="loading"
+          type="primary"
+          class="w-[100%]"
+          :title="t('login.register')"
+          @click="loginRegister()"
+        />
       </div>
       <div class="w-[100%] mt-15px">
         <el-button class="w-[100%]" @click="handleBackLogin">
           {{ t('login.hasUser') }}
         </el-button>
+        <XButton class="w-[100%]" :title="t('login.hasUser')" @click="handleBackLogin()" />
       </div>
     </template>
   </Form>
@@ -40,8 +45,8 @@ import { Form } from '@/components/Form'
 import { useI18n } from '@/hooks/web/useI18n'
 import { useForm } from '@/hooks/web/useForm'
 import { useValidator } from '@/hooks/web/useValidator'
-import { useLoginState, LoginStateEnum } from './useLogin'
 import LoginFormTitle from './LoginFormTitle.vue'
+import { useLoginState, LoginStateEnum } from './useLogin'
 import { FormSchema } from '@/types/form'
 
 const { t } = useI18n()