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): add action to clear remembered column widths (#12915)

lxk955f498fe8b9393
diff --git a/apps/desktop/src/components/grid/DataGrid.vue b/apps/desktop/src/components/grid/DataGrid.vue
index c73d78297a..43547ba7a1 100644
--- a/apps/desktop/src/components/grid/DataGrid.vue
+++ b/apps/desktop/src/components/grid/DataGrid.vue
@@ -2811,7 +2811,7 @@ function columnWidthDisplayValue(value: CellValue, columnIndex: number): CellVal
return showWhitespaceEnabled.value && typeof display === "string" ? gridCellDisplayValue(display, flatteningMultiLineEnabled.value, true) : display;
}
-const { initColumnWidths, growColumnWidthsToFitSamples, onResizeStart, autoFitColumn, autoFitAllColumns, renderedColumnWidths, totalWidth, columnVars, getIsResizing } = useDataGridColumnResize({
+const { initColumnWidths, growColumnWidthsToFitSamples, onResizeStart, autoFitColumn, autoFitAllColumns, resetColumnWidths, hasUserSizedColumns, renderedColumnWidths, totalWidth, columnVars, getIsResizing } = useDataGridColumnResize({
columns: visibleColumns,
sourceRows: computed(() => props.result.rows),
columnIndexes: visibleColumnIndexes,
@@ -13919,6 +13919,8 @@ defineExpose({
moveDisplayableColumn,
resetColumnOrder,
autoFitAllColumns,
+ resetColumnWidths,
+ hasUserSizedColumns,
nullColumnsHidden,
allNullColumnCount,
canToggleAllNullColumns,
@@ -14326,6 +14328,7 @@ const gridContextMenuItems = computed<ContextMenuItem[]>(() => {
frozenColumnCount: frozenColumnCount.value,
contextVisibleColIdx: contextHeaderVisibleColIdx.value ?? undefined,
hasColumnSelection: hasColumnSelection.value,
+ hasUserSizedColumns: hasUserSizedColumns.value,
selectedColumnCount,
visibleColumnCount: visibleColumnCount.value,
hiddenColumnCount: hiddenColumnCount.value,
@@ -14356,6 +14359,7 @@ const gridContextMenuItems = computed<ContextMenuItem[]>(() => {
hideSelectedColumns: t("grid.hideSelectedColumns", { count: selectedColumnCount }),
hideIdenticalColumns: identicalColumnCount > 0 ? t("grid.hideIdenticalColumnsCount", { count: identicalColumnCount }) : t("grid.hideIdenticalColumns"),
showAllColumnsMenu: t("grid.showAllColumnsMenu"),
+ clearRememberedColumnWidths: t("grid.clearRememberedColumnWidths"),
},
icons: {
copy: Copy,
@@ -14364,6 +14368,7 @@ const gridContextMenuItems = computed<ContextMenuItem[]>(() => {
ascending: ArrowUp,
descending: ArrowDown,
clearSort: Eraser,
+ clearRememberedColumnWidths: RotateCcw,
},
actions: {
copyName: copyHeaderColumnOrSelected,
@@ -14373,6 +14378,10 @@ const gridContextMenuItems = computed<ContextMenuItem[]>(() => {
copyAlterSql: copyAlterColumnSql,
copyMetadata: copyContextColumnMetadata,
sort: applyContextSort,
+ clearRememberedColumnWidths: () => {
+ resetColumnWidths();
+ clearCellSelection();
+ },
freezeToColumn: () => {
const idx = contextHeaderVisibleColIdx.value;
if (idx !== null && idx >= 0) {
diff --git a/apps/desktop/src/components/grid/DataGridColumnLayoutPopover.vue b/apps/desktop/src/components/grid/DataGridColumnLayoutPopover.vue
index 7ad8b4d892..4b02ee8951 100644
--- a/apps/desktop/src/components/grid/DataGridColumnLayoutPopover.vue
+++ b/apps/desktop/src/components/grid/DataGridColumnLayoutPopover.vue
@@ -368,11 +368,18 @@ onBeforeUnmount(resetColumnDragState);
{{ t("grid.noSearchResults") }}
</div>
</div>
- <div v-if="grid?.autoFitAllColumns" class="flex items-center justify-between gap-2 border-t bg-muted/30 px-2 py-1.5">
- <span class="text-[11px] leading-4 text-muted-foreground">{{ t("grid.columnWidth") }}</span>
- <Button variant="ghost" size="sm" class="h-7 shrink-0 px-2 text-xs" data-column-auto-fit-all :title="t('grid.autoFitColumnWidthsHint')" @click="grid?.autoFitAllColumns?.()">
- {{ t("grid.autoFitColumnWidths") }}
- </Button>
+ <div v-if="grid?.autoFitAllColumns" class="flex flex-col gap-1 border-t bg-muted/30 px-2 py-1.5">
+ <div class="flex items-center justify-between gap-1">
+ <span class="text-[11px] leading-4 text-muted-foreground">{{ t("grid.columnWidth") }}</span>
+ <div class="flex flex-wrap items-center justify-end gap-1">
+ <Button variant="ghost" size="sm" class="h-7 shrink-0 px-2 text-xs" data-column-auto-fit-all :title="t('grid.autoFitColumnWidthsHint')" @click="grid?.autoFitAllColumns?.()">
+ {{ t("grid.autoFitColumnWidths") }}
+ </Button>
+ <Button v-if="grid?.resetColumnWidths" variant="ghost" size="sm" class="h-7 shrink-0 px-2 text-xs" data-column-reset-widths :disabled="!grid?.hasUserSizedColumns" :title="t('grid.clearRememberedColumnWidthsHint')" @click="grid?.resetColumnWidths?.()">
+ {{ t("grid.clearRememberedColumnWidths") }}
+ </Button>
+ </div>
+ </div>
</div>
<div class="flex flex-col gap-1 border-t bg-muted/30 px-2 py-1.5">
<span class="text-[11px] leading-4 text-muted-foreground">
diff --git a/apps/desktop/src/components/grid/__tests__/DataGridBatchPasteFromCell.spec.ts b/apps/desktop/src/components/grid/__tests__/DataGridBatchPasteFromCell.spec.ts
index 6fb2180d4f..476c859971 100644
--- a/apps/desktop/src/components/grid/__tests__/DataGridBatchPasteFromCell.spec.ts
+++ b/apps/desktop/src/components/grid/__tests__/DataGridBatchPasteFromCell.spec.ts
@@ -49,6 +49,7 @@ vi.mock("@/composables/useDataGridColumnResize", async (importOriginal) => {
initColumnWidths: vi.fn(),
onResizeStart: vi.fn(),
autoFitColumn: vi.fn(),
+ hasUserSizedColumns: ref(false),
renderedColumnWidths: ref([120, 120, 120, 120]),
totalWidth: ref(480),
columnVars: ref({ "--total-w": "480px" }),
diff --git a/apps/desktop/src/components/grid/__tests__/DataGridContextExtractor.spec.ts b/apps/desktop/src/components/grid/__tests__/DataGridContextExtractor.spec.ts
index 2d9e5092f7..cc426efe02 100644
--- a/apps/desktop/src/components/grid/__tests__/DataGridContextExtractor.spec.ts
+++ b/apps/desktop/src/components/grid/__tests__/DataGridContextExtractor.spec.ts
@@ -48,6 +48,7 @@ vi.mock("@/composables/useDataGridColumnResize", async (importOriginal) => {
initColumnWidths: vi.fn(),
onResizeStart: vi.fn(),
autoFitColumn: vi.fn(),
+ hasUserSizedColumns: ref(false),
renderedColumnWidths: ref([120, 180]),
totalWidth: ref(300),
columnVars: ref({ "--total-w": "300px" }),
diff --git a/apps/desktop/src/components/grid/__tests__/DataGridFilterEditorState.spec.ts b/apps/desktop/src/components/grid/__tests__/DataGridFilterEditorState.spec.ts
index eac155df8c..da71ee4e22 100644
--- a/apps/desktop/src/components/grid/__tests__/DataGridFilterEditorState.spec.ts
+++ b/apps/desktop/src/components/grid/__tests__/DataGridFilterEditorState.spec.ts
@@ -58,6 +58,7 @@ vi.mock("@/composables/useDataGridColumnResize", async (importOriginal) => {
initColumnWidths: vi.fn(),
onResizeStart: vi.fn(),
autoFitColumn: vi.fn(),
+ hasUserSizedColumns: ref(false),
renderedColumnWidths: ref([120]),
totalWidth: ref(120),
columnVars: ref({ "--total-w": "120px" }),
diff --git a/apps/desktop/src/components/grid/__tests__/dataGridColumnLayoutPopover.spec.ts b/apps/desktop/src/components/grid/__tests__/dataGridColumnLayoutPopover.spec.ts
index f37f962e02..51f82cbe78 100644
--- a/apps/desktop/src/components/grid/__tests__/dataGridColumnLayoutPopover.spec.ts
+++ b/apps/desktop/src/components/grid/__tests__/dataGridColumnLayoutPopover.spec.ts
@@ -52,11 +52,12 @@ function columnLayoutOptions(itemCount: number): DataGridColumnLayoutOption[] {
}));
}
-function createGrid(itemCount: number) {
+function createGrid(itemCount: number, optionsOverride: Partial<DataGridColumnLayoutHandle> = {}) {
const options = columnLayoutOptions(itemCount);
const toggleColumnVisibility = vi.fn();
const moveDisplayableColumn = vi.fn();
const autoFitAllColumns = vi.fn();
+ const resetColumnWidths = vi.fn();
const grid: DataGridColumnLayoutHandle = {
visibleColumnCount: itemCount,
displayableColumnCount: itemCount,
@@ -74,8 +75,11 @@ function createGrid(itemCount: number) {
moveDisplayableColumn,
resetColumnOrder: vi.fn(),
autoFitAllColumns,
+ resetColumnWidths,
+ hasUserSizedColumns: true,
+ ...optionsOverride,
};
- return { grid, moveDisplayableColumn, toggleColumnVisibility, autoFitAllColumns };
+ return { grid, moveDisplayableColumn, toggleColumnVisibility, autoFitAllColumns, resetColumnWidths };
}
// https://github.com/t8y2/dbx/issues/9813
@@ -106,6 +110,34 @@ describe("column layout popover auto fit", () => {
expect(host.querySelector("[data-column-auto-fit-all]")).toBeNull();
});
+
+ it("offers a clear remembered column widths action that clears user-sized columns", async () => {
+ const { host, resetColumnWidths } = await mountPopover(3);
+
+ const resetButton = host.querySelector<HTMLButtonElement>("[data-column-reset-widths]")!;
+ expect(resetButton).not.toBeNull();
+ expect(resetButton.textContent?.trim()).toBe("Clear remembered column widths");
+ expect(resetButton.disabled).toBe(false);
+
+ resetButton.click();
+ expect(resetColumnWidths).toHaveBeenCalledTimes(1);
+ });
+
+ it("disables clear remembered column widths button when hasUserSizedColumns is false", async () => {
+ const gridState = createGrid(3, { hasUserSizedColumns: false });
+ const host = document.createElement("div");
+ document.body.append(host);
+ const app = createApp(DataGridColumnLayoutPopover, { grid: gridState.grid });
+ app.use(i18n);
+ app.mount(host);
+ mountedApps.push({ app, host });
+ await nextTick();
+ await nextTick();
+
+ const resetButton = host.querySelector<HTMLButtonElement>("[data-column-reset-widths]")!;
+ expect(resetButton).not.toBeNull();
+ expect(resetButton.disabled).toBe(true);
+ });
});
async function mountPopover(itemCount = 4) {
diff --git a/apps/desktop/src/components/grid/dataGridColumnLayoutPopover.ts b/apps/desktop/src/components/grid/dataGridColumnLayoutPopover.ts
index ab03f04b42..66093585a3 100644
--- a/apps/desktop/src/components/grid/dataGridColumnLayoutPopover.ts
+++ b/apps/desktop/src/components/grid/dataGridColumnLayoutPopover.ts
@@ -22,6 +22,9 @@ export interface DataGridColumnLayoutHandle {
/** Fit every visible column to its content (#9813). Optional so grids that
* only expose the visibility/order surface keep working. */
autoFitAllColumns?: () => void;
+ /** Clear manual/remembered column widths and restore automatic calculation. */
+ resetColumnWidths?: () => void;
+ hasUserSizedColumns?: boolean;
}
export interface DataGridColumnLayoutVirtualWindow {
diff --git a/apps/desktop/src/composables/__tests__/useDataGridColumnResize.spec.ts b/apps/desktop/src/composables/__tests__/useDataGridColumnResize.spec.ts
index 78aa9c8149..a3538008f0 100644
--- a/apps/desktop/src/composables/__tests__/useDataGridColumnResize.spec.ts
+++ b/apps/desktop/src/composables/__tests__/useDataGridColumnResize.spec.ts
@@ -722,6 +722,51 @@ describe("useDataGridColumnResize", () => {
expect(comf.columnWidths.value[0]).toBeGreaterThanOrEqual(std.columnWidths.value[0]);
});
+
+ it("clears remembered column widths and restores automatic calculation", () => {
+ const cacheKey = "test-reset-column-widths";
+ const state = createResizeState({
+ columns: ["id", "name"],
+ rows: [[1, "Alice"]],
+ cacheKey,
+ widthMode: "content",
+ });
+ state.initColumnWidths();
+ const autoWidth = state.columnWidths.value[0]!;
+ expect(state.hasUserSizedColumns.value).toBe(false);
+
+ // Resize column 0 manually
+ state.onResizeStart(0, new MouseEvent("mousedown", { clientX: 100, cancelable: true }));
+ document.dispatchEvent(new MouseEvent("mouseup", { clientX: 250 }));
+ expect(state.columnWidths.value[0]).toBeGreaterThan(autoWidth);
+ expect(state.hasUserSizedColumns.value).toBe(true);
+ expect(localStorage.getItem(`dbx-data-grid-column-widths:${cacheKey}`)).toBeTruthy();
+
+ // Reset column widths
+ state.resetColumnWidths();
+ expect(state.hasUserSizedColumns.value).toBe(false);
+ expect(state.columnWidths.value[0]).toBe(autoWidth);
+ expect(localStorage.getItem(`dbx-data-grid-column-widths:${cacheKey}`)).toBeNull();
+ });
+
+ it("clears auto-fitted widths after manual and automatic width states are split", () => {
+ const cacheKey = "test-reset-auto-fitted-column-widths";
+ const state = createResizeState({
+ columns: ["description"],
+ rows: [["A long description that has been explicitly fitted"]],
+ cacheKey,
+ widthMode: "content",
+ });
+ state.initColumnWidths();
+ const autoWidth = state.columnWidths.value[0]!;
+ state.autoFitAllColumns();
+ expect(state.hasUserSizedColumns.value).toBe(true);
+
+ state.resetColumnWidths();
+ expect(state.hasUserSizedColumns.value).toBe(false);
+ expect(state.columnWidths.value[0]).toBe(autoWidth);
+ expect(localStorage.getItem(`dbx-data-grid-column-widths:${cacheKey}`)).toBeNull();
+ });
});
describe("sampleDataGridColumnValues", () => {
diff --git a/apps/desktop/src/composables/useDataGridColumnResize.ts b/apps/desktop/src/composables/useDataGridColumnResize.ts
index a86c2710fe..7ae0aca378 100644
--- a/apps/desktop/src/composables/useDataGridColumnResize.ts
+++ b/apps/desktop/src/composables/useDataGridColumnResize.ts
@@ -57,6 +57,7 @@ export function useDataGridColumnResize(options: UseDataGridColumnResizeOptions)
// Only manual widths survive font metrics/density changes and persist across sessions.
const manualColumnIndexes = shallowRef<Set<number>>(new Set());
const autoFittedColumnIndexes = shallowRef<Set<number>>(new Set());
+ const hasUserSizedColumns = computed(() => manualColumnIndexes.value.size > 0 || autoFittedColumnIndexes.value.size > 0);
function columnWidthStateIdentity() {
return {
@@ -276,6 +277,11 @@ export function useDataGridColumnResize(options: UseDataGridColumnResizeOptions)
persistColumnWidths();
}
+ function resetColumnWidths() {
+ removeDataGridColumnWidthState(options.cacheKey?.value);
+ initColumnWidths(true);
+ }
+
const resolvedRowNumberWidth = computed(() => options.rowNumberWidth?.value ?? DATA_GRID_ROW_NUM_WIDTH);
const renderedColumnWidths = computed(() => {
@@ -363,6 +369,8 @@ export function useDataGridColumnResize(options: UseDataGridColumnResizeOptions)
onResizeStart,
autoFitColumn,
autoFitAllColumns,
+ resetColumnWidths,
+ hasUserSizedColumns,
renderedColumnWidths,
totalWidth,
columnVars,
diff --git a/apps/desktop/src/i18n/locales/az.ts b/apps/desktop/src/i18n/locales/az.ts
index 0d20ada20c..2f73e1265a 100644
--- a/apps/desktop/src/i18n/locales/az.ts
+++ b/apps/desktop/src/i18n/locales/az.ts
@@ -2229,6 +2229,8 @@ export default withEnglishFallback({
columnVisibility: "Sütunlar",
autoFitColumnWidths: "Məzmuna uyğunlaşdır",
autoFitColumnWidthsHint: "Bütün görünən sütunları xana məzmununa uyğun ölçüləndirir. Sonra da sütun kənarını sürükləyə bilərsiniz.",
+ clearRememberedColumnWidths: "Yadda saxlanmış sütun enini təmizlə",
+ clearRememberedColumnWidthsHint: "Manual düzəlişləri təmizləyir və avtomatik sütun eni hesablamasını bərpa edir.",
columnVisibilityHint: "Ən azı bir sütun görünən qalır.",
columnReorderHint: "Sütunların sırasını dəyişmək üçün sürükləyin.",
columnReorderSearchHint: "Sütunların sırasını dəyişmək üçün axtarışı təmizləyin.",
diff --git a/apps/desktop/src/i18n/locales/en.ts b/apps/desktop/src/i18n/locales/en.ts
index 0e7afebf6c..ace9671bb5 100644
--- a/apps/desktop/src/i18n/locales/en.ts
+++ b/apps/desktop/src/i18n/locales/en.ts
@@ -3049,6 +3049,8 @@ export default {
columnVisibility: "Columns",
autoFitColumnWidths: "Fit columns to content",
autoFitColumnWidthsHint: "Sizes every visible column to what its cells show. You can still drag a column border afterwards.",
+ clearRememberedColumnWidths: "Clear remembered column widths",
+ clearRememberedColumnWidthsHint: "Clear manual adjustments and restore automatic column width calculation.",
columnVisibilityHint: "At least one column stays visible.",
columnReorderHint: "Drag to reorder columns.",
columnReorderSearchHint: "Clear the search to reorder columns.",
diff --git a/apps/desktop/src/i18n/locales/es.ts b/apps/desktop/src/i18n/locales/es.ts
index e4d470d119..290861a068 100644
--- a/apps/desktop/src/i18n/locales/es.ts
+++ b/apps/desktop/src/i18n/locales/es.ts
@@ -2688,6 +2688,8 @@ export default withEnglishFallback({
columnVisibility: "Columnas",
autoFitColumnWidths: "Ajustar al contenido",
autoFitColumnWidthsHint: "Ajusta cada columna visible al contenido de sus celdas. Después puedes arrastrar el borde de la columna.",
+ clearRememberedColumnWidths: "Borrar anchos de columna recordados",
+ clearRememberedColumnWidthsHint: "Borra los ajustes manuales y restaura el cálculo automático del ancho de columna.",
columnVisibilityHint: "Al menos una columna permanece visible.",
columnReorderHint: "Arrastra para reordenar las columnas.",
columnReorderSearchHint: "Borra la búsqueda para reordenar las columnas.",
diff --git a/apps/desktop/src/i18n/locales/id.ts b/apps/desktop/src/i18n/locales/id.ts
index 9145c12661..abc6181a3f 100644
--- a/apps/desktop/src/i18n/locales/id.ts
+++ b/apps/desktop/src/i18n/locales/id.ts
@@ -2529,6 +2529,8 @@ export default withEnglishFallback({
columnVisibility: "Kolom",
autoFitColumnWidths: "Sesuaikan kolom dengan konten",
autoFitColumnWidthsHint: "Mengatur ukuran setiap kolom yang terlihat sesuai isi selnya. Anda masih bisa menyeret batas kolom setelahnya.",
+ clearRememberedColumnWidths: "Hapus lebar kolom tersimpan",
+ clearRememberedColumnWidthsHint: "Hapus penyesuaian manual dan pulihkan perhitungan lebar kolom otomatis.",
columnVisibilityHint: "Minimal satu kolom tetap terlihat.",
columnReorderHint: "Seret untuk mengurutkan ulang kolom.",
columnReorderSearchHint: "Hapus pencarian untuk mengurutkan ulang kolom.",
diff --git a/apps/desktop/src/i18n/locales/it.ts b/apps/desktop/src/i18n/locales/it.ts
index 699ed8a766..2c3b813870 100644
--- a/apps/desktop/src/i18n/locales/it.ts
+++ b/apps/desktop/src/i18n/locales/it.ts
@@ -2586,6 +2586,8 @@ export default withEnglishFallback({
columnVisibility: "Colonne",
autoFitColumnWidths: "Adatta al contenuto",
autoFitColumnWidthsHint: "Adatta ogni colonna visibile al contenuto delle celle. Puoi comunque trascinare il bordo della colonna.",
+ clearRememberedColumnWidths: "Cancella larghezze colonne memorizzate",
+ clearRememberedColumnWidthsHint: "Cancella le regolazioni manuali e ripristina il calcolo automatico della larghezza delle colonne.",
columnVisibilityHint: "Almeno una colonna deve rimanere visibile.",
columnReorderHint: "Trascina per riordinare le colonne.",
columnReorderSearchHint: "Cancella la ricerca per riordinare le colonne.",
diff --git a/apps/desktop/src/i18n/locales/ja.ts b/apps/desktop/src/i18n/locales/ja.ts
index 03ef6cee29..870c972f76 100644
--- a/apps/desktop/src/i18n/locales/ja.ts
+++ b/apps/desktop/src/i18n/locales/ja.ts
@@ -2591,6 +2591,8 @@ export default withEnglishFallback({
columnVisibility: "列",
autoFitColumnWidths: "内容に合わせて調整",
autoFitColumnWidthsHint: "表示中のすべての列をセルの内容に合わせて調整します。その後も列の境界をドラッグできます。",
+ clearRememberedColumnWidths: "記憶した列幅をクリア",
+ clearRememberedColumnWidthsHint: "手動で調整した幅をクリアし、自動計算に戻します。",
columnVisibilityHint: "少なくとも1列は表示されます。",
columnReorderHint: "ドラッグして列の順序を変更します。",
columnReorderSearchHint: "列の順序を変更するには検索をクリアしてください。",
diff --git a/apps/desktop/src/i18n/locales/ko.ts b/apps/desktop/src/i18n/locales/ko.ts
index ad7984c8f0..6ecd51bde1 100644
--- a/apps/desktop/src/i18n/locales/ko.ts
+++ b/apps/desktop/src/i18n/locales/ko.ts
@@ -2674,6 +2674,8 @@ export default withEnglishFallback({
columnVisibility: "컬럼",
autoFitColumnWidths: "내용에 맞게 맞춤",
autoFitColumnWidthsHint: "표시된 모든 열을 셀 내용에 맞게 조정합니다. 이후에도 열 경계를 드래그할 수 있습니다.",
+ clearRememberedColumnWidths: "기억된 열 너비 지우기",
+ clearRememberedColumnWidthsHint: "수동 조정을 지우고 열 너비 자동 계산으로 복원합니다.",
columnVisibilityHint: "최소 한 개의 컬럼은 표시 상태를 유지합니다.",
columnReorderHint: "드래그하여 컬럼 순서를 변경합니다.",
columnReorderSearchHint: "컬럼 순서를 변경하려면 검색을 지우세요.",
diff --git a/apps/desktop/src/i18n/locales/pl.ts b/apps/desktop/src/i18n/locales/pl.ts
index fa886de24c..150870f5ee 100644
--- a/apps/desktop/src/i18n/locales/pl.ts
+++ b/apps/desktop/src/i18n/locales/pl.ts
@@ -2609,6 +2609,8 @@ export default withEnglishFallback({
columnVisibility: "Kolumny",
autoFitColumnWidths: "Dopasuj szerokość kolumn do zawartości",
autoFitColumnWidthsHint: "Dopasowuje szerokość każdej widocznej kolumny do jej zawartości. Nadal możesz przeciągać granice kolumn.",
+ clearRememberedColumnWidths: "Wyczyść zapamiętane szerokości kolumn",
+ clearRememberedColumnWidthsHint: "Usuwa ręczne dopasowania i przywraca automatyczne obliczanie szerokości kolumn.",
columnVisibilityHint: "Co najmniej jedna kolumna musi pozostać widoczna.",
columnReorderHint: "Przeciągnij, aby zmienić kolejność kolumn.",
columnReorderSearchHint: "Wyczyść wyszukiwanie, aby zmienić kolejność kolumn.",
diff --git a/apps/desktop/src/i18n/locales/pt-BR.ts b/apps/desktop/src/i18n/locales/pt-BR.ts
index f1875bc3ff..562467627a 100644
--- a/apps/desktop/src/i18n/locales/pt-BR.ts
+++ b/apps/desktop/src/i18n/locales/pt-BR.ts
@@ -2587,6 +2587,8 @@ export default withEnglishFallback({
columnVisibility: "Colunas",
autoFitColumnWidths: "Ajustar ao conteúdo",
autoFitColumnWidthsHint: "Ajusta cada coluna visível ao conteúdo das células. Você ainda pode arrastar a borda da coluna.",
+ clearRememberedColumnWidths: "Limpar larguras de coluna memorizadas",
+ clearRememberedColumnWidthsHint: "Limpa os ajustes manuais e restaura o cálculo automático de largura de coluna.",
columnVisibilityHint: "Pelo menos uma coluna permanece visível.",
columnReorderHint: "Arraste para reordenar as colunas.",
columnReorderSearchHint: "Limpe a pesquisa para reordenar as colunas.",
diff --git a/apps/desktop/src/i18n/locales/ru.ts b/apps/desktop/src/i18n/locales/ru.ts
index 9a54aaa722..bb1c9d5c7d 100644
--- a/apps/desktop/src/i18n/locales/ru.ts
+++ b/apps/desktop/src/i18n/locales/ru.ts
@@ -2797,6 +2797,8 @@ export default withEnglishFallback({
columnVisibility: "Столбцы",
autoFitColumnWidths: "Подогнать столбцы по содержимому",
autoFitColumnWidthsHint: "Подбирает ширину каждого видимого столбца по его содержимому. После этого границу столбца всё ещё можно перетаскивать.",
+ clearRememberedColumnWidths: "Очистить сохраненную ширину столбцов",
+ clearRememberedColumnWidthsHint: "Сбросить ручные изменения и вернуть автоматический расчет ширины столбцов.",
columnVisibilityHint: "Хотя бы один столбец останется видимым.",
columnReorderHint: "Перетащите, чтобы изменить порядок столбцов.",
columnReorderSearchHint: "Очистите поиск, чтобы изменить порядок столбцов.",
diff --git a/apps/desktop/src/i18n/locales/th.ts b/apps/desktop/src/i18n/locales/th.ts
index 3eafbcbb22..f5d53b1a0c 100644
--- a/apps/desktop/src/i18n/locales/th.ts
+++ b/apps/desktop/src/i18n/locales/th.ts
@@ -2994,6 +2994,8 @@ export default withEnglishFallback({
columnVisibility: "คอลัมน์",
autoFitColumnWidths: "ปรับคอลัมน์ให้พอดีกับเนื้อหา",
autoFitColumnWidthsHint: "ปรับทุกคอลัมน์ที่มองเห็นให้พอดีกับสิ่งที่เซลล์แสดง คุณยังลากขอบคอลัมน์ได้ภายหลัง",
+ clearRememberedColumnWidths: "ล้างความกว้างคอลัมน์ที่จำไว้",
+ clearRememberedColumnWidthsHint: "ล้างการปรับด้วยตนเองและคืนค่าการคำนวณความกว้างคอลัมน์อัตโนมัติ",
columnVisibilityHint: "ต้องมีคอลัมน์ที่มองเห็นอย่างน้อยหนึ่งคอลัมน์",
columnReorderHint: "ลากเพื่อจัดลำดับคอลัมน์ใหม่",
columnReorderSearchHint: "ล้างการค้นหาเพื่อจัดลำดับคอลัมน์ใหม่",
diff --git a/apps/desktop/src/i18n/locales/tr.ts b/apps/desktop/src/i18n/locales/tr.ts
index eeec07b3da..f752ef0a09 100644
--- a/apps/desktop/src/i18n/locales/tr.ts
+++ b/apps/desktop/src/i18n/locales/tr.ts
@@ -2221,6 +2221,8 @@ export default withEnglishFallback({
columnVisibility: "Sütunlar",
autoFitColumnWidths: "İçeriğe sığdır",
autoFitColumnWidthsHint: "Görünen tüm sütunları hücre içeriğine göre ayarlar. Ardından sütun kenarını yine sürükleyebilirsiniz.",
+ clearRememberedColumnWidths: "Hatırlanan sütun genişliklerini temizle",
+ clearRememberedColumnWidthsHint: "Manuel ayarlamaları temizler ve otomatik sütun genişliği hesaplamasını geri yükler.",
columnVisibilityHint: "En az bir sütun görünür kalır.",
columnReorderHint: "Sütunları yeniden sıralamak için sürükleyin.",
columnReorderSearchHint: "Sütunları yeniden sıralamak için aramayı temizleyin.",
diff --git a/apps/desktop/src/i18n/locales/zh-CN.ts b/apps/desktop/src/i18n/locales/zh-CN.ts
index daac22b1cc..bcfb2ff528 100644
--- a/apps/desktop/src/i18n/locales/zh-CN.ts
+++ b/apps/desktop/src/i18n/locales/zh-CN.ts
@@ -2981,6 +2981,8 @@ export default withEnglishFallback({
columnVisibility: "字段筛选",
autoFitColumnWidths: "自动适配列宽",
autoFitColumnWidthsHint: "按单元格内容调整所有可见列的宽度;之后仍可拖拽列边界手动微调。",
+ clearRememberedColumnWidths: "清除记忆列宽",
+ clearRememberedColumnWidthsHint: "清除手动调整并恢复列宽自动计算。",
columnVisibilityHint: "至少保留一列可见。",
columnReorderHint: "拖动可调整字段顺序。",
columnReorderSearchHint: "清除搜索后可调整字段顺序。",
diff --git a/apps/desktop/src/i18n/locales/zh-TW.ts b/apps/desktop/src/i18n/locales/zh-TW.ts
index 50d258b113..4de81e65dd 100644
--- a/apps/desktop/src/i18n/locales/zh-TW.ts
+++ b/apps/desktop/src/i18n/locales/zh-TW.ts
@@ -2579,6 +2579,8 @@ export default withEnglishFallback({
columnVisibility: "欄位篩選",
autoFitColumnWidths: "自動適配欄寬",
autoFitColumnWidthsHint: "依儲存格內容調整所有可見欄的寬度;之後仍可拖曳欄邊界手動微調。",
+ clearRememberedColumnWidths: "清除記憶欄寬",
+ clearRememberedColumnWidthsHint: "清除手動調整並恢復欄寬自動計算。",
columnVisibilityHint: "至少保留一欄可見。",
columnReorderHint: "拖曳可調整欄位順序。",
columnReorderSearchHint: "清除搜尋後可調整欄位順序。",
diff --git a/apps/desktop/src/lib/__tests__/dataGrid/dataGridContextMenu.spec.ts b/apps/desktop/src/lib/__tests__/dataGrid/dataGridContextMenu.spec.ts
index 830ef472a4..a744e2bb28 100644
--- a/apps/desktop/src/lib/__tests__/dataGrid/dataGridContextMenu.spec.ts
+++ b/apps/desktop/src/lib/__tests__/dataGrid/dataGridContextMenu.spec.ts
@@ -444,4 +444,76 @@ describe("dataGridContextMenu", () => {
expect(cellItems.map((item) => item.label)).toContain("highlight");
});
+
+ it("includes clear remembered column widths action when hasUserSizedColumns is true and omits it otherwise", () => {
+ const action = vi.fn();
+ const clearAction = vi.fn();
+ const filter = createDataGridFilterSubmenu({
+ label: "filter",
+ icon,
+ labels: { equals: "equals", notEquals: "not equals", like: "like", notLike: "not like", lessThan: "less", greaterThan: "greater", custom: "custom", isNull: "null", isNotNull: "not null", clear: "clear" },
+ apply: action,
+ applyCustom: action,
+ clear: action,
+ });
+ const baseOptions = {
+ headerColumn: true,
+ contextColumn: true,
+ contextVisibleColIdx: 0,
+ canCopyAlterSql: false,
+ canFilter: true,
+ hasSort: false,
+ sortMode: "database" as const,
+ labels: {
+ copyName: "copy name",
+ copyComment: "copy comment",
+ copyNames: "copy names",
+ details: "details",
+ copyAlterSql: "alter",
+ databaseAscending: "db asc",
+ databaseDescending: "db desc",
+ localAscending: "local asc",
+ localDescending: "local desc",
+ clearSort: "clear sort",
+ freezeToColumn: "freeze",
+ freezeSelectedColumns: "freeze selected",
+ unfreezeColumns: "unfreeze",
+ hideColumn: "hide",
+ hideSelectedColumns: "hide selected",
+ showAllColumnsMenu: "show all",
+ clearRememberedColumnWidths: "Clear remembered column widths",
+ },
+ icons: { copy: icon, columnDetails: icon, database: icon, ascending: icon, descending: icon, clearSort: icon, clearRememberedColumnWidths: icon },
+ actions: {
+ copyName: action,
+ copyNames: action,
+ details: action,
+ copyAlterSql: action,
+ sort: action,
+ freezeToColumn: action,
+ freezeSelectedColumns: action,
+ unfreezeColumns: action,
+ hideColumn: action,
+ hideSelectedColumns: action,
+ showAllColumnsMenu: action,
+ clearRememberedColumnWidths: clearAction,
+ },
+ filterSubmenu: filter,
+ };
+
+ const withoutUserSized = createDataGridColumnContextMenuItems({
+ ...baseOptions,
+ hasUserSizedColumns: false,
+ });
+ expect(withoutUserSized.map((item) => item.label)).not.toContain("Clear remembered column widths");
+
+ const withUserSized = createDataGridColumnContextMenuItems({
+ ...baseOptions,
+ hasUserSizedColumns: true,
+ });
+ expect(withUserSized.map((item) => item.label)).toContain("Clear remembered column widths");
+ const clearItem = withUserSized.find((item) => item.label === "Clear remembered column widths");
+ clearItem?.action?.();
+ expect(clearAction).toHaveBeenCalledTimes(1);
+ });
});
diff --git a/apps/desktop/src/lib/dataGrid/dataGridContextMenu.ts b/apps/desktop/src/lib/dataGrid/dataGridContextMenu.ts
index 4c640169c1..aa574ad2c2 100644
--- a/apps/desktop/src/lib/dataGrid/dataGridContextMenu.ts
+++ b/apps/desktop/src/lib/dataGrid/dataGridContextMenu.ts
@@ -125,6 +125,7 @@ export function createDataGridColumnContextMenuItems(options: {
frozenColumnCount?: number;
contextVisibleColIdx?: number;
hasColumnSelection?: boolean;
+ hasUserSizedColumns?: boolean;
/** 显式多选的可见列数量;为 undefined 时按 0 处理。 */
selectedColumnCount?: number;
/** 当前可见列总数,用于判断「选中列覆盖全部可见列」而禁用批量隐藏。 */
@@ -136,8 +137,8 @@ export function createDataGridColumnContextMenuItems(options: {
"copyName" | "copyComment" | "copyNames" | "details" | "copyAlterSql" | "databaseAscending" | "databaseDescending" | "localAscending" | "localDescending" | "clearSort" | "freezeToColumn" | "freezeSelectedColumns" | "unfreezeColumns" | "hideColumn" | "hideSelectedColumns" | "showAllColumnsMenu",
string
> &
- Partial<Record<"freezeCurrentColumn" | "unfreezeCurrentColumn" | "hideIdenticalColumns" | "copyMetadata", string>>;
- icons: Pick<DataGridContextMenuIcons, "copy" | "columnDetails" | "database" | "ascending" | "descending" | "clearSort">;
+ Partial<Record<"freezeCurrentColumn" | "unfreezeCurrentColumn" | "hideIdenticalColumns" | "copyMetadata" | "clearRememberedColumnWidths", string>>;
+ icons: Pick<DataGridContextMenuIcons, "copy" | "columnDetails" | "database" | "ascending" | "descending" | "clearSort"> & Partial<Record<"clearRememberedColumnWidths", Component>>;
actions: {
copyName: () => void;
copyComment: () => void;
@@ -155,6 +156,7 @@ export function createDataGridColumnContextMenuItems(options: {
hideSelectedColumns: () => void;
hideIdenticalColumns?: () => void;
showAllColumnsMenu: () => void;
+ clearRememberedColumnWidths?: () => void;
};
filterSubmenu: DataGridContextMenuItem;
highlightSubmenu?: DataGridContextMenuItem;
@@ -205,6 +207,13 @@ export function createDataGridColumnContextMenuItems(options: {
if ((options.hiddenColumnCount ?? 0) > 0) {
items.push({ label: options.labels.showAllColumnsMenu, action: options.actions.showAllColumnsMenu });
}
+ if (options.hasUserSizedColumns && options.labels.clearRememberedColumnWidths && options.actions.clearRememberedColumnWidths) {
+ items.push({
+ label: options.labels.clearRememberedColumnWidths,
+ action: options.actions.clearRememberedColumnWidths,
+ icon: options.icons.clearRememberedColumnWidths,
+ });
+ }
if ((options.frozenColumnCount ?? 0) > 0) {
if ((options.contextVisibleColIdx ?? -1) < (options.frozenColumnCount ?? 0) && options.labels.unfreezeCurrentColumn && options.actions.unfreezeCurrentColumn) items.push({ label: options.labels.unfreezeCurrentColumn, action: options.actions.unfreezeCurrentColumn });
items.push({ label: options.labels.unfreezeColumns, action: options.actions.unfreezeColumns });
@@ -224,6 +233,13 @@ export function createDataGridColumnContextMenuItems(options: {
if ((options.hiddenColumnCount ?? 0) > 0) {
items.push({ label: options.labels.showAllColumnsMenu, action: options.actions.showAllColumnsMenu });
}
+ if (options.hasUserSizedColumns && options.labels.clearRememberedColumnWidths && options.actions.clearRememberedColumnWidths) {
+ items.push({
+ label: options.labels.clearRememberedColumnWidths,
+ action: options.actions.clearRememberedColumnWidths,
+ icon: options.icons.clearRememberedColumnWidths,
+ });
+ }
}
return items;
}