From 23ac80886d208ca942ad5411f1370f75662ad43d Mon Sep 17 00:00:00 2001
From: jxxghp <jxxghp@gmail.com>
Date: Fri, 31 May 2024 11:46:27 +0800
Subject: [PATCH] upgrade vuetify to 3.6.8

---
 package.json                                 |  5 ++-
 src/views/dashboard/AnalyticsCpu.vue         |  2 +-
 src/views/dashboard/AnalyticsMemory.vue      |  2 +-
 src/views/dashboard/AnalyticsProcesses.vue   |  2 +-
 src/views/dashboard/AnalyticsScheduler.vue   |  2 +-
 src/views/dashboard/AnalyticsSpeed.vue       |  2 +-
 src/views/reorganize/DownloadingListView.vue | 36 ++++++--------------
 src/views/setting/AccountSettingService.vue  |  2 +-
 src/views/subscribe/SubscribeListView.vue    |  6 ++--
 yarn.lock                                    |  8 ++---
 10 files changed, 25 insertions(+), 42 deletions(-)

diff --git a/package.json b/package.json
index 14727064..7750c2f5 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,6 @@
     "express-http-proxy": "^2.0.0",
     "lodash": "^4.17.21",
     "nprogress": "^0.2.0",
-    "pull-refresh-vue3": "^0.3.1",
     "qrcode.vue": "^3.4.1",
     "sass": "^1.59.3",
     "tailwindcss": "^3.3.2",
@@ -51,7 +50,7 @@
     "vue3-apexcharts": "^1.4.1",
     "vue3-perfect-scrollbar": "^2.0.0",
     "vuedraggable": "^4.1.0",
-    "vuetify": "3.5.14",
+    "vuetify": "3.6.8",
     "vuetify-use-dialog": "^0.6.11",
     "vuex": "^4.1.0",
     "vuex-persistedstate": "^4.1.0",
@@ -102,4 +101,4 @@
   "resolutions": {
     "postcss": "8"
   }
-}
+}
\ No newline at end of file
diff --git a/src/views/dashboard/AnalyticsCpu.vue b/src/views/dashboard/AnalyticsCpu.vue
index a1bdb89f..eda1becb 100644
--- a/src/views/dashboard/AnalyticsCpu.vue
+++ b/src/views/dashboard/AnalyticsCpu.vue
@@ -16,7 +16,7 @@ const variableTheme = controlledComputed(
 )
 
 // 定时器
