Commit f3cd13b

committed

fix sorting for custom columns and columns with nested data map in table

1 parent 416d559 commit f3cd13bCopy full SHA for f3cd13b

File tree

+13

-2

lines changed

+13

-2

lines changed

Lines changed: 13 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -325,10 +325,21 @@ export class TableImplComp extends TableInitComp implements IContainer {`
`325`	`325`	`...row,`
`326`	`326`	`[OB_ROW_ORI_INDEX]: index + "",`
`327`	`327`	`}));`
	`328`	`+ const updatedDataMap: Record<string, RecordType> = {};`
	`329`	`+ updatedData.forEach((row) => {`
	`330`	`+ updatedDataMap[row[OB_ROW_ORI_INDEX]] = row;`
	`331`	`+ })`
`328`	`332`	`const originalData = getOriDisplayData(updatedData, 1000, Object.values(dataColumns))`
`329`		`- const sortedData = sortData(data, sortColumns, sort);`
	`333`	`+ const sortedData = sortData(originalData, sortColumns, sort);`
	`334`	`+`
`330`	`335`	`// console.info( "sortNode. data: ", data, " sort: ", sort, " columns: ", columns, " sortedData: ", sortedData);`
`331`		`- return sortedData;`
	`336`	`+ const newData = sortedData.map(row => {`
	`337`	`+ return {`
	`338`	`+ ...row,`
	`339`	`+ ...updatedDataMap[row[OB_ROW_ORI_INDEX]],`
	`340`	`+ }`
	`341`	`+ });`
	`342`	`+ return newData;`
`332`	`343`	`});`
`333`	`344`	`return lastValueIfEqual(this, "sortedDataNode", [sortedDataNode, nodes] as const, (a, b) =>`
`334`	`345`	`shallowEqual(a[1], b[1])`

Comments

(0)