From b60c2cac8cc3737e755bc560264bf332e37ad005 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E5=A5=95?= Date: Thu, 15 Mar 2018 12:28:15 +0800 Subject: [PATCH] Form: make filter conditions for getFilteredRule clearer (#10181) --- packages/form/src/form-item.vue | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/form/src/form-item.vue b/packages/form/src/form-item.vue index 1e1a524fc..d5c1b94c5 100644 --- 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() {