From d523790c0fa0586fed711a83f3f8abc216539f27 Mon Sep 17 00:00:00 2001
From: jxxghp <jxxghp@gmail.com>
Date: Sun, 19 Jan 2025 14:31:51 +0800
Subject: [PATCH] fix ApexCharts

---
 package.json                                  |   2 +-
 .../dialog/SubscribeFilesDialog.vue           | 102 +++++++++---------
 src/pages/downloading.vue                     |   4 +-
 src/pages/setting.vue                         |   4 +-
 src/pages/subscribe.vue                       |  12 ++-
 src/views/dashboard/AnalyticsCpu.vue          |   8 +-
 src/views/dashboard/AnalyticsMemory.vue       |   8 +-
 7 files changed, 83 insertions(+), 57 deletions(-)

diff --git a/package.json b/package.json
index 90735f12..f296f961 100644
--- a/package.json
+++ b/package.json
@@ -101,4 +101,4 @@
     "workbox-window": "^7.3.0"
   },
   "packageManager": "yarn@1.22.18"
-}
\ No newline at end of file
+}
diff --git a/src/components/dialog/SubscribeFilesDialog.vue b/src/components/dialog/SubscribeFilesDialog.vue
index 5a1021c6..64b2477d 100644
--- a/src/components/dialog/SubscribeFilesDialog.vue
+++ b/src/components/dialog/SubscribeFilesDialog.vue
@@ -132,59 +132,63 @@ onBeforeMount(() => {
           <VWindow v-model="activeTab" class="mt-5 disable-tab-transition" :touch="false">
             <VWindowItem value="download">
               <transition name="fade-slide" appear>
-                <VDataTable
-                  items-per-page="50"
-                  :headers="downloadHeaders"
-                  :items="downloadInfos"
-                  :items-length="totalCount"
-                  density="compact"
-                  item-value="title"
-                  return-object
-                  fixed-header
-                  hover
-                  items-per-page-text="每页条数"
-                  page-text="{0}-{1} 共 {2} 条"
-                  loading-text="加载中..."
-                >
-                  <template #item.episode_number="{ item }">
-                    <div class="text-high-emphasis pt-1">{{ item.episode_number }}. {{ item.title }}</div>
-                  </template>
-                  <template #item.torrent_title="{ item }">
-                    <div class="text-xs" v-for="file in item.download">
-                      【{{ file.site_name }}】{{ file.torrent_title }}
-                    </div>
-                  </template>
-                  <template #item.file_path="{ item }">
-                    <div class="text-xs" v-for="file in item.download">{{ file.file_path }}</div>
-                  </template>
-                  <template #no-data> 没有数据 </template>
-                </VDataTable>
+                <div>
+                  <VDataTable
+                    items-per-page="50"
+                    :headers="downloadHeaders"
+                    :items="downloadInfos"
+                    :items-length="totalCount"
+                    density="compact"
+                    item-value="title"
+                    return-object
+                    fixed-header
+                    hover
+                    items-per-page-text="每页条数"
+                    page-text="{0}-{1} 共 {2} 条"
+                    loading-text="加载中..."
+                  >
+                    <template #item.episode_number="{ item }">
+                      <div class="text-high-emphasis pt-1">{{ item.episode_number }}. {{ item.title }}</div>
+                    </template>
+                    <template #item.torrent_title="{ item }">
+                      <div class="text-xs" v-for="file in item.download">
+                        【{{ file.site_name }}】{{ file.torrent_title }}
+                      </div>
+                    </template>
+                    <template #item.file_path="{ item }">
+                      <div class="text-xs" v-for="file in item.download">{{ file.file_path }}</div>
+                    </template>
+                    <template #no-data> 没有数据 </template>
+                  </VDataTable>
+                </div>
               </transition>
             </VWindowItem>
             <VWindowItem value="library">
               <transition name="fade-slide" appear>
-                <VDataTable
-                  items-per-page="50"
-                  :headers="libraryHeaders"
-                  :items="libraryInfos"
-                  :items-length="totalCount"
-                  density="compact"
-                  item-value="title"
-                  return-object
-                  fixed-header
-                  hover
-                  items-per-page-text="每页条数"
-                  page-text="{0}-{1} 共 {2} 条"
-                  loading-text="加载中..."
-                >
-                  <template #item.episode_number="{ item }">
-                    <div class="text-high-emphasis pt-1">{{ item.episode_number }}. {{ item.title }}</div>
-                  </template>
-                  <template #item.file_path="{ item }">
-                    <div class="text-xs" v-for="file in item.library">{{ file.file_path }}</div>
-                  </template>
-                  <template #no-data> 没有数据 </template>
-                </VDataTable>
+                <div>
+                  <VDataTable
+                    items-per-page="50"
+                    :headers="libraryHeaders"
+                    :items="libraryInfos"
+                    :items-length="totalCount"
+                    density="compact"
+                    item-value="title"
+                    return-object
+                    fixed-header
+                    hover
+                    items-per-page-text="每页条数"
+                    page-text="{0}-{1} 共 {2} 条"
+                    loading-text="加载中..."
+                  >
+                    <template #item.episode_number="{ item }">
+                      <div class="text-high-emphasis pt-1">{{ item.episode_number }}. {{ item.title }}</div>
+                    </template>
+                    <template #item.file_path="{ item }">
+                      <div class="text-xs" v-for="file in item.library">{{ file.file_path }}</div>
+                    </template>
+                    <template #no-data> 没有数据 </template>
+                  </VDataTable>
+                </div>
               </transition>
             </VWindowItem>
           </VWindow>
diff --git a/src/pages/downloading.vue b/src/pages/downloading.vue
index 4b32dd11..53c769aa 100644
--- a/src/pages/downloading.vue
+++ b/src/pages/downloading.vue
@@ -42,7 +42,9 @@ onMounted(async () => {
     <VWindow v-model="activeTab" class="mt-5 disable-tab-transition" :touch="false">
       <VWindowItem v-for="item in downloaders" :value="item.name">
         <transition name="fade-slide" appear>
-          <DownloadingListView :name="item.name" />
+          <div>
+            <DownloadingListView :name="item.name" />
+          </div>
         </transition>
       </VWindowItem>
     </VWindow>
diff --git a/src/pages/setting.vue b/src/pages/setting.vue
index 728179a9..2ba52f18 100644
--- a/src/pages/setting.vue
+++ b/src/pages/setting.vue
@@ -70,7 +70,9 @@ function jumpTab(tab: string) {
       <!-- 规则 -->
       <VWindowItem value="rule">
         <transition name="fade-slide" appear>
-          <AccountSettingRule />
+          <div>
+            <AccountSettingRule />
+          </div>
         </transition>
       </VWindowItem>
 
diff --git a/src/pages/subscribe.vue b/src/pages/subscribe.vue
index 9b8658f1..14f29975 100644
--- a/src/pages/subscribe.vue
+++ b/src/pages/subscribe.vue
@@ -30,17 +30,23 @@ function jumpTab(tab: string) {
     <VWindow v-model="activeTab" class="mt-5 disable-tab-transition" :touch="false">
       <VWindowItem value="mysub">
         <transition name="fade-slide" appear>
-          <SubscribeListView :type="subType" :subid="subId" />
+          <div>
+            <SubscribeListView :type="subType" :subid="subId" />
+          </div>
         </transition>
       </VWindowItem>
       <VWindowItem value="popular">
         <transition name="fade-slide" appear>
-          <SubscribePopularView :type="subType" />
+          <div>
+            <SubscribePopularView :type="subType" />
+          </div>
         </transition>
       </VWindowItem>
       <VWindowItem value="share">
         <transition name="fade-slide" appear>
-          <SubscribeShareView />
+          <div>
+            <SubscribeShareView />
+          </div>
         </transition>
       </VWindowItem>
     </VWindow>
diff --git a/src/views/dashboard/AnalyticsCpu.vue b/src/views/dashboard/AnalyticsCpu.vue
index 3dbbf744..44f5120a 100644
--- a/src/views/dashboard/AnalyticsCpu.vue
+++ b/src/views/dashboard/AnalyticsCpu.vue
@@ -23,6 +23,8 @@ const variableTheme = controlledComputed(
   () => vuetifyTheme.current.value.variables,
 )
 
+const chartKey = ref(0)
+
 // 定时器
 let refreshTimer: NodeJS.Timeout | null = null
 
@@ -129,6 +131,10 @@ onUnmounted(() => {
     refreshTimer = null
   }
 })
+
+onActivated(() => {
+  chartKey.value += 1
+})
 </script>
 
 <template>
@@ -142,7 +148,7 @@ onUnmounted(() => {
           <VCardTitle>CPU</VCardTitle>
         </VCardItem>
         <VCardText>
-          <VApexChart type="line" :options="chartOptions" :series="series" :height="150" />
+          <VApexChart :key="chartKey" type="line" :options="chartOptions" :series="series" :height="150" />
           <p class="text-center font-weight-medium mb-0">当前：{{ current }}%</p>
         </VCardText>
       </VCard>
diff --git a/src/views/dashboard/AnalyticsMemory.vue b/src/views/dashboard/AnalyticsMemory.vue
index 26752c06..00b4d2f3 100644
--- a/src/views/dashboard/AnalyticsMemory.vue
+++ b/src/views/dashboard/AnalyticsMemory.vue
@@ -24,6 +24,8 @@ const variableTheme = controlledComputed(
   () => vuetifyTheme.current.value.variables,
 )
 
+const chartKey = ref(0)
+
 // 定时器
 let refreshTimer: NodeJS.Timeout | null = null
 
@@ -135,6 +137,10 @@ onUnmounted(() => {
     refreshTimer = null
   }
 })
+
+onActivated(() => {
+  chartKey.value += 1
+})
 </script>
 
 <template>
@@ -148,7 +154,7 @@ onUnmounted(() => {
           <VCardTitle>内存</VCardTitle>
         </VCardItem>
         <VCardText>
-          <VApexChart type="area" :options="chartOptions" :series="series" :height="150" />
+          <VApexChart :key="chartKey" type="area" :options="chartOptions" :series="series" :height="150" />
           <p class="text-center font-weight-medium mb-0">当前：{{ formatBytes(usedMemory) }}</p>
         </VCardText>
       </VCard>