fix ui

src/components/render/DashboardRender.vue

@@ -1,16 +1,7 @@
 <script lang="ts" setup>
+import { RenderProps } from '@/api/types'
 import { type PropType } from 'vue'
 
-// 组件接口
-interface RenderProps {
-  component: string
-  text: string
-  html: string
-  content?: any
-  slots?: any
-  props?: any
-}
-
 // 输入参数
 const elementProps = defineProps({
   config: Object as PropType<RenderProps>,

src/components/render/FormRender.vue

@@ -1,15 +1,7 @@
 <script lang="ts" setup>
+import { RenderProps } from '@/api/types'
 import { type PropType, ref } from 'vue'
 
-// 组件接口
-interface RenderProps {
-  component: string
-  text: string
-  html: string
-  content?: any
-  props?: any
-}
-
 // 输入参数
 const elementProps = defineProps({
   config: Object as PropType<RenderProps>,
@@ -17,13 +9,15 @@ const elementProps = defineProps({
 })
 
 // 配置元素
-const formItem = ref<RenderProps>(elementProps.config ?? {
-  component: 'div',
-  text: '',
-  html: '',
-  props: {},
-  content: [],
-})
+const formItem = ref<RenderProps>(
+  elementProps.config ?? {
+    component: 'div',
+    text: '',
+    html: '',
+    props: {},
+    content: [],
+  },
+)
 
 // 配置数据
 const formData = ref<any>(elementProps.form || {})
@@ -37,53 +31,27 @@ const formData = ref<any>(elementProps.form || {})
     v-model:value="formData[formItem.props?.modelvalue]"
   >
     {{ formItem.text }}
-    <template
-      v-for="(innerItem, innerIndex) in (formItem.content || [])"
-      :key="innerIndex"
-    >
+    <template v-for="(innerItem, innerIndex) in formItem.content || []" :key="innerIndex">
       <FormRender
         v-if="!!innerItem.props?.modelvalue"
         v-model:value="formData[innerItem.props?.modelvalue]"
         :config="innerItem"
         :form="formData"
       />
-      <FormRender
-        v-else
-        v-model="formData[innerItem.props?.model]"
-        :config="innerItem"
-        :form="formData"
-      />
+      <FormRender v-else v-model="formData[innerItem.props?.model]" :config="innerItem" :form="formData" />
     </template>
   </Component>
-  <Component
-    :is="formItem.component"
-    v-else-if="formItem.html"
-    v-bind="formItem.props"
-    v-html="formItem.html"
-  />
-  <Component
-    :is="formItem.component"
-    v-else
-    v-bind="formItem.props"
-    v-model="formData[formItem.props?.model]"
-  >
+  <Component :is="formItem.component" v-else-if="formItem.html" v-bind="formItem.props" v-html="formItem.html" />
+  <Component :is="formItem.component" v-else v-bind="formItem.props" v-model="formData[formItem.props?.model]">
     {{ formItem.text }}
-    <template
-      v-for="(innerItem, innerIndex) in (formItem.content || [])"
-      :key="innerIndex"
-    >
+    <template v-for="(innerItem, innerIndex) in formItem.content || []" :key="innerIndex">
       <FormRender
         v-if="!!innerItem.props?.modelvalue"
         v-model:value="formData[innerItem.props?.modelvalue]"
         :config="innerItem"
         :form="formData"
       />
-      <FormRender
-        v-else
-        v-model="formData[innerItem.props?.model]"
-        :config="innerItem"
-        :form="formData"
-      />
+      <FormRender v-else v-model="formData[innerItem.props?.model]" :config="innerItem" :form="formData" />
     </template>
   </Component>
 </template>

src/components/render/PageRender.vue

@@ -3,21 +3,11 @@ import { isNullOrEmptyObject } from '@/@core/utils'
 import api from '@/api'
 import { type PropType } from 'vue'
 import ProgressDialog from '../dialog/ProgressDialog.vue'
+import { RenderProps } from '@/api/types'
 
 // 定议外部事件
 const emit = defineEmits(['action'])
 
-// 组件接口
-interface RenderProps {
-  component: string
-  text: string
-  html: string
-  content?: any
-  slots?: any
-  props?: any
-  events?: any
-}
-
 // 输入参数
 const elementProps = defineProps({
   config: Object as PropType<RenderProps>,