sea-chart 0.0.68-alpha.13 → 0.0.68-alpha.15
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.
|
@@ -653,7 +653,8 @@ function getTotal(summary_column, summary_type, summary_method) {
|
|
|
653
653
|
let value = r[summary_column_key];
|
|
654
654
|
if (FORMULA_COLUMN_TYPES_MAP[summary_column_type]) {
|
|
655
655
|
let formulaRow = formula_rows[r._id] || {};
|
|
656
|
-
value = formulaRow[summary_column_key];
|
|
656
|
+
value = formulaRow[summary_column_key] || '';
|
|
657
|
+
value = Array.isArray(value) && value.length !== 0 ? value[0] : '';
|
|
657
658
|
}
|
|
658
659
|
if (!value) return;
|
|
659
660
|
if (value.indexOf('T') !== -1) {
|
|
@@ -83,6 +83,7 @@ const Wrapper = _ref => {
|
|
|
83
83
|
if (!result) return null;
|
|
84
84
|
return /*#__PURE__*/React.createElement(Table, Object.assign({}, baseProps, {
|
|
85
85
|
summaryColumns: summary_columns,
|
|
86
|
+
columnGroupbyColumn: columnGroupbyColumn,
|
|
86
87
|
summaryMethod: summary_method,
|
|
87
88
|
chartTableColumns: chartTableColumns,
|
|
88
89
|
isCalculateByView: isCalculateByView
|
|
@@ -11,11 +11,8 @@ class Table extends PureComponent {
|
|
|
11
11
|
const {
|
|
12
12
|
groupbyColumn,
|
|
13
13
|
result,
|
|
14
|
-
|
|
14
|
+
columnGroupbyColumn
|
|
15
15
|
} = this.props;
|
|
16
|
-
const {
|
|
17
|
-
column_groupby_column_key
|
|
18
|
-
} = chart.config;
|
|
19
16
|
const {
|
|
20
17
|
pivot_columns
|
|
21
18
|
} = result;
|
|
@@ -23,7 +20,7 @@ class Table extends PureComponent {
|
|
|
23
20
|
if (Array.isArray(pivot_columns) && pivot_columns.length > 100) {
|
|
24
21
|
return /*#__PURE__*/React.createElement("div", null, intl.get('There_are_too_many_statistics_entries_to_display'));
|
|
25
22
|
}
|
|
26
|
-
if (
|
|
23
|
+
if (columnGroupbyColumn) {
|
|
27
24
|
return /*#__PURE__*/React.createElement(TwoDimensionTable, this.props);
|
|
28
25
|
}
|
|
29
26
|
if (!Array.isArray(pivot_columns)) return null;
|