From f455fb97f9b70ca4979561a82ae0f25825527013 Mon Sep 17 00:00:00 2001 From: Mikasa33 Date: Tue, 18 May 2021 23:04:31 +0800 Subject: [PATCH] feat(form): helpMessage Increase function type value (#616) * feat(form): helpMessage * feat(form): helpMessage --- src/components/Form/src/components/FormItem.vue | 5 +++-- src/components/Form/src/types/form.ts | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/components/Form/src/components/FormItem.vue b/src/components/Form/src/components/FormItem.vue index fa144280..44142713 100644 --- a/src/components/Form/src/components/FormItem.vue +++ b/src/components/Form/src/components/FormItem.vue @@ -261,13 +261,14 @@ ) : ( label ); - if (!helpMessage || (Array.isArray(helpMessage) && helpMessage.length === 0)) { + const getHelpMessage = isFunction(helpMessage) ? helpMessage(unref(getValues)) : helpMessage; + if (!getHelpMessage || (Array.isArray(getHelpMessage) && getHelpMessage.length === 0)) { return renderLabel; } return ( {renderLabel} - + ); } diff --git a/src/components/Form/src/types/form.ts b/src/components/Form/src/types/form.ts index 6ea672c2..86c55846 100644 --- a/src/components/Form/src/types/form.ts +++ b/src/components/Form/src/types/form.ts @@ -125,7 +125,7 @@ export interface FormSchema { // Auxiliary text subLabel?: string; // Help text on the right side of the text - helpMessage?: string | string[]; + helpMessage?: string | string[] | ((renderCallbackParams: RenderCallbackParams) => string | string[]); // BaseHelp component props helpComponentProps?: Partial; // Label width, if it is passed, the labelCol and WrapperCol configured by itemProps will be invalid -- GitLab