From b02c3c8e5c479c6f9b3cc104284dfe3eabc585e8 Mon Sep 17 00:00:00 2001
From: InfinityPacer <160988576+InfinityPacer@users.noreply.github.com>
Date: Fri, 25 Oct 2024 00:32:33 +0800
Subject: [PATCH 01/12] fix(dashboard): filter and load only enabled media
 servers

---
 src/views/dashboard/MediaServerLatest.vue  | 3 ++-
 src/views/dashboard/MediaServerLibrary.vue | 3 ++-
 src/views/dashboard/MediaServerPlaying.vue | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/views/dashboard/MediaServerLatest.vue b/src/views/dashboard/MediaServerLatest.vue
index c0d07e29..ac1df5e8 100644
--- a/src/views/dashboard/MediaServerLatest.vue
+++ b/src/views/dashboard/MediaServerLatest.vue
@@ -35,7 +35,8 @@ async function loadLatest(server: string) {
 
 onMounted(async () => {
   await loadMediaServerSetting()
-  for (const server of mediaServers.value) {
+  const enabledServers = mediaServers.value.filter(server => server.enabled)
+  for (const server of enabledServers) {
     loadLatest(server.name)
   }
 })
diff --git a/src/views/dashboard/MediaServerLibrary.vue b/src/views/dashboard/MediaServerLibrary.vue
index 5255ea95..768b7db1 100644
--- a/src/views/dashboard/MediaServerLibrary.vue
+++ b/src/views/dashboard/MediaServerLibrary.vue
@@ -35,7 +35,8 @@ async function loadLibrary(server: string) {
 
 onMounted(async () => {
   await loadMediaServerSetting()
-  for (const server of mediaServers.value) {
+  const enabledServers = mediaServers.value.filter(server => server.enabled)
+  for (const server of enabledServers) {
     loadLibrary(server.name)
   }
 })
diff --git a/src/views/dashboard/MediaServerPlaying.vue b/src/views/dashboard/MediaServerPlaying.vue
index c1f7ccc9..23426112 100644
--- a/src/views/dashboard/MediaServerPlaying.vue
+++ b/src/views/dashboard/MediaServerPlaying.vue
@@ -33,7 +33,8 @@ async function loadPlayingList(server: string) {
 
 onMounted(async () => {
   await loadMediaServerSetting()
-  for (const server of mediaServers.value) {
+  const enabledServers = mediaServers.value.filter(server => server.enabled)
+  for (const server of enabledServers) {
     loadPlayingList(server.name)
   }
 })

From 2d1d19e4578d811b05c34955cfdc16cbc7216ca9 Mon Sep 17 00:00:00 2001
From: machine <bo@eto.me>
Date: Fri, 25 Oct 2024 17:37:18 +0800
Subject: [PATCH 02/12] =?UTF-8?q?fix:=20=E6=97=A0=E6=B3=95=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E8=A7=84=E5=88=99=E5=88=86=E4=BA=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/@core/utils/navigator.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/@core/utils/navigator.ts b/src/@core/utils/navigator.ts
index e3f3782f..f60a0841 100644
--- a/src/@core/utils/navigator.ts
+++ b/src/@core/utils/navigator.ts
@@ -21,6 +21,8 @@ export async function copyToClipboard(content: string) {
     const input = document.createElement('textarea')
     input.value = content
     document.body.appendChild(input)
+    // 阻止事件冒泡到其他元素，确保 focusin 事件只在 textarea 元素上处理，不会影响其他元素
+    input.addEventListener('focusin', e => e.stopPropagation())
     input.select()
     document.execCommand('copy')
     document.body.removeChild(input)

From d120bb794c3d63ecc2927fa84e735947a2353584 Mon Sep 17 00:00:00 2001
From: InfinityPacer <160988576+InfinityPacer@users.noreply.github.com>
Date: Sat, 26 Oct 2024 00:06:37 +0800
Subject: [PATCH 03/12] fix(test): ensure rule group is specified before
 testing priority

---
 src/views/system/RuleTestView.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/system/RuleTestView.vue b/src/views/system/RuleTestView.vue
index 68ea4301..7bc5eaff 100644
--- a/src/views/system/RuleTestView.vue
+++ b/src/views/system/RuleTestView.vue
@@ -43,7 +43,7 @@ async function queryFilterRuleGroups() {
 
 // 调用API识别
 async function ruleTest() {
-  if (!ruleTestForm.title) return
+  if (!ruleTestForm.title || !ruleTestForm.rulegroup) return
 
   try {
     ruleTestLoading.value = true

From 005b1a971509b7ae33ac71243b11ee573530ada4 Mon Sep 17 00:00:00 2001
From: Attente <19653207+wikrin@users.noreply.github.com>
Date: Sat, 26 Oct 2024 07:16:57 +0800
Subject: [PATCH 04/12] =?UTF-8?q?fix:=20=E5=90=8C=E6=AD=A5=E5=90=8E?=
 =?UTF-8?q?=E7=AB=AF=E4=BF=AE=E6=AD=A3`msg`=20=3D>=20`message`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/reorganize/TransferHistoryView.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/reorganize/TransferHistoryView.vue b/src/views/reorganize/TransferHistoryView.vue
index cb75775e..fb261207 100644
--- a/src/views/reorganize/TransferHistoryView.vue
+++ b/src/views/reorganize/TransferHistoryView.vue
@@ -206,7 +206,7 @@ async function remove(item: TransferHistory, deleteSrc: boolean, deleteDest: boo
       data: item,
     })
 
-    if (!result.success) $toast.error(`删除失败: ${result.msg}`)
+    if (!result.success) $toast.error(`删除失败: ${result.message}`)
   } catch (error) {
     console.error(error)
   }

From 5f15e84065df0a587984e6bd9ffc9fc150274436 Mon Sep 17 00:00:00 2001
From: thsrite <thsrite@gmail.com>
Date: Mon, 28 Oct 2024 12:36:03 +0800
Subject: [PATCH 05/12] =?UTF-8?q?feat=20=E8=87=AA=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=E8=A7=84=E5=88=99=20&&=20=E4=BC=98=E5=85=88=E7=BA=A7=E8=A7=84?=
 =?UTF-8?q?=E5=88=99=E7=BB=84=20=E6=95=B4=E4=BD=93=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/setting/AccountSettingRule.vue | 109 ++++++++++++++++++++---
 1 file changed, 96 insertions(+), 13 deletions(-)

diff --git a/src/views/setting/AccountSettingRule.vue b/src/views/setting/AccountSettingRule.vue
index 118f124d..0a0bd7e3 100644
--- a/src/views/setting/AccountSettingRule.vue
+++ b/src/views/setting/AccountSettingRule.vue
@@ -1,15 +1,17 @@
 <!-- eslint-disable sonarjs/no-duplicate-string -->
 <script lang="ts" setup>
-import { useToast } from 'vue-toast-notification'
+import {useToast} from 'vue-toast-notification'
+import {copyToClipboard} from '@/@core/utils/navigator'
 import draggable from 'vuedraggable'
-import { VRow } from 'vuetify/lib/components/index.mjs'
+import {VRow} from 'vuetify/lib/components/index.mjs'
 import api from '@/api'
-import { CustomRule, FilterRuleGroup } from '@/api/types'
+import {CustomRule, FilterRuleGroup} from '@/api/types'
 import CustomerRuleCard from '@/components/cards/CustomRuleCard.vue'
 import FilterRuleGroupCard from '@/components/cards/FilterRuleGroupCard.vue'
+import ImportCodeDialog from '@/components/dialog/ImportCodeDialog.vue'
 
 // 自定义规则列表
-const customRules = ref<CustomRule[]>([])
+let customRules = ref<CustomRule[]>([])
 
 // 所有规则组列表
 const filterRuleGroups = ref<FilterRuleGroup[]>([])
@@ -20,15 +22,24 @@ const selectedTorrentPriority = ref<string>('seeder')
 // 二级分类策略
 const mediaCategories = ref<{ [key: string]: any }>({})
 
+// 导入代码弹窗
+const importCodeDialog = ref(false)
+
+// 导入的代码
+const importCodeString = ref('')
+
+// 导入代码类型
+const importCodeType = ref('')
+
 // 提示框
 const $toast = useToast()
 
 // 种子优先规则下拉框
 const TorrentPriorityItems = [
-  { title: '资源优先级', value: 'torrent' },
-  { title: '站点优先级', value: 'site' },
-  { title: '站点上传量', value: 'upload' },
-  { title: '资源做种数', value: 'seeder' },
+  {title: '资源优先级', value: 'torrent'},
+  {title: '站点优先级', value: 'site'},
+  {title: '站点上传量', value: 'upload'},
+  {title: '资源做种数', value: 'seeder'},
 ]
 
 // 调用API查询自动分类配置
@@ -110,6 +121,63 @@ function addFilterRuleGroup() {
   })
 }
 
+// 分享规则
+function shareRules(rules: CustomRule[] | FilterRuleGroup[]) {
+  if (!rules || rules.length === 0) return
+
+  // 将卡片规则接装为字符串
+  const value = JSON.stringify(rules)
+
+  console.log(rules)
+  // 复制到剪贴板
+  try {
+    copyToClipboard(value)
+    $toast.success('优先级规则已复制到剪贴板')
+  } catch (error) {
+    $toast.error('优先级规则复制失败！')
+  }
+}
+
+// 导入规则
+async function importRules(ruleType: string) {
+  importCodeType.value = ruleType
+  importCodeString.value = ''
+  importCodeDialog.value = true
+}
+
+// 监听导入代码变化
+watchEffect(() => {
+  if (!importCodeString.value) return
+  // 导入代码需要json格式
+  try {
+    if (importCodeType.value === 'custom') {
+      // 将导入的代码转换为规则卡片
+      customRules.value = JSON.parse(importCodeString.value).map((item: any) => {
+        return {
+          id: item.id,
+          name: item.name,
+          include: item.include,
+          exclude: item.exclude,
+          publish_time: item.publish_time,
+          seeders: item.seeders,
+        }
+      })
+    } else if (importCodeType.value === 'group') {
+      // 将导入的代码转换为规则卡片
+      filterRuleGroups.value = JSON.parse(importCodeString.value).map((item: any) => {
+        return {
+          name: item.name,
+          rule_string: item.rule_string,
+          media_type: item.media_type,
+          category: item.category,
+        }
+      })
+    }
+  } catch (error) {
+    $toast.error('规则导入失败！')
+  }
+})
+
 // 规则变化时赋值
 function onRuleChange(rule: CustomRule) {
   const index = customRules.value.findIndex(item => item.id === rule.id)
@@ -201,9 +269,15 @@ onMounted(() => {
           </draggable>
         </VCardText>
         <VCardText>
-          <VBtn type="submit" class="me-2" @click="saveCustomRules"> 保存 </VBtn>
+          <VBtn type="submit" class="me-2" @click="saveCustomRules"> 保存</VBtn>
           <VBtn color="success" variant="tonal" @click="addCustomRule">
-            <VIcon icon="mdi-plus" />
+            <VIcon icon="mdi-plus"/>
+          </VBtn>
+          <VBtn color="success" variant="tonal" @click="importRules('custom')">
+            <VIcon icon="mdi-import"/>
+          </VBtn>
+          <VBtn color="info" variant="tonal" @click="shareRules(customRules)">
+            <VIcon icon="mdi-share"/>
           </VBtn>
         </VCardText>
       </VCard>
@@ -235,11 +309,20 @@ onMounted(() => {
           </draggable>
         </VCardText>
         <VCardText>
-          <VBtn type="submit" class="me-2" @click="saveFilterRuleGroups"> 保存 </VBtn>
+          <VBtn type="submit" class="me-2" @click="saveFilterRuleGroups"> 保存</VBtn>
           <VBtn color="success" variant="tonal" @click="addFilterRuleGroup">
-            <VIcon icon="mdi-plus" />
+            <VIcon icon="mdi-plus"/>
+          </VBtn>
+          <VBtn color="success" variant="tonal" @click="importRules('group')">
+            <VIcon icon="mdi-import"/>
+          </VBtn>
+          <VBtn color="info" variant="tonal" @click="shareRules(filterRuleGroups)">
+            <VIcon icon="mdi-share"/>
           </VBtn>
         </VCardText>
+        <VDialog v-model="importCodeDialog" width="60rem" scrollable>
+          <ImportCodeDialog v-model="importCodeString" title="导入优先级规则" @close="importCodeDialog = false"/>
+        </VDialog>
       </VCard>
     </VCol>
     <VCol cols="12">
@@ -267,7 +350,7 @@ onMounted(() => {
           </VForm>
         </VCardText>
         <VCardText>
-          <VBtn type="submit" @click="saveTorrentPriority"> 保存 </VBtn>
+          <VBtn type="submit" @click="saveTorrentPriority"> 保存</VBtn>
         </VCardText>
       </VCard>
     </VCol>

From 2a9f9b725ee8ee408abfd3f7e9c20fb62ccf0cd2 Mon Sep 17 00:00:00 2001
From: thsrite <thsrite@gmail.com>
Date: Mon, 28 Oct 2024 12:47:15 +0800
Subject: [PATCH 06/12] fix log

---
 src/views/setting/AccountSettingRule.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/views/setting/AccountSettingRule.vue b/src/views/setting/AccountSettingRule.vue
index 0a0bd7e3..cff73b6c 100644
--- a/src/views/setting/AccountSettingRule.vue
+++ b/src/views/setting/AccountSettingRule.vue
@@ -128,7 +128,6 @@ function shareRules(rules: CustomRule[] | FilterRuleGroup[]) {
   // 将卡片规则接装为字符串
   const value = JSON.stringify(rules)
 
-  console.log(rules)
   // 复制到剪贴板
   try {
     copyToClipboard(value)

From 1b75bb2cec3e83fd2ac1ba419182560fd3158723 Mon Sep 17 00:00:00 2001
From: thsrite <thsrite@gmail.com>
Date: Mon, 28 Oct 2024 13:52:19 +0800
Subject: [PATCH 07/12] format

---
 src/views/setting/AccountSettingRule.vue | 34 ++++++++++++------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/views/setting/AccountSettingRule.vue b/src/views/setting/AccountSettingRule.vue
index cff73b6c..c8b872c7 100644
--- a/src/views/setting/AccountSettingRule.vue
+++ b/src/views/setting/AccountSettingRule.vue
@@ -1,11 +1,11 @@
 <!-- eslint-disable sonarjs/no-duplicate-string -->
 <script lang="ts" setup>
-import {useToast} from 'vue-toast-notification'
-import {copyToClipboard} from '@/@core/utils/navigator'
+import { useToast } from 'vue-toast-notification'
+import { copyToClipboard } from '@/@core/utils/navigator'
 import draggable from 'vuedraggable'
-import {VRow} from 'vuetify/lib/components/index.mjs'
+import { VRow } from 'vuetify/lib/components/index.mjs'
 import api from '@/api'
-import {CustomRule, FilterRuleGroup} from '@/api/types'
+import { CustomRule, FilterRuleGroup } from '@/api/types'
 import CustomerRuleCard from '@/components/cards/CustomRuleCard.vue'
 import FilterRuleGroupCard from '@/components/cards/FilterRuleGroupCard.vue'
 import ImportCodeDialog from '@/components/dialog/ImportCodeDialog.vue'
@@ -36,10 +36,10 @@ const $toast = useToast()
 
 // 种子优先规则下拉框
 const TorrentPriorityItems = [
-  {title: '资源优先级', value: 'torrent'},
-  {title: '站点优先级', value: 'site'},
-  {title: '站点上传量', value: 'upload'},
-  {title: '资源做种数', value: 'seeder'},
+  { title: '资源优先级', value: 'torrent' },
+  { title: '站点优先级', value: 'site' },
+  { title: '站点上传量', value: 'upload' },
+  { title: '资源做种数', value: 'seeder' },
 ]
 
 // 调用API查询自动分类配置
@@ -268,15 +268,15 @@ onMounted(() => {
           </draggable>
         </VCardText>
         <VCardText>
-          <VBtn type="submit" class="me-2" @click="saveCustomRules"> 保存</VBtn>
+          <VBtn type="submit" class="me-2" @click="saveCustomRules"> 保存 </VBtn>
           <VBtn color="success" variant="tonal" @click="addCustomRule">
-            <VIcon icon="mdi-plus"/>
+            <VIcon icon="mdi-plus" />
           </VBtn>
           <VBtn color="success" variant="tonal" @click="importRules('custom')">
-            <VIcon icon="mdi-import"/>
+            <VIcon icon="mdi-import" />
           </VBtn>
           <VBtn color="info" variant="tonal" @click="shareRules(customRules)">
-            <VIcon icon="mdi-share"/>
+            <VIcon icon="mdi-share" />
           </VBtn>
         </VCardText>
       </VCard>
@@ -308,15 +308,15 @@ onMounted(() => {
           </draggable>
         </VCardText>
         <VCardText>
-          <VBtn type="submit" class="me-2" @click="saveFilterRuleGroups"> 保存</VBtn>
+          <VBtn type="submit" class="me-2" @click="saveFilterRuleGroups"> 保存 </VBtn>
           <VBtn color="success" variant="tonal" @click="addFilterRuleGroup">
-            <VIcon icon="mdi-plus"/>
+            <VIcon icon="mdi-plus" />
           </VBtn>
           <VBtn color="success" variant="tonal" @click="importRules('group')">
-            <VIcon icon="mdi-import"/>
+            <VIcon icon="mdi-import" />
           </VBtn>
           <VBtn color="info" variant="tonal" @click="shareRules(filterRuleGroups)">
-            <VIcon icon="mdi-share"/>
+            <VIcon icon="mdi-share" />
           </VBtn>
         </VCardText>
         <VDialog v-model="importCodeDialog" width="60rem" scrollable>
@@ -349,7 +349,7 @@ onMounted(() => {
           </VForm>
         </VCardText>
         <VCardText>
-          <VBtn type="submit" @click="saveTorrentPriority"> 保存</VBtn>
+          <VBtn type="submit" @click="saveTorrentPriority"> 保存 </VBtn>
         </VCardText>
       </VCard>
     </VCol>

From becccb8368fb10f7bb873f5b36086da173dc8582 Mon Sep 17 00:00:00 2001
From: thsrite <thsrite@gmail.com>
Date: Mon, 28 Oct 2024 13:59:08 +0800
Subject: [PATCH 08/12] format

---
 src/views/setting/AccountSettingRule.vue | 36 ++++++++++++------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/views/setting/AccountSettingRule.vue b/src/views/setting/AccountSettingRule.vue
index cff73b6c..f3395488 100644
--- a/src/views/setting/AccountSettingRule.vue
+++ b/src/views/setting/AccountSettingRule.vue
@@ -1,17 +1,17 @@
 <!-- eslint-disable sonarjs/no-duplicate-string -->
 <script lang="ts" setup>
-import {useToast} from 'vue-toast-notification'
-import {copyToClipboard} from '@/@core/utils/navigator'
+import { useToast } from 'vue-toast-notification'
+import { copyToClipboard } from '@/@core/utils/navigator'
 import draggable from 'vuedraggable'
-import {VRow} from 'vuetify/lib/components/index.mjs'
+import { VRow } from 'vuetify/lib/components/index.mjs'
 import api from '@/api'
-import {CustomRule, FilterRuleGroup} from '@/api/types'
+import { CustomRule, FilterRuleGroup } from '@/api/types'
 import CustomerRuleCard from '@/components/cards/CustomRuleCard.vue'
 import FilterRuleGroupCard from '@/components/cards/FilterRuleGroupCard.vue'
 import ImportCodeDialog from '@/components/dialog/ImportCodeDialog.vue'
 
 // 自定义规则列表
-let customRules = ref<CustomRule[]>([])
+const customRules = ref<CustomRule[]>([])
 
 // 所有规则组列表
 const filterRuleGroups = ref<FilterRuleGroup[]>([])
@@ -36,10 +36,10 @@ const $toast = useToast()
 
 // 种子优先规则下拉框
 const TorrentPriorityItems = [
-  {title: '资源优先级', value: 'torrent'},
-  {title: '站点优先级', value: 'site'},
-  {title: '站点上传量', value: 'upload'},
-  {title: '资源做种数', value: 'seeder'},
+  { title: '资源优先级', value: 'torrent' },
+  { title: '站点优先级', value: 'site' },
+  { title: '站点上传量', value: 'upload' },
+  { title: '资源做种数', value: 'seeder' },
 ]
 
 // 调用API查询自动分类配置
@@ -268,15 +268,15 @@ onMounted(() => {
           </draggable>
         </VCardText>
         <VCardText>
-          <VBtn type="submit" class="me-2" @click="saveCustomRules"> 保存</VBtn>
+          <VBtn type="submit" class="me-2" @click="saveCustomRules"> 保存 </VBtn>
           <VBtn color="success" variant="tonal" @click="addCustomRule">
-            <VIcon icon="mdi-plus"/>
+            <VIcon icon="mdi-plus" />
           </VBtn>
           <VBtn color="success" variant="tonal" @click="importRules('custom')">
-            <VIcon icon="mdi-import"/>
+            <VIcon icon="mdi-import" />
           </VBtn>
           <VBtn color="info" variant="tonal" @click="shareRules(customRules)">
-            <VIcon icon="mdi-share"/>
+            <VIcon icon="mdi-share" />
           </VBtn>
         </VCardText>
       </VCard>
@@ -308,15 +308,15 @@ onMounted(() => {
           </draggable>
         </VCardText>
         <VCardText>
-          <VBtn type="submit" class="me-2" @click="saveFilterRuleGroups"> 保存</VBtn>
+          <VBtn type="submit" class="me-2" @click="saveFilterRuleGroups"> 保存 </VBtn>
           <VBtn color="success" variant="tonal" @click="addFilterRuleGroup">
-            <VIcon icon="mdi-plus"/>
+            <VIcon icon="mdi-plus" />
           </VBtn>
           <VBtn color="success" variant="tonal" @click="importRules('group')">
-            <VIcon icon="mdi-import"/>
+            <VIcon icon="mdi-import" />
           </VBtn>
           <VBtn color="info" variant="tonal" @click="shareRules(filterRuleGroups)">
-            <VIcon icon="mdi-share"/>
+            <VIcon icon="mdi-share" />
           </VBtn>
         </VCardText>
         <VDialog v-model="importCodeDialog" width="60rem" scrollable>
@@ -349,7 +349,7 @@ onMounted(() => {
           </VForm>
         </VCardText>
         <VCardText>
-          <VBtn type="submit" @click="saveTorrentPriority"> 保存</VBtn>
+          <VBtn type="submit" @click="saveTorrentPriority"> 保存 </VBtn>
         </VCardText>
       </VCard>
     </VCol>

From 86b4df871a4390ae4d9db14956604de1de796306 Mon Sep 17 00:00:00 2001
From: thsrite <thsrite@gmail.com>
Date: Tue, 29 Oct 2024 12:47:25 +0800
Subject: [PATCH 09/12] =?UTF-8?q?fix=20=E5=AF=BC=E5=85=A5=E8=87=AA?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89=E8=A7=84=E5=88=99=E6=97=B6=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E4=BD=93=E7=A7=AF=E6=9C=AA=E5=AF=BC=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/setting/AccountSettingRule.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/setting/AccountSettingRule.vue b/src/views/setting/AccountSettingRule.vue
index f3395488..e672bb86 100644
--- a/src/views/setting/AccountSettingRule.vue
+++ b/src/views/setting/AccountSettingRule.vue
@@ -159,6 +159,7 @@ watchEffect(() => {
           exclude: item.exclude,
           publish_time: item.publish_time,
           seeders: item.seeders,
+          size_range: item.size_range,
         }
       })
     } else if (importCodeType.value === 'group') {

From f4633a583259a6cbf2ca3b20dc44dc698a567452 Mon Sep 17 00:00:00 2001
From: jxxghp <jxxghp@gmail.com>
Date: Wed, 30 Oct 2024 07:07:04 +0800
Subject: [PATCH 10/12] Refactor button layout in AccountSettingRule.vue

---
 src/views/setting/AccountSettingRule.vue | 42 +++++++++++++-----------
 1 file changed, 23 insertions(+), 19 deletions(-)

diff --git a/src/views/setting/AccountSettingRule.vue b/src/views/setting/AccountSettingRule.vue
index e672bb86..5db32609 100644
--- a/src/views/setting/AccountSettingRule.vue
+++ b/src/views/setting/AccountSettingRule.vue
@@ -270,15 +270,17 @@ onMounted(() => {
         </VCardText>
         <VCardText>
           <VBtn type="submit" class="me-2" @click="saveCustomRules"> 保存 </VBtn>
-          <VBtn color="success" variant="tonal" @click="addCustomRule">
-            <VIcon icon="mdi-plus" />
-          </VBtn>
-          <VBtn color="success" variant="tonal" @click="importRules('custom')">
-            <VIcon icon="mdi-import" />
-          </VBtn>
-          <VBtn color="info" variant="tonal" @click="shareRules(customRules)">
-            <VIcon icon="mdi-share" />
-          </VBtn>
+          <VBtnGroup density="comfortable">
+            <VBtn color="success" variant="tonal" @click="addCustomRule">
+              <VIcon icon="mdi-plus" />
+            </VBtn>
+            <VBtn color="info" variant="tonal" @click="importRules('custom')">
+              <VIcon icon="mdi-import" />
+            </VBtn>
+            <VBtn color="info" variant="tonal" @click="shareRules(customRules)">
+              <VIcon icon="mdi-share" />
+            </VBtn>
+          </VBtnGroup>
         </VCardText>
       </VCard>
     </VCol>
@@ -310,18 +312,20 @@ onMounted(() => {
         </VCardText>
         <VCardText>
           <VBtn type="submit" class="me-2" @click="saveFilterRuleGroups"> 保存 </VBtn>
-          <VBtn color="success" variant="tonal" @click="addFilterRuleGroup">
-            <VIcon icon="mdi-plus" />
-          </VBtn>
-          <VBtn color="success" variant="tonal" @click="importRules('group')">
-            <VIcon icon="mdi-import" />
-          </VBtn>
-          <VBtn color="info" variant="tonal" @click="shareRules(filterRuleGroups)">
-            <VIcon icon="mdi-share" />
-          </VBtn>
+          <VBtnGroup density="comfortable">
+            <VBtn color="success" variant="tonal" @click="addFilterRuleGroup">
+              <VIcon icon="mdi-plus" />
+            </VBtn>
+            <VBtn color="info" variant="tonal" @click="importRules('group')">
+              <VIcon icon="mdi-import" />
+            </VBtn>
+            <VBtn color="info" variant="tonal" @click="shareRules(filterRuleGroups)">
+              <VIcon icon="mdi-share" />
+            </VBtn>
+          </VBtnGroup>
         </VCardText>
         <VDialog v-model="importCodeDialog" width="60rem" scrollable>
-          <ImportCodeDialog v-model="importCodeString" title="导入优先级规则" @close="importCodeDialog = false"/>
+          <ImportCodeDialog v-model="importCodeString" title="导入优先级规则" @close="importCodeDialog = false" />
         </VDialog>
       </VCard>
     </VCol>

From d67c6acfa2aa44ecc8dfcd843aec26b00e09dad2 Mon Sep 17 00:00:00 2001
From: thsrite <thsrite@gmail.com>
Date: Wed, 30 Oct 2024 09:52:05 +0800
Subject: [PATCH 11/12] =?UTF-8?q?fix=20=E5=B7=B2=E5=AE=89=E8=A3=85?=
 =?UTF-8?q?=E6=8F=92=E4=BB=B6=E6=98=BE=E7=A4=BA=E4=BD=9C=E8=80=85=E5=A4=B4?=
 =?UTF-8?q?=E5=83=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/cards/PluginCard.vue | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/components/cards/PluginCard.vue b/src/components/cards/PluginCard.vue
index 7a1e274e..64791503 100644
--- a/src/components/cards/PluginCard.vue
+++ b/src/components/cards/PluginCard.vue
@@ -215,6 +215,12 @@ const iconPath: Ref<string> = computed(() => {
   return `./plugin_icon/${props.plugin?.plugin_icon}`
 })
 
+// 插件作者头像路径
+const authorPath: Ref<string> = computed(() => {
+  // 网络图片则使用代理后返回
+  return `${import.meta.env.VITE_API_BASE_URL}system/img/1?imgurl=${encodeURIComponent(props.plugin?.author_url + '.png')}`
+})
+
 // 重置插件
 async function resetPlugin() {
   const isConfirmed = await createConfirm({
@@ -436,8 +442,8 @@ watch(
       </div>
     </div>
     <VCardText class="flex flex-none align-self-baseline py-3 w-full align-end">
-      <span>
-        <VIcon icon="mdi-github" class="me-1" />
+      <span class="author-info">
+        <VImg :src="authorPath" class="author-avatar" />
         <a :href="props.plugin?.author_url" target="_blank" @click.stop>
           {{ props.plugin?.plugin_author }}
         </a>
@@ -513,4 +519,15 @@ watch(
   content: '';
   inset: 0;
 }
+.author-info {
+  display: flex;
+  align-items: center;
+}
+.author-avatar {
+  width: 24px;
+  height: 24px;
+  margin-right: 8px;
+  border-radius: 50%;
+  object-fit: cover;
+}
 </style>

From 181ad39e183962d3b7bcee8d0992c35097cfa644 Mon Sep 17 00:00:00 2001
From: jxxghp <jxxghp@gmail.com>
Date: Wed, 30 Oct 2024 13:20:22 +0800
Subject: [PATCH 12/12] Refactor PluginCard.vue and login.vue components

---
 src/components/cards/PluginCard.vue | 19 ++++++--
 src/pages/login.vue                 | 73 ++++++++++++++++++-----------
 2 files changed, 60 insertions(+), 32 deletions(-)

diff --git a/src/components/cards/PluginCard.vue b/src/components/cards/PluginCard.vue
index 64791503..6dcf9749 100644
--- a/src/components/cards/PluginCard.vue
+++ b/src/components/cards/PluginCard.vue
@@ -61,6 +61,9 @@ const pluginInfoDialog = ref(false)
 // 进度框文本
 const progressText = ref('正在更新插件...')
 
+// 用户头像是否加载完成
+const isAvatarLoaded = ref(false)
+
 // 插件数据页面配置项
 let pluginPageItems = ref([])
 
@@ -218,7 +221,9 @@ const iconPath: Ref<string> = computed(() => {
 // 插件作者头像路径
 const authorPath: Ref<string> = computed(() => {
   // 网络图片则使用代理后返回
-  return `${import.meta.env.VITE_API_BASE_URL}system/img/1?imgurl=${encodeURIComponent(props.plugin?.author_url + '.png')}`
+  return `${import.meta.env.VITE_API_BASE_URL}system/img/1?imgurl=${encodeURIComponent(
+    props.plugin?.author_url + '.png',
+  )}`
 })
 
 // 重置插件
@@ -443,7 +448,9 @@ watch(
     </div>
     <VCardText class="flex flex-none align-self-baseline py-3 w-full align-end">
       <span class="author-info">
-        <VImg :src="authorPath" class="author-avatar" />
+        <VImg :src="authorPath" class="author-avatar" @load="isAvatarLoaded = true">
+          <VIcon v-if="!isAvatarLoaded" icon="mdi-github" class="me-1" />
+        </VImg>
         <a :href="props.plugin?.author_url" target="_blank" @click.stop>
           {{ props.plugin?.plugin_author }}
         </a>
@@ -519,15 +526,17 @@ watch(
   content: '';
   inset: 0;
 }
+
 .author-info {
   display: flex;
   align-items: center;
 }
+
 .author-avatar {
-  width: 24px;
-  height: 24px;
-  margin-right: 8px;
   border-radius: 50%;
+  block-size: 24px;
+  inline-size: 24px;
+  margin-inline-end: 8px;
   object-fit: cover;
 }
 </style>
diff --git a/src/pages/login.vue b/src/pages/login.vue
index f22a74f7..2b2985ab 100644
--- a/src/pages/login.vue
+++ b/src/pages/login.vue
@@ -31,13 +31,9 @@ const isPasswordVisible = ref(false)
 // 错误信息
 const errorMessage = ref('')
 
-// 背景图片
+// 背景图片 URL 和预加载 URL
 const backgroundImageUrl = ref('')
-
-// 所有的背景图片
 const backgroundImages = ref<string[]>([])
-
-// 背景图片加载状态
 const isImageLoaded = ref(false)
 
 // 是否开启双重验证
@@ -54,7 +50,6 @@ async function fetchBackgroundImage() {
   try {
     backgroundImages.value = await api.get('/login/wallpapers')
     if (backgroundImages.value && backgroundImages.value.length > 0) {
-      // 随机打乱排序
       backgroundImages.value.sort(() => Math.random() - 0.5)
       backgroundImageUrl.value = backgroundImages.value[0]
     }
@@ -63,6 +58,34 @@ async function fetchBackgroundImage() {
   }
 }
 
+// 切换背景图片函数
+function startBackgroundImageRotation() {
+  let currentIndex = 0
+
+  intervalTimer = setInterval(() => {
+    if (backgroundImages.value.length > 1) {
+      // 更新下一张图片索引
+      const nextIndex = (currentIndex + 1) % backgroundImages.value.length
+      const nextImageUrl = backgroundImages.value[nextIndex]
+      // 使用预加载机制确保下一张图片已加载完成
+      const img = new Image()
+      img.src = nextImageUrl
+      img.onload = () => {
+        // 开始淡入过渡
+        isImageLoaded.value = false
+        // 延迟一小段时间触发淡入效果
+        setTimeout(() => {
+          // 更新当前索引并切换背景图片 URL
+          currentIndex = nextIndex
+          backgroundImageUrl.value = nextImageUrl
+          // 切换完成后显示图片
+          isImageLoaded.value = true
+        }, 1000)
+      }
+    }
+  }, 5000)
+}
+
 // 查询是否开启双重验证
 const fetchOTP = debounce(async () => {
   const userid = usernameInput.value?.value
@@ -205,14 +228,8 @@ onMounted(async () => {
   } else {
     // 获取背景图片
     await fetchBackgroundImage()
-
-    // 每隔5秒更换一次背景图片
-    intervalTimer = setInterval(() => {
-      if (backgroundImages.value.length > 0) {
-        const index = Math.floor(Math.random() * backgroundImages.value.length)
-        backgroundImageUrl.value = backgroundImages.value[index]
-      }
-    }, 5000)
+    // 开始背景图片定时切换
+    startBackgroundImageRotation()
   }
 })
 
@@ -222,19 +239,21 @@ onUnmounted(() => {
 </script>
 
 <template>
-  <template v-for="image in backgroundImages">
-    <div v-if="backgroundImageUrl == image" class="absolute inset-0">
-      <VImg :src="image" class="w-full h-full" cover position="center top" @load="isImageLoaded = true">
-        <template #placeholder>
-          <VSkeletonLoader v-if="!isImageLoaded" class="object-cover" />
-        </template>
-        <div
-          class="absolute inset-0"
-          style="background-image: linear-gradient(rgba(45, 55, 72, 33%) 0%, rgb(26, 32, 46) 100%)"
-        />
-      </VImg>
-    </div>
-  </template>
+  <!-- 当前背景图片 -->
+  <div class="absolute inset-0 w-full h-full overflow-hidden">
+    <VImg
+      :src="backgroundImageUrl"
+      :class="{ 'opacity-0': !isImageLoaded, 'opacity-100': isImageLoaded }"
+      class="absolute inset-0 transition-opacity duration-1000"
+      cover
+      position="center top"
+    />
+    <div
+      class="absolute inset-0"
+      style="background-image: linear-gradient(rgba(45, 55, 72, 33%) 0%, rgb(26, 32, 46) 100%)"
+    />
+  </div>
+
   <div class="auth-wrapper d-flex align-center justify-center pa-4">
     <VCard
       class="auth-card px-7 py-3 w-full h-full rounded-lg"