From d377ced6b6b4c183979f8c546274ebee04e2de19 Mon Sep 17 00:00:00 2001
From: jxxghp <jxxghp@gmail.com>
Date: Wed, 27 Sep 2023 09:42:28 +0800
Subject: [PATCH] =?UTF-8?q?feat=20=E4=BC=98=E5=85=88=E7=BA=A7=E8=A7=84?=
 =?UTF-8?q?=E5=88=99=E6=94=AF=E6=8C=81=E5=8A=A8=E6=80=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/cards/FilterRuleCard.vue       | 27 ++++++++++-
 src/views/reorganize/TransferHistoryView.vue  |  1 +
 src/views/setting/AccountSettingSearch.vue    | 45 +++++++++++++++++
 src/views/setting/AccountSettingSubscribe.vue | 48 +++++++++++++++++++
 4 files changed, 120 insertions(+), 1 deletion(-)

diff --git a/src/components/cards/FilterRuleCard.vue b/src/components/cards/FilterRuleCard.vue
index 3e932252..b4dd0610 100644
--- a/src/components/cards/FilterRuleCard.vue
+++ b/src/components/cards/FilterRuleCard.vue
@@ -2,19 +2,30 @@
 // 输入参数
 const props = defineProps({
   pri: String,
+  maxpri: String,
   rules: Array as PropType<string[]>,
   width: String,
   height: String,
 })
 
 // 定义触发的自定义事件
-const emit = defineEmits(['close', 'changed'])
+const emit = defineEmits(['close', 'changed', 'levelup', 'leveldown'])
 
 // 按钮点击
 function onClose() {
   emit('close')
 }
 
