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

🐛 fix https://github.com/siyuan-note/siyuan/issues/7550

Browse source
This commit is contained in:
Vanessa 2023-03-03 12:43:40 +08:00
parent 4f11da8176
commit 49172597b5
1 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
app/src/util/backForward.ts
View file

@ -13,6 +13,7 @@ import {scrollCenter} from "./highlightById";
import {lockFile} from "../dialog/processSystem"; import {lockFile} from "../dialog/processSystem";
import {zoomOut} from "../menus/protyle"; import {zoomOut} from "../menus/protyle";
import {showMessage} from "../dialog/message"; import {showMessage} from "../dialog/message";
import {saveScroll} from "../protyle/scroll/saveScroll";
let forwardStack: IBackStack[] = []; let forwardStack: IBackStack[] = [];
let previousIsBack = false; let previousIsBack = false;
@ -51,9 +52,15 @@ const focusStack = async (stack: IBackStack) => {
title: info.data.rootTitle, title: info.data.rootTitle,
docIcon: info.data.rootIcon, docIcon: info.data.rootIcon,
callback(tab) { callback(tab) {
const scrollAttr = saveScroll(stack.protyle, true);
scrollAttr.focusId = stack.id;
scrollAttr.focusStart = stack.position.start
scrollAttr.focusEnd = stack.position.end
const editor = new Editor({ const editor = new Editor({
tab, tab,
blockId: stack.id, // 忘记为什么要用 rootChildID 了，但用了会产生 https://github.com/siyuan-note/siyuan/issues/6004 问题 scrollAttr,
blockId: stack.isZoom ? stack.id : stack.protyle.block.rootID,
action: stack.isZoom ? [Constants.CB_GET_FOCUS, Constants.CB_GET_ALL] : [Constants.CB_GET_FOCUS]
}); });
tab.addModel(editor); tab.addModel(editor);
} }
@ -164,7 +171,7 @@ const focusStack = async (stack: IBackStack) => {
return false; return false;
} }
fetchPost("/api/filetree/getDoc", { fetchPost("/api/filetree/getDoc", {
id: stack.id, // 忘记为什么要用 rootChildID 了，但用了会产生 https://github.com/siyuan-note/siyuan/issues/6004 问题 id: stack.id,
mode: stack.isZoom ? 0 : 3, mode: stack.isZoom ? 0 : 3,
size: stack.isZoom ? Constants.SIZE_GET_MAX : window.siyuan.config.editor.dynamicLoadBlocks, size: stack.isZoom ? Constants.SIZE_GET_MAX : window.siyuan.config.editor.dynamicLoadBlocks,
}, getResponse => { }, getResponse => {