dtable-statistic 5.0.42-alpha.21 → 5.0.42-alpha.23

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

@@ -48,7 +48,6 @@ const exportOneDimensionToTable = _ref => {
   let {
     statisticalResult
   } = _ref;
-  console.log('exportOneDimensionToTable');
   const {
     pivotResult,
     groupbyColumn,
@@ -127,6 +126,7 @@ const exportOneDimensionToTable = _ref => {
       name: _reactIntlUniversal.default.get('Total'),
       data: columnData
     };
+    console.log('totalColumn', totalColumn);
     columns.push(totalColumn);
 
     // generator rows
@@ -163,6 +163,7 @@ const exportOneDimensionToTable = _ref => {
     } = item;
     const column = statisticTableColumns.find(column => column.key === key);
     if (column) {
+      console.log('column', column);
       const columnName = column.name;
       let columnData;
       let columnType = _dtableUtils.CellType.NUMBER;
@@ -205,6 +206,18 @@ const exportOneDimensionToTable = _ref => {
     }
   });
 
+  // total column
+  const totalColumn = {
+    type: _isDateSummaryColumn ? _dtableUtils.CellType.DATE : _dtableUtils.CellType.NUMBER,
+    name: _reactIntlUniversal.default.get('Total'),
+    // data: columnData,
+    data: {
+      format: 'number'
+    }
+  };
+  columnMap[key] = totalColumn;
+  columns.push(totalColumn);
+
   // generator rows
   pivot_rows.forEach(item => {
     const {
@@ -236,6 +249,10 @@ const exportOneDimensionToTable = _ref => {
     });
     rows.push(newRow);
   });
+  console.log(11, {
+    columns,
+    rows
+  });
   return {
     columns,
     rows
@@ -245,7 +262,6 @@ const exportTwoDimensionToTable = _ref2 => {
   let {
     statisticalResult
   } = _ref2;
-  console.log('exportTwoDimensionToTable');
   const {
     pivotResult,
     groupbyColumn,
@@ -469,7 +485,6 @@ const exportTwoDimensionWithSummaryColumnsToTable = _ref4 => {
   let {
     statisticalResult
   } = _ref4;
-  console.log('exportTwoDimensionWithSummaryColumnsToTable');
   return getTwoDimensionWithSummaryColumns({
     statisticalResult
   });
@@ -479,8 +494,6 @@ const updatedOneDimensionToTable = _ref5 => {
     updateTable,
     statisticalResult
   } = _ref5;
-  console.log('statisticalResult', statisticalResult);
-  console.log('updateTable', updateTable);
   const {
     pivotResult,
     groupbyColumn,
@@ -521,8 +534,6 @@ const updatedOneDimensionToTable = _ref5 => {
       const row = tableRows.find(row => row[nameColumn.key] === groupName);
       const totalColumn = columnMap['total'];
       const sumary_column = columnMap['sumary_column'];
-      console.log('totalColumn', totalColumn);
-      console.log('sumary_column', sumary_column);
       if (row) {
         // update old row
         let updateRow = {};
@@ -545,7 +556,6 @@ const updatedOneDimensionToTable = _ref5 => {
         }
       } else {
         // insert new row
-        console.log('insertrow');
         let newRow = {};
         newRow[nameColumn.key] = groupName;
         if (totalColumn) {
@@ -557,12 +567,6 @@ const updatedOneDimensionToTable = _ref5 => {
         newRows.push(newRow);
       }
     });
-    console.log(77, {
-      newRows,
-      updatedRows,
-      rowIds,
-      oldRows
-    });
     return {
       newRows,
       updatedRows,

package/package.json

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