sea-chart 0.0.67-alpha.3 → 0.0.67-alpha.4

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

@@ -126,23 +126,21 @@ class TwoDimensionTable extends PureComponent {
         total
       }, selectedCell);
     };
-    this.renderEmptyCell = (summary_columns, cellIdx) => {
-      if (summary_columns && (summary_columns === null || summary_columns === void 0 ? void 0 : summary_columns.length) !== 0) {
-        return summary_columns.map(() => {
-          return /*#__PURE__*/React.createElement("div", {
-            key: "table-cell-".concat(cellIdx),
-            className: classnames('pivot-cell', {
-              'pivot-empty-cell': true
-            })
-          }, /*#__PURE__*/React.createElement("i", null));
-        });
-      }
+    this.renderSingle = (total, display_empty, cellIdx, isSelectedCell, isSelectedCellTop, isSelectedCellLeft) => {
+      const isValidDisplayValue = BaseUtils.isValidValue(total, display_empty);
       return /*#__PURE__*/React.createElement("div", {
         key: "table-cell-".concat(cellIdx),
         className: classnames('pivot-cell', {
-          'pivot-empty-cell': true
+          'pivot-empty-cell': !isValidDisplayValue,
+          'selected-pivot-cell': isSelectedCell,
+          'selected-pivot-cell-top': isSelectedCellTop,
+          'selected-pivot-cell-left': isSelectedCellLeft
+        })
+      }, isValidDisplayValue ? total : /*#__PURE__*/React.createElement("i", null), /*#__PURE__*/React.createElement("span", {
+        className: classnames({
+          'selected-pivot-cell-border': isSelectedCell
         })
-      }, /*#__PURE__*/React.createElement("i", null));
+      }));
     };
     this.renderRows = () => {
       const {
@@ -156,7 +154,8 @@ class TwoDimensionTable extends PureComponent {
       const {
         display_total = true,
         display_empty,
-        summary_type
+        summary_type,
+        column_groupby_multiple_numeric_column
       } = chart.config;
       const {
         pivot_rows,
@@ -244,11 +243,13 @@ class TwoDimensionTable extends PureComponent {
             }));
           }
           return /*#__PURE__*/React.createElement("td", {
-            className: classnames('pivot-cell'),
+            className: classnames('pivot-cell', {
+              'pivot-empty-cell': !total
+            }),
             key: "table-cell-".concat(cellIdx)
           }, /*#__PURE__*/React.createElement("div", {
-            className: "pivot-cells-container"
-          }, total && total.map && total.map((summaryCell, idx) => {
+            className: classnames('pivot-cells-container')
+          }, column_groupby_multiple_numeric_column && (total && total.map && total.map((summaryCell, idx) => {
             const summaryCellColumnKey = summaryCell[2];
             const summaryCellColumn = summary_columns.find(item => item.key === summaryCellColumnKey);
             const displayValue = BaseUtils.getSummaryValueDisplayString(summaryCellColumn, summaryCell[1], summaryMethod);
@@ -266,7 +267,14 @@ class TwoDimensionTable extends PureComponent {
                 'selected-pivot-cell-border': isSelectedCell
               })
             }));
-          }), !total && this.renderEmptyCell(summary_columns, cellIdx)));
+          }), !total && (summary_columns === null || summary_columns === void 0 ? void 0 : summary_columns.map(() => {
+            return /*#__PURE__*/React.createElement("div", {
+              key: "table-cell-".concat(cellIdx),
+              className: classnames('pivot-cell', {
+                'pivot-empty-cell': true
+              })
+            }, /*#__PURE__*/React.createElement("i", null));
+          }))), !column_groupby_multiple_numeric_column && this.renderSingle(total, display_empty, cellIdx, isSelectedCell, isSelectedCellTop, isSelectedCellLeft)));
         }), 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.67-alpha.3",
+  "version": "0.0.67-alpha.4",
   "main": "./dist/index.js",
   "dependencies": {
     "@antv/data-set": "0.11.8",