diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/lr-validator-helper.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/lr-validator-helper.js
index dcac566ad..5f2876c05 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/lr-validator-helper.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/lr-validator-helper.js
@@ -152,7 +152,10 @@
return learun.validator.validRegOrNull(obj, /^\d{15}(\d{2}[A-Za-z0-9;])?$/, '必须为身份证格式或空');
},
isStrongPwd: function (obj) {//判断是否为数字、大小写字母、特殊字符组成的密码
- return learun.validator.validRegOrNull(obj, /^(?=.*[0-9])(?=.*[A-Z])(?=.*[a-z])(?=.*[!@#$%^&*,\.])[0-9a-zA-Z!@#$%^&*,\.]{8,20}$/, '8-20位必须同时包含大小写字母、数字、特殊符号');
+ return learun.validator.validReg(obj, /^(?=.*[0-9])(?=.*[A-Z])(?=.*[a-z])(?=.*[!@#$%^&*,\.])[0-9a-zA-Z!@#$%^&*,\.]{8,20}$/, '8-20位必须同时包含大小写字母、数字、特殊符号');
+ },
+ isStrongPwdOrNull: function (obj) {//判断是否为数字、大小写字母、特殊字符组成的密码或者null,空
+ return learun.validator.validRegOrNull(obj, /^(?=.*[0-9])(?=.*[A-Z])(?=.*[a-z])(?=.*[!@#$%^&*,\.])[0-9a-zA-Z!@#$%^&*,\.]{8,20}$/, '8-20位必须同时包含大小写字母、数字、特殊符号或空');
},
isIP: function (obj) {//判断是否为IP地址格式
var res = { code: true, msg: '' };
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/PassWordForm.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/PassWordForm.cshtml
index 79235f1ec..748e2d0d9 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/PassWordForm.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/PassWordForm.cshtml
@@ -14,7 +14,7 @@