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

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

Browse source
This commit is contained in:
Vanessa 2023-04-14 23:02:44 +08:00
parent 671f182d5c
commit 2ee6b54bc7
3 changed files with 57 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

28
app/src/editor/util.ts
View file

@ -34,6 +34,7 @@ export const openFileById = async (options: {
keepCursor?: boolean
zoomIn?: boolean
removeCurrentTab?: boolean
afterOpen?: () => void
}) => {
fetchPost("/api/block/getBlockInfo", {id: options.id}, (data) => {
if (data.code === 3) {
@ -53,7 +54,8 @@ export const openFileById = async (options: {
action: options.action,
zoomIn: options.zoomIn,
keepCursor: options.keepCursor,
removeCurrentTab: options.removeCurrentTab
removeCurrentTab: options.removeCurrentTab,
afterOpen: options.afterOpen
});
});
};
@ -82,6 +84,9 @@ const openFile = (options: IOpenFileOptions) => {
}
});
if (asset) {
if (options.afterOpen) {
options.afterOpen();
}
return;
}
} else if (!options.position) {
@ -105,11 +110,17 @@ const openFile = (options: IOpenFileOptions) => {
if (!pdfIsLoading(editor.parent.parent.element)) {
switchEditor(editor, options, allModels);
}
if (options.afterOpen) {
options.afterOpen();
}
return true;
}
// 没有初始化的页签无法检测到
const hasEditor = getUnInitTab(options);
if (hasEditor) {
if (options.afterOpen) {
options.afterOpen();
}
return;
}
}
@ -134,6 +145,9 @@ const openFile = (options: IOpenFileOptions) => {
});
/// #endif
if (hasOpen) {
if (options.afterOpen) {
options.afterOpen();
}
return;
}
@ -165,6 +179,9 @@ const openFile = (options: IOpenFileOptions) => {
}
if (targetWnd) {
if (pdfIsLoading(targetWnd.element)) {
if (options.afterOpen) {
options.afterOpen();
}
return;
}
// 在右侧/下侧打开已有页签将进行页签切换 https://github.com/siyuan-note/siyuan/issues/5366
@ -184,9 +201,15 @@ const openFile = (options: IOpenFileOptions) => {
wnd.split(direction).addTab(newTab(options));
}
wnd.showHeading();
if (options.afterOpen) {
options.afterOpen();
}
return;
}
if (pdfIsLoading(wnd.element)) {
if (options.afterOpen) {
options.afterOpen();
}
return;
}
if (options.keepCursor && wnd.children[0].headElement) {
@ -213,6 +236,9 @@ const openFile = (options: IOpenFileOptions) => {
wnd.addTab(newTab(options));
}
wnd.showHeading();
if (options.afterOpen) {
options.afterOpen();
}
}
};