diff --git a/src/utils/validate.js b/src/utils/validate.js index 00f4339..94a8ee1 100644 --- a/src/utils/validate.js +++ b/src/utils/validate.js @@ -84,6 +84,6 @@ export function isArray(arg) { * @returns {Boolean} */ export function validPwd(value) { - const reg = /^(?=.*[A-Za-z])(?=.*\d)(?=.*[@$!%*#?&])[A-Za-z\d@$!%*#?&]{8,20}$/ + const reg = /^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[~!@&%#_])[a-zA-Z0-9~!@&%#_]{8,26}$/ return reg.test(value) } \ No newline at end of file diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index ed8cca9..80eeca9 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -349,7 +349,7 @@ export default { ], password: [ { required: true, message: '密码不能为空', trigger: 'blur' }, - { min: 8, max: 20, message: '密码长度在8到20个字符', trigger: 'blur' }, + { min: 8, max: 26, message: '密码长度在8到26个字符', trigger: 'blur' }, { validator: this.validatePwd, trigger: 'blur' } ], roleIds: [ @@ -377,7 +377,7 @@ export default { if (validPwd(value)) { callback() } else { - callback(new Error('密码规则为:至少一个字母,一个数字和一个特殊字符')) + callback(new Error('密码规则为:密码必须包含大小写字母、数字、特殊字符')) } }, /* 表单登录权限自定义校验 */ @@ -520,11 +520,11 @@ export default { confirmButtonText: "确定", cancelButtonText: "取消", closeOnClickModal: false, - inputPattern: /^.{8,20}$/, - inputErrorMessage: "用户密码长度必须介于 8 和 20 之间", + inputPattern: /^.{8,26}$/, + inputErrorMessage: "用户密码长度必须介于 8 和 26 之间", inputValidator: (value) => { - if (!/^(?=.*[A-Za-z])(?=.*\d)(?=.*[@$!%*#?&])[A-Za-z\d@$!%*#?&]{8,20}$/.test(value)) { - return "密码规则为:至少一个字母,一个数字和一个特殊字符" + if (!/^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[~!@&%#_])[a-zA-Z0-9~!@&%#_]{8,26}$/.test(value)) { + return "密码规则为:密码必须包含大小写字母、数字、特殊字符" } }, }).then(({ value }) => {