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

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

@@ -111,6 +111,16 @@ 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,
@@ -135,6 +145,9 @@ const exportOneDimensionToTable = _ref => {
         [groupbyColumn.name]: groupName,
         [_reactIntlUniversal.default.get('Total')]: cellValue
       };
+      if (summaryColumn) {
+        newRow[summaryColumn.name] = cellValue;
+      }
       rows.push(newRow);
     });
     return {
@@ -142,13 +155,12 @@ const exportOneDimensionToTable = _ref => {
       rows
     };
   }
-  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);
     if (column) {
       const columnName = column.name;
@@ -206,11 +218,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,
@@ -468,10 +479,13 @@ const updatedOneDimensionToTable = _ref5 => {
     updateTable,
     statisticalResult
   } = _ref5;
+  console.log('statisticalResult', statisticalResult);
+  console.log('updateTable', updateTable);
   const {
     pivotResult,
     groupbyColumn,
-    statisticTableColumns
+    statisticTableColumns,
+    summaryColumn
   } = statisticalResult;
   if (!groupbyColumn) return {};
   const nameColumn = (0, _dtableUtils.getTableColumnByName)(updateTable, groupbyColumn.name);
@@ -492,6 +506,9 @@ 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 => {
@@ -503,6 +520,9 @@ 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'];
+      console.log('totalColumn', totalColumn);
+      console.log('sumary_column', sumary_column);
       if (row) {
         // update old row
         let updateRow = {};
@@ -512,6 +532,11 @@ 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);
@@ -520,14 +545,24 @@ const updatedOneDimensionToTable = _ref5 => {
         }
       } else {
         // insert new row
+        console.log('insertrow');
         let newRow = {};
         newRow[nameColumn.key] = groupName;
         if (totalColumn) {
           newRow[totalColumn.key] = getValidValueForColumn(totalColumn, total.total);
         }
+        if (sumary_column) {
+          newRow[sumary_column.key] = getValidValueForColumn(sumary_column, total.total);
+        }
         newRows.push(newRow);
       }
     });
+    console.log(77, {
+      newRows,
+      updatedRows,
+      rowIds,
+      oldRows
+    });
     return {
       newRows,
       updatedRows,
@@ -568,7 +603,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.2",
+  "version": "5.0.42-alpha.21",
   "description": "statistics",
   "main": "dist/dtable-statistic.js",
   "author": "seafile",