From 59fb187792d0163a11dc5876b30cfca76c2a1f1c Mon Sep 17 00:00:00 2001
From: wangxiang <1827945911@qq.com>
Date: Wed, 4 May 2022 08:13:20 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=95=9F=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/core/login/ForgetPasswordForm.vue   | 48 +++++++++--------
 kicc-ui/src/views/core/login/useLogin.ts      | 53 ++++++++-----------
 2 files changed, 50 insertions(+), 51 deletions(-)

diff --git a/kicc-ui/src/views/core/login/ForgetPasswordForm.vue b/kicc-ui/src/views/core/login/ForgetPasswordForm.vue
index aca24aa4..6004bab2 100644
--- a/kicc-ui/src/views/core/login/ForgetPasswordForm.vue
+++ b/kicc-ui/src/views/core/login/ForgetPasswordForm.vue
@@ -1,33 +1,41 @@
 <template>
   <template v-if="getShow">
-    <LoginFormTitle class="enter-x" />
-    <Form class="p-4 enter-x" :model="formData" :rules="getFormRules" ref="formRef">
+    <LoginFormTitle class="enter-x"/>
+    <Form ref="formRef"
+          :model="formData"
+          class="p-4 enter-x"
+          :rules="getFormRules"
+    >
       <FormItem name="account" class="enter-x">
-        <Input
-          size="large"
-          v-model:value="formData.account"
-          :placeholder="t('sys.login.userName')"
+        <Input v-model:value="formData.account"
+               size="large"
+               :placeholder="t('sys.login.userName')"
         />
       </FormItem>
-
       <FormItem name="mobile" class="enter-x">
-        <Input size="large" v-model:value="formData.mobile" :placeholder="t('sys.login.mobile')" />
+        <Input v-model:value="formData.mobile"
+               size="large"
+               :placeholder="t('sys.login.mobile')"
+        />
       </FormItem>
       <FormItem name="sms" class="enter-x">
-        <CountdownInput
-          size="large"
-          v-model:value="formData.sms"
-          :placeholder="t('sys.login.smsCode')"
+        <CountdownInput v-model:value="formData.sms"
+                        size="large"
+                        :placeholder="t('sys.login.smsCode')"
         />
       </FormItem>
-
       <FormItem class="enter-x">
-        <Button type="primary" size="large" block @click="handleReset" :loading="loading">
-          {{ t('common.resetText') }}
-        </Button>
-        <Button size="large" block class="mt-4" @click="handleBackLogin">
-          {{ t('sys.login.backSignIn') }}
-        </Button>
+        <Button type="primary"
+                size="large"
+                block
+                :loading="loading"
+                @click="handleReset"
+        >{{ t('common.resetText') }}</Button>
+        <Button size="large"
+                block
+                class="mt-4"
+                @click="handleBackLogin"
+        >{{ t('sys.login.backSignIn') }}</Button>
       </FormItem>
     </Form>
   </template>
@@ -44,10 +52,8 @@
   const { t } = useI18n();
   const { handleBackLogin, getLoginState } = useLoginState();
   const { getFormRules } = useFormRules();
-
   const formRef = ref();
   const loading = ref(false);
-
   const formData = reactive({
     account: '',
     mobile: '',
diff --git a/kicc-ui/src/views/core/login/useLogin.ts b/kicc-ui/src/views/core/login/useLogin.ts
index 78b73fc6..df8d1639 100644
--- a/kicc-ui/src/views/core/login/useLogin.ts
+++ b/kicc-ui/src/views/core/login/useLogin.ts
@@ -72,36 +72,29 @@ export function useFormRules(formData?: Recordable) {
       sms: smsFormRule,
       mobile: mobileFormRule,
     };
-    switch (unref(currentState)) {
-      // register form rules
-      case LoginStateEnum.REGISTER:
-        return {
-          account: accountFormRule,
-          password: passwordFormRule,
-          confirmPassword: [
-            { validator: validateConfirmPassword(formData?.password), trigger: 'change' },
-          ],
-          policy: [{ validator: validatePolicy, trigger: 'change' }],
-          ...mobileRule,
-        };
-
-      // reset password form rules
-      case LoginStateEnum.RESET_PASSWORD:
-        return {
-          account: accountFormRule,
-          ...mobileRule,
-        };
-
-      // mobile form rules
-      case LoginStateEnum.MOBILE:
-        return mobileRule;
-
-      // login form rules
-      default:
-        return {
-          account: accountFormRule,
-          password: passwordFormRule,
-        };
+    let login = unref(currentState);
+    if (login === LoginStateEnum.REGISTER) {
+      return {
+        account: accountFormRule,
+        password: passwordFormRule,
+        confirmPassword: [
+          {validator: validateConfirmPassword(formData?.password), trigger: 'change'},
+        ],
+        policy: [{validator: validatePolicy, trigger: 'change'}],
+        ...mobileRule,
+      };
+    } else if (login === LoginStateEnum.RESET_PASSWORD) {
+      return {
+        account: accountFormRule,
+        ...mobileRule,
+      };
+    } else if (login === LoginStateEnum.MOBILE) {
+      return mobileRule;
+    } else {
+      return {
+        account: accountFormRule,
+        password: passwordFormRule,
+      };
     }
   });
   return { getFormRules };