dtable-statistic 5.0.42-alpha.16 → 5.0.42-alpha.17
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.
|
@@ -504,6 +504,10 @@ const updatedOneDimensionToTable = _ref5 => {
|
|
|
504
504
|
// one dimension table no summary columns
|
|
505
505
|
if (pivot_columns.length < 2) {
|
|
506
506
|
columnMap['total'] = (0, _dtableUtils.getTableColumnByName)(updateTable, _reactIntlUniversal.default.get('Total'));
|
|
507
|
+
if (summaryColumn) {
|
|
508
|
+
columnMap['sumary_column'] = (0, _dtableUtils.getTableColumnByName)(updateTable, summaryColumn.name);
|
|
509
|
+
}
|
|
510
|
+
console.log('columnMap', columnMap);
|
|
507
511
|
|
|
508
512
|
// updated rows
|
|
509
513
|
pivot_rows.forEach(item => {
|
|
@@ -515,6 +519,7 @@ const updatedOneDimensionToTable = _ref5 => {
|
|
|
515
519
|
const groupName = isEmptyName(original_name) ? _reactIntlUniversal.default.get(_constants.EMPTY_NAME) : name;
|
|
516
520
|
const row = tableRows.find(row => row[nameColumn.key] === groupName);
|
|
517
521
|
const totalColumn = columnMap['total'];
|
|
522
|
+
const sumary_column = columnMap['sumary_column'];
|
|
518
523
|
if (row) {
|
|
519
524
|
// update old row
|
|
520
525
|
let updateRow = {};
|
|
@@ -524,15 +529,15 @@ const updatedOneDimensionToTable = _ref5 => {
|
|
|
524
529
|
updateRow[totalColumn.key] = validTotalCellValue;
|
|
525
530
|
oldRow[totalColumn.key] = row[totalColumn.key];
|
|
526
531
|
}
|
|
527
|
-
const validSummaryCellValue = getValidValueForColumn(
|
|
532
|
+
const validSummaryCellValue = getValidValueForColumn(sumary_column, total.total);
|
|
528
533
|
console.log(22, row);
|
|
529
534
|
console.log(33, validSummaryCellValue);
|
|
530
|
-
console.log(44,
|
|
531
|
-
console.log(55, (0, _cellValue.isCellValueChanged)(row[
|
|
532
|
-
if (
|
|
533
|
-
updateRow[
|
|
534
|
-
oldRow[
|
|
535
|
-
console.log(66, row[
|
|
535
|
+
console.log(44, sumary_column);
|
|
536
|
+
console.log(55, (0, _cellValue.isCellValueChanged)(row[sumary_column.key]));
|
|
537
|
+
if (sumary_column && (0, _cellValue.isCellValueChanged)(row[sumary_column.key], validSummaryCellValue, sumary_column.type)) {
|
|
538
|
+
updateRow[sumary_column.key] = validSummaryCellValue;
|
|
539
|
+
oldRow[sumary_column.key] = row[sumary_column.key];
|
|
540
|
+
console.log(66, row[sumary_column.key]);
|
|
536
541
|
}
|
|
537
542
|
if (Object.keys(updateRow).length > 0) {
|
|
538
543
|
const rowId = row._id;
|
|
@@ -547,8 +552,8 @@ const updatedOneDimensionToTable = _ref5 => {
|
|
|
547
552
|
if (totalColumn) {
|
|
548
553
|
newRow[totalColumn.key] = getValidValueForColumn(totalColumn, total.total);
|
|
549
554
|
}
|
|
550
|
-
if (
|
|
551
|
-
newRow[
|
|
555
|
+
if (sumary_column) {
|
|
556
|
+
newRow[sumary_column.key] = getValidValueForColumn(sumary_column, total.total);
|
|
552
557
|
}
|
|
553
558
|
newRows.push(newRow);
|
|
554
559
|
}
|