feat(import): support comma decimal separator for CSV/TSV
This commit is contained in:
15 files changed
+184
-6
No files matched your search
@@ -135,6 +135,7 @@ const errorMessage = ref("");
|
||||
const wizardStep = ref<TableImportWizardStep>("source");
|
||||
const fileInput = ref<HTMLInputElement | null>(null);
|
||||
const delimiter = ref(",");
|
||||
const decimalSeparator = ref<"." | ",">(".");
|
||||
const textEncoding = ref<api.TableImportTextEncoding>("auto");
|
||||
const titleRow = ref(1);
|
||||
const dataStartRow = ref(2);
|
||||
@@ -397,6 +398,7 @@ function resetState() {
|
||||
activeTaskIndex.value = 0;
|
||||
sourceFormat.value = "csv";
|
||||
delimiter.value = ",";
|
||||
decimalSeparator.value = ".";
|
||||
textEncoding.value = "auto";
|
||||
titleRow.value = 1;
|
||||
dataStartRow.value = 2;
|
||||
@@ -465,6 +467,7 @@ function taskParseOptions(format: api.TableImportSourceFormat, sheetName = ""):
|
||||
return buildTableImportParseOptions({
|
||||
format,
|
||||
delimiter: delimiter.value,
|
||||
decimalSeparator: decimalSeparator.value,
|
||||
textEncoding: textEncoding.value,
|
||||
titleRow: titleRow.value,
|
||||
dataStartRow: dataStartRow.value,
|
||||
@@ -1223,7 +1226,7 @@ watch(
|
||||
onBeforeUnmount(stopDialogDrag);
|
||||
|
||||
watch([sourceFormat, delimiter, titleRow, dataStartRow, lastDataRow, trimValues, emptyStringAsNull, selectedSheet, jsonShape, previewLimit], schedulePreviewReload);
|
||||
watch(textEncoding, schedulePreviewReloadAfterEncodingChange);
|
||||
watch([textEncoding, decimalSeparator], schedulePreviewReloadAfterEncodingChange);
|
||||
watch([newTableName, columnMapping, columnDataTypes], saveActiveBatchTask, { deep: true });
|
||||
watch(wizardStep, (step) => {
|
||||
if (step !== "mapping") closeDataTypePicker();
|
||||
@@ -1434,7 +1437,7 @@ watch(rawProgressPercent, (percent) => {
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div v-if="sourceFormat === 'csv' || sourceFormat === 'tsv' || sourceFormat === 'delimited'" class="grid grid-cols-5 gap-3 rounded-md border p-3">
|
||||
<div v-if="sourceFormat === 'csv' || sourceFormat === 'tsv' || sourceFormat === 'delimited'" class="grid grid-cols-2 gap-3 rounded-md border p-3 md:grid-cols-3 xl:grid-cols-6">
|
||||
<div class="space-y-1.5">
|
||||
<Label class="text-xs">{{ t("tableImport.encoding") }}</Label>
|
||||
<Select :model-value="textEncoding" @update:model-value="(value: any) => (textEncoding = value)">
|
||||
@@ -1455,6 +1458,18 @@ watch(rawProgressPercent, (percent) => {
|
||||
<Label class="text-xs">{{ t("tableImport.delimiter") }}</Label>
|
||||
<Input v-model="delimiter" :disabled="sourceFormat !== 'delimited'" class="h-8 text-xs font-mono" />
|
||||
</div>
|
||||
<div class="space-y-1.5">
|
||||
<Label class="text-xs">{{ t("tableImport.decimalSeparator") }}</Label>
|
||||
<Select v-model="decimalSeparator">
|
||||
<SelectTrigger class="h-8 text-xs font-mono" :aria-label="t('tableImport.decimalSeparator')">
|
||||
<SelectValue />
|
||||
</SelectTrigger>
|
||||
<SelectContent>
|
||||
<SelectItem value=".">.</SelectItem>
|
||||
<SelectItem value=",">,</SelectItem>
|
||||
</SelectContent>
|
||||
</Select>
|
||||
</div>
|
||||
<div class="space-y-1.5">
|
||||
<Label class="text-xs">{{ t("tableImport.titleRow") }}</Label>
|
||||
<Input v-model.number="titleRow" type="number" min="0" class="h-8 text-xs" />
|
||||
|
||||
+40
-3
@@ -113,16 +113,29 @@ vi.mock("@/components/ui/label", async () => {
|
||||
});
|
||||
|
||||
vi.mock("@/components/ui/select", async () => {
|
||||
const { defineComponent, h } = await import("vue");
|
||||
const { defineComponent, h, inject, provide } = await import("vue");
|
||||
const passthrough = defineComponent({
|
||||
setup(_props, { slots }) {
|
||||
return () => h("div", slots.default?.());
|
||||
},
|
||||
});
|
||||
return {
|
||||
Select: passthrough,
|
||||
Select: defineComponent({
|
||||
props: { modelValue: String },
|
||||
emits: ["update:modelValue"],
|
||||
setup(_props, { emit, slots }) {
|
||||
provide("selectOption", (value: string) => emit("update:modelValue", value));
|
||||
return () => h("div", slots.default?.());
|
||||
},
|
||||
}),
|
||||
SelectContent: passthrough,
|
||||
SelectItem: passthrough,
|
||||
SelectItem: defineComponent({
|
||||
props: { value: String },
|
||||
setup(props, { slots }) {
|
||||
const selectOption = inject<(value: string) => void>("selectOption");
|
||||
return () => h("span", { "data-select-option": props.value, onClick: () => selectOption?.(props.value || "") }, slots.default?.());
|
||||
},
|
||||
}),
|
||||
SelectTrigger: passthrough,
|
||||
SelectValue: passthrough,
|
||||
};
|
||||
@@ -279,6 +292,30 @@ afterEach(() => {
|
||||
});
|
||||
|
||||
describe("TableImportDialog batch selection", () => {
|
||||
it("reloads a single CSV preview and passes the selected decimal separator to import", async () => {
|
||||
mocks.previewTableImportFile.mockImplementation(() => Promise.resolve(delimitedPreview()));
|
||||
await mountDialog([new File(['amount,note\n"12,50",plain'], "rows.csv")]);
|
||||
expect(mocks.previewTableImportFile.mock.calls.at(-1)?.[1].parseOptions.decimalSeparator).toBe(".");
|
||||
|
||||
document.body.querySelector<HTMLElement>('[data-select-option=","]')!.click();
|
||||
await new Promise((resolve) => setTimeout(resolve, 300));
|
||||
await flushAsyncUpdates();
|
||||
expect(mocks.previewTableImportFile.mock.calls.at(-1)?.[1].parseOptions.decimalSeparator).toBe(",");
|
||||
|
||||
await startImport();
|
||||
expect(mocks.importTableFile.mock.calls[0]![0].parseOptions?.decimalSeparator).toBe(",");
|
||||
});
|
||||
|
||||
it("reloads selected batch CSV previews when the decimal separator changes", async () => {
|
||||
mocks.previewTableImportFile.mockImplementation(() => Promise.resolve(delimitedPreview()));
|
||||
await mountDialog([new File(["id,name"], "first.csv"), new File(["id,name"], "second.csv")]);
|
||||
mocks.previewTableImportFile.mockClear();
|
||||
document.body.querySelector<HTMLElement>('[data-select-option=","]')!.click();
|
||||
await flushAsyncUpdates();
|
||||
expect(mocks.previewTableImportFile).toHaveBeenCalledTimes(2);
|
||||
expect(mocks.previewTableImportFile.mock.calls.map(([, options]) => options.parseOptions.decimalSeparator)).toEqual([",", ","]);
|
||||
});
|
||||
|
||||
it("uses all desktop grid columns when Parquet is unavailable", async () => {
|
||||
await mountSourceDialog();
|
||||
|
||||
|
||||
@@ -6992,6 +6992,7 @@ export default {
|
||||
parquetOnlyDuckdb: "Parquet import is only supported for DuckDB connections",
|
||||
previewRows: "Preview rows",
|
||||
delimiter: "Delimiter",
|
||||
decimalSeparator: "Decimal separator",
|
||||
encoding: "Encoding",
|
||||
encodingAuto: "Auto-detect",
|
||||
encodingUtf8: "UTF-8",
|
||||
|
||||
@@ -6380,6 +6380,7 @@ export default withEnglishFallback({
|
||||
status_cancelled: "Import cancelled",
|
||||
targetColumnsTimeout: "Se agotó el tiempo de espera al cargar los campos de la tabla de destino. Compruebe la conexión e inténtelo de nuevo.",
|
||||
retry: "Reintentar",
|
||||
decimalSeparator: "Separador decimal",
|
||||
},
|
||||
dataGenerate: {
|
||||
title: "Generación de datos",
|
||||
|
||||
@@ -6302,6 +6302,7 @@ export default withEnglishFallback({
|
||||
status_cancelled: "Import cancelled",
|
||||
targetColumnsTimeout: "Timeout nel caricamento dei campi della tabella di destinazione. Controlla la connessione e riprova.",
|
||||
retry: "Riprova",
|
||||
decimalSeparator: "Separatore decimale",
|
||||
},
|
||||
dataGenerate: {
|
||||
title: "Generazione dati",
|
||||
|
||||
@@ -6333,6 +6333,7 @@ export default withEnglishFallback({
|
||||
lastDataRow: "データ終了行(0 は末尾まで)",
|
||||
targetColumnsTimeout: "ターゲットテーブルのフィールド読み込みがタイムアウトしました。接続を確認して再試行してください。",
|
||||
retry: "再試行",
|
||||
decimalSeparator: "小数点記号",
|
||||
},
|
||||
dataGenerate: {
|
||||
title: "データ生成",
|
||||
|
||||
@@ -6035,6 +6035,7 @@ export default withEnglishFallback({
|
||||
status_cancelled: "가져오기 취소됨",
|
||||
targetColumnsTimeout: "대상 테이블 필드를 로드하는 시간이 초과되었습니다. 연결을 확인한 후 다시 시도하십시오.",
|
||||
retry: "재시도",
|
||||
decimalSeparator: "소수점 구분 기호",
|
||||
},
|
||||
dataGenerate: {
|
||||
title: "데이터 생성",
|
||||
|
||||
@@ -6304,6 +6304,7 @@ export default withEnglishFallback({
|
||||
status_cancelled: "Import cancelled",
|
||||
targetColumnsTimeout: "Tempo esgotado ao carregar os campos da tabela de destino. Verifique a conexão e tente novamente.",
|
||||
retry: "Tentar novamente",
|
||||
decimalSeparator: "Separador decimal",
|
||||
},
|
||||
dataGenerate: {
|
||||
title: "Geração de dados",
|
||||
|
||||
@@ -7413,6 +7413,7 @@ export default withEnglishFallback({
|
||||
parquetOnlyDuckdb: "Импорт Parquet поддерживается только для подключений DuckDB",
|
||||
previewRows: "Строк предпросмотра",
|
||||
delimiter: "Разделитель",
|
||||
decimalSeparator: "Десятичный разделитель",
|
||||
encoding: "Кодировка",
|
||||
encodingAuto: "Автоопределение",
|
||||
encodingUtf8: "UTF-8",
|
||||
|
||||
@@ -6959,6 +6959,7 @@ export default withEnglishFallback({
|
||||
parquetOnlyDuckdb: "Parquet 导入仅支持 DuckDB 连接",
|
||||
previewRows: "预览行数",
|
||||
delimiter: "分隔符",
|
||||
decimalSeparator: "小数分隔符",
|
||||
encoding: "文件编码",
|
||||
encodingAuto: "自动检测",
|
||||
encodingUtf8: "UTF-8",
|
||||
|
||||
@@ -5620,6 +5620,7 @@ export default withEnglishFallback({
|
||||
status_cancelled: "匯入已取消",
|
||||
targetColumnsTimeout: "載入目標資料表欄位逾時,請檢查連線後重試。",
|
||||
retry: "重試",
|
||||
decimalSeparator: "小數分隔符",
|
||||
},
|
||||
dataGenerate: {
|
||||
title: "資料生成",
|
||||
|
||||
@@ -45,6 +45,24 @@ describe("tableImport", () => {
|
||||
expect(legacyEmptyField.emptyStringAsNull).toBe(true);
|
||||
});
|
||||
|
||||
it("passes the decimal separator only for delimited sources", () => {
|
||||
const settings = {
|
||||
delimiter: ";",
|
||||
decimalSeparator: ",",
|
||||
textEncoding: "auto" as const,
|
||||
titleRow: 1,
|
||||
dataStartRow: 2,
|
||||
lastDataRow: 0,
|
||||
trimValues: false,
|
||||
emptyStringAsNull: false,
|
||||
jsonShape: "auto" as const,
|
||||
};
|
||||
expect(buildTableImportParseOptions({ ...settings, format: "delimited" }).decimalSeparator).toBe(",");
|
||||
expect(buildTableImportParseOptions({ ...settings, format: "csv" }).decimalSeparator).toBe(",");
|
||||
expect(buildTableImportParseOptions({ ...settings, format: "tsv" }).decimalSeparator).toBe(",");
|
||||
expect(buildTableImportParseOptions({ ...settings, format: "json" }).decimalSeparator).toBeNull();
|
||||
});
|
||||
|
||||
it("formats import elapsed time for progress and terminal summaries", () => {
|
||||
expect(formatTableImportElapsed(0)).toBe("0 ms");
|
||||
expect(formatTableImportElapsed(999)).toBe("999 ms");
|
||||
|
||||
@@ -5494,6 +5494,7 @@ export interface TableImportColumnMapping {
|
||||
|
||||
export interface TableImportParseOptions {
|
||||
delimiter?: string | null;
|
||||
decimalSeparator?: string | null;
|
||||
encoding?: TableImportTextEncoding | null;
|
||||
hasHeader?: boolean | null;
|
||||
titleRow?: number | null;
|
||||
|
||||
@@ -86,6 +86,7 @@ export function tableImportProgressPercent(progress: TableImportProgressLike | n
|
||||
export interface TableImportParseSettings {
|
||||
format: TableImportSourceFormat;
|
||||
delimiter: string;
|
||||
decimalSeparator?: "." | ",";
|
||||
textEncoding: TableImportTextEncoding;
|
||||
titleRow: number;
|
||||
dataStartRow: number;
|
||||
@@ -114,6 +115,7 @@ export function buildTableImportParseOptions(settings: TableImportParseSettings)
|
||||
const isTextSource = isDelimited || settings.format === "sql";
|
||||
return {
|
||||
delimiter: settings.format === "tsv" ? "\\t" : settings.format === "csv" ? "," : settings.delimiter,
|
||||
decimalSeparator: isDelimited ? (settings.decimalSeparator ?? ".") : null,
|
||||
encoding: isTextSource ? settings.textEncoding : null,
|
||||
titleRow: settings.titleRow,
|
||||
dataStartRow: settings.dataStartRow,
|
||||
|
||||
Reference in new issue
Block a user