dtable-statistic 5.0.42-alpha.22 → 5.0.42-alpha.4

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

@@ -48,6 +48,7 @@ const exportOneDimensionToTable = _ref => {
   let {
     statisticalResult
   } = _ref;
+  console.log('exportOneDimensionToTable');
   const {
     pivotResult,
     groupbyColumn,
@@ -110,16 +111,6 @@ const exportOneDimensionToTable = _ref => {
       }
     }
 
-    // count column
-    if (summaryColumn) {
-      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,
@@ -144,9 +135,6 @@ const exportOneDimensionToTable = _ref => {
         [groupbyColumn.name]: groupName,
         [_reactIntlUniversal.default.get('Total')]: cellValue
       };
-      if (summaryColumn) {
-        newRow[summaryColumn.name] = cellValue;
-      }
       rows.push(newRow);
     });
     return {
@@ -154,13 +142,16 @@ const exportOneDimensionToTable = _ref => {
       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;
@@ -203,7 +194,7 @@ const exportOneDimensionToTable = _ref => {
       columns.push(newColumn);
     }
   });
-
+  console.log('pivot_rows', pivot_rows);
   // generator rows
   pivot_rows.forEach(item => {
     const {
@@ -217,10 +208,11 @@ const exportOneDimensionToTable = _ref => {
     };
     Array.isArray(pivot_columns) && pivot_columns.forEach(item => {
       const {
-        key
+        key,
+        method
       } = item;
       const column = columnMap[key];
-      const cellValueKey = key;
+      const cellValueKey = key + method;
       const {
         name,
         type,
@@ -235,10 +227,7 @@ const exportOneDimensionToTable = _ref => {
     });
     rows.push(newRow);
   });
-  console.log(11, {
-    columns,
-    rows
-  });
+  console.log('columns-rows', columns, rows);
   return {
     columns,
     rows
@@ -248,6 +237,7 @@ const exportTwoDimensionToTable = _ref2 => {
   let {
     statisticalResult
   } = _ref2;
+  console.log('exportTwoDimensionToTable');
   const {
     pivotResult,
     groupbyColumn,
@@ -471,6 +461,7 @@ const exportTwoDimensionWithSummaryColumnsToTable = _ref4 => {
   let {
     statisticalResult
   } = _ref4;
+  console.log('exportTwoDimensionWithSummaryColumnsToTable');
   return getTwoDimensionWithSummaryColumns({
     statisticalResult
   });
@@ -483,8 +474,7 @@ const updatedOneDimensionToTable = _ref5 => {
   const {
     pivotResult,
     groupbyColumn,
-    statisticTableColumns,
-    summaryColumn
+    statisticTableColumns
   } = statisticalResult;
   if (!groupbyColumn) return {};
   const nameColumn = (0, _dtableUtils.getTableColumnByName)(updateTable, groupbyColumn.name);
@@ -505,9 +495,6 @@ const updatedOneDimensionToTable = _ref5 => {
   // one dimension table no summary columns
   if (pivot_columns.length < 2) {
     columnMap['total'] = (0, _dtableUtils.getTableColumnByName)(updateTable, _reactIntlUniversal.default.get('Total'));
-    if (summaryColumn) {
-      columnMap['sumary_column'] = (0, _dtableUtils.getTableColumnByName)(updateTable, summaryColumn.name);
-    }
 
     // updated rows
     pivot_rows.forEach(item => {
@@ -519,7 +506,6 @@ const updatedOneDimensionToTable = _ref5 => {
       const groupName = isEmptyName(original_name) ? _reactIntlUniversal.default.get(_constants.EMPTY_NAME) : name;
       const row = tableRows.find(row => row[nameColumn.key] === groupName);
       const totalColumn = columnMap['total'];
-      const sumary_column = columnMap['sumary_column'];
       if (row) {
         // update old row
         let updateRow = {};
@@ -529,11 +515,6 @@ const updatedOneDimensionToTable = _ref5 => {
           updateRow[totalColumn.key] = validTotalCellValue;
           oldRow[totalColumn.key] = row[totalColumn.key];
         }
-        const validSummaryCellValue = getValidValueForColumn(sumary_column, total.total);
-        if (sumary_column && (0, _cellValue.isCellValueChanged)(row[sumary_column.key], validSummaryCellValue, sumary_column.type)) {
-          updateRow[sumary_column.key] = validSummaryCellValue;
-          oldRow[sumary_column.key] = row[sumary_column.key];
-        }
         if (Object.keys(updateRow).length > 0) {
           const rowId = row._id;
           rowIds.push(rowId);
@@ -547,9 +528,6 @@ const updatedOneDimensionToTable = _ref5 => {
         if (totalColumn) {
           newRow[totalColumn.key] = getValidValueForColumn(totalColumn, total.total);
         }
-        if (sumary_column) {
-          newRow[sumary_column.key] = getValidValueForColumn(sumary_column, total.total);
-        }
         newRows.push(newRow);
       }
     });
@@ -593,7 +571,7 @@ const updatedOneDimensionToTable = _ref5 => {
           method
         } = item;
         const column = columnMap[key];
-        const cellValueKey = key;
+        const cellValueKey = key + method;
         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.22",
+  "version": "5.0.42-alpha.4",
   "description": "statistics",
   "main": "dist/dtable-statistic.js",
   "author": "seafile",