dtable-statistic 5.3.49 → 5.3.51

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

@@ -223,11 +223,7 @@ const exportOneDimensionToTable = _ref => {
     type: _dtableUtils.CellType.NUMBER,
     name: _reactIntlUniversal.default.get('Total'),
     data: {
-      decimal: 'dot',
-      enable_precision: false,
-      format: 'yuan',
-      precision: 2,
-      thousands: 'no'
+      format: 'number'
     }
   };
   columnMap['total'] = totalColumn;
@@ -650,18 +646,24 @@ const updatedOneDimensionToTable = _ref5 => {
       let newRow = {
         [nameColumn.key]: groupName
       };
+      let rowTotal = 0;
       Array.isArray(pivot_columns) && pivot_columns.forEach(item => {
         const {
-          key,
-          method
+          key
         } = item;
-        const cellValueKey = key + method;
+        const cellValueKey = key;
         const column = columnMap[key];
         if (column) {
           const totalCellValue = getValidValueForColumn(column, total[cellValueKey]);
           newRow[column.key] = totalCellValue;
+          rowTotal = rowTotal + Number(totalCellValue);
         }
       });
+      // total column
+      const totalColumn = columnMap['total'];
+      if (totalColumn) {
+        newRow[totalColumn.key] = rowTotal;
+      }
       newRows.push(newRow);
     }
   });
@@ -773,7 +775,7 @@ const updateTwoDimensionToTable = _ref6 => {
       let newRow = {};
       newRow[nameColumnKey] = name;
       if (totalColumn) {
-        newRow[totalColumn.key] = getValidValueForColumn(totalColumn, name);
+        newRow[totalColumn.key] = getValidValueForColumn(totalColumn, total);
       }
       Object.keys(cells).forEach(key => {
         const columnName = isEmptyName(key) ? _reactIntlUniversal.default.get(_constants.EMPTY_NAME) : key;
@@ -846,7 +848,13 @@ const updateTwoDimensionWithSummaryColumnsToTable = _ref7 => {
           name: tableColumnName
         } = tableColumn;
         const existCellValue = existRow[tableColumnKey];
-        const exportingCellValue = exportingRow[tableColumnName];
+        let exportingCellValue = exportingRow[tableColumnName];
+        if (exportingCellValue === undefined) {
+          const matchedKey = Object.keys(exportingRow).find(key => key.includes(`（${tableColumnName}）`));
+          if (matchedKey !== undefined) {
+            exportingCellValue = exportingRow[matchedKey];
+          }
+        }
         if (tableColumn && (0, _cellValue.isCellValueChanged)(existCellValue, exportingCellValue, tableColumnType)) {
           exportingRowData[tableColumnKey] = exportingCellValue;
           existRowData[tableColumnKey] = existCellValue;
@@ -859,8 +867,24 @@ const updateTwoDimensionWithSummaryColumnsToTable = _ref7 => {
         oldRows[rowId] = existRowData;
       }
     } else {
-      // create new row which not exist
-      newRows.push(exportingRow);
+      let newRowData = {};
+      tableColumns.forEach(tableColumn => {
+        const {
+          key: tableColumnKey,
+          name: tableColumnName
+        } = tableColumn;
+        let exportingCellValue = exportingRow[tableColumnName];
+        if (exportingCellValue === undefined) {
+          const matchedKey = Object.keys(exportingRow).find(key => key.includes(`（${tableColumnName}）`));
+          if (matchedKey !== undefined) {
+            exportingCellValue = exportingRow[matchedKey];
+          }
+        }
+        if (exportingCellValue !== undefined && exportingCellValue !== null) {
+          newRowData[tableColumnKey] = exportingCellValue;
+        }
+      });
+      newRows.push(newRowData);
     }
   });
   return {

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "5.3.49",
+  "version": "5.3.51",
   "name": "dtable-statistic",
   "description": "statistics",
   "main": "dist/dtable-statistic.js",
@@ -16,7 +16,7 @@
     "react-grid-layout": "^1.2.5",
     "react-intl-universal": "^2.4.8",
     "reactstrap": "9.2.3",
-    "sea-chart": "^1.1.132"
+    "sea-chart": "^1.1.134"
   },
   "peerDependencies": {
     "dtable-ui-component": "~6.0.*",
@@ -50,7 +50,7 @@
     "dotenv": "^10.0.0",
     "dotenv-expand": "^5.1.0",
     "dtable-store": "^6.2.7",
-    "dtable-ui-component": "^6.0.121",
+    "dtable-ui-component": "^6.0.123",
     "dtable-utils": "^5.0.23",
     "eslint": "^8.3.0",
     "eslint-config-react-app": "^7.0.1",