dtable-statistic 5.0.42-alpha.12 → 5.0.42-alpha.14
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -482,7 +482,8 @@ const updatedOneDimensionToTable = _ref5 => {
|
|
|
482
482
|
const {
|
|
483
483
|
pivotResult,
|
|
484
484
|
groupbyColumn,
|
|
485
|
-
statisticTableColumns
|
|
485
|
+
statisticTableColumns,
|
|
486
|
+
summaryColumn
|
|
486
487
|
} = statisticalResult;
|
|
487
488
|
if (!groupbyColumn) return {};
|
|
488
489
|
const nameColumn = (0, _dtableUtils.getTableColumnByName)(updateTable, groupbyColumn.name);
|
|
@@ -514,9 +515,6 @@ const updatedOneDimensionToTable = _ref5 => {
|
|
|
514
515
|
const groupName = isEmptyName(original_name) ? _reactIntlUniversal.default.get(_constants.EMPTY_NAME) : name;
|
|
515
516
|
const row = tableRows.find(row => row[nameColumn.key] === groupName);
|
|
516
517
|
const totalColumn = columnMap['total'];
|
|
517
|
-
console.log('updateTable', updateTable);
|
|
518
|
-
console.log('row', row);
|
|
519
|
-
console.log('totalColumn', totalColumn);
|
|
520
518
|
if (row) {
|
|
521
519
|
// update old row
|
|
522
520
|
let updateRow = {};
|
|
@@ -526,10 +524,11 @@ const updatedOneDimensionToTable = _ref5 => {
|
|
|
526
524
|
updateRow[totalColumn.key] = validTotalCellValue;
|
|
527
525
|
oldRow[totalColumn.key] = row[totalColumn.key];
|
|
528
526
|
}
|
|
529
|
-
|
|
530
|
-
|
|
531
|
-
|
|
532
|
-
|
|
527
|
+
const validSummaryCellValue = getValidValueForColumn(summaryColumn, total.total);
|
|
528
|
+
if (summaryColumn && (0, _cellValue.isCellValueChanged)(row[summaryColumn.key], validSummaryCellValue, summaryColumn.type)) {
|
|
529
|
+
updateRow[summaryColumn.key] = validSummaryCellValue;
|
|
530
|
+
oldRow[summaryColumn.key] = row[summaryColumn.key];
|
|
531
|
+
}
|
|
533
532
|
if (Object.keys(updateRow).length > 0) {
|
|
534
533
|
const rowId = row._id;
|
|
535
534
|
rowIds.push(rowId);
|
|
@@ -543,9 +542,18 @@ const updatedOneDimensionToTable = _ref5 => {
|
|
|
543
542
|
if (totalColumn) {
|
|
544
543
|
newRow[totalColumn.key] = getValidValueForColumn(totalColumn, total.total);
|
|
545
544
|
}
|
|
545
|
+
if (summaryColumn) {
|
|
546
|
+
newRow[summaryColumn.key] = getValidValueForColumn(summaryColumn, total.total);
|
|
547
|
+
}
|
|
546
548
|
newRows.push(newRow);
|
|
547
549
|
}
|
|
548
550
|
});
|
|
551
|
+
console.log(22, {
|
|
552
|
+
newRows,
|
|
553
|
+
updatedRows,
|
|
554
|
+
rowIds,
|
|
555
|
+
oldRows
|
|
556
|
+
});
|
|
549
557
|
return {
|
|
550
558
|
newRows,
|
|
551
559
|
updatedRows,
|