tangning 1 year ago
parent
commit
ffc5ae18f1
1 changed files with 17 additions and 15 deletions
  1. 17 15
      src/views/sys/login/useLogin.ts

+ 17 - 15
src/views/sys/login/useLogin.ts

@@ -90,23 +90,25 @@ export function useFormRules(formData?: Recordable) {
       case LoginStateEnum.REGISTER:
       case LoginStateEnum.REGISTER:
         return {
         return {
           account: accountFormRule,
           account: accountFormRule,
-          password: [{
-            required: true,
-            trigger: 'change',
-            // @ts-ignore
-            validator: async (rule, value) => {
-              console.log('value',value)
-              const regPos = /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)[a-zA-Z\d]{8,}$/; // 非中文
-              if (!value) {
+          password: [
+            {
+              required: true,
+              trigger: 'change',
+              // @ts-ignore
+              validator: async (rule, value) => {
+                console.log('value', value);
+                const regPos = /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)[a-zA-Z\d]{8,}$/; // 非中文
+                if (!value) {
+                  return Promise.reject('请输入8-16位数字、字母大小写组合');
+                }
+                if (!regPos.test(value)) {
+                  /* eslint-disable-next-line */
                 return Promise.reject('请输入8-16位数字、字母大小写组合');
                 return Promise.reject('请输入8-16位数字、字母大小写组合');
-              }
-              if (!regPos.test(value)) {
-                /* eslint-disable-next-line */
-                return Promise.reject('请输入8-16位数字、字母大小写组合');
-              }
-              return Promise.resolve();
+                }
+                return Promise.resolve();
+              },
             },
             },
-          }],
+          ],
           confirmPassword: [
           confirmPassword: [
             { validator: validateConfirmPassword(formData?.password), trigger: 'change' },
             { validator: validateConfirmPassword(formData?.password), trigger: 'change' },
           ],
           ],