xiaoxue_admin
/
dbx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(tabs): restore previous tab after data tab close

This commit is contained in:
t8y2 2026-07-02 00:48:30 +08:00
parent dfd1e7e6d1
commit 58e2d983c2
2 changed files with 40 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
apps/desktop/src/stores/queryStore.ts
View File

@ -190,6 +190,7 @@ export const useQueryStore = defineStore("query", () => {
const restored = loadSavedTabs();
const tabs = ref<QueryTab[]>(restored.tabs);
const activeTabId = ref<string | null>(restored.activeTabId);
const activeTabHistory = ref<string[]>(restored.activeTabId ? [restored.activeTabId] : []);
const showCloseConfirm = ref(false);
const pendingCloseTabId = ref<string | null>(null);
const pendingBatchCloseTabIds = ref<string[] | null>(null);
@ -866,7 +867,7 @@ export const useQueryStore = defineStore("query", () => {
clearResultPayload(tabs.value[idx]);
tabs.value.splice(idx, 1);
if (activeTabId.value === id) {
activeTabId.value = tabs.value[Math.min(idx, tabs.value.length - 1)]?.id ?? null;
activeTabId.value = fallbackActiveTabAfterClose(id, idx);
}
if (force) resumePendingBatchCloseAfter(id);
}
@ -2246,9 +2247,28 @@ export const useQueryStore = defineStore("query", () => {
}
}
watch(activeTabId, (id) => {
touchResult(tabs.value.find((tab) => tab.id === id));
});
function rememberActiveTab(id: string | null) {
if (!id || !tabs.value.some((tab) => tab.id === id)) return;
activeTabHistory.value = [...activeTabHistory.value.filter((tabId) => tabId !== id), id];
}
function fallbackActiveTabAfterClose(closedId: string, closedIndex: number): string | null {
const remainingIds = new Set(tabs.value.map((tab) => tab.id));
// Prefer the most recently focused remaining tab. This preserves the
// source query tab when a transient table-info/data tab is closed.
const history = activeTabHistory.value.filter((tabId) => tabId !== closedId && remainingIds.has(tabId));
activeTabHistory.value = history;
return [...history].reverse().find((tabId) => remainingIds.has(tabId)) ?? tabs.value[Math.min(closedIndex, tabs.value.length - 1)]?.id ?? null;
}
watch(
activeTabId,
(id) => {
rememberActiveTab(id);
touchResult(tabs.value.find((tab) => tab.id === id));
},
{ flush: "sync" },
);
function restoreCachedResultPayload(tab: QueryTab, snapshot: Awaited<ReturnType<typeof readTabResultSnapshot>>) {
if (!snapshot) return false;

16
packages/app-tests/queryStore.test.ts
View File

@ -101,6 +101,22 @@ test("renames query tab titles", () => {
assert.equal(tab?.customTitle, true);
});
test("closing an active data tab restores the previously focused query tab", () => {
setActivePinia(createPinia());
const store = useQueryStore();
const firstQueryId = store.createTab("conn-1", "db", "query_1", "query");
store.createTab("conn-1", "db", "query_2", "query");
store.activeTabId = firstQueryId;
const dataTabId = store.createTab("conn-1", "db", "public.users", "data", "public");
assert.equal(store.activeTabId, dataTabId);
store.closeTab(dataTabId);
assert.equal(store.activeTabId, firstQueryId);
});
test("linkExternalSqlPath records the local path and detaches saved SQL", () => {
setActivePinia(createPinia());
const store = useQueryStore();