修复：WeValidator.checkValue 校验空字段不符合预期

ChanceYu · May 12, 2019 · 9800e3a · 9800e3a
1 parent ec00aec
commit 9800e3a
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 16 deletions.
diff --git a/example/mpvue/package.json b/example/mpvue/package.json
@@ -12,7 +12,7 @@
   "dependencies": {
     "mpvue": "^1.0.11",
     "vuex": "^3.0.1",
-    "we-validator": "^2.1.5"
+    "we-validator": "^2.1.6"
   },
   "devDependencies": {
     "mpvue-loader": "1.0.13",

diff --git a/example/nodejs/package.json b/example/nodejs/package.json
@@ -10,6 +10,6 @@
     "koa-bodyparser": "^3.2.0",
     "koa-router": "^7.4.0",
     "koa-views": "^5.2.1",
-    "we-validator": "^2.1.5"
+    "we-validator": "^2.1.6"
   }
 }
diff --git a/example/wechat/js/we-validator.js b/example/wechat/js/we-validator.js
diff --git a/lib/we-validator.js b/lib/we-validator.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "we-validator",
-  "version": "2.1.5",
+  "version": "2.1.6",
   "description": "简单灵活的表单验证插件，支持小程序、浏览器、Nodejs",
   "main": "lib/we-validator.js",
   "scripts": {

diff --git a/src/we-validator.js b/src/we-validator.js
@@ -47,32 +47,43 @@ class WeValidator {
     static RULES = {}
 
     /**
-     * 动态添加验证规则（全局）
+     * 动态添加验证规则
      * @param {string} ruleName 规则名称
-     * @param {regexp|function} ruleValue 验证规则
+     * @param {object} ruleOption 规则配置
+     * @param {string} [ruleOption.message] 默认错误提示文字
+     * @param {regexp|function} [ruleOption.rule] 验证规则
      */
-    static addRule = function (ruleName, ruleValue) {
-        WeValidator.RULES[ruleName] = ruleValue
+    static addRule = function (ruleName, ruleOption) {
+        WeValidator.RULES[ruleName] = ruleOption
     }
 
     /**
      * 验证单个字段数据
      * @param {string} ruleName 规则名称
      * @param {string} value 要验证的值
      * @param {any} param 传递的验证参数
+     * @param {boolean} skip 未填跳过校验，仅供内部使用
      */
-    static checkValue = function (ruleName, value, param){
+    static checkValue = function (ruleName, value, param, skip){
       let rule = WeValidator.RULES[ruleName].rule
 
       if(isRegExp(rule)){
-        return !requiredFn(value) || rule.test(value)
+        if(skip){
+          return !requiredFn(value) || rule.test(value)
+        }else{
+          return rule.test(value)
+        }
       }
 
       if(isFunction(rule)){
         if(ruleName === 'required'){
           return requiredFn(value)
         }else{
-          return !requiredFn(value) || rule.call(this, value, param)
+          if(skip){
+            return !requiredFn(value) || rule.call(this, value, param)
+          }else{
+            return rule.call(this, value, param)
+          }
         }
       }
     }
@@ -212,7 +223,7 @@ class WeValidator {
                   ruleParam = ruleParam.call(this, value)
                 }
 
-                let isFieldValid = WeValidator.checkValue.call(this, ruleName, value, ruleParam)
+                let isFieldValid = WeValidator.checkValue.call(this, ruleName, value, ruleParam, true)
 
                 if (!isFieldValid) {
                   // 验证不通过
@@ -237,7 +248,7 @@ class WeValidator {
         }
 
         if(hasError){
-          if(multiCheck){
+          if(multiCheck && showMessage){
             this._showErrorMessage(errorData, onMessage)
           }
           return false