diff --git a/app/src/search/spread.ts b/app/src/search/spread.ts index 2fc580c02..edeab9ff8 100644 --- a/app/src/search/spread.ts +++ b/app/src/search/spread.ts @@ -61,18 +61,19 @@ export const openSearch = async (hotkey: string, key?: string, notebookId?: stri paragraph: window.siyuan.config.search.paragraph, }; } + let hPath = "" + let idPath = "" if (notebookId) { - localData.hPath = escapeHtml(getNotebookName(notebookId)); - localData.idPath = notebookId; + hPath = escapeHtml(getNotebookName(notebookId)); + idPath = notebookId; if (searchPath && searchPath !== "/") { const response = await fetchSyncPost("/api/filetree/getHPathByPath", { notebook: notebookId, path: searchPath.endsWith(".sy") ? searchPath : searchPath + ".sy" }); - localData.hPath = pathPosix().join(localData.hPath, escapeHtml(response.data)); - localData.idPath = pathPosix().join(localData.idPath, searchPath); + hPath = pathPosix().join(hPath, escapeHtml(response.data)); + idPath = pathPosix().join(idPath, searchPath); } - localStorage.setItem(Constants.LOCAL_SEARCHEDATA, JSON.stringify(localData)); } let range: Range; @@ -98,8 +99,8 @@ export const openSearch = async (hotkey: string, key?: string, notebookId?: stri r: localData.r || "", hasReplace: hotkey === window.siyuan.config.keymap.general.replace.custom, method: localData.method || 0, - hPath: localData.hPath || "", - idPath: localData.idPath || "", + hPath, + idPath, list: localData.list || [], replaceList: localData.replaceList || [], group: localData.group || 0, diff --git a/app/src/search/util.ts b/app/src/search/util.ts index 51290c0d7..3491fb663 100644 --- a/app/src/search/util.ts +++ b/app/src/search/util.ts @@ -176,7 +176,7 @@ export const genSearch = (config: ISearchOption, element: Element, closeCB?: () config.idPath = ""; config.hPath = ""; element.querySelector("#searchPathInput").innerHTML = config.hPath; - inputTimeout = inputEvent(element, config, inputTimeout, edit); + inputTimeout = inputEvent(element, config, inputTimeout, edit, false); event.stopPropagation(); event.preventDefault(); break; @@ -186,13 +186,13 @@ export const genSearch = (config: ISearchOption, element: Element, closeCB?: () config.idPath = toNotebook; config.hPath = escapeHtml(getNotebookName(toNotebook)); element.querySelector("#searchPathInput").innerHTML = `${config.hPath}`; - inputTimeout = inputEvent(element, config, inputTimeout, edit); + inputTimeout = inputEvent(element, config, inputTimeout, edit, false); } else { config.idPath = pathPosix().join(toNotebook, toPath); fetchPost("/api/filetree/getHPathsByPaths", {paths: [toPath]}, (response) => { config.hPath = escapeHtml(response.data ? response.data[0] : ""); element.querySelector("#searchPathInput").innerHTML = `${config.hPath}`; - inputTimeout = inputEvent(element, config, inputTimeout, edit); + inputTimeout = inputEvent(element, config, inputTimeout, edit, false); }); } }, window.siyuan.languages.specifyPath);