sea-chart 0.0.68-alpha.1 → 0.0.68-alpha.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -84,7 +84,8 @@ const Wrapper = _ref => {
|
|
|
84
84
|
return /*#__PURE__*/React.createElement(Table, Object.assign({}, baseProps, {
|
|
85
85
|
summaryColumns: summary_columns,
|
|
86
86
|
summaryMethod: summary_method,
|
|
87
|
-
chartTableColumns: chartTableColumns
|
|
87
|
+
chartTableColumns: chartTableColumns,
|
|
88
|
+
isCalculateByView: isCalculateByView
|
|
88
89
|
}));
|
|
89
90
|
}
|
|
90
91
|
case CHART_TYPE.COMBINATION:
|
|
@@ -126,7 +126,7 @@ class TwoDimensionTable extends PureComponent {
|
|
|
126
126
|
total
|
|
127
127
|
}, selectedCell);
|
|
128
128
|
};
|
|
129
|
-
this.
|
|
129
|
+
this.renderByView = (total, display_empty, cellIdx, isSelectedCell, isSelectedCellTop, isSelectedCellLeft) => {
|
|
130
130
|
const isValidDisplayValue = BaseUtils.isValidValue(total, display_empty);
|
|
131
131
|
return /*#__PURE__*/React.createElement("div", {
|
|
132
132
|
key: "table-cell-".concat(cellIdx),
|
|
@@ -149,7 +149,8 @@ class TwoDimensionTable extends PureComponent {
|
|
|
149
149
|
selectedCell,
|
|
150
150
|
summaryColumn,
|
|
151
151
|
summaryMethod,
|
|
152
|
-
chart
|
|
152
|
+
chart,
|
|
153
|
+
isCalculateByView
|
|
153
154
|
} = this.props;
|
|
154
155
|
const {
|
|
155
156
|
display_total = true,
|
|
@@ -251,7 +252,7 @@ class TwoDimensionTable extends PureComponent {
|
|
|
251
252
|
key: "table-cell-".concat(cellIdx)
|
|
252
253
|
}, /*#__PURE__*/React.createElement("div", {
|
|
253
254
|
className: classnames('pivot-cells-container')
|
|
254
|
-
},
|
|
255
|
+
}, isCalculateByView && (total && total.map && total.map((summaryCell, idx) => {
|
|
255
256
|
const summaryCellColumnKey = summaryCell[2];
|
|
256
257
|
const summaryCellColumn = summaryColumns.find(item => item.key === summaryCellColumnKey);
|
|
257
258
|
const displayValue = BaseUtils.getSummaryValueDisplayString(summaryCellColumn, summaryCell[1], summaryMethod);
|
|
@@ -276,7 +277,7 @@ class TwoDimensionTable extends PureComponent {
|
|
|
276
277
|
'pivot-empty-cell': true
|
|
277
278
|
})
|
|
278
279
|
}, /*#__PURE__*/React.createElement("i", null));
|
|
279
|
-
}))), !
|
|
280
|
+
}))), !isCalculateByView && this.renderByView(total, display_empty, cellIdx, isSelectedCell, isSelectedCellTop, isSelectedCellLeft)));
|
|
280
281
|
}), display_total && /*#__PURE__*/React.createElement("td", {
|
|
281
282
|
className: classnames('pivot-cell', {
|
|
282
283
|
'pivot-empty-cell': !isValidSummaryDisplayValue,
|