An open-source, privacy-first, self-hosted knowledge workspace where humans and AI agents work together 开源、隐私优先、自托管的知识工作空间,让人与智能体在此协作
TypeScript agentic-aiai-agentknowledge-baselocal-firstmarkdownmcpmindmapnote-takingself-hostedsiyuanworkspace
:sparkles: Improve mind map expansion menu ordering https://github.com/siyuan-note/siyuan/issues/20784
Daniel41dff106ba52
diff --git a/app/src/protyle/render/listMindmap/connectorMenu.test.ts b/app/src/protyle/render/listMindmap/connectorMenu.test.tsindex f08ad90d52..c7c6e284df 100644--- a/app/src/protyle/render/listMindmap/connectorMenu.test.ts+++ b/app/src/protyle/render/listMindmap/connectorMenu.test.ts@@ -89,8 +89,8 @@ test("desktop and mobile connector menus persist one undoable change and preservlet selectedLevel: unknown;target.onSettingsMenu(anchor, (level: unknown) => selectedLevel = level);assert.deepEqual((expandItem.submenu as IMenu[]).map(entry => entry.id),- ["level1", "level2", "level3", "level4", "level5", "level6", "separator_all", "expandAll", "foldAll"]);- (expandItem.submenu as IMenu[])[2].click(undefined, undefined);+ ["expandAll", "foldAll", "separator_all", "level1", "level2", "level3", "level4", "level5", "level6"]);+ (expandItem.submenu as IMenu[]).find(entry => entry.id === "level3").click(undefined, undefined);assert.equal(selectedLevel, 3, "narrow desktop and mobile views retain global expansion in More");(defaultItem.submenu as IMenu[]).find(entry => entry.id === "rounded").click(undefined, undefined);assert.deepEqual(defaults, ["rounded"]);diff --git a/app/src/protyle/render/listMindmap/fold.test.ts b/app/src/protyle/render/listMindmap/fold.test.tsindex 9442872732..ae49e9f9c4 100644--- a/app/src/protyle/render/listMindmap/fold.test.ts+++ b/app/src/protyle/render/listMindmap/fold.test.ts@@ -61,7 +61,7 @@ test("six-level expansion handles deep trees and invalid levels leave nodes unto}});-test("desktop and mobile menus offer six levels without icon placeholders followed by expand and collapse actions", () => {+test("desktop and mobile menus put expand and collapse actions before the six levels without icon placeholders", () => {const source = createSourceFile("index.ts", readFileSync("src/protyle/render/listMindmap/index.ts", "utf8"),ScriptTarget.ES2021, true);let callback = "";@@ -95,12 +95,12 @@ test("desktop and mobile menus offer six levels without icon placeholders follow}).outputText, context);open({closest: (): null => null, setAttribute() {}, getBoundingClientRect: () => ({left: 10, bottom: 30, height: 20})},(level: ListMindmapFoldTarget) => selected.push(level));- assert.deepEqual(entries.map(item => item.id), [...Array.from({length: 6}, (_, i) => `level${i + 1}`),- "separator_all", "expandAll", "foldAll"]);- entries.slice(0, 6).forEach(item => assert.equal(item.iconHTML, ""));- entries[5].click();- entries[7].click();+ assert.deepEqual(entries.map(item => item.id), ["expandAll", "foldAll", "separator_all",+ ...Array.from({length: 6}, (_, i) => `level${i + 1}`)]);+ entries.slice(3).forEach(item => assert.equal(item.iconHTML, ""));entries[8].click();+ entries[0].click();+ entries[1].click();assert.deepEqual(selected, [6, "expandAll", "foldAll"]);assert.deepEqual(JSON.parse(JSON.stringify(positions)), mobile ? ["bottom"] : [{x: 10, y: 30, h: 20}]);}diff --git a/app/src/protyle/render/listMindmap/foldMenu.ts b/app/src/protyle/render/listMindmap/foldMenu.tsindex 92a718c92a..ec970d5afe 100644--- a/app/src/protyle/render/listMindmap/foldMenu.ts+++ b/app/src/protyle/render/listMindmap/foldMenu.ts@@ -2,12 +2,12 @@ import type {ListMindmapFoldTarget} from "./fold";export const getListMindmapFoldMenuItems = (select: (level: ListMindmapFoldTarget) => void,labels: Record<string, string>): IMenu[] => [+ {id: "expandAll", icon: "iconExpand", label: labels.expandAll, click: () => select("expandAll")},+ {id: "foldAll", icon: "iconContract", label: labels.foldAll, click: () => select("foldAll")},+ {id: "separator_all", type: "separator"},...Array.from({length: 6}, (_, index): IMenu => ({id: `level${index + 1}`, iconHTML: "",label: labels.listMindmapExpandToLevel.replace("${level}", String(index + 1)),click: () => select(index + 1),})),- {id: "separator_all", type: "separator"},- {id: "expandAll", icon: "iconExpand", label: labels.expandAll, click: () => select("expandAll")},- {id: "foldAll", icon: "iconContract", label: labels.foldAll, click: () => select("foldAll")},];diff --git a/app/src/protyle/render/listMindmap/model.test.ts b/app/src/protyle/render/listMindmap/model.test.tsindex 663396d686..245c63b952 100644--- a/app/src/protyle/render/listMindmap/model.test.ts+++ b/app/src/protyle/render/listMindmap/model.test.ts@@ -2998,7 +2998,7 @@ const browserCases = async (sourceCode: string, css: string, taskSource: string,check.equal(list.outerHTML, persistedBeforeFold);const levelSelect = host.querySelector<HTMLSelectElement>(".mindmap-view__level-select");check.deepEqual(Array.from(levelSelect.options).map(option => option.value),- ["", "1", "2", "3", "4", "5", "6", "expandAll", "foldAll"]);+ ["", "expandAll", "foldAll", "1", "2", "3", "4", "5", "6"]);const levelChild = model.nodes.get(alpha).children[0].id;readonly.selectNode(levelChild);const scaleBeforeLevel = readonly.scale;diff --git a/app/src/protyle/render/listMindmap/view.ts b/app/src/protyle/render/listMindmap/view.tsindex e7ca4b9382..b262eadb82 100644--- a/app/src/protyle/render/listMindmap/view.ts+++ b/app/src/protyle/render/listMindmap/view.ts@@ -740,12 +740,12 @@ export class ListMindmapView {const placeholder = new Option(this.label("expandLevel"), "");placeholder.disabled = true;this.levelSelect.replaceChildren(placeholder);+ this.levelSelect.add(new Option(this.label("expandAll"), "expandAll"));+ this.levelSelect.add(new Option(this.label("foldAll"), "foldAll"));for (let level = 1; level <= 6; level++) {this.levelSelect.add(new Option(this.label("listMindmapExpandToLevel").replace("${level}", String(level)),String(level)));}- this.levelSelect.add(new Option(this.label("expandAll"), "expandAll"));- this.levelSelect.add(new Option(this.label("foldAll"), "foldAll"));this.levelSelect.value = "";}const descendants = new Map<string, number>();