From 7410fb854765cc1fe389fb3472756974fdcfe646 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=8C=E4=B8=AB=E8=AE=B2=E6=A2=B5?= Date: Thu, 1 Oct 2026 23:52:29 +0800 Subject: [PATCH] fix(grid): add transpose column-name sorting --- apps/desktop/src/components/grid/DataGrid.vue | 78 ++++++------ .../__tests__/DataGridTransposeSort.spec.ts | 113 ++++-------------- 2 files changed, 57 insertions(+), 134 deletions(-) diff --git a/apps/desktop/src/components/grid/DataGrid.vue b/apps/desktop/src/components/grid/DataGrid.vue index 41270070ef..2c4c50f85a 100644 --- a/apps/desktop/src/components/grid/DataGrid.vue +++ b/apps/desktop/src/components/grid/DataGrid.vue @@ -5197,11 +5197,14 @@ function scrollToCurrentMatch() { } function scrollTransposeFieldIntoView(visibleFieldIndex: number) { + const actualColumnIndex = visibleColumnIndexes.value[visibleFieldIndex]; + const sortedIndex = transposeRows.value.findIndex((item) => item.columnIndex === actualColumnIndex); + if (sortedIndex < 0) return; const scroller = transposeScrollRef.value; if (scroller && !(scroller instanceof HTMLElement)) { - (scroller as { scrollToItem?: (index: number) => void }).scrollToItem?.(visibleFieldIndex); + (scroller as { scrollToItem?: (index: number) => void }).scrollToItem?.(sortedIndex); } else if (scroller instanceof HTMLElement) { - scroller.scrollTop = visibleFieldIndex * transposeRowHeight.value; + scroller.scrollTop = sortedIndex * transposeRowHeight.value; } } @@ -10190,8 +10193,9 @@ const activeTransposeRecordIndexes = computed(() => ); const transposeBeforeSpacerWidth = computed(() => (multiRowTranspose.value ? transposeRecordWindow.value.beforeWidth : 0)); const transposeAfterSpacerWidth = computed(() => (multiRowTranspose.value ? transposeRecordWindow.value.afterWidth + transposeEndSpacerWidth.value : 0)); +const transposeColumnSortDirection = ref<"asc" | "desc" | null>(null); const transposeRows = computed(() => { - return buildVisibleTransposeRows({ + const rows = buildVisibleTransposeRows({ columns: visibleColumns.value, records: displayRowRefs.value.map((_, index) => displayItemAt(index)?.data ?? []), recordIndexes: activeTransposeRecordIndexes.value, @@ -10199,6 +10203,11 @@ const transposeRows = computed(() => { types: visibleColumnTypes.value.map((type) => (type ? shortTypeName(compactHeaderColumnType(type)) : "")), comments: visibleColumnComments.value, displayValue: (value, _column, index) => formatCellCached(value, visibleColumnIndexes.value[index]), + }).map((row, index) => ({ ...row, columnIndex: visibleColumnIndexes.value[index] })); + if (!transposeColumnSortDirection.value) return rows; + return [...rows].sort((left, right) => { + const result = left.column.localeCompare(right.column, undefined, { sensitivity: "base" }); + return transposeColumnSortDirection.value === "asc" ? result : -result; }); }); const transposeReserveTypeLine = computed(() => showTransposeFieldMetadata.value && showColumnTypesInHeader.value && transposeRows.value.some((row) => row.type)); @@ -10223,6 +10232,10 @@ function transposeFieldTitle(item: { column: string; type: string; comment?: str return details.join("\n"); } +function toggleTransposeColumnSort() { + transposeColumnSortDirection.value = transposeColumnSortDirection.value === "asc" ? "desc" : "asc"; +} + function transposeColumnIndexKind(column: string): ColumnIndexKind | undefined { if (!showIndexIndicatorsInHeader.value) return undefined; const kind = columnIndexMap.value.get(columnIndexNameKey(column)); @@ -13005,8 +13018,21 @@ useUpdateBlocker(() => (hasPendingChanges.value || hasPendingDataEditorDraft.val > -