dtable-statistic 5.0.42-alpha.0 → 5.0.42-alpha.10

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

@@ -48,6 +48,7 @@ const exportOneDimensionToTable = _ref => {
   let {
     statisticalResult
   } = _ref;
+  console.log('exportOneDimensionToTable');
   const {
     pivotResult,
     groupbyColumn,
@@ -110,6 +111,17 @@ const exportOneDimensionToTable = _ref => {
       }
     }
 
+    // count column
+    if (summaryColumn) {
+      console.log('columnData', columnData);
+      const countColumn = {
+        type: _isDateSummaryColumn ? _dtableUtils.CellType.DATE : _dtableUtils.CellType.NUMBER,
+        name: summaryColumn === null || summaryColumn === void 0 ? void 0 : summaryColumn.name,
+        data: columnData
+      };
+      columns.push(countColumn);
+    }
+
     // total column
     const totalColumn = {
       type: _isDateSummaryColumn ? _dtableUtils.CellType.DATE : _dtableUtils.CellType.NUMBER,
@@ -134,20 +146,30 @@ const exportOneDimensionToTable = _ref => {
         [groupbyColumn.name]: groupName,
         [_reactIntlUniversal.default.get('Total')]: cellValue
       };
+      if (summaryColumn) {
+        newRow[summaryColumn.name] = cellValue;
+      }
       rows.push(newRow);
     });
+    console.log(11, {
+      columns,
+      rows
+    });
     return {
       columns,
       rows
     };
   }
-
+  console.log('pivot_columns', pivot_columns);
+  console.log('statisticTableColumns', statisticTableColumns);
   // one dimension table with number columns
   Array.isArray(pivot_columns) && pivot_columns.forEach(item => {
     const {
       key
     } = item;
+    console.log('item', item);
     const column = statisticTableColumns.find(column => column.key === key);
+    console.log('column', column);
     if (column) {
       const columnName = column.name;
       let columnData;
@@ -190,7 +212,7 @@ const exportOneDimensionToTable = _ref => {
       columns.push(newColumn);
     }
   });
-
+  console.log('pivot_rows', pivot_rows);
   // generator rows
   pivot_rows.forEach(item => {
     const {
@@ -204,11 +226,10 @@ const exportOneDimensionToTable = _ref => {
     };
     Array.isArray(pivot_columns) && pivot_columns.forEach(item => {
       const {
-        key,
-        method
+        key
       } = item;
       const column = columnMap[key];
-      const cellValueKey = key + method;
+      const cellValueKey = key;
       const {
         name,
         type,
@@ -221,8 +242,10 @@ const exportOneDimensionToTable = _ref => {
       }
       newRow[name] = cellValue;
     });
+    console.log('newRow', newRow);
     rows.push(newRow);
   });
+  console.log('rows', rows);
   return {
     columns,
     rows
@@ -232,6 +255,7 @@ const exportTwoDimensionToTable = _ref2 => {
   let {
     statisticalResult
   } = _ref2;
+  console.log('exportTwoDimensionToTable');
   const {
     pivotResult,
     groupbyColumn,
@@ -455,6 +479,7 @@ const exportTwoDimensionWithSummaryColumnsToTable = _ref4 => {
   let {
     statisticalResult
   } = _ref4;
+  console.log('exportTwoDimensionWithSummaryColumnsToTable');
   return getTwoDimensionWithSummaryColumns({
     statisticalResult
   });
@@ -564,7 +589,7 @@ const updatedOneDimensionToTable = _ref5 => {
           method
         } = item;
         const column = columnMap[key];
-        const cellValueKey = key + method;
+        const cellValueKey = key;
         const totalCellValue = getValidValueForColumn(column, total[cellValueKey]);
         if (column && (0, _cellValue.isCellValueChanged)(row[column.key], totalCellValue, column.type)) {
           updateRow[column.key] = totalCellValue;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dtable-statistic",
-  "version": "5.0.42-alpha.0",
+  "version": "5.0.42-alpha.10",
   "description": "statistics",
   "main": "dist/dtable-statistic.js",
   "author": "seafile",
@@ -18,7 +18,7 @@
     "react-grid-layout": "^1.2.5",
     "react-intl-universal": "^2.4.8",
     "reactstrap": "8.9.0",
-    "sea-chart": "~0.0.88-alpha.3"
+    "sea-chart": "~0.0.88"
   },
   "peerDependencies": {
     "dtable-ui-component": "~5.0.*",