From c0ab145924b751cb8139305cf35edbeefc735122 Mon Sep 17 00:00:00 2001 From: t8y2 Date: Mon, 28 Sep 2026 01:45:14 +0800 Subject: [PATCH] feat(grid): default column width mode to content --- apps/desktop/src/components/grid/DataGrid.vue | 2 +- .../components/grid/DataGridColumnWidthModeControl.vue | 2 +- apps/desktop/src/stores/__tests__/settingsStore.spec.ts | 6 +++--- apps/desktop/src/stores/settingsStore.ts | 2 +- packages/app-tests/settingsStore.test.ts | 8 ++++---- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/apps/desktop/src/components/grid/DataGrid.vue b/apps/desktop/src/components/grid/DataGrid.vue index 48603d7d22..415681e889 100644 --- a/apps/desktop/src/components/grid/DataGrid.vue +++ b/apps/desktop/src/components/grid/DataGrid.vue @@ -2269,7 +2269,7 @@ function scrollToColumnIndex(columnIndex: number) { // --- Column resize composable --- const columnWidthDensity = computed(() => settingsStore.editorSettings.columnWidthDensity); -const columnWidthMode = computed(() => settingsStore.editorSettings.dataGridColumnWidthMode ?? "fill"); +const columnWidthMode = computed(() => settingsStore.editorSettings.dataGridColumnWidthMode ?? "content"); const tableFontFamily = computed(() => settingsStore.editorSettings.tableFontFamily); const columnWidthCacheKey = computed(() => props.columnWidthCacheKey?.trim() || props.cacheKey?.trim() || undefined); const columnStructureSignature = computed(() => createDataGridColumnStructureSignature(props.result.columns, props.result.column_types)); diff --git a/apps/desktop/src/components/grid/DataGridColumnWidthModeControl.vue b/apps/desktop/src/components/grid/DataGridColumnWidthModeControl.vue index eb3d3bd9b3..6ab5712f8a 100644 --- a/apps/desktop/src/components/grid/DataGridColumnWidthModeControl.vue +++ b/apps/desktop/src/components/grid/DataGridColumnWidthModeControl.vue @@ -5,7 +5,7 @@ import { useSettingsStore, type DataGridColumnWidthMode } from "@/stores/setting const { t } = useI18n(); const settingsStore = useSettingsStore(); -const columnWidthMode = computed(() => settingsStore.editorSettings.dataGridColumnWidthMode ?? "fill"); +const columnWidthMode = computed(() => settingsStore.editorSettings.dataGridColumnWidthMode ?? "content"); function setColumnWidthMode(value: DataGridColumnWidthMode) { settingsStore.updateEditorSettings({ dataGridColumnWidthMode: value }); diff --git a/apps/desktop/src/stores/__tests__/settingsStore.spec.ts b/apps/desktop/src/stores/__tests__/settingsStore.spec.ts index 0bcfeb0b46..a3198a742b 100644 --- a/apps/desktop/src/stores/__tests__/settingsStore.spec.ts +++ b/apps/desktop/src/stores/__tests__/settingsStore.spec.ts @@ -490,11 +490,11 @@ describe("normalizeEditorSettings", () => { }); it("normalizes the persistent data grid column width mode", () => { - expect(DEFAULT_EDITOR_SETTINGS.dataGridColumnWidthMode).toBe("fill"); - expect(normalizeEditorSettings({}).dataGridColumnWidthMode).toBe("fill"); + expect(DEFAULT_EDITOR_SETTINGS.dataGridColumnWidthMode).toBe("content"); + expect(normalizeEditorSettings({}).dataGridColumnWidthMode).toBe("content"); expect(normalizeEditorSettings({ dataGridColumnWidthMode: "fill" }).dataGridColumnWidthMode).toBe("fill"); expect(normalizeEditorSettings({ dataGridColumnWidthMode: "content" }).dataGridColumnWidthMode).toBe("content"); - expect(normalizeEditorSettings({ dataGridColumnWidthMode: "invalid" as any }).dataGridColumnWidthMode).toBe("fill"); + expect(normalizeEditorSettings({ dataGridColumnWidthMode: "invalid" as any }).dataGridColumnWidthMode).toBe("content"); }); it("defaults the cell detail hover button on and preserves only boolean values", () => { diff --git a/apps/desktop/src/stores/settingsStore.ts b/apps/desktop/src/stores/settingsStore.ts index 9411267e06..8c1e409d02 100644 --- a/apps/desktop/src/stores/settingsStore.ts +++ b/apps/desktop/src/stores/settingsStore.ts @@ -1186,7 +1186,7 @@ export const DEFAULT_EDITOR_SETTINGS: EditorSettings = { showIndexIndicatorsInHeader: true, compactColumnHeaderActions: true, columnWidthDensity: "standard", - dataGridColumnWidthMode: "fill", + dataGridColumnWidthMode: "content", dataGridQuickEntry: false, dataGridFilterEditorView: "quick", dataGridToolbarLayout: "single", diff --git a/packages/app-tests/settingsStore.test.ts b/packages/app-tests/settingsStore.test.ts index 2df6cafdec..5fe5130f97 100644 --- a/packages/app-tests/settingsStore.test.ts +++ b/packages/app-tests/settingsStore.test.ts @@ -141,11 +141,11 @@ test("table DDL wrapping defaults on and normalizes saved booleans independently assert.equal(settings.wordWrap, true); }); -test("data grid column width mode defaults to fill and normalizes saved values", () => { - assert.equal(DEFAULT_EDITOR_SETTINGS.dataGridColumnWidthMode, "fill"); - assert.equal(normalizeEditorSettings({}).dataGridColumnWidthMode, "fill"); +test("data grid column width mode defaults to content and normalizes saved values", () => { + assert.equal(DEFAULT_EDITOR_SETTINGS.dataGridColumnWidthMode, "content"); + assert.equal(normalizeEditorSettings({}).dataGridColumnWidthMode, "content"); assert.equal(normalizeEditorSettings({ dataGridColumnWidthMode: "content" }).dataGridColumnWidthMode, "content"); - assert.equal(normalizeEditorSettings({ dataGridColumnWidthMode: "invalid" as any }).dataGridColumnWidthMode, "fill"); + assert.equal(normalizeEditorSettings({ dataGridColumnWidthMode: "invalid" as any }).dataGridColumnWidthMode, "content"); }); test("updateEditorSettings persists the data grid column width mode", async () => {