dtable-statistic 5.0.42 → 5.0.43-alpha.1

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

@@ -48,6 +48,7 @@ const exportOneDimensionToTable = _ref => {
   let {
     statisticalResult
   } = _ref;
+  console.log('exportOneDimensionToTable', statisticalResult);
   const {
     pivotResult,
     groupbyColumn,
@@ -72,11 +73,13 @@ const exportOneDimensionToTable = _ref => {
 
   // one dimension table no number columns
   if (pivot_columns.length < 2) {
+    console.log('-2');
     let columnData = {
       format: 'number'
     };
     let _isDateSummaryColumn = false;
     let isIncludeHour = false;
+    console.log('summaryColumn', summaryColumn);
     if (summaryColumn) {
       if (isSummaryDateColumn(summaryColumn)) {
         const {
@@ -110,6 +113,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,
@@ -134,6 +147,9 @@ const exportOneDimensionToTable = _ref => {
         [groupbyColumn.name]: groupName,
         [_reactIntlUniversal.default.get('Total')]: cellValue
       };
+      if (summaryColumn) {
+        newRow[summaryColumn.name] = cellValue;
+      }
       rows.push(newRow);
     });
     return {
@@ -191,6 +207,21 @@ const exportOneDimensionToTable = _ref => {
     }
   });
 
+  // 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 {
@@ -198,17 +229,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,
@@ -220,7 +251,10 @@ 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);
   });
   return {
@@ -467,7 +501,8 @@ const updatedOneDimensionToTable = _ref5 => {
   const {
     pivotResult,
     groupbyColumn,
-    statisticTableColumns
+    statisticTableColumns,
+    summaryColumn
   } = statisticalResult;
   if (!groupbyColumn) return {};
   const nameColumn = (0, _dtableUtils.getTableColumnByName)(updateTable, groupbyColumn.name);
@@ -488,6 +523,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 => {
@@ -499,6 +537,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 = {};
@@ -508,6 +547,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);
@@ -521,6 +565,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);
       }
     });
@@ -542,6 +589,7 @@ const updatedOneDimensionToTable = _ref5 => {
       columnMap[key] = (0, _dtableUtils.getTableColumnByName)(updateTable, column.name);
     }
   });
+  columnMap['total'] = (0, _dtableUtils.getTableColumnByName)(updateTable, _reactIntlUniversal.default.get('Total'));
 
   // updated rows
   const {
@@ -555,22 +603,30 @@ 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]);
+        rowTotal = rowTotal + Number(totalCellValue);
         if (column && (0, _cellValue.isCellValueChanged)(row[column.key], totalCellValue, column.type)) {
           updateRow[column.key] = totalCellValue;
           oldRow[column.key] = row[column.key];
         }
       });
+
+      // total column
+      const column = columnMap['total'];
+      if (column) {
+        updateRow[column.key] = rowTotal;
+        oldRow[column.key] = row[column.key];
+      }
       if (Object.keys(updateRow).length > 0) {
         const rowId = row._id;
         rowIds.push(rowId);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dtable-statistic",
-  "version": "5.0.42",
+  "version": "5.0.43-alpha.1",
   "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"
+    "sea-chart": "~0.0.89"
   },
   "peerDependencies": {
     "dtable-ui-component": "~5.0.*",