浏览代码

Form: make filter conditions for getFilteredRule clearer (#10181)

杨奕 7 年之前
父节点
当前提交
b60c2cac8c
共有 1 个文件被更改,包括 6 次插入1 次删除
  1. 6 1
      packages/form/src/form-item.vue

+ 6 - 1
packages/form/src/form-item.vue

@@ -243,7 +243,12 @@
         const rules = this.getRules();
 
         return rules.filter(rule => {
-          return !rule.trigger || rule.trigger.indexOf(trigger) !== -1 || (Array.isArray(rule.trigger) && trigger === '');
+          if (!rule.trigger || trigger === '') return true;
+          if (Array.isArray(rule.trigger)) {
+            return rule.trigger.indexOf(trigger) > -1;
+          } else {
+            return rule.trigger === trigger;
+          }
         }).map(rule => objectAssign({}, rule));
       },
       onFieldBlur() {