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

🎨 fix https://github.com/siyuan-note/siyuan/issues/8193

Browse source
This commit is contained in:
Vanessa 2023-05-07 09:55:35 +08:00
parent f85b5d6740
commit 11adc35e10
13 changed files with 136 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/src/editor/index.ts
View file

@ -4,6 +4,9 @@ import {Model} from "../layout/Model";
import {disabledProtyle} from "../protyle/util/onGet";
import {setPadding} from "../protyle/ui/initUI";
import {getAllModels} from "../layout/getAll";
/// #if !BROWSER
import {setModelsHash} from "../window/setHeader";
/// #endif
import {countBlockWord} from "../layout/status";
export class Editor extends Model {
@ -62,6 +65,9 @@ export class Editor extends Model {
});
}
countBlockWord([], editor.protyle.block.rootID);
/// #if !BROWSER
setModelsHash();
/// #endif
},
});
// 需在 after 回调之前，否则不会聚焦 https://github.com/siyuan-note/siyuan/issues/5303

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

@ -14,7 +14,7 @@ import {focusBlock, focusByRange} from "../protyle/util/selection";
import {onGet} from "../protyle/util/onGet";
/// #if !BROWSER
import {shell} from "electron";
import {BrowserWindow} from "@electron/remote";
import {BrowserWindow, getCurrentWindow} from "@electron/remote";
/// #endif
import {pushBack} from "../util/backForward";
import {Asset} from "../asset";
@ -158,31 +158,31 @@ export const openFile = (options: IOpenFileOptions) => {
}
}
let hasOpen = false;
/// #if !BROWSER
// https://github.com/siyuan-note/siyuan/issues/7491
BrowserWindow.getAllWindows().find((item) => {
const json = getSearch("json", new URL(item.webContents.getURL()).search);
if (json) {
const jsonObj = JSON.parse(json);
if ((jsonObj.children.rootId && jsonObj.children.rootId === options.rootID) ||
(jsonObj.children.path && jsonObj.children.path === options.assetPath)) {
item.focus();
if (options.assetPath) {
item.webContents.executeJavaScript(`window.newWindow.positionPDF("${options.assetPath}", ${typeof options.page === "number" ? options.page : `"${options.page}"`})`);
}
hasOpen = true;
return true;
const currentWindowId = getCurrentWindow().id
const hasMatch = BrowserWindow.getAllWindows().find(item => {
if (item.id === currentWindowId) {
return;
}
const ids = decodeURIComponent(new URL(item.webContents.getURL()).hash.substring(1)).split(Constants.ZWSP);
if (ids.includes(options.rootID) || ids.includes(options.assetPath)) {
let execJS = `window.newWindow.switchTabById("${options.rootID || options.assetPath}");`
if (options.assetPath) {
execJS += `window.newWindow.positionPDF("${options.assetPath}", ${typeof options.page === "number" ? options.page : `"${options.page}"`})`
}
item.focus();
item.webContents.executeJavaScript(execJS);
if (options.afterOpen) {
options.afterOpen();
}
return true;
}
});
/// #endif
if (hasOpen) {
if (options.afterOpen) {
options.afterOpen();
}
})
if (hasMatch) {
return;
}
/// #endif
let wnd: Wnd = undefined;
// 获取光标所在 tab