From 70414b6e15cda9568d9763dc88e29c5dc81cb434 Mon Sep 17 00:00:00 2001 From: Sun Date: Tue, 19 Nov 2024 14:27:15 +0800 Subject: [PATCH] fix(FormItem): redundant commas in feedbackText --- packages/components/src/form-item/index.ts | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/packages/components/src/form-item/index.ts b/packages/components/src/form-item/index.ts index 51747f9..0853f0d 100644 --- a/packages/components/src/form-item/index.ts +++ b/packages/components/src/form-item/index.ts @@ -517,19 +517,12 @@ const Item = connect( if (isVoidField(field)) return props if (!field) return props const takeMessage = () => { - const split = (messages: any[]) => { - return messages.reduce((buf, text, index) => { - if (!text) return buf - return index < messages.length - 1 - ? buf.concat([text, ', ']) - : buf.concat([text]) - }, []) - } + const rejectEmpty = (messages: any[]) => messages.filter(msg => !!msg) if (field.validating) return if (props.feedbackText) return props.feedbackText - if (field.selfErrors.length) return split(field.selfErrors) - if (field.selfWarnings.length) return split(field.selfWarnings) - if (field.selfSuccesses.length) return split(field.selfSuccesses) + if (field.selfErrors.length) return rejectEmpty(field.selfErrors) + if (field.selfWarnings.length) return rejectEmpty(field.selfWarnings) + if (field.selfSuccesses.length) return rejectEmpty(field.selfSuccesses) } const errorMessages = takeMessage() return {