Skip to content

Commit b236d32

Browse files
committed
fix review remarks
1 parent 8c59e48 commit b236d32

1 file changed

Lines changed: 14 additions & 12 deletions

File tree

  • packages/devextreme/js/__internal/grids/data_grid/summary

packages/devextreme/js/__internal/grids/data_grid/summary/m_summary.ts

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -566,17 +566,18 @@ const data = (Base: ModuleType<DataController>) => class SummaryDataControllerEx
566566
}: CalculateSummaryCellsArgs) {
567567
const summaryCells: SummaryCellItem[][] = [];
568568
const summaryCellsByColumns: Record<number, SummaryCellItem[]> = {};
569+
const getColumnByKey = (key) => (
570+
columnMap
571+
? getColumnFromMap(key, columnMap)
572+
: this._columnsController.columnOption(key)
573+
);
569574

570575
each(summaryItems, (summaryIndex, summaryItem) => {
571-
const column = columnMap
572-
? getColumnFromMap(summaryItem.column, columnMap)
573-
: this._columnsController.columnOption(summaryItem.column);
574-
const showInColumn = (summaryItem.showInColumn
575-
&& (columnMap
576-
? getColumnFromMap(summaryItem.showInColumn, columnMap)
577-
: this._columnsController.columnOption(summaryItem.showInColumn)))
578-
|| column;
579-
const columnIndex = calculateTargetColumnIndex(summaryItem, showInColumn);
576+
const column = getColumnByKey(summaryItem.column);
577+
const showInColumn = summaryItem.showInColumn
578+
? getColumnByKey(summaryItem.showInColumn)
579+
: undefined;
580+
const columnIndex = calculateTargetColumnIndex(summaryItem, showInColumn ?? column);
580581

581582
if (columnIndex >= 0) {
582583
if (!summaryCellsByColumns[columnIndex]) {
@@ -591,13 +592,14 @@ const data = (Base: ModuleType<DataController>) => class SummaryDataControllerEx
591592
} else if (summaryItem.summaryType !== 'count') {
592593
valueFormat = gridCore.getFormatByDataType(column && column.dataType);
593594
}
594-
summaryCellsByColumns[columnIndex].push(extend({}, summaryItem, {
595-
value: isString(aggregate) && column && column.deserializeValue
595+
summaryCellsByColumns[columnIndex].push({
596+
...summaryItem,
597+
value: isString(aggregate) && column?.deserializeValue
596598
? column.deserializeValue(aggregate)
597599
: aggregate,
598600
valueFormat,
599601
columnCaption: column && column.index !== columnIndex ? column.caption : undefined,
600-
}));
602+
});
601603
}
602604
}
603605
});

0 commit comments

Comments
 (0)