From 9d4130bf6557730fd79c089ffff079103d3ebf44 Mon Sep 17 00:00:00 2001 From: Vanessa Date: Thu, 25 Jun 2026 10:15:41 +0800 Subject: [PATCH] :art: https://github.com/siyuan-note/siyuan/issues/17919 --- app/src/constants.ts | 1 + app/src/layout/util.ts | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/app/src/constants.ts b/app/src/constants.ts index e950ba2e2..c037d682f 100644 --- a/app/src/constants.ts +++ b/app/src/constants.ts @@ -68,6 +68,7 @@ export abstract class Constants { // 临时标记 DOM 属性以辅助完成其功能 public static readonly ATTRIBUTE_EDITING = "data-editing"; public static readonly ATTRIBUTE_V_SCROLL = "data-v-scroll"; + public static readonly ATTRIBUTE_DOCK_WIDTH = "data-dock-width"; // size public static readonly SIZE_DATABASE_MAZ_SIZE: number = 102400; diff --git a/app/src/layout/util.ts b/app/src/layout/util.ts index f3b458e63..f7bd40363 100644 --- a/app/src/layout/util.ts +++ b/app/src/layout/util.ts @@ -555,7 +555,11 @@ export const layoutToJSON = (layout: Layout | Wnd | Tab | Model, json: any, brea if (layout.element.classList.contains("fn__flex-1")) { json.size = "auto"; } else { - json.size = (layout.parent.direction === "tb" ? layout.element.clientHeight : layout.element.clientWidth) + "px"; + if (layout.element.style.maxWidth && layout.parent.direction !== "tb") { + json.size = layout.element.getAttribute(Constants.ATTRIBUTE_DOCK_WIDTH) + "px"; + } else { + json.size = (layout.parent.direction === "tb" ? layout.element.clientHeight : layout.element.clientWidth) + "px"; + } } } json.resize = layout.resize; @@ -1023,6 +1027,7 @@ export const addResize = (obj: Layout | Wnd, after = true) => { export const adjustLayout = (layout: Layout = window.siyuan.layout.centerLayout.parent) => { layout.children.forEach((item: Layout | Wnd) => { item.element.style.maxWidth = ""; + item.element.removeAttribute(Constants.ATTRIBUTE_DOCK_WIDTH); if (!item.element.style.width && !item.element.classList.contains("layout__center")) { item.element.style.minWidth = "8px"; } else { @@ -1042,6 +1047,9 @@ export const adjustLayout = (layout: Layout = window.siyuan.layout.centerLayout. let width = layout.element.firstElementChild.classList.contains("layout__dockl") ? 8 : 0; layout.children.find((item: Layout | Wnd) => { if (item.element.style.width && item.element.style.width !== "0px") { + if (!item.element.hasAttribute(Constants.ATTRIBUTE_DOCK_WIDTH)) { + item.element.setAttribute(Constants.ATTRIBUTE_DOCK_WIDTH, item.element.clientWidth.toString()); + } item.element.style.maxWidth = Math.max(Math.min(item.element.clientWidth, window.innerWidth) - 8, 168) + "px"; } width += item.element.clientWidth;