From 13146094ff6f64e638140556682cbe79d058b833 Mon Sep 17 00:00:00 2001 From: onenewcode Date: Fri, 31 Jul 2026 18:26:43 +0800 Subject: [PATCH] fix(grid): show field metadata in transpose view --- apps/desktop/src/components/grid/DataGrid.vue | 56 ++++++++++++++----- .../__tests__/DataGridClipboardRegion.spec.ts | 2 +- .../DataGridTransposePresentation.spec.ts | 25 +++++++++ .../src/components/ui/LightTooltip.vue | 13 ++++- .../ui/__tests__/LightTooltip.spec.ts | 52 +++++++++++++++++ .../dataGrid/dataGridTranspose.spec.ts | 20 +++++++ .../src/lib/dataGrid/dataGridTranspose.ts | 10 +++- 7 files changed, 159 insertions(+), 19 deletions(-) create mode 100644 apps/desktop/src/components/grid/__tests__/DataGridTransposePresentation.spec.ts create mode 100644 apps/desktop/src/components/ui/__tests__/LightTooltip.spec.ts diff --git a/apps/desktop/src/components/grid/DataGrid.vue b/apps/desktop/src/components/grid/DataGrid.vue index 8b26fbb30f..eeea1ba7d2 100644 --- a/apps/desktop/src/components/grid/DataGrid.vue +++ b/apps/desktop/src/components/grid/DataGrid.vue @@ -50,6 +50,7 @@ import { Input } from "@/components/ui/input"; import QueryLoadingState from "@/components/common/QueryLoadingState.vue"; import CustomContextMenu, { type ContextMenuItem } from "@/components/ui/CustomContextMenu.vue"; import LightDropdownMenu from "@/components/ui/LightDropdownMenu.vue"; +import LightTooltip from "@/components/ui/LightTooltip.vue"; import { Popover, PopoverAnchor, PopoverContent, PopoverTrigger } from "@/components/ui/popover"; import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select"; import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs"; @@ -163,7 +164,7 @@ import { } from "@/lib/dataGrid/dataGridColumnFilter"; import { normalizeResultPageSize, resultPageSizeMenuOptions } from "@/lib/dataGrid/paginationPageSize"; import { allNullColumnIndexes } from "@/lib/dataGrid/dataGridColumnVisibility"; -import { buildDataGridColumnLookupItems, filterDataGridColumnLookupItems } from "@/lib/dataGrid/dataGridColumnLookup"; +import { buildDataGridColumnLookupItems, dataGridColumnCommentFor, filterDataGridColumnLookupItems } from "@/lib/dataGrid/dataGridColumnLookup"; import { uniqueDataGridColumnOrderKeys } from "@/lib/dataGrid/dataGridColumnOrder"; import { dataGridColumnLayoutScopeKey, TABLE_DATA_GRID_COLUMN_ORDER_CHANGED_EVENT, tableDataGridColumnOrderScopeKey } from "@/lib/dataGrid/dataGridColumnLayoutStorage"; import { summarizeSelection } from "@/lib/dataGrid/gridSelection"; @@ -1810,6 +1811,7 @@ const allColumnTypes = computed(() => ), ); const visibleColumnTypes = computed(() => visibleColumnIndexes.value.map((index) => allColumnTypes.value[index])); +const visibleColumnComments = computed(() => visibleColumnIndexes.value.map((index) => dataGridColumnCommentFor(columnCommentMap.value, props.result.columns[index] ?? "", props.sourceColumns?.[index]))); const visibleColumnCount = computed(() => visibleColumnIndexes.value.length); const numericColumnRightAlign = computed(() => (settingsStore.editorSettings.numericColumnRightAlign ?? true) && !showTranspose.value); @@ -6577,7 +6579,8 @@ const transposeRows = computed(() => { records: displayRowRefs.value.map((_, index) => displayItemAt(index)?.data ?? []), recordIndexes: activeTransposeRecordIndexes.value, valueIndexes: visibleColumnIndexes.value, - typeByColumn: columnTypeMap.value, + types: visibleColumnTypes.value.map((type) => (type ? shortTypeName(compactHeaderColumnType(type)) : "")), + comments: visibleColumnComments.value, displayValue: (value, _column, index) => formatCellCached(value, visibleColumnIndexes.value[index]), }); }); @@ -6593,6 +6596,13 @@ function transposeScrollElement(): HTMLElement | undefined { return raw instanceof HTMLElement ? raw : raw.$el; } +function transposeFieldTitle(item: { column: string; type: string; comment?: string }): string { + const details = [item.column]; + if (showColumnTypesInHeader.value && item.type) details.push(`${t("grid.columnType")}: ${item.type}`); + if (showColumnCommentsInHeader.value && item.comment) details.push(`${t("grid.columnComment")}: ${item.comment}`); + return details.join("\n"); +} + function updateTransposeViewport() { const el = transposeScrollElement(); if (!el) return; @@ -8373,18 +8383,36 @@ const gridContextMenuItems = computed(() => {