From c8217768910f0d723283d0de8c2378e4a2166b6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BA=90=E6=96=87=E9=9B=A8?=
<41315874+fumiama@users.noreply.github.com>
Date: Mon, 13 Mar 2023 20:23:24 +0800
Subject: [PATCH] edit login
---
frontend/vben/src/views/sys/login/Login.vue | 4 ++--
.../vben/src/views/sys/login/LoginForm.vue | 19 +++++++++------
.../src/views/sys/login/LoginFormTitle.vue | 2 +-
frontend/vben/src/views/sys/login/useLogin.ts | 24 +++++++++----------
4 files changed, 27 insertions(+), 22 deletions(-)
diff --git a/frontend/vben/src/views/sys/login/Login.vue b/frontend/vben/src/views/sys/login/Login.vue
index 75eefa0..1f8d663 100644
--- a/frontend/vben/src/views/sys/login/Login.vue
+++ b/frontend/vben/src/views/sys/login/Login.vue
@@ -39,7 +39,7 @@
-
+
@@ -53,7 +53,7 @@
import LoginForm from './LoginForm.vue'
import ForgetPasswordForm from './ForgetPasswordForm.vue'
import RegisterForm from './RegisterForm.vue'
- import MobileForm from './MobileForm.vue'
+ // import MobileForm from './MobileForm.vue'
import { useGlobSetting } from '/@/hooks/setting'
import { useI18n } from '/@/hooks/web/useI18n'
import { useDesign } from '/@/hooks/web/useDesign'
diff --git a/frontend/vben/src/views/sys/login/LoginForm.vue b/frontend/vben/src/views/sys/login/LoginForm.vue
index 5c62fec..e929a4d 100644
--- a/frontend/vben/src/views/sys/login/LoginForm.vue
+++ b/frontend/vben/src/views/sys/login/LoginForm.vue
@@ -48,21 +48,26 @@
-
+
-
-
diff --git a/frontend/vben/src/views/sys/login/LoginFormTitle.vue b/frontend/vben/src/views/sys/login/LoginFormTitle.vue
index 9b2ecb7..86bc302 100644
--- a/frontend/vben/src/views/sys/login/LoginFormTitle.vue
+++ b/frontend/vben/src/views/sys/login/LoginFormTitle.vue
@@ -17,7 +17,7 @@
[LoginStateEnum.RESET_PASSWORD]: t('sys.login.forgetFormTitle'),
[LoginStateEnum.LOGIN]: t('sys.login.signInFormTitle'),
[LoginStateEnum.REGISTER]: t('sys.login.signUpFormTitle'),
- [LoginStateEnum.MOBILE]: t('sys.login.mobileSignInFormTitle'),
+ // [LoginStateEnum.MOBILE]: t('sys.login.mobileSignInFormTitle'),
}
return titleObj[unref(getLoginState)]
})
diff --git a/frontend/vben/src/views/sys/login/useLogin.ts b/frontend/vben/src/views/sys/login/useLogin.ts
index cdb9d36..642fa71 100644
--- a/frontend/vben/src/views/sys/login/useLogin.ts
+++ b/frontend/vben/src/views/sys/login/useLogin.ts
@@ -7,8 +7,8 @@ export enum LoginStateEnum {
LOGIN,
REGISTER,
RESET_PASSWORD,
- MOBILE,
- QR_CODE,
+ // MOBILE,
+ // QR_CODE,
}
const currentState = ref(LoginStateEnum.LOGIN)
@@ -43,8 +43,8 @@ export function useFormRules(formData?: Recordable) {
const getAccountFormRule = computed(() => createRule(t('sys.login.accountPlaceholder')))
const getPasswordFormRule = computed(() => createRule(t('sys.login.passwordPlaceholder')))
- const getSmsFormRule = computed(() => createRule(t('sys.login.smsPlaceholder')))
- const getMobileFormRule = computed(() => createRule(t('sys.login.mobilePlaceholder')))
+ // const getSmsFormRule = computed(() => createRule(t('sys.login.smsPlaceholder')))
+ // const getMobileFormRule = computed(() => createRule(t('sys.login.mobilePlaceholder')))
const validatePolicy = async (_: RuleObject, value: boolean) => {
return !value ? Promise.reject(t('sys.login.policyPlaceholder')) : Promise.resolve()
@@ -65,13 +65,13 @@ export function useFormRules(formData?: Recordable) {
const getFormRules = computed((): { [k: string]: ValidationRule | ValidationRule[] } => {
const accountFormRule = unref(getAccountFormRule)
const passwordFormRule = unref(getPasswordFormRule)
- const smsFormRule = unref(getSmsFormRule)
- const mobileFormRule = unref(getMobileFormRule)
+ // const smsFormRule = unref(getSmsFormRule)
+ // const mobileFormRule = unref(getMobileFormRule)
- const mobileRule = {
+ /*const mobileRule = {
sms: smsFormRule,
mobile: mobileFormRule,
- }
+ }*/
switch (unref(currentState)) {
// register form rules
case LoginStateEnum.REGISTER:
@@ -82,19 +82,19 @@ export function useFormRules(formData?: Recordable) {
{ validator: validateConfirmPassword(formData?.password), trigger: 'change' },
],
policy: [{ validator: validatePolicy, trigger: 'change' }],
- ...mobileRule,
+ // ...mobileRule,
}
// reset password form rules
case LoginStateEnum.RESET_PASSWORD:
return {
account: accountFormRule,
- ...mobileRule,
+ // ...mobileRule,
}
// mobile form rules
- case LoginStateEnum.MOBILE:
- return mobileRule
+ /*case LoginStateEnum.MOBILE:
+ return mobileRule*/
// login form rules
default: