Skip to content

An open-source, privacy-first, self-hosted knowledge workspace where humans and AI agents work together 开源、隐私优先、自托管的知识工作空间,让人与智能体在此协作

:bug: Preserve entry profile saves in settings windows https://github.com/siyuan-note/siyuan/issues/20094 https://github.com/siyuan-note/siyuan/issues/20099

Liang Ding86e97ea0db0d
diff --git a/app/src/config/entryVisibility/runtime.test.ts b/app/src/config/entryVisibility/runtime.test.ts
index e3c3c3a099..1cd2e57236 100644
--- a/app/src/config/entryVisibility/runtime.test.ts
+++ b/app/src/config/entryVisibility/runtime.test.ts
@@ -72,3 +72,53 @@ test("dock visibility menus follow profile scope order instead of the catalog or
resetEntryProfileOrder(config.profiles[0], "dock.order.LeftTop");
assert.deepEqual(Array.from(exports.getEntryOrder("dock")), ["file", "outline"]);
});
+
+test("entry profile saves in settings windows send requests and flush pending changes", () => {
+ const initial: Config.IEntryVisibility = {version: 6, active: "full", profiles: []};
+ const events: string[] = [];
+ const requests: Array<{url: string; config: Config.IEntryVisibility;
+ respond: (response: {code: number; data: Config.IEntryVisibility}) => void}> = [];
+ const window = {
+ siyuan: {layout: {}, config: {appearance: {entryVisibility: initial}}},
+ dispatchEvent: (event: {type: string}) => events.push(event.type),
+ };
+ const context = {
+ window,
+ document: {querySelectorAll: (): HTMLElement[] => [], querySelector: (): Element => null,
+ getElementById: (): HTMLElement => null},
+ CustomEvent: class {constructor(public type: string) {}},
+ };
+ const bar = {} as typeof import("../../layout/dock/barVisibility");
+ const compile = (path: string) => transpileModule(readFileSync(resolve(process.cwd(), "src", path), "utf8"), {
+ compilerOptions: {module: ModuleKind.CommonJS},
+ }).outputText;
+ runInNewContext(compile("layout/dock/barVisibility.ts"), {...context, exports: bar});
+ const exports = {} as typeof import("./runtime");
+ runInNewContext(compile("config/entryVisibility/runtime.ts"), {...context, exports, require: () => ({
+ syncDockBarVisibility: bar.syncDockBarVisibility,
+ refreshDockCatalog: () => {},
+ getDockEntryOrderSnapshot: () => Object.fromEntries(DOCK_ORDER_SCOPES.map(scope => [scope, []])),
+ mergeDockEntryOrderSnapshot,
+ applyDockEntryOrderSnapshot: () => {},
+ fetchPost: (url: string, config: Config.IEntryVisibility,
+ respond: (response: {code: number; data: Config.IEntryVisibility}) => void) => {
+ requests.push({url, config, respond});
+ },
+ })});
+ const simple = {...initial, active: "simple"};
+ const full = {...initial};
+ exports.saveEntryVisibility(simple);
+ assert.equal(window.siyuan.config.appearance.entryVisibility, simple);
+ assert.equal(requests.length, 1);
+ assert.equal(requests[0].url, "/api/setting/setEntryVisibility");
+ assert.equal(requests[0].config, simple);
+ assert.deepEqual(events, ["siyuan-entry-visibility"]);
+ exports.saveEntryVisibility(full);
+ assert.equal(requests.length, 1);
+ requests[0].respond({code: 0, data: simple});
+ assert.equal(requests.length, 2);
+ assert.equal(requests[1].config, full);
+ assert.equal(window.siyuan.config.appearance.entryVisibility, full);
+ requests[1].respond({code: 0, data: full});
+ assert.deepEqual(events, ["siyuan-entry-visibility", "siyuan-entry-visibility", "siyuan-entry-visibility"]);
+});
diff --git a/app/src/layout/dock/barVisibility.test.ts b/app/src/layout/dock/barVisibility.test.ts
index 02f58c40aa..e62b8da69c 100644
--- a/app/src/layout/dock/barVisibility.test.ts
+++ b/app/src/layout/dock/barVisibility.test.ts
@@ -1,7 +1,56 @@
import {describe, it} from "node:test";
import * as assert from "node:assert/strict";
+import {readFileSync} from "node:fs";
+import {resolve} from "node:path";
+import {runInNewContext} from "node:vm";
+import {ModuleKind, transpileModule} from "typescript";
import {shouldShowDockBar, shouldShowDockSplit} from "./barVisibility";
+const loadBarVisibility = (layout: unknown, hideStatusBar = false) => {
+ const source = readFileSync(resolve(process.cwd(), "src/layout/dock/barVisibility.ts"), "utf8");
+ const compiled = transpileModule(source, {compilerOptions: {module: ModuleKind.CommonJS}}).outputText;
+ const exports = {} as typeof import("./barVisibility");
+ runInNewContext(compiled, {
+ exports,
+ document: {querySelectorAll: (): HTMLElement[] => []},
+ window: {siyuan: {layout, config: {appearance: {hideStatusBar}}}},
+ });
+ return exports;
+};
+
+describe("dock padding", () => {
+ it("skips windows without a main dock layout and layouts still being initialized", () => {
+ for (const layout of [undefined, {}, {layout: {children: []}},
+ {layout: {children: [{element: {style: {}}}]}},
+ {layout: {children: [{element: {style: {}}}]}, leftDock: {elements: []}, rightDock: {elements: []}}]) {
+ const bar = loadBarVisibility(layout);
+ assert.doesNotThrow(bar.adjustDockPadding);
+ assert.doesNotThrow(bar.syncDockBarVisibility);
+ }
+ });
+
+ it("updates and clears main layout margins as dock and status bars change visibility", () => {
+ const style = {marginLeft: "", marginRight: "", marginBottom: ""};
+ let leftHidden = true;
+ let rightHidden = false;
+ const layout = {
+ layout: {children: [{element: {style}}]},
+ leftDock: {elements: [{parentElement: {classList: {contains: () => leftHidden}}}]},
+ rightDock: {elements: [{parentElement: {classList: {contains: () => rightHidden}}}]},
+ };
+ loadBarVisibility(layout, true).adjustDockPadding();
+ assert.deepEqual(style, {marginLeft: "var(--b3-layout-space)", marginRight: "",
+ marginBottom: "var(--b3-layout-space)"});
+ leftHidden = false;
+ rightHidden = true;
+ loadBarVisibility(layout).adjustDockPadding();
+ assert.deepEqual(style, {marginLeft: "", marginRight: "var(--b3-layout-space)", marginBottom: ""});
+ rightHidden = false;
+ loadBarVisibility(layout).adjustDockPadding();
+ assert.deepEqual(style, {marginLeft: "", marginRight: "", marginBottom: ""});
+ });
+});
+
describe("dock bar visibility", () => {
it("shows a non-empty dock bar when dock bars are enabled", () => {
assert.equal(shouldShowDockBar(false, true), true);
diff --git a/app/src/layout/dock/barVisibility.ts b/app/src/layout/dock/barVisibility.ts
index 613a5d0090..66ab6ca88b 100644
--- a/app/src/layout/dock/barVisibility.ts
+++ b/app/src/layout/dock/barVisibility.ts
@@ -5,13 +5,19 @@ export const shouldShowDockSplit = (hasVisibleEntryBefore: boolean, hasVisibleEn
hasVisibleEntryBefore && hasVisibleEntryAfter;
export const adjustDockPadding = () => {
- const layoutElement = window.siyuan.layout.layout.children[0].element;
- if (window.siyuan.layout.leftDock.elements[0].parentElement.classList.contains("fn__none")) {
+ const layoutElement = window.siyuan.layout?.layout?.children[0]?.element;
+ const leftDockElement = window.siyuan.layout?.leftDock?.elements[0]?.parentElement;
+ const rightDockElement = window.siyuan.layout?.rightDock?.elements[0]?.parentElement;
+ // 设置窗口和独立编辑窗口没有主窗口的停靠栏,布局初始化完成后才调整间距。
+ if (!layoutElement || !leftDockElement || !rightDockElement) {
+ return;
+ }
+ if (leftDockElement.classList.contains("fn__none")) {
layoutElement.style.marginLeft = "var(--b3-layout-space)";
} else {
layoutElement.style.marginLeft = "";
}
- if (window.siyuan.layout.rightDock.elements[0].parentElement.classList.contains("fn__none")) {
+ if (rightDockElement.classList.contains("fn__none")) {
layoutElement.style.marginRight = "var(--b3-layout-space)";
} else {
layoutElement.style.marginRight = "";