From 60f941aa27c4cd2926211252c45b81e326050bc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=8C=E4=B8=AB=E8=AE=B2=E6=A2=B5?= Date: Thu, 2 Jul 2026 10:33:35 +0800 Subject: [PATCH] =?UTF-8?q?feat(connection):=20=E6=B7=BB=E5=8A=A0=E5=AD=90?= =?UTF-8?q?=E7=BB=84=E6=97=B6=E6=94=AF=E6=8C=81=E5=AE=9A=E4=B9=89=E7=BB=84?= =?UTF-8?q?=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在创建新子组时，自动展开其父组，支持自定义组名 --- .../src/components/sidebar/ConnectionTree.vue | 17 +++++++++++++++-- .../desktop/src/components/sidebar/TreeItem.vue | 2 ++ apps/desktop/src/lib/sidebarLayout.ts | 4 +++- packages/app-tests/sidebarLayout.test.ts | 15 +++++++++++++++ 4 files changed, 35 insertions(+), 3 deletions(-) diff --git a/apps/desktop/src/components/sidebar/ConnectionTree.vue b/apps/desktop/src/components/sidebar/ConnectionTree.vue index 97cc0c627f..484891448f 100644 --- a/apps/desktop/src/components/sidebar/ConnectionTree.vue +++ b/apps/desktop/src/components/sidebar/ConnectionTree.vue @@ -447,9 +447,12 @@ function clearSidebarSelection() { async function createNewGroup() { const groupId = store.createConnectionGroup(t("connectionGroup.newGroupDefault")); + await startRenamingCreatedGroup(groupId); +} + +async function startRenamingCreatedGroup(groupId: string) { pendingRenameGroupId.value = groupId; store.selectedTreeNodeId = groupId; - if (isFiltering.value) { searchQuery.value = ""; deferredSearchQuery.value = ""; @@ -921,7 +924,16 @@ defineExpose({ focusSearch, createNewGroup }); flow-mode >
@@ -943,6 +955,7 @@ defineExpose({ focusSearch, createNewGroup }); :highlighted="highlightedNodeId === item.id" @search-toggle="onSearchToggle" @rename-started="pendingRenameGroupId = null" + @group-created="startRenamingCreatedGroup" />
diff --git a/apps/desktop/src/components/sidebar/TreeItem.vue b/apps/desktop/src/components/sidebar/TreeItem.vue index 57939afaca..dcb82b50f8 100644 --- a/apps/desktop/src/components/sidebar/TreeItem.vue +++ b/apps/desktop/src/components/sidebar/TreeItem.vue @@ -176,6 +176,7 @@ const props = defineProps<{ const emit = defineEmits<{ "rename-started": []; + "group-created": [groupId: string]; "node-toggled": [node: TreeNode, wasExpanded: boolean]; "search-toggle": [node: TreeNode]; }>(); @@ -3522,6 +3523,7 @@ function newConnectionInGroup() { function newSubgroup() { const groupId = connectionStore.createConnectionGroup(t("connectionGroup.newGroupDefault"), props.node.id); connectionStore.selectedTreeNodeId = groupId; + emit("group-created", groupId); } function confirmDeleteGroup() { diff --git a/apps/desktop/src/lib/sidebarLayout.ts b/apps/desktop/src/lib/sidebarLayout.ts index 7ff7fe5c61..803f85e2fd 100644 --- a/apps/desktop/src/lib/sidebarLayout.ts +++ b/apps/desktop/src/lib/sidebarLayout.ts @@ -248,11 +248,13 @@ export function createGroup(layout: SidebarLayout, name: string, parentGroupId?: const group: ConnectionGroup = { id: groupId, name, collapsed: false }; const order = cloneEntries(layout.order); const entry: SidebarOrderEntry = { type: "group", id: groupId, children: [] }; + let parentFound = false; if (parentGroupId) { const parent = findGroupEntry(order, parentGroupId); if (parent) { parent.children = [...(parent.children ?? []), entry]; + parentFound = true; } else { order.push(entry); } @@ -263,7 +265,7 @@ export function createGroup(layout: SidebarLayout, name: string, parentGroupId?: return { groupId, layout: { - groups: [...layout.groups, group], + groups: [...layout.groups, group].map((current) => (parentFound && current.id === parentGroupId ? { ...current, collapsed: false } : current)), order, }, }; diff --git a/packages/app-tests/sidebarLayout.test.ts b/packages/app-tests/sidebarLayout.test.ts index 5d1b0ca223..2b0851c339 100644 --- a/packages/app-tests/sidebarLayout.test.ts +++ b/packages/app-tests/sidebarLayout.test.ts @@ -168,6 +168,21 @@ test("createGroup adds a new empty group", () => { assert.ok(result.layout.order[0].type === "group"); }); +test("createGroup expands parent group when adding a subgroup", () => { + const layout: SidebarLayout = { + groups: [{ id: "g1", name: "Parent", collapsed: true }], + order: [{ type: "group", id: "g1", children: [] }], + }; + + const result = createGroup(layout, "Child", "g1"); + const parentGroup = result.layout.groups.find((group) => group.id === "g1"); + const parentEntry = result.layout.order[0]; + + assert.equal(parentGroup?.collapsed, false); + assert.equal(parentEntry.type, "group"); + assert.deepEqual(parentEntry.type === "group" ? parentEntry.children : undefined, [{ type: "group", id: result.groupId, children: [] }]); +}); + // --- renameGroup --- test("renameGroup updates group name", () => {