Commit f455fb97f9b70ca4979561a82ae0f25825527013
Committed by
GitHub
GitHub
1 parent
0e440f07
feat(form): helpMessage Increase function type value (#616)
* feat(form): helpMessage * feat(form): helpMessage
Showing
2 changed files
with
4 additions
and
3 deletions
src/components/Form/src/components/FormItem.vue
| @@ -261,13 +261,14 @@ | @@ -261,13 +261,14 @@ | ||
| 261 | ) : ( | 261 | ) : ( |
| 262 | label | 262 | label |
| 263 | ); | 263 | ); |
| 264 | - if (!helpMessage || (Array.isArray(helpMessage) && helpMessage.length === 0)) { | 264 | + const getHelpMessage = isFunction(helpMessage) ? helpMessage(unref(getValues)) : helpMessage; |
| 265 | + if (!getHelpMessage || (Array.isArray(getHelpMessage) && getHelpMessage.length === 0)) { | ||
| 265 | return renderLabel; | 266 | return renderLabel; |
| 266 | } | 267 | } |
| 267 | return ( | 268 | return ( |
| 268 | <span> | 269 | <span> |
| 269 | {renderLabel} | 270 | {renderLabel} |
| 270 | - <BasicHelp placement="top" class="mx-1" text={helpMessage} {...helpComponentProps} /> | 271 | + <BasicHelp placement="top" class="mx-1" text={getHelpMessage} {...helpComponentProps} /> |
| 271 | </span> | 272 | </span> |
| 272 | ); | 273 | ); |
| 273 | } | 274 | } |
src/components/Form/src/types/form.ts
| @@ -125,7 +125,7 @@ export interface FormSchema { | @@ -125,7 +125,7 @@ export interface FormSchema { | ||
| 125 | // Auxiliary text | 125 | // Auxiliary text |
| 126 | subLabel?: string; | 126 | subLabel?: string; |
| 127 | // Help text on the right side of the text | 127 | // Help text on the right side of the text |
| 128 | - helpMessage?: string | string[]; | 128 | + helpMessage?: string | string[] | ((renderCallbackParams: RenderCallbackParams) => string | string[]); |
| 129 | // BaseHelp component props | 129 | // BaseHelp component props |
| 130 | helpComponentProps?: Partial<HelpComponentProps>; | 130 | helpComponentProps?: Partial<HelpComponentProps>; |
| 131 | // Label width, if it is passed, the labelCol and WrapperCol configured by itemProps will be invalid | 131 | // Label width, if it is passed, the labelCol and WrapperCol configured by itemProps will be invalid |