From 2d3d04f547046c23cdfc319a7483261b47c08e83 Mon Sep 17 00:00:00 2001
From: Netfan <netfan@foxmail.com>
Date: Fri, 21 May 2021 09:36:41 +0800
Subject: [PATCH] fix(form): placeholder setting in componentProps (#634)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复为RangePicker组件设置的placeholder属性无效的BUG
---
 src/components/Form/src/components/FormItem.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/Form/src/components/FormItem.vue b/src/components/Form/src/components/FormItem.vue
index 7c6cb361..57b63ac7 100644
--- a/src/components/Form/src/components/FormItem.vue
+++ b/src/components/Form/src/components/FormItem.vue
@@ -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);
 
@@ -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;
         }
-- 
GitLab