From 43c6672ab14df25fe1dbd4ffeabc015dbe663af4 Mon Sep 17 00:00:00 2001
From: jxxghp <jxxghp@gmail.com>
Date: Sat, 11 Jan 2025 14:15:52 +0800
Subject: [PATCH] fixme

---
 src/@core/components/ThemeSwitcher.vue |  1 -
 src/components/render/FormRender.vue   | 28 ++++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/src/@core/components/ThemeSwitcher.vue b/src/@core/components/ThemeSwitcher.vue
index f35d4fa3..8ce803f6 100644
--- a/src/@core/components/ThemeSwitcher.vue
+++ b/src/@core/components/ThemeSwitcher.vue
@@ -5,7 +5,6 @@ import type { ThemeSwitcherTheme } from '@layouts/types'
 import api from '@/api'
 import { checkPrefersColorSchemeIsDark } from '@/@core/utils'
 import { useToast } from 'vue-toast-notification'
-import { VAceEditor } from 'vue3-ace-editor'
 
 // 显示器宽度
 const display = useDisplay()
diff --git a/src/components/render/FormRender.vue b/src/components/render/FormRender.vue
index d639b52e..afd46ece 100644
--- a/src/components/render/FormRender.vue
+++ b/src/components/render/FormRender.vue
@@ -15,6 +15,7 @@ const formItem = ref<RenderProps>(
     text: '',
     html: '',
     props: {},
+    slots: [],
     content: [],
   },
 )
@@ -24,6 +25,7 @@ const formData = ref<any>(elementProps.form || {})
 </script>
 
 <template>
+  <!-- 使用modelvalue -->
   <Component
     :is="formItem.component"
     v-if="!formItem.html && !!formItem.props?.modelvalue"
@@ -31,6 +33,18 @@ const formData = ref<any>(elementProps.form || {})
     v-model:value="formData[formItem.props?.modelvalue]"
   >
     {{ formItem.text }}
+    <!-- slots -->
+    <template v-for="(content, name) in formItem.slots || []" :key="name" v-slot:[name]="{ _props }">
+      <slot :name="name" v-bind="_props">
+        <PageRender
+          v-for="(slotItem, slotIndex) in content || []"
+          :key="slotIndex"
+          :config="slotItem"
+          @action="emit('action')"
+        />
+      </slot>
+    </template>
+    <!-- content -->
     <template v-for="(innerItem, innerIndex) in formItem.content || []" :key="innerIndex">
       <FormRender
         v-if="!!innerItem.props?.modelvalue"
@@ -41,9 +55,23 @@ const formData = ref<any>(elementProps.form || {})
       <FormRender v-else v-model="formData[innerItem.props?.model]" :config="innerItem" :form="formData" />
     </template>
   </Component>
+  <!-- 使用html -->
   <Component :is="formItem.component" v-else-if="formItem.html" v-bind="formItem.props" v-html="formItem.html" />
+  <!-- 使用model -->
   <Component :is="formItem.component" v-else v-bind="formItem.props" v-model="formData[formItem.props?.model]">
     {{ formItem.text }}
+    <!-- slots -->
+    <template v-for="(content, name) in formItem.slots || []" :key="name" v-slot:[name]="{ _props }">
+      <slot :name="name" v-bind="_props">
+        <PageRender
+          v-for="(slotItem, slotIndex) in content || []"
+          :key="slotIndex"
+          :config="slotItem"
+          @action="emit('action')"
+        />
+      </slot>
+    </template>
+    <!-- content -->
     <template v-for="(innerItem, innerIndex) in formItem.content || []" :key="innerIndex">
       <FormRender
         v-if="!!innerItem.props?.modelvalue"