Skip to content

armgit / dbx

Public Imported from GitHub
0

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。

fix(export): export full result set when paged results have multiple query results

misxzaizefcdabe12f5e
diff --git a/apps/desktop/src/composables/__tests__/useDataGridExport.xlsx.spec.ts b/apps/desktop/src/composables/__tests__/useDataGridExport.xlsx.spec.ts
index b6916da383..725d5c10c4 100644
--- a/apps/desktop/src/composables/__tests__/useDataGridExport.xlsx.spec.ts
+++ b/apps/desktop/src/composables/__tests__/useDataGridExport.xlsx.spec.ts
@@ -7,11 +7,14 @@ import type { QueryResult } from "@/types/database";
import { useExportTracker } from "@/composables/useExportTracker";
const mocks = vi.hoisted(() => ({
+ native: false,
exportQueryResultsXlsx: vi.fn(),
startQueryResultExport: vi.fn().mockResolvedValue({ exportId: "export-1", tableName: "Query Result", rowsExported: 1, totalRows: 1, status: "Done" }),
toast: vi.fn(),
}));
+vi.mock("@/lib/backend/tauriRuntime", () => ({ isTauriRuntime: () => mocks.native }));
+
vi.mock("@/components/export/XlsxHeaderDialog.vue", () => ({
default: {
emits: ["confirm"],
@@ -197,3 +200,52 @@ describe("useDataGridExport XLSX headers", () => {
);
});
});
+
+describe("useDataGridExport paged multi-result full export completion", () => {
+ beforeEach(() => {
+ mocks.native = false;
+ vi.clearAllMocks();
+ const tracker = useExportTracker();
+ for (const task of tracker.tasks.value) tracker.removeTask(task.exportId);
+ });
+
+ function pagedOptions() {
+ const options = createOptions();
+ const active = queryResult(["id"], [[1]]);
+ options.allExportResults = computed(() => [
+ { sheetName: "Ids", result: active },
+ { sheetName: "Names", result: queryResult(["name"], [["Ada"]]) },
+ ]);
+ options.snapshotResult = computed(() => active);
+ options.hasCompleteLocalResult = computed(() => false);
+ options.fullExportResult = vi.fn(async () => {
+ throw new Error("full result fetch failed");
+ });
+ return options;
+ }
+
+ it("aborts the workbook export when the completion fetch fails instead of writing the current page (memory path)", async () => {
+ mocks.native = true;
+ const options = pagedOptions();
+ const state = useDataGridExport(options);
+
+ await state.exportAllResultsXlsx();
+
+ expect(options.fullExportResult).toHaveBeenCalledOnce();
+ expect(mocks.startQueryResultExport).not.toHaveBeenCalled();
+ expect(mocks.exportQueryResultsXlsx).not.toHaveBeenCalled();
+ expect(mocks.toast).toHaveBeenCalledWith("grid.exportFailed", 5000);
+ });
+
+ it("aborts the export when the completion fetch fails instead of writing the current page (web fallback)", async () => {
+ mocks.native = false;
+ const options = pagedOptions();
+ const state = useDataGridExport(options);
+
+ await state.exportAllResultsXlsx();
+
+ expect(options.fullExportResult).toHaveBeenCalledOnce();
+ expect(mocks.exportQueryResultsXlsx).not.toHaveBeenCalled();
+ expect(mocks.toast).toHaveBeenCalledWith("grid.exportFailed", 5000);
+ });
+});
diff --git a/apps/desktop/src/composables/useDataGridExport.ts b/apps/desktop/src/composables/useDataGridExport.ts
index 2ecc679687..e48f606246 100644
--- a/apps/desktop/src/composables/useDataGridExport.ts
+++ b/apps/desktop/src/composables/useDataGridExport.ts
@@ -1946,11 +1946,34 @@ export function useDataGridExport(options: UseDataGridExportOptions) {
async function exportMemoryResultSheetsXlsx(sheetsToExport: DataGridExportSheet[] | undefined, includeSqlSheet: boolean): Promise<boolean> {
if (!isTauriRuntime()) return false;
- const sheets = (sheetsToExport ?? allExportResults?.value ?? []).filter((sheet) => sheet.result.columns.length > 0);
+ let sheets = (sheetsToExport ?? allExportResults?.value ?? []).filter((sheet) => sheet.result.columns.length > 0);
if (!sheets.length) return true;
+ // 导出全部结果集(sheetsToExport === undefined)时,当前激活结果集可能只持
+ // 有当前页:SQL 分页会把 tab.result 替换为当前页,而 allExportResults 直接
+ // 引用它(snapshotResult === props.result === 激活结果集)。此时重跑一次查询
+ // 拉全量,避免"导出所有数据"实际只导出当前页(#13726)。
+ const completedResultResults = new Set<QueryResult>();
+ if (sheetsToExport === undefined && fullExportResult && !hasCompleteLocalResult?.value) {
+ const activeIndex = sheets.findIndex((sheet) => sheet.result === options.snapshotResult?.value);
+ if (activeIndex >= 0) {
+ // 用户要求全部数据:补全查询失败(含取消)时中止导出而不是静默回退到
+ // 当前页快照,否则会产出残缺文件;错误向上传播,与单结果导出路径
+ // (resultToExport 中的 fullExportResult 调用)一致,由统一 toast 提示。
+ const fullResult = await fullExportResult();
+ if (fullResult?.columns.length) {
+ sheets = sheets.map((sheet, index) => (index === activeIndex ? { ...sheet, result: fullResult } : sheet));
+ completedResultResults.add(fullResult);
+ }
+ }
+ }
+ // 补全后的激活 sheet 是重建对象(result 替换为全量结果),不再与
+ // allExportResults 中任一原对象共享引用,但其"仍是当前激活结果集"已由
+ // sourceCurrent() 通过 snapshotResult 引用一致性保证,故在此豁免,避免
+ // 补全后误报 "Export result context changed"。
+ const isSheetInAllExportResults = (sheet: DataGridExportSheet) => completedResultResults.has(sheet.result) || !!allExportResults?.value?.some((origin) => origin === sheet || origin.result === sheet.result);
const sourceCurrent = captureExportConfirmationSource();
const sources = sheets.map((sheet) => ({ sheet, result: sheet.result, rows: sheet.result.rows }));
- const isCurrent = () => sourceCurrent() && sources.every(({ sheet, result, rows }) => sheet.result === result && sheet.result.rows === rows && (sheetsToExport !== undefined || !!allExportResults?.value?.includes(sheet)));
+ const isCurrent = () => sourceCurrent() && sources.every(({ sheet, result, rows }) => sheet.result === result && sheet.result.rows === rows && (sheetsToExport !== undefined || isSheetInAllExportResults(sheet)));
const settings = { ...useSettingsStore().editorSettings };
const title = currentExportTitle();
const fileName = exportFileName("query-results", "xlsx", { allResults: true });
@@ -1985,7 +2008,7 @@ export function useDataGridExport(options: UseDataGridExportOptions) {
const resourcesCurrent = () =>
!scopeDisposed &&
sourceCurrent() &&
- lobSources.every(({ sheet, result, rows }) => sheet.result === result && result.rows === rows && (sheetsToExport !== undefined || !!allExportResults?.value?.includes(sheet))) &&
+ lobSources.every(({ sheet, result, rows }) => sheet.result === result && result.rows === rows && (sheetsToExport !== undefined || isSheetInAllExportResults(sheet))) &&
resources.every((resource) => {
if (!connections) return true;
const config = connections.getConfig(resource.connectionId);
@@ -2142,9 +2165,28 @@ export function useDataGridExport(options: UseDataGridExportOptions) {
await runExclusiveExport(async () => {
try {
- const sheets = (sheetsToExport ?? allExportResults?.value ?? []).filter((sheet) => sheet.result.columns.length > 0);
+ let sheets = (sheetsToExport ?? allExportResults?.value ?? []).filter((sheet) => sheet.result.columns.length > 0);
if (sheets.length === 0) return;
+ // 与 exportMemoryResultSheetsXlsx 相同:导出全部结果集且激活结果集分页
+ // 未完整时,重跑查询拉全量,避免只导出当前页(#13726)。
+ const completedResultResults = new Set<QueryResult>();
+ if (sheetsToExport === undefined && fullExportResult && !hasCompleteLocalResult?.value) {
+ const activeIndex = sheets.findIndex((sheet) => sheet.result === options.snapshotResult?.value);
+ if (activeIndex >= 0) {
+ // 与 exportMemoryResultSheetsXlsx 相同:补全失败(含取消)时中止导出,
+ // 不静默回退到当前页,错误由外层统一 toast 报错。
+ const fullResult = await fullExportResult();
+ if (fullResult?.columns.length) {
+ sheets = sheets.map((sheet, index) => (index === activeIndex ? { ...sheet, result: fullResult } : sheet));
+ completedResultResults.add(fullResult);
+ }
+ }
+ }
+ // 补全后的激活 sheet 是重建对象,不再与 allExportResults 共享引用,但
+ // snapshotResult 引用一致性已保证其仍为当前激活结果集,故豁免成员检查。
+ const isSheetInAllExportResults = (sheet: DataGridExportSheet) => completedResultResults.has(sheet.result) || !!allExportResults?.value?.some((origin) => origin === sheet || origin.result === sheet.result);
+
let outputPath = exportFileName("query-results", "xlsx", { allResults: true });
if (isTauriRuntime()) {
const path = await promptExportSavePath({
@@ -2161,7 +2203,7 @@ export function useDataGridExport(options: UseDataGridExportOptions) {
const worksheets = [];
for (const sheet of sheets) {
const sourceRows = sheet.result.rows;
- const rows = await materializeExportSnapshot(sheet.result, () => sheet.result.rows === sourceRows && (sheetsToExport !== undefined || !!allExportResults?.value?.includes(sheet)));
+ const rows = await materializeExportSnapshot(sheet.result, () => sheet.result.rows === sourceRows && (sheetsToExport !== undefined || isSheetInAllExportResults(sheet)));
if (sheet.result.large_value_refs?.length || sheet.result.large_value_cells?.some((cell) => cell.value_ref)) assertSnapshotXlsxCellLengths(rows);
worksheets.push({
sheetName: sheet.sheetName,