diff --git a/app/src/assets/scss/_search.scss b/app/src/assets/scss/_search.scss index 0e043c771..6194b78a7 100644 --- a/app/src/assets/scss/_search.scss +++ b/app/src/assets/scss/_search.scss @@ -77,4 +77,29 @@ overflow: auto; padding-bottom: 8px; } + + &__path { + white-space: nowrap; + position: relative; + padding-right: 20px; + } + + &__rmpath { + position: absolute; + height: 8px; + width: 8px; + padding: 4px; + border-radius: 10px; + color: var(--b3-theme-on-surface); + background-color: var(--b3-theme-surface); + transition: var(--b3-transition); + top: 1px; + right: 0px; + cursor: pointer; + + &:hover { + color: var(--b3-theme-on-background); + background-color: var(--b3-theme-background-light); + } + } } diff --git a/app/src/search/spread.ts b/app/src/search/spread.ts index 4ffceaeda..41b4ee087 100644 --- a/app/src/search/spread.ts +++ b/app/src/search/spread.ts @@ -96,7 +96,7 @@ export const openSearch = async (hotkey: string, key?: string, notebookId?: stri }); dialog.element.setAttribute("data-key", hotkey); const edit = genSearch({ - k: key || "", + k: key || localData.k, r: localData.r || "", hasReplace: hotkey === window.siyuan.config.keymap.general.replace.custom, querySyntax: localData.querySyntax || false, diff --git a/app/src/search/util.ts b/app/src/search/util.ts index ea5111705..198ac095c 100644 --- a/app/src/search/util.ts +++ b/app/src/search/util.ts @@ -1,5 +1,5 @@ import {getAllModels} from "../layout/getAll"; -import {getWndByLayout, resizeTabs} from "../layout/util"; +import {getInstanceById, getWndByLayout, resizeTabs} from "../layout/util"; import {Tab} from "../layout/Tab"; import {Search} from "./index"; import {Wnd} from "../layout/Wnd"; @@ -77,7 +77,7 @@ export const openGlobalSearch = (text: string, replace: boolean) => { }; export const genSearch = (config: ISearchOption, element: Element, closeCB?: () => void) => { - element.innerHTML = `