From 946cc4bda07c24dcb16f9e937935e5a4110606a6 Mon Sep 17 00:00:00 2001 From: Vanessa Date: Thu, 29 Jun 2023 17:43:16 +0800 Subject: [PATCH] :art: https://github.com/siyuan-note/siyuan/issues/8265 --- app/src/search/util.ts | 28 ++++++++-------------------- 1 file changed, 8 insertions(+), 20 deletions(-) diff --git a/app/src/search/util.ts b/app/src/search/util.ts index 838299aa3..143fb1812 100644 --- a/app/src/search/util.ts +++ b/app/src/search/util.ts @@ -996,34 +996,22 @@ const replace = (element: Element, config: ISearchOption, edit: Protyle, app: Ap return; } loadElement.classList.remove("fn__none"); - let ids: string[] = []; - let rootIds: string[] = []; - if (isAll) { - searchPanelElement.querySelectorAll('.b3-list-item[data-type="search-item"]').forEach(item => { - ids.push(item.getAttribute("data-node-id")); - rootIds.push(item.getAttribute("data-root-id")); - }); - } else { - ids = [currentList.getAttribute("data-node-id")]; - rootIds = [currentList.getAttribute("data-root-id")]; - } - fetchPost("/api/search/findReplace", { - k: config.method === 0 ? getKeyByLiElement(currentList) : searchInputElement.value, - r: replaceInputElement.value, - ids, - types: config.types, - method: config.method, - }, (response) => { + const searchData: ISearchOption & { ids?: string[] } = Object.assign({}, config); + searchData.k = config.method === 0 ? getKeyByLiElement(currentList) : searchInputElement.value; + searchData.r = replaceInputElement.value; + searchData.ids = isAll ? [] : [currentList.getAttribute("data-node-id")]; + fetchPost("/api/search/findReplace", searchData, (response) => { loadElement.classList.add("fn__none"); if (response.code === 1) { showMessage(response.msg); return; } - if (ids.length > 1) { + if (isAll) { return; } + const rootId = currentList.getAttribute("data-root-id") getAllModels().editor.forEach(item => { - if (rootIds[0] === item.editor.protyle.block.rootID) { + if (rootId === item.editor.protyle.block.rootID) { reloadProtyle(item.editor.protyle, false); } });