From 6fad85e957ccd2e397c5ca6c5a79bc75b80e7e0f Mon Sep 17 00:00:00 2001
From: jxxghp <jxxghp@gmail.com>
Date: Mon, 24 Jun 2024 09:13:22 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat=EF=BC=9A=E4=BB=AA=E8=A1=A8=E7=9B=98?=
 =?UTF-8?q?=E4=B8=8D=E6=B4=BB=E8=B7=83=E6=97=B6=E4=B8=8D=E5=88=B7=E6=96=B0?=
 =?UTF-8?q?=20&&=20=E7=BD=91=E7=9B=98=E6=95=B4=E7=90=86=E8=81=94=E5=8A=A8?=
 =?UTF-8?q?=E5=88=AE=E5=89=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                               |  2 +-
 src/components/dialog/ReorganizeDialog.vue |  2 +-
 src/components/misc/DashboardElement.vue   | 14 ++++++++++----
 src/pages/dashboard.vue                    | 15 ++++++++++++++-
 src/views/dashboard/AnalyticsCpu.vue       | 10 ++++++++++
 src/views/dashboard/AnalyticsMemory.vue    | 10 ++++++++++
 src/views/dashboard/AnalyticsScheduler.vue | 12 ++++++++++++
 src/views/dashboard/AnalyticsSpeed.vue     | 13 +++++++++++++
 8 files changed, 71 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index dca5d6bb..7c86d710 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "moviepilot",