+// 上升优先级
+function onLevelUp() {
+  emit('levelup', props.pri)
+}
+
+// 下降优先级
+function onLevelDown() {
+  emit('leveldown', props.pri)
+}
+
 // 选项变化
 function filtersChanged(value: string[]) {
   emit('changed', props.pri, value)
@@ -54,6 +65,20 @@ const selectFilterOptions = ref<{ [key: string]: string }[]>([
 
 <template>
   <VCard variant="tonal" :width="props.width" :height="props.height">
+    <span class="absolute top-3 right-14">
+      <IconBtn
+        v-if="props.pri !== '1'"
+        @click.stop="onLevelUp"
+      >
+        <VIcon icon="mdi-arrow-up" />
+      </IconBtn>
+      <IconBtn
+        v-if="props.pri !== props.maxpri"
+        @click.stop="onLevelDown"
+      >
+        <VIcon icon="mdi-arrow-down" />
+      </IconBtn>
+    </span>
     <DialogCloseBtn @click="onClose" />
     <VCardItem>
       <VCardTitle>优先级 {{ props.pri }}</VCardTitle>
diff --git a/src/views/reorganize/TransferHistoryView.vue b/src/views/reorganize/TransferHistoryView.vue
index d5496531..b60f446a 100644
--- a/src/views/reorganize/TransferHistoryView.vue
+++ b/src/views/reorganize/TransferHistoryView.vue
@@ -226,6 +226,7 @@ async function retransferBatch() {
   // 清空当前操作记录
   currentHistory.value = undefined
   // 打开识别弹窗
+  redoType.value = ''
   redoDialog.value = true
 }
 
diff --git a/src/views/setting/AccountSettingSearch.vue b/src/views/setting/AccountSettingSearch.vue
index e9fe2ab5..7a108ea3 100644
--- a/src/views/setting/AccountSettingSearch.vue
+++ b/src/views/setting/AccountSettingSearch.vue
@@ -148,6 +148,48 @@ async function saveSelectedSites() {
   }
 }
 
+// 上调优先级
+function onLevelUp(pri: string) {
+  // 找到当前卡片
+  const card = filterCards.value.find(card => card.pri === pri)
+  if (!card)
+    return
+
+  // 找到当前卡片的上一张卡片
+  const prevCard = filterCards.value.find(card => card.pri === (parseInt(pri) - 1).toString())
+  if (!prevCard)
+    return
+
+  // 交换两张卡片的优先级
+  const temp = card.pri
+  card.pri = prevCard.pri
+  prevCard.pri = temp
+
+  // 卡片重新按优先级排序
+  filterCards.value.sort((a, b) => parseInt(a.pri) - parseInt(b.pri))
+}
+
+// 下调优先级
+function onLevelDown(pri: string) {
+  // 找到当前卡片
+  const card = filterCards.value.find(card => card.pri === pri)
+  if (!card)
+    return
+
+  // 找到当前卡片的下一张卡片
+  const nextCard = filterCards.value.find(card => card.pri === (parseInt(pri) + 1).toString())
+  if (!nextCard)
+    return
+
+  // 交换两张卡片的优先级
+  const temp = card.pri
+  card.pri = nextCard.pri
+  nextCard.pri = temp
+
+  // 卡片重新按优先级排序
+  filterCards.value.sort((a, b) => parseInt(a.pri) - parseInt(b.pri))
+}
+
 onMounted(() => {
   queryCustomFilters()
   querySites()
@@ -191,9 +233,12 @@ onMounted(() => {
               v-for="(card, index) in filterCards"
               :key="index"
               :pri="card.pri"
+              :maxpri="filterCards.length.toString()"
               :rules="card.rules"
               @changed="updateFilterCardValue"
               @close="filterCardClose(card.pri)"
+              @leveldown="onLevelDown"
+              @levelup="onLevelUp"
             />
           </div>
         </VCardItem>
diff --git a/src/views/setting/AccountSettingSubscribe.vue b/src/views/setting/AccountSettingSubscribe.vue
index 665c989e..9920ab76 100644
--- a/src/views/setting/AccountSettingSubscribe.vue
+++ b/src/views/setting/AccountSettingSubscribe.vue
@@ -165,6 +165,48 @@ function addFilterCard(ruleType: string) {
   cards.value.push(newCard)
 }
 
+// 上调优先级
+function onLevelUp(filterCards: FilterCard[], pri: string) {
+  // 找到当前卡片
+  const card = filterCards.find(card => card.pri === pri)
+  if (!card)
+    return
+
+  // 找到当前卡片的上一张卡片
+  const prevCard = filterCards.find(card => card.pri === (parseInt(pri) - 1).toString())
+  if (!prevCard)
+    return
+
+  // 交换两张卡片的优先级
+  const temp = card.pri
+  card.pri = prevCard.pri
+  prevCard.pri = temp
+
+  // 卡片重新按优先级排序
+  filterCards.sort((a, b) => parseInt(a.pri) - parseInt(b.pri))
+}
+
+// 下调优先级
+function onLevelDown(filterCards: FilterCard[], pri: string) {
+  // 找到当前卡片
+  const card = filterCards.find(card => card.pri === pri)
+  if (!card)
+    return
+
+  // 找到当前卡片的下一张卡片
+  const nextCard = filterCards.find(card => card.pri === (parseInt(pri) + 1).toString())
+  if (!nextCard)
+    return
+
+  // 交换两张卡片的优先级
+  const temp = card.pri
+  card.pri = nextCard.pri
+  nextCard.pri = temp
+
+  // 卡片重新按优先级排序
+  filterCards.sort((a, b) => parseInt(a.pri) - parseInt(b.pri))
+}
+
 onMounted(() => {
   querySites()
   queryCustomFilters('SubscribeFilterRules')
@@ -209,9 +251,12 @@ onMounted(() => {
               v-for="(card, index) in subscribeFilterCards"
               :key="index"
               :pri="card.pri"
+              :maxpri="subscribeFilterCards.length.toString()"
               :rules="card.rules"
               @changed="updateFilterCardValue"
               @close="filterCardClose('SubscribeFilterRules', card.pri)"
+              @leveldown="onLevelDown(subscribeFilterCards, card.pri)"
+              @levelup="onLevelUp(subscribeFilterCards, card.pri)"
             />
           </div>
         </VCardItem>
@@ -242,9 +287,12 @@ onMounted(() => {
               v-for="(card, index) in bestVersionFilterCards"
               :key="index"
               :pri="card.pri"
+              :maxpri="bestVersionFilterCards.length.toString()"
               :rules="card.rules"
               @changed="updateFilterCardValue2"
               @close="filterCardClose('BestVersionFilterRules', card.pri)"
+              @leveldown="onLevelDown(bestVersionFilterCards, card.pri)"
+              @levelup="onLevelUp(bestVersionFilterCards, card.pri)"
             />
           </div>
         </VCardItem>