dtable-statistic 5.0.42-alpha.25 → 5.0.42-alpha.27

package/es/utils/export-table-utils.js

@@ -210,12 +210,15 @@ const exportOneDimensionToTable = _ref => {
   const totalColumn = {
     type: _dtableUtils.CellType.NUMBER,
     name: _reactIntlUniversal.default.get('Total'),
-    // data: columnData,
     data: {
-      format: 'number'
+      decimal: "dot",
+      enable_precision: false,
+      format: "yuan",
+      precision: 2,
+      thousands: "no"
     }
   };
-  columnMap['key'] = totalColumn;
+  columnMap['total'] = totalColumn;
   columns.push(totalColumn);
 
   // generator rows
@@ -225,6 +228,7 @@ const exportOneDimensionToTable = _ref => {
       original_name,
       total
     } = item;
+    let rowTotal = 0;
     const groupName = isEmptyName(original_name) ? _reactIntlUniversal.default.get(_constants.EMPTY_NAME) : name;
     let newRow = {
       [groupbyColumn.name]: groupName
@@ -246,7 +250,10 @@ const exportOneDimensionToTable = _ref => {
         cellValue = (0, _dayjs.default)(cellValue).format(dateFormat);
       }
       newRow[name] = cellValue;
+      rowTotal = rowTotal + Number(cellValue);
     });
+    // total row
+    newRow[_reactIntlUniversal.default.get('Total')] = rowTotal;
     rows.push(newRow);
   });
   console.log(11, {
@@ -603,18 +610,22 @@ const updatedOneDimensionToTable = _ref5 => {
       let oldRow = {};
       Array.isArray(pivot_columns) && pivot_columns.forEach(item => {
         const {
-          key,
-          method
+          key
         } = item;
         const column = columnMap[key];
         const cellValueKey = key;
         const totalCellValue = getValidValueForColumn(column, total[cellValueKey]);
+        console.log('column', column);
+        console.log('cellValueKey', cellValueKey);
+        console.log('totalCellValue', totalCellValue);
         if (column && (0, _cellValue.isCellValueChanged)(row[column.key], totalCellValue, column.type)) {
+          console.log(111);
           updateRow[column.key] = totalCellValue;
           oldRow[column.key] = row[column.key];
         }
       });
       if (Object.keys(updateRow).length > 0) {
+        console.log(222);
         const rowId = row._id;
         rowIds.push(rowId);
         updatedRows[rowId] = updateRow;
@@ -639,6 +650,12 @@ const updatedOneDimensionToTable = _ref5 => {
       newRows.push(newRow);
     }
   });
+  console.log('update', {
+    newRows,
+    updatedRows,
+    rowIds,
+    oldRows
+  });
   return {
     newRows,
     updatedRows,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dtable-statistic",
-  "version": "5.0.42-alpha.25",
+  "version": "5.0.42-alpha.27",
   "description": "statistics",
   "main": "dist/dtable-statistic.js",
   "author": "seafile",