-  "version": "1.9.8",
+  "version": "1.9.8-1",
   "private": true,
   "bin": "dist/service.js",
   "scripts": {
diff --git a/src/components/dialog/ReorganizeDialog.vue b/src/components/dialog/ReorganizeDialog.vue
index 3574d78b..89f17018 100644
--- a/src/components/dialog/ReorganizeDialog.vue
+++ b/src/components/dialog/ReorganizeDialog.vue
@@ -350,7 +350,7 @@ onMounted(() => {
             </VCol>
           </VRow>
           <VRow>
-            <VCol cols="12" md="6" v-if="props.storage == 'local'">
+            <VCol cols="12" md="6">
               <VSwitch
                 v-model="transferForm.scrape"
                 label="刮削元数据"
diff --git a/src/components/misc/DashboardElement.vue b/src/components/misc/DashboardElement.vue
index 1892b262..f257c4e2 100644
--- a/src/components/misc/DashboardElement.vue
+++ b/src/components/misc/DashboardElement.vue
@@ -12,12 +12,18 @@ import MediaServerLibrary from '@/views/dashboard/MediaServerLibrary.vue'
 import MediaServerPlaying from '@/views/dashboard/MediaServerPlaying.vue'
 import DashboardRender from '@/components/render/DashboardRender.vue'
 import { isNullOrEmptyObject } from '@/@core/utils'
+
 // 输入参数
 const props = defineProps({
   // 仪表板配置
   config: Object as PropType<DashboardItem>,
   // 刷新状态
   refreshStatus: Boolean,
+  // 是否允许刷新数据
+  allowRefresh: {
+    type: Boolean,
+    default: true,
+  },
 })
 
 const emit = defineEmits(['update:refreshStatus'])
@@ -32,10 +38,10 @@ onUnmounted(() => {
   <AnalyticsStorage v-if="config?.id === 'storage'" />
   <AnalyticsMediaStatistic v-else-if="config?.id === 'mediaStatistic'" />
   <AnalyticsWeeklyOverview v-else-if="config?.id === 'weeklyOverview'" />
-  <AnalyticsSpeed v-else-if="config?.id === 'speed'" />
-  <AnalyticsScheduler v-else-if="config?.id === 'scheduler'" />
-  <AnalyticsCpu v-else-if="config?.id === 'cpu'" />
-  <AnalyticsMemory v-else-if="config?.id === 'memory'" />
+  <AnalyticsSpeed v-else-if="config?.id === 'speed'" :allowRefresh="props.allowRefresh" />
+  <AnalyticsScheduler v-else-if="config?.id === 'scheduler'" :allowRefresh="props.allowRefresh" />
+  <AnalyticsCpu v-else-if="config?.id === 'cpu'" :allowRefresh="props.allowRefresh" />
+  <AnalyticsMemory v-else-if="config?.id === 'memory'" :allowRefresh="props.allowRefresh" />
   <MediaServerLibrary v-else-if="config?.id === 'library'" />
   <MediaServerPlaying v-else-if="config?.id === 'playing'" />
   <MediaServerLatest v-else-if="config?.id === 'latest'" />
diff --git a/src/pages/dashboard.vue b/src/pages/dashboard.vue
index 577c7d62..3683bd77 100644
--- a/src/pages/dashboard.vue
+++ b/src/pages/dashboard.vue
@@ -19,6 +19,9 @@ const superUser = store.state.auth.superUser
 // 是否拉升高度
 const isElevated = ref(true)
 
+// 是否发送请求的总开关
+const isRequest = ref(true)
+
 // 计算属性，控制是否拉升高度
 const elevatedConf = controlledComputed(
   () => isElevated.value,
@@ -269,7 +272,8 @@ async function getPluginDashboard(id: string, key: string) {
         if (
           res.attrs?.refresh &&
           pluginDashboardRefreshStatus.value[pluginDashboardId] &&
-          enableConfig.value[pluginDashboardId]
+          enableConfig.value[pluginDashboardId] &&
+          isRequest.value
         ) {
           // 清除之前的定时器
           if (refreshTimers.value[pluginDashboardId]) {
@@ -298,6 +302,14 @@ onBeforeMount(async () => {
   await loadDashboardConfig()
   getPluginDashboardMeta()
 })
+
+onActivated(async () => {
+  isRequest.value = true
+})
+
+onDeactivated(() => {
+  isRequest.value = false
+})
 </script>
 
 <template>
@@ -314,6 +326,7 @@ onBeforeMount(async () => {
       <VCol v-if="enableConfig[buildPluginDashboardId(element.id, element.key)] && element.cols" v-bind:="element.cols">
         <DashboardElement
           :config="element"
+          :allow-refresh="isRequest"
           v-model:refreshStatus="pluginDashboardRefreshStatus[buildPluginDashboardId(element.id, element.key)]"
         />
       </VCol>
diff --git a/src/views/dashboard/AnalyticsCpu.vue b/src/views/dashboard/AnalyticsCpu.vue
index eda1becb..6edf226e 100644
--- a/src/views/dashboard/AnalyticsCpu.vue
+++ b/src/views/dashboard/AnalyticsCpu.vue
@@ -4,6 +4,15 @@ import { useTheme } from 'vuetify'
 import { hexToRgb } from '@layouts/utils'
 import api from '@/api'
 
+// 输入参数
+const props = defineProps({
+  // 是否允许刷新数据
+  allowRefresh: {
+    type: Boolean,
+    default: true,
+  },
+})
+
 const vuetifyTheme = useTheme()
 
 const currentTheme = controlledComputed(
@@ -94,6 +103,7 @@ const chartOptions = controlledComputed(
 
 // 调用API接口获取最新CPU使用率
 async function getCpuUsage() {
+  if (!props.allowRefresh) return
   try {
     // 请求数据
     current.value = (await api.get('dashboard/cpu')) ?? 0
diff --git a/src/views/dashboard/AnalyticsMemory.vue b/src/views/dashboard/AnalyticsMemory.vue
index 6d1143b5..013156ce 100644
--- a/src/views/dashboard/AnalyticsMemory.vue
+++ b/src/views/dashboard/AnalyticsMemory.vue
@@ -5,6 +5,15 @@ import { hexToRgb } from '@layouts/utils'
 import api from '@/api'
 import { formatBytes } from '@/@core/utils/formatters'
 
+// 输入参数
+const props = defineProps({
+  // 是否允许刷新数据
+  allowRefresh: {
+    type: Boolean,
+    default: true,
+  },
+})
+
 const vuetifyTheme = useTheme()
 
 const currentTheme = controlledComputed(
@@ -100,6 +109,7 @@ const chartOptions = controlledComputed(
 
 // 调用API接口获取最新内存使用量
 async function getMemorgUsage() {
+  if (!props.allowRefresh) return
   try {
     // 请求数据
     ;[usedMemory.value, memoryUsage.value] = await api.get('dashboard/memory')
diff --git a/src/views/dashboard/AnalyticsScheduler.vue b/src/views/dashboard/AnalyticsScheduler.vue
index 6472a1e7..c0d7643c 100644
--- a/src/views/dashboard/AnalyticsScheduler.vue
+++ b/src/views/dashboard/AnalyticsScheduler.vue
@@ -2,6 +2,15 @@
 import api from '@/api'
 import type { ScheduleInfo } from '@/api/types'
 
+// 输入参数
+const props = defineProps({
+  // 是否允许刷新数据
+  allowRefresh: {
+    type: Boolean,
+    default: true,
+  },
+})
+
 // 定时服务列表
 const schedulerList = ref<ScheduleInfo[]>([])
 
@@ -10,6 +19,9 @@ let refreshTimer: NodeJS.Timeout | null = null
 
 // 调用API加载定时服务列表
 async function loadSchedulerList() {
+  if (!props.allowRefresh) {
+    return
+  }
   try {
     const res: ScheduleInfo[] = await api.get('dashboard/schedule')
 
diff --git a/src/views/dashboard/AnalyticsSpeed.vue b/src/views/dashboard/AnalyticsSpeed.vue
index 67a7a2bd..5f10d97b 100644
--- a/src/views/dashboard/AnalyticsSpeed.vue
+++ b/src/views/dashboard/AnalyticsSpeed.vue
@@ -3,6 +3,15 @@ import { formatFileSize } from '@/@core/utils/formatters'
 import api from '@/api'
 import type { DownloaderInfo } from '@/api/types'
 
+// 输入参数
+const props = defineProps({
+  // 是否允许刷新数据
+  allowRefresh: {
+    type: Boolean,
+    default: true,
+  },
+})
+
 // 定时器
 let refreshTimer: NodeJS.Timeout | null = null
 
@@ -35,6 +44,10 @@ const infoItems = ref([
 
 // 调用API查询下载器数据
 async function loadDownloaderInfo() {
+  if (!props.allowRefresh) {
+    return
+  }
+
   try {
     const res: DownloaderInfo = await api.get('dashboard/downloader')
 

From 1cb02994bfb5eaf6498940070945483f7fcc86dc Mon Sep 17 00:00:00 2001
From: jxxghp <jxxghp@gmail.com>
Date: Mon, 24 Jun 2024 11:51:39 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix=20=E7=99=BB=E5=BD=95=E5=A4=B1=E8=B4=A5?=
 =?UTF-8?q?=E7=9A=84=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json     | 2 +-
 src/api/index.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 7c86d710..bfbcafa5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "moviepilot",
-  "version": "1.9.8-1",
+  "version": "1.9.8-2",
   "private": true,
   "bin": "dist/service.js",
   "scripts": {
diff --git a/src/api/index.ts b/src/api/index.ts
index ad415100..2f30f7a2 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -32,7 +32,7 @@ api.interceptors.response.use(
       router.push('/login')
     }
 
-    return Promise.reject(new Error(error))
+    return Promise.reject(error)
   },
 )