refactor(advanced-search): 重构高级搜索逻辑并修复条件检查

- 将高级搜索条件检查函数 `hasAnyAdvancedCondition` 提取到工具文件
- 修复路由守卫和搜索输入验证中的条件检查逻辑
- 重构搜索历史应用逻辑，提取公共函数 `applyQueryToForm`
- 优化数据存储中搜索历史的标准化处理
- 修复本地数据库精确匹配查询的 SQL 生成问题
- 更新组件类型声明和路由配置以支持重构

Author: kazukokawagawa

components.d.ts

@@ -121,6 +121,7 @@ declare module 'vue' {
     NProgress: typeof import('naive-ui')['NProgress']
     NQrCode: typeof import('naive-ui')['NQrCode']
     NRadio: typeof import('naive-ui')['NRadio']
+    NRadioButton: typeof import('naive-ui')['NRadioButton']
     NRadioGroup: typeof import('naive-ui')['NRadioGroup']
     NResult: typeof import('naive-ui')['NResult']
     NScrollbar: typeof import('naive-ui')['NScrollbar']
@@ -154,6 +155,8 @@ declare module 'vue' {
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']
     ScalingModal: typeof import('./src/components/Modal/ScalingModal.vue')['default']
+    SearchAdvanced: typeof import('./src/components/Search/SearchAdvanced.vue')['default']
+    SearchAdvancedLocal: typeof import('./src/components/Search/SearchAdvancedLocal.vue')['default']
     SearchDefault: typeof import('./src/components/Search/SearchDefault.vue')['default']
     SearchInp: typeof import('./src/components/Search/SearchInp.vue')['default']
     SearchInpMenu: typeof import('./src/components/Menu/SearchInpMenu.vue')['default']

electron/main/database/LocalMusicDB.ts

@@ -58,7 +58,7 @@ const buildAdvancedSearchWhere = (query: AdvancedSearchQuery) => {
     const v = normalizeInput(value);
     if (!v) return;
     if (match === "exact") {
-      where.push(`COALESCE(${column}, '') = ?`);
+      where.push(`${column} = ?`);
       params.push(v);
       return;
     }

src/components/Search/SearchAdvanced.vue

@@ -2,7 +2,7 @@
   <n-modal
     :show="show"
     preset="card"
-    title="在线高级搜索"
+    title="高级搜索"
     style="width: min(520px, calc(100vw - 24px))"
     @update:show="emit('update:show', $event)"
   >
@@ -113,11 +113,7 @@ const historyOptions = computed<SelectOption[]>(() => {
   }));
 });
 
-const applyHistory = (value: number | null) => {
-  if (value === null) return;
-  const list = dataStore.advancedSearchHistory.filter((q) => (q.mode ?? "auto") !== "local");
-  const q = list[value];
-  if (!q) return;
+const applyQueryToForm = (q: AdvancedSearchQuery) => {
   form.match = q.match ?? "contains";
   form.keywords = q.keywords ?? "";
   form.title = q.title ?? "";
@@ -127,9 +123,17 @@ const applyHistory = (value: number | null) => {
   form.maxDuration = q.maxDuration;
 };
 
+const applyHistory = (value: number | null) => {
+  if (value === null) return;
+  const list = dataStore.advancedSearchHistory.filter((q) => (q.mode ?? "auto") !== "local");
+  const q = list[value];
+  if (!q) return;
+  applyQueryToForm(q);
+};
+
 const submit = () => {
   const query: AdvancedSearchQuery = {
-    mode: "online",
+    mode: "auto",
     match: form.match ?? "contains",
     keywords: form.keywords?.trim() || undefined,
     title: form.title?.trim() || undefined,
@@ -153,13 +157,7 @@ watch(
     if (!show) return;
     const last = dataStore.advancedSearchHistory.find((q) => (q.mode ?? "auto") !== "local");
     if (!last) return;
-    form.match = last.match ?? "contains";
-    form.keywords = last.keywords ?? "";
-    form.title = last.title ?? "";
-    form.artist = last.artist ?? "";
-    form.album = last.album ?? "";
-    form.minDuration = last.minDuration;
-    form.maxDuration = last.maxDuration;
+    applyQueryToForm(last);
   },
 );
 </script>

src/components/Search/SearchAdvancedLocal.vue

@@ -254,11 +254,7 @@ const historyOptions = computed<SelectOption[]>(() => {
   }));
 });
 
