1

src/views/sys/login/useLogin.ts

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