diff --git a/src/layouts/components/ShortcutBar.vue b/src/layouts/components/ShortcutBar.vue
index 3c412d3e..2d3c748d 100644
--- a/src/layouts/components/ShortcutBar.vue
+++ b/src/layouts/components/ShortcutBar.vue
@@ -132,9 +132,9 @@ const ruleTestDialog = ref(false)
- 规则
+ 优先级
- 过滤规则测试
+ 优先级规则测试
@@ -184,7 +184,7 @@ const ruleTestDialog = ref(false)
max-width="50rem"
scrollable
>
-
+
diff --git a/src/pages/setting.vue b/src/pages/setting.vue
index 2da3c55a..e60c1469 100644
--- a/src/pages/setting.vue
+++ b/src/pages/setting.vue
@@ -6,6 +6,8 @@ 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'
+import AccountSettingSearch from '@/views/setting/AccountSettingSearch.vue'
+import AccountSettingSubscribe from '@/views/setting/AccountSettingSubscribe.vue'
const route = useRoute()
@@ -23,6 +25,16 @@ const tabs = [
icon: 'mdi-web',
tab: 'site',
},
+ {
+ title: '搜索',
+ icon: 'mdi-magnify',
+ tab: 'search',
+ },
+ {
+ title: '订阅',
+ icon: 'mdi-rss',
+ tab: 'subscribe',
+ },
{
title: '规则',
icon: 'mdi-filter-cog',
@@ -64,13 +76,27 @@ const tabs = [
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -78,19 +104,19 @@ const tabs = [
-
+
-
+
-
+
diff --git a/src/views/setting/AccountSettingRule.vue b/src/views/setting/AccountSettingRule.vue
index 4c8f20b6..70e5f6c5 100644
--- a/src/views/setting/AccountSettingRule.vue
+++ b/src/views/setting/AccountSettingRule.vue
@@ -1,15 +1,6 @@
-
-
- 设置在搜索和订阅时默认使用的过滤规则
-
-
-
-
-
-
-
- 保存
-
-
-
- 增加规则
-
-
-
-
-
-
- 设置在订阅洗版时使用的过滤规则,匹配优先级1时洗版完成
-
-
-
-
-
-
-
- 保存
-
-
-
- 增加规则
-
-
-
-
diff --git a/src/views/setting/AccountSettingSearch.vue b/src/views/setting/AccountSettingSearch.vue
new file mode 100644
index 00000000..72fce8d1
--- /dev/null
+++ b/src/views/setting/AccountSettingSearch.vue
@@ -0,0 +1,226 @@
+
+
+
+
+
+
+ 只有选中的站点才会在搜索中使用。
+
+
+
+
+ {{ site.name }}
+
+
+
+
+
+
+ 保存
+
+
+
+
+
+
+ 设置在搜索时默认使用的优先级排序,未在优先级中的资源将不在搜索结果中显示。
+
+
+
+
+
+
+
+ 保存
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/setting/AccountSettingSite.vue b/src/views/setting/AccountSettingSite.vue
index 5a56b84c..66f6c642 100644
--- a/src/views/setting/AccountSettingSite.vue
+++ b/src/views/setting/AccountSettingSite.vue
@@ -1,19 +1,10 @@
-
-
- 只有选中的站点才会在搜索中使用
-
-
-
-
- {{ site.name }}
-
-
-
-
-
-
- 保存
-
-
-
-
-
-
- 只有选中的站点才会在订阅中使用
-
-
-
-
- {{ site.name }}
-
-
-
-
-
-
- 保存
-
-
-
-
diff --git a/src/views/setting/AccountSettingSubscribe.vue b/src/views/setting/AccountSettingSubscribe.vue
new file mode 100644
index 00000000..3fc3f6c4
--- /dev/null
+++ b/src/views/setting/AccountSettingSubscribe.vue
@@ -0,0 +1,277 @@
+
+
+
+
+
+
+ 只有选中的站点才会在订阅中使用。
+
+
+
+
+ {{ site.name }}
+
+
+
+
+
+
+ 保存
+
+
+
+
+
+
+ 设置在正常订阅时默认使用的优先级,未在优先级中的资源将不会自动下载。
+
+
+
+
+
+
+
+ 保存
+
+
+
+
+
+
+
+
+
+ 设置在订阅洗版时使用的优先级,匹配优先级1时洗版完成。
+
+
+
+
+
+
+
+ 保存
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/system/RuleTestView.vue b/src/views/system/RuleTestView.vue
index 297792fa..24806672 100644
--- a/src/views/system/RuleTestView.vue
+++ b/src/views/system/RuleTestView.vue
@@ -69,11 +69,14 @@ async function ruleTest() {
v-model="ruleTestForm.ruletype"
label="规则类型"
:items="[{
- title: '默认规则',
+ title: '订阅优先级',
value: '1',
}, {
- title: '洗版规则',
+ title: '洗版优先级',
value: '2',
+ }, {
+ title: '搜索优先级',
+ value: '3',
}]"
/>