dtable-statistic 5.0.42-alpha.3 → 5.0.42-alpha.30

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

@@ -48,7 +48,6 @@ const exportOneDimensionToTable = _ref => {
   let {
     statisticalResult
   } = _ref;
-  console.log('exportOneDimensionToTable');
   const {
     pivotResult,
     groupbyColumn,
@@ -111,12 +110,23 @@ 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,
       name: _reactIntlUniversal.default.get('Total'),
       data: columnData
     };
+    console.log('totalColumn', totalColumn);
     columns.push(totalColumn);
 
     // generator rows
@@ -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,17 +155,15 @@ 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) {
+      console.log('column', column);
       const columnName = column.name;
       let columnData;
       let columnType = _dtableUtils.CellType.NUMBER;
@@ -194,7 +205,22 @@ const exportOneDimensionToTable = _ref => {
       columns.push(newColumn);
     }
   });
-  console.log('pivot_rows', pivot_rows);
+
+  // total column
+  const totalColumn = {
+    type: _dtableUtils.CellType.NUMBER,
+    name: _reactIntlUniversal.default.get('Total'),
+    data: {
+      decimal: "dot",
+      enable_precision: false,
+      format: "yuan",
+      precision: 2,
+      thousands: "no"
+    }
+  };
+  columnMap['total'] = totalColumn;
+  columns.push(totalColumn);
+
   // generator rows
   pivot_rows.forEach(item => {
     const {
@@ -202,17 +228,17 @@ 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
     };
     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,
@@ -224,9 +250,16 @@ 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, {
+    columns,
+    rows
+  });
   return {
     columns,
     rows
@@ -236,7 +269,6 @@ const exportTwoDimensionToTable = _ref2 => {
   let {
     statisticalResult
   } = _ref2;
-  console.log('exportTwoDimensionToTable');
   const {
     pivotResult,
     groupbyColumn,
@@ -460,7 +492,6 @@ const exportTwoDimensionWithSummaryColumnsToTable = _ref4 => {
   let {
     statisticalResult
   } = _ref4;
-  console.log('exportTwoDimensionWithSummaryColumnsToTable');
   return getTwoDimensionWithSummaryColumns({
     statisticalResult
   });
@@ -473,7 +504,8 @@ const updatedOneDimensionToTable = _ref5 => {
   const {
     pivotResult,
     groupbyColumn,
-    statisticTableColumns
+    statisticTableColumns,
+    summaryColumn
   } = statisticalResult;
   if (!groupbyColumn) return {};
   const nameColumn = (0, _dtableUtils.getTableColumnByName)(updateTable, groupbyColumn.name);
@@ -494,6 +526,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 => {
@@ -505,6 +540,7 @@ 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 = {};
@@ -514,6 +550,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);
@@ -527,6 +568,9 @@ 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);
       }
     });
@@ -561,23 +605,33 @@ const updatedOneDimensionToTable = _ref5 => {
     } = item;
     const groupName = isEmptyName(original_name) ? _reactIntlUniversal.default.get(_constants.EMPTY_NAME) : name;
     const row = tableRows.find(row => row[nameColumnKey] === groupName);
+    let rowTotal = 0;
     if (row) {
       let updateRow = {};
       let oldRow = {};
       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 totalCellValue = getValidValueForColumn(column, total[cellValueKey]);
         if (column && (0, _cellValue.isCellValueChanged)(row[column.key], totalCellValue, column.type)) {
           updateRow[column.key] = totalCellValue;
           oldRow[column.key] = row[column.key];
+          console.log('totalCellValue', Number(totalCellValue));
+          rowTotal = rowTotal + Number(totalCellValue);
         }
       });
+
+      // total column
+      console.log('row', row);
+      console.log('item', item);
+      console.log('rowTotal', rowTotal);
+      updateRow[_reactIntlUniversal.default.get('Total')] = rowTotal;
+      oldRow[_reactIntlUniversal.default.get('Total')] = row[_reactIntlUniversal.default.get('Total')];
       if (Object.keys(updateRow).length > 0) {
+        console.log(222);
         const rowId = row._id;
         rowIds.push(rowId);
         updatedRows[rowId] = updateRow;
@@ -602,6 +656,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.3",
+  "version": "5.0.42-alpha.30",
   "description": "statistics",
   "main": "dist/dtable-statistic.js",
   "author": "seafile",