密码修改提示

src/widgets/Header/Widget.html

@@ -9,8 +9,9 @@
         <div class="userInfo">
             <div class="avatar " title="个人信息"></div>
             <div class="dropdown">
-                <button class="btn btn-link dropdown-toggle" type="button" id="userInfo" data-toggle="dropdown" aria-expanded="false">
-                  <%=username%>
+                <button class="btn btn-link dropdown-toggle" type="button" id="userInfo" data-toggle="dropdown"
+                    aria-expanded="false">
+                    <%=username%>
                 </button>
                 <div class="dropdown-menu" aria-labelledby="userInfo">
                     <div class="userInfo-detail">
@@ -33,13 +34,15 @@
                                 <div class="form-group">
                                     <label>
                                         新密码：
-                                        <input type="password" class="form-control input-sm password1 " placeholder="请输入新的密码">
+                                        <input type="password" class="form-control input-sm password1 "
+                                            placeholder="请输入新的密码">
                                     </label>
                                 </div>
                                 <div class="form-group">
                                     <label>
                                         重复密码：
-                                        <input type="password" class="form-control input-sm password2" placeholder="请再次输入新的密码">
+                                        <input type="password" class="form-control input-sm password2"
+                                            placeholder="请再次输入新的密码">
                                     </label>
                                 </div>
                                 <button class="btn btn-primary btn-sm savepwd">确认</button>
@@ -48,7 +51,7 @@
                         </div>
                     </div>
                 </div>
-              </div>
+            </div>
         </div>
         <div class="spli-btn"></div>
         <!--返回项目切换页按钮-->
@@ -65,7 +68,8 @@
             <button type="button" class="btn btn-link"><i class="tool-question"></i>常见问题</button>
         </div>
         <div class="dropdown helper">
-            <button class="btn btn-link dropdown-toggle" type="button" id="systemHelper" data-toggle="dropdown" aria-expanded="false">
+            <button class="btn btn-link dropdown-toggle" type="button" id="systemHelper" data-toggle="dropdown"
+                aria-expanded="false">
                 <i class="tool-help"></i>帮助
             </button>
             <div class="dropdown-menu" aria-labelledby="systemHelper">
@@ -112,7 +116,7 @@ $$
                     <button type="button" class="btn btn-light getVertifyBtn">获取验证码</button>
                 </div>
             </div>
-            
+
         </div>
         <div class="form-group nextBtn">
             <button type="button" class="form-control btn btn-success persionVertifyBtn">下一步</button>
@@ -128,17 +132,18 @@ $$
         </div>
         <div class="form-group">
             <input type="text" class="form-control disabledPhoneNumber" disabled>
-            
+
         </div>
         <div class="form-group">
             <input type="password" autocomplete="new-password" class="form-control newPassWrodInt" placeholder="请输入新密码">
         </div>
         <div class="form-group" style="margin-bottom: 60px;">
-            <input type="password" autocomplete="new-password" class="form-control repeatNewPassword" placeholder="请再次输入新密码">
+            <input type="password" autocomplete="new-password" class="form-control repeatNewPassword"
+                placeholder="请再次输入新密码">
         </div>
         <div class="form-group nextBtn">
             <button type="button" class="form-control btn btn-success vertifyResetBtn">确认修改</button>
         </div>
-        <small style="color: #666666;">密码至少8位，包含英文大小写、数字</small>
+        <small style="color: #666666;">密码至少12位，包含大小写字母和数字，不可包含非法字符！</small>
     </form>
 </div>

src/widgets/Header/Widget.ts

@@ -147,11 +147,12 @@ class Header extends BaseWidget {
         popup.domObj.find(".vertifyResetBtn").off('click').on('click', e => {
             //至少包含英文大小写，数字，特殊字符 ^(?=.*[0-9])(?=.*[a-zA-Z])(?=.*[^a-zA-Z0-9]).{8,30}$
 
-            const pateen = new RegExp(/^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)[^]{8,24}$/);
+            // const pateen = new RegExp(/^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)[^]{8,24}$/);
+            const pateen = new RegExp(/^(?=.*\d)(?=.*[a-z])(?=.*[A-Z])[a-zA-Z0-9!@#$%&+-]{12,}$/);
             const newPwd: string = popup.domObj.find('.newPassWrodInt').val().toString().trim();
             const repeatNewPwd: string = popup.domObj.find('.repeatNewPassword').val().toString().trim();
             if (!pateen.test(newPwd) || !pateen.test(repeatNewPwd)) {
-                this.AppX.runtimeConfig.toast.show('密码格式错误，密码至少8位，包含英文大小写、数字!');
+                this.AppX.runtimeConfig.toast.show('密码格式错误，密码位数至少12位，必须包含大小写字母和数字，不可包含非法字符！');
                 return;
             }
             if (newPwd === repeatNewPwd) {

src/widgets/UserManagement/Widget.ts

@@ -771,7 +771,7 @@ class UserManagement extends BaseWidget {
                         if (!that.checkInput("联系电话", this.data.phone, /[0-9]{11}/)) {
                             return;
                         }
-                        if (!that.checkInput("密码", this.data.password, /^(?=.*\d)(?=.*[a-z])(?=.*[A-Z])[a-zA-Z0-9!@#$%&+-]{12,}$/)) {
+                        if (!that.checkInput("密码", this.data.password, /^(?=.*\d)(?=.*[a-z])(?=.*[A-Z])[a-zA-Z0-9!@#$%&+-]{12,}$/, '密码位数至少12位，必须包含大小写字母和数字，不可包含非法字符！')) {
                             return;
                         }
                         // if (!that.verificationHelper.isPhone(this.data.phone, that.toast)) {
@@ -833,7 +833,7 @@ class UserManagement extends BaseWidget {
                         if (!that.checkInput("联系电话", this.data.phone, /[0-9]{11}/)) {
                             return;
                         }
-                        if (!that.checkInput("密码", this.data.password, /^(?=.*\d)(?=.*[a-z])(?=.*[A-Z])[a-zA-Z0-9!@#$%&+-]{12,}$/)) {
+                        if (!that.checkInput("密码", this.data.password, /^(?=.*\d)(?=.*[a-z])(?=.*[A-Z])[a-zA-Z0-9!@#$%&+-]{12,}$/, '密码位数至少12位，必须包含大小写字母和数字，不可包含非法字符！')) {
                             return;
                         }
                         if (!that.checkInput("单位", this.data.deptid)) {
@@ -1027,9 +1027,10 @@ class UserManagement extends BaseWidget {
      * @param title 数据名称
      * @param results 数据
      * @param type 数据类型(选填) 正则表达式
+     * @param errMsg 错误提示
      * @returns 返回true或者false(true正常，false返回数据异常)
      */
-    checkInput(title, results, type?: RegExp) {
+    checkInput(title, results, type?: RegExp, errMsg?: string) {
         if (type == undefined) {
             if (results == undefined || results == null || results == "") {
                 this.toast.show(title + "不能为空")
@@ -1041,7 +1042,7 @@ class UserManagement extends BaseWidget {
             if (type.test(results)) {
                 return results;
             } else {
-                this.toast.show(title + "格式错误")
+                this.toast.show(errMsg || title + "格式错误")
                 return false;
             }
         }