25 MB lightweight cross-platform database client for 100+ databases, including MySQL, PostgreSQL, SQLite, Redis, MongoDB, DuckDB, SQL Server, and Dameng. Built-in AI, MCP Server, CLI, desktop and Docker. | 轻量级跨平台数据库管理工具,支持 MySQL、PostgreSQL、SQLite、Redis、MongoDB、达梦等 100+ 数据库,提供桌面端、Docker、CLI、内置 AI 助手和 MCP。
TypeScript aicliclickhousedatabasedatabase-clientdatabase-managementdockerguimcpmongodbmysqlpostgresqlredisrustsql-serversqlitetaurivue
fix(tabs): preserve collapsed groups after closing active tabs (#13761)
ayang87509b33080ad33
diff --git a/apps/desktop/src/components/layout/EditorGroupTabBar.vue b/apps/desktop/src/components/layout/EditorGroupTabBar.vueindex 694f02432a..0540ea29b1 100644--- a/apps/desktop/src/components/layout/EditorGroupTabBar.vue+++ b/apps/desktop/src/components/layout/EditorGroupTabBar.vue@@ -1973,10 +1973,12 @@ const tabScrollBehavior = ref<ScrollBehavior>("smooth");watch(() => props.activeTabId,- (tabId) => {+ (tabId, previousTabId) => {lastDispatchedSwitchTabId = null;- // A tab that just became active must be visible: reveal its group if collapsed.- expandTabGroupForTab(tabId);+ // Closing the active tab selects a fallback without changing other groups.+ if (!previousTabId || queryStore.tabs.some((tab) => tab.id === previousTabId)) {+ expandTabGroupForTab(tabId);+ }if (isTwoRowLayout.value && tabId) {const tab = queryStore.tabs.find((item) => item.id === tabId);if (tab) {diff --git a/apps/desktop/src/components/layout/__tests__/EditorGroupTabBar.groups.spec.ts b/apps/desktop/src/components/layout/__tests__/EditorGroupTabBar.groups.spec.tsindex 8cc3950b55..94f2624565 100644--- a/apps/desktop/src/components/layout/__tests__/EditorGroupTabBar.groups.spec.ts+++ b/apps/desktop/src/components/layout/__tests__/EditorGroupTabBar.groups.spec.ts@@ -855,6 +855,64 @@ describe("EditorGroupTabBar group behavior", () => {host.remove();});+ it.each([+ { groupMode: "connection", menuTarget: "tab" },+ { groupMode: "connection", menuTarget: "header" },+ { groupMode: "sidebar", menuTarget: "tab" },+ { groupMode: "sidebar", menuTarget: "header" },+ ] as const)("preserves other $groupMode groups when closing the active group from its $menuTarget", async ({ groupMode, menuTarget }) => {+ const store = useQueryStore();+ const settings = useSettingsStore();+ settings.editorSettings.tabGroupMode = groupMode;+ settings.editorSettings.tabPlacement = "left";+ const survivor = store.createTab("mysql-1", "app", "Survivor", "query");+ store.createTab("oracle-1", "audit", "Expanded", "query");+ const closing = store.createTab("pg-1", "reports", "Closing", "query");+ const { app, host } = mountBar(store.focusedGroupId, store.tabs, closing, pinia, {+ get tabs() {+ return store.tabs;+ },+ get activeTabId() {+ return store.activeTabId;+ },+ });+ try {+ await settle();+ const survivorHeader = Array.from(host.querySelectorAll<HTMLButtonElement>(".tab-group-header")).find((header) => header.title === "mysql-1")!;+ survivorHeader.click();+ await settle();+ expect(survivorHeader.getAttribute("aria-expanded")).toBe("false");+ const states = Array.from(host.querySelectorAll<HTMLButtonElement>(".tab-group-header"), (header) => [header.title, header.getAttribute("aria-expanded")]);+ const target = menuTarget === "tab" ? host.querySelector<HTMLElement>(`[data-tab-id="${closing}"]`)! : Array.from(host.querySelectorAll<HTMLButtonElement>(".tab-group-header")).find((header) => header.title === "pg-1")!;+ target.dispatchEvent(new MouseEvent("contextmenu", { bubbles: true, cancelable: true, clientX: 10, clientY: 10 }));+ await settle();+ // Current main nests tab batch actions in a submenu; the original base+ // exposes them directly. Exercise the actual menu in either layout.+ const batchClose = Array.from(document.body.querySelectorAll<HTMLButtonElement>("[data-dbx-context-menu] button")).find((button) => button.textContent?.includes("Close multiple tabs"));+ if (batchClose) {+ batchClose.click();+ await settle();+ }+ const closeGroup = Array.from(document.body.querySelectorAll<HTMLButtonElement>("[data-dbx-context-menu] button")).find((button) => button.textContent?.includes("Close group"));+ expect(closeGroup).toBeDefined();+ closeGroup!.click();+ await settle();+ expect(store.tabs.map((tab) => tab.id)).not.toContain(closing);+ expect(store.activeTabId).toBe(survivor);+ for (const header of host.querySelectorAll<HTMLButtonElement>(".tab-group-header")) {+ expect([header.title, header.getAttribute("aria-expanded")]).toEqual(states.find(([title]) => title === header.title));+ }+ store.activateTab(store.tabs.find((tab) => tab.id !== survivor)!.id);+ await settle();+ store.activateTab(survivor);+ await settle();+ expect(survivorHeader.getAttribute("aria-expanded")).toBe("true");+ } finally {+ app.unmount();+ host.remove();+ }+ });+it("closing a group stays within the invoking pane, sparing the same-key cluster elsewhere", async () => {const store = useQueryStore();const settings = useSettingsStore();