fix: bug

wupengfei

3 天以前 8994e585d37575ef6df49f083ed23796a85a4113

fix: bug

 src/constants/regExp.ts

@@ -5,10 +5,10 @@

  static PasswordRegex =
    // eslint-disable-next-line no-useless-escape
    /^(?![\d]+$)(?![a-z]+$)(?![A-Z]+$)(?![~`!@#$%\^&*\\|()_\-=+\\、{}\[\]'"<>?.,:;/]+$)[a-zA-Z\d~`!@#$%\^&*\\|()_\-=+\\、{}\[\]'"<>?.,:;/]{6,16}$/;
    /^(?![\d]+$)(?![a-z]+$)(?![A-Z]+$)(?![~`!@#$%\^&*\\|()_\-=+\\、{}\[\]'"<>?.,:;/]+$)[a-zA-Z\d~`!@#$%\^&*\\|()_\-=+\\、{}\[\]'"<>?.,:;/]{8,16}$/;
  static PasswordRegexNoSymbol =
    // eslint-disable-next-line no-useless-escape
    /^(?![\d]+$)(?![a-z]+$)(?![A-Z]+$)[a-zA-Z\d]{6,16}$/;
    /^(?![\d]+$)(?![a-z]+$)(?![A-Z]+$)[a-zA-Z\d]{8,16}$/;
  static PasswordRegexOnlyLetterNumber =
    // eslint-disable-next-line no-useless-escape
    /^[a-zA-Z0-9]+$/;

 src/views/Permission/components/AddOrEditExternalAccountDialog.vue

@@ -52,7 +52,28 @@
        v-if="!isEdit"
        label="密码:"
        prop="password"
        :check-rules="[{ message: '请输入密码', required: !form.id }]"
        :check-rules="[
          { required: !form.id, message: '请输入密码', trigger: 'blur' },
          {
            // pattern: MyRegExp.PasswordRegexNoSymbol,
            // message: '密码应满足6~16位，并包含大写字母、小写字母、数字其中的任意两种',
            trigger: 'blur',
            validator: (rule, value, callback) => {
              if (isEdit) {
                return callback();
              } else {
                if (!value) {
                  callback(new Error('请输入密码'));
                } else if (!MyRegExp.PasswordRegexNoSymbol.test(value)) {
                  callback(
                    new Error('密码应满足8~16位，并包含大写字母、小写字母、数字其中的任意两种')
                  );
                }
                callback();
              }
            },
          },
        ]"
      >
        <ProFormText
          placeholder="请输入密码"