From 497b8fc5b40d9c337159c2481ead69a093452215 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=87=AF=E9=BE=99?= <502431556@qq.com>
Date: Sun, 19 Dec 2021 15:22:15 +0800
Subject: [PATCH] wip(VForm): VForm component development

---
 src/App.vue                       | 21 ++++++++++++++-------
 src/components/Form/src/helper.ts | 22 ++--------------------
 2 files changed, 16 insertions(+), 27 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 26f36e7..c81cede 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { reactive, ref, onMounted } from 'vue'
+import { reactive, ref, onMounted, markRaw } from 'vue'
 import { ElConfigProvider, ElIcon } from 'element-plus'
 import zhCn from 'element-plus/lib/locale/lang/zh-cn'
 // import en from 'element-plus/lib/locale/lang/en'
@@ -332,8 +332,8 @@ const schema = reactive<VFormSchema[]>([
     label: `${t('formDemo.icon')}1`,
     component: 'Input',
     componentProps: {
-      suffixIcon: Calendar,
-      prefixIcon: Calendar
+      suffixIcon: markRaw(Calendar),
+      prefixIcon: markRaw(Calendar)
     }
   },
   {
@@ -594,8 +594,8 @@ const schema = reactive<VFormSchema[]>([
     component: 'Switch',
     value: false,
     componentProps: {
-      activeIcon: Check,
-      inactiveIcon: Close
+      activeIcon: markRaw(Check),
+      inactiveIcon: markRaw(Close)
     }
   },
   {
@@ -615,11 +615,18 @@ const schema = reactive<VFormSchema[]>([
     component: 'Rate',
     value: null,
     componentProps: {
-      voidIcon: ChatRound,
-      icons: [ChatRound, ChatLineRound, ChatDotRound]
+      voidIcon: markRaw(ChatRound),
+      icons: [markRaw(ChatRound), markRaw(ChatLineRound), markRaw(ChatDotRound)]
     }
   }
 ])
+
+setTimeout(() => {
+  if (schema[2].componentProps) {
+    schema[2].componentProps.placeholder = 'test'
+    console.log(schema[2])
+  }
+}, 3000)
 </script>
 
 <template>
diff --git a/src/components/Form/src/helper.ts b/src/components/Form/src/helper.ts
index 6ed372e..2c8d01d 100644
--- a/src/components/Form/src/helper.ts
+++ b/src/components/Form/src/helper.ts
@@ -1,7 +1,6 @@
 import { useI18n } from '@/hooks/web/useI18n'
 const { t } = useI18n()
-import { unref } from 'vue'
-import { Slots } from 'vue'
+import type { Slots } from 'vue'
 import { getSlot } from '@/utils/tsxHelper'
 
 interface PlaceholderMoel {
@@ -76,29 +75,12 @@ export function setGridProp(col: ColProps = {}): ColProps {
  * @returns 默认添加 clearable 属性
  */
 export function setComponentProps(props: Recordable = {}): Recordable {
-  const propsObj = unref(props)
-  // for (const key in propsObj) {
-  //   // 如果传入的是组件，需要让其失去响应式，避免不必要的性能开销
-  //   // 这样判断好像还不太合理。后续看看没有更合理的判断方法
-  //   if (propsObj[key]?.render && isFunction(propsObj[key]?.render)) {
-  //     propsObj[key] = shallowRef(propsObj[key]?.render())
-  //   }
-  //   // if (key === 'icon') {
-  //   //   propsObj[key] = [...propsObj[key]]
-  //   // }
-  // }
   const componentProps: Recordable = {
     clearable: true,
-    ...propsObj
+    ...props
   }
-  // componentProps.icons
-  //   ? (componentProps.icons = (componentProps.icons as Recordable[]).map((v) => {
-  //       return shallowRef(v?.render()?.value)
-  //     }))
-  //   : undefined
   // 需要删除额外的属性
   delete componentProps?.slots
-  console.log(componentProps)
   return componentProps
 }