Sfoglia il codice sorgente

fix: 隐藏密码校验

tangning 1 anno fa
parent
commit
a31fa8352f
2 ha cambiato i file con 23 aggiunte e 23 eliminazioni
  1. BIN
      20230926 17-00.zip
  2. 23 23
      src/views/sys/login/useLogin.ts

BIN
20230926 17-00.zip


+ 23 - 23
src/views/sys/login/useLogin.ts

@@ -53,11 +53,11 @@ export function useFormRules(formData?: Recordable) {
       if (!value) {
         return Promise.reject(t('sys.login.passwordPlaceholder'));
       }
-      const regPos = /^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{8,16}$/; // 非中文
-      if (!regPos.test(value)) {
-        /* eslint-disable-next-line */
-        return Promise.reject('请输入8-16位数字、字母大小写组合');
-      }
+      // const regPos = /^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{8,16}$/; // 非中文
+      // if (!regPos.test(value)) {
+      //   /* eslint-disable-next-line */
+      //   return Promise.reject('请输入8-16位数字、字母大小写组合');
+      // }
       return Promise.resolve();
     };
   };
@@ -89,23 +89,25 @@ export function useFormRules(formData?: Recordable) {
       case LoginStateEnum.REGISTER:
         return {
           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) {
-                return Promise.reject('请输入8-16位数字、字母大小写组合');
-              }
-              if (!regPos.test(value)) {
-                /* eslint-disable-next-line */
+          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.resolve();
+                }
+                return Promise.resolve();
+              },
             },
-          }],
+          ],
           confirmPassword: [
             { validator: validateConfirmPassword(formData?.password), trigger: 'change' },
           ],
@@ -128,9 +130,7 @@ export function useFormRules(formData?: Recordable) {
       default:
         return {
           account: accountFormRule,
-          password: [
-            { validator: getPasswordFormRule(formData?.password), trigger: 'change' },
-          ],
+          password: [{ validator: getPasswordFormRule(formData?.password), trigger: 'change' }],
         };
     }
   });