From 502ba048ac7528027f8abe06caef80152f391ba1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=97=B6=E5=90=AF=E9=BE=99?= <shiqilong@beyondcent.com>
Date: Thu, 29 Aug 2024 14:31:43 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20ukey=E7=99=BB=E5=BD=95=E8=BE=93=E5=85=A5?=
 =?UTF-8?q?=E5=AF=86=E7=A0=81=E5=90=8E=EF=BC=8C=E4=B8=80=E5=9B=9E=E8=BD=A6?=
 =?UTF-8?q?=E5=B0=B1=E8=87=AA=E5=8A=A8=E5=88=B7=E6=96=B0=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/login/login.vue | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/views/login/login.vue b/src/views/login/login.vue
index 15eee49..5a82ce2 100644
--- a/src/views/login/login.vue
+++ b/src/views/login/login.vue
@@ -13,7 +13,7 @@
         <span class="desc-title">{{ configs.promotionalTitle }}</span>
         <span class="desc-remark">{{ configs.promotionalContent }}</span>
       </div>
-      <el-form :model="loginForm" ref="loginFormRef" label-position="left" label-width="0px" class="card-box login-form" @keyup.enter="activeName === 'normal' ? handleLogin : handleUkeyLogin">
+      <el-form :model="loginForm" ref="loginFormRef" label-position="left" label-width="0px" class="card-box login-form" @keyup.enter="handleUkeyLogin" @submit.prevent>
         <el-tabs v-model="activeName">
           <el-tab-pane label="云管登录" name="normal">
             <div v-if="activeName === 'normal'">
@@ -52,7 +52,7 @@
             <div v-if="activeName === 'UKEY'">
               <el-tooltip :visible="capsTooltip" content="大写锁定已打开" placement="right" :manual="true">
                 <el-form-item class="login-form-item" prop="ukeyPassword" :rules="[{ ...required, message: '请输入UKEY密码' }]">
-                  <el-input show-password v-model="loginForm.ukeyPassword" placeholder="UKEY密码" @blur="capsTooltip = false" @keyup="checkCapslock">
+                  <el-input show-password v-model="loginForm.ukeyPassword" placeholder="UKEY密码" @blur="capsTooltip = false" @keyup="checkCapslock" ref="ukeyPasswordInputRef">
                     <template #prefix>
                       <el-icon><icon-ep-lock /></el-icon>
                     </template>
@@ -79,7 +79,11 @@ import { required } from '@/validate'
 import { setUkeyPassword } from 'utils/auth'
 import type { FormInstance } from 'element-plus'
 
-const activeName = ref('normal')
+const ukeyPasswordInputRef = ref()
+onMounted(() => {
+  if (typeof ukeyPasswordInputRef.value.focus === 'function') ukeyPasswordInputRef.value.focus()
+})
+const activeName = ref('UKEY')
 const loginForm = reactive({
   account: '',
   password: '',