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

🎨 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

2
app/src/asset/index.ts
View file

@ -3,6 +3,7 @@ import {Tab} from "../layout/Tab";
import {Constants} from "../constants";
import {setPanelFocus} from "../layout/util";
/// #if !MOBILE
import {setModelsHash} from "../window/setHeader";
// @ts-ignore
import {webViewerLoad} from "./pdf/viewer";
// @ts-ignore
@ -497,6 +498,7 @@ export class Asset extends Model {
this.element, this.pdfPage, this.pdfId);
this.element.setAttribute("data-loading", "true");
}
setModelsHash();
}, Constants.TIMEOUT_BLOCKLOAD);
/// #endif
}

13
app/src/asset/pdf/app.js
View file

@ -2467,20 +2467,7 @@ function webViewerResize() {
}
function webViewerHashchange(evt) {
const hash = evt.hash;
if (!hash) {
return;
}
// NOTE
const pdfInstance = getPdfInstance(evt.source)
if (!pdfInstance) {
return
}
if (!pdfInstance.isInitialViewSet) {
pdfInstance.initialBookmark = hash;
} else if (!pdfInstance.pdfHistory?.popStateInProgress) {
pdfInstance.pdfLinkService.setHash(hash);
}
}
if (typeof PDFJSDev === "undefined" || PDFJSDev.test("GENERIC")) {

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

34
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();
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) {
item.webContents.executeJavaScript(`window.newWindow.positionPDF("${options.assetPath}", ${typeof options.page === "number" ? options.page : `"${options.page}"`})`);
execJS += `window.newWindow.positionPDF("${options.assetPath}", ${typeof options.page === "number" ? options.page : `"${options.page}"`})`
}
hasOpen = true;
return true;
}
}
});
/// #endif
if (hasOpen) {
item.focus();
item.webContents.executeJavaScript(execJS);
if (options.afterOpen) {
options.afterOpen();
}
return true;
}
})
if (hasMatch) {
return;
}
/// #endif
let wnd: Wnd = undefined;
// 获取光标所在 tab

9
app/src/layout/Wnd.ts
View file

