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

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

Browse source
This commit is contained in:
Vanessa 2023-10-24 09:44:45 +08:00
parent 7f9be7fea2
commit 066bd25819
2 changed files with 20 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

29
app/src/boot/onGetConfig.ts
View file

@ -172,6 +172,19 @@ const winOnMaxRestore = async () => {
/// #endif
};
const saveUI = () => {
exportLayout({
reload: false,
onlyData: false,
errorExit: false
});
}
export const unbindSaveUI = () => {
window.removeEventListener("beforeunload", saveUI);
window.removeEventListener("pagehide", saveUI);
}
export const initWindow = async (app: App) => {
/// #if !BROWSER
const winOnClose = (close = false) => {
@ -509,19 +522,7 @@ ${response.data.replace("%pages", "<span class=totalPages></span>").replace("%pa
if (!isWindow()) {
document.querySelector(".toolbar").classList.add("toolbar--browser");
}
window.addEventListener("beforeunload", () => {
exportLayout({
reload: false,
onlyData: false,
errorExit: false
});
}, false);
window.addEventListener("pagehide", () => {
exportLayout({
reload: false,
onlyData: false,
errorExit: false
});
}, false);
window.addEventListener("beforeunload", saveUI, false);
window.addEventListener("pagehide", saveUI, false);
/// #endif
};

5
app/src/menus/workspace.ts
View file

@ -23,6 +23,7 @@ import {hasClosestByClassName} from "../protyle/util/hasClosest";
import {confirmDialog} from "../dialog/confirmDialog";
import {App} from "../index";
import {isBrowser} from "../util/functions";
import {unbindSaveUI} from "../boot/onGetConfig";
const togglePinDock = (dock: Dock, icon: string) => {
return {
@ -276,6 +277,9 @@ export const workspaceMenu = (app: App, rect: DOMRect) => {
});
}
}];
if (window.siyuan.storage[Constants.LOCAL_LAYOUTS].length > 0) {
layoutSubMenu.push({type: "separator"});
}
window.siyuan.storage[Constants.LOCAL_LAYOUTS].forEach((item: ISaveLayout) => {
layoutSubMenu.push({
iconHTML: Constants.ZWSP,
@ -297,6 +301,7 @@ export const workspaceMenu = (app: App, rect: DOMRect) => {
return;
}
fetchPost("/api/system/setUILayout", {layout: item.layout}, () => {
unbindSaveUI();
window.location.reload();
});
});