From 4a58f100277f11d068ea8faa81147ae9d3997eea Mon Sep 17 00:00:00 2001
From: Gary Fu <xuebaiyouling@gmail.com>
Date: Sun, 13 Oct 2024 10:34:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A8=E6=80=81=E5=B1=9E=E6=80=A7slots?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common-form-control/index.vue | 26 +++-----------------
 1 file changed, 4 insertions(+), 22 deletions(-)

diff --git a/src/components/common-form-control/index.vue b/src/components/common-form-control/index.vue
index d6c39fa..285d3c7 100644
--- a/src/components/common-form-control/index.vue
+++ b/src/components/common-form-control/index.vue
@@ -222,24 +222,6 @@ const formatResult = computed(() => {
   return null
 })
 
-const slotsResult = computed(() => {
-  const results = {}
-  if (calcOption.value?.slots) {
-    const slots = calcOption.value.slots
-    for (const slotKey in slots) {
-      const slot = slots[slotKey]
-      if (isFunction(slot)) {
-        const slotResult = slot(modelValue.value, calcOption.value)
-        results[slotKey] = {
-          result: slotResult,
-          vnode: isVNode(slotResult)
-        }
-      }
-    }
-  }
-  return results
-})
-
 </script>
 
 <template>
@@ -302,14 +284,14 @@ const slotsResult = computed(() => {
         <template
           v-for="(slot, slotKey) in (calcOption.slots||{})"
           :key="slotKey"
-          #[slotKey]
+          #[slotKey]="scope"
         >
           <component
-            :is="slotsResult[slotKey].result"
-            v-if="slotsResult[slotKey]?.vnode"
+            :is="scope[`__slotResult__${slotKey}`]"
+            v-if="isVNode(scope[`__slotResult__${slotKey}`] = slot(scope))"
           />
           <template v-else>
-            {{ slotsResult[slotKey].result }}
+            {{ scope[`__slotResult__${slotKey}`] }}
           </template>
         </template>
         <template