From fc74a232a02020943db8683a264f298369af5362 Mon Sep 17 00:00:00 2001 From: Herrington Darkholme <2883231+HerringtonDarkholme@users.noreply.github.com> Date: Fri, 10 Sep 2021 12:02:52 +0800 Subject: [PATCH] Revert "fix(components): [el-form]: ensure form validation always triggers callback (#3294)" (#3324) This reverts commit 509292678dba35df97ab9179043ec80fe61df503. --- packages/components/form/src/form.vue | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/components/form/src/form.vue b/packages/components/form/src/form.vue index 27f6ed6ae4..30b9377bf6 100644 --- a/packages/components/form/src/form.vue +++ b/packages/components/form/src/form.vue @@ -184,6 +184,7 @@ export default defineComponent({ callback(true) } let valid = true + let count = 0 let invalidFields = {} let firstInvalidFields for (const field of fields) { @@ -193,10 +194,11 @@ export default defineComponent({ firstInvalidFields || (firstInvalidFields = field) } invalidFields = { ...invalidFields, ...field } + if (++count === fields.length) { + callback(valid, invalidFields) + } }) } - callback(valid, invalidFields) - if (!valid && props.scrollToError) { scrollToField(Object.keys(firstInvalidFields)[0]) }