diff --git a/src/constants/reg.ts b/src/constants/reg.ts index 8805ca8..a0c2be4 100644 --- a/src/constants/reg.ts +++ b/src/constants/reg.ts @@ -7,9 +7,9 @@ export const REG_PHONE = /** * Password reg * - * 6-18 characters, including letters, numbers, and underscores + * 由字母、数字、特殊字符,任意2种组成,6-20位 */ -export const REG_PWD = /^\w{6,18}$/; +export const REG_PWD = /^(?![a-zA-Z]+$)(?!\d+$)(?![^\da-zA-Z\s]+$).{6,20}$/; /** Email reg */ export const REG_EMAIL = /^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/; diff --git a/src/locales/langs/en-us.ts b/src/locales/langs/en-us.ts index da4fd54..c2be41f 100644 --- a/src/locales/langs/en-us.ts +++ b/src/locales/langs/en-us.ts @@ -873,7 +873,7 @@ const local: App.I18n.Schema = { }, pwd: { required: 'Please enter password', - invalid: '6-18 characters, including letters, numbers, and underscores' + invalid: 'Letters, numbers, and special characters, combination of two, 6 to 20 characters' }, confirmPwd: { required: 'Please enter password again', diff --git a/src/locales/langs/zh-cn.ts b/src/locales/langs/zh-cn.ts index f3bc9fc..f49e79a 100644 --- a/src/locales/langs/zh-cn.ts +++ b/src/locales/langs/zh-cn.ts @@ -881,7 +881,7 @@ const local: App.I18n.Schema = { }, pwd: { required: '请输入密码', - invalid: '密码格式不正确,6-18位字符,包含字母、数字、下划线' + invalid: '由字母、数字、特殊字符,任意2种组成,6-20位' }, confirmPwd: { required: '请输入确认密码',