Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-03-13 07:56:14 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

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

Browse source
This commit is contained in:
Vanessa 2023-12-09 10:57:53 +08:00
parent d2cf402c6a
commit 2d11266b31
8 changed files with 23 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/src/layout/tabUtil.ts
View file

@ -231,11 +231,11 @@ export const copyTab = (app: App, tab: Tab) => {
callback(newTab: Tab) {
let model: Model;
if (tab.model instanceof Editor) {
saveScroll(tab.model.editor.protyle);
model = new Editor({
app,
tab: newTab,
blockId: tab.model.editor.protyle.block.id,
scrollAttr: saveScroll(tab.model.editor.protyle, true)
blockId: tab.model.editor.protyle.block.id
});
} else if (tab.model instanceof Asset) {
model = new Asset({

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

@ -178,13 +178,12 @@ export const exportLayout = (options: {
cb?: () => void,
onlyData: boolean,
errorExit: boolean,
dropEditScroll?: boolean
}) => {
if (isWindow()) {
const layoutJSON: any = {
layout: {},
};
layoutToJSON(window.siyuan.layout.layout, layoutJSON.layout, !!options.dropEditScroll);
layoutToJSON(window.siyuan.layout.layout, layoutJSON.layout);
if (options.onlyData) {
return layoutJSON;
}
@ -207,7 +206,7 @@ export const exportLayout = (options: {
left: dockToJSON(window.siyuan.layout.leftDock),
right: dockToJSON(window.siyuan.layout.rightDock),
};
layoutToJSON(window.siyuan.layout.layout, layoutJSON.layout, !!options.dropEditScroll);
layoutToJSON(window.siyuan.layout.layout, layoutJSON.layout);
if (options.onlyData) {
return layoutJSON;
}
@ -308,10 +307,6 @@ export const JSONToCenter = (app: App, json: ILayoutJSON, layout?: Layout | Wnd
if (window.siyuan.config.fileTree.openFilesUseCurrentTab) {
(layout as Tab).headElement.classList.add("item--unupdate");
}
if (json.scrollAttr) {
// 历史数据兼容
json.scrollAttr.rootId = json.rootId;
}
(layout as Tab).headElement.setAttribute("data-initdata", JSON.stringify(json));
} else if (json.instance === "Asset") {
(layout as Tab).addModel(new Asset({
@ -431,7 +426,7 @@ export const JSONToLayout = (app: App, isStart: boolean) => {
resizeTopBar();
};
export const layoutToJSON = (layout: Layout | Wnd | Tab | Model, json: any, dropEditScroll = false) => {
export const layoutToJSON = (layout: Layout | Wnd | Tab | Model, json: any) => {
if (layout instanceof Layout) {
json.direction = layout.direction;
if (layout.parent) {
@ -480,9 +475,7 @@ export const layoutToJSON = (layout: Layout | Wnd | Tab | Model, json: any, drop
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";
if (!dropEditScroll) {
json.scrollAttr = saveScroll(layout.editor.protyle, true);
}
saveScroll(layout.editor.protyle);
} else if (layout instanceof Asset) {
json.path = layout.path;
if (layout.pdfObject) {
@ -549,13 +542,13 @@ export const layoutToJSON = (layout: Layout | Wnd | Tab | Model, json: any, drop
layout.children.forEach((item: Layout | Wnd | Tab) => {
const itemJSON = {};
json.children.push(itemJSON);
layoutToJSON(item, itemJSON, dropEditScroll);
layoutToJSON(item, itemJSON);
});
}
} else if (layout instanceof Tab) {
if (layout.model) {
json.children = {};
layoutToJSON(layout.model, json.children, dropEditScroll);
layoutToJSON(layout.model, json.children);
} else if (layout.headElement) {
// 当前页签没有激活时编辑器没有初始化
json.children = JSON.parse(layout.headElement.getAttribute("data-initdata") || "{}");