diff --git a/apps/desktop/src/components/grid/DataGrid.vue b/apps/desktop/src/components/grid/DataGrid.vue index 3c6708da34..2fc16e3341 100644 --- a/apps/desktop/src/components/grid/DataGrid.vue +++ b/apps/desktop/src/components/grid/DataGrid.vue @@ -8109,6 +8109,7 @@ const { exportCurrentPageXlsxWithSql, exportAllResultsXlsx, exportAllResultsXlsxWithSql, + exportResultSheetsXlsx, exportSql, exportCurrentPageSql, exportTxt, @@ -12145,6 +12146,7 @@ defineExpose({ exportJson, exportSql, exportXlsx, + exportResultSheetsXlsx, openXlsx, exportTxt, defaultCopyPreference: selectedCopyPreference, diff --git a/apps/desktop/src/components/layout/ContentArea.vue b/apps/desktop/src/components/layout/ContentArea.vue index c8fe2eb22f..99e965c21d 100644 --- a/apps/desktop/src/components/layout/ContentArea.vue +++ b/apps/desktop/src/components/layout/ContentArea.vue @@ -7,6 +7,7 @@ import { defaultViewForResult } from "@/lib/query/queryResultDefaultView"; import { queryResultMessages } from "@/lib/query/queryResultMessages"; import { isQueryExecutionErrorResult } from "@/lib/query/queryResultError"; import { hasQueryOutput as tabHasQueryOutput } from "@/lib/query/queryOutput"; +import { batchResultInsertRequest } from "@/lib/query/queryResultBatchInsert"; import { batchSqlRecoveryState, type BatchSqlRecoveryAction } from "@/lib/query/batchSqlRecovery"; import type { CSSProperties } from "vue"; import { useI18n } from "vue-i18n"; @@ -190,7 +191,7 @@ import { loadObjectDdl } from "@/lib/metadata/objectDdlCache"; import { formatDdlForDisplay } from "@/lib/sql/ddlDisplay"; import { sqlObjectNavigationTypeFromTableType } from "@/lib/sql/sqlNavigation"; import type { CustomSaveHandler } from "@/composables/useDataGridEditor"; -import type { QueryMessage, QueryTab, RedisResultViewMode, TableInfoTab, TreeNode, VectorCollectionMeta } from "@/types/database"; +import type { QueryMessage, QueryResult, QueryTab, RedisResultViewMode, TableInfoTab, TreeNode, VectorCollectionMeta } from "@/types/database"; import type { SqlObjectNavigationTarget } from "@/lib/sql/sqlNavigation"; import { sqlFormatDialectForDbType, type SqlFormatDialect } from "@/lib/sql/sqlFormatter"; import { productionContextForDatabase } from "@/lib/database/productionSafety"; @@ -221,6 +222,7 @@ type DataGridHandle = DataGridColumnLayoutHandle & { exportJson: () => Promise; exportSql: () => Promise; exportXlsx: () => Promise; + exportResultSheetsXlsx: (sheets: Array<{ sheetName: string; result: QueryResult; sql?: string }>) => Promise; openXlsx: () => Promise; }; @@ -515,6 +517,82 @@ const allResultExportSheets = computed(() => sql: item.index === props.activeTab.activeResultIndex ? queryResultExecutionSql(props.activeTab) : item.result.sourceStatement, })), ); + +type ResultSetItem = (typeof visibleResultItems.value)[number]; + +const resultBatchBusy = ref(false); + +async function copySelectedResultSql(items: ResultSetItem[]) { + if (resultBatchBusy.value) return; + resultBatchBusy.value = true; + const tab = props.activeTab; + const generation = tab.resultViewGeneration; + const runId = tab.activeResultRunId; + const databaseType = activeEffectiveDatabaseType.value; + const identifierQuote = connectionStore.connectionIdentifierQuote(activeResultConnectionId.value); + const extractorOptions = JSON.parse(JSON.stringify(settingsStore.editorSettings.dataGridExtractorOptions)); + extractorOptions.sql.includeDatabaseName = settingsStore.editorSettings.generateSqlIncludeDatabaseName; + const isCurrent = () => props.activeTab === tab && tab.activeResultRunId === runId && tab.resultViewGeneration === generation && items.every((item) => (tab.results ?? [tab.result]).includes(item.result)); + try { + const sections: string[] = []; + let bytes = 0; + for (const item of items) { + const metadata = await queryStore.resolveResultMetadataForBatch(tab.id, item.result); + const request = batchResultInsertRequest(item.result, metadata, databaseType, identifierQuote, extractorOptions); + if (!request) throw new Error(t("tabs.batchCopyUnsupportedResult", { name: item.label || t("tabs.resultN", { n: item.n }) })); + if (!request.rows.length) continue; + const extraction = await api.extractDataGridSelection(request); + if (!extraction.text.trim()) throw new Error(t("tabs.batchCopyUnsupportedResult", { name: item.label || t("tabs.resultN", { n: item.n }) })); + const label = (item.label || t("tabs.resultN", { n: item.n })).replace(/[\r\n]/g, " "); + const section = `-- ${label}\n${extraction.text.trim()}`; + bytes += new TextEncoder().encode(section).length + 2; + if (bytes > 32 * 1024 * 1024) throw new Error(t("tabs.batchCopyTooLarge")); + sections.push(section); + } + if (!isCurrent()) throw new Error(t("tabs.batchResultsChanged")); + if (!sections.length) throw new Error(t("tabs.batchCopyNoCompatibleResults")); + await copyToClipboard(sections.join("\n\n")); + toast(t("grid.copied")); + } catch (error: any) { + toast(t("grid.copyFailed", { message: error?.message || String(error) }), 5000); + } finally { + resultBatchBusy.value = false; + } +} + +async function exportSelectedResultSheets(items: ResultSetItem[]) { + if (resultBatchBusy.value) return; + const dataGrid = dataGridRef.value; + if (!dataGrid) return; + const sheets = items.filter((item) => !item.result.execution_error && !item.result.server_message).map((item) => ({ sheetName: item.label || t("tabs.resultN", { n: item.n }), result: item.result })); + if (!sheets.length) return; + resultBatchBusy.value = true; + try { + await dataGrid.exportResultSheetsXlsx(sheets); + } finally { + resultBatchBusy.value = false; + } +} + +async function copySelectedResultQueries(items: ResultSetItem[]) { + const sections = items + .map((item) => { + const sql = item.result.sourceStatement?.trim(); + const label = (item.label || t("tabs.resultN", { n: item.n })).replace(/[\r\n]/g, " "); + return sql ? `-- ${label}\n${sql.endsWith(";") ? sql : `${sql};`}` : ""; + }) + .filter(Boolean); + if (!sections.length) { + toast(t("tabs.batchCopyNoCompatibleResults"), 5000); + return; + } + try { + await copyToClipboard(sections.join("\n\n")); + toast(t("grid.copied")); + } catch (error: any) { + toast(t("grid.copyFailed", { message: error?.message || String(error) }), 5000); + } +} // 结果标签优先显示来源(表名),历史批次缺少来源信息时按批次 SQL 重新解析 const resultRuns = computed(() => resultRunItems(props.activeTab, { @@ -1877,7 +1955,19 @@ defineExpose({
- +
diff --git a/apps/desktop/src/components/layout/ResultSetNavigator.vue b/apps/desktop/src/components/layout/ResultSetNavigator.vue index 0d91659107..805e8e886a 100644 --- a/apps/desktop/src/components/layout/ResultSetNavigator.vue +++ b/apps/desktop/src/components/layout/ResultSetNavigator.vue @@ -1,7 +1,7 @@