Merge branch 'main' of https://github.com/jxxghp/MoviePilot-Frontend

2026-06-03 14:50:21 +08:00 · 2023-12-14 07:10:56 +08:00
parent e3b11b1130 f866f23af1
commit 3980249271
16 changed files with 850 additions and 35 deletions
--- a/src/views/reorganize/TransferHistoryView.vue
+++ b/src/views/reorganize/TransferHistoryView.vue
@@ -40,6 +40,9 @@ const dataList = ref<TransferHistory[]>([])
 // 搜索
 const search = ref('')

+// 搜索提示词列表
+const searchHintList = ref<string[]>([])
+
 // 加载状态
 const loading = ref(false)

@@ -89,6 +92,7 @@ async function fetchData({

    dataList.value = result.data.list
    totalItems.value = result.data.total
+    searchHintList.value = [...new Set(dataList.value.map(item => item.title || ''))].filter(title => title !== '')
  }
  catch (error) {
    console.error(error)
@@ -294,9 +298,10 @@ const dropdownItems = ref([
        <VRow>
          <VCol> 历史记录 </VCol>
          <VCol>
-            <VTextField
+            <VCombobox
              key="search_navbar"
              v-model="search"
+              :items="searchHintList"
              class="text-disabled"
              density="compact"
              label="搜索"
@@ -306,6 +311,7 @@ const dropdownItems = ref([
              hide-details
              flat
              rounded
+              clearable
            />
          </VCol>
        </VRow>
--- a/src/views/setting/AccountSettingSearch.vue
+++ b/src/views/setting/AccountSettingSearch.vue
@@ -3,6 +3,8 @@ import { useToast } from 'vue-toast-notification'
 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'

 // 规则卡片类型
 interface FilterCard {
@@ -30,6 +32,12 @@ const defaultFilterRules = ref({
  exclude: '',
 })

+// 导入代码弹窗
+const importCodeDialog = ref(false)
+
+// 导入的代码
+const importCodeString = ref('')
+
 // 查询已设置优先级规则
 async function queryCustomFilters() {
  try {
@@ -227,6 +235,49 @@ async function saveDefaultFilter() {
  }
 }

+// 分享规则
+function shareRules() {
+  // 有值才处理
+  if (filterCards.value.length === 0)
+    return
+
+  // 将卡片规则接装为字符串
+  const value = filterCards.value
+    .filter(card => card.rules.length > 0)
+    .map(card => card.rules.join('&'))
+    .join('>')
+
+  // 复制到剪贴板
+  try {
+    copyToClipboard(value)
+    $toast.success('优先级规则已复制到剪贴板')
+  }
+  catch (error) {
+    $toast.error('优先级规则复制失败！')
+  }
+}
+
+// 监听导入代码变化
+watchEffect(() => {
+  if (!importCodeString.value)
+    return
+
+  // 导入代码需要以空格开头和结束，没有则拼接
+  if (!importCodeString.value.startsWith(' '))
+    importCodeString.value = ` ${importCodeString.value}`
+  if (!importCodeString.value.endsWith(' '))
+    importCodeString.value = `${importCodeString.value} `
+
+  // 将导入的代码转换为规则卡片
+  const groups = importCodeString.value.split('>')
+  filterCards.value = groups.map((group: string, index: number) => {
+    return {
+      pri: (index + 1).toString(),
+      rules: group.split('&'),
+    }
+  })
+})
+
 onMounted(() => {
  queryCustomFilters()
  querySites()
@@ -264,6 +315,36 @@ onMounted(() => {
    </VCol>
    <VCol cols="12">
      <VCard title="搜索优先级">
+        <template #append>
+          <IconBtn>
+            <VIcon icon="mdi-dots-vertical" />
+            <VMenu
+              activator="parent"
+              close-on-content-click
+            >
+              <VList>
+                <VListItem
+                  variant="plain"
+                  @click="shareRules"
+                >
+                  <template #prepend>
+                    <VIcon icon="mdi-share" />
+                  </template>
+                  <VListItemTitle>分享</VListItemTitle>
+                </VListItem>
+                <VListItem
+                  variant="plain"
+                  @click="importCodeDialog = true"
+                >
+                  <template #prepend>
+                    <VIcon icon="mdi-import" />
+                  </template>
+                  <VListItemTitle>导入</VListItemTitle>
+                </VListItem>
+              </VList>
+            </VMenu>
+          </IconBtn>
+        </template>
        <VCardSubtitle> 设置在搜索时默认使用的优先级排序，未在优先级中的资源将不在搜索结果中显示。 </VCardSubtitle>
        <VCardItem>
          <div class="grid gap-3 grid-filterrule-card">
@@ -332,6 +413,17 @@ onMounted(() => {
      </VCard>
    </VCol>
  </VRow>
+  <VDialog
+    v-model="importCodeDialog"
+    width="60rem"
+    scrollable
+  >
+    <ImportCodeForm
+      v-model="importCodeString"
+      title="导入优先级规则"
+      @close="importCodeDialog = false"
+    />
+  </VDialog>
 </template>

 <style lang="scss">
--- a/src/views/setting/AccountSettingSubscribe.vue
+++ b/src/views/setting/AccountSettingSubscribe.vue
@@ -3,6 +3,8 @@ import { useToast } from 'vue-toast-notification'
 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'

 // 规则卡片类型
 interface FilterCard {
@@ -27,12 +29,21 @@ const allSites = ref<Site[]>([])
 // 选中订阅站点
 const selectedRssSites = ref<number[]>([])

+// 当前规则类型
+const currentRuleType = ref('SubscribeFilterRules')
+
 // 包含与排除规则
 const defaultFilterRules = ref({
  include: '',
  exclude: '',
 })

+// 导入代码弹窗
+const importCodeDialog = ref(false)
+
+// 导入的代码
+const importCodeString = ref('')
+
 // 查询用户选中的订阅站点
 async function querySelectedRssSites() {
  try {
@@ -244,6 +255,66 @@ async function saveDefaultFilter() {
  }
 }

+// 分享规则
+function shareRules(ruleType: string) {
+  let filterCards: Ref<FilterCard[]>
+  if (ruleType === 'SubscribeFilterRules')
+    filterCards = subscribeFilterCards
+  else
+    filterCards = bestVersionFilterCards
+  // 有值才处理
+  if (filterCards.value.length === 0)
+    return
+
+  // 将卡片规则接装为字符串
+  const value = filterCards.value
+    .filter(card => card.rules.length > 0)
+    .map(card => card.rules.join('&'))
+    .join('>')
+
+  // 复制到剪贴板
+  try {
+    copyToClipboard(value)
+    $toast.success('优先级规则已复制到剪贴板')
+  }
+  catch (error) {
+    $toast.error('优先级规则复制失败！')
+  }
+}
+
+// 导入规则
+async function importRules(ruleType: string) {
+  currentRuleType.value = ruleType
+  importCodeString.value = ''
+  importCodeDialog.value = true
+}
+
+// 监听导入代码变化
+watchEffect(() => {
+  if (!importCodeString.value)
+    return
+  if (!currentRuleType.value)
+    return
+  // 导入代码需要以空格开头和结束，没有则拼接
+  if (!importCodeString.value.startsWith(' '))
+    importCodeString.value = ` ${importCodeString.value}`
+  if (!importCodeString.value.endsWith(' '))
+    importCodeString.value = `${importCodeString.value} `
+  let filterCards: Ref<FilterCard[]>
+  if (currentRuleType.value === 'SubscribeFilterRules')
+    filterCards = subscribeFilterCards
+  else
+    filterCards = bestVersionFilterCards
+  // 将导入的代码转换为规则卡片
+  const groups = importCodeString.value.split('>')
+  filterCards.value = groups.map((group: string, index: number) => {
+    return {
+      pri: (index + 1).toString(),
+      rules: group.split('&'),
+    }
+  })
+})
+
 onMounted(() => {
  querySites()
  queryCustomFilters('SubscribeFilterRules')
@@ -282,6 +353,36 @@ onMounted(() => {
    </VCol>
    <VCol cols="12">
      <VCard title="订阅优先级">
+        <template #append>
+          <IconBtn>
+            <VIcon icon="mdi-dots-vertical" />
+            <VMenu
+              activator="parent"
+              close-on-content-click
+            >
+              <VList>
+                <VListItem
+                  variant="plain"
+                  @click="shareRules('SubscribeFilterRules')"
+                >
+                  <template #prepend>
+                    <VIcon icon="mdi-share" />
+                  </template>
+                  <VListItemTitle>分享</VListItemTitle>
+                </VListItem>
+                <VListItem
+                  variant="plain"
+                  @click="importRules('SubscribeFilterRules')"
+                >
+                  <template #prepend>
+                    <VIcon icon="mdi-import" />
+                  </template>
+                  <VListItemTitle>导入</VListItemTitle>
+                </VListItem>
+              </VList>
+            </VMenu>
+          </IconBtn>
+        </template>
        <VCardSubtitle> 设置在正常订阅时默认使用的优先级，未在优先级中的资源将不会自动下载。 </VCardSubtitle>
        <VCardItem>
          <div class="grid gap-3 grid-filterrule-card">
@@ -318,6 +419,36 @@ onMounted(() => {
    </VCol>
    <VCol cols="12">
      <VCard title="洗版优先级">
+        <template #append>
+          <IconBtn>
+            <VIcon icon="mdi-dots-vertical" />
+            <VMenu
+              activator="parent"
+              close-on-content-click
+            >
+              <VList>
+                <VListItem
+                  variant="plain"
+                  @click="shareRules('BestVersionFilterRules')"
+                >
+                  <template #prepend>
+                    <VIcon icon="mdi-share" />
+                  </template>
+                  <VListItemTitle>分享</VListItemTitle>
+                </VListItem>
+                <VListItem
+                  variant="plain"
+                  @click="importRules('BestVersionFilterRules')"
+                >
+                  <template #prepend>
+                    <VIcon icon="mdi-import" />
+                  </template>
+                  <VListItemTitle>导入</VListItemTitle>
+                </VListItem>
+              </VList>
+            </VMenu>
+          </IconBtn>
+        </template>
        <VCardSubtitle> 设置在订阅洗版时使用的优先级，匹配优先级1时洗版完成。 </VCardSubtitle>
        <VCardItem>
          <div class="grid gap-3 grid-filterrule-card">
@@ -386,6 +517,17 @@ onMounted(() => {
      </VCard>
    </VCol>
  </VRow>
+  <VDialog
+    v-model="importCodeDialog"
+    width="60rem"
+    scrollable
+  >
+    <ImportCodeForm
+      v-model="importCodeString"
+      title="导入优先级规则"
+      @close="importCodeDialog = false"
+    />
+  </VDialog>
 </template>

 <style lang="scss">
--- a/src/views/setting/AccountSettingWords.vue
+++ b/src/views/setting/AccountSettingWords.vue
@@ -173,7 +173,7 @@ onMounted(() => {
          <VAlert
            type="info"
            variant="tonal"
-            title="支持的配置格式："
+            title="支持的配置格式（注意空格）："
          >
            <span
              v-html="`