sea-chart 0.0.72 → 0.0.73

package/dist/utils/chart-utils/original-data-utils/pivot-table-calculator.js

@@ -379,10 +379,13 @@ function updateTwoDimensionRows(pivot_rows, pivot_columns, index, name, row, isC
   } = chart;
   const isCount = summary_type === CHART_SUMMARY_TYPE.COUNT;
   let summarySQLColumnName2ColumnKey = {};
-  const numericColumns = [{
-    column_key: summary_column_key,
-    summary_method: summary_method
-  }, ...summary_columns];
+  let numericColumns = [];
+  if (summary_column_key) {
+    numericColumns = [{
+      column_key: summary_column_key,
+      summary_method: summary_method
+    }, ...summary_columns];
+  }
   numericColumns.forEach(item => {
     const {
       column_key,
@@ -400,7 +403,6 @@ function updateTwoDimensionRows(pivot_rows, pivot_columns, index, name, row, isC
       summarySQLColumnName2ColumnKey[sqlNumericColumnKey] = summaryColumnKey;
     }
   });
-  const summarySQLnames = Object.keys(summarySQLColumnName2ColumnKey);
   const summarySQLColumnKeys = Object.values(summarySQLColumnName2ColumnKey);
   const summaryColumn = getTableColumnByKey(table, summary_column_key) || {};
   const singleNumeriColumnWithMethod = {
@@ -577,11 +579,19 @@ function getTwoDimensionTotal(summaryColumn, summary_type, summary_method, formu
             // cells[key].total = subTotal.date;
           }
         } else {
-          cells[key].total = subTotal;
-          total += subTotal[0][1] ? subTotal[0][1] - 0 : 0;
-          let columnTotal = pivot_columns_total[key] ? pivot_columns_total[key] : 0;
-          columnTotal += subTotal[0][1] ? subTotal[0][1] - 0 : 0;
-          pivot_columns_total[key] = columnTotal;
+          if (Array.isArray(subTotal)) {
+            cells[key].total = subTotal;
+            total += subTotal[0][1] ? subTotal[0][1] - 0 : 0;
+            let columnTotal = pivot_columns_total[key] ? pivot_columns_total[key] : 0;
+            columnTotal += subTotal[0][1] ? subTotal[0][1] - 0 : 0;
+            pivot_columns_total[key] = columnTotal;
+          } else {
+            cells[key].total = subTotal;
+            total += subTotal ? subTotal - 0 : 0;
+            let columnTotal = pivot_columns_total[key] ? pivot_columns_total[key] : 0;
+            columnTotal += subTotal ? subTotal - 0 : 0;
+            pivot_columns_total[key] = columnTotal;
+          }
         }
       }
     });

package/dist/view/wrapper/table/two-dimension-table.js

@@ -151,8 +151,7 @@ class TwoDimensionTable extends PureComponent {
         selectedCell,
         summaryColumn,
         summaryMethod,
-        chart,
-        isCalculateByView
+        chart
       } = this.props;
       const {
         display_total = true,
@@ -270,7 +269,7 @@ class TwoDimensionTable extends PureComponent {
                 'selected-pivot-cell-border': isSelectedCell
               })
             }));
-          }), !total && this.renderEmpty(summaryColumns, cellIdx)));
+          }), !total && !(typeof total === 'number') && this.renderEmpty(summaryColumns, cellIdx)));
         }), display_total && /*#__PURE__*/React.createElement("td", {
           className: classnames('pivot-cell', {
             'pivot-empty-cell': !isValidSummaryDisplayValue,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sea-chart",
-  "version": "0.0.72",
+  "version": "0.0.73",
   "main": "./dist/index.js",
   "dependencies": {
     "@antv/data-set": "0.11.8",