fix ui

src/api/types.ts

@@ -447,6 +447,17 @@ export interface Plugin {
   add_time?: number
 }
 
+// 渲染结构
+export interface RenderProps {
+  component: string
+  text?: string
+  html?: string
+  content?: any
+  slots?: any
+  props?: any
+  events?: any
+}
+
 // 仪表板组件
 export interface DashboardItem {
   // ID
@@ -458,7 +469,7 @@ export interface DashboardItem {
   // col列数
   cols: { [key: string]: number }
   // 页面元素
-  elements: { [key: string]: any }[]
+  elements: RenderProps[]
 }
 
 // 种子信息

src/components/cards/MediaCard.vue

@@ -477,7 +477,10 @@ function getYear(airDate: string) {
   <VBottomSheet v-if="subscribeSeasonDialog" v-model="subscribeSeasonDialog" inset scrollable>
     <VCard class="rounded-t">
       <DialogCloseBtn @click="subscribeSeasonDialog = false" />
+      <VCardItem>
         <VCardTitle class="pe-10"> 订阅 - {{ props.media?.title }} </VCardTitle>
+      </VCardItem>
+      <VDivider />
       <VCardText>
         <VList v-model:selected="seasonsSelected" lines="three" select-strategy="classic">
           <VListItem v-for="(item, i) in seasonInfos" :key="i" :value="item">

src/components/cards/PluginAppCard.vue

@@ -215,6 +215,7 @@ const dropdownItems = ref([
   <VDialog v-if="releaseDialog" v-model="releaseDialog" width="600" scrollable>
     <VCard :title="`${props.plugin?.plugin_name} 更新说明`">
       <DialogCloseBtn @click="releaseDialog = false" />
+      <VDivider />
       <VersionHistory :history="props.plugin?.history" />
     </VCard>
   </VDialog>

src/components/cards/PluginCard.vue

@@ -435,6 +435,7 @@ watch(
   <VDialog v-model="pluginConfigDialog" scrollable max-width="60rem" :fullscreen="!display.mdAndUp.value">
     <VCard :title="`${props.plugin?.plugin_name} - 配置`" class="rounded-t">
       <DialogCloseBtn v-model="pluginConfigDialog" />
+      <VDivider />
       <VCardText>
         <FormRender v-for="(item, index) in pluginFormItems" :key="index" :config="item" :form="pluginConfigForm" />
       </VCardText>
@@ -452,13 +453,10 @@ watch(
   <VDialog v-model="pluginInfoDialog" scrollable max-width="80rem" :fullscreen="!display.mdAndUp.value">
     <VCard :title="`${props.plugin?.plugin_name}`" class="rounded-t">
       <DialogCloseBtn v-model="pluginInfoDialog" />
-      <VCardText>
+      <VCardText class="min-h-40">
         <PageRender @action="loadPluginPage" v-for="(item, index) in pluginPageItems" :key="index" :config="item" />
       </VCardText>
-      <VCardActions class="pt-3">
+      <VFab icon="mdi-cog" location="bottom end" size="x-large" fixed app appear @click="showPluginConfig" />
-        <VSpacer />
-        <VBtn @click="showPluginConfig" variant="elevated" prepend-icon="mdi-cog" class="px-5"> 配置 </VBtn>
-      </VCardActions>
     </VCard>
   </VDialog>
 
@@ -469,7 +467,9 @@ watch(
   <VDialog v-if="releaseDialog" v-model="releaseDialog" width="600" scrollable>
     <VCard :title="`${props.plugin?.plugin_name} 更新说明`">
       <DialogCloseBtn @click="releaseDialog = false" />
+      <VDivider />
       <VersionHistory :history="props.plugin?.history" />
+      <VDivider />
       <VCardText>
         <VBtn @click="updatePlugin" block>
           <template #prepend>

src/components/cards/SiteCard.vue

@@ -308,6 +308,7 @@ onMounted(() => {
     <!-- Dialog Content -->
     <VCard :title="`浏览站点 - ${cardProps.site?.name}`">
       <DialogCloseBtn @click="resourceDialog = false" />
+      <VDivider />
       <VCardText class="pt-2">
         <SiteTorrentTable :site="cardProps.site?.id" />
       </VCardText>

src/components/dialog/ReorganizeDialog.vue

@@ -169,7 +169,8 @@ onMounted(() => {
       class="rounded-t"
     >
       <DialogCloseBtn @click="emit('close')" />
-      <VCardText class="pt-2">
+      <VDivider />
+      <VCardText>
         <VForm @submit.prevent="() => {}">
           <VRow>
             <VCol cols="12" md="8">

src/components/dialog/SiteAddEditDialog.vue

@@ -133,7 +133,8 @@ async function updateSiteInfo() {
       class="rounded-t"
     >
       <DialogCloseBtn @click="emit('close')" />
-      <VCardText class="pt-2">
+      <VDivider />
+      <VCardText>
         <VForm @submit.prevent="() => {}">
           <VRow>
             <VCol cols="12" md="6">

src/components/dialog/SubscribeEditDialog.vue

@@ -269,7 +269,8 @@ onMounted(() => {
       }`"
       class="rounded-t"
     >
-      <VCardText class="pt-2">
+      <VDivider />
+      <VCardText>
         <DialogCloseBtn @click="emit('close')" />
         <VForm @submit.prevent="() => {}">
           <VRow>
@@ -369,7 +370,6 @@ onMounted(() => {
           </VRow>
         </VForm>
       </VCardText>
-
       <VCardActions class="pt-3">
         <VBtn v-if="!props.default" color="error" @click="removeSubscribe" variant="outlined" class="me-3">
           取消订阅

src/components/dialog/SubscribeHistoryDialog.vue

@@ -134,9 +134,10 @@ const dropdownItems = ref([
 <template>
   <VDialog scrollable max-width="50rem" :fullscreen="!display.mdAndUp.value">
     <VCard class="mx-auto" width="100%">
-      <VCardItem class="pb-0">
+      <VCardItem>
         <VCardTitle>{{ props.type + '订阅历史' }}</VCardTitle>
       </VCardItem>
+      <VDivider />
       <DialogCloseBtn
         @click="
           () => {

src/components/misc/MediaIdSelector.vue

@@ -110,6 +110,7 @@ onMounted(() => {
         }
       "
     />
+    <VDivider />
     <VList v-if="items.length > 0" lines="three">
       <template v-for="(item, i) in items" :key="i">
         <VListItem @click="selectMedia(item)">

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 ?? {
+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
+    <template v-for="(innerItem, innerIndex) in formItem.content || []" :key="innerIndex">
-      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
+      <FormRender v-else v-model="formData[innerItem.props?.model]" :config="innerItem" :form="formData" />
-        v-else
-        v-model="formData[innerItem.props?.model]"
-        :config="innerItem"
-        :form="formData"
-      />
     </template>
   </Component>
-  <Component
+  <Component :is="formItem.component" v-else-if="formItem.html" v-bind="formItem.props" v-html="formItem.html" />
-    :is="formItem.component"
+  <Component :is="formItem.component" v-else v-bind="formItem.props" v-model="formData[formItem.props?.model]">
-    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
+    <template v-for="(innerItem, innerIndex) in formItem.content || []" :key="innerIndex">
-      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
+      <FormRender v-else v-model="formData[innerItem.props?.model]" :config="innerItem" :form="formData" />
-        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>,

src/pages/dashboard.vue

@@ -2,14 +2,10 @@
 import draggable from 'vuedraggable'
 import api from '@/api'
 import { isNullOrEmptyObject } from '@/@core/utils'
-import { useDisplay } from 'vuetify'
 import { DashboardItem } from '@/api/types'
 import store from '@/store'
 import DashboardElement from '@/components/misc/DashboardElement.vue'
 
-// 显示器宽度
-const display = useDisplay()
-
 // 从Vuex Store中获取superuser信息
 const superUser = store.state.auth.superUser
 
@@ -107,6 +103,9 @@ const dashboardConfigs = ref<DashboardItem[]>([
 // 有仪表板的插件
 const dashboardPlugins = ref<any[]>([])
 
+// 插件仪表板的刷新状态
+const pluginDashboardRefreshStatus = ref<{ [key: string]: boolean }>({})
+
 // 弹窗
 const dialog = ref(false)
 
@@ -196,9 +195,6 @@ async function getDashboardPlugins() {
   }
 }
 
-// 插件仪表板的刷新状态
-const pluginDashboardRefreshStatus = ref<{ [key: string]: boolean }>({})
-
 // 获取一个插件的仪表板配置项
 async function getPluginDashboard(id: string) {
   try {