Commit 2d3d04f547046c23cdfc319a7483261b47c08e83
Committed by
GitHub
1 parent
bb0d2e1c
fix(form): placeholder setting in componentProps (#634)
修复为RangePicker组件设置的placeholder属性无效的BUG
Showing
1 changed file
with
4 additions
and
4 deletions
src/components/Form/src/components/FormItem.vue
@@ -248,13 +248,11 @@ | @@ -248,13 +248,11 @@ | ||
248 | }; | 248 | }; |
249 | 249 | ||
250 | const isCreatePlaceholder = !propsData.disabled && autoSetPlaceHolder; | 250 | const isCreatePlaceholder = !propsData.disabled && autoSetPlaceHolder; |
251 | - let placeholder; | ||
252 | // RangePicker place is an array | 251 | // RangePicker place is an array |
253 | if (isCreatePlaceholder && component !== 'RangePicker' && component) { | 252 | if (isCreatePlaceholder && component !== 'RangePicker' && component) { |
254 | - placeholder = | 253 | + propsData.placeholder = |
255 | unref(getComponentsProps)?.placeholder || createPlaceholderMessage(component); | 254 | unref(getComponentsProps)?.placeholder || createPlaceholderMessage(component); |
256 | } | 255 | } |
257 | - propsData.placeholder = placeholder; | ||
258 | propsData.codeField = field; | 256 | propsData.codeField = field; |
259 | propsData.formValues = unref(getValues); | 257 | propsData.formValues = unref(getValues); |
260 | 258 | ||
@@ -289,7 +287,9 @@ | @@ -289,7 +287,9 @@ | ||
289 | ) : ( | 287 | ) : ( |
290 | label | 288 | label |
291 | ); | 289 | ); |
292 | - const getHelpMessage = isFunction(helpMessage) ? helpMessage(unref(getValues)) : helpMessage; | 290 | + const getHelpMessage = isFunction(helpMessage) |
291 | + ? helpMessage(unref(getValues)) | ||
292 | + : helpMessage; | ||
293 | if (!getHelpMessage || (Array.isArray(getHelpMessage) && getHelpMessage.length === 0)) { | 293 | if (!getHelpMessage || (Array.isArray(getHelpMessage) && getHelpMessage.length === 0)) { |
294 | return renderLabel; | 294 | return renderLabel; |
295 | } | 295 | } |