dtable-statistic 5.0.42-alpha.16 → 5.0.42-alpha.18

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,9 @@ 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
+ }
507
510
 
508
511
  // updated rows
509
512
  pivot_rows.forEach(item => {
@@ -515,6 +518,7 @@ const updatedOneDimensionToTable = _ref5 => {
515
518
  const groupName = isEmptyName(original_name) ? _reactIntlUniversal.default.get(_constants.EMPTY_NAME) : name;
516
519
  const row = tableRows.find(row => row[nameColumn.key] === groupName);
517
520
  const totalColumn = columnMap['total'];
521
+ const sumary_column = columnMap['sumary_column'];
518
522
  if (row) {
519
523
  // update old row
520
524
  let updateRow = {};
@@ -524,15 +528,10 @@ const updatedOneDimensionToTable = _ref5 => {
524
528
  updateRow[totalColumn.key] = validTotalCellValue;
525
529
  oldRow[totalColumn.key] = row[totalColumn.key];
526
530
  }
527
- const validSummaryCellValue = getValidValueForColumn(summaryColumn, total.total);
528
- console.log(22, row);
529
- console.log(33, validSummaryCellValue);
530
- console.log(44, summaryColumn);
531
- console.log(55, (0, _cellValue.isCellValueChanged)(row[summaryColumn.key]));
532
- if (summaryColumn && (0, _cellValue.isCellValueChanged)(row[summaryColumn.key], validSummaryCellValue, summaryColumn.type)) {
533
- updateRow[summaryColumn.key] = validSummaryCellValue;
534
- oldRow[summaryColumn.key] = row[summaryColumn.key];
535
- console.log(66, row[summaryColumn.key]);
531
+ const validSummaryCellValue = getValidValueForColumn(sumary_column, total.total);
532
+ if (sumary_column && (0, _cellValue.isCellValueChanged)(row[sumary_column.key], validSummaryCellValue, sumary_column.type)) {
533
+ updateRow[sumary_column.key] = validSummaryCellValue;
534
+ oldRow[sumary_column.key] = row[sumary_column.key];
536
535
  }
537
536
  if (Object.keys(updateRow).length > 0) {
538
537
  const rowId = row._id;
@@ -542,13 +541,14 @@ const updatedOneDimensionToTable = _ref5 => {
542
541
  }
543
542
  } else {
544
543
  // insert new row
544
+ console.log('insertrow');
545
545
  let newRow = {};
546
546
  newRow[nameColumn.key] = groupName;
547
547
  if (totalColumn) {
548
548
  newRow[totalColumn.key] = getValidValueForColumn(totalColumn, total.total);
549
549
  }
550
- if (summaryColumn) {
551
- newRow[summaryColumn.key] = getValidValueForColumn(summaryColumn, total.total);
550
+ if (sumary_column) {
551
+ newRow[sumary_column.key] = getValidValueForColumn(sumary_column, total.total);
552
552
  }
553
553
  newRows.push(newRow);
554
554
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "dtable-statistic",
3
- "version": "5.0.42-alpha.16",
3
+ "version": "5.0.42-alpha.18",
4
4
  "description": "statistics",
5
5
  "main": "dist/dtable-statistic.js",
6
6
  "author": "seafile",