Skip to content

Commit

Permalink
fix(form): placeholder setting in componentProps (#634)
Browse files Browse the repository at this point in the history
修复为RangePicker组件设置的placeholder属性无效的BUG
  • Loading branch information
mynetfan authored May 21, 2021
1 parent bb0d2e1 commit 2d3d04f
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions src/components/Form/src/components/FormItem.vue
Original file line number Diff line number Diff line change
Expand Up @@ -248,13 +248,11 @@
};
const isCreatePlaceholder = !propsData.disabled && autoSetPlaceHolder;
let placeholder;
// RangePicker place is an array
if (isCreatePlaceholder && component !== 'RangePicker' && component) {
placeholder =
propsData.placeholder =
unref(getComponentsProps)?.placeholder || createPlaceholderMessage(component);
}
propsData.placeholder = placeholder;
propsData.codeField = field;
propsData.formValues = unref(getValues);
Expand Down Expand Up @@ -289,7 +287,9 @@
) : (
label
);
const getHelpMessage = isFunction(helpMessage) ? helpMessage(unref(getValues)) : helpMessage;
const getHelpMessage = isFunction(helpMessage)
? helpMessage(unref(getValues))
: helpMessage;
if (!getHelpMessage || (Array.isArray(getHelpMessage) && getHelpMessage.length === 0)) {
return renderLabel;
}
Expand Down

0 comments on commit 2d3d04f

Please sign in to comment.