Merge pull request #12 from alibaba-fusion/fix-required

Fix required=false to ignore required
alibaba-fusion · Oct 11, 2019 · ea71b85 · ea71b85
2 parents cb1a475 + dc2470f
commit ea71b85
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@alifd/validate",
-  "version": "1.1.3",
+  "version": "1.2.0",
   "description": "Validation to be used with @alifd/field",
   "files": [
     "demo/",

diff --git a/src/validator.js b/src/validator.js
@@ -18,15 +18,16 @@ export function validateFunc(validator, ruleType) {
         if (ruleType !== 'required') {
             const errors = [];
             rules.required(rule, value, errors, options);
+            // 空数据
             if (errors.length > 0) {
-                if ('required' in rule) {
+                if ('required' in rule && rule.required) {
                     if (cb) {
                         return cb(errors);
                     } else {
                         return Promise.reject(errors);
                     }
                 } else if (cb) {
-                    return cb([]); //忽略空数据的判断
+                    return cb([]); //空数据，并且没有require要求，则忽略
                 } else {
                     return Promise.resolve(null);
                 }
@@ -69,7 +70,7 @@ export function getValidationMethod(rule) {
     }
 
     // 有其他位置参数
-    if ('required' in rule) {
+    if ('required' in rule && rule.required) {
         return validateFunc(rules.required, 'required');
     }
 

diff --git a/test/required.spec.js b/test/required.spec.js
@@ -10,10 +10,12 @@ describe('required', () => {
             new Schema({
                 v1: { required },
                 v2: { required },
+                v3: { required: false },
             }).validate(
                 {
                     v1: null,
                     v2: undefined,
+                    v3: ''
                 },
                 errors => {
                     assert(errors.length === 2);