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。

feat(grid): support original text copy across a single column (#11498)

zipgd6777a5ce436
diff --git a/apps/desktop/src/components/grid/DataGridExtractorDialog.vue b/apps/desktop/src/components/grid/DataGridExtractorDialog.vue
index 006e50433e..cc9f3655da 100644
--- a/apps/desktop/src/components/grid/DataGridExtractorDialog.vue
+++ b/apps/desktop/src/components/grid/DataGridExtractorDialog.vue
@@ -167,6 +167,8 @@ function save() {
</Select>
</div>
+ <p v-if="draftExtractor === 'raw'" class="text-xs text-muted-foreground">{{ t("grid.copyExtractorRawHint") }}</p>
+
<template v-if="isDsv">
<div v-if="draftExtractor === 'dsv'" class="space-y-1.5">
<Label>{{ t("grid.copyExtractorColumnSeparator") }}</Label>
diff --git a/apps/desktop/src/components/grid/__tests__/DataGridContextExtractor.spec.ts b/apps/desktop/src/components/grid/__tests__/DataGridContextExtractor.spec.ts
index 5d53d91173..d25db2664c 100644
--- a/apps/desktop/src/components/grid/__tests__/DataGridContextExtractor.spec.ts
+++ b/apps/desktop/src/components/grid/__tests__/DataGridContextExtractor.spec.ts
@@ -12,6 +12,7 @@ const mocks = vi.hoisted(() => ({
buildTableSelectSql: vi.fn(async ({ whereInput }: { whereInput?: string }) => `SELECT payload FROM events${whereInput ? ` WHERE ${whereInput}` : ""}`),
executeMulti: vi.fn(),
cancelQuery: vi.fn(),
+ extractDataGridSelection: vi.fn(),
copyToClipboard: vi.fn(),
toast: vi.fn(),
}));
@@ -21,6 +22,7 @@ vi.mock("@/lib/backend/api", () => ({
buildTableSelectSql: mocks.buildTableSelectSql,
executeMulti: mocks.executeMulti,
cancelQuery: mocks.cancelQuery,
+ extractDataGridSelection: mocks.extractDataGridSelection,
}));
vi.mock("@/composables/useToast", () => ({
@@ -261,6 +263,24 @@ afterEach(() => {
});
describe("DataGrid context menu target lifecycle", () => {
+ it("offers original text for a single column spanning multiple rows", async () => {
+ const lines = ["CREATE view v_Test as", "\tselect 'quoted' as value", '-- "keep quotes"'];
+ mocks.extractDataGridSelection.mockResolvedValueOnce({ text: lines.join("\n"), mimeType: "text/plain", fileExtension: "txt", rowCount: 3, columnCount: 1 });
+ mocks.copyToClipboard.mockResolvedValueOnce(true);
+ const { host } = mountGrid({ columns: ["id", "payload"], rows: lines.map((line, index) => [index + 1, line]), affected_rows: 0, execution_time_ms: 0 });
+ await settle();
+ columnHeader(host, 1).click();
+ openContextMenu(gridCell(host));
+ await settle();
+ contextMenuButton("Copy").dispatchEvent(new MouseEvent("mouseenter", { bubbles: true }));
+ await settle();
+
+ contextMenuButton("Original Text (Single Column)").click();
+
+ await vi.waitFor(() => expect(mocks.copyToClipboard).toHaveBeenCalledWith(lines.join("\n")));
+ expect(mocks.extractDataGridSelection).toHaveBeenCalledWith(expect.objectContaining({ extractor: "raw", rows: lines.map((line) => [line]) }));
+ });
+
it("does not reuse a closed header target for a later select-all menu", async () => {
const { host } = mountGrid(hydratedResult(1, "value"));
await settle();
@@ -362,7 +382,7 @@ describe("DataGrid context menu target lifecycle", () => {
contextMenuButton("Export").dispatchEvent(new MouseEvent("mouseenter", { bubbles: true }));
await settle();
- expect(contextMenuButton("Cell Text").disabled).toBe(false);
+ expect(contextMenuButton("Original Text (Single Column)").disabled).toBe(false);
expect(contextMenuButton("JSON Array").disabled).toBe(false);
expect(contextMenuButton("SQL Select").disabled).toBe(false);
});
diff --git a/apps/desktop/src/composables/__tests__/useDataGridExport.spec.ts b/apps/desktop/src/composables/__tests__/useDataGridExport.spec.ts
index 0abcecf613..09e92d012f 100644
--- a/apps/desktop/src/composables/__tests__/useDataGridExport.spec.ts
+++ b/apps/desktop/src/composables/__tests__/useDataGridExport.spec.ts
@@ -882,12 +882,36 @@ describe("useDataGridExport prepared row statements", () => {
expect(copyToClipboard).toHaveBeenCalledWith(payload);
});
- it("does not allow raw output for a multi-cell selection", async () => {
+ it("copies and previews a single-column view definition as original text", async () => {
+ const lines = ["CREATE view v_Test as", "\tselect 'quoted' as value", '-- "keep quotes"'];
+ const rows = lines.map((line) => [line]);
const matrix: CellSelectionMatrix = {
- rowIndexes: [0, 1],
+ rowIndexes: [0, 1, 2],
columnIndexes: [0],
- columns: ["id"],
- rows: [[1], [2]],
+ columns: ["Text"],
+ rows,
+ };
+ const result = { text: lines.join("\n"), mimeType: "text/plain", fileExtension: "txt", rowCount: 3, columnCount: 1 };
+ vi.mocked(extractDataGridSelection).mockResolvedValue(result);
+ const state = createExportState(editableTable, ["Text"], matrix, undefined, undefined, rows);
+
+ expect(state.canCopyWithExtractor("raw")).toBe(true);
+ await expect(state.copyWithPreference("raw")).resolves.toBe(true);
+ expect(extractDataGridSelection).toHaveBeenCalledWith(expect.objectContaining({ extractor: "raw", rows }));
+ expect(copyToClipboard).toHaveBeenCalledWith(result.text);
+ expect(parseDataGridClipboard(result.text)).toEqual(rows);
+ await expect(state.previewWithPreference("raw", DEFAULT_DATA_GRID_EXTRACTOR_OPTIONS)).resolves.toMatchObject({ text: result.text, sourceRowCount: 3, truncated: false });
+ });
+
+ it("does not allow raw output for a multi-column selection", async () => {
+ const matrix: CellSelectionMatrix = {
+ rowIndexes: [0, 1],
+ columnIndexes: [0, 1],
+ columns: ["id", "name"],
+ rows: [
+ [1, "Ada"],
+ [2, "Linus"],
+ ],
};
const state = createExportState(editableTable, ["id", "name"], matrix, undefined, undefined, [
[1, "Ada"],
diff --git a/apps/desktop/src/composables/useDataGridExtractor.ts b/apps/desktop/src/composables/useDataGridExtractor.ts
index fbd446617f..511f24a6b4 100644
--- a/apps/desktop/src/composables/useDataGridExtractor.ts
+++ b/apps/desktop/src/composables/useDataGridExtractor.ts
@@ -374,7 +374,7 @@ export function useDataGridExtractor(options: UseDataGridExtractorOptions) {
}
if (extractor === "raw") {
const request = buildRequest(extractor, extractorOptions);
- return request !== null && request.rows.length * request.selectedColumnIndexes.length === 1;
+ return request !== null && request.rows.length > 0 && request.selectedColumnIndexes.length === 1;
}
return selectionData() !== null;
}
diff --git a/apps/desktop/src/i18n/__tests__/gridCopyExtractorSavedParity.spec.ts b/apps/desktop/src/i18n/__tests__/gridCopyExtractorSavedParity.spec.ts
index 2b2c5a81bf..608383de0f 100644
--- a/apps/desktop/src/i18n/__tests__/gridCopyExtractorSavedParity.spec.ts
+++ b/apps/desktop/src/i18n/__tests__/gridCopyExtractorSavedParity.spec.ts
@@ -35,5 +35,7 @@ describe("grid copy extractor saved locale parity", () => {
const grid = (locale as { grid: Record<string, unknown> }).grid;
expect(grid.copyExtractorSaved, `${_name}: grid.copyExtractorSaved`).toBeTypeOf("string");
expect(grid.copyExtractorSaved as string, `${_name}: grid.copyExtractorSaved`).not.toHaveLength(0);
+ expect(grid.copyExtractorRawHint, `${_name}: grid.copyExtractorRawHint`).toBeTypeOf("string");
+ expect(grid.copyExtractorRawHint as string, `${_name}: grid.copyExtractorRawHint`).not.toHaveLength(0);
});
});
diff --git a/apps/desktop/src/i18n/locales/az.ts b/apps/desktop/src/i18n/locales/az.ts
index 3ae2ce7a03..57ea6e79ba 100644
--- a/apps/desktop/src/i18n/locales/az.ts
+++ b/apps/desktop/src/i18n/locales/az.ts
@@ -1802,7 +1802,8 @@ export default withEnglishFallback({
noFilteredRowsDescription: "Axtarış mətnini və ya sətir vəziyyəti süzgəcini dəyişin.",
copy: "Kopyala",
copyExtractorSmart: "Ağıllı kopyalama",
- copyExtractorRaw: "Xana mətni",
+ copyExtractorRaw: "Orijinal mətn (bir sütun)",
+ copyExtractorRawHint: "Seçilmiş sütunun sətirlərini yeni sətirlə birləşdirir, tabulyasiyaları, sətir keçidlərini və dırnaqları saxlayır.",
copyExtractorWithHeaders: "Başlıqlarla {format}",
copyExtractorOneRow: "Bir sətir",
copyExtractorJsonArray: "JSON massivi",
diff --git a/apps/desktop/src/i18n/locales/en.ts b/apps/desktop/src/i18n/locales/en.ts
index f63c07560c..56fd79155a 100644
--- a/apps/desktop/src/i18n/locales/en.ts
+++ b/apps/desktop/src/i18n/locales/en.ts
@@ -2234,7 +2234,8 @@ export default {
noFilteredRowsDescription: "Adjust the search text or row status filter.",
copy: "Copy",
copyExtractorSmart: "Smart Copy",
- copyExtractorRaw: "Cell Text",
+ copyExtractorRaw: "Original Text (Single Column)",
+ copyExtractorRawHint: "Join the selected column’s rows with a newline, preserving tabs, line breaks, and quotes.",
copyExtractorWithHeaders: "{format} with Headers",
copyExtractorOneRow: "One-row",
copyExtractorJsonArray: "JSON Array",
diff --git a/apps/desktop/src/i18n/locales/es.ts b/apps/desktop/src/i18n/locales/es.ts
index 64a1c17bfc..5e716b0ab9 100644
--- a/apps/desktop/src/i18n/locales/es.ts
+++ b/apps/desktop/src/i18n/locales/es.ts
@@ -2839,7 +2839,8 @@ export default withEnglishFallback({
filterBuilderSearchColumns: "Buscar columnas...",
filterBuilderNoMatchingColumns: "Sin columnas coincidentes",
copyExtractorSmart: "Copia inteligente",
- copyExtractorRaw: "Texto de celda",
+ copyExtractorRaw: "Texto original (una columna)",
+ copyExtractorRawHint: "Une las filas de la columna seleccionada con un salto de línea, conservando tabulaciones, saltos de línea y comillas.",
copyExtractorWithHeaders: "{format} (con encabezados)",
copyExtractorOneRow: "CSV de una fila",
copyExtractorJsonArray: "Array JSON",
diff --git a/apps/desktop/src/i18n/locales/id.ts b/apps/desktop/src/i18n/locales/id.ts
index e7f295b443..34e5db2bb8 100644
--- a/apps/desktop/src/i18n/locales/id.ts
+++ b/apps/desktop/src/i18n/locales/id.ts
@@ -2074,7 +2074,8 @@ export default withEnglishFallback({
noFilteredRowsDescription: "Sesuaikan teks pencarian atau filter status baris.",
copy: "Salin",
copyExtractorSmart: "Salin Cerdas",
- copyExtractorRaw: "Teks Sel",
+ copyExtractorRaw: "Teks Asli (Satu Kolom)",
+ copyExtractorRawHint: "Menggabungkan baris kolom yang dipilih dengan baris baru, mempertahankan tab, baris baru, dan tanda kutip.",
copyExtractorWithHeaders: "{format} dengan Header",
copyExtractorOneRow: "Satu baris",
copyExtractorJsonArray: "Larik JSON",
diff --git a/apps/desktop/src/i18n/locales/it.ts b/apps/desktop/src/i18n/locales/it.ts
index 8dabc2fcc6..6248dc97ec 100644
--- a/apps/desktop/src/i18n/locales/it.ts
+++ b/apps/desktop/src/i18n/locales/it.ts
@@ -2716,7 +2716,8 @@ export default withEnglishFallback({
filterBuilderSearchColumns: "Cerca campi...",
filterBuilderNoMatchingColumns: "Nessun campo corrispondente",
copyExtractorSmart: "Copia intelligente",
- copyExtractorRaw: "Testo della cella",
+ copyExtractorRaw: "Testo originale (una colonna)",
+ copyExtractorRawHint: "Unisce le righe della colonna selezionata con un a capo, preservando tabulazioni, interruzioni di riga e virgolette.",
copyExtractorWithHeaders: "{format} (con intestazione)",
copyExtractorOneRow: "CSV a riga singola",
copyExtractorJsonArray: "Array JSON",
diff --git a/apps/desktop/src/i18n/locales/ja.ts b/apps/desktop/src/i18n/locales/ja.ts
index ea015a6d8c..ef07b4de3b 100644
--- a/apps/desktop/src/i18n/locales/ja.ts
+++ b/apps/desktop/src/i18n/locales/ja.ts
@@ -2736,7 +2736,8 @@ export default withEnglishFallback({
filterBuilderSearchColumns: "フィールドを検索...",
filterBuilderNoMatchingColumns: "一致するフィールドがありません",
copyExtractorSmart: "スマートコピー",
- copyExtractorRaw: "セルの原文",
+ copyExtractorRaw: "原文(単一列)",
+ copyExtractorRawHint: "選択した単一列の各行を改行で結合し、タブ、改行、引用符をそのまま保持します。",
copyExtractorWithHeaders: "{format}(ヘッダー付き)",
copyExtractorOneRow: "単行CSV",
copyExtractorJsonArray: "JSON 配列",
diff --git a/apps/desktop/src/i18n/locales/ko.ts b/apps/desktop/src/i18n/locales/ko.ts
index d8f60dcaac..e0fd3b4059 100644
--- a/apps/desktop/src/i18n/locales/ko.ts
+++ b/apps/desktop/src/i18n/locales/ko.ts
@@ -2048,7 +2048,8 @@ export default withEnglishFallback({
noFilteredRowsDescription: "검색 텍스트나 행 상태 필터를 조정하세요.",
copy: "복사",
copyExtractorSmart: "스마트 복사",
- copyExtractorRaw: "셀 원문",
+ copyExtractorRaw: "원문 (단일 열)",
+ copyExtractorRawHint: "선택한 단일 열의 행을 줄바꿈으로 연결하고 탭, 줄바꿈, 따옴표를 그대로 유지합니다.",
copyExtractorWithHeaders: "머리글 포함 {format}",
copyExtractorOneRow: "단일 행",
copyExtractorJsonArray: "JSON 배열",
diff --git a/apps/desktop/src/i18n/locales/pt-BR.ts b/apps/desktop/src/i18n/locales/pt-BR.ts
index 814a4f9120..dc1d102c9f 100644
--- a/apps/desktop/src/i18n/locales/pt-BR.ts
+++ b/apps/desktop/src/i18n/locales/pt-BR.ts
@@ -2717,7 +2717,8 @@ export default withEnglishFallback({
filterBuilderSearchColumns: "Pesquisar campos...",
filterBuilderNoMatchingColumns: "Nenhum campo correspondente",
copyExtractorSmart: "Cópia inteligente",
- copyExtractorRaw: "Texto da célula",
+ copyExtractorRaw: "Texto original (uma coluna)",
+ copyExtractorRawHint: "Une as linhas da coluna selecionada com uma quebra de linha, preservando tabulações, quebras de linha e aspas.",
copyExtractorWithHeaders: "{format} (com cabeçalhos)",
copyExtractorOneRow: "CSV de linha única",
copyExtractorJsonArray: "Array JSON",
diff --git a/apps/desktop/src/i18n/locales/ru.ts b/apps/desktop/src/i18n/locales/ru.ts
index 751dd8ae4c..c17a1351f3 100644
--- a/apps/desktop/src/i18n/locales/ru.ts
+++ b/apps/desktop/src/i18n/locales/ru.ts
@@ -2137,7 +2137,8 @@ export default withEnglishFallback({
noFilteredRowsDescription: "Измените текст поиска или фильтр по состоянию строк.",
copy: "Копировать",
copyExtractorSmart: "Умное копирование",
- copyExtractorRaw: "Текст ячейки",
+ copyExtractorRaw: "Исходный текст (один столбец)",
+ copyExtractorRawHint: "Соединяет строки выбранного столбца переносом строки, сохраняя табуляцию, переносы и кавычки.",
copyExtractorWithHeaders: "{format} с заголовками",
copyExtractorOneRow: "Одна строка",
copyExtractorJsonArray: "Массив JSON",
diff --git a/apps/desktop/src/i18n/locales/tr.ts b/apps/desktop/src/i18n/locales/tr.ts
index 850835f8c8..1fea25f3ac 100644
--- a/apps/desktop/src/i18n/locales/tr.ts
+++ b/apps/desktop/src/i18n/locales/tr.ts
@@ -1801,7 +1801,8 @@ export default withEnglishFallback({
noFilteredRowsDescription: "Arama metnini veya satır durumu filtresini değiştirin.",
copy: "Kopyala",
copyExtractorSmart: "Akıllı Kopyala",
- copyExtractorRaw: "Hücre Metni",
+ copyExtractorRaw: "Özgün Metin (Tek Sütun)",
+ copyExtractorRawHint: "Seçilen sütunun satırlarını yeni satırla birleştirir; sekmeleri, satır sonlarını ve tırnakları korur.",
copyExtractorWithHeaders: "Başlıklarla {format}",
copyExtractorOneRow: "Tek satır",
copyExtractorJsonArray: "JSON Dizisi",
diff --git a/apps/desktop/src/i18n/locales/zh-CN.ts b/apps/desktop/src/i18n/locales/zh-CN.ts
index a2b23668bf..7fe23d9152 100644
--- a/apps/desktop/src/i18n/locales/zh-CN.ts
+++ b/apps/desktop/src/i18n/locales/zh-CN.ts
@@ -2168,7 +2168,8 @@ export default withEnglishFallback({
noFilteredRowsDescription: "调整搜索词或状态筛选试试。",
copy: "复制",
copyExtractorSmart: "智能复制",
- copyExtractorRaw: "单元格原文",
+ copyExtractorRaw: "原文(单列)",
+ copyExtractorRawHint: "将选中单列的各行用换行拼接,保留原有 Tab、换行和引号。",
copyExtractorWithHeaders: "{format}(含表头)",
copyExtractorOneRow: "单行 CSV",
copyExtractorJsonArray: "JSON 数组",
diff --git a/apps/desktop/src/i18n/locales/zh-TW.ts b/apps/desktop/src/i18n/locales/zh-TW.ts
index 3164e117c5..a472906757 100644
--- a/apps/desktop/src/i18n/locales/zh-TW.ts
+++ b/apps/desktop/src/i18n/locales/zh-TW.ts
@@ -2722,7 +2722,8 @@ export default withEnglishFallback({
filterBuilderSearchColumns: "搜尋欄位...",
filterBuilderNoMatchingColumns: "沒有匹配的欄位",
copyExtractorSmart: "智慧複製",
- copyExtractorRaw: "儲存格原文",
+ copyExtractorRaw: "原文(單欄)",
+ copyExtractorRawHint: "將選取單欄的各列以換行串接,保留原有 Tab、換行及引號。",
copyExtractorWithHeaders: "{format}(含表頭)",
copyExtractorOneRow: "單行 CSV",
copyExtractorJsonArray: "JSON 陣列",
diff --git a/apps/desktop/src/lib/__tests__/dataGrid/dataGridCopyExtractor.spec.ts b/apps/desktop/src/lib/__tests__/dataGrid/dataGridCopyExtractor.spec.ts
index 5fef626940..eac1e006db 100644
--- a/apps/desktop/src/lib/__tests__/dataGrid/dataGridCopyExtractor.spec.ts
+++ b/apps/desktop/src/lib/__tests__/dataGrid/dataGridCopyExtractor.spec.ts
@@ -29,9 +29,11 @@ describe("data-grid extractor options", () => {
it("resolves smart copy to raw for one cell and TSV otherwise", () => {
expect(normalizeDataGridCopyPreference(undefined)).toBe("smart");
expect(normalizeDataGridCopyPreference("smart")).toBe("smart");
+ expect(normalizeDataGridCopyPreference("raw")).toBe("raw");
expect(resolveDataGridCopyPreference("smart", 1)).toBe("raw");
expect(resolveDataGridCopyPreference("smart", 2)).toBe("tsv");
expect(resolveDataGridCopyPreference("csv", 1)).toBe("csv");
+ expect(resolveDataGridCopyPreference("raw", 3)).toBe("raw");
});
it("normalizes persisted values without sharing the default object", () => {
diff --git a/apps/desktop/src/lib/dataGrid/dataGridCopyExtractor.ts b/apps/desktop/src/lib/dataGrid/dataGridCopyExtractor.ts
index ddeabbb54a..3ac24c0fa7 100644
--- a/apps/desktop/src/lib/dataGrid/dataGridCopyExtractor.ts
+++ b/apps/desktop/src/lib/dataGrid/dataGridCopyExtractor.ts
@@ -4,11 +4,12 @@ import type { DataGridCopyInsertMode, DataGridTableMeta } from "@/lib/dataGrid/d
export const DATA_GRID_COPY_EXTRACTOR_IDS = ["raw", "tsv", "tsv-with-headers", "csv", "csv-with-headers", "pipe-separated", "dsv", "json", "json-lines", "one-row", "sql-in-list", "sql-inserts", "sql-updates", "sql-select", "where-clause", "markdown", "html", "xml", "pretty"] as const;
export type DataGridCopyExtractorId = (typeof DATA_GRID_COPY_EXTRACTOR_IDS)[number];
-export type DataGridCopyPreference = "smart" | Exclude<DataGridCopyExtractorId, "raw">;
+export type DataGridCopyPreference = "smart" | DataGridCopyExtractorId;
export type DataGridExtractorCategory = "raw" | "delimited" | "json" | "sql" | "document";
export const DATA_GRID_DEFAULT_COPY_PREFERENCES: readonly DataGridCopyPreference[] = [
"smart",
+ "raw",
"tsv",
"tsv-with-headers",
"csv",
diff --git a/apps/desktop/src/stores/__tests__/settingsStore.spec.ts b/apps/desktop/src/stores/__tests__/settingsStore.spec.ts
index c771ba5ac3..2f967c9ea7 100644
--- a/apps/desktop/src/stores/__tests__/settingsStore.spec.ts
+++ b/apps/desktop/src/stores/__tests__/settingsStore.spec.ts
@@ -568,6 +568,7 @@ describe("normalizeEditorSettings", () => {
it("defaults the global data grid copy preference and preserves valid choices", () => {
expect(normalizeEditorSettings({}).dataGridCopyExtractor).toBe("smart");
expect(normalizeEditorSettings({ dataGridCopyExtractor: "smart" }).dataGridCopyExtractor).toBe("smart");
+ expect(normalizeEditorSettings({ dataGridCopyExtractor: "raw" }).dataGridCopyExtractor).toBe("raw");
expect(normalizeEditorSettings({ dataGridCopyExtractor: "tsv" }).dataGridCopyExtractor).toBe("tsv");
expect(normalizeEditorSettings({ dataGridCopyExtractor: "sql-updates" }).dataGridCopyExtractor).toBe("sql-updates");
expect(normalizeEditorSettings({ dataGridCopyExtractor: "markdown" }).dataGridCopyExtractor).toBe("markdown");
diff --git a/crates/dbx-core/src/data/grid_clipboard_guard.rs b/crates/dbx-core/src/data/grid_clipboard_guard.rs
index d625f63bb2..bfe851a219 100644
--- a/crates/dbx-core/src/data/grid_clipboard_guard.rs
+++ b/crates/dbx-core/src/data/grid_clipboard_guard.rs
@@ -188,6 +188,15 @@ mod tests {
}
}
+ #[test]
+ fn raw_multiline_sql_keeps_tabs_and_apostrophes_without_formula_guards() {
+ let lines = ["CREATE view v_Test as", "\tselect 'quoted' as value", "-- \"keep quotes\""];
+ let request = request(DataGridExtractorId::Raw, lines.iter().map(|line| vec![json!(line)]).collect());
+ let guarded = neutralize_spreadsheet_formulas(request);
+ let result = dbx_sql::data_grid_extractors::extract_data_grid_selection(guarded).expect("raw SQL extraction");
+ assert_eq!(result.text, lines.join("\n"));
+ }
+
#[test]
fn text_without_a_trigger_character_is_untouched() {
// Only the trigger set is neutralized; a value that merely contains an
diff --git a/crates/dbx-sql-data/src/data_grid_extractors/mod.rs b/crates/dbx-sql-data/src/data_grid_extractors/mod.rs
index 9b79dba16b..258d0e1450 100644
--- a/crates/dbx-sql-data/src/data_grid_extractors/mod.rs
+++ b/crates/dbx-sql-data/src/data_grid_extractors/mod.rs
@@ -254,10 +254,10 @@ fn write_extraction(
let extractor = context.request.extractor;
match extractor {
DataGridExtractorId::Raw => {
- if context.request.rows.len() != 1 || context.selected_source_indexes.len() != 1 {
+ if context.selected_source_indexes.len() != 1 {
return Err(DataGridExtractError::new(
DataGridExtractErrorCode::InvalidRawSelection,
- "The raw extractor supports exactly one selected cell.",
+ "The raw extractor supports exactly one selected column.",
));
}
write_raw(context, output)?;
diff --git a/crates/dbx-sql-data/src/data_grid_extractors/raw.rs b/crates/dbx-sql-data/src/data_grid_extractors/raw.rs
index bef19daf35..3d3ad6fcdf 100644
--- a/crates/dbx-sql-data/src/data_grid_extractors/raw.rs
+++ b/crates/dbx-sql-data/src/data_grid_extractors/raw.rs
@@ -1,9 +1,9 @@
use super::{value_text, write_bytes, DataGridExtractError, ExtractContext};
use std::io::Write;
-/// Writes selected cell values without DSV escaping. Tabs and newlines retain
-/// the selection shape, while NULL cells remain empty for spreadsheet-friendly
-/// clipboard output.
+/// Writes one selected column without escaping or spreadsheet formula guards.
+/// Rows are joined with a newline; tabs, quotes and embedded line breaks inside
+/// each value are preserved, and NULL cells remain empty.
pub(super) fn write_raw(context: &ExtractContext<'_>, output: &mut dyn Write) -> Result<(), DataGridExtractError> {
for (row_index, row) in context.request.rows.iter().enumerate() {
if row_index > 0 {
diff --git a/crates/dbx-sql-data/src/data_grid_extractors/tests.rs b/crates/dbx-sql-data/src/data_grid_extractors/tests.rs
index 74329926d8..ee952ff208 100644
--- a/crates/dbx-sql-data/src/data_grid_extractors/tests.rs
+++ b/crates/dbx-sql-data/src/data_grid_extractors/tests.rs
@@ -459,9 +459,34 @@ fn raw_exports_null_as_an_empty_value() {
}
#[test]
-fn raw_rejects_multiple_selected_cells() {
+fn raw_preserves_multiline_view_definition_with_tabs_and_quotes() {
+ let lines = [
+ "CREATE view v_Copy_Tab",
+ "as",
+ "outer apply (select string_agg(z.CurrencyName+':'+convert(varchar,round(z.Balance,2)), '/') YuE",
+ "\tfrom currency_detail z where z.customer_id=a.id) e",
+ "-- keep \"quoted\" identifiers and embedded\r\nnewlines",
+ "",
+ ];
+ let mut request = request(DataGridExtractorId::Raw);
+ request.columns = vec![column("Text", 0)];
+ request.selected_column_indexes = vec![0];
+ request.rows = lines.iter().map(|line| vec![json!(line)]).collect();
+ // Original text ignores the tabular format's quoting and header settings.
+ request.options.dsv.quote_policy = DataGridQuotePolicy::Always;
+ request.options.dsv.include_row_header = true;
+ request.options.dsv.include_column_header = true;
+
+ let result = extract_data_grid_selection(request).expect("raw view definition extraction");
+ assert_eq!(result.text, lines.join("\n"));
+ assert_eq!(result.row_count, lines.len());
+ assert_eq!(result.column_count, 1);
+}
+
+#[test]
+fn raw_rejects_multiple_selected_columns() {
let error =
- extract_data_grid_selection(request(DataGridExtractorId::Raw)).expect_err("raw must reject multiple cells");
+ extract_data_grid_selection(request(DataGridExtractorId::Raw)).expect_err("raw must reject multiple columns");
assert_eq!(error.code, DataGridExtractErrorCode::InvalidRawSelection);
}
diff --git a/docs/grid-original-text-copy.md b/docs/grid-original-text-copy.md
new file mode 100644
index 0000000000..7f39643f99
--- /dev/null
+++ b/docs/grid-original-text-copy.md
@@ -0,0 +1,43 @@
+# 查询结果单列多行原文复制验证
+
+## 行为
+
+右键复制菜单中的“原文(单列)”支持单个单元格和单列多行选区。各行以换行拼接,值内的 Tab、单双引号、换行和 SQL 注释保持原样。它可以在“配置数据提取器…”中设为默认格式,供 Ctrl/Cmd+C 使用。
+
+多列选区不支持原文复制。TSV/CSV 的转义和电子表格公式防护继续生效,智能复制也继续对多格选择使用 TSV。
+
+## 真实页面验证(2026-10-09)
+
+环境为 macOS、Chromium、当前分支构建的 dbx-web 和 Vite 页面。使用独立 SQLite 文件,真实创建含 Tab、单双引号和 SQL 注释的视图,从 sqlite_master 读取定义并按行返回为 Text 单列。该结果覆盖反馈中的单列多行复制形态;没有在用户的 SQL Server 原库或打包的 Windows 客户端验证。
+
+视图原文共 5 行、182 个字符、190 个 UTF-8 字节,含一个 Tab。
+
+| 检查 | 结果 |
+| --- | --- |
+| 旧版 TSV → 系统剪贴板 → SQL 编辑器 | 186 个字符;Tab 行增加字段引用,注释行增加公式防护前缀 |
+| 旧版原文提取器 | 多行请求返回 invalid-raw-selection |
+| 优化后右键“原文(单列)” → macOS 系统剪贴板 | 与数据库定义逐字节一致,Tab 保留,无新增引号 |
+| 从系统剪贴板粘贴到 SQL 编辑器 | 与数据库定义逐字符一致 |
+| 配置页原文预览 | 与数据库定义逐字符一致 |
+| 保存原文为默认格式,刷新页面、重新查询并 Cmd+C | 仍与数据库定义逐字节一致;复制前用测试标记覆盖剪贴板,确认实际发生了复制 |
+| 两列两行全选 | 默认原文菜单项禁用,TSV 等格式可用 |
+
+优化前:
+
+![TSV 复制后粘贴](screenshots/grid-original-text-before.png)
+
+优化后:
+
+![原文复制后粘贴](screenshots/grid-original-text-after.png)
+
+原文配置与预览:
+
+![原文配置](screenshots/grid-original-text-preview.png)
+
+## 自动化检查
+
+- dbx-sql-data 全套 522 项通过,包含多行原文、嵌入 CRLF、空末行、Tab、引号、忽略表格引用/表头配置,以及多列拒绝。
+- grid_clipboard_guard 12 项通过,包含多行原文保持原样和 TSV/CSV 防护回归。
+- 前端相关 6 个测试文件共 346 项通过,覆盖真实菜单组件、复制/预览、网格回粘、默认格式规范化和 12 语言说明。
+- vue-tsc、相关 oxlint/oxfmt、cargo fmt --check、git diff --check 通过。
+- 实测后端构建:cargo build -p dbx-web --no-default-features --features dbx-core/sqlite-bundled。macOS 系统 SQLite 的无 bundled 构建缺少扩展加载符号,切换仓库已有 bundled 功能后构建成功,无产品代码调整。
diff --git a/docs/screenshots/grid-original-text-after.png b/docs/screenshots/grid-original-text-after.png
new file mode 100644
index 0000000000..f0737d91ef
Binary files /dev/null and b/docs/screenshots/grid-original-text-after.png differ
diff --git a/docs/screenshots/grid-original-text-before.png b/docs/screenshots/grid-original-text-before.png
new file mode 100644
index 0000000000..6221f90088
Binary files /dev/null and b/docs/screenshots/grid-original-text-before.png differ
diff --git a/docs/screenshots/grid-original-text-preview.png b/docs/screenshots/grid-original-text-preview.png
new file mode 100644
index 0000000000..7921dd270c
Binary files /dev/null and b/docs/screenshots/grid-original-text-preview.png differ