-const applyHistory = (value: number | null) => {
-  if (value === null) return;
-  const list = dataStore.advancedSearchHistory.filter((q) => q.mode === "local");
-  const q = list[value];
-  if (!q) return;
+const applyQueryToForm = (q: AdvancedSearchQuery) => {
   form.match = q.match ?? "contains";
   form.keywords = q.keywords ?? "";
   form.title = q.title ?? "";
@@ -276,6 +272,14 @@ const applyHistory = (value: number | null) => {
   form.maxTrackNumber = q.maxTrackNumber;
 };
 
+const applyHistory = (value: number | null) => {
+  if (value === null) return;
+  const list = dataStore.advancedSearchHistory.filter((q) => q.mode === "local");
+  const q = list[value];
+  if (!q) return;
+  applyQueryToForm(q);
+};
+
 const submit = () => {
   const query: AdvancedSearchQuery = {
     mode: "local",
@@ -324,22 +328,7 @@ watch(
     if (!show) return;
     const last = dataStore.advancedSearchHistory.find((q) => q.mode === "local");
     if (!last) return;
-    form.match = last.match ?? "contains";
-    form.keywords = last.keywords ?? "";
-    form.title = last.title ?? "";
-    form.artist = last.artist ?? "";
-    form.album = last.album ?? "";
-    form.minDuration = last.minDuration;
-    form.maxDuration = last.maxDuration;
-    form.inPath = last.inPath;
-    form.path = last.path ?? "";
-    form.minBitrate = last.minBitrate;
-    form.maxBitrate = last.maxBitrate;
-    form.minSize = last.minSize;
-    form.maxSize = last.maxSize;
-    form.minTrackNumber = last.minTrackNumber;
-    form.maxTrackNumber = last.maxTrackNumber;
+    applyQueryToForm(last);
   },
 );
 </script>
-

src/components/Search/SearchInp.vue

@@ -20,7 +20,7 @@
       </template>
       <template #suffix>
         <n-button
-          v-if="statusStore.searchFocus"
+          v-if="statusStore.searchFocus && (settingStore.useOnlineService || isElectron)"
           :focusable="false"
           quaternary
           size="tiny"
@@ -54,9 +54,11 @@ import { songDetail } from "@/api/song";
 import { formatSongsList } from "@/utils/format";
 import SearchInpMenu from "@/components/Menu/SearchInpMenu.vue";
 import SearchAdvanced from "@/components/Search/SearchAdvanced.vue";
+import { isElectron } from "@/utils/env";
 import {
   buildAdvancedSearchRouteQuery,
   formatAdvancedSearchSummary,
+  hasAnyAdvancedCondition,
   parseAdvancedSearchQuery,
 } from "@/utils/advancedSearch";
 import type { AdvancedSearchQuery } from "@shared";
@@ -131,6 +133,10 @@ const openAdvancedSearch = () => {
 };
 
 const toAdvancedSearch = (query: AdvancedSearchQuery) => {
+  if (!hasAnyAdvancedCondition(query)) {
+    window.$message.info("请至少设置一个搜索条件");
+    return;
+  }
   statusStore.searchFocus = false;
   searchInputRef.value?.blur();
   advancedSearchShow.value = false;
@@ -158,6 +164,11 @@ const setSearchHistory = (keyword: string) => {
 
 // 更换搜索框关键词
 const updatePlaceholder = async () => {
+  if (!settingStore.useOnlineService) {
+    searchPlaceholder.value = "搜索本地音乐";
+    searchRealkeyword.value = "";
+    return;
+  }
   if (!settingStore.enableSearchKeyword) {
     searchPlaceholder.value = "搜索音乐 / 视频";
     return;
@@ -187,7 +198,9 @@ const toSearch = async (key: any, type: string = "keyword") => {
     key = searchRealkeyword.value?.trim();
   }
   // 更新推荐
-  updatePlaceholder();
+  if (settingStore.useOnlineService) {
+    updatePlaceholder();
+  }
   // 前往搜索
   switch (type) {
     case "keyword":

src/router/routes.ts

@@ -1,4 +1,5 @@
 import AppLayout from "@/layout/AppLayout.vue";
+import { hasAnyAdvancedCondition, parseAdvancedSearchQuery } from "@/utils/advancedSearch";
 import { type RouteRecordRaw } from "vue-router";
 
 /**
@@ -28,25 +29,15 @@ const appRoutes: Array<RouteRecordRaw> = [
         next({ path: "/403" });
         return;
       }
-      const hasAny =
-        !!to.query.keywords ||
-        !!to.query.title ||
-        !!to.query.artist ||
-        !!to.query.album ||
-        !!to.query.minDuration ||
-        !!to.query.maxDuration ||
-        !!to.query.inPath ||
-        !!to.query.path ||
-        !!to.query.minBitrate ||
-        !!to.query.maxBitrate ||
-        !!to.query.minSize ||
-        !!to.query.maxSize ||
-        !!to.query.minTrackNumber ||
-        !!to.query.maxTrackNumber;
-      if (!hasAny) {
+      const advancedQuery = parseAdvancedSearchQuery(to.query);
+      if (!hasAnyAdvancedCondition(advancedQuery)) {
         next({ path: "/403" });
         return;
       }
+      if (to.name !== "search-advanced") {
+        next({ name: "search-advanced", query: to.query });
+        return;
+      }
       next();
     },
     redirect: (to) => {

src/stores/data.ts

@@ -499,43 +499,27 @@ export const useDataStore = defineStore("data", {
       }
     },
     addAdvancedSearchHistory(query: AdvancedSearchQuery) {
+      const normalizeString = (v?: string) => (typeof v === "string" ? v.trim() || undefined : undefined);
+      const normalizeNumber = (v?: number) =>
+        typeof v === "number" && Number.isFinite(v) ? v : undefined;
+
       const normalized: AdvancedSearchQuery = {
         mode: query.mode,
         match: query.match,
-        keywords: query.keywords?.trim() || undefined,
-        title: query.title?.trim() || undefined,
-        artist: query.artist?.trim() || undefined,
-        album: query.album?.trim() || undefined,
-        minDuration:
-          typeof query.minDuration === "number" && Number.isFinite(query.minDuration)
-            ? query.minDuration
-            : undefined,
-        maxDuration:
-          typeof query.maxDuration === "number" && Number.isFinite(query.maxDuration)
-            ? query.maxDuration
-            : undefined,
-        inPath: query.inPath?.trim() || undefined,
-        path: query.path?.trim() || undefined,
-        minBitrate:
-          typeof query.minBitrate === "number" && Number.isFinite(query.minBitrate)
-            ? query.minBitrate
-            : undefined,
-        maxBitrate:
-          typeof query.maxBitrate === "number" && Number.isFinite(query.maxBitrate)
-            ? query.maxBitrate
-            : undefined,
-        minSize:
-          typeof query.minSize === "number" && Number.isFinite(query.minSize) ? query.minSize : undefined,
-        maxSize:
-          typeof query.maxSize === "number" && Number.isFinite(query.maxSize) ? query.maxSize : undefined,
-        minTrackNumber:
-          typeof query.minTrackNumber === "number" && Number.isFinite(query.minTrackNumber)
-            ? query.minTrackNumber
-            : undefined,
-        maxTrackNumber:
-          typeof query.maxTrackNumber === "number" && Number.isFinite(query.maxTrackNumber)
-            ? query.maxTrackNumber
-            : undefined,
+        keywords: normalizeString(query.keywords),
+        title: normalizeString(query.title),
+        artist: normalizeString(query.artist),
+        album: normalizeString(query.album),
+        minDuration: normalizeNumber(query.minDuration),
+        maxDuration: normalizeNumber(query.maxDuration),
+        inPath: normalizeString(query.inPath),
+        path: normalizeString(query.path),
+        minBitrate: normalizeNumber(query.minBitrate),
+        maxBitrate: normalizeNumber(query.maxBitrate),
+        minSize: normalizeNumber(query.minSize),
+        maxSize: normalizeNumber(query.maxSize),
+        minTrackNumber: normalizeNumber(query.minTrackNumber),
+        maxTrackNumber: normalizeNumber(query.maxTrackNumber),
       };
 
       const key = JSON.stringify(normalized);

src/utils/advancedSearch.ts

@@ -70,18 +70,18 @@ export const buildAdvancedSearchRouteQuery = (q: AdvancedSearchQuery) => {
   const query: Record<string, string> = { advanced: "1" };
   if (q.mode) query.mode = q.mode;
   if (q.match) query.match = q.match;
-  if (q.keywords?.trim()) query.keywords = q.keywords.trim();
-  if (q.title?.trim()) query.title = q.title.trim();
-  if (q.artist?.trim()) query.artist = q.artist.trim();
-  if (q.album?.trim()) query.album = q.album.trim();
+  if (q.keywords) query.keywords = q.keywords;
+  if (q.title) query.title = q.title;
+  if (q.artist) query.artist = q.artist;
+  if (q.album) query.album = q.album;
   if (typeof q.minDuration === "number" && Number.isFinite(q.minDuration)) {
     query.minDuration = String(q.minDuration);
   }
   if (typeof q.maxDuration === "number" && Number.isFinite(q.maxDuration)) {
     query.maxDuration = String(q.maxDuration);
   }
-  if (q.inPath?.trim()) query.inPath = q.inPath.trim();
-  if (q.path?.trim()) query.path = q.path.trim();
+  if (q.inPath) query.inPath = q.inPath;
+  if (q.path) query.path = q.path;
   if (typeof q.minBitrate === "number" && Number.isFinite(q.minBitrate)) {
     query.minBitrate = String(q.minBitrate);
   }
@@ -153,6 +153,25 @@ export const buildOnlineKeywords = (q: AdvancedSearchQuery) => {
   return parts.join(" ");
 };
 
+export const hasAnyAdvancedCondition = (q: AdvancedSearchQuery) => {
+  return (
+    !!q.keywords?.trim() ||
+    !!q.title?.trim() ||
+    !!q.artist?.trim() ||
+    !!q.album?.trim() ||
+    (typeof q.minDuration === "number" && Number.isFinite(q.minDuration)) ||
+    (typeof q.maxDuration === "number" && Number.isFinite(q.maxDuration)) ||
+    !!q.inPath?.trim() ||
+    !!q.path?.trim() ||
+    (typeof q.minBitrate === "number" && Number.isFinite(q.minBitrate)) ||
+    (typeof q.maxBitrate === "number" && Number.isFinite(q.maxBitrate)) ||
+    (typeof q.minSize === "number" && Number.isFinite(q.minSize)) ||
+    (typeof q.maxSize === "number" && Number.isFinite(q.maxSize)) ||
+    (typeof q.minTrackNumber === "number" && Number.isFinite(q.minTrackNumber)) ||
+    (typeof q.maxTrackNumber === "number" && Number.isFinite(q.maxTrackNumber))
+  );
+};
+
 const getSongArtistText = (song: SongType) => {
   if (typeof song.artists === "string") return song.artists;
   return song.artists.map((a) => a.name).filter(Boolean).join(" / ");

src/views/Local/layout.vue

@@ -184,7 +184,7 @@ import SearchAdvancedLocal from "@/components/Search/SearchAdvancedLocal.vue";
 import { useDataStore, useLocalStore, useSettingStore } from "@/stores";
 import type { SongType } from "@/types/main";
 import type { AdvancedSearchQuery } from "@shared";
-import { buildAdvancedSearchRouteQuery } from "@/utils/advancedSearch";
+import { buildAdvancedSearchRouteQuery, hasAnyAdvancedCondition } from "@/utils/advancedSearch";
 import { formatSongsList } from "@/utils/format";
 import { fuzzySearch, renderIcon } from "@/utils/helper";
 import { openBatchList, openCreatePlaylist, openLocalMusicDirectoryModal } from "@/utils/modal";
@@ -236,25 +236,6 @@ const filteredSearchResult = ref<SongType[]>([]);
 const localSearchFocus = ref(false);
 const localAdvancedSearchShow = ref(false);
 
-const hasAnyAdvancedCondition = (q: AdvancedSearchQuery) => {
-  return (
-    !!q.keywords?.trim() ||
-    !!q.title?.trim() ||
-    !!q.artist?.trim() ||
-    !!q.album?.trim() ||
-    typeof q.minDuration === "number" ||
-    typeof q.maxDuration === "number" ||
-    !!q.inPath?.trim() ||
-    !!q.path?.trim() ||
-    typeof q.minBitrate === "number" ||
-    typeof q.maxBitrate === "number" ||
-    typeof q.minSize === "number" ||
-    typeof q.maxSize === "number" ||
-    typeof q.minTrackNumber === "number" ||
-    typeof q.maxTrackNumber === "number"
-  );
-};
-
 const openLocalAdvancedSearch = () => {
   localSearchFocus.value = false;
   localAdvancedSearchShow.value = true;