fix(grid): add transpose column-name sorting

This commit is contained in:
二丫讲梵 authored and GitHub committed 2026-10-01 23:52:29 +08:00
1 parent 36ecfc6ea4
commit 7410fb8547
2 files changed
+57 -134

No files matched your search

+36 -42
View File
@@ -5197,11 +5197,14 @@ function scrollToCurrentMatch() {
} }
function scrollTransposeFieldIntoView(visibleFieldIndex: number) { 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; const scroller = transposeScrollRef.value;
if (scroller && !(scroller instanceof HTMLElement)) { 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) { } 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 transposeBeforeSpacerWidth = computed(() => (multiRowTranspose.value ? transposeRecordWindow.value.beforeWidth : 0));
const transposeAfterSpacerWidth = computed(() => (multiRowTranspose.value ? transposeRecordWindow.value.afterWidth + transposeEndSpacerWidth.value : 0)); const transposeAfterSpacerWidth = computed(() => (multiRowTranspose.value ? transposeRecordWindow.value.afterWidth + transposeEndSpacerWidth.value : 0));
const transposeColumnSortDirection = ref<"asc" | "desc" | null>(null);
const transposeRows = computed(() => { const transposeRows = computed(() => {
return buildVisibleTransposeRows({ const rows = buildVisibleTransposeRows({
columns: visibleColumns.value, columns: visibleColumns.value,
records: displayRowRefs.value.map((_, index) => displayItemAt(index)?.data ?? []), records: displayRowRefs.value.map((_, index) => displayItemAt(index)?.data ?? []),
recordIndexes: activeTransposeRecordIndexes.value, recordIndexes: activeTransposeRecordIndexes.value,
@@ -10199,6 +10203,11 @@ const transposeRows = computed(() => {
types: visibleColumnTypes.value.map((type) => (type ? shortTypeName(compactHeaderColumnType(type)) : "")), types: visibleColumnTypes.value.map((type) => (type ? shortTypeName(compactHeaderColumnType(type)) : "")),
comments: visibleColumnComments.value, comments: visibleColumnComments.value,
displayValue: (value, _column, index) => formatCellCached(value, visibleColumnIndexes.value[index]), 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)); 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"); return details.join("\n");
} }
function toggleTransposeColumnSort() {
transposeColumnSortDirection.value = transposeColumnSortDirection.value === "asc" ? "desc" : "asc";
}
function transposeColumnIndexKind(column: string): ColumnIndexKind | undefined { function transposeColumnIndexKind(column: string): ColumnIndexKind | undefined {
if (!showIndexIndicatorsInHeader.value) return undefined; if (!showIndexIndicatorsInHeader.value) return undefined;
const kind = columnIndexMap.value.get(columnIndexNameKey(column)); const kind = columnIndexMap.value.get(columnIndexNameKey(column));
@@ -13005,8 +13018,21 @@ useUpdateBlocker(() => (hasPendingChanges.value || hasPendingDataEditorDraft.val
> >
<template #before> <template #before>
<div class="data-grid-transpose-header data-grid-header-shell sticky top-0 z-20 flex h-7 border-b border-border font-semibold text-muted-foreground" :style="{ width: `${transposeTotalWidth}px` }"> <div class="data-grid-transpose-header data-grid-header-shell sticky top-0 z-20 flex h-7 border-b border-border font-semibold text-muted-foreground" :style="{ width: `${transposeTotalWidth}px` }">
<div class="data-grid-header-cell sticky left-0 z-30 shrink-0 border-r border-border px-3 py-1.5 truncate relative" :style="{ width: `${transposePinnedWidth}px` }"> <div class="data-grid-header-cell sticky left-0 z-30 flex shrink-0 items-center border-r border-border px-3 py-1.5 truncate relative" :style="{ width: `${transposePinnedWidth}px` }">
{{ t("grid.columnName") }} <span class="min-w-0 flex-1 truncate">{{ t("grid.columnName") }}</span>
<button
data-grid-transpose-column-sort
type="button"
class="ml-1 flex h-4 w-4 shrink-0 items-center justify-center rounded text-muted-foreground hover:bg-accent hover:text-foreground"
:title="t('grid.sort')"
:aria-label="t('grid.sort')"
@mousedown.stop
@click.stop="toggleTransposeColumnSort"
>
<ArrowUp v-if="transposeColumnSortDirection === 'asc'" class="h-3 w-3" />
<ArrowDown v-else-if="transposeColumnSortDirection === 'desc'" class="h-3 w-3" />
<ArrowUpDown v-else class="h-3 w-3" />
</button>
<div class="absolute right-0 top-0 bottom-0 w-1.5 cursor-col-resize hover:bg-primary/30" @mousedown.stop="onTransposePinnedResizeStart" /> <div class="absolute right-0 top-0 bottom-0 w-1.5 cursor-col-resize hover:bg-primary/30" @mousedown.stop="onTransposePinnedResizeStart" />
</div> </div>
<div class="shrink-0" :style="{ width: `${transposeBeforeSpacerWidth}px` }" /> <div class="shrink-0" :style="{ width: `${transposeBeforeSpacerWidth}px` }" />
@@ -13034,7 +13060,7 @@ useUpdateBlocker(() => (hasPendingChanges.value || hasPendingDataEditorDraft.val
<div class="shrink-0" :style="{ width: `${transposeAfterSpacerWidth}px` }" /> <div class="shrink-0" :style="{ width: `${transposeAfterSpacerWidth}px` }" />
</div> </div>
</template> </template>
<template #default="{ item, index }"> <template #default="{ item }">
<div <div
class="data-grid-transpose-row flex border-b border-border/60" class="data-grid-transpose-row flex border-b border-border/60"
:style="{ :style="{
@@ -13045,12 +13071,12 @@ useUpdateBlocker(() => (hasPendingChanges.value || hasPendingDataEditorDraft.val
<LightTooltip :text="transposeFieldTitle(item)" side="right" :side-offset="6" :delay="250" :open-on-focus="false" surface="popover"> <LightTooltip :text="transposeFieldTitle(item)" side="right" :side-offset="6" :delay="250" :open-on-focus="false" surface="popover">
<div <div
data-native-clipboard data-native-clipboard
:data-grid-transpose-column-index="visibleColumnIndexes[index]" :data-grid-transpose-column-index="item.columnIndex"
class="sticky left-0 z-10 flex shrink-0 flex-col items-start justify-center overflow-hidden border-r border-border bg-background px-3 py-0" class="sticky left-0 z-10 flex shrink-0 flex-col items-start justify-center overflow-hidden border-r border-border bg-background px-3 py-0"
:class="{ :class="{
'ring-2 ring-inset ring-primary': highlightedColumnIndex === visibleColumnIndexes[index], 'ring-2 ring-inset ring-primary': highlightedColumnIndex === item.columnIndex,
'bg-yellow-200/60 dark:bg-yellow-500/20': transposeHeaderIsSearchMatch(visibleColumnIndexes[index]), 'bg-yellow-200/60 dark:bg-yellow-500/20': transposeHeaderIsSearchMatch(item.columnIndex),
'ring-2 ring-inset ring-yellow-500 bg-yellow-300/60 dark:bg-yellow-500/40': transposeHeaderIsCurrentMatch(visibleColumnIndexes[index]), 'ring-2 ring-inset ring-yellow-500 bg-yellow-300/60 dark:bg-yellow-500/40': transposeHeaderIsCurrentMatch(item.columnIndex),
}" }"
:style="{ width: `${transposePinnedWidth}px` }" :style="{ width: `${transposePinnedWidth}px` }"
> >
@@ -13059,38 +13085,6 @@ useUpdateBlocker(() => (hasPendingChanges.value || hasPendingDataEditorDraft.val
<Hash v-else-if="transposeColumnIndexKind(item.column)" data-grid-transpose-index-indicator class="h-3 w-3 shrink-0" :class="columnIndexColorClass(transposeColumnIndexKind(item.column)!)" :title="transposeColumnIndexText(transposeColumnIndexKind(item.column)!)" /> <Hash v-else-if="transposeColumnIndexKind(item.column)" data-grid-transpose-index-indicator class="h-3 w-3 shrink-0" :class="columnIndexColorClass(transposeColumnIndexKind(item.column)!)" :title="transposeColumnIndexText(transposeColumnIndexKind(item.column)!)" />
<span class="min-w-0 flex-1 truncate font-medium leading-4">{{ item.column }}</span> <span class="min-w-0 flex-1 truncate font-medium leading-4">{{ item.column }}</span>
</span> </span>
<LightDropdownMenu
v-if="headerColumnSortable(visibleColumnIndexes[index])"
:items="sortMenuItems(item.column, visibleColumnIndexes[index])"
:open="headerSortMenuOpenColumn === visibleColumnIndexes[index]"
:selected-value="selectedSortMenuValue(item.column, visibleColumnIndexes[index])"
check-position="none"
align="end"
content-class="w-max min-w-28 p-0.5"
item-class="gap-1 rounded-none px-1.5 py-0.5 text-xs"
item-icon-class="h-3 w-3"
:match-trigger-width="false"
@update:open="(value: boolean) => (headerSortMenuOpenColumn = value ? visibleColumnIndexes[index] : null)"
@select="(value: string) => selectHeaderSort(value, item.column, visibleColumnIndexes[index])"
>
<template #trigger="{ open, toggle }">
<button
data-grid-transpose-sort
type="button"
class="absolute right-1 top-1 flex h-4 w-4 shrink-0 items-center justify-center rounded"
:class="columnIsSorted(item.column, visibleColumnIndexes[index]) ? 'bg-primary text-primary-foreground opacity-100 shadow-sm hover:bg-primary/90' : 'text-muted-foreground opacity-80 hover:bg-accent hover:text-foreground'"
:title="t('grid.sort')"
:aria-label="`${t('grid.sort')}: ${item.column}`"
:aria-expanded="open"
@mousedown.stop
@click.stop="toggle"
>
<ArrowUp v-if="columnIsSorted(item.column, visibleColumnIndexes[index]) && sortDir === 'asc'" class="h-3 w-3 shrink-0" />
<ArrowDown v-else-if="columnIsSorted(item.column, visibleColumnIndexes[index]) && sortDir === 'desc'" class="h-3 w-3 shrink-0" />
<ArrowUpDown v-else class="h-3 w-3 shrink-0" />
</button>
</template>
</LightDropdownMenu>
<template v-if="showTransposeFieldMetadata && showColumnTypesInHeader && item.type"> <template v-if="showTransposeFieldMetadata && showColumnTypesInHeader && item.type">
<span data-grid-transpose-type-line class="h-3 min-w-0 truncate text-[10px] font-normal leading-3 select-none" :class="typeColorClass(item.type)" :title="item.type"> <span data-grid-transpose-type-line class="h-3 min-w-0 truncate text-[10px] font-normal leading-3 select-none" :class="typeColorClass(item.type)" :title="item.type">
{{ item.type }} {{ item.type }}
@@ -6,7 +6,6 @@ import { afterEach, describe, expect, it, vi } from "vitest";
import i18n from "@/i18n"; import i18n from "@/i18n";
import type { QueryResult } from "@/types/database"; import type { QueryResult } from "@/types/database";
import { TooltipProvider } from "@/components/ui/tooltip"; import { TooltipProvider } from "@/components/ui/tooltip";
import { sortDataGridRowIndexes, type DataGridSortDirection, type DataGridSortMode } from "@/lib/dataGrid/dataGridSort";
vi.mock("vue-virtual-scroller", async () => { vi.mock("vue-virtual-scroller", async () => {
const { defineComponent, h } = await import("vue"); const { defineComponent, h } = await import("vue");
@@ -53,29 +52,11 @@ async function settle() {
await nextTick(); await nextTick();
} }
function menuAction(label: string): HTMLButtonElement { function transposeFieldNames(host: HTMLElement): string[] {
const button = [...document.querySelectorAll<HTMLButtonElement>('[role="menuitem"]')].find((candidate) => candidate.textContent?.trim() === label); return [...host.querySelectorAll<HTMLElement>("[data-grid-transpose-column-index]")].map((field) => field.textContent?.trim().split("\n")[0] ?? "");
if (!button) throw new Error(`Sort menu action not found: ${label}`);
return button;
} }
function transposeField(host: HTMLElement, columnIndex: number): HTMLElement { function mountGrid() {
const field = host.querySelector<HTMLElement>(`[data-grid-transpose-column-index="${columnIndex}"]`);
if (!field) throw new Error(`Transpose field not found: ${columnIndex}`);
return field.closest<HTMLElement>(".data-grid-transpose-row")!;
}
function transposeValues(host: HTMLElement, columnIndex: number): string[] {
return [...transposeField(host, columnIndex).querySelectorAll<HTMLElement>("[data-grid-transpose-cell]")].map((cell) => cell.textContent?.trim() ?? "");
}
function transposeRecordHeader(host: HTMLElement, recordIndex: number): HTMLElement {
const header = host.querySelector<HTMLElement>(`[data-grid-transpose-record-header][data-grid-transpose-record-index="${recordIndex}"]`);
if (!header) throw new Error(`Transpose record header not found: ${recordIndex}`);
return header;
}
function mountGrid(databaseSortEnabled?: boolean) {
const pinia = createPinia(); const pinia = createPinia();
setActivePinia(pinia); setActivePinia(pinia);
const settingsStore = useSettingsStore(); const settingsStore = useSettingsStore();
@@ -88,25 +69,13 @@ function mountGrid(databaseSortEnabled?: boolean) {
]; ];
const result = ref<QueryResult>( const result = ref<QueryResult>(
markRaw({ markRaw({
columns: ["name", "score"], columns: ["zeta", "alpha"],
column_types: ["varchar", "bigint"], column_types: ["varchar", "bigint"],
rows: originalRows, rows: originalRows,
affected_rows: 0, affected_rows: 0,
execution_time_ms: 0, execution_time_ms: 0,
}), }),
); );
const sortColumn = ref<string>();
const sortColumnIndex = ref<number>();
const sortDirection = ref<DataGridSortDirection>();
const sortMode = ref<DataGridSortMode>();
const onSort = vi.fn((column: string, columnIndex: number, direction: DataGridSortDirection | null, _whereInput?: string, mode: DataGridSortMode = "database") => {
const indexes = direction ? sortDataGridRowIndexes(originalRows, columnIndex, direction, result.value.column_types?.[columnIndex]) : originalRows.map((_, index) => index);
result.value = markRaw({ ...result.value, rows: indexes.map((index) => originalRows[index]!) });
sortColumn.value = direction ? column : undefined;
sortColumnIndex.value = direction ? columnIndex : undefined;
sortDirection.value = direction ?? undefined;
sortMode.value = direction ? mode : undefined;
});
const host = document.createElement("div"); const host = document.createElement("div");
document.body.append(host); document.body.append(host);
@@ -121,21 +90,15 @@ function mountGrid(databaseSortEnabled?: boolean) {
h(DataGrid, { h(DataGrid, {
result: result.value, result: result.value,
databaseType: "mysql", databaseType: "mysql",
databaseSortEnabled,
context: "table-data", context: "table-data",
sortColumn: sortColumn.value,
sortColumnIndex: sortColumnIndex.value,
sortDirection: sortDirection.value,
sortMode: sortMode.value,
tableMeta: { tableMeta: {
tableName: "scores", tableName: "scores",
columns: [ columns: [
{ name: "name", data_type: "varchar", is_nullable: false, column_default: null, is_primary_key: true, extra: null }, { name: "zeta", data_type: "varchar", is_nullable: false, column_default: null, is_primary_key: true, extra: null },
{ name: "score", data_type: "bigint", is_nullable: true, column_default: null, is_primary_key: false, extra: null }, { name: "alpha", data_type: "bigint", is_nullable: true, column_default: null, is_primary_key: false, extra: null },
], ],
primaryKeys: ["name"], primaryKeys: ["zeta"],
}, },
onSort,
}), }),
}, },
); );
@@ -146,7 +109,7 @@ function mountGrid(databaseSortEnabled?: boolean) {
app.use(i18n); app.use(i18n);
app.mount(host); app.mount(host);
mountedApps.push({ app, host }); mountedApps.push({ app, host });
return { host, onSort }; return { host };
} }
async function openTranspose(host: HTMLElement) { async function openTranspose(host: HTMLElement) {
@@ -158,15 +121,6 @@ async function openTranspose(host: HTMLElement) {
await settle(); await settle();
} }
async function selectTransposeSort(host: HTMLElement, columnIndex: number, labelKey: string) {
const trigger = transposeField(host, columnIndex).querySelector<HTMLButtonElement>("[data-grid-transpose-sort]");
if (!trigger) throw new Error(`Transpose sort trigger not found: ${columnIndex}`);
trigger.click();
await settle();
menuAction(i18n.global.t(labelKey)).click();
await settle();
}
afterEach(() => { afterEach(() => {
for (const { app, host } of mountedApps.splice(0)) { for (const { app, host } of mountedApps.splice(0)) {
app.unmount(); app.unmount();
@@ -175,51 +129,26 @@ afterEach(() => {
}); });
describe("DataGrid transpose sorting", () => { describe("DataGrid transpose sorting", () => {
it("retains local sorting when database sorting is explicitly disabled", async () => { it("sorts transpose field rows from the column-name header", async () => {
const { host, onSort } = mountGrid(false); const { host } = mountGrid();
await settle(); await settle();
await openTranspose(host); await openTranspose(host);
transposeField(host, 1).querySelector<HTMLButtonElement>("[data-grid-transpose-sort]")!.click(); expect(transposeFieldNames(host)).toEqual(["zeta", "alpha"]);
host.querySelector<HTMLButtonElement>("[data-grid-transpose-column-sort]")!.click();
await settle(); await settle();
const labels = [...document.querySelectorAll('[role="menuitem"]')].map((item) => item.textContent?.trim()); expect(transposeFieldNames(host)).toEqual(["alpha", "zeta"]);
expect(labels).toContain(i18n.global.t("grid.sortCurrentPageAscending"));
expect(labels).not.toContain(i18n.global.t("grid.sortDatabaseDescending"));
menuAction(i18n.global.t("grid.sortCurrentPageAscending")).click();
await settle();
expect(onSort).toHaveBeenLastCalledWith("score", 1, "asc", undefined, "local");
expect(transposeValues(host, 1)).toEqual(["2", "10", "NULL"]);
}); });
it("uses the shared local/database sort actions and keeps the active record and row selection", async () => { it("toggles descending field-name order from the same header button", async () => {
const { host, onSort } = mountGrid(); const { host } = mountGrid();
await settle(); await settle();
await openTranspose(host); await openTranspose(host);
const trigger = host.querySelector<HTMLButtonElement>("[data-grid-transpose-column-sort]");
expect(transposeValues(host, 1)).toEqual(["10", "NULL", "2"]); if (!trigger) throw new Error("Transpose column sort trigger not found");
const nextRecordButton = host.querySelector(".lucide-chevron-right")?.closest<HTMLButtonElement>("button"); trigger.click();
if (!nextRecordButton) throw new Error("Next transpose record button not found");
nextRecordButton.click();
await settle(); await settle();
expect(transposeRecordHeader(host, 0).classList.contains("transpose-record-header-selected")).toBe(true); trigger.click();
expect(transposeRecordHeader(host, 1).classList.contains("transpose-record-header-active")).toBe(true); await settle();
expect(transposeFieldNames(host)).toEqual(["zeta", "alpha"]);
await selectTransposeSort(host, 1, "grid.sortCurrentPageAscending");
expect(onSort).toHaveBeenLastCalledWith("score", 1, "asc", undefined, "local");
expect(transposeValues(host, 1)).toEqual(["2", "10", "NULL"]);
expect(transposeRecordHeader(host, 1).classList.contains("transpose-record-header-selected")).toBe(true);
expect(transposeRecordHeader(host, 2).classList.contains("transpose-record-header-active")).toBe(true);
await selectTransposeSort(host, 1, "grid.sortDatabaseDescending");
expect(onSort).toHaveBeenLastCalledWith("score", 1, "desc", undefined, "database", "`score` DESC");
expect(transposeValues(host, 1)).toEqual(["10", "2", "NULL"]);
expect(transposeRecordHeader(host, 0).classList.contains("transpose-record-header-selected")).toBe(true);
expect(transposeRecordHeader(host, 2).classList.contains("transpose-record-header-active")).toBe(true);
await selectTransposeSort(host, 1, "grid.clearSort");
expect(onSort).toHaveBeenLastCalledWith("score", 1, null, undefined, "database", undefined);
expect(transposeValues(host, 1)).toEqual(["10", "NULL", "2"]);
expect(transposeRecordHeader(host, 0).classList.contains("transpose-record-header-selected")).toBe(true);
expect(transposeRecordHeader(host, 1).classList.contains("transpose-record-header-active")).toBe(true);
expect(host.querySelector(".transpose-grid-scroller")).not.toBeNull();
}); });
}); });