Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-03-10 06:32:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

🎨 https://github.com/siyuan-note/siyuan/issues/8231

Browse source
This commit is contained in:
Vanessa 2023-05-11 12:22:53 +08:00
parent 7a68c8ad1b
commit f06a2e62a5
11 changed files with 175 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -187,20 +187,26 @@ export const resetLayout = () => {
});
};
export const exportLayout = (reload: boolean, cb?: () => void, onlyData = false, errorExit = false) => {
export const exportLayout = (options: {
reload: boolean,
cb?: () => void,
onlyData: boolean,
errorExit: boolean,
dropEditScroll?: boolean
}) => {
if (isWindow()) {
const layoutJSON: any = {
layout: {},
};
layoutToJSON(window.siyuan.layout.layout, layoutJSON.layout);
if (onlyData) {
layoutToJSON(window.siyuan.layout.layout, layoutJSON.layout, !!options.dropEditScroll);
if (options.onlyData) {
return layoutJSON;
}
sessionStorage.setItem("layout", JSON.stringify(layoutJSON));
if (reload) {
if (options.reload) {
window.location.reload();
} else if (cb) {
cb();
} else if (options.cb) {
options.cb();
}
return;
}
@ -215,18 +221,18 @@ export const exportLayout = (reload: boolean, cb?: () => void, onlyData = false,
left: dockToJSON(window.siyuan.layout.leftDock),
right: dockToJSON(window.siyuan.layout.rightDock),
};
layoutToJSON(window.siyuan.layout.layout, layoutJSON.layout);
if (onlyData) {
layoutToJSON(window.siyuan.layout.layout, layoutJSON.layout, !!options.dropEditScroll);
if (options.onlyData) {
return layoutJSON;
}
fetchPost("/api/system/setUILayout", {
layout: layoutJSON,
errorExit // 后台不接受该参数，用于请求发生错误时退出程序
errorExit: options.errorExit // 后台不接受该参数，用于请求发生错误时退出程序
}, () => {
if (reload) {
if (options.reload) {
window.location.reload();
} else if (cb) {
cb();
} else if (options.cb) {
options.cb();
}
});
};
@ -404,7 +410,7 @@ export const JSONToLayout = (app: App, isStart: boolean) => {
}
};
export const layoutToJSON = (layout: Layout | Wnd | Tab | Model, json: any) => {
export const layoutToJSON = (layout: Layout | Wnd | Tab | Model, json: any, dropEditScroll = false) => {
if (layout instanceof Layout) {
json.direction = layout.direction;
if (layout.parent) {
@ -453,7 +459,9 @@ export const layoutToJSON = (layout: Layout | Wnd | Tab | Model, json: any) => {
json.mode = layout.editor.protyle.preview.element.classList.contains("fn__none") ? "wysiwyg" : "preview";
json.action = layout.editor.protyle.block.showAll ? Constants.CB_GET_ALL : "";
json.instance = "Editor";
json.scrollAttr = saveScroll(layout.editor.protyle, true);
if (!dropEditScroll) {
json.scrollAttr = saveScroll(layout.editor.protyle, true);
}
} else if (layout instanceof Asset) {
json.path = layout.path;
if (layout.pdfObject) {
@ -517,13 +525,13 @@ export const layoutToJSON = (layout: Layout | Wnd | Tab | Model, json: any) => {
layout.children.forEach((item: Layout | Wnd | Tab) => {
const itemJSON = {};
json.children.push(itemJSON);
layoutToJSON(item, itemJSON);
layoutToJSON(item, itemJSON, dropEditScroll);
});
}
} else if (layout instanceof Tab) {
if (layout.model) {
json.children = {};
layoutToJSON(layout.model, json.children);
layoutToJSON(layout.model, json.children, dropEditScroll);
} else if (layout.headElement) {
// 当前页签没有激活时编辑器没有初始化
json.children = JSON.parse(layout.headElement.getAttribute("data-initdata") || "{}");