feat(settings): add global date and time formats
This commit is contained in:
31 files changed
+1109
-88
No files matched your search
@@ -112,6 +112,7 @@ import { DEFAULT_WEB_DAV_AUTO_UPLOAD_INTERVAL_MINUTES, DEFAULT_WEB_DAV_REMOTE_PA
|
||||
import { apiUrl } from "@/lib/common/webPath";
|
||||
import { DEFAULT_UI_FONT_FAMILY, SYSTEM_UI_FONT_FAMILY } from "@/lib/app/appFonts";
|
||||
import { buildAppSupportInfoRows, formatAppSupportInfoForClipboard, type AppSupportInfoLabels } from "@/lib/app/supportInfo";
|
||||
import { DateTimePatterns, normalizeSupportedDateTimePattern } from "@/lib/dataGrid/columnFormatter";
|
||||
|
||||
const { t } = useI18n();
|
||||
const { toast } = useToast();
|
||||
@@ -340,6 +341,9 @@ const editSidebarHiddenTablePrefixes = ref(settingsStore.editorSettings.sidebarH
|
||||
const editSidebarHideTableComments = ref(settingsStore.editorSettings.sidebarHideTableComments);
|
||||
const editSidebarAllowHorizontalScroll = ref(settingsStore.editorSettings.sidebarAllowHorizontalScroll);
|
||||
const editExportBatchSize = ref(settingsStore.editorSettings.exportBatchSize);
|
||||
const editGlobalDateTimeDisplayFormat = ref(settingsStore.editorSettings.globalDateTimeDisplayFormat);
|
||||
const editGlobalDateTimeExportFormat = ref(settingsStore.editorSettings.globalDateTimeExportFormat);
|
||||
const editGlobalDateTimeImportFormat = ref(settingsStore.editorSettings.globalDateTimeImportFormat);
|
||||
const editExportRowLimitEnabled = ref(settingsStore.editorSettings.exportRowLimitEnabled);
|
||||
const editExportRowLimit = ref(settingsStore.editorSettings.exportRowLimit);
|
||||
const editQueryExportKeysetOptimizationEnabled = ref(settingsStore.editorSettings.queryExportKeysetOptimizationEnabled);
|
||||
@@ -427,6 +431,9 @@ function currentEditorSettingsDraft(): EditorSettingsDraft {
|
||||
sidebarAllowHorizontalScroll: editSidebarAllowHorizontalScroll.value,
|
||||
sidebarHiddenTablePrefixes: normalizeSidebarHiddenTablePrefixes(editSidebarHiddenTablePrefixes.value),
|
||||
exportBatchSize: editExportBatchSize.value,
|
||||
globalDateTimeDisplayFormat: editGlobalDateTimeDisplayFormat.value,
|
||||
globalDateTimeExportFormat: editGlobalDateTimeExportFormat.value,
|
||||
globalDateTimeImportFormat: editGlobalDateTimeImportFormat.value,
|
||||
exportRowLimitEnabled: editExportRowLimitEnabled.value,
|
||||
exportRowLimit: editExportRowLimit.value,
|
||||
queryExportKeysetOptimizationEnabled: editQueryExportKeysetOptimizationEnabled.value,
|
||||
@@ -704,6 +711,9 @@ function syncEditorSettingsDraftFromStore() {
|
||||
editSidebarHideTableComments.value = settingsStore.editorSettings.sidebarHideTableComments;
|
||||
editSidebarAllowHorizontalScroll.value = settingsStore.editorSettings.sidebarAllowHorizontalScroll;
|
||||
editExportBatchSize.value = settingsStore.editorSettings.exportBatchSize;
|
||||
editGlobalDateTimeDisplayFormat.value = settingsStore.editorSettings.globalDateTimeDisplayFormat;
|
||||
editGlobalDateTimeExportFormat.value = settingsStore.editorSettings.globalDateTimeExportFormat;
|
||||
editGlobalDateTimeImportFormat.value = settingsStore.editorSettings.globalDateTimeImportFormat;
|
||||
editExportRowLimitEnabled.value = settingsStore.editorSettings.exportRowLimitEnabled;
|
||||
editExportRowLimit.value = settingsStore.editorSettings.exportRowLimit;
|
||||
editQueryExportKeysetOptimizationEnabled.value = settingsStore.editorSettings.queryExportKeysetOptimizationEnabled;
|
||||
@@ -910,6 +920,9 @@ function resetDefaultsForTab(tab: SettingsCategory) {
|
||||
editDuckDbWorkerMaxProcesses.value = DEFAULT_DESKTOP_SETTINGS.duckdb_worker_max_processes;
|
||||
editTableColumnTemplateRows.value = tableColumnTemplateRowsFromSettings(DEFAULT_EDITOR_SETTINGS.tableColumnTemplateFields);
|
||||
editExportBatchSize.value = DEFAULT_EDITOR_SETTINGS.exportBatchSize;
|
||||
editGlobalDateTimeDisplayFormat.value = DEFAULT_EDITOR_SETTINGS.globalDateTimeDisplayFormat;
|
||||
editGlobalDateTimeExportFormat.value = DEFAULT_EDITOR_SETTINGS.globalDateTimeExportFormat;
|
||||
editGlobalDateTimeImportFormat.value = DEFAULT_EDITOR_SETTINGS.globalDateTimeImportFormat;
|
||||
editExportRowLimitEnabled.value = DEFAULT_EDITOR_SETTINGS.exportRowLimitEnabled;
|
||||
editExportRowLimit.value = DEFAULT_EDITOR_SETTINGS.exportRowLimit;
|
||||
editQueryExportKeysetOptimizationEnabled.value = DEFAULT_EDITOR_SETTINGS.queryExportKeysetOptimizationEnabled;
|
||||
@@ -977,6 +990,9 @@ function resetAllDefaults() {
|
||||
editSidebarAllowHorizontalScroll.value = DEFAULT_EDITOR_SETTINGS.sidebarAllowHorizontalScroll;
|
||||
editSidebarHiddenTablePrefixes.value = DEFAULT_EDITOR_SETTINGS.sidebarHiddenTablePrefixes.join("\n");
|
||||
editExportBatchSize.value = DEFAULT_EDITOR_SETTINGS.exportBatchSize;
|
||||
editGlobalDateTimeDisplayFormat.value = DEFAULT_EDITOR_SETTINGS.globalDateTimeDisplayFormat;
|
||||
editGlobalDateTimeExportFormat.value = DEFAULT_EDITOR_SETTINGS.globalDateTimeExportFormat;
|
||||
editGlobalDateTimeImportFormat.value = DEFAULT_EDITOR_SETTINGS.globalDateTimeImportFormat;
|
||||
editExportRowLimitEnabled.value = DEFAULT_EDITOR_SETTINGS.exportRowLimitEnabled;
|
||||
editExportRowLimit.value = DEFAULT_EDITOR_SETTINGS.exportRowLimit;
|
||||
editQueryExportKeysetOptimizationEnabled.value = DEFAULT_EDITOR_SETTINGS.queryExportKeysetOptimizationEnabled;
|
||||
@@ -3590,6 +3606,62 @@ onUnmounted(cleanupPreviewEditor);
|
||||
<Separator />
|
||||
</template>
|
||||
|
||||
<div class="space-y-3">
|
||||
<div class="text-sm font-medium text-muted-foreground">{{ t("settings.dateTimeSection") }}</div>
|
||||
<div class="grid gap-3 rounded-md border bg-muted/20 px-3 py-3 sm:grid-cols-[minmax(0,1fr)_minmax(220px,0.8fr)] sm:items-center">
|
||||
<div>
|
||||
<Label>{{ t("settings.globalDateTimeDisplayFormat") }}</Label>
|
||||
<p class="mt-1 text-xs text-muted-foreground">{{ t("settings.globalDateTimeDisplayFormatDescription") }}</p>
|
||||
</div>
|
||||
<SearchableSelect
|
||||
v-model="editGlobalDateTimeDisplayFormat"
|
||||
:options="DateTimePatterns"
|
||||
:placeholder="t('settings.dateTimeFormatRaw')"
|
||||
:search-placeholder="t('settings.dateTimeFormatSearchPlaceholder')"
|
||||
:empty-text="t('settings.dateTimeFormatEmpty')"
|
||||
:normalize-custom="normalizeSupportedDateTimePattern"
|
||||
allow-custom
|
||||
clearable
|
||||
trigger-variant="outline"
|
||||
trigger-class="h-9 w-full max-w-none justify-between"
|
||||
/>
|
||||
<div>
|
||||
<Label>{{ t("settings.globalDateTimeExportFormat") }}</Label>
|
||||
<p class="mt-1 text-xs text-muted-foreground">{{ t("settings.globalDateTimeExportFormatDescription") }}</p>
|
||||
</div>
|
||||
<SearchableSelect
|
||||
v-model="editGlobalDateTimeExportFormat"
|
||||
:options="DateTimePatterns"
|
||||
:placeholder="t('settings.dateTimeFormatRaw')"
|
||||
:search-placeholder="t('settings.dateTimeFormatSearchPlaceholder')"
|
||||
:empty-text="t('settings.dateTimeFormatEmpty')"
|
||||
:normalize-custom="normalizeSupportedDateTimePattern"
|
||||
allow-custom
|
||||
clearable
|
||||
trigger-variant="outline"
|
||||
trigger-class="h-9 w-full max-w-none justify-between"
|
||||
/>
|
||||
<div>
|
||||
<Label>{{ t("settings.globalDateTimeImportFormat") }}</Label>
|
||||
<p class="mt-1 text-xs text-muted-foreground">{{ t("settings.globalDateTimeImportFormatDescription") }}</p>
|
||||
</div>
|
||||
<SearchableSelect
|
||||
v-model="editGlobalDateTimeImportFormat"
|
||||
:options="DateTimePatterns"
|
||||
:placeholder="t('settings.dateTimeFormatAuto')"
|
||||
:search-placeholder="t('settings.dateTimeFormatSearchPlaceholder')"
|
||||
:empty-text="t('settings.dateTimeFormatEmpty')"
|
||||
:normalize-custom="normalizeSupportedDateTimePattern"
|
||||
allow-custom
|
||||
clearable
|
||||
trigger-variant="outline"
|
||||
trigger-class="h-9 w-full max-w-none justify-between"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<Separator />
|
||||
|
||||
<div class="space-y-3">
|
||||
<div class="text-sm font-medium text-muted-foreground">{{ t("settings.exportSection") }}</div>
|
||||
<div class="space-y-2">
|
||||
|
||||
@@ -963,7 +963,10 @@ function columnFormatter(columnIndex: number): ColumnFormatterConfig | undefined
|
||||
const column = props.result.columns[columnIndex];
|
||||
if (!column) return undefined;
|
||||
const key = formatterKeyForColumn(column);
|
||||
return key ? resolveColumnFormatter(settingsStore.editorSettings.columnFormatters[key], settingsStore.editorSettings.customColumnFormatters) : undefined;
|
||||
return resolveColumnFormatter(key ? settingsStore.editorSettings.columnFormatters[key] : undefined, settingsStore.editorSettings.customColumnFormatters, {
|
||||
pattern: settingsStore.editorSettings.globalDateTimeDisplayFormat,
|
||||
columnType: props.result.column_types?.[columnIndex] ?? tableColumnForGridColumn(columnIndex)?.data_type,
|
||||
});
|
||||
}
|
||||
|
||||
function savedColumnFormatter(columnIndex: number): ColumnFormatterConfig | undefined {
|
||||
|
||||
@@ -11,6 +11,7 @@ import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@
|
||||
import { SearchableSelect } from "@/components/ui/searchable-select";
|
||||
import { AlertTriangle, ArrowLeft, ArrowRight, Check, CheckCircle2, FileJson, FileSpreadsheet, FileText, FileUp, Loader2, RefreshCw, Square, Upload, X } from "@lucide/vue";
|
||||
import { useConnectionStore } from "@/stores/connectionStore";
|
||||
import { useSettingsStore } from "@/stores/settingsStore";
|
||||
import { useToast } from "@/composables/useToast";
|
||||
import { autoMapImportColumns, nextTableImportWizardStep, previousTableImportWizardStep, requiredImportTargetColumns, suggestImportTargetDataTypes, validateImportMappings, type TableImportWizardStep } from "@/lib/table/tableImport";
|
||||
import { getDataTypeOptions } from "@/lib/table/tableStructureEditorState";
|
||||
@@ -20,6 +21,7 @@ import * as api from "@/lib/backend/api";
|
||||
|
||||
const { t } = useI18n();
|
||||
const store = useConnectionStore();
|
||||
const settingsStore = useSettingsStore();
|
||||
const { toast } = useToast();
|
||||
const open = defineModel<boolean>("open", { default: false });
|
||||
|
||||
@@ -625,6 +627,7 @@ async function startImport() {
|
||||
mode: targetMode.value === "create" ? "append" : importMode.value,
|
||||
createTable: targetMode.value === "create",
|
||||
batchSize: Math.max(1, Number(batchSize.value) || 500),
|
||||
dateTimeFormat: settingsStore.editorSettings.globalDateTimeImportFormat || undefined,
|
||||
},
|
||||
(nextProgress) => {
|
||||
progress.value = nextProgress;
|
||||
@@ -700,6 +703,7 @@ async function startBatchImport() {
|
||||
mode: "append",
|
||||
createTable: true,
|
||||
batchSize: Math.max(1, Number(batchSize.value) || 500),
|
||||
dateTimeFormat: settingsStore.editorSettings.globalDateTimeImportFormat || undefined,
|
||||
},
|
||||
(nextProgress) => {
|
||||
task.rowsImported = nextProgress.rowsImported;
|
||||
|
||||
@@ -18,6 +18,7 @@ import type { DatabaseType, QueryResult } from "@/types/database";
|
||||
import type { QueryResultExportRequest } from "@/lib/backend/api";
|
||||
import { usesSyntheticRowIdKey } from "@/lib/table/tableEditing";
|
||||
import { buildXlsxSqlWorksheet } from "@/lib/export/xlsxSqlSheet";
|
||||
import { formatTemporalRowsForExport } from "@/lib/dataGrid/columnFormatter";
|
||||
|
||||
/**
|
||||
* Format metadata for backend table exports. Each entry maps a format key
|
||||
@@ -202,10 +203,15 @@ export function useDataGridExport(options: UseDataGridExportOptions) {
|
||||
return displayItems.value.filter((item) => rowIdSet.has(item.id) && !item.isDraft);
|
||||
}
|
||||
|
||||
async function resultToExport(rowIds?: number[], onProgress?: (info: { rowsExported: number; totalRows: number | null }) => void, useFullExport = true): Promise<{ columns: string[]; columnTypes: string[]; rows: CellValue[][] }> {
|
||||
function applyGlobalDateTimeExportFormat(result: { columns: string[]; columnTypes: string[]; rows: CellValue[][] }, enabled: boolean) {
|
||||
const pattern = enabled ? useSettingsStore().editorSettings.globalDateTimeExportFormat : "";
|
||||
return pattern ? { ...result, rows: formatTemporalRowsForExport(result.rows, result.columnTypes, pattern) } : result;
|
||||
}
|
||||
|
||||
async function resultToExport(rowIds?: number[], onProgress?: (info: { rowsExported: number; totalRows: number | null }) => void, useFullExport = true, formatDateTime = true): Promise<{ columns: string[]; columnTypes: string[]; rows: CellValue[][] }> {
|
||||
if (useFullExport && rowIds === undefined && fullExportResult && !hasCompleteLocalResult?.value) {
|
||||
const result = await fullExportResult(onProgress);
|
||||
if (result) return { columns: result.columns, columnTypes: result.column_types ?? [], rows: result.rows };
|
||||
if (result) return applyGlobalDateTimeExportFormat({ columns: result.columns, columnTypes: result.column_types ?? [], rows: result.rows }, formatDateTime);
|
||||
}
|
||||
// The full result is already in memory — export the raw QueryResult (all
|
||||
// rows, all columns, committed values) so "export all data" matches the
|
||||
@@ -213,13 +219,16 @@ export function useDataGridExport(options: UseDataGridExportOptions) {
|
||||
// and reflects client-side filters/search and unsaved edits, which would
|
||||
// silently change what the export contains.
|
||||
if (useFullExport && rowIds === undefined && hasCompleteLocalResult?.value && completeLocalResult?.value) {
|
||||
return { columns: completeLocalResult.value.columns, columnTypes: completeLocalResult.value.column_types ?? [], rows: completeLocalResult.value.rows };
|
||||
return applyGlobalDateTimeExportFormat({ columns: completeLocalResult.value.columns, columnTypes: completeLocalResult.value.column_types ?? [], rows: completeLocalResult.value.rows }, formatDateTime);
|
||||
}
|
||||
return {
|
||||
columns: columns.value,
|
||||
columnTypes: (columnTypes.value ?? []).map((type) => type ?? ""),
|
||||
rows: rowsToExport(rowIds).map((item) => item.data),
|
||||
};
|
||||
return applyGlobalDateTimeExportFormat(
|
||||
{
|
||||
columns: columns.value,
|
||||
columnTypes: (columnTypes.value ?? []).map((type) => type ?? ""),
|
||||
rows: rowsToExport(rowIds).map((item) => item.data),
|
||||
},
|
||||
formatDateTime,
|
||||
);
|
||||
}
|
||||
|
||||
function currentXlsxSheetName(): string {
|
||||
@@ -1026,11 +1035,12 @@ export function useDataGridExport(options: UseDataGridExportOptions) {
|
||||
outputPath = path as string;
|
||||
}
|
||||
|
||||
const exportPattern = useSettingsStore().editorSettings.globalDateTimeExportFormat;
|
||||
const worksheets = sheets.map((sheet) => ({
|
||||
sheetName: sheet.sheetName,
|
||||
columns: sheet.result.columns,
|
||||
columnTypes: sheet.result.column_types ?? [],
|
||||
rows: sheet.result.rows,
|
||||
rows: formatTemporalRowsForExport(sheet.result.rows, sheet.result.column_types ?? [], exportPattern),
|
||||
}));
|
||||
const sqlWorksheet = includeSqlSheet ? buildXlsxSqlWorksheet(sheets.map((sheet) => ({ resultName: sheet.sheetName, sql: sheet.sql || sheet.result.sourceStatement || "" }))) : undefined;
|
||||
await api.exportQueryResultsXlsx(outputPath, sqlWorksheet ? [...worksheets, sqlWorksheet] : worksheets);
|
||||
@@ -1110,6 +1120,7 @@ export function useDataGridExport(options: UseDataGridExportOptions) {
|
||||
skipCount: false,
|
||||
batchSize: exportBatchSize.value,
|
||||
rowLimit,
|
||||
dateTimeFormat: editorSettings.globalDateTimeExportFormat || undefined,
|
||||
},
|
||||
(progress) => {
|
||||
if (exportProgressState) {
|
||||
@@ -1156,7 +1167,8 @@ export function useDataGridExport(options: UseDataGridExportOptions) {
|
||||
}
|
||||
|
||||
const exportId = uuid();
|
||||
const request = await queryResultExportRequest({ exportId, filePath: outputPath, format, includeSqlSheet });
|
||||
const baseRequest = await queryResultExportRequest({ exportId, filePath: outputPath, format, includeSqlSheet });
|
||||
const request = baseRequest ? { ...baseRequest, dateTimeFormat: useSettingsStore().editorSettings.globalDateTimeExportFormat || undefined } : undefined;
|
||||
if (!request) throw new Error("Unable to build query result export request");
|
||||
|
||||
if (exportProgressState) {
|
||||
@@ -1204,7 +1216,7 @@ export function useDataGridExport(options: UseDataGridExportOptions) {
|
||||
try {
|
||||
if (await exportFullTableDataViaBackend("sql", rowIds)) return;
|
||||
|
||||
const result = await resultToExport(rowIds);
|
||||
const result = await resultToExport(rowIds, undefined, true, false);
|
||||
const exportData = sqlInsertExportData(result);
|
||||
const content = await formatSqlInsert({
|
||||
databaseType: databaseType.value,
|
||||
@@ -1225,7 +1237,7 @@ export function useDataGridExport(options: UseDataGridExportOptions) {
|
||||
async function exportCurrentPageSql() {
|
||||
await runExclusiveExport(async () => {
|
||||
try {
|
||||
const result = await resultToExport(undefined, undefined, false);
|
||||
const result = await resultToExport(undefined, undefined, false, false);
|
||||
const exportData = sqlInsertExportData(result);
|
||||
const content = await formatSqlInsert({
|
||||
databaseType: databaseType.value,
|
||||
|
||||
@@ -3498,6 +3498,17 @@ export default {
|
||||
redisScanPageSizeDescription: "Keys requested per Redis SCAN page when browsing keys.",
|
||||
redisScanPageSizeOption: "{count} keys",
|
||||
exportBatchSize: "Export batch size",
|
||||
dateTimeSection: "Date and time",
|
||||
globalDateTimeDisplayFormat: "Global display format",
|
||||
globalDateTimeDisplayFormatDescription: "Applies to temporal columns without a column-specific formatter in every database.",
|
||||
globalDateTimeExportFormat: "Global export format",
|
||||
globalDateTimeExportFormatDescription: "Formats temporal columns consistently in CSV, Excel, JSON, Markdown, and text exports.",
|
||||
globalDateTimeImportFormat: "Global import format",
|
||||
globalDateTimeImportFormatDescription: "Parses imported temporal values with this format. Leave empty to detect common formats automatically.",
|
||||
dateTimeFormatRaw: "Keep database value",
|
||||
dateTimeFormatAuto: "Auto detect",
|
||||
dateTimeFormatSearchPlaceholder: "Select or enter a format",
|
||||
dateTimeFormatEmpty: "Enter a custom datetime format",
|
||||
exportBatchSizeDescription: "Rows fetched per batch when exporting data (100-100000).",
|
||||
exportRowLimitEnabled: "Limit exported rows",
|
||||
exportRowLimitEnabledDescription: "When on, query result and table data exports stop at the row limit below.",
|
||||
|
||||
@@ -3474,6 +3474,17 @@ export default withEnglishFallback({
|
||||
shortcutUppercaseSelection: "Convertir selección a mayúsculas",
|
||||
shortcutLowercaseSelection: "Convertir selección a minúsculas",
|
||||
shortcutExPasteSqlInCondition: "ExPaste: pegar como condición IN",
|
||||
dateTimeSection: "Fecha y hora",
|
||||
globalDateTimeDisplayFormat: "Formato de visualización global",
|
||||
globalDateTimeDisplayFormatDescription: "Se aplica a todos los campos de fecha y hora que no tienen un formato de columna configurado individualmente en las bases de datos.",
|
||||
globalDateTimeExportFormat: "Formato de exportación global",
|
||||
globalDateTimeExportFormatDescription: "Formatea uniformemente los campos de fecha y hora al exportar a CSV, Excel, JSON, Markdown y texto.",
|
||||
globalDateTimeImportFormat: "Formato de importación global",
|
||||
globalDateTimeImportFormatDescription: "Analiza las fechas y horas en los archivos importados según este formato; si se deja vacío, se reconocen automáticamente los formatos comunes.",
|
||||
dateTimeFormatRaw: "Mantener el valor original de la base de datos",
|
||||
dateTimeFormatAuto: "Reconocimiento automático",
|
||||
dateTimeFormatSearchPlaceholder: "Seleccionar o ingresar formato",
|
||||
dateTimeFormatEmpty: "Ingresar formato de fecha y hora personalizado",
|
||||
},
|
||||
driverStore: {
|
||||
progressJreExtract: "Extrayendo JRE...",
|
||||
|
||||
@@ -3472,6 +3472,17 @@ export default withEnglishFallback({
|
||||
shortcutUppercaseSelection: "Converti selezione in maiuscolo",
|
||||
shortcutLowercaseSelection: "Converti selezione in minuscolo",
|
||||
shortcutExPasteSqlInCondition: "ExPaste: incolla come condizione IN",
|
||||
dateTimeSection: "Data e Ora",
|
||||
globalDateTimeDisplayFormat: "Formato di visualizzazione globale",
|
||||
globalDateTimeDisplayFormatDescription: "Applicato a tutti i campi data/ora nei database che non hanno una configurazione di formato colonna individuale.",
|
||||
globalDateTimeExportFormat: "Formato di esportazione globale",
|
||||
globalDateTimeExportFormatDescription: "Formatta uniformemente i campi data/ora durante l'esportazione in CSV, Excel, JSON, Markdown e testo.",
|
||||
globalDateTimeImportFormat: "Formato di importazione globale",
|
||||
globalDateTimeImportFormatDescription: "Analizza i campi data/ora nei file importati secondo questo formato; lascia vuoto per rilevare automaticamente i formati comuni.",
|
||||
dateTimeFormatRaw: "Mantieni il valore originale del database",
|
||||
dateTimeFormatAuto: "Riconoscimento automatico",
|
||||
dateTimeFormatSearchPlaceholder: "Seleziona o inserisci il formato",
|
||||
dateTimeFormatEmpty: "Inserisci un formato data/ora personalizzato",
|
||||
},
|
||||
driverStore: {
|
||||
progressJreExtract: "Estrazione JRE...",
|
||||
|
||||
@@ -3473,6 +3473,17 @@ export default withEnglishFallback({
|
||||
shortcutUppercaseSelection: "選択範囲を大文字に変換",
|
||||
shortcutLowercaseSelection: "選択範囲を小文字に変換",
|
||||
shortcutExPasteSqlInCondition: "ExPaste: IN条件として貼り付け",
|
||||
dateTimeSection: "日付と時刻",
|
||||
globalDateTimeDisplayFormat: "グローバル表示形式",
|
||||
globalDateTimeDisplayFormatDescription: "すべてのデータベースで列形式が個別に設定されていない日時フィールドに適用されます。",
|
||||
globalDateTimeExportFormat: "グローバルエクスポート形式",
|
||||
globalDateTimeExportFormatDescription: "CSV、Excel、JSON、Markdown、テキストをエクスポートする際に日時フィールドを統一フォーマットします。",
|
||||
globalDateTimeImportFormat: "グローバルインポート形式",
|
||||
globalDateTimeImportFormatDescription: "この形式でインポートファイル内の日時を解析します。空欄の場合は一般的な形式を自動認識します。",
|
||||
dateTimeFormatRaw: "データベースの元の値を保持",
|
||||
dateTimeFormatAuto: "自動認識",
|
||||
dateTimeFormatSearchPlaceholder: "形式を選択または入力",
|
||||
dateTimeFormatEmpty: "カスタム日時形式を入力",
|
||||
},
|
||||
driverStore: {
|
||||
progressJreExtract: "JREを展開中...",
|
||||
|
||||
@@ -3474,6 +3474,17 @@ export default withEnglishFallback({
|
||||
shortcutUppercaseSelection: "Converter seleção em maiúsculas",
|
||||
shortcutLowercaseSelection: "Converter seleção em minúsculas",
|
||||
shortcutExPasteSqlInCondition: "ExPaste: colar como condição IN",
|
||||
dateTimeSection: "Data e Hora",
|
||||
globalDateTimeDisplayFormat: "Formato de exibição global",
|
||||
globalDateTimeDisplayFormatDescription: "Aplicado a todos os campos de data e hora em todos os bancos de dados que não tenham formato de coluna configurado individualmente.",
|
||||
globalDateTimeExportFormat: "Formato de exportação global",
|
||||
globalDateTimeExportFormatDescription: "Formata campos de data e hora de forma uniforme ao exportar para CSV, Excel, JSON, Markdown e texto.",
|
||||
globalDateTimeImportFormat: "Formato de importação global",
|
||||
globalDateTimeImportFormatDescription: "Analisa datas e horas em arquivos importados de acordo com este formato; deixe em branco para detectar automaticamente formatos comuns.",
|
||||
dateTimeFormatRaw: "Manter valor original do banco de dados",
|
||||
dateTimeFormatAuto: "Detecção automática",
|
||||
dateTimeFormatSearchPlaceholder: "Selecione ou digite um formato",
|
||||
dateTimeFormatEmpty: "Insira um formato de data e hora personalizado",
|
||||
},
|
||||
driverStore: {
|
||||
progressJreExtract: "Extraindo JRE...",
|
||||
|
||||
@@ -3488,6 +3488,17 @@ export default withEnglishFallback({
|
||||
redisScanPageSizeDescription: "浏览 Redis Key 时每次 SCAN 请求的 Key 数量。",
|
||||
redisScanPageSizeOption: "{count} 个 Key",
|
||||
exportBatchSize: "导出批次大小",
|
||||
dateTimeSection: "日期与时间",
|
||||
globalDateTimeDisplayFormat: "全局显示格式",
|
||||
globalDateTimeDisplayFormatDescription: "应用于所有数据库中未单独配置列格式的日期时间字段。",
|
||||
globalDateTimeExportFormat: "全局导出格式",
|
||||
globalDateTimeExportFormatDescription: "导出 CSV、Excel、JSON、Markdown 和文本时统一格式化日期时间字段。",
|
||||
globalDateTimeImportFormat: "全局导入格式",
|
||||
globalDateTimeImportFormatDescription: "按此格式解析导入文件中的日期时间;留空时自动识别常见格式。",
|
||||
dateTimeFormatRaw: "保持数据库原始值",
|
||||
dateTimeFormatAuto: "自动识别",
|
||||
dateTimeFormatSearchPlaceholder: "选择或输入格式",
|
||||
dateTimeFormatEmpty: "输入自定义日期时间格式",
|
||||
exportBatchSizeDescription: "导出数据时每批读取的行数(100-100000)。",
|
||||
exportRowLimitEnabled: "限制导出行数",
|
||||
exportRowLimitEnabledDescription: "开启时,查询结果和表数据导出最多为下方设置的行数。",
|
||||
|
||||
@@ -3319,6 +3319,17 @@ export default withEnglishFallback({
|
||||
updateDownloadSourceAtomgit: "AtomGit",
|
||||
exportSection: "匯出",
|
||||
exportBatchSize: "匯出批次大小",
|
||||
dateTimeSection: "日期與時間",
|
||||
globalDateTimeDisplayFormat: "全域顯示格式",
|
||||
globalDateTimeDisplayFormatDescription: "套用到所有資料庫中未單獨設定欄位格式的日期時間欄位。",
|
||||
globalDateTimeExportFormat: "全域匯出格式",
|
||||
globalDateTimeExportFormatDescription: "匯出 CSV、Excel、JSON、Markdown 和文字時統一格式化日期時間欄位。",
|
||||
globalDateTimeImportFormat: "全域匯入格式",
|
||||
globalDateTimeImportFormatDescription: "依此格式解析匯入檔案中的日期時間;留空時自動辨識常見格式。",
|
||||
dateTimeFormatRaw: "保留資料庫原始值",
|
||||
dateTimeFormatAuto: "自動辨識",
|
||||
dateTimeFormatSearchPlaceholder: "選擇或輸入格式",
|
||||
dateTimeFormatEmpty: "輸入自訂日期時間格式",
|
||||
exportBatchSizeDescription: "匯出資料時每批次擷取的列數(100-100000)。",
|
||||
exportRowLimitEnabled: "限制匯出行數",
|
||||
exportRowLimitEnabledDescription: "開啟後,查詢結果和資料表資料匯出將在下方設定的行數上限處停止。",
|
||||
|
||||
@@ -0,0 +1,14 @@
|
||||
import { describe, expect, it } from "vitest";
|
||||
import { normalizeSupportedDateTimePattern } from "@/lib/dataGrid/columnFormatter";
|
||||
|
||||
describe("normalizeSupportedDateTimePattern", () => {
|
||||
it("accepts the format grammar shared by the frontend and backend", () => {
|
||||
expect(normalizeSupportedDateTimePattern(" YYYY/M/D [at] HH:mm:ss.SSSZ ")).toBe("YYYY/M/D [at] HH:mm:ss.SSSZ");
|
||||
});
|
||||
|
||||
it("rejects unsupported or malformed Day.js tokens", () => {
|
||||
expect(normalizeSupportedDateTimePattern("MM/DD/YYYY hh:mm A")).toBe("");
|
||||
expect(normalizeSupportedDateTimePattern("YYYY-MM-DD [at HH:mm:ss")).toBe("");
|
||||
expect(normalizeSupportedDateTimePattern("%Y-%m-%d")).toBe("");
|
||||
});
|
||||
});
|
||||
@@ -2201,6 +2201,7 @@ export interface TableImportRequest {
|
||||
mode: TableImportMode;
|
||||
createTable?: boolean;
|
||||
batchSize: number;
|
||||
dateTimeFormat?: string;
|
||||
}
|
||||
|
||||
export interface TableImportSummary {
|
||||
@@ -2291,6 +2292,7 @@ export interface TableExportRequest {
|
||||
skipCount?: boolean;
|
||||
batchSize?: number;
|
||||
rowLimit?: number | null;
|
||||
dateTimeFormat?: string;
|
||||
}
|
||||
|
||||
export interface TableCsvExportOptions {
|
||||
@@ -2332,6 +2334,7 @@ export interface QueryResultExportRequest {
|
||||
keysetOptimizationEnabled: boolean;
|
||||
clientSessionId?: string;
|
||||
executionId?: string;
|
||||
dateTimeFormat?: string;
|
||||
}
|
||||
|
||||
export async function startTableExport(request: TableExportRequest, onProgress: (progress: TableExportProgress) => void): Promise<TableExportProgress> {
|
||||
|
||||
@@ -10,9 +10,47 @@ dayjs.extend(timezone);
|
||||
|
||||
export type DateTimeFormatterUnit = "seconds" | "milliseconds" | "auto";
|
||||
const DEFAULT_DATETIME_PATTERN = "YYYY-MM-DD HH:mm:ss";
|
||||
export const DateTimePatterns = ["HH:mm:ss", "HH:mm:ss.SSS", "YYYY-MM-DD HH:mm:ss", "YYYY-MM-DD HH:mm:ss.SSS", "YYYY/MM/DD HH:mm:ss", "YYYY/MM/DD HH:mm:ss.SSS", "YYYY-MM-DDTHH:mm:ssZ", "YYYY-MM-DDTHH:mm:ss.SSSZ", "YYYY/MM/DDTHH:mm:ssZ", "YYYY/MM/DDTHH:mm:ss.SSSZ"];
|
||||
const STRICT_LOCAL_DATETIME_INPUT_PATTERNS = ["YYYY-MM-DD", "YYYY/MM/DD", "YYYY-MM-DD HH:mm:ss", "YYYY-MM-DD HH:mm:ss.SSS", "YYYY/MM/DD HH:mm:ss", "YYYY/MM/DD HH:mm:ss.SSS", "YYYY-MM-DDTHH:mm:ss", "YYYY-MM-DDTHH:mm:ss.SSS", "YYYY/MM/DDTHH:mm:ss", "YYYY/MM/DDTHH:mm:ss.SSS"];
|
||||
const ISO_OFFSET_DATETIME_PATTERN = /^(\d{4})([-/])(\d{2})\2(\d{2})T(\d{2}):(\d{2}):(\d{2})(\.\d{1,3})?(Z|[+-]\d{2}:\d{2})$/;
|
||||
export const DateTimePatterns = [
|
||||
"YYYY-MM-DD",
|
||||
"YYYY/MM/DD",
|
||||
"YYYY/M/D",
|
||||
"HH:mm:ss",
|
||||
"HH:mm:ss.SSS",
|
||||
"YYYY-MM-DD HH:mm:ss",
|
||||
"YYYY-MM-DD HH:mm:ss.SSS",
|
||||
"YYYY/MM/DD HH:mm:ss",
|
||||
"YYYY/MM/DD HH:mm:ss.SSS",
|
||||
"YYYY/M/D HH:mm:ss",
|
||||
"YYYY-MM-DDTHH:mm:ssZ",
|
||||
"YYYY-MM-DDTHH:mm:ss.SSSZ",
|
||||
"YYYY/MM/DDTHH:mm:ssZ",
|
||||
"YYYY/MM/DDTHH:mm:ss.SSSZ",
|
||||
];
|
||||
const SUPPORTED_DATE_TIME_PATTERN_TOKENS = ["YYYY", "SSS", "ZZ", "MM", "DD", "HH", "mm", "ss", "M", "D", "H", "m", "s", "Z"];
|
||||
const STRICT_LOCAL_DATETIME_INPUT_PATTERNS = [
|
||||
"YYYY-MM-DD",
|
||||
"YYYY-M-D",
|
||||
"YYYY/MM/DD",
|
||||
"YYYY/M/D",
|
||||
"YYYY-MM-DD HH:mm:ss",
|
||||
"YYYY-M-D H:m:s",
|
||||
"YYYY-MM-DD HH:mm:ss.SSS",
|
||||
"YYYY-M-D H:m:s.SSS",
|
||||
"YYYY/MM/DD HH:mm:ss",
|
||||
"YYYY/M/D H:m:s",
|
||||
"YYYY/MM/DD HH:mm:ss.SSS",
|
||||
"YYYY/M/D H:m:s.SSS",
|
||||
"YYYY-MM-DDTHH:mm:ss",
|
||||
"YYYY-M-DTH:m:s",
|
||||
"YYYY-MM-DDTHH:mm:ss.SSS",
|
||||
"YYYY-M-DTH:m:s.SSS",
|
||||
"YYYY/MM/DDTHH:mm:ss",
|
||||
"YYYY/M/DTH:m:s",
|
||||
"YYYY/MM/DDTHH:mm:ss.SSS",
|
||||
"YYYY/M/DTH:m:s.SSS",
|
||||
];
|
||||
const ISO_OFFSET_DATETIME_PATTERN = /^(\d{4})([-/])(\d{2})\2(\d{2})T(\d{2}):(\d{2}):(\d{2})(\.\d{1,9})?(Z|[+-]\d{2}:\d{2})$/;
|
||||
const FRACTIONAL_LOCAL_DATETIME_PATTERN = /^(\d{4})([-/])(\d{1,2})\2(\d{1,2})([ T])(\d{1,2}):(\d{1,2}):(\d{1,2})\.(\d{1,9})$/;
|
||||
|
||||
export interface CustomColumnFormatterConfig {
|
||||
id: string;
|
||||
@@ -20,6 +58,33 @@ export interface CustomColumnFormatterConfig {
|
||||
template: string;
|
||||
}
|
||||
|
||||
export function normalizeSupportedDateTimePattern(value: string): string {
|
||||
const pattern = value.trim();
|
||||
if (!pattern || pattern.length > 100 || pattern.includes("%")) return "";
|
||||
|
||||
let index = 0;
|
||||
while (index < pattern.length) {
|
||||
const remaining = pattern.slice(index);
|
||||
if (remaining.startsWith("[")) {
|
||||
const closeIndex = remaining.indexOf("]");
|
||||
if (closeIndex < 0) return "";
|
||||
index += closeIndex + 1;
|
||||
continue;
|
||||
}
|
||||
|
||||
const token = SUPPORTED_DATE_TIME_PATTERN_TOKENS.find((candidate) => remaining.startsWith(candidate));
|
||||
if (token) {
|
||||
index += token.length;
|
||||
continue;
|
||||
}
|
||||
|
||||
if (/[A-Za-z]/.test(pattern[index])) return "";
|
||||
index += 1;
|
||||
}
|
||||
|
||||
return pattern;
|
||||
}
|
||||
|
||||
export type ColumnFormatterConfig = { kind: "datetime"; unit: DateTimeFormatterUnit; pattern: string } | { kind: "json-path"; path: string } | { kind: "mask"; prefix: number; suffix: number } | { kind: "custom-template"; template: string } | { kind: "custom-ref"; formatterId: string };
|
||||
|
||||
export interface ColumnFormatterKeyParts {
|
||||
@@ -82,13 +147,69 @@ export function normalizeCustomColumnFormatter(value: unknown): CustomColumnForm
|
||||
};
|
||||
}
|
||||
|
||||
export function resolveColumnFormatter(formatter: ColumnFormatterConfig | undefined, customFormatters: Record<string, CustomColumnFormatterConfig>): ColumnFormatterConfig | undefined {
|
||||
if (!formatter) return undefined;
|
||||
export function normalizeGlobalDateTimePattern(value: unknown): string {
|
||||
return typeof value === "string" ? value.trim().slice(0, 100) : "";
|
||||
}
|
||||
|
||||
export function isTemporalColumnType(dataType: string | null | undefined): boolean {
|
||||
const normalized = String(dataType || "")
|
||||
.trim()
|
||||
.toLowerCase()
|
||||
.replace(/\s+/g, " ");
|
||||
if (!normalized) return false;
|
||||
const base = normalized.split(/[(:]/)[0]?.trim() ?? "";
|
||||
return (
|
||||
["date", "date32", "daten", "time", "time64", "timen", "timetz", "datetime", "datetime2", "datetime4", "datetime64", "datetimen", "datetimeoffset", "datetimeoffsetn", "smalldatetime", "timestamp", "timestampdty", "timestamptz"].includes(base) ||
|
||||
base.startsWith("timestamp_") ||
|
||||
normalized.startsWith("timestamp with ") ||
|
||||
normalized.startsWith("timestamp without ") ||
|
||||
normalized.startsWith("time with ") ||
|
||||
normalized.startsWith("time without ")
|
||||
);
|
||||
}
|
||||
|
||||
export function resolveColumnFormatter(formatter: ColumnFormatterConfig | undefined, customFormatters: Record<string, CustomColumnFormatterConfig>, globalDateTime?: { pattern?: string; columnType?: string | null }): ColumnFormatterConfig | undefined {
|
||||
if (!formatter) {
|
||||
const pattern = normalizeGlobalDateTimePattern(globalDateTime?.pattern);
|
||||
return pattern && isTemporalColumnType(globalDateTime?.columnType) ? { kind: "datetime", unit: "auto", pattern } : undefined;
|
||||
}
|
||||
if (formatter.kind !== "custom-ref") return formatter;
|
||||
const customFormatter = customFormatters[formatter.formatterId];
|
||||
return customFormatter ? { kind: "custom-template", template: customFormatter.template } : undefined;
|
||||
}
|
||||
|
||||
export function formatTemporalRowsForExport<T extends CellValue>(rows: readonly (readonly T[])[], columnTypes: readonly (string | null | undefined)[], pattern: string): T[][] {
|
||||
const normalizedPattern = normalizeGlobalDateTimePattern(pattern);
|
||||
if (!normalizedPattern) return rows.map((row) => [...row]);
|
||||
return rows.map((row) =>
|
||||
row.map((value, index) => {
|
||||
if (!isTemporalColumnType(columnTypes[index])) return value;
|
||||
return formatTemporalValueForExport(value, normalizedPattern) as T;
|
||||
}),
|
||||
);
|
||||
}
|
||||
|
||||
function formatTemporalValueForExport(value: CellValue, pattern: string): string {
|
||||
if (typeof value === "string") {
|
||||
const match = value.match(ISO_OFFSET_DATETIME_PATTERN);
|
||||
if (match) {
|
||||
const [, year, separator, month, day, hour, minute, second, fraction = "", zone] = match;
|
||||
if (!isValidDateTimeParts(year, month, day, hour, minute, second) || !isValidOffset(zone)) {
|
||||
return displayCellValue(value);
|
||||
}
|
||||
const normalizedFraction = fraction ? `.${fraction.slice(1, 4).padEnd(3, "0")}` : "";
|
||||
const localValue = `${year}${separator}${month}${separator}${day}T${hour}:${minute}:${second}${normalizedFraction}`;
|
||||
const inputPattern = `${separator === "-" ? "YYYY-MM-DD" : "YYYY/MM/DD"}THH:mm:ss${fraction ? ".SSS" : ""}`;
|
||||
const parsed = dayjs(localValue, inputPattern, true);
|
||||
if (parsed.isValid()) {
|
||||
const offsetMinutes = zone === "Z" ? 0 : (zone.startsWith("-") ? -1 : 1) * (Number(zone.slice(1, 3)) * 60 + Number(zone.slice(4, 6)));
|
||||
return parsed.utcOffset(offsetMinutes, true).format(pattern);
|
||||
}
|
||||
}
|
||||
}
|
||||
return applyColumnFormatter(value, { kind: "datetime", unit: "auto", pattern });
|
||||
}
|
||||
|
||||
export function applyColumnFormatter(value: CellValue, formatter: ColumnFormatterConfig | undefined): string {
|
||||
if (!formatter) return displayCellValue(value);
|
||||
|
||||
@@ -142,6 +263,16 @@ function parseStrictDateTimeString(value: string): Dayjs | undefined {
|
||||
const parsedIsoOffset = parseIsoOffsetDateTimeString(value);
|
||||
if (parsedIsoOffset) return parsedIsoOffset;
|
||||
|
||||
const fractionalLocalMatch = value.match(FRACTIONAL_LOCAL_DATETIME_PATTERN);
|
||||
if (fractionalLocalMatch) {
|
||||
const [, yearText, , monthText, dayText, , hourText, minuteText, secondText, fractionText] = fractionalLocalMatch;
|
||||
if (isValidDateTimeParts(yearText, monthText, dayText, hourText, minuteText, secondText)) {
|
||||
const normalized = `${yearText}-${monthText.padStart(2, "0")}-${dayText.padStart(2, "0")}T${hourText.padStart(2, "0")}:${minuteText.padStart(2, "0")}:${secondText.padStart(2, "0")}.${fractionText.slice(0, 3).padEnd(3, "0")}`;
|
||||
const parsed = dayjs(normalized, "YYYY-MM-DDTHH:mm:ss.SSS", true);
|
||||
if (parsed.isValid()) return parsed;
|
||||
}
|
||||
}
|
||||
|
||||
for (const pattern of STRICT_LOCAL_DATETIME_INPUT_PATTERNS) {
|
||||
// Day.js non-strict parsing normalizes overflow dates such as 2022-01-33.
|
||||
// Keep cell text strict so invalid values fall back unchanged.
|
||||
@@ -159,7 +290,8 @@ function parseIsoOffsetDateTimeString(value: string): Dayjs | undefined {
|
||||
if (!isValidDateTimeParts(yearText, monthText, dayText, hourText, minuteText, secondText)) return undefined;
|
||||
if (!isValidOffset(zoneText)) return undefined;
|
||||
|
||||
const normalized = `${yearText}-${monthText}-${dayText}T${hourText}:${minuteText}:${secondText}${fractionText}${zoneText}`;
|
||||
const normalizedFraction = fractionText ? `.${fractionText.slice(1, 4).padEnd(3, "0")}` : "";
|
||||
const normalized = `${yearText}-${monthText}-${dayText}T${hourText}:${minuteText}:${secondText}${normalizedFraction}${zoneText}`;
|
||||
const parsed = dayjs(normalized);
|
||||
return parsed.isValid() ? parsed : undefined;
|
||||
}
|
||||
|
||||
@@ -47,6 +47,9 @@ export const EDITOR_SETTINGS_DRAFT_KEYS = [
|
||||
"exportRowLimitEnabled",
|
||||
"exportRowLimit",
|
||||
"queryExportKeysetOptimizationEnabled",
|
||||
"globalDateTimeDisplayFormat",
|
||||
"globalDateTimeExportFormat",
|
||||
"globalDateTimeImportFormat",
|
||||
"updateDownloadSource",
|
||||
"toolbarItems",
|
||||
"snippets",
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import { defineStore } from "pinia";
|
||||
import { ref } from "vue";
|
||||
import * as api from "@/lib/backend/api";
|
||||
import { normalizeColumnFormatter, normalizeCustomColumnFormatter, type ColumnFormatterConfig, type CustomColumnFormatterConfig } from "@/lib/dataGrid/columnFormatter";
|
||||
import { normalizeColumnFormatter, normalizeCustomColumnFormatter, normalizeGlobalDateTimePattern, type ColumnFormatterConfig, type CustomColumnFormatterConfig } from "@/lib/dataGrid/columnFormatter";
|
||||
import { normalizeShortcutSettings, type ShortcutSettings } from "@/lib/editor/shortcutRegistry";
|
||||
import { normalizeResultPageSize } from "@/lib/dataGrid/paginationPageSize";
|
||||
import { normalizeSidebarHiddenTablePrefixes } from "@/lib/sidebar/sidebarTableNameDisplay";
|
||||
@@ -421,6 +421,9 @@ export interface EditorSettings {
|
||||
sidebarAllowHorizontalScroll: boolean;
|
||||
columnFormatters: Record<string, ColumnFormatterConfig>;
|
||||
customColumnFormatters: Record<string, CustomColumnFormatterConfig>;
|
||||
globalDateTimeDisplayFormat: string;
|
||||
globalDateTimeExportFormat: string;
|
||||
globalDateTimeImportFormat: string;
|
||||
snippets: SqlSnippet[];
|
||||
tableColumnTemplateFields: string[];
|
||||
exportBatchSize: number;
|
||||
@@ -559,6 +562,9 @@ export const DEFAULT_EDITOR_SETTINGS: EditorSettings = {
|
||||
sidebarAllowHorizontalScroll: false,
|
||||
columnFormatters: {},
|
||||
customColumnFormatters: {},
|
||||
globalDateTimeDisplayFormat: "",
|
||||
globalDateTimeExportFormat: "",
|
||||
globalDateTimeImportFormat: "",
|
||||
snippets: DEFAULT_SQL_SNIPPETS,
|
||||
tableColumnTemplateFields: [...DEFAULT_TABLE_COLUMN_TEMPLATE_FIELDS],
|
||||
exportBatchSize: 2000,
|
||||
@@ -797,6 +803,9 @@ export function normalizeEditorSettings(settings: Partial<EditorSettings>, exist
|
||||
sidebarAllowHorizontalScroll: settings.sidebarAllowHorizontalScroll ?? DEFAULT_EDITOR_SETTINGS.sidebarAllowHorizontalScroll,
|
||||
columnFormatters: normalizeColumnFormatters(settings.columnFormatters),
|
||||
customColumnFormatters: normalizeCustomColumnFormatters(settings.customColumnFormatters),
|
||||
globalDateTimeDisplayFormat: normalizeGlobalDateTimePattern(settings.globalDateTimeDisplayFormat),
|
||||
globalDateTimeExportFormat: normalizeGlobalDateTimePattern(settings.globalDateTimeExportFormat),
|
||||
globalDateTimeImportFormat: normalizeGlobalDateTimePattern(settings.globalDateTimeImportFormat),
|
||||
snippets: normalizeSqlSnippets(settings.snippets, existing?.snippets),
|
||||
tableColumnTemplateFields: normalizeTableColumnTemplateFields(settings.tableColumnTemplateFields),
|
||||
exportBatchSize: typeof settings.exportBatchSize === "number" && settings.exportBatchSize >= 100 && settings.exportBatchSize <= 100000 ? Math.round(settings.exportBatchSize) : DEFAULT_EDITOR_SETTINGS.exportBatchSize,
|
||||
@@ -1047,6 +1056,9 @@ export const useSettingsStore = defineStore("settings", () => {
|
||||
if (partial.sidebarAllowHorizontalScroll !== undefined) editorSettings.value.sidebarAllowHorizontalScroll = partial.sidebarAllowHorizontalScroll;
|
||||
if (partial.columnFormatters !== undefined) editorSettings.value.columnFormatters = partial.columnFormatters;
|
||||
if (partial.customColumnFormatters !== undefined) editorSettings.value.customColumnFormatters = partial.customColumnFormatters;
|
||||
if (partial.globalDateTimeDisplayFormat !== undefined) editorSettings.value.globalDateTimeDisplayFormat = normalizeGlobalDateTimePattern(partial.globalDateTimeDisplayFormat);
|
||||
if (partial.globalDateTimeExportFormat !== undefined) editorSettings.value.globalDateTimeExportFormat = normalizeGlobalDateTimePattern(partial.globalDateTimeExportFormat);
|
||||
if (partial.globalDateTimeImportFormat !== undefined) editorSettings.value.globalDateTimeImportFormat = normalizeGlobalDateTimePattern(partial.globalDateTimeImportFormat);
|
||||
if (partial.snippets !== undefined) editorSettings.value.snippets = normalizeSqlSnippets(partial.snippets);
|
||||
if (partial.tableColumnTemplateFields !== undefined) editorSettings.value.tableColumnTemplateFields = normalizeTableColumnTemplateFields(partial.tableColumnTemplateFields);
|
||||
if (partial.exportBatchSize !== undefined) editorSettings.value.exportBatchSize = Math.min(100000, Math.max(100, Math.round(partial.exportBatchSize)));
|
||||
|
||||
Reference in new issue
Block a user