fix(grid): cap automatic header width

This commit is contained in:
t8y2 committed 2026-07-17 08:52:41 +08:00
1 parent 51f87976b4
commit ef8cc11161
3 files changed
+12 -10

No files matched your search

@@ -135,7 +135,7 @@ describe("useDataGridColumnResize", () => {
expect(state.columnWidths.value[0]).toBe(129); expect(state.columnWidths.value[0]).toBe(129);
}); });
it("compact mode bases width on field name without truncating long names", () => { it("compact mode keeps normal field names complete and caps pathological names", () => {
// 短字段名:列宽=字段名宽度,值不参与撑宽 // 短字段名:列宽=字段名宽度,值不参与撑宽
const short = createResizeState({ const short = createResizeState({
columns: ["id"], columns: ["id"],
@@ -158,16 +158,16 @@ describe("useDataGridColumnResize", () => {
// 9×7+45=108 // 9×7+45=108
expect(mid.columnWidths.value[0]).toBe(108); expect(mid.columnWidths.value[0]).toBe(108);
// 过长字段名:字段名仍完整展示,不受内容宽度上限影响 // 异常超长字段名:使用独立表头上限,避免单列撑爆表格
const longName = createResizeState({ const longName = createResizeState({
columns: ["x".repeat(70)], columns: ["x".repeat(100)],
rows: [["a"]], rows: [["a"]],
density: "compact", density: "compact",
compactColumnHeaderActions: true, compactColumnHeaderActions: true,
}); });
longName.initColumnWidths(); longName.initColumnWidths();
// 70×7+45=535,紧凑模式只限制内容,不限制字段名 // 100×7+45=745,表头自动宽度限制为 500
expect(longName.columnWidths.value[0]).toBe(535); expect(longName.columnWidths.value[0]).toBe(500);
}); });
it("comfortable mode uses percentile to ignore outlier values", () => { it("comfortable mode uses percentile to ignore outlier values", () => {
@@ -5,6 +5,7 @@ type CellValue = string | number | boolean | null;
export const DATA_GRID_COL_MIN_WIDTH = 60; export const DATA_GRID_COL_MIN_WIDTH = 60;
export const DATA_GRID_COL_MAX_WIDTH = 400; export const DATA_GRID_COL_MAX_WIDTH = 400;
export const DATA_GRID_COL_AUTO_FIT_MAX_WIDTH = 1200; export const DATA_GRID_COL_AUTO_FIT_MAX_WIDTH = 1200;
export const DATA_GRID_HEADER_MAX_WIDTH = 500;
export const DATA_GRID_CHAR_WIDTH = 8; export const DATA_GRID_CHAR_WIDTH = 8;
export const DATA_GRID_HEADER_CONTROL_WIDTH = 80; export const DATA_GRID_HEADER_CONTROL_WIDTH = 80;
export const DATA_GRID_CELL_PADDING = 28; export const DATA_GRID_CELL_PADDING = 28;
@@ -98,7 +99,8 @@ export function calculateDataGridColumnWidth(options: { columnName: string; samp
const valueTextLimit = options.valueTextLimit ?? preset.valueTextLimit; const valueTextLimit = options.valueTextLimit ?? preset.valueTextLimit;
const headerControl = options.compactColumnHeaderActions ? preset.headerControlWidthCompact : preset.headerControlWidth; const headerControl = options.compactColumnHeaderActions ? preset.headerControlWidthCompact : preset.headerControlWidth;
const headerTextWidth = options.headerTextWidth ?? estimateTextWidth(options.columnName, 0, preset.charWidth); const headerTextWidth = options.headerTextWidth ?? estimateTextWidth(options.columnName, 0, preset.charWidth);
const headerWidth = headerTextWidth + headerControl; // Protect the grid from pathological identifiers while keeping normal names density-independent.
const headerWidth = Math.min(DATA_GRID_HEADER_MAX_WIDTH, headerTextWidth + headerControl);
// Density limits cell content, never the column name and its header controls. // Density limits cell content, never the column name and its header controls.
if (density === "compact" && !options.includeValues) { if (density === "compact" && !options.includeValues) {
+4 -4
View File
@@ -1,5 +1,5 @@
import { expect, test } from "vitest"; import { expect, test } from "vitest";
import { calculateDataGridColumnWidth, DATA_GRID_AUTO_FIT_VALUE_TEXT_LIMIT, DATA_GRID_COL_AUTO_FIT_MAX_WIDTH, DATA_GRID_COL_MAX_WIDTH } from "../../apps/desktop/src/lib/dataGrid/dataGridColumnWidth.ts"; import { calculateDataGridColumnWidth, DATA_GRID_AUTO_FIT_VALUE_TEXT_LIMIT, DATA_GRID_COL_AUTO_FIT_MAX_WIDTH, DATA_GRID_COL_MAX_WIDTH, DATA_GRID_HEADER_MAX_WIDTH } from "../../apps/desktop/src/lib/dataGrid/dataGridColumnWidth.ts";
test("default data grid column width remains compact for long values", () => { test("default data grid column width remains compact for long values", () => {
const width = calculateDataGridColumnWidth({ const width = calculateDataGridColumnWidth({
@@ -33,7 +33,7 @@ test("auto-fit data grid column width stays bounded for very long values", () =>
expect(width).toBe(DATA_GRID_COL_AUTO_FIT_MAX_WIDTH); expect(width).toBe(DATA_GRID_COL_AUTO_FIT_MAX_WIDTH);
}); });
test("data grid column width uses measured header text as an uncapped minimum", () => { test("data grid column width uses measured header text as the normal minimum", () => {
const width = calculateDataGridColumnWidth({ const width = calculateDataGridColumnWidth({
columnName: "AMOUNT", columnName: "AMOUNT",
sampleValues: ["1"], sampleValues: ["1"],
@@ -45,7 +45,7 @@ test("data grid column width uses measured header text as an uncapped minimum",
expect(width).toBe(113); expect(width).toBe(113);
}); });
test("compact data grid columns keep long field names complete", () => { test("data grid caps pathological field names independently of density", () => {
const width = calculateDataGridColumnWidth({ const width = calculateDataGridColumnWidth({
columnName: "x".repeat(100), columnName: "x".repeat(100),
sampleValues: ["1"], sampleValues: ["1"],
@@ -54,5 +54,5 @@ test("compact data grid columns keep long field names complete", () => {
headerTextWidth: 700, headerTextWidth: 700,
}); });
expect(width).toBe(745); expect(width).toBe(DATA_GRID_HEADER_MAX_WIDTH);
}); });