Merge pull request #140 from hotlcc/develop-20240603

Develop 20240603

src/components/cards/SiteCard.vue

@@ -194,7 +194,7 @@ onMounted(() => {
           <VImg :src="siteIcon" />
         </VAvatar>
       </template>
-      <VCardItem>
+      <VCardItem style="padding-block-end: 0;">
         <VCardTitle class="font-bold">
           <span @click.stop="openSitePage">{{ cardProps.site?.name }}</span>
         </VCardTitle>
@@ -202,10 +202,10 @@ onMounted(() => {
           <span @click.stop="openSitePage">{{ cardProps.site?.url }}</span>
         </VCardSubtitle>
       </VCardItem>
-      <VCardText class="py-2">
+      <VCardText class="py-2" style="block-size: 36px;">
-        <VTooltip v-if="cardProps.site?.render === 1" text="浏览器仿真">
+        <VTooltip v-if="cardProps.site?.limit_interval" text="流控">
           <template #activator="{ props }">
-            <VIcon color="primary" class="me-2" v-bind="props" icon="mdi-apple-safari" />
+            <VIcon color="primary" class="me-2" v-bind="props" icon="mdi-speedometer" />
           </template>
         </VTooltip>
         <VTooltip v-if="cardProps.site?.proxy === 1" text="代理">
@@ -213,9 +213,9 @@ onMounted(() => {
             <VIcon color="primary" class="me-2" v-bind="props" icon="mdi-network-outline" />
           </template>
         </VTooltip>
-        <VTooltip v-if="cardProps.site?.limit_interval" text="流控">
+        <VTooltip v-if="cardProps.site?.render === 1" text="浏览器仿真">
           <template #activator="{ props }">
-            <VIcon color="primary" class="me-2" v-bind="props" icon="mdi-speedometer" />
+            <VIcon color="primary" class="me-2" v-bind="props" icon="mdi-apple-safari" />
           </template>
         </VTooltip>
         <VTooltip v-if="cardProps.site?.filter" text="过滤">

src/views/reorganize/TransferHistoryView.vue

@@ -6,10 +6,15 @@ import api from '@/api'
 import type { TransferHistory } from '@/api/types'
 import ReorganizeDialog from '@/components/dialog/ReorganizeDialog.vue'
 import ProgressDialog from '@/components/dialog/ProgressDialog.vue'
+import { useRoute } from 'vue-router'
+import router from '@/router'
 
 // 提示框
 const $toast = useToast()
 
+// 路由
+const route = useRoute()
+
 // 重新整理对话框
 const redoDialog = ref(false)
 
@@ -70,6 +75,8 @@ const dataList = ref<TransferHistory[]>([])
 
 // 搜索
 const search = ref()
+// 路由中有搜索参数时放到搜索框中
+if (route.query.search) search.value = route.query.search
 
 // 搜索提示词列表
 const searchHintList = ref<string[]>([])
@@ -131,6 +138,8 @@ const totalPage = computed(() => {
 watch(
   [() => currentPage.value, () => itemsPerPage.value, () => search.value],
   debounce(async () => {
+    // 清除路由参数
+    if (route.query.search) router.push("/history")
     await fetchData()
   }, 1000),
 )

src/views/system/SearchBarView.vue

@@ -166,6 +166,18 @@ function searchTorrent() {
   emit('close')
 }
 
+// 跳转到历史记录页面
+function searchHistory() {
+  if (!searchWord.value) return
+  router.push({
+    path: '/history',
+    query: {
+      search: searchWord.value
+    },
+  })
+  emit('close')
+}
+
 // 跳转插件页面
 function showPlugin(pluginId: string) {
   router.push({
@@ -290,6 +302,24 @@ onMounted(() => {
               </VListItem>
             </template>
           </VHover>
+          <VHover>
+            <template #default="hover">
+              <VListItem
+                prepend-icon="mdi-history"
+                density="compact"
+                link
+                v-bind="hover.props"
+                @click="searchHistory"
+              >
+                <VListItemTitle>
+                  搜索 <span class="font-bold">{{ searchWord }}</span> 相关的【历史记录】 ...
+                </VListItemTitle>
+                <template #append>
+                  <VIcon v-if="hover.isHovering" icon="ri-corner-down-left-line" />
+                </template>
+              </VListItem>
+            </template>
+          </VHover>
           <VListSubheader v-if="matchedSubscribeItems.length > 0"> 订阅 </VListSubheader>
           <VHover
             v-if="matchedSubscribeItems.length > 0"