From d46b630841cef03847c1094084307971bee4dc35 Mon Sep 17 00:00:00 2001
From: jmal <zhushilun084@gmail.com>
Date: Wed, 4 Jun 2025 13:56:38 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E9=80=89=E9=A1=B9=E5=92=8C=E6=98=BE=E7=A4=BA=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修复了 SearchOption 组件中 includeFileName 和 includeFileContent 属性的错误赋值
- 优化了 ShowFile 组件中的搜索历史查询逻辑
- 调整了搜索建议的加载顺序和内容
---
 src/components/SearchOption/index.vue |  4 +-
 src/components/ShowFile/ShowFile.vue  | 96 ++++++++++++---------------
 2 files changed, 46 insertions(+), 54 deletions(-)

diff --git a/src/components/SearchOption/index.vue b/src/components/SearchOption/index.vue
index 278577d..69d8e0f 100644
--- a/src/components/SearchOption/index.vue
+++ b/src/components/SearchOption/index.vue
@@ -415,8 +415,8 @@ export default {
       this.searchOverall = !!filterOption.searchOverall
       this.exactSearch = !!filterOption.exactSearch
       this.includeTagName = filterOption.includeTagName === undefined ? true : filterOption.includeTagName
-      this.includeFileName = filterOption.includeFileName === undefined ? true : filterOption.includeTagName
-      this.includeFileContent = filterOption.includeFileName === undefined ? true : filterOption.includeTagName
+      this.includeFileName = filterOption.includeFileName === undefined ? true : filterOption.includeFileName
+      this.includeFileContent = filterOption.includeFileContent === undefined ? true : filterOption.includeFileContent
 
       // 更新过滤条件
       this.updateFilterOption()
diff --git a/src/components/ShowFile/ShowFile.vue b/src/components/ShowFile/ShowFile.vue
index f6b8f49..2c29207 100644
--- a/src/components/ShowFile/ShowFile.vue
+++ b/src/components/ShowFile/ShowFile.vue
@@ -893,41 +893,41 @@
 </template>
 
 <script>
-import SearchOption from '@/components/SearchOption/index.vue'
-import DialogFileList from '@/components/ShowFile/DialogFileList.vue'
-import FileClipboard from '@/components/ShowFile/FileClipboard.vue'
-import store from '@/store'
-import path from 'path'
-import { fileOperations } from '@/utils/file-operations'
-import { mapGetters, mapState } from 'vuex'
-import { formatSize, formatTime } from '@/utils/number'
-import { getElementToPageLeft } from '@/utils/dom'
-import { suffix } from '@/utils/file-type'
-import { formatExif,formatVideo } from '@/utils/media'
 import api from '@/api/file-api'
 import BreadcrumbFilePath from '@/components/Breadcrumb/BreadcrumbFilePath'
-import IconFile from '@/components/Icon/IconFile'
-import EmptyFile from '@/components/EmptyFile'
-import SimTextPreview from '@/components/preview/SimTextPreview'
-import ImageViewer from '@/components/preview/ImageViewer'
-import VideoPreview from '@/components/preview/VideoPreview'
-import AudioPreview from '@/components/preview/AudioPreview'
 import ButtonUpload from '@/components/button/ButtonUpload'
-import MessageDialog from '@/components/message/MessageDialog'
+import EmptyFile from '@/components/EmptyFile'
 
 import FileTree from '@/components/FileTree'
 
 import '@/utils/directives.js'
-
-import _ from "lodash";
+import IconFile from '@/components/Icon/IconFile'
+import MessageDialog from '@/components/message/MessageDialog'
+import AudioPreview from '@/components/preview/AudioPreview'
+import FileDetails from '@/components/preview/FileDetails.vue'
+import IframePreview from '@/components/preview/IframePreview.vue'
+import ImageViewer from '@/components/preview/ImageViewer'
+import SimTextPreview from '@/components/preview/SimTextPreview'
+import VideoPreview from '@/components/preview/VideoPreview'
+import SearchOption from '@/components/SearchOption/index.vue'
+import ShareDialog from '@/components/ShareDialog/index.vue'
+import DialogFileList from '@/components/ShowFile/DialogFileList.vue'
+import FileClipboard from '@/components/ShowFile/FileClipboard.vue'
+import TagDialog from '@/components/TagDialog/index.vue'
+import store from '@/store'
+import { getElementToPageLeft } from '@/utils/dom'
 
 import fileConfig from '@/utils/file-config'
+import { fileOperations } from '@/utils/file-operations'
+import { suffix } from '@/utils/file-type'
+import { formatExif, formatVideo } from '@/utils/media'
+import { formatSize, formatTime } from '@/utils/number'
 import EditElement from '@/views/markdown/EditElement'
-import IframePreview from '@/components/preview/IframePreview.vue'
-import ShareDialog from '@/components/ShareDialog/index.vue'
 import Clipboard from 'clipboard'
-import TagDialog from '@/components/TagDialog/index.vue'
-import FileDetails from "@/components/preview/FileDetails.vue";
+
+import _ from 'lodash'
+import path from 'path'
+import { mapGetters, mapState } from 'vuex'
 
 export default {
   name: 'ShowFile',
@@ -4649,10 +4649,8 @@ export default {
           id: 'recently_search_id'
         }
       if (!queryString) {
-        await this.pushSearchHistory(queryString, recentlySearch)
+        this.queryRecentlySearchHistory(queryString, recentlySearch, cb)
       } else {
-        // 用户已输入关键字
-        // 1. 固定操作项
         const fixedActionItems = [
           {
             sugType: 'action_current_path_search',
@@ -4668,32 +4666,24 @@ export default {
           },
         ]
         this.searchSuggestions.push(...fixedActionItems)
-        await this.pushSearchHistory(queryString, recentlySearch)
+        this.queryRecentlySearchHistory(queryString, recentlySearch, cb)
       }
-      cb(this.searchSuggestions)
     },
-    async pushSearchHistory(queryString, recentlySearch) {
-      const historyItems = await this.queryRecentlySearchHistory(queryString)
-      if (historyItems.length > 0) {
-        this.searchSuggestions.push(recentlySearch)
-      }
-      this.searchSuggestions.push(...historyItems)
-    },
-    async queryRecentlySearchHistory(queryString = '') {
-      return new Promise(resolve => {
-        setTimeout(() => {
-          api.getRecentlySearchHistory({keyword: queryString}).then(res => {
-            const filteredHistory = res.data.map(item => ({
-              ...item,
-              value: item.keyword,
-              sugType: 'history'
-            }))
-            resolve(filteredHistory)
-          }).catch(error => {
-            console.error("Error fetching search history:", error)
-          })
-        }, 50)
-      });
+    queryRecentlySearchHistory(queryString = '', recentlySearch, cb) {
+      api.getRecentlySearchHistory({keyword: queryString}).then(res => {
+        const historyItems = res.data.map(item => ({
+          ...item,
+          value: item.keyword,
+          sugType: 'history'
+        }))
+        if (historyItems.length > 0) {
+          this.searchSuggestions.push(recentlySearch)
+        }
+        this.searchSuggestions.push(...historyItems)
+        cb(this.searchSuggestions)
+      }).catch(error => {
+        console.error("Error fetching search history:", error)
+      })
     },
     handleSelectSuggestion(item) {
       this._isSuggestionHandledBySelect = true
@@ -4739,7 +4729,9 @@ export default {
         type: 'warning'
       }).then(() => {
         api.removeAllSearchHistory({userId: this.$store.getters.userId}).then(() => {
-          this.searchSuggestions.splice(2, this.searchSuggestions.length - 2)
+          this.searchSuggestions = this.searchSuggestions.filter(
+            item => item.sugType === 'action_current_path_search' || item.sugType === 'action_global_search'
+          );
         })
       }).catch(() => {
       })