From 5425dc241fe40463e82c3ecffce76f18b5fb74b3 Mon Sep 17 00:00:00 2001
From: invalid w <wangjuesix@gmail.com>
Date: Sun, 13 Aug 2023 09:14:04 +0800
Subject: [PATCH] fix: #2767 #2884 #2868 (#2956)

* fix: #2767

* fix: #2884

* fix: #2868
---
 src/components/CardList/src/CardList.vue      |  4 +--
 .../Form/src/hooks/useFormEvents.ts           | 30 +++++++++++++++++--
 .../modules/FormComponentPanel.vue            |  5 ++--
 3 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/src/components/CardList/src/CardList.vue b/src/components/CardList/src/CardList.vue
index 083545f68..4624618f1 100644
--- a/src/components/CardList/src/CardList.vue
+++ b/src/components/CardList/src/CardList.vue
@@ -61,7 +61,7 @@
 
               <CardMeta>
                 <template #title>
-                  <TypographyText :content="item.name" :ellipsis="{ tooltip: item.address }" />
+                  <TypographyParagraph :content="item.name" :ellipsis="{ tooltip: item.address }" />
                 </template>
                 <template #avatar>
                   <Avatar :src="item.avatar" />
@@ -93,7 +93,7 @@
 
   const ListItem = List.Item;
   const CardMeta = Card.Meta;
-  const TypographyText = Typography.Text;
+  const TypographyParagraph = Typography.Paragraph;
   // 获取slider属性
   const sliderProp = computed(() => useSlider(4));
   // 组件接收参数
diff --git a/src/components/Form/src/hooks/useFormEvents.ts b/src/components/Form/src/hooks/useFormEvents.ts
index f8f8fe2a9..5fe9f5014 100644
--- a/src/components/Form/src/hooks/useFormEvents.ts
+++ b/src/components/Form/src/hooks/useFormEvents.ts
@@ -94,9 +94,7 @@ export function useFormEvents({
           formModel[field] = defaultValueObj![field];
         });
       }
-      const isInput = schema?.component && defaultValueComponents.includes(schema.component);
-      const defaultValue = cloneDeep(defaultValueRef.value[key]);
-      formModel[key] = isInput ? defaultValue || '' : defaultValue;
+      formModel[key] = getDefaultValue(schema, defaultValueRef, key);
     });
     nextTick(() => clearValidate());
 
@@ -407,3 +405,29 @@ export function useFormEvents({
     scrollToField,
   };
 }
+
+function getDefaultValue(
+  schema: FormSchema | undefined,
+  defaultValueRef: UseFormActionContext['defaultValueRef'],
+  key: string,
+) {
+  let defaultValue = cloneDeep(defaultValueRef.value[key]);
+  const isInput = checkIsInput(schema);
+  if (isInput) {
+    return defaultValue || '';
+  }
+  if (!defaultValue && schema && checkIsRangeSlider(schema)) {
+    defaultValue = [0, 0];
+  }
+  return defaultValue;
+}
+
+function checkIsRangeSlider(schema: FormSchema) {
+  if (schema.component === 'Slider' && schema.componentProps && schema.componentProps.range) {
+    return true;
+  }
+}
+
+function checkIsInput(schema?: FormSchema) {
+  return schema?.component && defaultValueComponents.includes(schema.component);
+}
diff --git a/src/views/form-design/components/VFormDesign/modules/FormComponentPanel.vue b/src/views/form-design/components/VFormDesign/modules/FormComponentPanel.vue
index df2dfd7da..a7024cfa8 100644
--- a/src/views/form-design/components/VFormDesign/modules/FormComponentPanel.vue
+++ b/src/views/form-design/components/VFormDesign/modules/FormComponentPanel.vue
@@ -131,15 +131,16 @@
     }
 
     .draggable-box {
+      height: calc(100vh - 200px);
       // width: 100%;
+      overflow: auto;
+
       .drag-move {
         min-height: 62px;
         cursor: move;
       }
 
       .list-main {
-        height: 100%;
-        overflow: auto;
         // 列表动画
         .list-enter-active {
           transition: all 0.5s;