From 117b12348ca28f0b30847f57fc58ac4f1585f45d Mon Sep 17 00:00:00 2001
From: "hao.dai" <dh505159718@gmail.com>
Date: Wed, 17 Apr 2024 12:38:34 +0800
Subject: [PATCH 01/36] =?UTF-8?q?fix:=20=E4=BD=8E=E7=89=88=E6=9C=ACSafari?=
 =?UTF-8?q?=E6=B5=8F=E8=A7=88=E5=99=A8=E4=B8=8D=E8=83=BD=E6=AD=A3=E7=A1=AE?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E8=AE=A2=E9=98=85=E7=9A=84=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E6=97=A5=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                  |  3 ++-
 src/@core/utils/formatters.ts | 45 ++++++++++++++++++++---------------
 2 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/package.json b/package.json
index db1fd896..50de97db 100644
--- a/package.json
+++ b/package.json
@@ -81,6 +81,7 @@
     "@vitejs/plugin-vue": "^5.0.4",
     "@vitejs/plugin-vue-jsx": "^3.0.0",
     "autoprefixer": "^10.4.14",
+    "dayjs": "^1.11.10",
     "eslint": "^9.0.0",
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-import-resolver-typescript": "^3.5.1",
@@ -112,4 +113,4 @@
   "resolutions": {
     "postcss": "8"
   }
-}
\ No newline at end of file
+}
diff --git a/src/@core/utils/formatters.ts b/src/@core/utils/formatters.ts
index 342de36b..f7848206 100644
--- a/src/@core/utils/formatters.ts
+++ b/src/@core/utils/formatters.ts
@@ -1,5 +1,12 @@
+import dayjs from 'dayjs'
+import relativeTime from 'dayjs/plugin/relativeTime'
+import ZH_CN from 'dayjs/locale/zh-cn'
+
 import { isToday } from './index'
 