-let refreshTimer: NodeJS.Timer | null = null
+let refreshTimer: NodeJS.Timeout | null = null
 
 // 时间序列
 const series = ref([
diff --git a/src/views/dashboard/AnalyticsMemory.vue b/src/views/dashboard/AnalyticsMemory.vue
index 77f525a4..6d1143b5 100644
--- a/src/views/dashboard/AnalyticsMemory.vue
+++ b/src/views/dashboard/AnalyticsMemory.vue
@@ -17,7 +17,7 @@ const variableTheme = controlledComputed(
 )
 
 // 定时器
-let refreshTimer: NodeJS.Timer | null = null
+let refreshTimer: NodeJS.Timeout | null = null
 
 // 时间序列
 const series = ref([
diff --git a/src/views/dashboard/AnalyticsProcesses.vue b/src/views/dashboard/AnalyticsProcesses.vue
index 64b08e2e..7d1f05f5 100644
--- a/src/views/dashboard/AnalyticsProcesses.vue
+++ b/src/views/dashboard/AnalyticsProcesses.vue
@@ -10,7 +10,7 @@ const headers = ['进程ID', '进程名称', '运行时间', '内存占用']
 const processList = ref<Process[]>([])
 
 // 定时器
-let refreshTimer: NodeJS.Timer | null = null
+let refreshTimer: NodeJS.Timeout | null = null
 
 // 调用API加载数据
 async function loadProcessList() {
diff --git a/src/views/dashboard/AnalyticsScheduler.vue b/src/views/dashboard/AnalyticsScheduler.vue
index d44e60d9..6472a1e7 100644
--- a/src/views/dashboard/AnalyticsScheduler.vue
+++ b/src/views/dashboard/AnalyticsScheduler.vue
@@ -6,7 +6,7 @@ import type { ScheduleInfo } from '@/api/types'
 const schedulerList = ref<ScheduleInfo[]>([])
 
 // 定时器
-let refreshTimer: NodeJS.Timer | null = null
+let refreshTimer: NodeJS.Timeout | null = null
 
 // 调用API加载定时服务列表
 async function loadSchedulerList() {
diff --git a/src/views/dashboard/AnalyticsSpeed.vue b/src/views/dashboard/AnalyticsSpeed.vue
index f182f7af..67a7a2bd 100644
--- a/src/views/dashboard/AnalyticsSpeed.vue
+++ b/src/views/dashboard/AnalyticsSpeed.vue
@@ -4,7 +4,7 @@ import api from '@/api'
 import type { DownloaderInfo } from '@/api/types'
 
 // 定时器
-let refreshTimer: NodeJS.Timer | null = null
+let refreshTimer: NodeJS.Timeout | null = null
 
 // 下载器信息
 const downloadInfo = ref<DownloaderInfo>({
diff --git a/src/views/reorganize/DownloadingListView.vue b/src/views/reorganize/DownloadingListView.vue
index 6b86d5dc..624aa1af 100644
--- a/src/views/reorganize/DownloadingListView.vue
+++ b/src/views/reorganize/DownloadingListView.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import PullRefresh from 'pull-refresh-vue3'
+import { VPullToRefresh } from 'vuetify/labs/VPullToRefresh'
 import api from '@/api'
 import type { DownloadingInfo } from '@/api/types'
 import NoDataFound from '@/components/NoDataFound.vue'
@@ -7,7 +7,7 @@ import DownloadingCard from '@/components/cards/DownloadingCard.vue'
 import store from '@/store'
 
 // 定时器
-let refreshTimer: NodeJS.Timer | null = null
+let refreshTimer: NodeJS.Timeout | null = null
 
 // 数据列表
 const dataList = ref<DownloadingInfo[]>([])
@@ -20,8 +20,7 @@ async function fetchData() {
   try {
     dataList.value = await api.get('download/')
     isRefreshed.value = true
-  }
-  catch (error) {
+  } catch (error) {
     console.error(error)
   }
 }
@@ -41,10 +40,8 @@ const filteredDataList = computed(() => {
   // 从Vuex Store中获取用户信息
   const superUser = store.state.auth.superUser
   const userName = store.state.auth.userName
-  if (superUser)
-    return dataList.value
-  else
-    return dataList.value.filter(data => data.userid === userName || data.username === userName)
+  if (superUser) return dataList.value
+  else return dataList.value.filter(data => data.userid === userName || data.username === userName)
 })
 
 // 加载时获取数据
@@ -67,23 +64,10 @@ onUnmounted(() => {
 </script>
 
 <template>
-  <LoadingBanner
-    v-if="!isRefreshed"
-    class="mt-12"
-  />
-  <PullRefresh
-    v-model="loading"
-    @refresh="onRefresh"
-  >
-    <div
-      v-if="filteredDataList.length > 0"
-      class="grid gap-3 grid-downloading-card"
-    >
-      <DownloadingCard
-        v-for="data in filteredDataList"
-        :key="data.hash"
-        :info="data"
-      />
+  <LoadingBanner v-if="!isRefreshed" class="mt-12" />
+  <VPullToRefresh v-model="loading" @load="onRefresh" :pull-down-threshold="64">
+    <div v-if="filteredDataList.length > 0" class="grid gap-3 grid-downloading-card">
+      <DownloadingCard v-for="data in filteredDataList" :key="data.hash" :info="data" />
     </div>
     <NoDataFound
       v-if="filteredDataList.length === 0 && isRefreshed"
@@ -91,5 +75,5 @@ onUnmounted(() => {
       error-title="没有任务"
       error-description="正在下载的任务将会显示在这里。"
     />
-  </PullRefresh>
+  </VPullToRefresh>
 </template>
diff --git a/src/views/setting/AccountSettingService.vue b/src/views/setting/AccountSettingService.vue
index a85ff257..30b0aa1f 100644
--- a/src/views/setting/AccountSettingService.vue
+++ b/src/views/setting/AccountSettingService.vue
@@ -10,7 +10,7 @@ const $toast = useToast()
 const schedulerList = ref<ScheduleInfo[]>([])
 
 // 定时器
-let refreshTimer: NodeJS.Timer | null = null
+let refreshTimer: NodeJS.Timeout | null = null
 
 // 调用API加载定时服务列表
 async function loadSchedulerList() {
diff --git a/src/views/subscribe/SubscribeListView.vue b/src/views/subscribe/SubscribeListView.vue
index 1cfe39eb..1d5e22cd 100644
--- a/src/views/subscribe/SubscribeListView.vue
+++ b/src/views/subscribe/SubscribeListView.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import PullRefresh from 'pull-refresh-vue3'
+import { VPullToRefresh } from 'vuetify/labs/VPullToRefresh'
 import api from '@/api'
 import type { Subscribe } from '@/api/types'
 import NoDataFound from '@/components/NoDataFound.vue'
@@ -60,7 +60,7 @@ const filteredDataList = computed(() => {
 
 <template>
   <LoadingBanner v-if="!isRefreshed" class="mt-12" />
-  <PullRefresh v-model="loading" @refresh="onRefresh">
+  <VPullToRefresh v-model="loading" @load="onRefresh">
     <div v-if="filteredDataList.length > 0" class="mx-3 grid gap-4 grid-subscribe-card p-1">
       <SubscribeCard
         v-for="data in filteredDataList"
@@ -76,7 +76,7 @@ const filteredDataList = computed(() => {
       error-title="没有订阅"
       error-description="请通过搜索添加电影、电视剧订阅。"
     />
-  </PullRefresh>
+  </VPullToRefresh>
   <!-- 底部操作按钮 -->
   <VFab
     v-if="store.state.auth.superUser"
diff --git a/yarn.lock b/yarn.lock
index 55e2e3d4..b0ebd4c2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7396,10 +7396,10 @@ vuetify-use-dialog@^0.6.11:
   dependencies:
     defu "^6.1.4"
 
-vuetify@3.5.14:
-  version "3.5.14"
-  resolved "https://registry.yarnpkg.com/vuetify/-/vuetify-3.5.14.tgz#9590a06bcf49398f1303203b84cc065899d7cec8"
-  integrity sha512-bmfid7K4D+wPi9h7sK4PxjmIB2tBzNuqlW14cs30iQ7GAphEeo/HYwn6aEdNK/Na+imhti8CJDDqdGs6SEfyXQ==
+vuetify@3.6.8:
+  version "3.6.8"
+  resolved "https://registry.yarnpkg.com/vuetify/-/vuetify-3.6.8.tgz#89ab0b68aa5488c7b54a04fa4a02a1b802892aaa"
+  integrity sha512-j0v0iTeSVRj2ZEM9Q8HxejHxmxrQLYQSalhH82hfcraORaiDoqf1XV05N3P5ERXkKiJjJc/LfxFAUUvYSldxeg==
 
 vuex-persistedstate@^4.1.0:
   version "4.1.0"