fix(grid): keep grouped column comments in lookup

Closes #7071
This commit is contained in:
t8y2 committed 2026-08-24 11:07:55 +00:00
1 parent 7a098a276a
commit e1a4242729
6 files changed
+72 -1

No files matched your search

@@ -255,6 +255,28 @@ describe("useDataGridColumnLayout", () => {
scope.stop();
});
it("uses grouped result comments in field filtering without name-map fallback", () => {
const scope = effectScope();
const state = scope.run(() =>
useDataGridColumnLayoutState({
columns: ref(["asin_url", "total"]),
sourceColumns: ref(undefined),
columnComments: ref(["asin亚马逊前台地址", undefined]),
commentByColumn: ref(new Map([["total", "Wrong aggregate comment"]])),
displayableColumnIndexes: ref([0, 1]),
allNullColumnIndexes: ref([]),
columnOrderKeys: ref(["asin_url\0\0", "total\0\0"]),
layoutScopeKey: ref("grouped-result-comments"),
tableScopeKey: ref(""),
}),
)!;
expect(state.orderedColumnLayoutOptions.value.map((option) => option.comment)).toEqual(["asin亚马逊前台地址", undefined]);
expect(state.filteredColumnLayoutOptions("亚马逊").map((option) => option.column)).toEqual(["asin_url"]);
expect(state.filteredColumnLayoutOptions("wrong")).toEqual([]);
scope.stop();
});
it("keeps a new resize active when the previous resize completion frame is pending", () => {
const frames = new Map<number, FrameRequestCallback>();
let nextFrame = 1;
@@ -83,6 +83,7 @@ export function dataGridHorizontalColumnWindow(options: { widths: readonly numbe
export function useDataGridColumnLayoutState(options: {
columns: MaybeRefOrGetter<readonly string[]>;
sourceColumns?: MaybeRefOrGetter<readonly (string | undefined)[] | undefined>;
columnComments?: MaybeRefOrGetter<readonly (string | undefined)[] | undefined>;
commentByColumn?: MaybeRefOrGetter<ReadonlyMap<string, string>>;
displayableColumnIndexes: MaybeRefOrGetter<readonly number[]>;
allNullColumnIndexes: MaybeRefOrGetter<readonly number[]>;
@@ -116,6 +117,7 @@ export function useDataGridColumnLayoutState(options: {
buildDataGridColumnLookupItems({
columns: toValue(options.columns),
sourceColumns: toValue(options.sourceColumns),
columnComments: toValue(options.columnComments),
displayableIndexes: toValue(options.displayableColumnIndexes),
commentByColumn: toValue(options.commentByColumn),
}),