feat 默认过滤规则拆分

src/pages/setting.vue

@@ -2,7 +2,6 @@
 import { useRoute } from 'vue-router'
 import AccountSettingAccount from '@/views/setting/AccountSettingAccount.vue'
 import AccountSettingNotification from '@/views/setting/AccountSettingNotification.vue'
-import AccountSettingRule from '@/views/setting/AccountSettingRule.vue'
 import AccountSettingSite from '@/views/setting/AccountSettingSite.vue'
 import AccountSettingWords from '@/views/setting/AccountSettingWords.vue'
 import AccountSettingAbout from '@/views/setting/AccountSettingAbout.vue'
@@ -41,11 +40,6 @@ const tabs = [
     icon: 'mdi-list-box',
     tab: 'service',
   },
-  {
-    title: '规则',
-    icon: 'mdi-filter-cog',
-    tab: 'filter',
-  },
   {
     title: '通知',
     icon: 'mdi-bell',
@@ -117,13 +111,6 @@ const tabs = [
         </transition>
       </VWindowItem>
 
-      <!-- 规则 -->
-      <VWindowItem value="filter">
-        <transition name="fade-slide" appear>
-          <AccountSettingRule />
-        </transition>
-      </VWindowItem>
-
       <!-- 通知 -->
       <VWindowItem value="notification">
         <transition name="fade-slide" appear>

src/views/setting/AccountSettingRule.vue

@@ -1,163 +0,0 @@
-<script lang="ts" setup>
-import { useToast } from 'vue-toast-notification'
-import api from '@/api'
-
-// 提示框
-const $toast = useToast()
-
-// 种子优先规则
-const selectedTorrentPriority = ref<string>('seeder')
-
-// 种子优先规则下拉框
-const TorrentPriorityItems = [
-  { title: '站点优先', value: 'site' },
-  { title: '做种数优先', value: 'seeder' },
-]
-
-// 包含与排除规则
-const defaultFilterRules = ref({
-  include: '',
-  exclude: '',
-})
-
-// 查询种子优先规则
-async function queryTorrentPriority() {
-  try {
-    const result: { [key: string]: any } = await api.get(
-      'system/setting/TorrentsPriority',
-    )
-
-    selectedTorrentPriority.value = result.data?.value
-  }
-  catch (error) {
-    console.log(error)
-  }
-}
-
-// 查询包含与排除规则
-async function queryDefaultFilter() {
-  try {
-    const result: { [key: string]: any } = await api.get(
-      'system/setting/DefaultFilterRules',
-    )
-    if (result.data?.value)
-      defaultFilterRules.value = result.data?.value
-  }
-  catch (error) {
-    console.log(error)
-  }
-}
-
-// 保存种子优先规则
-async function saveTorrentPriority() {
-  try {
-    // 用户名密码
-    const result: { [key: string]: any } = await api.post(
-      'system/setting/TorrentsPriority',
-      selectedTorrentPriority.value,
-    )
-
-    if (result.success)
-      $toast.success('优先规则保存成功')
-    else
-      $toast.error('优先规则保存失败！')
-  }
-  catch (error) {
-    console.log(error)
-  }
-}
-
-// 保存包含与排除规则
-async function saveDefaultFilter() {
-  try {
-    const result: { [key: string]: any } = await api.post(
-      'system/setting/DefaultFilterRules',
-      defaultFilterRules.value,
-    )
-    if (result.success)
-      $toast.success('默认包含/排除规则保存成功')
-    else
-      $toast.error('默认包含/排除规则保存失败！')
-  }
-  catch (error) {
-    console.log(error)
-  }
-}
-
-onMounted(() => {
-  queryTorrentPriority()
-  queryDefaultFilter()
-})
-</script>
-
-<template>
-  <VRow>
-    <VCol cols="12">
-      <VCard title="下载优先规则">
-        <VCardSubtitle> 按站点优先级或资源种子数量排序和择优下载。 </VCardSubtitle>
-        <VCardText>
-          <VForm>
-            <VRow>
-              <VCol cols="12" md="6">
-                <VSelect
-                  v-model="selectedTorrentPriority"
-                  :items="TorrentPriorityItems"
-                  label="优先规则"
-                  outlined
-                />
-              </VCol>
-            </VRow>
-          </vform>
-        </VCardText>
-        <VCardItem>
-          <VBtn
-            type="submit"
-            @click="saveTorrentPriority"
-          >
-            保存
-          </VBtn>
-        </VCardItem>
-      </VCard>
-    </VCol>
-    <VCol cols="12">
-      <VCard title="默认过滤规则">
-        <VCardSubtitle> 设置在搜索和订阅时默认使用的过滤规则。 </VCardSubtitle>
-        <VCardText>
-          <VForm>
-            <VRow>
-              <VCol cols="12" md="6">
-                <VTextField
-                  v-model="defaultFilterRules.include"
-                  type="text"
-                  label="包含（关键字、正则式）"
-                />
-              </VCol>
-              <VCol cols="12" md="6">
-                <VTextField
-                  v-model="defaultFilterRules.exclude"
-                  type="text"
-                  label="排除（关键字、正则式）"
-                />
-              </VCol>
-            </VRow>
-          </VForm>
-        </VCardText>
-        <VCardItem>
-          <VBtn
-            type="submit"
-            @click="saveDefaultFilter"
-          >
-            保存
-          </VBtn>
-        </VCardItem>
-      </VCard>
-    </VCol>
-  </VRow>
-</template>
-
-<style lang="scss">
-.grid-filterrule-card {
-  grid-template-columns: repeat(auto-fill, minmax(20rem, 1fr));
-  padding-block-end: 1rem;
-}
-</style>

src/views/setting/AccountSettingSearch.vue

@@ -24,6 +24,12 @@ const allSites = ref<Site[]>([])
 // 选中订阅站点
 const selectedSites = ref<number[]>([])
 
+// 包含与排除规则
+const defaultFilterRules = ref({
+  include: '',
+  exclude: '',
+})
+
 // 查询已设置优先级规则
 async function queryCustomFilters() {
   try {
@@ -190,9 +196,41 @@ function onLevelDown(pri: string) {
   filterCards.value.sort((a, b) => parseInt(a.pri) - parseInt(b.pri))
 }
 
+// 查询包含与排除规则
+async function queryDefaultFilter() {
+  try {
+    const result: { [key: string]: any } = await api.get(
+      'system/setting/DefaultSearchFilterRules',
+    )
+    if (result.data?.value)
+      defaultFilterRules.value = result.data?.value
+  }
+  catch (error) {
+    console.log(error)
+  }
+}
+
+// 保存包含与排除规则
+async function saveDefaultFilter() {
+  try {
+    const result: { [key: string]: any } = await api.post(
+      'system/setting/DefaultSearchFilterRules',
+      defaultFilterRules.value,
+    )
+    if (result.success)
+      $toast.success('默认包含/排除规则保存成功')
+    else
+      $toast.error('默认包含/排除规则保存失败！')
+  }
+  catch (error) {
+    console.log(error)
+  }
+}
+
 onMounted(() => {
   queryCustomFilters()
   querySites()
+  queryDefaultFilter()
 })
 </script>
 
@@ -260,6 +298,39 @@ onMounted(() => {
         </VCardItem>
       </VCard>
     </VCol>
+    <VCol cols="12">
+      <VCard title="默认过滤规则">
+        <VCardSubtitle> 设置在搜索时默认使用的过滤规则。 </VCardSubtitle>
+        <VCardText>
+          <VForm>
+            <VRow>
+              <VCol cols="12" md="6">
+                <VTextField
+                  v-model="defaultFilterRules.include"
+                  type="text"
+                  label="包含（关键字、正则式）"
+                />
+              </VCol>
+              <VCol cols="12" md="6">
+                <VTextField
+                  v-model="defaultFilterRules.exclude"
+                  type="text"
+                  label="排除（关键字、正则式）"
+                />
+              </VCol>
+            </VRow>
+          </VForm>
+        </VCardText>
+        <VCardItem>
+          <VBtn
+            type="submit"
+            @click="saveDefaultFilter"
+          >
+            保存
+          </VBtn>
+        </VCardItem>
+      </VCard>
+    </VCol>
   </VRow>
 </template>
 

src/views/setting/AccountSettingSite.vue

@@ -14,6 +14,15 @@ const resetSitesText = ref('重置站点数据')
 // 站点重置按钮可用状态
 const resetSitesDisabled = ref(false)
 
+// 种子优先规则
+const selectedTorrentPriority = ref<string>('seeder')
+
+// 种子优先规则下拉框
+const TorrentPriorityItems = [
+  { title: '站点优先', value: 'site' },
+  { title: '做种数优先', value: 'seeder' },
+]
+
 // 重置站点
 async function resetSites() {
   try {
@@ -34,10 +43,74 @@ async function resetSites() {
     console.log(error)
   }
 }
+
+// 查询种子优先规则
+async function queryTorrentPriority() {
+  try {
+    const result: { [key: string]: any } = await api.get(
+      'system/setting/TorrentsPriority',
+    )
+
+    selectedTorrentPriority.value = result.data?.value
+  }
+  catch (error) {
+    console.log(error)
+  }
+}
+
+// 保存种子优先规则
+async function saveTorrentPriority() {
+  try {
+    // 用户名密码
+    const result: { [key: string]: any } = await api.post(
+      'system/setting/TorrentsPriority',
+      selectedTorrentPriority.value,
+    )
+
+    if (result.success)
+      $toast.success('优先规则保存成功')
+    else
+      $toast.error('优先规则保存失败！')
+  }
+  catch (error) {
+    console.log(error)
+  }
+}
+
+onMounted(() => {
+  queryTorrentPriority()
+})
 </script>
 
 <template>
   <VRow>
+    <VCol cols="12">
+      <VCard title="下载优先规则">
+        <VCardSubtitle> 按站点或做种数量优先下载。 </VCardSubtitle>
+        <VCardText>
+          <VForm>
+            <VRow>
+              <VCol cols="12" md="6">
+                <VSelect
+                  v-model="selectedTorrentPriority"
+                  :items="TorrentPriorityItems"
+                  label="优先规则"
+                  outlined
+                />
+              </VCol>
+            </VRow>
+          </vform>
+        </VCardText>
+        <VCardItem>
+          <VBtn
+            type="submit"
+            @click="saveTorrentPriority"
+          >
+            保存
+          </VBtn>
+        </VCardItem>
+      </VCard>
+    </VCol>
     <VCol cols="12">
       <VCard title="站点重置">
         <VCardText>

src/views/setting/AccountSettingSubscribe.vue

@@ -27,6 +27,12 @@ const allSites = ref<Site[]>([])
 // 选中订阅站点
 const selectedRssSites = ref<number[]>([])
 
+// 包含与排除规则
+const defaultFilterRules = ref({
+  include: '',
+  exclude: '',
+})
+
 // 查询用户选中的订阅站点
 async function querySelectedRssSites() {
   try {
@@ -207,10 +213,42 @@ function onLevelDown(filterCards: FilterCard[], pri: string) {
   filterCards.sort((a, b) => parseInt(a.pri) - parseInt(b.pri))
 }
 
+// 查询包含与排除规则
+async function queryDefaultFilter() {
+  try {
+    const result: { [key: string]: any } = await api.get(
+      'system/setting/DefaultFilterRules',
+    )
+    if (result.data?.value)
+      defaultFilterRules.value = result.data?.value
+  }
+  catch (error) {
+    console.log(error)
+  }
+}
+
+// 保存包含与排除规则
+async function saveDefaultFilter() {
+  try {
+    const result: { [key: string]: any } = await api.post(
+      'system/setting/DefaultFilterRules',
+      defaultFilterRules.value,
+    )
+    if (result.success)
+      $toast.success('默认包含/排除规则保存成功')
+    else
+      $toast.error('默认包含/排除规则保存失败！')
+  }
+  catch (error) {
+    console.log(error)
+  }
+}
+
 onMounted(() => {
   querySites()
   queryCustomFilters('SubscribeFilterRules')
   queryCustomFilters('BestVersionFilterRules')
+  queryDefaultFilter()
 })
 </script>
 
@@ -314,6 +352,39 @@ onMounted(() => {
         </VCardItem>
       </VCard>
     </VCol>
+    <VCol cols="12">
+      <VCard title="默认过滤规则">
+        <VCardSubtitle> 设置在订阅时默认使用的过滤规则。 </VCardSubtitle>
+        <VCardText>
+          <VForm>
+            <VRow>
+              <VCol cols="12" md="6">
+                <VTextField
+                  v-model="defaultFilterRules.include"
+                  type="text"
+                  label="包含（关键字、正则式）"
+                />
+              </VCol>
+              <VCol cols="12" md="6">
+                <VTextField
+                  v-model="defaultFilterRules.exclude"
+                  type="text"
+                  label="排除（关键字、正则式）"
+                />
+              </VCol>
+            </VRow>
+          </VForm>
+        </VCardText>
+        <VCardItem>
+          <VBtn
+            type="submit"
+            @click="saveDefaultFilter"
+          >
+            保存
+          </VBtn>
+        </VCardItem>
+      </VCard>
+    </VCol>
   </VRow>
 </template>