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

b60c2cac · 杨奕 · GitHub · d73ec07d · b60c2cac
Commit b60c2cac authored Mar 15, 2018 by 杨奕 Committed by GitHub Mar 15, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

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

No files found.
--- a/packages/form/src/form-item.vue
+++ b/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() {