diff --git a/apps/desktop/src/components/grid/DataGrid.vue b/apps/desktop/src/components/grid/DataGrid.vue index 021dca053f..11a9e7dcd9 100644 --- a/apps/desktop/src/components/grid/DataGrid.vue +++ b/apps/desktop/src/components/grid/DataGrid.vue @@ -4491,10 +4491,12 @@ const { canCopyRowAsUpdate, copyAll, copySelectionTsv, + copySelectionTsvWithHeaders, copySelectionCsv, copySelectionJson, copySelectionSqlInList, copySelectedRowsTsv, + copyColumnNames, exportCsv, exportCurrentPageCsv, exportJson, @@ -6271,6 +6273,7 @@ function copySubmenu(): ContextMenuItem { items.push({ label: labels.update, action: copyRowAsUpdate, disabled: !canCopyPreparedUpdate() }); } items.push({ label: t("grid.copyAll"), action: copyAll }); + items.push({ label: t("grid.copyColumnNames"), action: copyColumnNames }); return { label: t("grid.copy"), icon: Copy, children: items }; } @@ -6280,6 +6283,7 @@ function selectionSubmenu(): ContextMenuItem { icon: SquareDashed, children: [ { label: t("grid.copySelectionTsv"), action: copySelectionTsv }, + { label: t("grid.copySelectionTsvWithHeaders"), action: copySelectionTsvWithHeaders }, { label: t("grid.copySelectionCsv"), action: copySelectionCsv }, { label: t("grid.copySelectionJson"), action: copySelectionJson }, { label: t("grid.copySelectionSql"), action: copySelectionSqlInList }, @@ -6316,6 +6320,7 @@ const gridContextMenuItems = computed(() => { // 1. Copy column name if (contextHeaderColumn.value) { items.push({ label: t("grid.copyColumnName"), action: copyHeaderColumn, icon: Copy }); + items.push({ label: t("grid.copyColumnNames"), action: copyColumnNames, icon: Copy }); items.push({ label: t("grid.openColumnDetailsDialog"), action: openContextColumnDetailDialog, diff --git a/apps/desktop/src/composables/useDataGridExport.ts b/apps/desktop/src/composables/useDataGridExport.ts index 849754b62f..a4abc39d23 100644 --- a/apps/desktop/src/composables/useDataGridExport.ts +++ b/apps/desktop/src/composables/useDataGridExport.ts @@ -339,6 +339,11 @@ export function useDataGridExport(options: UseDataGridExportOptions) { await copyText(formatSelectionAsTsv(selectedCells.value)); } + async function copySelectionTsvWithHeaders() { + if (!hasCellSelection.value) return; + await copyText(formatSelectionAsTsv(selectedCells.value, true)); + } + async function copySelectionCsv() { if (!hasCellSelection.value) return; await copyText(formatSelectionAsCsv(selectedCells.value)); @@ -360,6 +365,11 @@ export function useDataGridExport(options: UseDataGridExportOptions) { await copyText(formatSelectionAsTsv({ columns: columns.value, rows })); } + async function copyColumnNames() { + if (columns.value.length === 0) return; + await copyText(columns.value.join("\t")); + } + function rowToJsonObject(item: RowItem): Record { const obj: Record = {}; columns.value.forEach((col, i) => { @@ -918,10 +928,12 @@ export function useDataGridExport(options: UseDataGridExportOptions) { canCopyRowAsUpdate, copyAll, copySelectionTsv, + copySelectionTsvWithHeaders, copySelectionCsv, copySelectionJson, copySelectionSqlInList, copySelectedRowsTsv, + copyColumnNames, exportCsv, exportCurrentPageCsv, exportJson, diff --git a/apps/desktop/src/i18n/locales/en.ts b/apps/desktop/src/i18n/locales/en.ts index 9751d0e4fb..3b483a5bd9 100644 --- a/apps/desktop/src/i18n/locales/en.ts +++ b/apps/desktop/src/i18n/locales/en.ts @@ -518,12 +518,14 @@ export default { copyCell: "Copy Cell", copyRow: "Copy Row (JSON)", copyColumnJson: "Copy Column (JSON)", + copyColumnNames: "Copy Column Names", copyRowInsert: "Copy as INSERT", copyRowInsertWithoutPrimaryKeys: "Copy as INSERT without Primary Keys", copyRowUpdate: "Copy as UPDATE", copyAll: "Copy All (TSV)", selection: "Selection", copySelectionTsv: "Copy Selection (TSV)", + copySelectionTsvWithHeaders: "Copy Selection with Headers (TSV)", copySelectionCsv: "Copy Selection (CSV)", copySelectionJson: "Copy Selection (JSON)", copySelectionSql: "Copy Selection as SQL IN List", diff --git a/apps/desktop/src/i18n/locales/es.ts b/apps/desktop/src/i18n/locales/es.ts index d19d3ae648..86a1abb759 100644 --- a/apps/desktop/src/i18n/locales/es.ts +++ b/apps/desktop/src/i18n/locales/es.ts @@ -459,12 +459,14 @@ export default { copyCell: "Copiar celda", copyRow: "Copiar fila (JSON)", copyColumnJson: "Copiar columna (JSON)", + copyColumnNames: "Copiar nombres de columnas", copyRowInsert: "Copiar como INSERT", copyRowInsertWithoutPrimaryKeys: "Copiar como INSERT sin claves primarias", copyRowUpdate: "Copiar como UPDATE", copyAll: "Copiar todo (TSV)", selection: "Selección", copySelectionTsv: "Copiar selección (TSV)", + copySelectionTsvWithHeaders: "Copiar selección con encabezados (TSV)", copySelectionCsv: "Copiar selección (CSV)", copySelectionJson: "Copiar selección (JSON)", copySelectionSql: "Copiar selección como lista SQL IN", diff --git a/apps/desktop/src/i18n/locales/it.ts b/apps/desktop/src/i18n/locales/it.ts index 79bf0e1f75..5cfd29a979 100644 --- a/apps/desktop/src/i18n/locales/it.ts +++ b/apps/desktop/src/i18n/locales/it.ts @@ -464,12 +464,14 @@ export default { copyCell: "Copia Cella", copyRow: "Copia Riga (JSON)", copyColumnJson: "Copia Colonna (JSON)", + copyColumnNames: "Copia Nomi Colonne", copyRowInsert: "Copia come INSERT", copyRowInsertWithoutPrimaryKeys: "Copia come INSERT senza Chiavi Primarie", copyRowUpdate: "Copia come UPDATE", copyAll: "Copia Tutto (TSV)", selection: "Selezione", copySelectionTsv: "Copia Selezione (TSV)", + copySelectionTsvWithHeaders: "Copia Selezione con Intestazioni (TSV)", copySelectionCsv: "Copia Selezione (CSV)", copySelectionJson: "Copia Selezione (JSON)", copySelectionSql: "Copia Selezione come elenco SQL IN", diff --git a/apps/desktop/src/i18n/locales/ja.ts b/apps/desktop/src/i18n/locales/ja.ts index 0014088778..ed3d2c3476 100644 --- a/apps/desktop/src/i18n/locales/ja.ts +++ b/apps/desktop/src/i18n/locales/ja.ts @@ -514,12 +514,14 @@ export default { copyCell: "セルをコピー", copyRow: "行をコピー (JSON)", copyColumnJson: "列をコピー (JSON)", + copyColumnNames: "列名をコピー", copyRowInsert: "INSERTとしてコピー", copyRowInsertWithoutPrimaryKeys: "主キーなしでINSERTとしてコピー", copyRowUpdate: "UPDATEとしてコピー", copyAll: "すべてコピー (TSV)", selection: "選択範囲", copySelectionTsv: "選択範囲をコピー (TSV)", + copySelectionTsvWithHeaders: "ヘッダー付きで選択範囲をコピー (TSV)", copySelectionCsv: "選択範囲をコピー (CSV)", copySelectionJson: "選択範囲をコピー (JSON)", copySelectionSql: "選択範囲をSQL INリストとしてコピー", diff --git a/apps/desktop/src/i18n/locales/pt-BR.ts b/apps/desktop/src/i18n/locales/pt-BR.ts index bcb05643d7..f841e6c78e 100644 --- a/apps/desktop/src/i18n/locales/pt-BR.ts +++ b/apps/desktop/src/i18n/locales/pt-BR.ts @@ -464,12 +464,14 @@ export default { copyCell: "Copiar Célula", copyRow: "Copiar Linha (JSON)", copyColumnJson: "Copiar Coluna (JSON)", + copyColumnNames: "Copiar Nomes das Colunas", copyRowInsert: "Copiar como INSERT", copyRowInsertWithoutPrimaryKeys: "Copiar como INSERT sem Chaves Primárias", copyRowUpdate: "Copiar como UPDATE", copyAll: "Copiar Tudo (TSV)", selection: "Seleção", copySelectionTsv: "Copiar Seleção (TSV)", + copySelectionTsvWithHeaders: "Copiar Seleção com Cabeçalhos (TSV)", copySelectionCsv: "Copiar Seleção (CSV)", copySelectionJson: "Copiar Seleção (JSON)", copySelectionSql: "Copiar Seleção como Lista IN do SQL", diff --git a/apps/desktop/src/i18n/locales/zh-CN.ts b/apps/desktop/src/i18n/locales/zh-CN.ts index f3b0583c75..d9b7423f93 100644 --- a/apps/desktop/src/i18n/locales/zh-CN.ts +++ b/apps/desktop/src/i18n/locales/zh-CN.ts @@ -519,12 +519,14 @@ export default { copyCell: "复制单元格", copyRow: "复制行 (JSON)", copyColumnJson: "复制列 (JSON)", + copyColumnNames: "复制全部列名", copyRowInsert: "复制为 INSERT 语句", copyRowInsertWithoutPrimaryKeys: "复制为 INSERT 语句(不含主键)", copyRowUpdate: "复制为 UPDATE 语句", copyAll: "复制全部 (TSV)", selection: "选区", copySelectionTsv: "复制选区 (TSV)", + copySelectionTsvWithHeaders: "复制选区含表头 (TSV)", copySelectionCsv: "复制选区 (CSV)", copySelectionJson: "复制选区 (JSON)", copySelectionSql: "复制选区为 SQL IN 列表", diff --git a/apps/desktop/src/i18n/locales/zh-TW.ts b/apps/desktop/src/i18n/locales/zh-TW.ts index b5127f95d8..6937d365b6 100644 --- a/apps/desktop/src/i18n/locales/zh-TW.ts +++ b/apps/desktop/src/i18n/locales/zh-TW.ts @@ -465,12 +465,14 @@ export default { copyCell: "複製儲存格", copyRow: "複製整筆 (JSON)", copyColumnJson: "複製欄 (JSON)", + copyColumnNames: "複製全部欄名", copyRowInsert: "複製為 INSERT 語句", copyRowInsertWithoutPrimaryKeys: "複製為 INSERT 語句(不含主鍵)", copyRowUpdate: "複製為 UPDATE 語句", copyAll: "複製全部 (TSV)", selection: "選區", copySelectionTsv: "複製選區 (TSV)", + copySelectionTsvWithHeaders: "複製選區含表頭 (TSV)", copySelectionCsv: "複製選區 (CSV)", copySelectionJson: "複製選區 (JSON)", copySelectionSql: "複製選區為 SQL IN 清單", diff --git a/apps/desktop/src/lib/__tests__/gridSelection.spec.ts b/apps/desktop/src/lib/__tests__/gridSelection.spec.ts new file mode 100644 index 0000000000..549fa221ca --- /dev/null +++ b/apps/desktop/src/lib/__tests__/gridSelection.spec.ts @@ -0,0 +1,31 @@ +import { describe, expect, it } from "vitest"; +import { formatSelectionAsTsv } from "@/lib/gridSelection"; + +describe("gridSelection", () => { + it("formats TSV selections without headers by default", () => { + expect( + formatSelectionAsTsv({ + columns: ["id", "name"], + rows: [ + [1, "Ada"], + [2, "Lin"], + ], + }), + ).toBe("1\tAda\n2\tLin"); + }); + + it("can include column headers in TSV selections", () => { + expect( + formatSelectionAsTsv( + { + columns: ["id", "name"], + rows: [ + [1, "Ada"], + [2, "Lin"], + ], + }, + true, + ), + ).toBe("id\tname\n1\tAda\n2\tLin"); + }); +}); diff --git a/apps/desktop/src/lib/gridSelection.ts b/apps/desktop/src/lib/gridSelection.ts index acbf6c12bd..1078105e41 100644 --- a/apps/desktop/src/lib/gridSelection.ts +++ b/apps/desktop/src/lib/gridSelection.ts @@ -104,8 +104,10 @@ function sqlValue(value: GridCellValue): string { return `'${String(value).replace(/'/g, "''")}'`; } -export function formatSelectionAsTsv(selection: SelectionData): string { - return selection.rows.map((row) => row.map(displayValue).join("\t")).join("\n"); +export function formatSelectionAsTsv(selection: SelectionData, includeHeader = false): string { + const body = selection.rows.map((row) => row.map(displayValue).join("\t")).join("\n"); + if (!includeHeader) return body; + return [selection.columns.join("\t"), body].filter(Boolean).join("\n"); } export function formatSelectionAsCsv(selection: SelectionData): string {