+dayjs.extend(relativeTime)
+dayjs.locale(ZH_CN)
+
 export function avatarText(value: string) {
   if (!value)
     return ''
@@ -19,7 +26,7 @@ export function kFormatter(num: number) {
  * Format and return date in Humanize format
  * Intl docs: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/DateTimeFormat/format
  * Intl Constructor: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/DateTimeFormat/DateTimeFormat
- * @param {String} value date to format
+ * @param {string} value date to format
  * @param {Intl.DateTimeFormatOptions} formatting Intl object to format with
  */
 export function formatDate(value: string, formatting: Intl.DateTimeFormatOptions = { month: 'short', day: 'numeric', year: 'numeric' }) {
@@ -32,8 +39,8 @@ export function formatDate(value: string, formatting: Intl.DateTimeFormatOptions
 /**
  * Return short human friendly month representation of date
  * Can also convert date to only time if date is of today (Better UX)
- * @param {String} value date to format
- * @param {Boolean} toTimeForCurrentDay Shall convert to time if day is today/current
+ * @param {string} value date to format
+ * @param {boolean} toTimeForCurrentDay Shall convert to time if day is today/current
  */
 export function formatDateToMonthShort(value: string, toTimeForCurrentDay = true) {
   const date = new Date(value)
@@ -107,7 +114,7 @@ export function formatBytes(bytes: number, decimals = 2) {
 
   const i = Math.floor(Math.log(bytes) / Math.log(k))
 
-  return `${parseFloat((bytes / k ** i).toFixed(dm))} ${sizes[i]}`
+  return `${Number.parseFloat((bytes / k ** i).toFixed(dm))} ${sizes[i]}`
 }
 
 // 格式化剧集列表
@@ -150,20 +157,20 @@ export function formatEp(nums: number[]): string {
 
 // 将yyyy-mm-dd hh:mm:ss转换为时间差，如：1小时前，1天前
 export function formatDateDifference(dateString: string): string {
-  const date = new Date(dateString)
-  const currentDate = new Date()
-  const timeDifference = currentDate.getTime() - date.getTime()
-  const secondsDifference = Math.floor(timeDifference / 1000)
-  const minutesDifference = Math.floor(secondsDifference / 60)
-  const hoursDifference = Math.floor(minutesDifference / 60)
-  const daysDifference = Math.floor(hoursDifference / 24)
+  // const timeDifference = dayjs().millisecond() - dayjs(dateString).millisecond()
+  // const secondsDifference = Math.floor(timeDifference / 1000)
+  // const minutesDifference = Math.floor(secondsDifference / 60)
+  // const hoursDifference = Math.floor(minutesDifference / 60)
+  // const daysDifference = Math.floor(hoursDifference / 24)
 
-  if (daysDifference > 0)
-    return `${daysDifference}天前`
-  else if (hoursDifference > 0)
-    return `${hoursDifference}小时前`
-  else if (minutesDifference > 0)
-    return `${minutesDifference}分钟前`
-  else
-    return '刚刚'
+  // if (daysDifference > 0)
+  //   return `${daysDifference}天前`
+  // else if (hoursDifference > 0)
+  //   return `${hoursDifference}小时前`
+  // else if (minutesDifference > 0)
+  //   return `${minutesDifference}分钟前`
+  // else
+  //   return '刚刚'
+
+  return dayjs(dateString).fromNow()
 }

From 468607c8e855bf903692145cf108b19fa529f512 Mon Sep 17 00:00:00 2001
From: jxxghp <jxxghp@gmail.com>
Date: Wed, 17 Apr 2024 14:38:40 +0800
Subject: [PATCH 02/36] =?UTF-8?q?feat=EF=BC=9A=E7=AB=99=E7=82=B9=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components.d.ts                   |  1 +
 src/@core/components/StatIcon.vue | 18 +++++++++++++++
 src/api/types.ts                  | 27 ++++++++++++++++++++++
 src/components/cards/SiteCard.vue | 37 ++++++++++++++++++++++++++++---
 yarn.lock                         |  7 ++++++
 5 files changed, 87 insertions(+), 3 deletions(-)
 create mode 100644 src/@core/components/StatIcon.vue

diff --git a/components.d.ts b/components.d.ts
index 8f4e3f15..842ae72d 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -13,6 +13,7 @@ declare module 'vue' {
     MoreBtn: typeof import('./src/@core/components/MoreBtn.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']
+    StatIcon: typeof import('./src/@core/components/StatIcon.vue')['default']
     ThemeSwitcher: typeof import('./src/@core/components/ThemeSwitcher.vue')['default']
   }
 }
diff --git a/src/@core/components/StatIcon.vue b/src/@core/components/StatIcon.vue
new file mode 100644
index 00000000..e5c82df3
--- /dev/null
+++ b/src/@core/components/StatIcon.vue
@@ -0,0 +1,18 @@
+<script lang="ts" setup>
+interface Props {
+  color?: string
+  message?: string
+}
+
+const props = defineProps<Props>()
+</script>
+
+<template>
+  <div class="absolute top-2 right-2 flex items-center justify-between p-2 shadow">
+    <VBadge :color="props.color" bordered>
+      <template #badge>          
+        <VIcon icon="mdi-pulse"></VIcon>
+      </template>
+    </VBadge>
+  </div>
+</template>
diff --git a/src/api/types.ts b/src/api/types.ts
index 32ab43f6..1d0efbe1 100644
--- a/src/api/types.ts
+++ b/src/api/types.ts
@@ -505,6 +505,33 @@ export interface Site {
   is_active: boolean
 }
 
+// 站点使用统计
+export interface SiteStatistic {
+
+  // 站点主域名Key
+  domain?: string
+
+  // 成功次数
+  success?: number
+
+  // 失败次数
+  fail?: number
+
+  // 平均耗时
+  seconds?: number
+
+  // 最后一次访问状态 0-成功 1-失败
+  lst_state?: number
+
+  // 最后访问时间
+  lst_mod_date?: string
+
+  // 耗时记录 JSON
+  note?: string
+
+
+}
+
 // 正在下载
 export interface DownloadingInfo {
 
diff --git a/src/components/cards/SiteCard.vue b/src/components/cards/SiteCard.vue
index 2b97b415..8fd8528a 100644
--- a/src/components/cards/SiteCard.vue
+++ b/src/components/cards/SiteCard.vue
@@ -5,7 +5,7 @@ import SiteAddEditForm from '../form/SiteAddEditForm.vue'
 import SiteTorrentTable from '../table/SiteTorrentTable.vue'
 import { requiredValidator } from '@/@validators'
 import api from '@/api'
-import type { Site } from '@/api/types'
+import type { Site, SiteStatistic } from '@/api/types'
 import ExistIcon from '@core/components/ExistIcon.vue'
 
 // 输入参数
@@ -58,6 +58,9 @@ const userPwForm = ref({
   code: '',
 })
 
+// 站点使用统计
+const siteStats = ref<SiteStatistic>({})
+
 // 查询站点图标
 async function getSiteIcon() {
   try {
@@ -82,6 +85,18 @@ async function testSite() {
 
     testButtonText.value = '测试'
     testButtonDisable.value = false
+
+    getSiteStats()
+  }
+  catch (error) {
+    console.error(error)
+  }
+}
+
+// 查询站点使用统计
+async function getSiteStats() {
+  try {
+    siteStats.value = (await api.get(`site/statistic/${cardProps.site?.domain}`))
   }
   catch (error) {
     console.error(error)
@@ -140,9 +155,24 @@ function openSitePage() {
   window.open(cardProps.site?.url, '_blank')
 }
 
+// 根据站点状态显示不同的状态图标
+const statColor = computed(() => {
+  if (siteStats.value?.lst_state == 1){
+    return 'error'
+  }
+  else if (siteStats.value?.lst_state == 0){
+    if (!siteStats.value?.seconds)
+      return 'secondary'
+     if (siteStats.value?.seconds >= 10)
+      return 'warning'
+    return 'success'
+  }
+})
+
 // 装载时查询站点图标
 onMounted(() => {
   getSiteIcon()
+  getSiteStats()
 })
 </script>
 
@@ -163,16 +193,17 @@ onMounted(() => {
         <VImg :src="siteIcon" />
       </VAvatar>
     </template>
+
     <VCardItem>
       <VCardTitle class="font-bold">
         <span @click.stop="openSitePage">{{ cardProps.site?.name }}</span>
       </VCardTitle>
       <VCardSubtitle>
-        {{ cardProps.site?.url }}
+        <span @click.stop="openSitePage">{{ cardProps.site?.url }}</span>
       </VCardSubtitle>
     </VCardItem>
 
-    <ExistIcon v-if="cardProps.site?.is_active" />
+    <StatIcon v-if="cardProps.site?.is_active" :color="statColor" />
 
     <VCardText class="py-2">
       <VTooltip
diff --git a/yarn.lock b/yarn.lock
index 549d5e58..0148c207 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3057,6 +3057,11 @@ data-view-byte-offset@^1.0.0:
     es-errors "^1.3.0"
     is-data-view "^1.0.1"
 
+dayjs@^1.11.10:
+  version "1.11.10"
+  resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.10.tgz#68acea85317a6e164457d6d6947564029a6a16a0"
+  integrity sha512-vjAczensTgRcqDERK0SR2XMwsF/tSvnvlv6VcF2GIhg6Sx4yOIt/irsr1RDJsKiIyBzJDpCoXiWWq28MqH2cnQ==
+
 de-indent@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/de-indent/-/de-indent-1.0.2.tgz#b2038e846dc33baa5796128d0804b455b8c1e21d"
@@ -6482,6 +6487,7 @@ stop-iteration-iterator@^1.0.0:
     internal-slot "^1.0.4"
 
 "string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0, string-width@^4.2.3:
+  name string-width-cjs
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -6555,6 +6561,7 @@ stringify-object@^3.3.0:
     is-regexp "^1.0.0"
 
 "strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+  name strip-ansi-cjs
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
   integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==

From e90cf3ee77ddfb269b668564bab9ddb4e49cd327 Mon Sep 17 00:00:00 2001
From: jxxghp <jxxghp@gmail.com>
Date: Wed, 17 Apr 2024 14:41:22 +0800
Subject: [PATCH 03/36] test release

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 50de97db..4d0456e7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "moviepilot",
-  "version": "1.8.1-3",
+  "version": "1.8.2",
   "private": true,
   "bin": "dist/service.js",
   "scripts": {
@@ -113,4 +113,4 @@
   "resolutions": {
     "postcss": "8"
   }
-}
+}
\ No newline at end of file

From f1238a03b37ca8011ae9788afa23565ad12ff9d5 Mon Sep 17 00:00:00 2001
From: jxxghp <jxxghp@gmail.com>
Date: Wed, 17 Apr 2024 14:51:05 +0800
Subject: [PATCH 04/36] fix

---
 src/components/cards/SiteCard.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/components/cards/SiteCard.vue b/src/components/cards/SiteCard.vue
index 8fd8528a..aba7fca6 100644
--- a/src/components/cards/SiteCard.vue
+++ b/src/components/cards/SiteCard.vue
@@ -157,6 +157,9 @@ function openSitePage() {
 
 // 根据站点状态显示不同的状态图标
 const statColor = computed(() => {
+  if (!siteStats.value){
+    return 'secondary'
+  }
   if (siteStats.value?.lst_state == 1){
     return 'error'
   }

From b9ee6b4039b1f744c4025c7e7d5f89d5ae22d093 Mon Sep 17 00:00:00 2001
From: jxxghp <jxxghp@gmail.com>
Date: Wed, 17 Apr 2024 15:30:40 +0800
Subject: [PATCH 05/36] fix ui

---
 src/components/cards/SiteCard.vue            | 5 +++--
 src/components/filebrowser/List.vue          | 2 +-
 src/views/reorganize/TransferHistoryView.vue | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/components/cards/SiteCard.vue b/src/components/cards/SiteCard.vue
index aba7fca6..d2c04061 100644
--- a/src/components/cards/SiteCard.vue
+++ b/src/components/cards/SiteCard.vue
@@ -7,6 +7,7 @@ import { requiredValidator } from '@/@validators'
 import api from '@/api'
 import type { Site, SiteStatistic } from '@/api/types'
 import ExistIcon from '@core/components/ExistIcon.vue'
+import { isNullOrEmptyObject } from '@/@core/utils'
 
 // 输入参数
 const cardProps = defineProps({
@@ -157,7 +158,7 @@ function openSitePage() {
 
 // 根据站点状态显示不同的状态图标
 const statColor = computed(() => {
-  if (!siteStats.value){
+  if (isNullOrEmptyObject(siteStats.value)){
     return 'secondary'
   }
   if (siteStats.value?.lst_state == 1){
@@ -166,7 +167,7 @@ const statColor = computed(() => {
   else if (siteStats.value?.lst_state == 0){
     if (!siteStats.value?.seconds)
       return 'secondary'
-     if (siteStats.value?.seconds >= 10)
+     if (siteStats.value?.seconds >= 6)
       return 'warning'
     return 'success'
   }
diff --git a/src/components/filebrowser/List.vue b/src/components/filebrowser/List.vue
index 583f1c9b..effd063c 100644
--- a/src/components/filebrowser/List.vue
+++ b/src/components/filebrowser/List.vue
@@ -592,7 +592,7 @@ onMounted(() => {
 
 @media (width <= 768px) {
   .virtual-scroll-div {
-    block-size: calc(100vh - 16rem);
+    block-size: calc(100vh - 17rem);
   }
 }
 
diff --git a/src/views/reorganize/TransferHistoryView.vue b/src/views/reorganize/TransferHistoryView.vue
index 0e871ca7..45a2eec9 100644
--- a/src/views/reorganize/TransferHistoryView.vue
+++ b/src/views/reorganize/TransferHistoryView.vue
@@ -534,7 +534,7 @@ onMounted(fetchData)
 
 @media (width <= 768px) {
   .data-table-div {
-    block-size: calc(100vh - 16rem);
+    block-size: calc(100vh - 17rem);
   }
 }
 </style>

From d097c1c17ce4ef170e9eaf32679bb00216158eac Mon Sep 17 00:00:00 2001
From: jxxghp <jxxghp@gmail.com>
Date: Wed, 17 Apr 2024 19:31:50 +0800
Subject: [PATCH 06/36] fix ui

---
 src/views/reorganize/TransferHistoryView.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/views/reorganize/TransferHistoryView.vue b/src/views/reorganize/TransferHistoryView.vue
index 45a2eec9..482d8f94 100644
--- a/src/views/reorganize/TransferHistoryView.vue
+++ b/src/views/reorganize/TransferHistoryView.vue
@@ -378,9 +378,12 @@ onMounted(fetchData)
             <VIcon :icon="getIcon(item.type || '')" />
           </VAvatar>
           <div class="d-flex flex-column ms-1">
-            <span class="d-block text-high-emphasis min-w-20">
+            <span v-if="item.type === '电视剧'" class="d-block text-high-emphasis min-w-20">
               {{ item?.title }} {{ item?.seasons }}{{ item?.episodes }}
             </span>
+            <span v-else class="d-block text-high-emphasis min-w-20">
+              {{ item?.title }}
+            </span>
             <small>{{ item?.category }}</small>
           </div>
         </div>

From 6350c7e9e65ee81a474c5ee31f2949185e183e1b Mon Sep 17 00:00:00 2001
From: jxxghp <jxxghp@gmail.com>
Date: Wed, 17 Apr 2024 21:20:31 +0800
Subject: [PATCH 07/36] =?UTF-8?q?feat=EF=BC=9A=E6=8F=92=E4=BB=B6=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E6=B8=B2=E6=9F=93=E5=BC=B9=E7=AA=97=E5=85=B3=E9=97=AD?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/@core/components/DialogCloseBtn.vue | 4 ++--
 src/components/cards/PluginCard.vue     | 4 ++--
 src/main.ts                             | 2 ++
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/@core/components/DialogCloseBtn.vue b/src/@core/components/DialogCloseBtn.vue
index 1bd12764..bc661431 100644
--- a/src/@core/components/DialogCloseBtn.vue
+++ b/src/@core/components/DialogCloseBtn.vue
@@ -1,9 +1,9 @@
 <script lang="ts" setup>
 // 定义触发的自定义事件
-const emit = defineEmits(['click'])
-
+const emit = defineEmits(['click', 'update:modelValue'])
 // 按钮点击
 function onClick() {
+  emit('update:modelValue', false)
   emit('click')
 }
 </script>
diff --git a/src/components/cards/PluginCard.vue b/src/components/cards/PluginCard.vue
index 20f1a3e9..51ab7438 100644
--- a/src/components/cards/PluginCard.vue
+++ b/src/components/cards/PluginCard.vue
@@ -482,7 +482,7 @@ watch(() => props.plugin?.has_update, (newHasUpdate, oldHasUpdate) => {
       :title="`${props.plugin?.plugin_name} - 配置`"
       class="rounded-t"
     >
-      <DialogCloseBtn @click="pluginConfigDialog = false" />
+      <DialogCloseBtn v-model='pluginConfigDialog' />
       <VCardText>
         <FormRender
           v-for="(item, index) in pluginFormItems"
@@ -516,7 +516,7 @@ watch(() => props.plugin?.has_update, (newHasUpdate, oldHasUpdate) => {
       :title="`${props.plugin?.plugin_name}`"
       class="rounded-t"
     >
-      <DialogCloseBtn @click="pluginInfoDialog = false" />
+      <DialogCloseBtn v-model='pluginInfoDialog' />
       <VCardText>
         <PageRender
           v-for="(item, index) in pluginPageItems"
diff --git a/src/main.ts b/src/main.ts
index d7707e19..0b64cc6c 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -17,6 +17,7 @@ import '@styles/styles.scss'
 import 'vue-toast-notification/dist/theme-bootstrap.css'
 import { PerfectScrollbarPlugin } from 'vue3-perfect-scrollbar';
 import 'vue3-perfect-scrollbar/style.css';
+import DialogCloseBtn from '@/@core/components/DialogCloseBtn.vue'
 
 loadFonts()
 
@@ -26,6 +27,7 @@ const app = createApp(App)
 // 注册全局组件
 app.component('VAceEditor', VAceEditor)
   .component('VApexChart', VueApexCharts)
+  .component('VDialogCloseBtn', DialogCloseBtn)
 
 // 注册插件
 app

From 9ff212c94d30ec083f6f7d8986b59382800c58b2 Mon Sep 17 00:00:00 2001
From: jxxghp <jxxghp@gmail.com>
Date: Wed, 17 Apr 2024 22:55:45 +0800
Subject: [PATCH 08/36] =?UTF-8?q?feat:=20=E6=8F=92=E4=BB=B6=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=94=AF=E6=8C=81slot?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/render/PageRender.vue | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/components/render/PageRender.vue b/src/components/render/PageRender.vue
index 1a04e991..4436cb0d 100644
--- a/src/components/render/PageRender.vue
+++ b/src/components/render/PageRender.vue
@@ -7,6 +7,7 @@ interface RenderProps {
   text: string
   html: string
   content?: any
+  slots?: any
   props?: any
 }
 
@@ -22,6 +23,7 @@ const formItem = ref<RenderProps>(elementProps.config ?? {
   html: '',
   props: {},
   content: [],
+  slots: {},
 })
 </script>
 
@@ -32,6 +34,15 @@ const formItem = ref<RenderProps>(elementProps.config ?? {
     v-bind="formItem.props"
   >
     {{ formItem.text }}
+    <template v-for="(content, name) in (formItem.slots || [])" :key="name" v-slot:[name]="{_props}">
+      <slot :name="name" v-bind="_props">
+        <PageRender
+          v-for="(slotItem, slotIndex) in (content || [])"
+          :key="slotIndex"
+          :config="slotItem"
+        />
+      </slot>
+    </template>
     <PageRender
       v-for="(innerItem, innerIndex) in (formItem.content || [])"
       :key="innerIndex"

From 55eea50a6eedfc4b4e83fc3665e909c594fc3bc3 Mon Sep 17 00:00:00 2001
From: jxxghp <jxxghp@gmail.com>
Date: Wed, 17 Apr 2024 23:02:37 +0800
Subject: [PATCH 09/36] test release

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 4d0456e7..44ff5cb1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "moviepilot",
-  "version": "1.8.2",
+  "version": "1.8.2-1",
   "private": true,
   "bin": "dist/service.js",
   "scripts": {
@@ -113,4 +113,4 @@
   "resolutions": {
     "postcss": "8"
   }
-}
\ No newline at end of file
+}

From aff30c48a0845cdf6dbc55a4e680571fe5d5e793 Mon Sep 17 00:00:00 2001
From: jxxghp <jxxghp@gmail.com>
Date: Thu, 18 Apr 2024 08:12:46 +0800
Subject: [PATCH 10/36] fix site stat

---
 src/components/cards/SiteCard.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/cards/SiteCard.vue b/src/components/cards/SiteCard.vue
index d2c04061..d2ddeb55 100644
--- a/src/components/cards/SiteCard.vue
+++ b/src/components/cards/SiteCard.vue
@@ -166,8 +166,8 @@ const statColor = computed(() => {
   }
   else if (siteStats.value?.lst_state == 0){
     if (!siteStats.value?.seconds)
-      return 'secondary'
-     if (siteStats.value?.seconds >= 6)
+      return 'success'
+     if (siteStats.value?.seconds >= 5)
       return 'warning'
     return 'success'
   }

From e1ee3ef2db9f10f45fb6a9f536ee0d3670e58bb1 Mon Sep 17 00:00:00 2001
From: jxxghp <jxxghp@gmail.com>
Date: Thu, 18 Apr 2024 11:13:36 +0800
Subject: [PATCH 11/36] fix #1918

---
 src/components/cards/TorrentCard.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/cards/TorrentCard.vue b/src/components/cards/TorrentCard.vue
index c13716c8..96ebf4dc 100644
--- a/src/components/cards/TorrentCard.vue
+++ b/src/components/cards/TorrentCard.vue
@@ -293,7 +293,7 @@ onMounted(() => {
     <VExpandTransition>
       <div v-show="showMoreTorrents">
         <VDivider />
-        <VChipGroup class="p-3">
+        <VChipGroup class="p-3" column>
           <VChip
             v-for="(item, index) in props.more"
             :key="index"

From 2d7880351b2c68d4a9ac32d7561b81e72e68f908 Mon Sep 17 00:00:00 2001
From: jxxghp <jxxghp@gmail.com>
Date: Thu, 18 Apr 2024 11:14:03 +0800
Subject: [PATCH 12/36] release

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 44ff5cb1..4d0456e7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "moviepilot",
-  "version": "1.8.2-1",
+  "version": "1.8.2",
   "private": true,
   "bin": "dist/service.js",
   "scripts": {
@@ -113,4 +113,4 @@
   "resolutions": {
     "postcss": "8"
   }
-}
+}
\ No newline at end of file

From 8cb514d70e711a0bbfbc2a3f31be55d66aae89f0 Mon Sep 17 00:00:00 2001
From: Allen <hotlcc@qq.com>
Date: Thu, 18 Apr 2024 12:40:14 +0800
Subject: [PATCH 13/36] =?UTF-8?q?dashboard=E9=85=8D=E7=BD=AE=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E4=BF=9D=E5=AD=98=E5=85=A5=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue             | 13 +++++++++++++
 src/pages/dashboard.vue | 14 ++++++++++++--
 src/pages/login.vue     | 21 +++++++++++++++++++--
 3 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 55cea95f..8311232f 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,7 @@
 <script lang="ts" setup>
 import { useToast } from 'vue-toast-notification'
 import { useTheme } from 'vuetify'
+import api from '@/api'
 
 import store from './store'
 
@@ -41,10 +42,22 @@ function startSSEMessager() {
   }
 }
 
+// 加载用户监控面板配置
+async function loadDashboardConfig() {
+  const response = await api.get('/user/config/Dashboard')
+  if (response && response.data && response.data.value) {
+      const data = JSON.stringify(response.data.value)
+      if (data != localStorage.getItem("MP_DASHBOARD")) {
+        localStorage.setItem("MP_DASHBOARD", data)
+      }
+    }
+}
+
 // 页面加载时，加载当前用户数据
 onBeforeMount(async () => {
   setTheme()
   startSSEMessager()
+  await loadDashboardConfig()
 })
 </script>
 
diff --git a/src/pages/dashboard.vue b/src/pages/dashboard.vue
index 5dadee70..01fe2b71 100644
--- a/src/pages/dashboard.vue
+++ b/src/pages/dashboard.vue
@@ -9,6 +9,7 @@ import AnalyticsMemory from '@/views/dashboard/AnalyticsMemory.vue'
 import MediaServerLatest from '@/views/dashboard/MediaServerLatest.vue'
 import MediaServerLibrary from '@/views/dashboard/MediaServerLibrary.vue'
 import MediaServerPlaying from '@/views/dashboard/MediaServerPlaying.vue'
+import api from '@/api'
 
 // 仪表盘配置
 const dashboard_names = {
@@ -48,8 +49,17 @@ if (Object.keys(config.value).length === 0) {
 
 // 设置项目
 function setDashboardConfig() {
-  localStorage.setItem('MP_DASHBOARD', JSON.stringify(config.value))
-  dialog.value = false
+  const data = JSON.stringify(config.value)
+  api.post('/user/config/Dashboard', data, {
+    headers: {
+      "Content-Type": "text/plain"
+    }
+  }).then((response: any) => {
+    if (response && response.success) {
+      localStorage.setItem('MP_DASHBOARD', data)
+      dialog.value = false
+    }
+  })
 }
 </script>
 
diff --git a/src/pages/login.vue b/src/pages/login.vue
index 766a84a7..6f93f357 100644
--- a/src/pages/login.vue
+++ b/src/pages/login.vue
@@ -66,6 +66,24 @@ async function fetchOTP() {
     })
 }
 
+// 加载用户监控面板配置
+async function loadDashboardConfig() {
+  const response = await api.get('/user/config/Dashboard')
+  if (response && response.data && response.data.value) {
+    const data = JSON.stringify(response.data.value)
+    if (data != localStorage.getItem("MP_DASHBOARD")) {
+      localStorage.setItem("MP_DASHBOARD", data)
+    }
+  }
+}
+
+async function afterLogin() {
+  // 加载用户监控面板配置
+  await loadDashboardConfig()
+  // 跳转到首页或回原始页面
+  router.push(store.state.auth.originalPath ?? '/')
+}
+
 // 登录获取token事件
 function login() {
   errorMessage.value = ''
@@ -103,8 +121,7 @@ function login() {
       store.dispatch('auth/updateUserName', username)
       store.dispatch('auth/updateAvatar', avatar)
 
-      // 跳转到首页或回原始页面
-      router.push(store.state.auth.originalPath ?? '/')
+      afterLogin()
     })
     .catch((error: any) => {
       // 登录失败，显示错误提示

From 3db4d883afd8547561e391fb910da87744e4e9d3 Mon Sep 17 00:00:00 2001
From: Allen <hotlcc@qq.com>
Date: Thu, 18 Apr 2024 15:19:24 +0800
Subject: [PATCH 14/36] fixbug

---
 src/pages/dashboard.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/dashboard.vue b/src/pages/dashboard.vue
index 01fe2b71..b1e1ad5d 100644
--- a/src/pages/dashboard.vue
+++ b/src/pages/dashboard.vue
@@ -52,7 +52,7 @@ function setDashboardConfig() {
   const data = JSON.stringify(config.value)
   api.post('/user/config/Dashboard', data, {
     headers: {
-      "Content-Type": "text/plain"
+      "Content-Type": "application/json"
     }
   }).then((response: any) => {
     if (response && response.success) {

From 62bb6de80d12850121a34dfa1747d39e6ba97a57 Mon Sep 17 00:00:00 2001
From: jxxghp <jxxghp@gmail.com>
Date: Thu, 18 Apr 2024 21:00:35 +0800
Subject: [PATCH 15/36] =?UTF-8?q?feat=EF=BC=9A=E8=AE=A2=E9=98=85=E5=8E=86?=
 =?UTF-8?q?=E5=8F=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/types.ts                              |   3 +
 src/components/FileBrowser.vue                |   9 +-
 .../cards/CardStatisticsHorizontal.vue        |  50 ---
 .../cards/CardStatisticsVertical.vue          |  56 ---
 .../cards/CardStatisticsWithImages.vue        |  65 ----
 .../filebrowser/{List.vue => FileList.vue}    |   0
 .../{Toolbar.vue => FileToolbar.vue}          |   0
 src/components/form/ReorganizeForm.vue        |   4 +-
 src/components/form/SubscribeEditForm.vue     | 322 +++++++++---------
 src/components/misc/SubscribeHistory.vue      | 197 +++++++++++
 .../TmdbSelector.vue}                         |   0
 src/views/subscribe/SubscribeListView.vue     |  44 ++-
 12 files changed, 403 insertions(+), 347 deletions(-)
 delete mode 100644 src/components/cards/CardStatisticsHorizontal.vue
 delete mode 100644 src/components/cards/CardStatisticsVertical.vue
 delete mode 100644 src/components/cards/CardStatisticsWithImages.vue
 rename src/components/filebrowser/{List.vue => FileList.vue} (100%)
 rename src/components/filebrowser/{Toolbar.vue => FileToolbar.vue} (100%)
 create mode 100644 src/components/misc/SubscribeHistory.vue
 rename src/components/{cards/TmdbSelectorCard.vue => misc/TmdbSelector.vue} (100%)

diff --git a/src/api/types.ts b/src/api/types.ts
index 1d0efbe1..ff6ebb33 100644
--- a/src/api/types.ts
+++ b/src/api/types.ts
@@ -88,6 +88,9 @@ export interface Subscribe {
 
   // 保存目录
   save_path: string
+
+  // 时间
+  date: string
 }
 
 // 历史记录
diff --git a/src/components/FileBrowser.vue b/src/components/FileBrowser.vue
index a3ec9e19..e4c7e9a3 100644
--- a/src/components/FileBrowser.vue
+++ b/src/components/FileBrowser.vue
@@ -1,9 +1,8 @@
 <script lang="ts" setup>
 import type { Axios } from 'axios'
 import axios from 'axios'
-import List from './filebrowser/List.vue'
-
-import Toolbar from './filebrowser/Toolbar.vue'
+import FileList from './filebrowser/FileList.vue'
+import FileToolbar from './filebrowser/FileToolbar.vue'
 import type { EndPoints } from '@/api/types'
 
 // 输入参数
@@ -100,7 +99,7 @@ onMounted(() => {
 <template>
   <VCard class="mx-auto" :loading="loading > 0 || !path">
     <div v-if="path">
-      <Toolbar
+      <FileToolbar
         :path="path"
         :storages="storagesArray"
         :storage="activeStorage"
@@ -111,7 +110,7 @@ onMounted(() => {
         @foldercreated="refreshPending = true"
         @sortchanged="sortChanged"
       />
-      <List
+      <FileList
         :path="path"
         :storage="activeStorage"
         :icons="fileIcons"
diff --git a/src/components/cards/CardStatisticsHorizontal.vue b/src/components/cards/CardStatisticsHorizontal.vue
deleted file mode 100644
index 6f083fd6..00000000
--- a/src/components/cards/CardStatisticsHorizontal.vue
+++ /dev/null
@@ -1,50 +0,0 @@
-<script setup lang="ts">
-import { kFormatter } from '@core/utils/formatters'
-
-interface Props {
-  title: string
-  color?: string
-  icon: string
-  stats: number
-  change: number
-}
-
-const props = withDefaults(defineProps<Props>(), {
-  color: 'primary',
-})
-
-const isPositive = controlledComputed(() => props.change, () => Math.sign(props.change) === 1)
-</script>
-
-<template>
-  <VCard>
-    <VCardText class="d-flex align-center">
-      <VAvatar
-        size="44"
-        rounded
-        :color="props.color"
-        variant="tonal"
-        class="me-4"
-      >
-        <VIcon
-          :icon="props.icon"
-          size="30"
-        />
-      </VAvatar>
-
-      <div>
-        <span class="text-caption">{{ props.title }}</span>
-        <div class="d-flex align-center flex-wrap">
-          <span class="text-h6 font-weight-semibold">{{ kFormatter(props.stats) }}</span>
-          <div
-            v-if="props.change"
-            :class="`${isPositive ? 'text-success' : 'text-error'} mt-1`"
-          >
-            <VIcon :icon="isPositive ? 'mdi-chevron-up' : 'mdi-chevron-down'" />
-            <span class="text-caption font-weight-semibold">{{ Math.abs(props.change) }}%</span>
-          </div>
-        </div>
-      </div>
-    </VCardText>
-  </VCard>
-</template>
diff --git a/src/components/cards/CardStatisticsVertical.vue b/src/components/cards/CardStatisticsVertical.vue
deleted file mode 100644
index 67ad117a..00000000
--- a/src/components/cards/CardStatisticsVertical.vue
+++ /dev/null
@@ -1,56 +0,0 @@
-<script setup lang="ts">
-interface Props {
-  title: string
-  color?: string
-  icon: string
-  stats: string
-  change: number
-  subtitle: string
-}
-
-const props = withDefaults(defineProps<Props>(), {
-  color: 'primary',
-})
-
-const isPositive = controlledComputed(() => props.change, () => Math.sign(props.change) === 1)
-</script>
-
-<template>
-  <VCard>
-    <VCardText class="d-flex align-center">
-      <VAvatar
-        v-if="props.icon"
-        size="38"
-        :color="props.color"
-      >
-        <VIcon
-          :icon="props.icon"
-          size="24"
-        />
-      </VAvatar>
-
-      <VSpacer />
-
-      <MoreBtn class="me-n3 mt-n1" />
-    </VCardText>
-
-    <VCardText>
-      <h6 class="text-sm font-weight-semibold mb-2">
-        {{ props.title }}
-      </h6>
-      <div
-        v-if="props.change"
-        class="d-flex align-center mb-2"
-      >
-        <span class="font-weight-semibold text-h5 me-2">{{ props.stats }}</span>
-        <span
-          :class="isPositive ? 'text-success' : 'text-error'"
-          class="text-caption"
-        >
-          {{ isPositive ? `+${props.change}` : props.change }}%
-        </span>
-      </div>
-      <span class="text-caption">{{ props.subtitle }}</span>
-    </VCardText>
-  </VCard>
-</template>
diff --git a/src/components/cards/CardStatisticsWithImages.vue b/src/components/cards/CardStatisticsWithImages.vue
deleted file mode 100644
index 1d2094df..00000000
--- a/src/components/cards/CardStatisticsWithImages.vue
+++ /dev/null
@@ -1,65 +0,0 @@
-<script setup lang="ts">
-interface Props {
-  title: string
-  subtitle: string
-  stats: string
-  change: number
-  image: string
-  color?: string
-}
-
-const props = withDefaults(defineProps<Props>(), {
-  color: 'primary',
-})
-
-const isPositive = controlledComputed(() => props.change, () => Math.sign(props.change) === 1)
-</script>
-
-<template>
-  <VCard class="overflow-visible">
-    <div class="d-flex position-relative">
-      <VCardText>
-        <h6 class="text-base font-weight-semibold mb-4">
-          {{ props.title }}
-        </h6>
-        <div class="d-flex align-center flex-wrap mb-4">
-          <h5 class="text-h5 font-weight-semibold me-2">
-            {{ props.stats }}
-          </h5>
-          <span
-            class="text-caption"
-            :class="isPositive ? 'text-success' : 'text-error'"
-          >
-            {{ isPositive ? `+${props.change}` : props.change }}%
-          </span>
-        </div>
-
-        <VChip
-          v-if="props.subtitle"
-          size="small"
-          :color="props.color"
-        >
-          {{ props.subtitle }}
-        </VChip>
-      </VCardText>
-
-      <VSpacer />
-
-      <div class="illustrator-img">
-        <VImg
-          v-if="props.image"
-          :src="props.image"
-          :width="110"
-        />
-      </div>
-    </div>
-  </VCard>
-</template>
-
-<style lang="scss">
-.illustrator-img {
-  position: absolute;
-  inset-block-end: 0;
-  inset-inline-end: 5%;
-}
-</style>
diff --git a/src/components/filebrowser/List.vue b/src/components/filebrowser/FileList.vue
similarity index 100%
rename from src/components/filebrowser/List.vue
rename to src/components/filebrowser/FileList.vue
diff --git a/src/components/filebrowser/Toolbar.vue b/src/components/filebrowser/FileToolbar.vue
similarity index 100%
rename from src/components/filebrowser/Toolbar.vue
rename to src/components/filebrowser/FileToolbar.vue
diff --git a/src/components/form/ReorganizeForm.vue b/src/components/form/ReorganizeForm.vue
index c4fcc8f4..fa851c86 100644
--- a/src/components/form/ReorganizeForm.vue
+++ b/src/components/form/ReorganizeForm.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import { useToast } from 'vue-toast-notification'
-import TmdbSelectorCard from '../cards/TmdbSelectorCard.vue'
+import TmdbSelector from '../misc/TmdbSelector.vue'
 import store from '@/store'
 import api from '@/api'
 import { numberValidator } from '@/@validators'
@@ -306,7 +306,7 @@ async function transfer() {
       scrollable
       max-height="85vh"
     >
-      <TmdbSelectorCard
+      <TmdbSelector
         v-model="transferForm.tmdbid"
         @close="tmdbSelectorDialog = false"
       />
diff --git a/src/components/form/SubscribeEditForm.vue b/src/components/form/SubscribeEditForm.vue
index 278fb8df..04ae8167 100644
--- a/src/components/form/SubscribeEditForm.vue
+++ b/src/components/form/SubscribeEditForm.vue
@@ -43,6 +43,7 @@ const subscribeForm = ref<Subscribe>({
   username: '',
   current_priority: 0,
   save_path: '',
+  date: ''
 })
 
 // 提示框
@@ -265,169 +266,164 @@ onMounted(() => {
 </script>
 
 <template>
-  <VDialog
-    scrollable
-    max-width="60rem"
+  <VCard
+    :title="`${props.default ? `${props.type}默认订阅规则` : `编辑订阅 - ${subscribeForm.name} ${subscribeForm.season ? `第 ${subscribeForm.season} 季` : ''}`}`"
+    class="rounded-t"
   >
-    <VCard
-      :title="`${props.default ? `设置${props.type}默认订阅规则` : `编辑订阅 - ${subscribeForm.name} ${subscribeForm.season ? `第 ${subscribeForm.season} 季` : ''}`}`"
-      class="rounded-t"
-    >
-      <VCardText class="pt-2">
-        <DialogCloseBtn @click="emit('close')" />
-        <VForm @submit.prevent="() => {}">
-          <VRow>
-            <VCol
-              cols="12"
-              md="8"
-            >
-              <VTextField
-                v-if="!props.default"
-                v-model="subscribeForm.keyword"
-                label="搜索关键词"
-                hint="设定搜索关键词后，将使用此关键词搜索站点资源，否则自动使用themoviedb中的名称搜索"
-              />
-            </VCol>
-            <VCol
-              v-if="subscribeForm.type === '电视剧'"
-              cols="12"
-              md="2"
-            >
-              <VTextField
-                v-model="subscribeForm.total_episode"
-                label="总集数"
-                :rules="[numberValidator]"
-                hint="设定剧集的总集数，以应对themoviedb中剧集信息未维护完整，导致提前结束订阅的情况"
-              />
-            </VCol>
-            <VCol
-              v-if="subscribeForm.type === '电视剧'"
-              cols="12"
-              md="2"
-            >
-              <VTextField
-                v-model="subscribeForm.start_episode"
-                label="开始集数"
-                :rules="[numberValidator]"
-                hint="只订阅下载此集数及之后的剧集"
-              />
-            </VCol>
-          </VRow>
-          <VRow>
-            <VCol
-              cols="12"
-              md="4"
-            >
-              <VSelect
-                v-model="subscribeForm.quality"
-                label="质量"
-                :items="qualityOptions"
-              />
-            </VCol>
-            <VCol
-              cols="12"
-              md="4"
-            >
-              <VSelect
-                v-model="subscribeForm.resolution"
-                label="分辨率"
-                :items="resolutionOptions"
-              />
-            </VCol>
-            <VCol
-              cols="12"
-              md="4"
-            >
-              <VSelect
-                v-model="subscribeForm.effect"
-                label="特效"
-                :items="effectOptions"
-              />
-            </VCol>
-          </VRow>
-          <VRow>
-            <VCol
-              cols="12"
-              md="4"
-            >
-              <VTextField
-                v-model="subscribeForm.include"
-                label="包含（关键字、正则式）"
-                hint="支持正则表达式，多个关键字用 | 分隔表示或"
-              />
-            </VCol>
-            <VCol
-              cols="12"
-              md="4"
-            >
-              <VTextField
-                v-model="subscribeForm.exclude"
-                label="排除（关键字、正则式）"
-                hint="支持正则表达式，多个关键字用 | 分隔表示或"
-              />
-            </VCol>
-            <VCol
-              cols="12"
-              md="4"
-            >
-              <VSelect
-                v-model="subscribeForm.sites"
-                :items="selectSitesOptions"
-                chips
-                label="订阅站点"
-                multiple
-                hint="只订阅选中的订阅站点，不选则订阅所有可订阅站点"
-              />
-            </VCol>
-          </VRow>
-          <VRow>
-            <VCol
-              cols="12"
-            >
-              <VTextField
-                v-model="subscribeForm.save_path"
-                label="保存路径"
-                hint="指定该订阅的下载保存路径，留空自动使用设定的下载目录"
-              />
-            </VCol>
-          </VRow>
-          <VRow>
-            <VCol
-              cols="12"
-              md="4"
-            >
-              <VSwitch
-                v-model="subscribeForm.best_version"
-                label="洗版"
-                hint="开启后不管媒体库是否存在，均会根据洗版优先级进行过滤下载，直到下载到了最高优先级的资源为止"
-              />
-            </VCol>
-            <VCol
-              cols="12"
-              md="4"
-            >
-              <VSwitch
-                v-model="subscribeForm.search_imdbid"
-                label="使用 ImdbID 搜索"
-                hint="开启后将使用 ImdbID 搜索资源，搜索结果更精确，但不是所有站点都支持"
-              />
-            </VCol>
-          </VRow>
-        </VForm>
-      </VCardText>
+    <VCardText class="pt-2">
+      <DialogCloseBtn @click="emit('close')" />
+      <VForm @submit.prevent="() => {}">
+        <VRow>
+          <VCol
+            cols="12"
+            md="8"
+          >
+            <VTextField
+              v-if="!props.default"
+              v-model="subscribeForm.keyword"
+              label="搜索关键词"
+              hint="设定搜索关键词后，将使用此关键词搜索站点资源，否则自动使用themoviedb中的名称搜索"
+            />
+          </VCol>
+          <VCol
+            v-if="subscribeForm.type === '电视剧'"
+            cols="12"
+            md="2"
+          >
+            <VTextField
+              v-model="subscribeForm.total_episode"
+              label="总集数"
+              :rules="[numberValidator]"
+              hint="设定剧集的总集数，以应对themoviedb中剧集信息未维护完整，导致提前结束订阅的情况"
+            />
+          </VCol>
+          <VCol
+            v-if="subscribeForm.type === '电视剧'"
+            cols="12"
+            md="2"
+          >
+            <VTextField
+              v-model="subscribeForm.start_episode"
+              label="开始集数"
+              :rules="[numberValidator]"
+              hint="只订阅下载此集数及之后的剧集"
+            />
+          </VCol>
+        </VRow>
+        <VRow>
+          <VCol
+            cols="12"
+            md="4"
+          >
+            <VSelect
+              v-model="subscribeForm.quality"
+              label="质量"
+              :items="qualityOptions"
+            />
+          </VCol>
+          <VCol
+            cols="12"
+            md="4"
+          >
+            <VSelect
+              v-model="subscribeForm.resolution"
+              label="分辨率"
+              :items="resolutionOptions"
+            />
+          </VCol>
+          <VCol
+            cols="12"
+            md="4"
+          >
+            <VSelect
+              v-model="subscribeForm.effect"
+              label="特效"
+              :items="effectOptions"
+            />
+          </VCol>
+        </VRow>
+        <VRow>
+          <VCol
+            cols="12"
+            md="4"
+          >
+            <VTextField
+              v-model="subscribeForm.include"
+              label="包含（关键字、正则式）"
+              hint="支持正则表达式，多个关键字用 | 分隔表示或"
+            />
+          </VCol>
+          <VCol
+            cols="12"
+            md="4"
+          >
+            <VTextField
+              v-model="subscribeForm.exclude"
+              label="排除（关键字、正则式）"
+              hint="支持正则表达式，多个关键字用 | 分隔表示或"
+            />
+          </VCol>
+          <VCol
+            cols="12"
+            md="4"
+          >
+            <VSelect
+              v-model="subscribeForm.sites"
+              :items="selectSitesOptions"
+              chips
+              label="订阅站点"
+              multiple
+              hint="只订阅选中的订阅站点，不选则订阅所有可订阅站点"
+            />
+          </VCol>
+        </VRow>
+        <VRow>
+          <VCol
+            cols="12"
+          >
+            <VTextField
+              v-model="subscribeForm.save_path"
+              label="保存路径"
+              hint="指定该订阅的下载保存路径，留空自动使用设定的下载目录"
+            />
+          </VCol>
+        </VRow>
+        <VRow>
+          <VCol
+            cols="12"
+            md="4"
+          >
+            <VSwitch
+              v-model="subscribeForm.best_version"
+              label="洗版"
+              hint="开启后不管媒体库是否存在，均会根据洗版优先级进行过滤下载，直到下载到了最高优先级的资源为止"
+            />
+          </VCol>
+          <VCol
+            cols="12"
+            md="4"
+          >
+            <VSwitch
+              v-model="subscribeForm.search_imdbid"
+              label="使用 ImdbID 搜索"
+              hint="开启后将使用 ImdbID 搜索资源，搜索结果更精确，但不是所有站点都支持"
+            />
+          </VCol>
+        </VRow>
+      </VForm>
+    </VCardText>
 
-      <VCardActions>
-        <VBtn v-if="!props.default" color="error" @click="removeSubscribe">
-          取消订阅
-        </VBtn>
-        <VSpacer />
-        <VBtn
-          variant="tonal"
-          @click="`${props.default ? saveDefaultSubscribeConfig() : updateSubscribeInfo()}`"
-        >
-          保存
-        </VBtn>
-      </VCardActions>
-    </VCard>
-  </VDialog>
+    <VCardActions>
+      <VBtn v-if="!props.default" color="error" @click="removeSubscribe">
+        取消订阅
+      </VBtn>
+      <VSpacer />
+      <VBtn
+        variant="tonal"
+        @click="`${props.default ? saveDefaultSubscribeConfig() : updateSubscribeInfo()}`"
+      >
+        保存
+      </VBtn>
+    </VCardActions>
+  </VCard>
 </template>
diff --git a/src/components/misc/SubscribeHistory.vue b/src/components/misc/SubscribeHistory.vue
new file mode 100644
index 00000000..e71a6983
--- /dev/null
+++ b/src/components/misc/SubscribeHistory.vue
@@ -0,0 +1,197 @@
+<script lang="ts" setup>
+import api from '@/api';
+import { Subscribe } from '@/api/types';
+import { formatDateDifference } from '@core/utils/formatters'
+
+// 输入参数
+const props = defineProps({
+  type: String,
+})
+
+// 定义触发的自定义事件
+const emit = defineEmits(['close'])
+
+// 订阅历史列表
+const historyList = ref<Subscribe[]>([])
+
+// 当前加载数据
+const currData = ref<Subscribe[]>([])
+
+// 当前页
+const currentPage = ref(1)
+
+// 每页数量
+const pageSize = ref(30)
+
+// 是否加载中
+const loading = ref(false)
+
+// 是否加载完成
+const isRefreshed = ref(false)
+
+// 调用API查询列表
+async function loadHistory({ done }: { done: any }) {
+  // 如果正在加载中，直接返回
+  if (loading.value) {
+    done('ok')
+    return
+  }
+
+  // 设置加载中
+  loading.value = true
+
+  // 调用API查询列表
+  try {
+    currData.value = await api.get(`subscribe/history/${props.type}`, {
+      params: {
+        page: currentPage.value,
+        count: pageSize.value,
+      },
+    })
+    // 标计为已请求完成
+    isRefreshed.value = true
+    if (currData.value.length === 0) {
+      // 如果没有数据，跳出
+      done('ok')
+      return
+    }
+    // 合并数据
+    historyList.value = [...historyList.value, ...currData.value]
+    // 页码+1
+    currentPage.value++
+    // 取消加载中
+    loading.value = false
+    // 返回加载成功
+    done('ok')
+  } catch (e) {
+    console.error(e)
+    // 返回加载失败
+    done('error')
+  }
+}
+
+// 重新订阅
+function reSubscribe(item: Subscribe) {
+
+}
+
+// 删除记录
+function deleteHistory(item: Subscribe) {
+
+}
+
+// 弹出菜单
+const dropdownItems = ref([
+  {
+    title: '重新订阅',
+    value: 1,
+    color: '',
+    props: {
+      prependIcon: 'mdi-redo',
+      click: reSubscribe,
+    },
+  },
+  {
+    title: '删除',
+    value: 2,
+    color: 'error',
+    props: {
+      prependIcon: 'mdi-delete',
+      click: deleteHistory,
+    },
+  }
+])
+
+</script>
+
+<template>
+ <VCard
+    class="mx-auto"
+    width="100%"
+    :title = "props.type + '订阅历史'"
+  >
+    <DialogCloseBtn @click="() => { emit('close') }" />
+    <div
+      v-if="!isRefreshed"
+      class="mt-12 w-full text-center text-gray-500 text-sm flex flex-col items-center"
+    >
+      <VProgressCircular
+        size="48"
+        indeterminate
+        color="primary"
+      />
+    </div>
+    <VList
+      lines="two"
+    >
+      <VInfiniteScroll
+        mode="intersect"
+        side="end"
+        :items="historyList"
+        class="overflow-hidden"
+        @load="loadHistory"
+      >
+        <template #loading />
+          <template v-for="(item, i) in historyList" :key="i">
+            <VListItem>
+              <template #prepend>
+                <VImg
+                  height="75"
+                  width="50"
+                  :src="item.poster"
+                  aspect-ratio="2/3"
+                  class="object-cover rounded shadow ring-gray-500 me-3"
+                  cover
+                >
+                  <template #placeholder>
+                    <div class="w-full h-full">
+                      <VSkeletonLoader class="object-cover aspect-w-2 aspect-h-3" />
+                    </div>
+                  </template>
+                </VImg>
+              </template>
+              <VListItemTitle v-if="item.type == '电视剧'">
+                {{ item.name }} <span class="text-sm">第 {{ item.season }} 季</span>
+              </VListItemTitle>
+              <VListItemTitle v-else>
+                {{ item.name }}
+              </VListItemTitle>
+              <VListItemSubtitle class="mt-2">{{ formatDateDifference(item.date) }}</VListItemSubtitle>
+              <VListItemSubtitle class="mt-2">{{ item.description }}</VListItemSubtitle>
+              <template #append>
+                <div class="me-n3">
+                  <IconBtn>
+                    <VIcon
+                      icon="mdi-dots-vertical"
+                    />
+                    <VMenu
+                      activator="parent"
+                      close-on-content-click
+                    >
+                      <VList>
+                        <VListItem
+                          v-for="(item, i) in dropdownItems"
+                          :key="i"
+                          variant="plain"
+                          :base-color="item.color"
+                          @click="item.props.click"
+                        >
+                          <template #prepend>
+                            <VIcon :icon="item.props.prependIcon" />
+                          </template>
+                          <VListItemTitle v-text="item.title" />
+                        </VListItem>
+                      </VList>
+                    </VMenu>
+                  </IconBtn>
+                </div>
+              </template>
+            </VListItem>
+          </template>
+        </VInfiniteScroll>
+      </VList>
+    <VCardText v-if="historyList.length == 0 && isRefreshed" class="text-center">
+      没有数据
+    </VCardText>
+  </VCard>
+</template>
diff --git a/src/components/cards/TmdbSelectorCard.vue b/src/components/misc/TmdbSelector.vue
similarity index 100%
rename from src/components/cards/TmdbSelectorCard.vue
rename to src/components/misc/TmdbSelector.vue
diff --git a/src/views/subscribe/SubscribeListView.vue b/src/views/subscribe/SubscribeListView.vue
index e7720714..2affe976 100644
--- a/src/views/subscribe/SubscribeListView.vue
+++ b/src/views/subscribe/SubscribeListView.vue
@@ -5,6 +5,7 @@ import type { Subscribe } from '@/api/types'
 import NoDataFound from '@/components/NoDataFound.vue'
 import SubscribeCard from '@/components/cards/SubscribeCard.vue'
 import SubscribeEditForm from '@/components/form/SubscribeEditForm.vue'
+import SubscribeHistory from '@/components/misc/SubscribeHistory.vue'
 import store from '@/store'
 
 // 输入参数
@@ -21,6 +22,9 @@ const dataList = ref<Subscribe[]>([])
 // 弹窗
 const subscribeEditDialog = ref(false)
 
+// 历史记录弹窗
+const historyDialog = ref(false)
+
 // 获取订阅列表数据
 async function fetchData() {
   try {
@@ -102,15 +106,43 @@ const filteredDataList = computed(() => {
     appear
     @click="subscribeEditDialog = true"
   />
+  <VFab
+    icon="mdi-history"
+    color="info"
+    location="bottom end"
+    class="mb-2"
+    size="x-large"
+    fixed
+    app
+    appear
+    @click="historyDialog = true"
+  />
   <!-- 订阅编辑弹窗 -->
-  <SubscribeEditForm
+  <VDialog
     v-if="subscribeEditDialog"
     v-model="subscribeEditDialog"
-    :default="true"
-    :type="props.type"
-    @save="subscribeEditDialog = false"
-    @close="subscribeEditDialog = false"
-  />
+    scrollable
+    max-width="60rem"
+  >
+    <SubscribeEditForm
+      :default="true"
+      :type="props.type"
+      @save="subscribeEditDialog = false"
+      @close="subscribeEditDialog = false"
+    />
+  </VDialog>
+  <!-- 历史记录弹窗 -->
+  <VDialog
+    v-if="historyDialog"
+    v-model="historyDialog"
+    scrollable
+    max-width="50rem"
+  >
+    <SubscribeHistory
+      :type="props.type"
+      @close="historyDialog = false"
+    />
+  </VDialog>
 </template>
 
 <style lang="scss">

From b0f28b7e7c3105981fcafd2813754ac3907692e4 Mon Sep 17 00:00:00 2001
From: jxxghp <jxxghp@gmail.com>
Date: Thu, 18 Apr 2024 22:33:03 +0800
Subject: [PATCH 16/36] fix

---
 src/components/form/ImportCodeForm.vue    |  40 +--
 src/components/form/SubscribeEditForm.vue | 321 +++++++++++-----------
 src/components/misc/SubscribeHistory.vue  | 178 ++++++------
 src/views/subscribe/SubscribeListView.vue |  30 +-
 4 files changed, 288 insertions(+), 281 deletions(-)

diff --git a/src/components/form/ImportCodeForm.vue b/src/components/form/ImportCodeForm.vue
index 1346f657..bc723628 100644
--- a/src/components/form/ImportCodeForm.vue
+++ b/src/components/form/ImportCodeForm.vue
@@ -18,22 +18,28 @@ function handleImport() {
 </script>
 
 <template>
-  <VCard
-    :title="props.title"
-    class="rounded-t"
+  <VDialog
+    width="40rem"
+    scrollable
+    max-height="85vh"
   >
-    <DialogCloseBtn @click="emit('close')" />
-    <VCardText class="pt-2">
-      <VTextarea v-model="codeString" />
-    </VCardText>
-    <VCardActions>
-      <VSpacer />
-      <VBtn
-        variant="tonal"
-        @click="handleImport"
-      >
-        导入
-      </VBtn>
-    </VCardActions>
-  </VCard>
+    <VCard
+      :title="props.title"
+      class="rounded-t"
+    >
+      <DialogCloseBtn @click="emit('close')" />
+      <VCardText class="pt-2">
+        <VTextarea v-model="codeString" />
+      </VCardText>
+      <VCardActions>
+        <VSpacer />
+        <VBtn
+          variant="tonal"
+          @click="handleImport"
+        >
+          导入
+        </VBtn>
+      </VCardActions>
+    </VCard>
+  </VDialog>
 </template>
diff --git a/src/components/form/SubscribeEditForm.vue b/src/components/form/SubscribeEditForm.vue
index 04ae8167..d0708c16 100644
--- a/src/components/form/SubscribeEditForm.vue
+++ b/src/components/form/SubscribeEditForm.vue
@@ -266,164 +266,169 @@ onMounted(() => {
 </script>
 
 <template>
-  <VCard
-    :title="`${props.default ? `${props.type}默认订阅规则` : `编辑订阅 - ${subscribeForm.name} ${subscribeForm.season ? `第 ${subscribeForm.season} 季` : ''}`}`"
-    class="rounded-t"
+  <VDialog
+    scrollable
+    max-width="60rem"
   >
-    <VCardText class="pt-2">
-      <DialogCloseBtn @click="emit('close')" />
-      <VForm @submit.prevent="() => {}">
-        <VRow>
-          <VCol
-            cols="12"
-            md="8"
-          >
-            <VTextField
-              v-if="!props.default"
-              v-model="subscribeForm.keyword"
-              label="搜索关键词"
-              hint="设定搜索关键词后，将使用此关键词搜索站点资源，否则自动使用themoviedb中的名称搜索"
-            />
-          </VCol>
-          <VCol
-            v-if="subscribeForm.type === '电视剧'"
-            cols="12"
-            md="2"
-          >
-            <VTextField
-              v-model="subscribeForm.total_episode"
-              label="总集数"
-              :rules="[numberValidator]"
-              hint="设定剧集的总集数，以应对themoviedb中剧集信息未维护完整，导致提前结束订阅的情况"
-            />
-          </VCol>
-          <VCol
-            v-if="subscribeForm.type === '电视剧'"
-            cols="12"
-            md="2"
-          >
-            <VTextField
-              v-model="subscribeForm.start_episode"
-              label="开始集数"
-              :rules="[numberValidator]"
-              hint="只订阅下载此集数及之后的剧集"
-            />
-          </VCol>
-        </VRow>
-        <VRow>
-          <VCol
-            cols="12"
-            md="4"
-          >
-            <VSelect
-              v-model="subscribeForm.quality"
-              label="质量"
-              :items="qualityOptions"
-            />
-          </VCol>
-          <VCol
-            cols="12"
-            md="4"
-          >
-            <VSelect
-              v-model="subscribeForm.resolution"
-              label="分辨率"
-              :items="resolutionOptions"
-            />
-          </VCol>
-          <VCol
-            cols="12"
-            md="4"
-          >
-            <VSelect
-              v-model="subscribeForm.effect"
-              label="特效"
-              :items="effectOptions"
-            />
-          </VCol>
-        </VRow>
-        <VRow>
-          <VCol
-            cols="12"
-            md="4"
-          >
-            <VTextField
-              v-model="subscribeForm.include"
-              label="包含（关键字、正则式）"
-              hint="支持正则表达式，多个关键字用 | 分隔表示或"
-            />
-          </VCol>
-          <VCol
-            cols="12"
-            md="4"
-          >
-            <VTextField
-              v-model="subscribeForm.exclude"
-              label="排除（关键字、正则式）"
-              hint="支持正则表达式，多个关键字用 | 分隔表示或"
-            />
-          </VCol>
-          <VCol
-            cols="12"
-            md="4"
-          >
-            <VSelect
-              v-model="subscribeForm.sites"
-              :items="selectSitesOptions"
-              chips
-              label="订阅站点"
-              multiple
-              hint="只订阅选中的订阅站点，不选则订阅所有可订阅站点"
-            />
-          </VCol>
-        </VRow>
-        <VRow>
-          <VCol
-            cols="12"
-          >
-            <VTextField
-              v-model="subscribeForm.save_path"
-              label="保存路径"
-              hint="指定该订阅的下载保存路径，留空自动使用设定的下载目录"
-            />
-          </VCol>
-        </VRow>
-        <VRow>
-          <VCol
-            cols="12"
-            md="4"
-          >
-            <VSwitch
-              v-model="subscribeForm.best_version"
-              label="洗版"
-              hint="开启后不管媒体库是否存在，均会根据洗版优先级进行过滤下载，直到下载到了最高优先级的资源为止"
-            />
-          </VCol>
-          <VCol
-            cols="12"
-            md="4"
-          >
-            <VSwitch
-              v-model="subscribeForm.search_imdbid"
-              label="使用 ImdbID 搜索"
-              hint="开启后将使用 ImdbID 搜索资源，搜索结果更精确，但不是所有站点都支持"
-            />
-          </VCol>
-        </VRow>
-      </VForm>
-    </VCardText>
+    <VCard
+      :title="`${props.default ? `${props.type}默认订阅规则` : `编辑订阅 - ${subscribeForm.name} ${subscribeForm.season ? `第 ${subscribeForm.season} 季` : ''}`}`"
+      class="rounded-t"
+    >
+      <VCardText class="pt-2">
+        <DialogCloseBtn @click="emit('close')" />
+        <VForm @submit.prevent="() => {}">
+          <VRow>
+            <VCol
+              cols="12"
+              md="8"
+            >
+              <VTextField
+                v-if="!props.default"
+                v-model="subscribeForm.keyword"
+                label="搜索关键词"
+                hint="设定搜索关键词后，将使用此关键词搜索站点资源，否则自动使用themoviedb中的名称搜索"
+              />
+            </VCol>
+            <VCol
+              v-if="subscribeForm.type === '电视剧'"
+              cols="12"
+              md="2"
+            >
+              <VTextField
+                v-model="subscribeForm.total_episode"
+                label="总集数"
+                :rules="[numberValidator]"
+                hint="设定剧集的总集数，以应对themoviedb中剧集信息未维护完整，导致提前结束订阅的情况"
+              />
+            </VCol>
+            <VCol
+              v-if="subscribeForm.type === '电视剧'"
+              cols="12"
+              md="2"
+            >
+              <VTextField
+                v-model="subscribeForm.start_episode"
+                label="开始集数"
+                :rules="[numberValidator]"
+                hint="只订阅下载此集数及之后的剧集"
+              />
+            </VCol>
+          </VRow>
+          <VRow>
+            <VCol
+              cols="12"
+              md="4"
+            >
+              <VSelect
+                v-model="subscribeForm.quality"
+                label="质量"
+                :items="qualityOptions"
+              />
+            </VCol>
+            <VCol
+              cols="12"
+              md="4"
+            >
+              <VSelect
+                v-model="subscribeForm.resolution"
+                label="分辨率"
+                :items="resolutionOptions"
+              />
+            </VCol>
+            <VCol
+              cols="12"
+              md="4"
+            >
+              <VSelect
+                v-model="subscribeForm.effect"
+                label="特效"
+                :items="effectOptions"
+              />
+            </VCol>
+          </VRow>
+          <VRow>
+            <VCol
+              cols="12"
+              md="4"
+            >
+              <VTextField
+                v-model="subscribeForm.include"
+                label="包含（关键字、正则式）"
+                hint="支持正则表达式，多个关键字用 | 分隔表示或"
+              />
+            </VCol>
+            <VCol
+              cols="12"
+              md="4"
+            >
+              <VTextField
+                v-model="subscribeForm.exclude"
+                label="排除（关键字、正则式）"
+                hint="支持正则表达式，多个关键字用 | 分隔表示或"
+              />
+            </VCol>
+            <VCol
+              cols="12"
+              md="4"
+            >
+              <VSelect
+                v-model="subscribeForm.sites"
+                :items="selectSitesOptions"
+                chips
+                label="订阅站点"
+                multiple
+                hint="只订阅选中的订阅站点，不选则订阅所有可订阅站点"
+              />
+            </VCol>
+          </VRow>
+          <VRow>
+            <VCol
+              cols="12"
+            >
+              <VTextField
+                v-model="subscribeForm.save_path"
+                label="保存路径"
+                hint="指定该订阅的下载保存路径，留空自动使用设定的下载目录"
+              />
+            </VCol>
+          </VRow>
+          <VRow>
+            <VCol
+              cols="12"
+              md="4"
+            >
+              <VSwitch
+                v-model="subscribeForm.best_version"
+                label="洗版"
+                hint="开启后不管媒体库是否存在，均会根据洗版优先级进行过滤下载，直到下载到了最高优先级的资源为止"
+              />
+            </VCol>
+            <VCol
+              cols="12"
+              md="4"
+            >
+              <VSwitch
+                v-model="subscribeForm.search_imdbid"
+                label="使用 ImdbID 搜索"
+                hint="开启后将使用 ImdbID 搜索资源，搜索结果更精确，但不是所有站点都支持"
+              />
+            </VCol>
+          </VRow>
+        </VForm>
+      </VCardText>
 
-    <VCardActions>
-      <VBtn v-if="!props.default" color="error" @click="removeSubscribe">
-        取消订阅
-      </VBtn>
-      <VSpacer />
-      <VBtn
-        variant="tonal"
-        @click="`${props.default ? saveDefaultSubscribeConfig() : updateSubscribeInfo()}`"
-      >
-        保存
-      </VBtn>
-    </VCardActions>
-  </VCard>
+      <VCardActions>
+        <VBtn v-if="!props.default" color="error" @click="removeSubscribe">
+          取消订阅
+        </VBtn>
+        <VSpacer />
+        <VBtn
+          variant="tonal"
+          @click="`${props.default ? saveDefaultSubscribeConfig() : updateSubscribeInfo()}`"
+        >
+          保存
+        </VBtn>
+      </VCardActions>
+    </VCard>
+  </VDialog>
 </template>
diff --git a/src/components/misc/SubscribeHistory.vue b/src/components/misc/SubscribeHistory.vue
index e71a6983..92af0b34 100644
--- a/src/components/misc/SubscribeHistory.vue
+++ b/src/components/misc/SubscribeHistory.vue
@@ -105,93 +105,99 @@ const dropdownItems = ref([
 </script>
 
 <template>
- <VCard
-    class="mx-auto"
-    width="100%"
-    :title = "props.type + '订阅历史'"
+  <VDialog
+    scrollable
+    max-width="50rem"
   >
-    <DialogCloseBtn @click="() => { emit('close') }" />
-    <div
-      v-if="!isRefreshed"
-      class="mt-12 w-full text-center text-gray-500 text-sm flex flex-col items-center"
+  <VCard
+      class="mx-auto"
+      width="100%"
+      :title = "props.type + '订阅历史'"
     >
-      <VProgressCircular
-        size="48"
-        indeterminate
-        color="primary"
-      />
-    </div>
-    <VList
-      lines="two"
-    >
-      <VInfiniteScroll
-        mode="intersect"
-        side="end"
-        :items="historyList"
-        class="overflow-hidden"
-        @load="loadHistory"
+      <DialogCloseBtn @click="() => { emit('close') }" />
+      <div
+        v-if="!isRefreshed"
+        class="mt-12 w-full text-center text-gray-500 text-sm flex flex-col items-center"
       >
-        <template #loading />
-          <template v-for="(item, i) in historyList" :key="i">
-            <VListItem>
-              <template #prepend>
-                <VImg
-                  height="75"
-                  width="50"
-                  :src="item.poster"
-                  aspect-ratio="2/3"
-                  class="object-cover rounded shadow ring-gray-500 me-3"
-                  cover
-                >
-                  <template #placeholder>
-                    <div class="w-full h-full">
-                      <VSkeletonLoader class="object-cover aspect-w-2 aspect-h-3" />
-                    </div>
-                  </template>
-                </VImg>
-              </template>
-              <VListItemTitle v-if="item.type == '电视剧'">
-                {{ item.name }} <span class="text-sm">第 {{ item.season }} 季</span>
-              </VListItemTitle>
-              <VListItemTitle v-else>
-                {{ item.name }}
-              </VListItemTitle>
-              <VListItemSubtitle class="mt-2">{{ formatDateDifference(item.date) }}</VListItemSubtitle>
-              <VListItemSubtitle class="mt-2">{{ item.description }}</VListItemSubtitle>
-              <template #append>
-                <div class="me-n3">
-                  <IconBtn>
-                    <VIcon
-                      icon="mdi-dots-vertical"
-                    />
-                    <VMenu
-                      activator="parent"
-                      close-on-content-click
-                    >
-                      <VList>
-                        <VListItem
-                          v-for="(item, i) in dropdownItems"
-                          :key="i"
-                          variant="plain"
-                          :base-color="item.color"
-                          @click="item.props.click"
-                        >
-                          <template #prepend>
-                            <VIcon :icon="item.props.prependIcon" />
-                          </template>
-                          <VListItemTitle v-text="item.title" />
-                        </VListItem>
-                      </VList>
-                    </VMenu>
-                  </IconBtn>
-                </div>
-              </template>
-            </VListItem>
-          </template>
-        </VInfiniteScroll>
-      </VList>
-    <VCardText v-if="historyList.length == 0 && isRefreshed" class="text-center">
-      没有数据
-    </VCardText>
-  </VCard>
+        <VProgressCircular
+          size="48"
+          indeterminate
+          color="primary"
+        />
+      </div>
+      <VList
+        lines="two"
+      >
+        <VInfiniteScroll
+          v-if="historyList.length > 0"
+          mode="intersect"
+          side="end"
+          :items="historyList"
+          class="overflow-hidden"
+          @load="loadHistory"
+        >
+          <template #loading />
+            <template v-for="(item, i) in historyList" :key="i">
+              <VListItem>
+                <template #prepend>
+                  <VImg
+                    height="75"
+                    width="50"
+                    :src="item.poster"
+                    aspect-ratio="2/3"
+                    class="object-cover rounded shadow ring-gray-500 me-3"
+                    cover
+                  >
+                    <template #placeholder>
+                      <div class="w-full h-full">
+                        <VSkeletonLoader class="object-cover aspect-w-2 aspect-h-3" />
+                      </div>
+                    </template>
+                  </VImg>
+                </template>
+                <VListItemTitle v-if="item.type == '电视剧'">
+                  {{ item.name }} <span class="text-sm">第 {{ item.season }} 季</span>
+                </VListItemTitle>
+                <VListItemTitle v-else>
+                  {{ item.name }}
+                </VListItemTitle>
+                <VListItemSubtitle class="mt-2">{{ formatDateDifference(item.date) }}</VListItemSubtitle>
+                <VListItemSubtitle class="mt-2">{{ item.description }}</VListItemSubtitle>
+                <template #append>
+                  <div class="me-n3">
+                    <IconBtn>
+                      <VIcon
+                        icon="mdi-dots-vertical"
+                      />
+                      <VMenu
+                        activator="parent"
+                        close-on-content-click
+                      >
+                        <VList>
+                          <VListItem
+                            v-for="(item, i) in dropdownItems"
+                            :key="i"
+                            variant="plain"
+                            :base-color="item.color"
+                            @click="item.props.click"
+                          >
+                            <template #prepend>
+                              <VIcon :icon="item.props.prependIcon" />
+                            </template>
+                            <VListItemTitle v-text="item.title" />
+                          </VListItem>
+                        </VList>
+                      </VMenu>
+                    </IconBtn>
+                  </div>
+                </template>
+              </VListItem>
+            </template>
+          </VInfiniteScroll>
+        </VList>
+      <VCardText v-if="historyList.length == 0 && isRefreshed" class="text-center">
+        没有数据
+      </VCardText>
+    </VCard>
+  </VDialog>
 </template>
diff --git a/src/views/subscribe/SubscribeListView.vue b/src/views/subscribe/SubscribeListView.vue
index 2affe976..d1f05e3c 100644
--- a/src/views/subscribe/SubscribeListView.vue
+++ b/src/views/subscribe/SubscribeListView.vue
@@ -118,31 +118,21 @@ const filteredDataList = computed(() => {
     @click="historyDialog = true"
   />
   <!-- 订阅编辑弹窗 -->
-  <VDialog
+  <SubscribeEditForm
     v-if="subscribeEditDialog"
     v-model="subscribeEditDialog"
-    scrollable
-    max-width="60rem"
-  >
-    <SubscribeEditForm
-      :default="true"
-      :type="props.type"
-      @save="subscribeEditDialog = false"
-      @close="subscribeEditDialog = false"
-    />
-  </VDialog>
+    :default="true"
+    :type="props.type"
+    @save="subscribeEditDialog = false"
+    @close="subscribeEditDialog = false"
+  />
   <!-- 历史记录弹窗 -->
-  <VDialog
+  <SubscribeHistory   
     v-if="historyDialog"
     v-model="historyDialog"
-    scrollable
-    max-width="50rem"
-  >
-    <SubscribeHistory
-      :type="props.type"
-      @close="historyDialog = false"
-    />
-  </VDialog>
+    :type="props.type"
+    @close="historyDialog = false"
+  />
 </template>
 
 <style lang="scss">

From 20f031b2e22b4eaa4f77a425ba9adceb6a9ef2e2 Mon Sep 17 00:00:00 2001
From: jxxghp <jxxghp@gmail.com>
Date: Thu, 18 Apr 2024 22:59:00 +0800
Subject: [PATCH 17/36] rename components

---
 src/components/cards/MediaCard.vue            |   4 +-
 src/components/cards/SiteCard.vue             |   4 +-
 src/components/cards/SubscribeCard.vue        |   4 +-
 .../ImportCodeDialog.vue}                     |   0
 .../ReorganizeDialog.vue}                     |   0
 .../SiteAddEditDialog.vue}                    |   0
 .../SubscribeEditDialog.vue}                  |   0
 .../dialog/SubscribeHistoryDialog.vue         | 203 ++++++++++++++++++
 src/components/filebrowser/FileList.vue       |   4 +-
 src/components/misc/SubscribeHistory.vue      | 203 ------------------
 src/views/discover/MediaDetailView.vue        |   4 +-
 src/views/reorganize/TransferHistoryView.vue  |   4 +-
 src/views/setting/AccountSettingSearch.vue    |   4 +-
 src/views/setting/AccountSettingSubscribe.vue |   4 +-
 src/views/site/SiteCardListView.vue           |   4 +-
 src/views/subscribe/SubscribeListView.vue     |   8 +-
 16 files changed, 225 insertions(+), 225 deletions(-)
 rename src/components/{form/ImportCodeForm.vue => dialog/ImportCodeDialog.vue} (100%)
 rename src/components/{form/ReorganizeForm.vue => dialog/ReorganizeDialog.vue} (100%)
 rename src/components/{form/SiteAddEditForm.vue => dialog/SiteAddEditDialog.vue} (100%)
 rename src/components/{form/SubscribeEditForm.vue => dialog/SubscribeEditDialog.vue} (100%)
 create mode 100644 src/components/dialog/SubscribeHistoryDialog.vue
 delete mode 100644 src/components/misc/SubscribeHistory.vue

diff --git a/src/components/cards/MediaCard.vue b/src/components/cards/MediaCard.vue
index 05155b98..aaaeb441 100644
--- a/src/components/cards/MediaCard.vue
+++ b/src/components/cards/MediaCard.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import type { PropType, Ref } from 'vue'
 import { useToast } from 'vue-toast-notification'
-import SubscribeEditForm from '../form/SubscribeEditForm.vue'
+import SubscribeEditDialog from '../dialog/SubscribeEditDialog.vue'
 import { formatSeason } from '@/@core/utils/formatters'
 import api from '@/api'
 import { doneNProgress, startNProgress } from '@/api/nprogress'
@@ -592,7 +592,7 @@ function getYear(airDate: string) {
     </VCard>
   </VBottomSheet>
   <!-- 订阅编辑弹窗 -->
-  <SubscribeEditForm
+  <SubscribeEditDialog
     v-if="subscribeEditDialog"
     v-model="subscribeEditDialog"
     :subid="subscribeId"
diff --git a/src/components/cards/SiteCard.vue b/src/components/cards/SiteCard.vue
index d2ddeb55..1e258f3d 100644
--- a/src/components/cards/SiteCard.vue
+++ b/src/components/cards/SiteCard.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import type { PropType } from 'vue'
 import { useToast } from 'vue-toast-notification'
-import SiteAddEditForm from '../form/SiteAddEditForm.vue'
+import SiteAddEditDialog from '../dialog/SiteAddEditDialog.vue'
 import SiteTorrentTable from '../table/SiteTorrentTable.vue'
 import { requiredValidator } from '@/@validators'
 import api from '@/api'
@@ -360,7 +360,7 @@ onMounted(() => {
       </VCardActions>
     </VCard>
   </VDialog>
-  <SiteAddEditForm
+  <SiteAddEditDialog
     v-if="siteEditDialog"
     v-model="siteEditDialog"
     :siteid="cardProps.site?.id"
diff --git a/src/components/cards/SubscribeCard.vue b/src/components/cards/SubscribeCard.vue
index aecdd90c..9c6932a1 100644
--- a/src/components/cards/SubscribeCard.vue
+++ b/src/components/cards/SubscribeCard.vue
@@ -1,6 +1,6 @@
 <script lang='ts' setup>
 import { useToast } from 'vue-toast-notification'
-import SubscribeEditForm from '../form/SubscribeEditForm.vue'
+import SubscribeEditDialog from '../dialog/SubscribeEditDialog.vue'
 import { calculateTimeDifference } from '@/@core/utils'
 import { formatSeason } from '@/@core/utils/formatters'
 import api from '@/api'
@@ -284,7 +284,7 @@ const dropdownItems = ref([
     />
   </VCard>
   <!-- 订阅编辑弹窗 -->
-  <SubscribeEditForm
+  <SubscribeEditDialog
     v-if="subscribeEditDialog"
     v-model="subscribeEditDialog"
     :subid="props.media?.id"
diff --git a/src/components/form/ImportCodeForm.vue b/src/components/dialog/ImportCodeDialog.vue
similarity index 100%
rename from src/components/form/ImportCodeForm.vue
rename to src/components/dialog/ImportCodeDialog.vue
diff --git a/src/components/form/ReorganizeForm.vue b/src/components/dialog/ReorganizeDialog.vue
similarity index 100%
rename from src/components/form/ReorganizeForm.vue
rename to src/components/dialog/ReorganizeDialog.vue
diff --git a/src/components/form/SiteAddEditForm.vue b/src/components/dialog/SiteAddEditDialog.vue
similarity index 100%
rename from src/components/form/SiteAddEditForm.vue
rename to src/components/dialog/SiteAddEditDialog.vue
diff --git a/src/components/form/SubscribeEditForm.vue b/src/components/dialog/SubscribeEditDialog.vue
similarity index 100%
rename from src/components/form/SubscribeEditForm.vue
rename to src/components/dialog/SubscribeEditDialog.vue
diff --git a/src/components/dialog/SubscribeHistoryDialog.vue b/src/components/dialog/SubscribeHistoryDialog.vue
new file mode 100644
index 00000000..822a6e62
--- /dev/null
+++ b/src/components/dialog/SubscribeHistoryDialog.vue
@@ -0,0 +1,203 @@
+<script lang="ts" setup>
+import api from '@/api';
+import { Subscribe } from '@/api/types';
+import { formatDateDifference } from '@core/utils/formatters'
+
+// 输入参数
+const props = defineProps({
+  type: String,
+})
+
+// 定义触发的自定义事件
+const emit = defineEmits(['close'])
+
+// 订阅历史列表
+const historyList = ref<Subscribe[]>([])
+
+// 当前加载数据
+const currData = ref<Subscribe[]>([])
+
+// 当前页
+const currentPage = ref(1)
+
+// 每页数量
+const pageSize = ref(30)
+
+// 是否加载中
+const loading = ref(false)
+
+// 是否加载完成
+const isRefreshed = ref(false)
+
+// 调用API查询列表
+async function loadHistory({ done }: { done: any }) {
+  // 如果正在加载中，直接返回
+  if (loading.value) {
+    done('ok')
+    return
+  }
+
+  // 设置加载中
+  loading.value = true
+
+  // 调用API查询列表
+  try {
+    currData.value = await api.get(`subscribe/history/${props.type}`, {
+      params: {
+        page: currentPage.value,
+        count: pageSize.value,
+      },
+    })
+    // 标计为已请求完成
+    isRefreshed.value = true
+    if (currData.value.length === 0) {
+      // 如果没有数据，跳出
+      done('ok')
+      return
+    }
+    // 合并数据
+    historyList.value = [...historyList.value, ...currData.value]
+    // 页码+1
+    currentPage.value++
+    // 取消加载中
+    loading.value = false
+    // 返回加载成功
+    done('ok')
+  } catch (e) {
+    console.error(e)
+    // 返回加载失败
+    done('error')
+  }
+}
+
+// 重新订阅
+function reSubscribe(item: Subscribe) {
+
+}
+
+// 删除记录
+function deleteHistory(item: Subscribe) {
+
+}
+
+// 弹出菜单
+const dropdownItems = ref([
+  {
+    title: '重新订阅',
+    value: 1,
+    color: '',
+    props: {
+      prependIcon: 'mdi-redo',
+      click: reSubscribe,
+    },
+  },
+  {
+    title: '删除',
+    value: 2,
+    color: 'error',
+    props: {
+      prependIcon: 'mdi-delete',
+      click: deleteHistory,
+    },
+  }
+])
+
+</script>
+
+<template>
+  <VDialog
+    scrollable
+    max-width="50rem"
+  >
+  <VCard
+      class="mx-auto"
+      width="100%"
+      :title = "props.type + '订阅历史'"
+    >
+      <DialogCloseBtn @click="() => { emit('close') }" />
+      <VList
+        lines="two"
+      >
+        <VInfiniteScroll
+          mode="intersect"
+          side="end"
+          :items="historyList"
+          class="overflow-hidden"
+          @load="loadHistory"
+        >
+          <template #loading>
+            <div
+              v-if="!isRefreshed"
+              class="w-full text-center text-gray-500 text-sm flex flex-col items-center"
+            >
+              <VProgressCircular
+                size="48"
+                indeterminate
+                color="primary"
+              />
+            </div>
+          </template>
+          <template v-for="(item, i) in historyList" :key="i">
+            <VListItem>
+              <template #prepend>
+                <VImg
+                  height="75"
+                  width="50"
+                  :src="item.poster"
+                  aspect-ratio="2/3"
+                  class="object-cover rounded shadow ring-gray-500 me-3"
+                  cover
+                >
+                  <template #placeholder>
+                    <div class="w-full h-full">
+                      <VSkeletonLoader class="object-cover aspect-w-2 aspect-h-3" />
+                    </div>
+                  </template>
+                </VImg>
+              </template>
+              <VListItemTitle v-if="item.type == '电视剧'">
+                {{ item.name }} <span class="text-sm">第 {{ item.season }} 季</span>
+              </VListItemTitle>
+              <VListItemTitle v-else>
+                {{ item.name }}
+              </VListItemTitle>
+              <VListItemSubtitle class="mt-2">{{ formatDateDifference(item.date) }}</VListItemSubtitle>
+              <VListItemSubtitle class="mt-2">{{ item.description }}</VListItemSubtitle>
+              <template #append>
+                <div class="me-n3">
+                  <IconBtn>
+                    <VIcon
+                      icon="mdi-dots-vertical"
+                    />
+                    <VMenu
+                      activator="parent"
+                      close-on-content-click
+                    >
+                      <VList>
+                        <VListItem
+                          v-for="(item, i) in dropdownItems"
+                          :key="i"
+                          variant="plain"
+                          :base-color="item.color"
+                          @click="item.props.click"
+                        >
+                          <template #prepend>
+                            <VIcon :icon="item.props.prependIcon" />
+                          </template>
+                          <VListItemTitle v-text="item.title" />
+                        </VListItem>
+                      </VList>
+                    </VMenu>
+                  </IconBtn>
+                </div>
+              </template>
+            </VListItem>
+          </template>
+          <VCardText v-if="historyList.length == 0 && isRefreshed" class="text-center">
+            没有数据
+          </VCardText>
+        </VInfiniteScroll>
+      </VList>
+    </VCard>
+  </VDialog>
+</template>
diff --git a/src/components/filebrowser/FileList.vue b/src/components/filebrowser/FileList.vue
index effd063c..94934917 100644
--- a/src/components/filebrowser/FileList.vue
+++ b/src/components/filebrowser/FileList.vue
@@ -4,7 +4,7 @@ import type { PropType } from 'vue'
 import { useConfirm } from 'vuetify-use-dialog'
 import axios from 'axios'
 import { useToast } from 'vue-toast-notification'
-import ReorganizeForm from '../form/ReorganizeForm.vue'
+import ReorganizeDialog from '../dialog/ReorganizeDialog.vue'
 import { formatBytes } from '@core/utils/formatters'
 import type { Context, EndPoints, FileItem } from '@/api/types'
 import store from '@/store'
@@ -535,7 +535,7 @@ onMounted(() => {
     </VCard>
   </VDialog>
   <!-- 文件整理弹窗 -->
-  <ReorganizeForm
+  <ReorganizeDialog
     v-if="transferPopper"
     v-model="transferPopper"
     :path="currentItem?.path"
diff --git a/src/components/misc/SubscribeHistory.vue b/src/components/misc/SubscribeHistory.vue
deleted file mode 100644
index 92af0b34..00000000
--- a/src/components/misc/SubscribeHistory.vue
+++ /dev/null
@@ -1,203 +0,0 @@
-<script lang="ts" setup>
-import api from '@/api';
-import { Subscribe } from '@/api/types';
-import { formatDateDifference } from '@core/utils/formatters'
-
-// 输入参数
-const props = defineProps({
-  type: String,
-})
-
-// 定义触发的自定义事件
-const emit = defineEmits(['close'])
-
-// 订阅历史列表
-const historyList = ref<Subscribe[]>([])
-
-// 当前加载数据
-const currData = ref<Subscribe[]>([])
-
-// 当前页
-const currentPage = ref(1)
-
-// 每页数量
-const pageSize = ref(30)
-
-// 是否加载中
-const loading = ref(false)
-
-// 是否加载完成
-const isRefreshed = ref(false)
-
-// 调用API查询列表
-async function loadHistory({ done }: { done: any }) {
-  // 如果正在加载中，直接返回
-  if (loading.value) {
-    done('ok')
-    return
-  }
-
-  // 设置加载中
-  loading.value = true
-
-  // 调用API查询列表
-  try {
-    currData.value = await api.get(`subscribe/history/${props.type}`, {
-      params: {
-        page: currentPage.value,
-        count: pageSize.value,
-      },
-    })
-    // 标计为已请求完成
-    isRefreshed.value = true
-    if (currData.value.length === 0) {
-      // 如果没有数据，跳出
-      done('ok')
-      return
-    }
-    // 合并数据
-    historyList.value = [...historyList.value, ...currData.value]
-    // 页码+1
-    currentPage.value++
-    // 取消加载中
-    loading.value = false
-    // 返回加载成功
-    done('ok')
-  } catch (e) {
-    console.error(e)
-    // 返回加载失败
-    done('error')
-  }
-}
-
-// 重新订阅
-function reSubscribe(item: Subscribe) {
-
-}
-
-// 删除记录
-function deleteHistory(item: Subscribe) {
-
-}
-
-// 弹出菜单
-const dropdownItems = ref([
-  {
-    title: '重新订阅',
-    value: 1,
-    color: '',
-    props: {
-      prependIcon: 'mdi-redo',
-      click: reSubscribe,
-    },
-  },
-  {
-    title: '删除',
-    value: 2,
-    color: 'error',
-    props: {
-      prependIcon: 'mdi-delete',
-      click: deleteHistory,
-    },
-  }
-])
-
-</script>
-
-<template>
-  <VDialog
-    scrollable
-    max-width="50rem"
-  >
-  <VCard
-      class="mx-auto"
-      width="100%"
-      :title = "props.type + '订阅历史'"
-    >
-      <DialogCloseBtn @click="() => { emit('close') }" />
-      <div
-        v-if="!isRefreshed"
-        class="mt-12 w-full text-center text-gray-500 text-sm flex flex-col items-center"
-      >
-        <VProgressCircular
-          size="48"
-          indeterminate
-          color="primary"
-        />
-      </div>
-      <VList
-        lines="two"
-      >
-        <VInfiniteScroll
-          v-if="historyList.length > 0"
-          mode="intersect"
-          side="end"
-          :items="historyList"
-          class="overflow-hidden"
-          @load="loadHistory"
-        >
-          <template #loading />
-            <template v-for="(item, i) in historyList" :key="i">
-              <VListItem>
-                <template #prepend>
-                  <VImg
-                    height="75"
-                    width="50"
-                    :src="item.poster"
-                    aspect-ratio="2/3"
-                    class="object-cover rounded shadow ring-gray-500 me-3"
-                    cover
-                  >
-                    <template #placeholder>
-                      <div class="w-full h-full">
-                        <VSkeletonLoader class="object-cover aspect-w-2 aspect-h-3" />
-                      </div>
-                    </template>
-                  </VImg>
-                </template>
-                <VListItemTitle v-if="item.type == '电视剧'">
-                  {{ item.name }} <span class="text-sm">第 {{ item.season }} 季</span>
-                </VListItemTitle>
-                <VListItemTitle v-else>
-                  {{ item.name }}
-                </VListItemTitle>
-                <VListItemSubtitle class="mt-2">{{ formatDateDifference(item.date) }}</VListItemSubtitle>
-                <VListItemSubtitle class="mt-2">{{ item.description }}</VListItemSubtitle>
-                <template #append>
-                  <div class="me-n3">
-                    <IconBtn>
-                      <VIcon
-                        icon="mdi-dots-vertical"
-                      />
-                      <VMenu
-                        activator="parent"
-                        close-on-content-click
-                      >
-                        <VList>
-                          <VListItem
-                            v-for="(item, i) in dropdownItems"
-                            :key="i"
-                            variant="plain"
-                            :base-color="item.color"
-                            @click="item.props.click"
-                          >
-                            <template #prepend>
-                              <VIcon :icon="item.props.prependIcon" />
-                            </template>
-                            <VListItemTitle v-text="item.title" />
-                          </VListItem>
-                        </VList>
-                      </VMenu>
-                    </IconBtn>
-                  </div>
-                </template>
-              </VListItem>
-            </template>
-          </VInfiniteScroll>
-        </VList>
-      <VCardText v-if="historyList.length == 0 && isRefreshed" class="text-center">
-        没有数据
-      </VCardText>
-    </VCard>
-  </VDialog>
-</template>
diff --git a/src/views/discover/MediaDetailView.vue b/src/views/discover/MediaDetailView.vue
index 556e0a31..2a6c1bae 100644
--- a/src/views/discover/MediaDetailView.vue
+++ b/src/views/discover/MediaDetailView.vue
@@ -8,7 +8,7 @@ import NoDataFound from '@/components/NoDataFound.vue'
 import { doneNProgress, startNProgress } from '@/api/nprogress'
 import { formatSeason } from '@/@core/utils/formatters'
 import router from '@/router'
-import SubscribeEditForm from '@/components/form/SubscribeEditForm.vue'
+import SubscribeEditDialog from '@/components/dialog/SubscribeEditDialog.vue'
 
 // 输入参数
 const mediaProps = defineProps({
@@ -849,7 +849,7 @@ onBeforeMount(() => {
     error-description="未识别到媒体信息。"
   />
   <!-- 订阅编辑弹窗 -->
-  <SubscribeEditForm
+  <SubscribeEditDialog
     v-model="subscribeEditDialog"
     :subid="subscribeId"
     @close="subscribeEditDialog = false"
diff --git a/src/views/reorganize/TransferHistoryView.vue b/src/views/reorganize/TransferHistoryView.vue
index 482d8f94..aec584e0 100644
--- a/src/views/reorganize/TransferHistoryView.vue
+++ b/src/views/reorganize/TransferHistoryView.vue
@@ -3,7 +3,7 @@ import { ref, unref } from 'vue'
 import { useToast } from 'vue-toast-notification'
 import api from '@/api'
 import type { TransferHistory } from '@/api/types'
-import ReorganizeForm from '@/components/form/ReorganizeForm.vue'
+import ReorganizeDialog from '@/components/dialog/ReorganizeDialog.vue'
 
 // 提示框
 const $toast = useToast()
@@ -482,7 +482,7 @@ onMounted(fetchData)
     </VCard>
   </VBottomSheet>
   <!-- 文件整理弹窗 -->
-  <ReorganizeForm
+  <ReorganizeDialog
     v-if="redoDialog"
     v-model="redoDialog"
     :logids="redoIds"
diff --git a/src/views/setting/AccountSettingSearch.vue b/src/views/setting/AccountSettingSearch.vue
index d4672bd9..665a2c0b 100644
--- a/src/views/setting/AccountSettingSearch.vue
+++ b/src/views/setting/AccountSettingSearch.vue
@@ -4,7 +4,7 @@ import api from '@/api'
 import FilterRuleCard from '@/components/cards/FilterRuleCard.vue'
 import type { Site } from '@/api/types'
 import { copyToClipboard } from '@/@core/utils/navigator'
-import ImportCodeForm from '@/components/form/ImportCodeForm.vue'
+import ImportCodeDialog from '@/components/dialog/ImportCodeDialog.vue'
 
 // 规则卡片类型
 interface FilterCard {
@@ -420,7 +420,7 @@ onMounted(() => {
     width="60rem"
     scrollable
   >
-    <ImportCodeForm
+    <ImportCodeDialog
       v-model="importCodeString"
       title="导入优先级规则"
       @close="importCodeDialog = false"
diff --git a/src/views/setting/AccountSettingSubscribe.vue b/src/views/setting/AccountSettingSubscribe.vue
index f6fd05fc..f242ed33 100644
--- a/src/views/setting/AccountSettingSubscribe.vue
+++ b/src/views/setting/AccountSettingSubscribe.vue
@@ -4,7 +4,7 @@ import api from '@/api'
 import FilterRuleCard from '@/components/cards/FilterRuleCard.vue'
 import type { Site } from '@/api/types'
 import { copyToClipboard } from '@/@core/utils/navigator'
-import ImportCodeForm from '@/components/form/ImportCodeForm.vue'
+import ImportCodeDialog from '@/components/dialog/ImportCodeDialog.vue'
 
 // 规则卡片类型
 interface FilterCard {
@@ -648,7 +648,7 @@ onMounted(() => {
     width="60rem"
     scrollable
   >
-    <ImportCodeForm
+    <ImportCodeDialog
       v-model="importCodeString"
       title="导入优先级规则"
       @close="importCodeDialog = false"
diff --git a/src/views/site/SiteCardListView.vue b/src/views/site/SiteCardListView.vue
index bf421692..b276ff4c 100644
--- a/src/views/site/SiteCardListView.vue
+++ b/src/views/site/SiteCardListView.vue
@@ -3,7 +3,7 @@ import api from '@/api'
 import type { Site } from '@/api/types'
 import SiteCard from '@/components/cards/SiteCard.vue'
 import NoDataFound from '@/components/NoDataFound.vue'
-import SiteAddEditForm from '@/components/form/SiteAddEditForm.vue'
+import SiteAddEditDialog from '@/components/dialog/SiteAddEditDialog.vue'
 import { useDefer } from '@/@core/utils/dom'
 
 // 数据列表
@@ -80,7 +80,7 @@ onBeforeMount(fetchData)
     @click="siteAddDialog = true"
   />
   <!-- 新增站点弹窗 -->
-  <SiteAddEditForm
+  <SiteAddEditDialog
     v-if="siteAddDialog"
     v-model="siteAddDialog"
     oper="add"
diff --git a/src/views/subscribe/SubscribeListView.vue b/src/views/subscribe/SubscribeListView.vue
index d1f05e3c..0e9d50f5 100644
--- a/src/views/subscribe/SubscribeListView.vue
+++ b/src/views/subscribe/SubscribeListView.vue
@@ -4,8 +4,8 @@ import api from '@/api'
 import type { Subscribe } from '@/api/types'
 import NoDataFound from '@/components/NoDataFound.vue'
 import SubscribeCard from '@/components/cards/SubscribeCard.vue'
-import SubscribeEditForm from '@/components/form/SubscribeEditForm.vue'
-import SubscribeHistory from '@/components/misc/SubscribeHistory.vue'
+import SubscribeEditDialog from '@/components/dialog/SubscribeEditDialog.vue'
+import SubscribeHistoryDialog from '@/components/dialog/SubscribeHistoryDialog.vue'
 import store from '@/store'
 
 // 输入参数
@@ -118,7 +118,7 @@ const filteredDataList = computed(() => {
     @click="historyDialog = true"
   />
   <!-- 订阅编辑弹窗 -->
-  <SubscribeEditForm
+  <SubscribeEditDialog
     v-if="subscribeEditDialog"
     v-model="subscribeEditDialog"
     :default="true"
@@ -127,7 +127,7 @@ const filteredDataList = computed(() => {
     @close="subscribeEditDialog = false"
   />
   <!-- 历史记录弹窗 -->
-  <SubscribeHistory   
+  <SubscribeHistoryDialog   
     v-if="historyDialog"
     v-model="historyDialog"
     :type="props.type"

From f63beb776e12cf358a011a026dbd556c39765952 Mon Sep 17 00:00:00 2001
From: jxxghp <jxxghp@gmail.com>
Date: Fri, 19 Apr 2024 08:24:57 +0800
Subject: [PATCH 18/36] =?UTF-8?q?fix=20=E8=AE=A2=E9=98=85=E5=8E=86?=
 =?UTF-8?q?=E5=8F=B2=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components.d.ts                               |  1 +
 src/@core/components/LoadingBanner.vue        | 28 +++++++
 src/App.vue                                   |  5 --
 .../dialog/SubscribeHistoryDialog.vue         | 81 ++++++++++++++-----
 src/main.ts                                   |  5 ++
 src/pages/resource.vue                        | 11 +--
 src/views/discover/MediaCardListView.vue      | 12 +--
 src/views/discover/MediaDetailView.vue        | 24 ++----
 src/views/discover/PersonCardListView.vue     | 12 +--
 src/views/discover/PersonDetailView.vue       | 12 +--
 src/views/plugin/PluginCardListView.vue       | 26 ++----
 src/views/reorganize/DownloadingListView.vue  | 13 +--
 src/views/site/SiteCardListView.vue           | 13 +--
 src/views/subscribe/SubscribeListView.vue     | 14 +---
 14 files changed, 131 insertions(+), 126 deletions(-)
 create mode 100644 src/@core/components/LoadingBanner.vue

diff --git a/components.d.ts b/components.d.ts
index 842ae72d..adba0235 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -10,6 +10,7 @@ declare module 'vue' {
     DialogCloseBtn: typeof import('./src/@core/components/DialogCloseBtn.vue')['default']
     ErrorHeader: typeof import('./src/@core/components/ErrorHeader.vue')['default']
     ExistIcon: typeof import('./src/@core/components/ExistIcon.vue')['default']
+    LoadingBanner: typeof import('./src/@core/components/LoadingBanner.vue')['default']
     MoreBtn: typeof import('./src/@core/components/MoreBtn.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']
diff --git a/src/@core/components/LoadingBanner.vue b/src/@core/components/LoadingBanner.vue
new file mode 100644
index 00000000..8e97558c
--- /dev/null
+++ b/src/@core/components/LoadingBanner.vue
@@ -0,0 +1,28 @@
+<script lang="ts" setup>
+  // 定义输入参数
+  const props = defineProps({
+    progress: Number,
+    text: String
+  })
+</script>
+
+<template>
+  <div
+    class="w-full text-center text-gray-500 text-sm flex flex-col items-center"
+  >
+    <VProgressCircular
+      v-if="!props.text"
+      size="48"
+      indeterminate
+      color="primary"
+    />
+    <VProgressCircular 
+      v-if="props.progress" 
+      class="mb-3" 
+      color="primary" 
+      :model-value="props.progress" 
+      size="64" 
+      />
+    <span>{{ props.text }}</span>
+  </div>
+</template>
diff --git a/src/App.vue b/src/App.vue
index 55cea95f..37b1e115 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,13 +1,8 @@
 <script lang="ts" setup>
 import { useToast } from 'vue-toast-notification'
 import { useTheme } from 'vuetify'
-
 import store from './store'
 
-import { fixArrayAt } from '@/@core/utils/compatibility'
-
-// 修复低版本Safari等浏览器数组不支持at函数的问题
-fixArrayAt()
 
 // 提示框
 const $toast = useToast()
diff --git a/src/components/dialog/SubscribeHistoryDialog.vue b/src/components/dialog/SubscribeHistoryDialog.vue
index 822a6e62..48b86879 100644
--- a/src/components/dialog/SubscribeHistoryDialog.vue
+++ b/src/components/dialog/SubscribeHistoryDialog.vue
@@ -9,7 +9,7 @@ const props = defineProps({
 })
 
 // 定义触发的自定义事件
-const emit = defineEmits(['close'])
+const emit = defineEmits(['close', 'save'])
 
 // 订阅历史列表
 const historyList = ref<Subscribe[]>([])
@@ -29,6 +29,12 @@ const loading = ref(false)
 // 是否加载完成
 const isRefreshed = ref(false)
 
+// 进度框
+const progressDialog = ref(false)
+
+// 进度文字
+const progressText = ref('正在重新订阅...')
+
 // 调用API查询列表
 async function loadHistory({ done }: { done: any }) {
   // 如果正在加载中，直接返回
@@ -71,13 +77,33 @@ async function loadHistory({ done }: { done: any }) {
 }
 
 // 重新订阅
-function reSubscribe(item: Subscribe) {
-
+async function reSubscribe(item: Subscribe) {
+  if (item.type === '电影')
+    progressText.value = `正在重新订阅 ${item.name} ...`
+  else
+    progressText.value = `正在重新订阅 ${item.name} 第 ${item.season} 季 ...`
+  progressDialog.value = true
+  try {
+    const result: {[key: string]: any} = await api.post('subscribe', item)
+    if (result.success){
+      emit('save')
+    }
+  } catch (e) {
+    console.error(e)
+  }
+  progressDialog.value = false
 }
 
 // 删除记录
-function deleteHistory(item: Subscribe) {
-
+async function deleteHistory(item: Subscribe) {
+  try {
+    const result: {[key: string]: any} = await api.delete(`subscribe/history/${item.id}`)
+    if (result.success){
+      historyList.value = historyList.value.filter((i) => i.id !== item.id)
+    }
+  } catch (e) {
+    console.error(e)
+  }
 }
 
 // 弹出菜单
@@ -108,12 +134,15 @@ const dropdownItems = ref([
   <VDialog
     scrollable
     max-width="50rem"
+    max-height="90vh"
   >
   <VCard
       class="mx-auto"
       width="100%"
-      :title = "props.type + '订阅历史'"
     >
+      <VCardItem class="pb-0">
+        <VCardTitle>{{ props.type + '订阅历史' }}</VCardTitle>
+      </VCardItem>
       <DialogCloseBtn @click="() => { emit('close') }" />
       <VList
         lines="two"
@@ -126,16 +155,7 @@ const dropdownItems = ref([
           @load="loadHistory"
         >
           <template #loading>
-            <div
-              v-if="!isRefreshed"
-              class="w-full text-center text-gray-500 text-sm flex flex-col items-center"
-            >
-              <VProgressCircular
-                size="48"
-                indeterminate
-                color="primary"
-              />
-            </div>
+            <LoadingBanner />
           </template>
           <template v-for="(item, i) in historyList" :key="i">
             <VListItem>
@@ -175,16 +195,16 @@ const dropdownItems = ref([
                     >
                       <VList>
                         <VListItem
-                          v-for="(item, i) in dropdownItems"
+                          v-for="(menu, i) in dropdownItems"
                           :key="i"
                           variant="plain"
-                          :base-color="item.color"
-                          @click="item.props.click"
+                          :base-color="menu.color"
+                          @click="menu.props.click(item)"
                         >
                           <template #prepend>
-                            <VIcon :icon="item.props.prependIcon" />
+                            <VIcon :icon="menu.props.prependIcon" />
                           </template>
-                          <VListItemTitle v-text="item.title" />
+                          <VListItemTitle v-text="menu.title" />
                         </VListItem>
                       </VList>
                     </VMenu>
@@ -199,5 +219,24 @@ const dropdownItems = ref([
         </VInfiniteScroll>
       </VList>
     </VCard>
+    <!-- 进度框 -->
+    <VDialog
+      v-model="progressDialog"
+      :scrim="false"
+      width="25rem"
+    >
+      <VCard
+        color="primary"
+      >
+        <VCardText class="text-center">
+          {{ progressText }}
+          <VProgressLinear
+            indeterminate
+            color="white"
+            class="mb-0 mt-1"
+          />
+        </VCardText>
+      </VCard>
+    </VDialog>
   </VDialog>
 </template>
diff --git a/src/main.ts b/src/main.ts
index 0b64cc6c..35573818 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -18,7 +18,12 @@ import 'vue-toast-notification/dist/theme-bootstrap.css'
 import { PerfectScrollbarPlugin } from 'vue3-perfect-scrollbar';
 import 'vue3-perfect-scrollbar/style.css';
 import DialogCloseBtn from '@/@core/components/DialogCloseBtn.vue'
+import { fixArrayAt } from '@/@core/utils/compatibility'
 
+// 修复低版本Safari等浏览器数组不支持at函数的问题
+fixArrayAt()
+
+// 加载字体
 loadFonts()
 
 // 创建Vue实例
diff --git a/src/pages/resource.vue b/src/pages/resource.vue
index 264fc39b..2e72ef65 100644
--- a/src/pages/resource.vue
+++ b/src/pages/resource.vue
@@ -120,11 +120,12 @@ onMounted(() => {
 </script>
 
 <template>
-  <div v-if="!isRefreshed" class="mt-12 w-full text-center text-gray-500 text-sm flex flex-col items-center">
-    <VProgressCircular v-if="!keyword" size="48" indeterminate color="primary" />
-    <VProgressCircular v-if="keyword" class="mb-3" color="primary" :model-value="progressValue" size="64" />
-    <span>{{ progressText }}</span>
-  </div>
+  <LoadingBanner 
+    v-if="!isRefreshed" 
+    class="mt-12"
+    :text="progressText"
+    :progress="progressValue"
+  />
   <NoDataFound
     v-if="dataList.length === 0 && isRefreshed"
     :error-title="errorTitle"
diff --git a/src/views/discover/MediaCardListView.vue b/src/views/discover/MediaCardListView.vue
index bd9d91d8..af9a38db 100644
--- a/src/views/discover/MediaCardListView.vue
+++ b/src/views/discover/MediaCardListView.vue
@@ -123,16 +123,10 @@ async function fetchData({ done }: { done: any }) {
 </script>
 
 <template>
-  <div
+  <LoadingBanner
     v-if="!isRefreshed"
-    class="mt-12 w-full text-center text-gray-500 text-sm flex flex-col items-center"
-  >
-    <VProgressCircular
-      size="48"
-      indeterminate
-      color="primary"
-    />
-  </div>
+    class="mt-12"
+  />
   <VInfiniteScroll
     mode="intersect"
     side="end"
diff --git a/src/views/discover/MediaDetailView.vue b/src/views/discover/MediaDetailView.vue
index 2a6c1bae..0d0c013b 100644
--- a/src/views/discover/MediaDetailView.vue
+++ b/src/views/discover/MediaDetailView.vue
@@ -457,16 +457,10 @@ onBeforeMount(() => {
 </script>
 
 <template>
-  <div
+  <LoadingBanner
     v-if="!isRefreshed"
-    class="mt-12 w-full text-center text-gray-500 text-sm flex flex-col items-center"
-  >
-    <VProgressCircular
-      size="48"
-      indeterminate
-      color="primary"
-    />
-  </div>
+    class="mt-12"
+  />
   <div v-if="mediaDetail.tmdb_id || mediaDetail.douban_id || mediaDetail.bangumi_id" class="max-w-8xl mx-auto px-4">
     <template v-if="mediaDetail.backdrop_path || mediaDetail.poster_path">
       <div class="vue-media-back absolute left-0 top-0 w-full h-96">
@@ -638,16 +632,10 @@ onBeforeMount(() => {
                 </VExpansionPanelTitle>
                 <VExpansionPanelText>
                   <template #default>
-                    <div
+                    <LoadingBanner
                       v-if="!seasonEpisodesInfo[season.season_number || 0]"
-                      class="mt-3 w-full text-center text-gray-500 text-sm flex flex-col items-center"
-                    >
-                      <VProgressCircular
-                        size="48"
-                        indeterminate
-                        color="primary"
-                      />
-                    </div>
+                      class="mt-3"
+                    />
                     <div class="flex flex-col justify-center divide-y divide-gray-700">
                       <div v-for="episode in seasonEpisodesInfo[season.season_number || 0]" :key="episode.episode_number" class="flex flex-col space-y-4 py-4 xl:flex-row xl:space-y-4 xl:space-x-4">
                         <div class="flex-1">
diff --git a/src/views/discover/PersonCardListView.vue b/src/views/discover/PersonCardListView.vue
index 9245e32a..8f576a06 100644
--- a/src/views/discover/PersonCardListView.vue
+++ b/src/views/discover/PersonCardListView.vue
@@ -117,16 +117,10 @@ async function fetchData({ done }: { done: any }) {
 </script>
 
 <template>
-  <div
+  <LoadingBanner
     v-if="!isRefreshed"
-    class="mt-12 w-full text-center text-gray-500 text-sm flex flex-col items-center"
-  >
-    <VProgressCircular
-      size="48"
-      indeterminate
-      color="primary"
-    />
-  </div>
+    class="mt-12"
+  />
   <VInfiniteScroll
     mode="intersect"
     side="end"
diff --git a/src/views/discover/PersonDetailView.vue b/src/views/discover/PersonDetailView.vue
index a794dfca..6cea12bb 100644
--- a/src/views/discover/PersonDetailView.vue
+++ b/src/views/discover/PersonDetailView.vue
@@ -48,16 +48,10 @@ onBeforeMount(() => {
 </script>
 
 <template>
-  <div
+  <LoadingBanner
     v-if="!isRefreshed"
-    class="mt-12 w-full text-center text-gray-500 text-sm flex flex-col items-center"
-  >
-    <VProgressCircular
-      size="48"
-      indeterminate
-      color="primary"
-    />
-  </div>
+    class="mt-12"
+  />
   <div v-if="personDetail.id" class="max-w-8xl mx-auto px-4">
     <div class="relative z-10 mt-4 mb-8 flex flex-col items-center lg:flex-row ">
       <VAvatar
diff --git a/src/views/plugin/PluginCardListView.vue b/src/views/plugin/PluginCardListView.vue
index e2aec265..30963468 100644
--- a/src/views/plugin/PluginCardListView.vue
+++ b/src/views/plugin/PluginCardListView.vue
@@ -211,17 +211,10 @@ onBeforeMount(() => {
 </script>
 
 <template>
-  <div
+  <LoadingBanner
     v-if="!isRefreshed"
-    class="mt-12 w-full text-center text-gray-500 text-sm flex flex-col items-center"
-  >
-    <VProgressCircular
-      v-if="!isRefreshed"
-      size="48"
-      indeterminate
-      color="primary"
-    />
-  </div>
+    class="mt-12"
+  />
   <div
     v-if="dataList.length > 0"
     class="grid gap-4 grid-plugin-card"
@@ -285,17 +278,10 @@ onBeforeMount(() => {
         </VToolbar>
       </div>
       <VCardText>
-        <div
+        <LoadingBanner
           v-if="!isAppMarketLoaded"
-          class="mt-12 w-full text-center text-gray-500 text-sm flex flex-col items-center"
-        >
-          <VProgressCircular
-            v-if="!isAppMarketLoaded"
-            size="48"
-            indeterminate
-            color="primary"
-          />
-        </div>
+          class="mt-12"
+        />
         <div v-if="isAppMarketLoaded" class="grid gap-4 grid-plugin-card">
           <PluginAppCard
             v-for="data in sortedUninstalledList"
diff --git a/src/views/reorganize/DownloadingListView.vue b/src/views/reorganize/DownloadingListView.vue
index 3de4c16b..6f07e997 100644
--- a/src/views/reorganize/DownloadingListView.vue
+++ b/src/views/reorganize/DownloadingListView.vue
@@ -67,17 +67,10 @@ onUnmounted(() => {
 </script>
 
 <template>
-  <div
+  <LoadingBanner
     v-if="!isRefreshed"
-    class="mt-12 w-full text-center text-gray-500 text-sm flex flex-col items-center"
-  >
-    <VProgressCircular
-      v-if="!isRefreshed"
-      size="48"
-      indeterminate
-      color="primary"
-    />
-  </div>
+    class="mt-12"
+  />
   <PullRefresh
     v-model="loading"
     @refresh="onRefresh"
diff --git a/src/views/site/SiteCardListView.vue b/src/views/site/SiteCardListView.vue
index b276ff4c..0d738cd3 100644
--- a/src/views/site/SiteCardListView.vue
+++ b/src/views/site/SiteCardListView.vue
@@ -35,17 +35,10 @@ onBeforeMount(fetchData)
 </script>
 
 <template>
-  <div
+  <LoadingBanner
     v-if="!isRefreshed"
-    class="mt-12 w-full text-center text-gray-500 text-sm flex flex-col items-center"
-  >
-    <VProgressCircular
-      v-if="!isRefreshed"
-      size="48"
-      indeterminate
-      color="primary"
-    />
-  </div>
+    class="mt-12"
+  />
   <div
     v-if="dataList.length > 0"
     class="grid gap-3 grid-site-card"
diff --git a/src/views/subscribe/SubscribeListView.vue b/src/views/subscribe/SubscribeListView.vue
index 0e9d50f5..32bd22dd 100644
--- a/src/views/subscribe/SubscribeListView.vue
+++ b/src/views/subscribe/SubscribeListView.vue
@@ -62,17 +62,10 @@ const filteredDataList = computed(() => {
 </script>
 
 <template>
-  <div
+  <LoadingBanner
     v-if="!isRefreshed"
-    class="mt-12 w-full text-center text-gray-500 text-sm flex flex-col items-center"
-  >
-    <VProgressCircular
-      v-if="!isRefreshed"
-      size="48"
-      indeterminate
-      color="primary"
-    />
-  </div>
+    class="mt-12"
+  />
   <PullRefresh
     v-model="loading"
     @refresh="onRefresh"
@@ -132,6 +125,7 @@ const filteredDataList = computed(() => {
     v-model="historyDialog"
     :type="props.type"
     @close="historyDialog = false"
+    @save="() => {historyDialog = false; fetchData()}"
   />
 </template>
 

From 40cdb820fb400762be3296fa0d1146a793e1562d Mon Sep 17 00:00:00 2001
From: jxxghp <jxxghp@gmail.com>
Date: Fri, 19 Apr 2024 13:16:13 +0800
Subject: [PATCH 19/36] fix ui

---
 .../dialog/SubscribeHistoryDialog.vue         | 19 ++++---
 src/views/discover/MediaCardListView.vue      | 36 +++++--------
 src/views/discover/PersonCardListView.vue     | 51 ++++++++-----------
 src/views/system/MessageView.vue              | 29 +++++------
 4 files changed, 57 insertions(+), 78 deletions(-)

diff --git a/src/components/dialog/SubscribeHistoryDialog.vue b/src/components/dialog/SubscribeHistoryDialog.vue
index 48b86879..7622e984 100644
--- a/src/components/dialog/SubscribeHistoryDialog.vue
+++ b/src/components/dialog/SubscribeHistoryDialog.vue
@@ -43,11 +43,10 @@ async function loadHistory({ done }: { done: any }) {
     return
   }
 
-  // 设置加载中
-  loading.value = true
-
   // 调用API查询列表
   try {
+    // 设置加载中
+    loading.value = true
     currData.value = await api.get(`subscribe/history/${props.type}`, {
       params: {
         page: currentPage.value,
@@ -58,17 +57,17 @@ async function loadHistory({ done }: { done: any }) {
     isRefreshed.value = true
     if (currData.value.length === 0) {
       // 如果没有数据，跳出
+      done('error')
+    } else {
+      // 合并数据
+      historyList.value = [...historyList.value, ...currData.value]
+      // 页码+1
+      currentPage.value++
+      // 返回加载成功
       done('ok')
-      return
     }
-    // 合并数据
-    historyList.value = [...historyList.value, ...currData.value]
-    // 页码+1
-    currentPage.value++
     // 取消加载中
     loading.value = false
-    // 返回加载成功
-    done('ok')
   } catch (e) {
     console.error(e)
     // 返回加载失败
diff --git a/src/views/discover/MediaCardListView.vue b/src/views/discover/MediaCardListView.vue
index af9a38db..877205cc 100644
--- a/src/views/discover/MediaCardListView.vue
+++ b/src/views/discover/MediaCardListView.vue
@@ -52,66 +52,58 @@ async function fetchData({ done }: { done: any }) {
     // 如果正在加载中，直接返回
     if (loading.value) {
       done('ok')
-
       return
     }
 
-    // 设置加载中
-    loading.value = true
-
     // 加载到满屏或者加载出错
     if (!hasScroll()) {
       // 加载多次
       while (!hasScroll()) {
+        // 设置加载中
+        loading.value = true
         // 请求API
         currData.value = await api.get(props.apipath, {
           params: getParams(),
         })
-
+        // 取消加载中
+        loading.value = false
         // 标计为已请求完成
         isRefreshed.value = true
         if (currData.value.length === 0) {
           // 如果没有数据，跳出
-          done('ok')
-
+          done('error')
           return
         }
-
         // 合并数据
         dataList.value = [...dataList.value, ...currData.value]
-
         // 页码+1
         page.value++
       }
     }
     else {
       // 加载一次
+      // 设置加载中
+      loading.value = true
       // 请求API
       currData.value = await api.get(props.apipath, {
         params: getParams(),
       })
-
       // 标计为已请求完成
       isRefreshed.value = true
       if (currData.value.length === 0) {
         // 如果没有数据，跳出
+        done('error')
+      } else {
+        // 合并数据
+        dataList.value = [...dataList.value, ...currData.value]
+        // 页码+1
+        page.value++
+        // 返回加载成功
         done('ok')
-
-        return
       }
-
-      // 合并数据
-      dataList.value = [...dataList.value, ...currData.value]
-
-      // 页码+1
-      page.value++
     }
-
     // 取消加载中
     loading.value = false
-
-    // 返回加载成功
-    done('ok')
   }
   catch (error) {
     console.error(error)
diff --git a/src/views/discover/PersonCardListView.vue b/src/views/discover/PersonCardListView.vue
index 8f576a06..ddf14c0e 100644
--- a/src/views/discover/PersonCardListView.vue
+++ b/src/views/discover/PersonCardListView.vue
@@ -42,74 +42,67 @@ async function fetchData({ done }: { done: any }) {
     // 如果正在加载中，直接返回
     if (loading.value) {
       done('ok')
-
       return
     }
 
-    // 设置加载中
-    loading.value = true
-
     // 加载到满屏或者加载出错
     if (!hasScroll()) {
       // 加载多次
       while (!hasScroll()) {
+        // 设置加载中
+        loading.value = true
         // 请求API
         currData.value = await api.get(props.apipath, {
           params: {
             page: page.value,
           },
         })
-
+        // 取消加载中
+        loading.value = false
         // 标计为已请求完成
         isRefreshed.value = true
         if (currData.value.length === 0) {
           // 如果没有数据，跳出
+          done('error')
+        } else {
+          // 合并数据
+          dataList.value = [...dataList.value, ...currData.value]
+          // 页码+1
+          page.value++
+          // 返回加载成功
           done('ok')
-
-          return
         }
-
-        // 合并数据
-        dataList.value = [...dataList.value, ...currData.value]
-
-        // 页码+1
-        page.value++
       }
     }
     else {
       // 加载一次
+      // 设置加载中
+      loading.value = true
       // 请求API
       currData.value = await api.get(props.apipath, {
         params: {
           page: page.value,
         },
       })
-
       // 标计为已请求完成
       isRefreshed.value = true
       if (currData.value.length === 0) {
         // 如果没有数据，跳出
+        done('error')
+      } else {
+        // 合并数据
+        dataList.value = [...dataList.value, ...currData.value]
+        // 页码+1
+        page.value++
+        // 返回加载成功
         done('ok')
-
-        return
       }
-
-      // 合并数据
-      dataList.value = [...dataList.value, ...currData.value]
-
-      // 页码+1
-      page.value++
+      // 取消加载中
+      loading.value = false
     }
-
-    // 取消加载中
-    loading.value = false
-
-    // 返回加载成功
-    done('ok')
   }
   catch (error) {
     console.error(error)
-
     // 返回加载失败
     done('error')
   }
diff --git a/src/views/system/MessageView.vue b/src/views/system/MessageView.vue
index 48a07b45..f7a0c29c 100644
--- a/src/views/system/MessageView.vue
+++ b/src/views/system/MessageView.vue
@@ -55,38 +55,39 @@ async function loadMessages({ done }: { done: any }) {
     done('ok')
     return
   }
-  // 设置加载中
-  loading.value = true
   try {
+    // 设置加载中
+    loading.value = true
     currData.value = await api.get('message/web', {
       params: {
         page: page.value,
         size: 20,
       },
     })
+    // 已加载过
+    isLoaded.value = true
     if (currData.value.length > 0) {
       // 取最后一条时间为存量消息最新时间
       lastTime.value = currData.value[currData.value.length - 1].reg_time ?? ''
       // 合并数据
       messages.value = [...currData.value, ...messages.value]
-      // 加载完成
-      done('ok')
       if (page.value === 1) {
         // 滚动到底部
         emit('scroll')
-        // 监听SSE消息
-        startSSEMessager()
       }
       // 页码+1
       page.value++
+      // 完成
+      done('ok')
     }
     else {
-      done('ok')
-      // 监听SSE消息
-      startSSEMessager()
+      // 没有新数据
+      done('error')
     }
+    // 取消加载中
     loading.value = false
-    isLoaded.value = true
+    // 监听SSE消息
+    startSSEMessager()
   }
   catch (error) {
     console.error(error)
@@ -117,13 +118,7 @@ onBeforeUnmount(() => {
     @load="loadMessages"
   >
     <template #loading>
-      <VProgressCircular
-        v-if="loading"
-        indeterminate
-        size="48"
-        class="mb-5"
-        color="primary"
-      />
+      <LoadingBanner />
     </template>
     <div>
       <VRow

From cfbc5802e450270ee6fc708f3eb2593132e1832c Mon Sep 17 00:00:00 2001
From: jxxghp <jxxghp@gmail.com>
Date: Fri, 19 Apr 2024 13:56:57 +0800
Subject: [PATCH 20/36] fix VInfiniteScroll

---
 src/components/dialog/SubscribeHistoryDialog.vue | 8 ++++----
 src/views/discover/MediaCardListView.vue         | 8 +++++---
 src/views/discover/PersonCardListView.vue        | 5 +++--
 src/views/system/MessageView.vue                 | 8 ++++++--
 4 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/src/components/dialog/SubscribeHistoryDialog.vue b/src/components/dialog/SubscribeHistoryDialog.vue
index 7622e984..fe1f2e60 100644
--- a/src/components/dialog/SubscribeHistoryDialog.vue
+++ b/src/components/dialog/SubscribeHistoryDialog.vue
@@ -57,7 +57,7 @@ async function loadHistory({ done }: { done: any }) {
     isRefreshed.value = true
     if (currData.value.length === 0) {
       // 如果没有数据，跳出
-      done('error')
+      done('empty')
     } else {
       // 合并数据
       historyList.value = [...historyList.value, ...currData.value]
@@ -156,6 +156,9 @@ const dropdownItems = ref([
           <template #loading>
             <LoadingBanner />
           </template>
+          <template #empty>
+            没有更多数据
+          </template>
           <template v-for="(item, i) in historyList" :key="i">
             <VListItem>
               <template #prepend>
@@ -212,9 +215,6 @@ const dropdownItems = ref([
               </template>
             </VListItem>
           </template>
-          <VCardText v-if="historyList.length == 0 && isRefreshed" class="text-center">
-            没有数据
-          </VCardText>
         </VInfiniteScroll>
       </VList>
     </VCard>
diff --git a/src/views/discover/MediaCardListView.vue b/src/views/discover/MediaCardListView.vue
index 877205cc..1992c54a 100644
--- a/src/views/discover/MediaCardListView.vue
+++ b/src/views/discover/MediaCardListView.vue
@@ -71,13 +71,15 @@ async function fetchData({ done }: { done: any }) {
         isRefreshed.value = true
         if (currData.value.length === 0) {
           // 如果没有数据，跳出
-          done('error')
+          done('empty')
           return
         }
         // 合并数据
         dataList.value = [...dataList.value, ...currData.value]
         // 页码+1
         page.value++
+        // 返回加载成功
+        done('ok')
       }
     }
     else {
@@ -92,7 +94,7 @@ async function fetchData({ done }: { done: any }) {
       isRefreshed.value = true
       if (currData.value.length === 0) {
         // 如果没有数据，跳出
-        done('error')
+        done('empty')
       } else {
         // 合并数据
         dataList.value = [...dataList.value, ...currData.value]
@@ -107,7 +109,6 @@ async function fetchData({ done }: { done: any }) {
   }
   catch (error) {
     console.error(error)
-
     // 返回加载失败
     done('error')
   }
@@ -127,6 +128,7 @@ async function fetchData({ done }: { done: any }) {
     @load="fetchData"
   >
     <template #loading />
+    <template #empty />
     <div
       v-if="dataList.length > 0"
       class="grid gap-4 grid-media-card mx-3"
diff --git a/src/views/discover/PersonCardListView.vue b/src/views/discover/PersonCardListView.vue
index ddf14c0e..704702f9 100644
--- a/src/views/discover/PersonCardListView.vue
+++ b/src/views/discover/PersonCardListView.vue
@@ -63,7 +63,7 @@ async function fetchData({ done }: { done: any }) {
         isRefreshed.value = true
         if (currData.value.length === 0) {
           // 如果没有数据，跳出
-          done('error')
+          done('empty')
         } else {
           // 合并数据
           dataList.value = [...dataList.value, ...currData.value]
@@ -88,7 +88,7 @@ async function fetchData({ done }: { done: any }) {
       isRefreshed.value = true
       if (currData.value.length === 0) {
         // 如果没有数据，跳出
-        done('error')
+        done('empty')
       } else {
         // 合并数据
         dataList.value = [...dataList.value, ...currData.value]
@@ -122,6 +122,7 @@ async function fetchData({ done }: { done: any }) {
     @load="fetchData"
   >
     <template #loading />
+    <template #empty />
     <div
       v-if="dataList.length > 0 && props.type === 'tmdb'"
       class="grid gap-4 grid-media-card mx-3"
diff --git a/src/views/system/MessageView.vue b/src/views/system/MessageView.vue
index f7a0c29c..79dacb6d 100644
--- a/src/views/system/MessageView.vue
+++ b/src/views/system/MessageView.vue
@@ -82,7 +82,7 @@ async function loadMessages({ done }: { done: any }) {
     }
     else {
       // 没有新数据
-      done('error')
+      done('empty')
     }
     // 取消加载中
     loading.value = false
@@ -111,15 +111,19 @@ onBeforeUnmount(() => {
 
 <template>
   <VInfiniteScroll
-    mode="intersect"
+    :mode="!isLoaded ? 'intersect' : 'manual'"
     side="start"
     :items="messages"
     class="overflow-hidden"
     @load="loadMessages"
+    load-more-text="加载更多 ..."
   >
     <template #loading>
       <LoadingBanner />
     </template>
+    <template #empty>
+      没有更多数据
+    </template>
     <div>
       <VRow
         v-for="(msg, index) in messages"

From e85c2870e20fbaa15afa16cc5664044cd2800c69 Mon Sep 17 00:00:00 2001
From: jxxghp <jxxghp@gmail.com>
Date: Fri, 19 Apr 2024 17:08:41 +0800
Subject: [PATCH 21/36] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20SubscribeHistoryDial?=
 =?UTF-8?q?og.vue?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/dialog/SubscribeHistoryDialog.vue | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/components/dialog/SubscribeHistoryDialog.vue b/src/components/dialog/SubscribeHistoryDialog.vue
index fe1f2e60..03a7b3a9 100644
--- a/src/components/dialog/SubscribeHistoryDialog.vue
+++ b/src/components/dialog/SubscribeHistoryDialog.vue
@@ -156,9 +156,7 @@ const dropdownItems = ref([
           <template #loading>
             <LoadingBanner />
           </template>
-          <template #empty>
-            没有更多数据
-          </template>
+          <template #empty />
           <template v-for="(item, i) in historyList" :key="i">
             <VListItem>
               <template #prepend>

From 7b38d2d74f951e243c7d44ad151dc77cbe7a9f89 Mon Sep 17 00:00:00 2001
From: jxxghp <jxxghp@gmail.com>
Date: Fri, 19 Apr 2024 19:51:14 +0800
Subject: [PATCH 22/36] fix #105

---
 src/components/cards/BackdropCard.vue   | 2 +-
 src/components/cards/LibraryCard.vue    | 4 ++--
 src/components/cards/MediaCard.vue      | 2 +-
 src/components/cards/PluginAppCard.vue  | 2 +-
 src/components/cards/PluginCard.vue     | 2 +-
 src/components/cards/PosterCard.vue     | 2 +-
 src/components/cards/SiteCard.vue       | 8 +++++++-
 src/views/plugin/PluginCardListView.vue | 2 +-
 8 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/components/cards/BackdropCard.vue b/src/components/cards/BackdropCard.vue
index c266e2e5..29597aeb 100644
--- a/src/components/cards/BackdropCard.vue
+++ b/src/components/cards/BackdropCard.vue
@@ -25,7 +25,7 @@ function goPlay() {
 // 计算图片地址
 const getImgUrl = computed(() => {
   const image = props.media?.image || ''
-  return `${import.meta.env.VITE_API_BASE_URL}system/img/0/${encodeURIComponent(image).replace(/%2F/g, '/')}`
+  return `${import.meta.env.VITE_API_BASE_URL}system/img/0?imgurl=${encodeURIComponent(image)}`
 })
 </script>
 
diff --git a/src/components/cards/LibraryCard.vue b/src/components/cards/LibraryCard.vue
index 43ee7d98..f7c8d5b4 100644
--- a/src/components/cards/LibraryCard.vue
+++ b/src/components/cards/LibraryCard.vue
@@ -56,7 +56,7 @@ function getImgUrl(url: string) {
   if (!url)
     return getDefaultImage()
   else
-    return `${import.meta.env.VITE_API_BASE_URL}system/img/0/${encodeURIComponent(url).replace(/%2F/g, '/')}`
+    return `${import.meta.env.VITE_API_BASE_URL}system/img/0?imgurl=${encodeURIComponent(url)}`
 }
 
 // 根据多张图片生成媒体库封面
@@ -68,7 +68,7 @@ async function drawImages(imageList: string[]) {
 
   // 为所有图片添加system/img前缀
   for (let i = 0; i < IMAGES.length; i++)
-    IMAGES[i] = `${import.meta.env.VITE_API_BASE_URL}system/img/0/${encodeURIComponent(IMAGES[i]).replace(/%2F/g, '/')}`
+    IMAGES[i] = `${import.meta.env.VITE_API_BASE_URL}system/img/0?imgurl=${encodeURIComponent(IMAGES[i])}`
 
   // canvas
   const canvas = canvasRef.value
diff --git a/src/components/cards/MediaCard.vue b/src/components/cards/MediaCard.vue
index aaaeb441..fd56e5f3 100644
--- a/src/components/cards/MediaCard.vue
+++ b/src/components/cards/MediaCard.vue
@@ -400,7 +400,7 @@ const getImgUrl: Ref<string> = computed(() => {
   const url = props.media?.poster_path?.replace('original', 'w500') ?? noImage
   // 如果地址中包含douban则使用中转代理
   if (url.includes('doubanio.com'))
-    return `${import.meta.env.VITE_API_BASE_URL}douban/img/${encodeURIComponent(url)}`
+    return `${import.meta.env.VITE_API_BASE_URL}douban/img?imgurl=${encodeURIComponent(url)}`
 
   return url
 })
diff --git a/src/components/cards/PluginAppCard.vue b/src/components/cards/PluginAppCard.vue
index 1d41df01..8ba6115d 100644
--- a/src/components/cards/PluginAppCard.vue
+++ b/src/components/cards/PluginAppCard.vue
@@ -91,7 +91,7 @@ const iconPath: Ref<string> = computed(() => {
     return noImage
   // 如果是网络图片则使用代理后返回
   if (props.plugin?.plugin_icon?.startsWith('http'))
-    return `${import.meta.env.VITE_API_BASE_URL}system/img/1/${encodeURIComponent(props.plugin?.plugin_icon).replace(/%2F/g, '/')}`
+    return `${import.meta.env.VITE_API_BASE_URL}system/img/1?imgurl=${encodeURIComponent(props.plugin?.plugin_icon)}`
 
   return `./plugin_icon/${props.plugin?.plugin_icon}`
 })
diff --git a/src/components/cards/PluginCard.vue b/src/components/cards/PluginCard.vue
index 51ab7438..90e90094 100644
--- a/src/components/cards/PluginCard.vue
+++ b/src/components/cards/PluginCard.vue
@@ -223,7 +223,7 @@ const iconPath: Ref<string> = computed(() => {
     return noImage
   // 如果是网络图片则使用代理后返回
   if (props.plugin?.plugin_icon?.startsWith('http'))
-    return `${import.meta.env.VITE_API_BASE_URL}system/img/1/${encodeURIComponent(props.plugin?.plugin_icon).replace(/%2F/g, '/')}`
+    return `${import.meta.env.VITE_API_BASE_URL}system/img/1?imgurl=${encodeURIComponent(props.plugin?.plugin_icon)}`
 
   return `./plugin_icon/${props.plugin?.plugin_icon}`
 })
diff --git a/src/components/cards/PosterCard.vue b/src/components/cards/PosterCard.vue
index 8522dd79..d8ff6241 100644
--- a/src/components/cards/PosterCard.vue
+++ b/src/components/cards/PosterCard.vue
@@ -31,7 +31,7 @@ const getImgUrl = computed(() => {
   if (imageLoadError.value)
     return noImage
   const image = props.media?.image || ''
-  return `${import.meta.env.VITE_API_BASE_URL}system/img/0/${encodeURIComponent(image).replace(/%2F/g, '/')}`
+  return `${import.meta.env.VITE_API_BASE_URL}system/img/0?imgurl=${encodeURIComponent(image)}`
 })
 
 // 跳转播放
diff --git a/src/components/cards/SiteCard.vue b/src/components/cards/SiteCard.vue
index 1e258f3d..c57ffeda 100644
--- a/src/components/cards/SiteCard.vue
+++ b/src/components/cards/SiteCard.vue
@@ -166,13 +166,19 @@ const statColor = computed(() => {
   }
   else if (siteStats.value?.lst_state == 0){
     if (!siteStats.value?.seconds)
-      return 'success'
+      return 'secondary'
      if (siteStats.value?.seconds >= 5)
       return 'warning'
     return 'success'
   }
 })
 
+// 监听resourceDialog，如果为false则重新查询站点使用统计
+watch(resourceDialog, (value) => {
+  if (!value)
+    getSiteStats()
+})
+
 // 装载时查询站点图标
 onMounted(() => {
   getSiteIcon()
diff --git a/src/views/plugin/PluginCardListView.vue b/src/views/plugin/PluginCardListView.vue
index 30963468..0a92f506 100644
--- a/src/views/plugin/PluginCardListView.vue
+++ b/src/views/plugin/PluginCardListView.vue
@@ -117,7 +117,7 @@ function pluginIcon(item: Plugin) {
     return noImage
   // 如果是网络图片则使用代理后返回
   if (item?.plugin_icon?.startsWith('http'))
-    return `${import.meta.env.VITE_API_BASE_URL}system/img/1/${encodeURIComponent(item?.plugin_icon).replace(/%2F/g, '/')}`
+    return `${import.meta.env.VITE_API_BASE_URL}system/img/1?imgurl=${encodeURIComponent(item?.plugin_icon)}`
 
   return `./plugin_icon/${item?.plugin_icon}`
 }

From 890920775aa25a60b80cbe8b34f17c4d775c30cd Mon Sep 17 00:00:00 2001
From: falling <zyz635857938@gmail.com>
Date: Fri, 19 Apr 2024 21:57:37 +0800
Subject: [PATCH 23/36] =?UTF-8?q?fix=20=E5=AE=89=E5=8D=93=E6=89=8B?=
 =?UTF-8?q?=E6=9C=BA=E7=AB=AFhover=E4=BA=8B=E4=BB=B6=E8=A2=ABVCard?=
 =?UTF-8?q?=E7=9A=84click=E4=BA=8B=E4=BB=B6=E8=A6=86=E7=9B=96=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/cards/MediaCard.vue | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/components/cards/MediaCard.vue b/src/components/cards/MediaCard.vue
index fd56e5f3..5bfdb879 100644
--- a/src/components/cards/MediaCard.vue
+++ b/src/components/cards/MediaCard.vue
@@ -364,14 +364,16 @@ function getExistText(season: number) {
 }
 
 // 打开详情页
-function goMediaDetail() {
-  router.push({
-    path: '/media',
-    query: {
-      mediaid: getMediaId(),
-      type: props.media?.type,
-    },
-  })
+function goMediaDetail(isHovering = false) {
+  if (isHovering) {
+    router.push({
+      path: '/media',
+      query: {
+        mediaid: getMediaId(),
+        type: props.media?.type,
+      },
+    })
+  }
 }
 
 // 开始搜索
@@ -440,7 +442,7 @@ function getYear(airDate: string) {
           'transition transform-cpu duration-300 scale-105 shadow-lg': hover.isHovering,
           'ring-1': isImageLoaded,
         }"
-        @click.stop="goMediaDetail"
+        @click.stop="goMediaDetail(hover.isHovering)"
       >
         <VImg
           aspect-ratio="2/3"

From 9f9091b23e4264e5a7616d39835b918583c8de4a Mon Sep 17 00:00:00 2001
From: jxxghp <jxxghp@gmail.com>
Date: Fri, 19 Apr 2024 22:45:42 +0800
Subject: [PATCH 24/36] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20package.json?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 4d0456e7..8348b97b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "moviepilot",
-  "version": "1.8.2",
+  "version": "1.8.2-1",
   "private": true,
   "bin": "dist/service.js",
   "scripts": {

From 555a00b73108dcdec759d4520539d10b250202a0 Mon Sep 17 00:00:00 2001
From: jxxghp <jxxghp@gmail.com>
Date: Fri, 19 Apr 2024 23:08:41 +0800
Subject: [PATCH 25/36] fix postercard

---
 src/components/cards/PosterCard.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/cards/PosterCard.vue b/src/components/cards/PosterCard.vue
index d8ff6241..f1206386 100644
--- a/src/components/cards/PosterCard.vue
+++ b/src/components/cards/PosterCard.vue
@@ -35,8 +35,8 @@ const getImgUrl = computed(() => {
 })
 
 // 跳转播放
-function goPlay() {
-  if (props.media?.link)
+function goPlay(isHovering = false) {
+  if (props.media?.link && isHovering)
     window.open(props.media?.link, '_blank')
 }
 </script>
@@ -53,7 +53,7 @@ function goPlay() {
           'transition transform-cpu duration-300 scale-105 shadow-lg': hover.isHovering,
           'ring-1': isImageLoaded,
         }"
-        @click.stop="goPlay"
+        @click.stop="goPlay(hover.isHovering)"
       >
         <VImg
           aspect-ratio="2/3"

From 3d551ac45bb865c4aebbd07937f8677afe14c542 Mon Sep 17 00:00:00 2001
From: thsrite <thsrite@gmail.com>
Date: Sat, 20 Apr 2024 18:48:02 +0800
Subject: [PATCH 26/36] =?UTF-8?q?fix=20=E8=AE=A2=E9=98=85=E6=97=B6?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E8=A7=84=E5=88=99=E7=A7=BB=E5=88=B0=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E8=AE=A2=E9=98=85=E8=A7=84=E5=88=99=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/dialog/SubscribeEditDialog.vue | 13 +++++-
 src/views/discover/MediaDetailView.vue        | 42 ++++++++++---------
 src/views/setting/AccountSettingSubscribe.vue | 10 +----
 3 files changed, 35 insertions(+), 30 deletions(-)

diff --git a/src/components/dialog/SubscribeEditDialog.vue b/src/components/dialog/SubscribeEditDialog.vue
index d0708c16..d6b6ad18 100644
--- a/src/components/dialog/SubscribeEditDialog.vue
+++ b/src/components/dialog/SubscribeEditDialog.vue
@@ -43,7 +43,8 @@ const subscribeForm = ref<Subscribe>({
   username: '',
   current_priority: 0,
   save_path: '',
-  date: ''
+  date: '',
+  show_edit_dialog: false
 })
 
 // 提示框
@@ -413,6 +414,16 @@ onMounted(() => {
                 hint="开启后将使用 ImdbID 搜索资源，搜索结果更精确，但不是所有站点都支持"
               />
             </VCol>
+            <VCol
+              cols="12"
+              md="4"
+            >
+              <VSwitch
+                v-model="subscribeForm.show_edit_dialog"
+                label="订阅时编辑更多规则"
+                hint="开启后将在添加订阅后弹出编辑订阅的对话框，方便用户编辑订阅规则"
+              />
+            </VCol>
           </VRow>
         </VForm>
       </VCardText>
diff --git a/src/views/discover/MediaDetailView.vue b/src/views/discover/MediaDetailView.vue
index 0d0c013b..9191e529 100644
--- a/src/views/discover/MediaDetailView.vue
+++ b/src/views/discover/MediaDetailView.vue
@@ -46,10 +46,8 @@ const seasonsSubscribed = ref<{ [key: number]: boolean }>({})
 // 订阅编号
 const subscribeId = ref<number>()
 
-// 订阅规则
-const subscribeRules = ref({
-  show_edit_dialog: false,
-})
+// 是否显示编辑订阅弹窗
+const showEditDialog = ref(false)
 
 // 获得mediaid
 function getMediaId() {
@@ -230,7 +228,7 @@ async function addSubscribe(season = 0) {
     )
 
     // 显示编辑弹窗
-    if (result.success && subscribeRules.value.show_edit_dialog) {
+    if (result.success && showEditDialog.value) {
       subscribeId.value = result.data.id
       subscribeEditDialog.value = true
     }
@@ -290,20 +288,6 @@ async function removeSubscribe(season: number) {
   doneNProgress()
 }
 
-// 查询订阅弹窗规则
-async function querySubscribeRules() {
-  try {
-    const result: { [key: string]: any } = await api.get(
-      'system/setting/DefaultFilterRules',
-    )
-    if (result.data?.value)
-      subscribeRules.value = result.data?.value
-  }
-  catch (error) {
-    console.log(error)
-  }
-}
-
 // 订阅按钮响应
 function handleSubscribe(season = 0) {
   if (isSubscribed.value)
@@ -450,9 +434,27 @@ async function handlePlay() {
   }
 }
 
+async function queryDefaultSubscribeConfig() {
+  try {
+    let subscribe_config_url = ''
+    if (mediaProps.type === '电影')
+      subscribe_config_url = 'system/setting/DefaultMovieSubscribeConfig'
+    else
+      subscribe_config_url = 'system/setting/DefaultTvSubscribeConfig'
+
+    const result: { [key: string]: any } = await api.get(subscribe_config_url)
+
+    if (result.data.value && result.data.value.show_edit_dialog)
+      showEditDialog.value = true
+  }
+  catch (error) {
+    console.log(error)
+  }
+}
+
 onBeforeMount(() => {
   getMediaDetail()
-  querySubscribeRules()
+  queryDefaultSubscribeConfig()
 })
 </script>
 
diff --git a/src/views/setting/AccountSettingSubscribe.vue b/src/views/setting/AccountSettingSubscribe.vue
index f242ed33..1dca788e 100644
--- a/src/views/setting/AccountSettingSubscribe.vue
+++ b/src/views/setting/AccountSettingSubscribe.vue
@@ -41,8 +41,7 @@ const defaultFilterRules = ref({
   exclude: '',
   movie_size: '',
   tv_size: '',
-  min_seeders: 0,
-  show_edit_dialog: false,
+  min_seeders: 0
 })
 
 // 订阅模式选择项
@@ -622,13 +621,6 @@ onMounted(() => {
                   hint="小于该值的资源将被过滤掉，0表示不过滤"
                 />
               </VCol>
-              <VCol cols="12" md="6">
-                <VSwitch
-                  v-model="defaultFilterRules.show_edit_dialog"
-                  label="订阅时编辑更多规则"
-                  hint="开启后，添加订阅时将自动弹出订阅编辑框，要设置更多订阅选项"
-                />
-              </VCol>
             </VRow>
           </VForm>
         </VCardText>

From 7727b0f1c3fc76f2993ddd59b5de6a61be4bf141 Mon Sep 17 00:00:00 2001
From: thsrite <thsrite@gmail.com>
Date: Sat, 20 Apr 2024 19:11:44 +0800
Subject: [PATCH 27/36] fix

---
 src/components/cards/MediaCard.vue | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/components/cards/MediaCard.vue b/src/components/cards/MediaCard.vue
index 5bfdb879..37e8f295 100644
--- a/src/components/cards/MediaCard.vue
+++ b/src/components/cards/MediaCard.vue
@@ -157,7 +157,7 @@ async function addSubscribe(season = 0) {
 
     // 弹出订阅编辑弹窗
     if (result.success && seasonsSelected.value.length <= 1) {
-      const show_edit_dialog = await querySubscribeRules()
+      const show_edit_dialog = await queryDefaultSubscribeConfig()
       if (show_edit_dialog) {
         subscribeId.value = result.data.id
         subscribeEditDialog.value = true
@@ -313,11 +313,16 @@ async function getMediaSeasons() {
 }
 
 // 查询订阅弹窗规则
-async function querySubscribeRules() {
+async function queryDefaultSubscribeConfig() {
   try {
-    const result: { [key: string]: any } = await api.get(
-      'system/setting/DefaultFilterRules',
-    )
+    let subscribe_config_url = ''
+    if (props.media?.type === '电影')
+      subscribe_config_url = 'system/setting/DefaultMovieSubscribeConfig'
+    else
+      subscribe_config_url = 'system/setting/DefaultTvSubscribeConfig'
+
+    const result: { [key: string]: any } = await api.get(subscribe_config_url)
+
     if (result.data?.value)
       return result.data.value.show_edit_dialog
   }

From c5b5c15f996103abb3e9644f9615a15817226cc1 Mon Sep 17 00:00:00 2001
From: thsrite <thsrite@gmail.com>
Date: Sat, 20 Apr 2024 19:18:16 +0800
Subject: [PATCH 28/36] fix

---
 src/components/dialog/SubscribeEditDialog.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/dialog/SubscribeEditDialog.vue b/src/components/dialog/SubscribeEditDialog.vue
index d6b6ad18..db089076 100644
--- a/src/components/dialog/SubscribeEditDialog.vue
+++ b/src/components/dialog/SubscribeEditDialog.vue
@@ -414,7 +414,7 @@ onMounted(() => {
                 hint="开启后将使用 ImdbID 搜索资源，搜索结果更精确，但不是所有站点都支持"
               />
             </VCol>
-            <VCol
+            <VCol v-if="props.default"
               cols="12"
               md="4"
             >

From c6549860428e830fc52eef6c26f63f8d3033dc84 Mon Sep 17 00:00:00 2001
From: thsrite <thsrite@gmail.com>
Date: Sat, 20 Apr 2024 19:22:55 +0800
Subject: [PATCH 29/36] fix

---
 src/views/discover/MediaDetailView.vue | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/views/discover/MediaDetailView.vue b/src/views/discover/MediaDetailView.vue
index 9191e529..d817a011 100644
--- a/src/views/discover/MediaDetailView.vue
+++ b/src/views/discover/MediaDetailView.vue
@@ -46,9 +46,6 @@ const seasonsSubscribed = ref<{ [key: number]: boolean }>({})
 // 订阅编号
 const subscribeId = ref<number>()
 
-// 是否显示编辑订阅弹窗
-const showEditDialog = ref(false)
-
 // 获得mediaid
 function getMediaId() {
   return mediaDetail.value?.tmdb_id
@@ -228,9 +225,12 @@ async function addSubscribe(season = 0) {
     )
 
     // 显示编辑弹窗
-    if (result.success && showEditDialog.value) {
-      subscribeId.value = result.data.id
-      subscribeEditDialog.value = true
+    if (result.success) {
+      const show_edit_dialog = await queryDefaultSubscribeConfig()
+      if (show_edit_dialog) {
+        subscribeId.value = result.data.id
+        subscribeEditDialog.value = true
+      }
     }
   }
   catch (error) {
@@ -444,17 +444,17 @@ async function queryDefaultSubscribeConfig() {
 
     const result: { [key: string]: any } = await api.get(subscribe_config_url)
 
-    if (result.data.value && result.data.value.show_edit_dialog)
-      showEditDialog.value = true
+    if (result.data?.value)
+      return result.data.value.show_edit_dialog
   }
   catch (error) {
     console.log(error)
   }
+  return false
 }
 
 onBeforeMount(() => {
   getMediaDetail()
-  queryDefaultSubscribeConfig()
 })
 </script>
 

From d5411489c01ae739d0bb55a4fb6800031c3adcc5 Mon Sep 17 00:00:00 2001
From: jxxghp <jxxghp@gmail.com>
Date: Mon, 22 Apr 2024 10:02:57 +0800
Subject: [PATCH 30/36] fix ui

---
 src/views/subscribe/FullCalendarView.vue | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/views/subscribe/FullCalendarView.vue b/src/views/subscribe/FullCalendarView.vue
index 56c19959..b78a47e5 100644
--- a/src/views/subscribe/FullCalendarView.vue
+++ b/src/views/subscribe/FullCalendarView.vue
@@ -155,7 +155,7 @@ onMounted(() => {
         </VCard>
       </div>
       <div class="md:hidden">
-        <VTooltip :text="`${arg.event.title} ${arg.event.extendedProps.subtitle}`">
+        <VTooltip :text="`${arg.event.title} 第 ${arg.event.extendedProps.subtitle} 集`">
           <template #activator="{ props }">
             <VImg
               height="60"
@@ -384,8 +384,8 @@ onMounted(() => {
 }
 
 .v-application .fc .fc-daygrid-day-number {
-  padding-block: 0rem;
-  padding-inline: 0rem;
+  padding-block: 0;
+  padding-inline: 0;
 }
 
 .v-application .fc .fc-list-event-dot {
@@ -435,7 +435,7 @@ onMounted(() => {
   margin-inline-end: 0.25rem;
 }
 
-@media (max-width: 1264px) {
+@media (width <= 1264px) {
   .v-application .fc .fc-toolbar-chunk .fc-button-group .fc-drawerToggler-button {
     display: block !important;
   }
@@ -481,10 +481,10 @@ onMounted(() => {
 }
 
 .v-application .fc .fc-button-primary {
-  background-color: transparent;
   border: none;
-  outline: none;
+  background-color: transparent;
   color: var(--v-theme-on-surface);
+  outline: none;
 }
 
 .v-application .fc .fc-button-primary:hover {
@@ -492,7 +492,7 @@ onMounted(() => {
   color: rgb(var(--v-theme-primary));
 }
 
-@media (max-width: 776px) {
+@media (width <= 776px) {
   .fc-daygrid-event-harness {
     display: flex;
     align-items: center;

From ce642aceed92d23dc2fc1011cab37a426e0d73d0 Mon Sep 17 00:00:00 2001
From: jxxghp <jxxghp@gmail.com>
Date: Mon, 22 Apr 2024 10:04:23 +0800
Subject: [PATCH 31/36] release v2

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 8348b97b..2e0157c3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "moviepilot",
-  "version": "1.8.2-1",
+  "version": "1.8.2-2",
   "private": true,
   "bin": "dist/service.js",
   "scripts": {

From f197ed79727a6939fffae02c056a38bac2ee68bf Mon Sep 17 00:00:00 2001
From: Allen <hotlcc@qq.com>
Date: Tue, 23 Apr 2024 09:52:11 +0800
Subject: [PATCH 32/36] =?UTF-8?q?=E4=BC=98=E5=8C=96dashboard=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue             | 10 +++++++++-
 src/pages/dashboard.vue |  8 +++-----
 src/pages/login.vue     | 12 ++++++++++--
 3 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 8311232f..762f79b6 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -53,11 +53,19 @@ async function loadDashboardConfig() {
     }
 }
 
+// 尝试加载用户监控面板配置（本地无配置时才加载）
+async function tryLoadDashboardConfig() {
+  if (localStorage.getItem("MP_DASHBOARD")) {
+    return
+  }
+  await loadDashboardConfig()
+}
+
 // 页面加载时，加载当前用户数据
 onBeforeMount(async () => {
   setTheme()
   startSSEMessager()
-  await loadDashboardConfig()
+  await tryLoadDashboardConfig()
 })
 </script>
 
diff --git a/src/pages/dashboard.vue b/src/pages/dashboard.vue
index b1e1ad5d..fcb3ae98 100644
--- a/src/pages/dashboard.vue
+++ b/src/pages/dashboard.vue
@@ -50,15 +50,13 @@ if (Object.keys(config.value).length === 0) {
 // 设置项目
 function setDashboardConfig() {
   const data = JSON.stringify(config.value)
+  localStorage.setItem('MP_DASHBOARD', data)
+  dialog.value = false
+  // 保存到服务端
   api.post('/user/config/Dashboard', data, {
     headers: {
       "Content-Type": "application/json"
     }
-  }).then((response: any) => {
-    if (response && response.success) {
-      localStorage.setItem('MP_DASHBOARD', data)
-      dialog.value = false
-    }
   })
 }
 </script>
diff --git a/src/pages/login.vue b/src/pages/login.vue
index 6f93f357..aa1f261b 100644
--- a/src/pages/login.vue
+++ b/src/pages/login.vue
@@ -77,9 +77,17 @@ async function loadDashboardConfig() {
   }
 }
 
-async function afterLogin() {
-  // 加载用户监控面板配置
+// 尝试加载用户监控面板配置（本地无配置时才加载）
+async function tryLoadDashboardConfig() {
+  if (localStorage.getItem("MP_DASHBOARD")) {
+    return
+  }
   await loadDashboardConfig()
+}
+
+async function afterLogin() {
+  // 尝试加载用户监控面板配置（本地无配置时才加载）
+  await tryLoadDashboardConfig()
   // 跳转到首页或回原始页面
   router.push(store.state.auth.originalPath ?? '/')
 }

From 8e6d3cf30eeea5b2291df863e5a2bcec9f2a45d5 Mon Sep 17 00:00:00 2001
From: jxxghp <jxxghp@gmail.com>
Date: Tue, 23 Apr 2024 10:25:43 +0800
Subject: [PATCH 33/36] fix dashboard config

---
 src/pages/dashboard.vue | 8 +++++---
 src/pages/login.vue     | 3 ++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/pages/dashboard.vue b/src/pages/dashboard.vue
index fcb3ae98..2ea4760d 100644
--- a/src/pages/dashboard.vue
+++ b/src/pages/dashboard.vue
@@ -10,6 +10,7 @@ import MediaServerLatest from '@/views/dashboard/MediaServerLatest.vue'
 import MediaServerLibrary from '@/views/dashboard/MediaServerLibrary.vue'
 import MediaServerPlaying from '@/views/dashboard/MediaServerPlaying.vue'
 import api from '@/api'
+import { isNullOrEmptyObject } from '@/@core/utils'
 
 // 仪表盘配置
 const dashboard_names = {
@@ -41,23 +42,24 @@ const default_config = {
   playing: true,
   latest: true,
 }
+
+// 初始化默认值
 const config = ref(JSON.parse(localStorage.getItem('MP_DASHBOARD') || '{}'))
-if (Object.keys(config.value).length === 0) {
+if (isNullOrEmptyObject(config.value)) {
   config.value = default_config
-  localStorage.setItem('MP_DASHBOARD', JSON.stringify(config.value))
 }
 
 // 设置项目
 function setDashboardConfig() {
   const data = JSON.stringify(config.value)
   localStorage.setItem('MP_DASHBOARD', data)
-  dialog.value = false
   // 保存到服务端
   api.post('/user/config/Dashboard', data, {
     headers: {
       "Content-Type": "application/json"
     }
   })
+  dialog.value = false
 }
 </script>
 
diff --git a/src/pages/login.vue b/src/pages/login.vue
index aa1f261b..32fb40e7 100644
--- a/src/pages/login.vue
+++ b/src/pages/login.vue
@@ -128,7 +128,8 @@ function login() {
       store.dispatch('auth/updateSuperUser', superuser)
       store.dispatch('auth/updateUserName', username)
       store.dispatch('auth/updateAvatar', avatar)
-
+      
+      // 登录后处理
       afterLogin()
     })
     .catch((error: any) => {

From 72088dff2ebb947879fdd8a1d00204fee9755d94 Mon Sep 17 00:00:00 2001
From: jxxghp <jxxghp@gmail.com>
Date: Tue, 23 Apr 2024 17:48:35 +0800
Subject: [PATCH 34/36] release v1.8.3

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 2e0157c3..693bfdf1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "moviepilot",
-  "version": "1.8.2-2",
+  "version": "1.8.3",
   "private": true,
   "bin": "dist/service.js",
   "scripts": {

From e1524c26cdbcc585430fa59b7dde55c0f98b9e60 Mon Sep 17 00:00:00 2001
From: Allen <hotlcc@qq.com>
Date: Wed, 24 Apr 2024 10:06:32 +0800
Subject: [PATCH 35/36] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E4=BD=8E=E7=89=88=E6=9C=ACsafari=E6=B5=8F=E8=A7=88=E5=99=A8Dat?=
 =?UTF-8?q?e=E5=85=BC=E5=AE=B9=E6=80=A7=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/@core/utils/formatters.ts             |  3 ++-
 src/@core/utils/index.ts                  | 10 +++++++---
 src/components/cards/MediaCard.vue        |  4 ++--
 src/components/cards/SubscribeCard.vue    | 10 ++++------
 src/views/setting/AccountSettingAbout.vue |  4 ++--
 src/views/system/MessageView.vue          |  2 +-
 6 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/src/@core/utils/formatters.ts b/src/@core/utils/formatters.ts
index f7848206..ae696ba6 100644
--- a/src/@core/utils/formatters.ts
+++ b/src/@core/utils/formatters.ts
@@ -171,6 +171,7 @@ export function formatDateDifference(dateString: string): string {
   //   return `${minutesDifference}分钟前`
   // else
   //   return '刚刚'
-
+  if (!dateString)
+    return ''
   return dayjs(dateString).fromNow()
 }
diff --git a/src/@core/utils/index.ts b/src/@core/utils/index.ts
index e74b1717..2c97f674 100644
--- a/src/@core/utils/index.ts
+++ b/src/@core/utils/index.ts
@@ -33,12 +33,16 @@ export function isToday(date: Date) {
   )
 }
 
-// 计算时间差，返回xx天/xx小时/xx分钟/xx秒
+/**
+ * 计算时间差，返回xx天/xx小时/xx分钟/xx秒
+ *
+ * @deprecated 建议使用：@core/utils/formatters.ts formatDateDifference
+ */
 export function calculateTimeDifference(inputTime: string): string {
   if (!inputTime)
     return ''
 
-  const inputDate = new Date(inputTime)
+  const inputDate = new Date(inputTime.replaceAll(/-/g, '/'))
   const currentDate = new Date()
 
   const timeDifference = currentDate.getTime() - inputDate.getTime()
@@ -70,7 +74,7 @@ export function calculateTimeDiff(inputTime: string): string {
     return ''
 
   // 使用当前时区
-  const inputDate = new Date(inputTime)
+  const inputDate = new Date(inputTime.replaceAll(/-/g, '/'))
   const currentDate = new Date()
 
   const timeDifference = currentDate.getTime() - inputDate.getTime()
diff --git a/src/components/cards/MediaCard.vue b/src/components/cards/MediaCard.vue
index 37e8f295..663eefdc 100644
--- a/src/components/cards/MediaCard.vue
+++ b/src/components/cards/MediaCard.vue
@@ -423,14 +423,14 @@ function getSeasonPoster(posterPath: string) {
 function formatAirDate(airDate: string) {
   if (!airDate)
     return ''
-  const date = new Date(airDate)
+  const date = new Date(airDate.replaceAll(/-/g, '/'))
   return `${date.getFullYear()}年${date.getMonth() + 1}月${date.getDate()}日`
 }
 // 从yyyy-mm-dd中提取年份
 function getYear(airDate: string) {
   if (!airDate)
     return ''
-  const date = new Date(airDate)
+  const date = new Date(airDate.replaceAll(/-/g, '/'))
   return date.getFullYear()
 }
 </script>
diff --git a/src/components/cards/SubscribeCard.vue b/src/components/cards/SubscribeCard.vue
index 9c6932a1..e37e345c 100644
--- a/src/components/cards/SubscribeCard.vue
+++ b/src/components/cards/SubscribeCard.vue
@@ -1,7 +1,7 @@
 <script lang='ts' setup>
 import { useToast } from 'vue-toast-notification'
 import SubscribeEditDialog from '../dialog/SubscribeEditDialog.vue'
-import { calculateTimeDifference } from '@/@core/utils'
+import { formatDateDifference } from '@/@core/utils/formatters'
 import { formatSeason } from '@/@core/utils/formatters'
 import api from '@/api'
 import type { Subscribe } from '@/api/types'
@@ -26,11 +26,9 @@ const subscribeEditDialog = ref(false)
 
 // 上一次更新时间
 const lastUpdateText = ref(
-  `${
-    props.media?.last_update
-      ? `${calculateTimeDifference(props.media?.last_update || '')}前`
-      : ''
-  }`,
+    props.media && props.media.last_update
+    ? formatDateDifference(props.media.last_update)
+    : '',
 )
 
 // 图片加载完成响应
diff --git a/src/views/setting/AccountSettingAbout.vue b/src/views/setting/AccountSettingAbout.vue
index 63c309de..79e161f3 100644
--- a/src/views/setting/AccountSettingAbout.vue
+++ b/src/views/setting/AccountSettingAbout.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { calculateTimeDifference } from '@/@core/utils'
+import { formatDateDifference } from '@/@core/utils/formatters'
 import api from '@/api'
 
 // 系统环境变量
@@ -62,7 +62,7 @@ async function queryAllRelease() {
 // 计算发布时间
 function releaseTime(releaseDate: string) {
   // 上一次更新时间
-  return `${calculateTimeDifference(releaseDate)}前`
+  return formatDateDifference(releaseDate)
 }
 
 onMounted(() => {
diff --git a/src/views/system/MessageView.vue b/src/views/system/MessageView.vue
index 79dacb6d..17827534 100644
--- a/src/views/system/MessageView.vue
+++ b/src/views/system/MessageView.vue
@@ -100,7 +100,7 @@ function compareTime(time1: string, time2: string) {
     return -1
   if (!time2)
     return 1
-  return new Date(time1).getTime() - new Date(time2).getTime()
+  return new Date(time1.replaceAll(/-/g, '/')).getTime() - new Date(time2.replaceAll(/-/g, '/')).getTime()
 }
 
 onBeforeUnmount(() => {

From fa02a23e4c09b139d4a96a4bc8416977dbd1a09e Mon Sep 17 00:00:00 2001
From: jxxghp <jxxghp@gmail.com>
Date: Wed, 24 Apr 2024 10:19:02 +0800
Subject: [PATCH 36/36] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20package.json?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 693bfdf1..a436ed85 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "moviepilot",
-  "version": "1.8.3",
+  "version": "1.8.3-1",
   "private": true,
   "bin": "dist/service.js",
   "scripts": {