Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-17 07:00:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

🎨 https://github.com/siyuan-note/siyuan/issues/16428

Browse source
This commit is contained in:
Vanessa 2025-11-29 11:28:12 +08:00
parent cad7d48320
commit bdd3756127
1 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

14
app/src/search/util.ts
View file

@ -46,6 +46,7 @@ import {isSupportCSSHL, searchMarkRender} from "../protyle/render/searchMarkRend
import {saveKeyList, toggleAssetHistory, toggleReplaceHistory, toggleSearchHistory} from "./toggleHistory";
import {highlightById} from "../util/highlightById";
import {getSelectionOffset} from "../protyle/util/selection";
import {electronUndo} from "../protyle/undo";
export const openGlobalSearch = (app: App, text: string, replace: boolean, searchData?: Config.IUILayoutTabSearchConfig) => {
text = text.trim();
@ -890,6 +891,12 @@ export const genSearch = (app: App, config: Config.IUILayoutTabSearchConfig, ele
}
saveKeyList("keys", searchInputElement.value);
});
searchInputElement.addEventListener("keydown", (event) => {
electronUndo(event);
});
replaceInputElement.addEventListener("keydown", (event) => {
electronUndo(event);
});
addClearButton({
inputElement: searchInputElement,
right: 8,
@ -914,7 +921,7 @@ export const openSearchEditor = (options: {
id?: string,
cb?: () => void
}) => {
const currentRange = options.protyle.highlight.ranges[options.protyle.highlight.rangeIndex];
let currentRange = options.protyle.highlight.ranges[options.protyle.highlight.rangeIndex];
if (currentRange) {
const rangeBlockElement = hasClosestBlock(currentRange.startContainer);
if (rangeBlockElement) {
@ -928,12 +935,15 @@ export const openSearchEditor = (options: {
zoomInId: options.protyle.block.showAll ? options.protyle.block.id : undefined
};
window.siyuan.storage[Constants.LOCAL_FILEPOSITION][options.protyle.block.rootID] = scrollAttr;
if (offset.start === offset.end) {
currentRange = null;
}
}
}
checkFold(options.id, (zoomIn) => {
openFileById({
app: options.protyle.app,
id:options.id,
id: options.id,
action: currentRange ?
(zoomIn ? [Constants.CB_GET_FOCUS, Constants.CB_GET_ALL, Constants.CB_GET_SCROLL, Constants.CB_GET_SEARCH] : [Constants.CB_GET_FOCUS, Constants.CB_GET_CONTEXT, Constants.CB_GET_SCROLL, Constants.CB_GET_SEARCH]) :
(zoomIn ? [Constants.CB_GET_FOCUS, Constants.CB_GET_ALL, Constants.CB_GET_HL] : [Constants.CB_GET_FOCUS, Constants.CB_GET_CONTEXT, Constants.CB_GET_HL]),