Merge branch 'jiading' of http://192.168.168.201:8888/panzhaov5/bsth_control.git into jiading

王通
2 parents 851b2357 0699e578
Showing 3 changed files with 31 additions and 6 deletions
src/main/resources/static/assets/plugins/passwordRulesHelper/passwordRulesHelper.js
src/main/resources/static/index.html
src/main/resources/static/pages/permission/user/changePWD.html
 (function ($) {
  
-    $.fn.passwordRulesValidator = function (aOptions) {
+    $.fn.passwordRulesValidator = function (aOptions, callbackFn) {
  
  
         // Define default's parameters
@@ -47,6 +47,22 @@
                     'onLoad': undefined
         };
  
+        var _ruleErrorMap = {
+        };
+        function _callbackFn() {
+            var isOk = false;
+            $.each(_ruleErrorMap, function(k, v) {
+                if (v) {
+                    isOk = true;
+                } else {
+                    isOk = false;
+                    return false;
+                }
+            });
+            // console.log(_ruleErrorMap);
+            callbackFn(isOk);
+        }
+
         /**
          * @param {object} oRegex
          * @param {string} sVal
@@ -57,8 +73,10 @@
         {
             if (oRegex.test(sVal)) {
                 $('#' + sIdContainer + ' li.' + sName).removeClass('ko ' + aParameters.koClass).addClass('ok ' + aParameters.okClass);
+                _ruleErrorMap[sName] = true;
             } else {
                 $('#' + sIdContainer + ' li.' + sName).removeClass('ok ' +aParameters.okClass).addClass('ko ' +aParameters.koClass);
+                _ruleErrorMap[sName] = false;
             }
         }
  
@@ -112,18 +130,22 @@
  
             // Execute checkRules on load
             checkRules(aParameters, $(this).val(), sIdContainer);
+            _callbackFn();
  
             // Execute checkRules fonction
             $(this).keyup(function () {
                 checkRules(aParameters, $(this).val(), sIdContainer);
+                _callbackFn();
             });
  
             $(this).on('paste', function () {
                 checkRules(aParameters, $(this).val(), sIdContainer);
+                _callbackFn();
             });
  
             $(this).change(function () {
                 checkRules(aParameters, $(this).val(), sIdContainer);
+                _callbackFn();
             });
         });
     };
@@ -419,7 +419,7 @@
 <!-- tipso JS -->
 <script src="/metronic_v4.5.4/plugins/tipso/js/tipso.js"></script>
 <!-- passwordRulesHelper插件 -->
-<script src="/assets/plugins/passwordRulesHelper/passwordRulesHelper.min.js"></script>
+<script src="/assets/plugins/passwordRulesHelper/passwordRulesHelper.js" data-exclude=1></script>
  
 <script data-exclude=1>
 	//初始打开的片段地址
@@ -4,7 +4,7 @@
 <div class="portlet light portlet-fit portlet-form bordered">
 <div class="portlet-body">
 	<form class="form-horizontal" id="changePWDForm">
-		<div class="form-group" style="margin-top: 60px">
+		<div class="form-group" style="margin-top: 10px; margin-bottom: 0px;">
 		    <label class="control-label col-md-4">原始密码：
 		    </label>
 		    <div class="col-md-6">
@@ -13,7 +13,7 @@
 		            <input type="password" class="form-control" name="oldPWD" /> </div>
 		    </div>
 		</div>
-		<div class="form-group">
+		<div class="form-group" style="margin-top: 10px; margin-bottom: 0px;">
 		    <label class="control-label col-md-4">输入新密码：
 		    </label>
 		    <div class="col-md-6">
@@ -22,7 +22,7 @@
 		            <input type="password" class="form-control" name="newPWD" id="newPWD" /> </div>
 		    </div>
 		</div>
-		<div class="form-group">
+		<div class="form-group" style="margin-bottom: 5px;">
 		    <label class="control-label col-md-4">确认新密码：
 		    </label>
 		    <div class="col-md-6">
@@ -31,7 +31,7 @@
 		            <input type="password" class="form-control" name="cnewPWD" /> </div>
 		    </div>
 		</div>
-		<div class="form-actions">
+		<div class="form-actions" style="padding: 5px;">
 	        <div class="row">
 	            <div class="col-md-offset-5 col-md-7">
 	                <button type="button" id="confirm" class="btn green">确定</button>
@@ -82,6 +82,9 @@ $(function(){
                 'enable': true
             }
         }
+    }, function(flag) {
+        // console.log(flag);
+        $("#confirm").attr("disabled", !flag);
     });