system-clients 3.2.81 → 3.2.82-hantou

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "system-clients",
-  "version": "3.2.81",
+  "version": "3.2.82-hantou",
   "description": "系统基础框架",
   "main": "src/index.js",
   "directories": {

package/src/components/server/ModifyPw.vue

@@ -22,10 +22,10 @@
           'has-success': !$v.newpassword.required && !$v.newpassword.numbersAndLetter8to16&&!$v.newpassword.minlength  && !$v.newpassword.chinesePassword}">
             <label for="newpassword" class="col-sm-4 col-sm-offset-1 control-label">新的密码:&nbsp;&nbsp;</label>
             <div class="col-sm-4">
-              <input type="password" v-model="deliver.newpassword" class="form-control" id="newpassword" v-validate:newpassword='{required:true, numbersAndLetter8to16: true, minlength: 6,chinesePassword: true}'>
+              <input type="password" v-model="deliver.newpassword" class="form-control" id="newpassword" v-validate:newpassword='{required:true, numbersAndLetter8to16: true, minlength: 12,chinesePassword: true}'>
               <span class="glyphicon glyphicon-ok form-control-feedback" v-if="!$v.newpassword.required && !$v.newpassword.minlength && !($v.newpassword.numbersAndLetter8to16 && !($v.newpassword.required)) && !($v.newpassword.chinesePassword) "></span>
               <span v-if="$v.newpassword.required">不能为空</span>
-              <span v-if="($v.newpassword.numbersAndLetter8to16||$v.newpassword.minlength) && !($v.newpassword.required&&$v.newpassword.minlength)">密码必须是8~16位数字与大小字母外加特殊字符的组合，并且不能出现类似'123','abc'等连贯数字或者字母</span>
+              <span v-if="($v.newpassword.numbersAndLetter8to16||$v.newpassword.minlength) && !($v.newpassword.required&&$v.newpassword.minlength)">密码必须是12位以上数字与大小字母外加特殊字符的组合，并且不能出现类似'123','abc'等连贯数字或者字母</span>
               <span v-if="$v.newpassword.chinesePassword">密码不能包含中文</span>
             </div>
           </div>

package/src/plugins/validation.js

@@ -9,7 +9,7 @@ Vue.validator('chinesePassword', function (val) {
   var testBealoon=/.*?[\u4E00-\u9FFF]+.*$/.test(val)
   return !(/.*?[\u4E00-\u9FFF]+.*$/.test(val))
 });
-// 潜能要求8~16位数字字母组合；
+// 密码要求12位以上数字字母组合；
 Vue.validator('numbersAndLetter8to16', function (val) {
-  return /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?!.*(123|321|abc|cba))[a-zA-Z\d!@#$%^&*()_+-=<>?]{8,16}$/.test(val)
+  return /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?!.*(123|321|abc|cba))[a-zA-Z\d!@#$%^&*()_+-=<>?]{12,}$/.test(val)
 });