Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"changes": [
{
"comment": "Render group title for single-column list tables.",
"type": "none",
"packageName": "@visactor/vtable"
}
],
"packageName": "@visactor/vtable",
"email": "biukam.w@gmail.com"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
// @ts-nocheck
import { ListTable } from '../../src';
import { createDiv } from '../dom';

global.__VERSION__ = 'none';

function collectText(graphic: any): string[] {
const result: string[] = [];
const children = graphic?.children ?? [];

for (const child of children) {
if (child.type === 'text') {
result.push(child.attribute?.text);
}
result.push(...collectText(child));
}

return result;
}

describe('listTable group single column', () => {
test('renders parent group title when there is only one data column', () => {
const containerDom: HTMLElement = createDiv();
containerDom.style.position = 'relative';
containerDom.style.width = '500px';
containerDom.style.height = '360px';

const table = new ListTable(containerDom, {
records: [
{ category: 'Furniture', subCategory: 'Bookcases', value: 'Bookcase' },
{ category: 'Furniture', subCategory: 'Chairs', value: 'Chair' }
],
columns: [{ field: 'value', title: 'Value', width: 180 }],
widthMode: 'standard',
groupConfig: {
groupBy: ['category', 'subCategory'],
titleFieldFormat: record => `${record.vtableMergeName}(${record.children.length})`
}
});

const groupRecord = table.getCellRawRecord(0, 1);
expect(groupRecord.vtableMerge).toBe(true);

const text = collectText(table.scenegraph.getCell(0, 1, true));
expect(text).toContain('Furniture(2)');

table.release();
});
});
7 changes: 4 additions & 3 deletions packages/vtable/src/scenegraph/group-creater/cell-helper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -666,12 +666,12 @@ export function updateCell(
isMerge = range.start.col !== range.end.col || range.start.row !== range.end.row;
}
let isVtableMerge = false;
if (table.internalProps.enableTreeNodeMerge && isMerge) {
if (table.internalProps.enableTreeNodeMerge && range) {
const rawRecord = table.getCellRawRecord(range.start.col, range.start.row);
const { vtableMergeName, vtableMerge } = rawRecord ?? {};

isVtableMerge = vtableMerge;
if (vtableMerge) {
isVtableMerge = vtableMerge && (isMerge || !table.isSeriesNumberInBody(col, row));
if (isVtableMerge) {
mayHaveIcon = true;
if ((table.internalProps as ListTableProtected).groupTitleCustomLayout) {
customResult = dealWithCustom(
Expand Down Expand Up @@ -712,6 +712,7 @@ export function updateCell(
if (
!addNew &&
!isMerge &&
!isVtableMerge &&
!(define?.customLayout || define?.customRender || define?.headerCustomLayout || define?.headerCustomRender) &&
(forceFastUpdate || canUseFastUpdate(col, row, oldCellGroup, autoWrapText, mayHaveIcon, table))
) {
Expand Down
6 changes: 3 additions & 3 deletions packages/vtable/src/scenegraph/group-creater/column-helper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -169,12 +169,12 @@ export function createComplexColumn(
}
}
let isVtableMerge = false;
if (table.internalProps.enableTreeNodeMerge && isMerge) {
if (table.internalProps.enableTreeNodeMerge && range) {
const rawRecord = table.getCellRawRecord(range.start.col, range.start.row);
const { vtableMergeName, vtableMerge } = rawRecord ?? {};

isVtableMerge = vtableMerge;
if (vtableMerge) {
isVtableMerge = vtableMerge && (isMerge || !table.isSeriesNumberInBody(col, row));
if (isVtableMerge) {
mayHaveIcon = true;
if ((table.internalProps as ListTableProtected).groupTitleCustomLayout) {
customResult = dealWithCustom(
Expand Down
Loading