fix(export): use page sql for current-page xlsx export
This commit is contained in:
1 parent
7e732a985a
commit
06918c06c8
16 files changed
+310
-43
No files matched your search
@@ -83,6 +83,7 @@ export interface UseDataGridExportOptions {
|
||||
extractorOptions?: ComputedRef<DataGridExtractorOptions>;
|
||||
sql: ComputedRef<string | undefined>;
|
||||
exportSql?: ComputedRef<string | undefined>;
|
||||
pageSql?: ComputedRef<string | undefined>;
|
||||
tableMeta: ComputedRef<DataGridTableMeta | undefined>;
|
||||
/** Editor setting "Include database name in generated SQL" — passed through to SQL extractors. */
|
||||
includeDatabaseName?: ComputedRef<boolean>;
|
||||
@@ -189,6 +190,7 @@ export function useDataGridExport(options: UseDataGridExportOptions) {
|
||||
extractorOptions: extractorOptionsOption,
|
||||
sql,
|
||||
exportSql: resultExportSql,
|
||||
pageSql: resultPageSql,
|
||||
tableMeta,
|
||||
copyInsertTargetLabel,
|
||||
sourceColumns,
|
||||
@@ -520,8 +522,13 @@ export function useDataGridExport(options: UseDataGridExportOptions) {
|
||||
return resultExportSql?.value || sql.value;
|
||||
}
|
||||
|
||||
async function writeXlsxResult(outputPath: string, result: { columns: string[]; columnTypes: string[]; columnComments?: (string | null)[]; rows: CellValue[][] }, includeSqlSheet: boolean, autoFilter: boolean) {
|
||||
const sqlWorksheet = includeSqlSheet ? buildXlsxSqlWorksheet([{ sql: currentExportSql() || "" }]) : undefined;
|
||||
function currentPageExportSql(): string | undefined {
|
||||
return resultPageSql?.value || currentExportSql();
|
||||
}
|
||||
|
||||
async function writeXlsxResult(outputPath: string, result: { columns: string[]; columnTypes: string[]; columnComments?: (string | null)[]; rows: CellValue[][] }, includeSqlSheet: boolean, autoFilter: boolean, sqlOverride?: string) {
|
||||
const effectiveSql = sqlOverride ?? currentExportSql();
|
||||
const sqlWorksheet = includeSqlSheet ? buildXlsxSqlWorksheet([{ sql: effectiveSql || "" }]) : undefined;
|
||||
const rightAlign = useSettingsStore().editorSettings.numericColumnRightAlign;
|
||||
// The rows are already rendered with the global export pattern, but the
|
||||
// workbook still needs the pattern itself so its numFmt matches; without it
|
||||
@@ -543,7 +550,7 @@ export function useDataGridExport(options: UseDataGridExportOptions) {
|
||||
numericColumnRightAlign: rightAlign,
|
||||
autoFilter,
|
||||
},
|
||||
{ ...sqlWorksheet, autoFilter },
|
||||
{ ...sqlWorksheet, autoFilter: false },
|
||||
],
|
||||
autoFilter,
|
||||
dateTimeFormat,
|
||||
@@ -1243,7 +1250,7 @@ export function useDataGridExport(options: UseDataGridExportOptions) {
|
||||
outputPath = path as string;
|
||||
}
|
||||
const result = await resultToExport(undefined, undefined, false, true, exportOptions.headerMode);
|
||||
await writeXlsxResult(outputPath, result, includeSqlSheet, exportOptions.autoFilter);
|
||||
await writeXlsxResult(outputPath, result, includeSqlSheet, exportOptions.autoFilter, currentPageExportSql());
|
||||
toast(t("grid.exported"));
|
||||
} catch (e: any) {
|
||||
toast(t("grid.exportFailed", { message: translateBackendError(t, e) }), 5000);
|
||||
@@ -1291,7 +1298,7 @@ export function useDataGridExport(options: UseDataGridExportOptions) {
|
||||
autoFilter: exportOptions.autoFilter,
|
||||
}));
|
||||
const sqlWorksheet = includeSqlSheet ? buildXlsxSqlWorksheet(sheets.map((sheet) => ({ resultName: sheet.sheetName, sql: sheet.sql || sheet.result.sourceStatement || "" }))) : undefined;
|
||||
await api.exportQueryResultsXlsx(outputPath, sqlWorksheet ? [...worksheets, { ...sqlWorksheet, autoFilter: exportOptions.autoFilter }] : worksheets, exportOptions.autoFilter, exportPattern || undefined);
|
||||
await api.exportQueryResultsXlsx(outputPath, sqlWorksheet ? [...worksheets, { ...sqlWorksheet, autoFilter: false }] : worksheets, exportOptions.autoFilter, exportPattern || undefined);
|
||||
toast(t("grid.exported"));
|
||||
} catch (e: any) {
|
||||
toast(t("grid.exportFailed", { message: translateBackendError(t, e) }), 5000);
|
||||
|
||||
Reference in new issue
Block a user