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

Merge remote-tracking branch 'origin/dev' into dev

Browse source
This commit is contained in:
Vanessa 2023-03-19 23:30:39 +08:00
commit 7ad5cdd067
31 changed files with 155 additions and 249 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -10,7 +10,6 @@ import {Tab} from "../layout/Tab";
import {Editor} from "../editor";
import {onGet} from "../protyle/util/onGet";
import {scrollCenter} from "./highlightById";
import {lockFile} from "../dialog/processSystem";
import {zoomOut} from "../menus/protyle";
import {showMessage} from "../dialog/message";
import {saveScroll} from "../protyle/scroll/saveScroll";
@ -39,11 +38,6 @@ const focusStack = async (stack: IBackStack) => {
}
if (wnd) {
const info = await fetchSyncPost("/api/block/getBlockInfo", {id: stack.id});
if (info.code === 2) {
// 文件被锁定
lockFile(info.data);
return false;
}
if (info.code === 3) {
showMessage(info.msg);
return;