@ -17,7 +17,7 @@ import {Constants} from "../constants";
/// #if !BROWSER
import {webFrame, ipcRenderer} from "electron";
import {getCurrentWindow} from "@electron/remote";
import {setTabPosition} from "../window/setHeader";
import {setModelsHash, setTabPosition} from "../window/setHeader";
/// #endif
import {Search} from "../search";
import {showMessage} from "../dialog/message";
@ -228,6 +228,7 @@ export class Wnd {
ipcRenderer.send(Constants.SIYUAN_SEND_WINDOWS, {cmd: "closetab", data: tabData.id});
it.querySelector("li[data-clone='true']").remove();
wnd.switchTab(oldTab.headElement);
getCurrentWindow().focus();
}
}
/// #endif
@ -334,6 +335,7 @@ export class Wnd {
JSONToCenter(tabData, this);
oldTab = this.children[this.children.length - 1];
ipcRenderer.send(Constants.SIYUAN_SEND_WINDOWS, {cmd: "closetab", data: tabData.id});
getCurrentWindow().focus();
}
/// #endif
if (!oldTab) {
@ -552,6 +554,7 @@ export class Wnd {
}
/// #if !BROWSER
setTabPosition();
setModelsHash();
/// #endif
}
@ -689,9 +692,6 @@ export class Wnd {
}
});
}
/// #if !BROWSER
setTabPosition();
/// #endif
return;
}
if (item.headElement) {
@ -746,6 +746,7 @@ export class Wnd {
/// #if !BROWSER
webFrame.clearCache();
getCurrentWindow().webContents.session.clearCache();
setTabPosition();
/// #endif
};

6
app/src/layout/getAll.ts
View file

@ -64,12 +64,12 @@ export const getAllModels = () => {
};
export const getAllTabs = () => {
const models: Tab[] = [];
const tabs: Tab[] = [];
const getTabs = (layout: Layout) => {
for (let i = 0; i < layout.children.length; i++) {
const item = layout.children[i];
if (item instanceof Tab) {
models.push(item);
tabs.push(item);
} else {
getTabs(item as Layout);
}
@ -79,7 +79,7 @@ export const getAllTabs = () => {
if (window.siyuan.layout.centerLayout) {
getTabs(window.siyuan.layout.centerLayout);
}
return models;
return tabs;
};
export const getAllDocks = () => {

10
app/src/layout/util.ts
View file

@ -237,7 +237,7 @@ const JSONToDock = (json: any) => {
window.siyuan.layout.bottomDock = new Dock({position: "Bottom", data: json.bottom});
};
export const JSONToCenter = (json: any, layout?: Layout | Wnd | Tab | Model, isStart = false) => {
export const JSONToCenter = (json: ILayoutJSON, layout?: Layout | Wnd | Tab | Model, isStart = false) => {
let child: Layout | Wnd | Tab | Model;
if (json.instance === "Layout") {
if (!layout) {
@ -309,7 +309,7 @@ export const JSONToCenter = (json: any, layout?: Layout | Wnd | Tab | Model, isS
tab: (layout as Tab),
blockId: json.blockId,
rootId: json.rootId,
type: json.type,
type: json.type as "pin" | "local",
}));
} else if (json.instance === "Bookmark") {
(layout as Tab).addModel(new Bookmark((layout as Tab)));
@ -322,13 +322,13 @@ export const JSONToCenter = (json: any, layout?: Layout | Wnd | Tab | Model, isS
tab: (layout as Tab),
blockId: json.blockId,
rootId: json.rootId,
type: json.type
type: json.type as "pin" | "local" | "global",
}));
} else if (json.instance === "Outline") {
(layout as Tab).addModel(new Outline({
tab: (layout as Tab),
blockId: json.blockId,
type: json.type
type: json.type as "pin" | "local",
}));
} else if (json.instance === "Tag") {
(layout as Tab).addModel(new Tag((layout as Tab)));
@ -347,7 +347,7 @@ export const JSONToCenter = (json: any, layout?: Layout | Wnd | Tab | Model, isS
if (Array.isArray(json.children)) {
json.children.forEach((item: any, index: number) => {
JSONToCenter(item, layout ? child : window.siyuan.layout.layout, isStart);
if (item.instance === "Tab" && index === json.children.length - 1) {
if (item.instance === "Tab" && index === (json.children as ILayoutJSON[]).length - 1) {
const activeTabElement = (child as Wnd).headersElement.querySelector('[data-init-active="true"]') as HTMLElement;
if (activeTabElement) {
if (window.siyuan.config.fileTree.closeTabsOnStart && isStart &&

24
app/src/types/index.d.ts vendored
View file

@ -50,6 +50,7 @@ interface Window {
newWindow: {
positionPDF(pathStr: string, page: string | number): void
switchTabById(id: string): void
}
Protyle: import("../protyle/method").default
@ -271,6 +272,29 @@ interface IObject {
[key: string]: string;
}
declare interface ILayoutJSON extends ILayoutOptions {
instance?: string,
width?: string,
height?: string,
title?: string,
lang?: string
docIcon?: string
page?: string
path?: string
blockId?: string
icon?: string
rootId?: string
active?: boolean
pin?: boolean
data?: {
cardType: TCardType,
id: string,
title?: string
}
config?: ISearchOption
children?: ILayoutJSON[] | ILayoutJSON
}
declare interface IDockTab {
type: TDockType;
size: { width: number, height: number }

37
app/src/window/global/function.ts Normal file
View file

@ -0,0 +1,37 @@
import {getAllTabs} from "../../layout/getAll";
import {Asset} from "../../asset";
import {Editor} from "../../editor";
export const positionPDF = (pathStr: string, page: string | number) => {
getAllTabs().forEach((tab) => {
if (tab.model instanceof Asset && tab.model.pdfObject && tab.model.path === pathStr) {
tab.parent.switchTab(tab.headElement);
tab.model.goToPage(page);
}
});
};
export const switchTabById = (id: string) => {
getAllTabs().find((tab) => {
if (!tab.model) {
const initTab = tab.headElement.getAttribute("data-initdata");
if (initTab) {
const initTabData = JSON.parse(initTab);
if (initTabData.rootId === id) {
tab.parent.switchTab(tab.headElement);
return true;
}
}
} else if (tab.model instanceof Editor) {
if (tab.model.editor.protyle.block.rootID === id) {
tab.parent.switchTab(tab.headElement);
return true
}
} else if (tab.model instanceof Asset) {
if (tab.model.path === id) {
tab.parent.switchTab(tab.headElement);
return true
}
}
});
}

11
app/src/window/global/positionPDF.ts
View file

@ -1,11 +0,0 @@
import {getAllTabs} from "../../layout/getAll";
import {Asset} from "../../asset";
export const positionPDF = (pathStr: string, page: string | number) => {
getAllTabs().forEach((tab) => {
if (tab.model instanceof Asset && tab.model.pdfObject && tab.model.path === pathStr) {
tab.parent.switchTab(tab.headElement);
tab.model.goToPage(page);
}
});
};

5
app/src/window/index.ts
View file

@ -20,7 +20,7 @@ import {initMessage} from "../dialog/message";
import {getAllTabs} from "../layout/getAll";
import {getLocalStorage} from "../protyle/util/compatibility";
import {init} from "../window/init";
import {positionPDF} from "./global/positionPDF";
import {positionPDF, switchTabById} from "./global/function";
class App {
constructor() {
@ -145,5 +145,6 @@ new App();
// 再次点击新窗口已打开的 PDF 时，需进行定位
window.newWindow = {
positionPDF: positionPDF
positionPDF: positionPDF,
switchTabById: switchTabById
};

1
app/src/window/init.ts
View file

@ -36,7 +36,6 @@ export const init = () => {
}]
});
window.siyuan.layout.centerLayout = window.siyuan.layout.layout;
});
initStatus(true);
initWindow();

26
app/src/window/setHeader.ts
View file

@ -2,6 +2,10 @@ import {isWindow} from "../util/functions";
import {Wnd} from "../layout/Wnd";
import {getCurrentWindow} from "@electron/remote";
import {Layout} from "../layout";
import {getAllTabs} from "../layout/getAll";
import {Editor} from "../editor";
import {Asset} from "../asset";
import {Constants} from "../constants";
const getAllWnds = (layout: Layout, wnds: Wnd[]) => {
for (let i = 0; i < layout.children.length; i++) {
@ -50,3 +54,25 @@ export const setTabPosition = () => {
}
});
};
export const setModelsHash = () => {
if (!isWindow()) {
return
}
let hash = ""
getAllTabs().forEach(tab => {
if (!tab.model) {
const initTab = tab.headElement.getAttribute("data-initdata");
if (initTab) {
const initTabData = JSON.parse(initTab);
hash += initTabData.rootId + Constants.ZWSP
}
} else if (tab.model instanceof Editor) {
hash += tab.model.editor.protyle.block.rootID + Constants.ZWSP
} else if (tab.model instanceof Asset) {
hash += tab.model.path + Constants.ZWSP
}
})
window.location.hash = hash
}