dtable-statistic 4.2.2 → 4.3.0
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.
- package/es/api/dtable-db-api.js +31 -37
- package/es/calculator/base-calculator.js +49 -99
- package/es/calculator/basic-chart-calculator.js +335 -559
- package/es/calculator/combination-calculator.js +231 -299
- package/es/calculator/compare-bar-calculator.js +184 -281
- package/es/calculator/completeness-calculator.js +203 -288
- package/es/calculator/copy-value.js +18 -18
- package/es/calculator/dashboard-calculator.js +68 -137
- package/es/calculator/heat-map-calculator.js +139 -220
- package/es/calculator/horizontal-bar-calculator.js +64 -93
- package/es/calculator/index.js +53 -69
- package/es/calculator/map-calculator.js +98 -174
- package/es/calculator/mirror-calculator.js +137 -216
- package/es/calculator/number-card-calculator.js +58 -126
- package/es/calculator/pivot-table-calculator.js +750 -792
- package/es/calculator/scatter-calculator.js +72 -140
- package/es/calculator/thread-manager.js +48 -67
- package/es/calculator/trend-calculator.js +107 -191
- package/es/calculator/workers/basic-chart-calculator-worker.js +194 -165
- package/es/calculator/workers/calculator.worker.js +22 -6
- package/es/calculator/workers/card-calculator-worker.js +16 -14
- package/es/calculator/workers/combination-calculator-worker.js +128 -135
- package/es/calculator/workers/compare-bar-chart-calculator-worker.js +80 -96
- package/es/calculator/workers/completeness-calculator-worker.js +56 -49
- package/es/calculator/workers/dashboard-calculator-worker.js +24 -22
- package/es/calculator/workers/mirror-calculator-worker.js +52 -52
- package/es/calculator/workers/pivot-table-calculator-worker.js +247 -230
- package/es/calculator/workers/scatter-calculator-worker.js +34 -32
- package/es/calculator/workers/trend-calculator-worker.js +33 -29
- package/es/calculator/world-map-calculator.js +120 -197
- package/es/components/common-add-tool.js +7 -5
- package/es/components/dialog/chart-addition-edit-dialog.js +67 -77
- package/es/components/dialog/chart-addition-widgets/chart-selector.js +57 -67
- package/es/components/dialog/color-theme-dialog.js +34 -47
- package/es/components/dialog/delete-confirmation-dialog.js +7 -5
- package/es/components/dialog/enlarged-chart-dialog.js +68 -81
- package/es/components/dialog/new-table-dialog.js +62 -80
- package/es/components/dialog/new-view-dialog.js +50 -62
- package/es/components/dialog/rename-view-dialog.js +49 -58
- package/es/components/dialog/statistic-record-dialog/index.js +233 -231
- package/es/components/dialog/statistic-types-dialog/index.js +40 -49
- package/es/components/dialog/table-select-dialog.js +61 -70
- package/es/components/dropdown-menu/statistic-dropdown-menu.js +129 -142
- package/es/components/dtable-popover.js +62 -81
- package/es/components/dtable-search-input.js +89 -99
- package/es/components/dtable-select.js +55 -74
- package/es/components/icon.js +5 -3
- package/es/components/loading.js +1 -1
- package/es/components/modal-portal.js +15 -32
- package/es/components/popover/color-rules/color-rule.js +137 -141
- package/es/components/popover/color-rules/index.js +58 -66
- package/es/components/popover/color-rules/rule-filters/filter.js +124 -124
- package/es/components/popover/color-rules/rule-filters/index.js +50 -58
- package/es/components/popover/color-rules/rule-filters/number-input.js +42 -57
- package/es/components/popover/color-rules-popover.js +117 -121
- package/es/components/popover/color-selector-popover.js +60 -70
- package/es/components/seatable-radio/index.js +2 -2
- package/es/components/select/option-group.js +139 -157
- package/es/components/select/option.js +26 -40
- package/es/components/select/select.js +97 -112
- package/es/components/toast/alert.js +65 -80
- package/es/components/toast/index.js +1 -1
- package/es/components/toast/toast.js +76 -103
- package/es/components/toast/toastManager.js +57 -93
- package/es/components/toast/toaster.js +58 -56
- package/es/constants/color-rules.js +8 -5
- package/es/constants/dtable-select-style.js +44 -48
- package/es/constants/event-types.js +4 -4
- package/es/constants/index.js +328 -242
- package/es/constants/map.js +2 -2
- package/es/constants/model.js +20 -20
- package/es/constants/regions.js +1 -1
- package/es/constants/zIndexes.js +1 -1
- package/es/custom-g2.js +11 -11
- package/es/dashboard.js +343 -333
- package/es/desktop-dashboard.js +217 -224
- package/es/index.js +45 -58
- package/es/locale/index.js +3 -3
- package/es/locale/lang/de.js +1 -1
- package/es/locale/lang/en.js +7 -7
- package/es/locale/lang/fr.js +1 -1
- package/es/locale/lang/zh_CN.js +1 -1
- package/es/mobile-dashboard.js +76 -89
- package/es/model/bar-group.js +34 -44
- package/es/model/bar.js +26 -36
- package/es/model/base-model.js +11 -12
- package/es/model/basic-number-card.js +10 -20
- package/es/model/collaborators.js +10 -11
- package/es/model/combination.js +32 -42
- package/es/model/compare-bar.js +30 -40
- package/es/model/completeness-group.js +19 -29
- package/es/model/completeness.js +14 -24
- package/es/model/custom-bar.js +14 -24
- package/es/model/dashboard.js +9 -19
- package/es/model/generic-model.js +187 -197
- package/es/model/heat-map.js +16 -26
- package/es/model/horizontal-bar-group.js +32 -42
- package/es/model/horizontal-bar.js +26 -36
- package/es/model/index.js +31 -3
- package/es/model/map.js +20 -30
- package/es/model/mirror.js +15 -25
- package/es/model/pie.js +21 -31
- package/es/model/ring.js +23 -33
- package/es/model/scatter.js +11 -21
- package/es/model/statistic-dashboard.js +7 -8
- package/es/model/table.js +19 -29
- package/es/model/trend.js +15 -25
- package/es/model/world-map.js +17 -27
- package/es/service/chart-service.js +69 -65
- package/es/service/dashboard-service.js +421 -419
- package/es/service/map-json.js +112 -132
- package/es/stat-editor/chart-name-editor.js +44 -58
- package/es/stat-editor/index.js +59 -70
- package/es/stat-editor/stat-settings/advance-chart-settings/basic-number-card-settings.js +93 -98
- package/es/stat-editor/stat-settings/advance-chart-settings/combination-settings.js +246 -248
- package/es/stat-editor/stat-settings/advance-chart-settings/dashboard-chart-settings.js +127 -126
- package/es/stat-editor/stat-settings/advance-chart-settings/geo-granularity-settings.js +5 -3
- package/es/stat-editor/stat-settings/advance-chart-settings/heat-map-settings.js +78 -90
- package/es/stat-editor/stat-settings/advance-chart-settings/index.js +146 -150
- package/es/stat-editor/stat-settings/advance-chart-settings/map-settings.js +88 -98
- package/es/stat-editor/stat-settings/advance-chart-settings/mirror-settings.js +100 -118
- package/es/stat-editor/stat-settings/advance-chart-settings/style-setting/combination-style-setting.js +161 -148
- package/es/stat-editor/stat-settings/advance-chart-settings/style-setting/heat-map-settings.js +58 -66
- package/es/stat-editor/stat-settings/advance-chart-settings/style-setting/map-setting.js +58 -60
- package/es/stat-editor/stat-settings/advance-chart-settings/summary-settings.js +152 -148
- package/es/stat-editor/stat-settings/advance-chart-settings/trend-chart-settings.js +101 -105
- package/es/stat-editor/stat-settings/advance-chart-settings/world-map-settings.js +81 -91
- package/es/stat-editor/stat-settings/basic-chart-settings/advance-bar-chart-settings.js +110 -122
- package/es/stat-editor/stat-settings/basic-chart-settings/bar-settings.js +101 -113
- package/es/stat-editor/stat-settings/basic-chart-settings/completeness-chart-settings.js +130 -120
- package/es/stat-editor/stat-settings/basic-chart-settings/custom-bar-settings.js +88 -102
- package/es/stat-editor/stat-settings/basic-chart-settings/groupby-settings.js +88 -102
- package/es/stat-editor/stat-settings/basic-chart-settings/horizontal-axis-group-settings.js +200 -194
- package/es/stat-editor/stat-settings/basic-chart-settings/horizontal-bar-settings.js +98 -110
- package/es/stat-editor/stat-settings/basic-chart-settings/horizontal-group-chart-settings.js +106 -118
- package/es/stat-editor/stat-settings/basic-chart-settings/index.js +212 -223
- package/es/stat-editor/stat-settings/basic-chart-settings/pie-settings.js +109 -119
- package/es/stat-editor/stat-settings/basic-chart-settings/pivot-table-settings.js +329 -319
- package/es/stat-editor/stat-settings/basic-chart-settings/scatter-settings.js +82 -90
- package/es/stat-editor/stat-settings/basic-chart-settings/stack-item-settings.js +58 -65
- package/es/stat-editor/stat-settings/basic-chart-settings/stacks-settings.js +126 -116
- package/es/stat-editor/stat-settings/basic-chart-settings/style-setting/bar-chart-style-setting.js +201 -182
- package/es/stat-editor/stat-settings/basic-chart-settings/style-setting/completeness-style.js +79 -79
- package/es/stat-editor/stat-settings/basic-chart-settings/style-setting/horizontal-bar-chart-style.js +196 -175
- package/es/stat-editor/stat-settings/basic-chart-settings/style-setting/label-font-size-editor.js +35 -50
- package/es/stat-editor/stat-settings/basic-chart-settings/style-setting/pie-chart-style-settings.js +180 -147
- package/es/stat-editor/stat-settings/basic-chart-settings/style-setting/time-compare-style.js +31 -40
- package/es/stat-editor/stat-settings/basic-chart-settings/summary-method-setting.js +56 -67
- package/es/stat-editor/stat-settings/basic-chart-settings/summary-settings.js +60 -69
- package/es/stat-editor/stat-settings/basic-chart-settings/time-comparison-settings.js +165 -158
- package/es/stat-editor/stat-settings/basic-chart-settings/timer-picker.js +61 -74
- package/es/stat-editor/stat-settings/basic-chart-settings/y-axis-group-settings.js +199 -193
- package/es/stat-editor/stat-settings/color-setting/color-group-selector.js +25 -38
- package/es/stat-editor/stat-settings/color-setting/color-picker.js +79 -86
- package/es/stat-editor/stat-settings/color-setting/color-use-type-selector.js +138 -120
- package/es/stat-editor/stat-settings/map/map-level.js +31 -43
- package/es/stat-editor/stat-settings/map/map-province-city.js +82 -83
- package/es/stat-editor/stat-settings/public-setting/axis-label-position-setting.js +48 -50
- package/es/stat-editor/stat-settings/public-setting/base-settings.js +96 -96
- package/es/stat-editor/stat-settings/public-setting/calender.js +69 -75
- package/es/stat-editor/stat-settings/public-setting/column-settings.js +5 -3
- package/es/stat-editor/stat-settings/public-setting/custom-title-setting.js +36 -41
- package/es/stat-editor/stat-settings/public-setting/data-sort-setting.js +37 -41
- package/es/stat-editor/stat-settings/public-setting/ind-toggle-setting.js +25 -38
- package/es/stat-editor/stat-settings/public-setting/min-max-setting.js +40 -52
- package/es/stat-editor/stat-settings/public-setting/numeric-summary-item.js +90 -93
- package/es/stat-editor/stat-settings/public-setting/toggle-setting.js +23 -36
- package/es/stat-editor/stat-settings/public-setting/type-settings/index.js +39 -44
- package/es/stat-list/chart-preview.js +85 -98
- package/es/stat-list/index.js +170 -178
- package/es/stat-view/area-chart.js +282 -274
- package/es/stat-view/bar-chart.js +300 -292
- package/es/stat-view/base-chart.js +58 -52
- package/es/stat-view/basic-number-card.js +115 -168
- package/es/stat-view/combination-chart.js +298 -334
- package/es/stat-view/compare-chart.js +256 -254
- package/es/stat-view/completeness-chart.js +194 -206
- package/es/stat-view/custom-bar.js +221 -223
- package/es/stat-view/dashboard-chart.js +122 -180
- package/es/stat-view/heat-map.js +268 -294
- package/es/stat-view/horizontal-bar-chart.js +291 -281
- package/es/stat-view/index.js +136 -152
- package/es/stat-view/line-chart.js +267 -265
- package/es/stat-view/map.js +246 -246
- package/es/stat-view/mirror.js +141 -152
- package/es/stat-view/pie-chart.js +143 -156
- package/es/stat-view/pivot-table/index.js +113 -118
- package/es/stat-view/pivot-table/one-dimension-table-no-numeric-columns.js +104 -102
- package/es/stat-view/pivot-table/one-dimension-table-with-numeric-columns.js +116 -118
- package/es/stat-view/pivot-table/pivot-table-display-name.js +96 -95
- package/es/stat-view/pivot-table/two-dimension-table.js +238 -229
- package/es/stat-view/ring-chart.js +189 -200
- package/es/stat-view/scatter-chart.js +162 -213
- package/es/stat-view/treemap-chart.js +136 -200
- package/es/stat-view/trend-chart.js +137 -183
- package/es/stat-view/world-map.js +233 -243
- package/es/tabs/index.js +164 -169
- package/es/tabs/tab.js +101 -116
- package/es/utils/basic-chart-utils.js +7 -9
- package/es/utils/cell-format.js +48 -51
- package/es/utils/cell-value.js +1 -1
- package/es/utils/collaborator.js +15 -14
- package/es/utils/color-utils.js +48 -37
- package/es/utils/column-utils.js +47 -33
- package/es/utils/column.js +1 -1
- package/es/utils/common-utils.js +111 -117
- package/es/utils/date-format.js +17 -17
- package/es/utils/export-table-utils.js +507 -396
- package/es/utils/index.js +6 -6
- package/es/utils/map.js +30 -34
- package/es/utils/model.js +3 -5
- package/es/utils/object.js +4 -4
- package/es/utils/pivot-table.js +20 -20
- package/es/utils/row-utils.js +41 -33
- package/es/utils/search.js +18 -20
- package/es/utils/sql-utils.js +132 -98
- package/es/utils/stat-utils.js +303 -320
- package/es/utils/trend-utils.js +57 -67
- package/package.json +2 -2
|
@@ -1,44 +1,35 @@
|
|
|
1
|
-
import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
|
|
2
|
-
import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
|
|
3
|
-
import _createClass from "@babel/runtime/helpers/esm/createClass";
|
|
4
|
-
import _inherits from "@babel/runtime/helpers/esm/inherits";
|
|
5
|
-
import _createSuper from "@babel/runtime/helpers/esm/createSuper";
|
|
6
1
|
import React, { Component, Fragment } from 'react';
|
|
7
2
|
import intl from 'react-intl-universal';
|
|
8
3
|
import { DTableSelect } from '../../../components';
|
|
9
4
|
import NumericSummaryItem from '../public-setting/numeric-summary-item';
|
|
10
5
|
import { STATISTICS_COUNT_SHOW, STAT_TYPE, SUMMARY_METHOD, SUMMARY_TYPE } from '../../../constants';
|
|
11
|
-
|
|
6
|
+
const GROUP_TYPES = {
|
|
12
7
|
COUNT: 'count',
|
|
13
8
|
SINGLE_NUMERIC_COLUMN: 'single_numeric_column',
|
|
14
9
|
MULTIPLE_NUMERIC_COLUMN: 'multiple_numeric_column'
|
|
15
10
|
};
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
_classCallCheck(this, SummarySettings);
|
|
22
|
-
_this = _super.call(this, props);
|
|
23
|
-
_this.getSummaryTypeOptions = function () {
|
|
24
|
-
var summaryTypes = [{
|
|
11
|
+
class SummarySettings extends Component {
|
|
12
|
+
constructor(props) {
|
|
13
|
+
super(props);
|
|
14
|
+
this.getSummaryTypeOptions = () => {
|
|
15
|
+
const summaryTypes = [{
|
|
25
16
|
value: GROUP_TYPES.COUNT,
|
|
26
17
|
label: /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
|
|
27
18
|
className: 'select-module select-module-name'
|
|
28
19
|
}, intl.get(STATISTICS_COUNT_SHOW['count'])), /*#__PURE__*/React.createElement("div", {
|
|
29
20
|
className: "summary-type-explanation"
|
|
30
|
-
},
|
|
21
|
+
}, this.summaryExplanation['count']))
|
|
31
22
|
}, {
|
|
32
23
|
value: GROUP_TYPES.SINGLE_NUMERIC_COLUMN,
|
|
33
24
|
label: /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
|
|
34
25
|
className: 'select-module select-module-name'
|
|
35
26
|
}, intl.get(STATISTICS_COUNT_SHOW['advanced'])), /*#__PURE__*/React.createElement("div", {
|
|
36
27
|
className: "summary-type-explanation"
|
|
37
|
-
},
|
|
28
|
+
}, this.summaryExplanation['advanced']))
|
|
38
29
|
}];
|
|
39
30
|
|
|
40
31
|
// multiple_numeric_column
|
|
41
|
-
if (
|
|
32
|
+
if (this.props.useMultipleSummaryColumns) {
|
|
42
33
|
summaryTypes.push({
|
|
43
34
|
value: GROUP_TYPES.MULTIPLE_NUMERIC_COLUMN,
|
|
44
35
|
label: /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
|
|
@@ -50,10 +41,12 @@ var SummarySettings = /*#__PURE__*/function (_Component) {
|
|
|
50
41
|
}
|
|
51
42
|
return summaryTypes;
|
|
52
43
|
};
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
44
|
+
this.getSummaryExplanation = () => {
|
|
45
|
+
const {
|
|
46
|
+
statItem
|
|
47
|
+
} = this.props;
|
|
48
|
+
const chartType = statItem.type;
|
|
49
|
+
let variable = '';
|
|
57
50
|
if (chartType === 'map') {
|
|
58
51
|
variable = '位置字段';
|
|
59
52
|
}
|
|
@@ -84,8 +77,8 @@ var SummarySettings = /*#__PURE__*/function (_Component) {
|
|
|
84
77
|
})
|
|
85
78
|
};
|
|
86
79
|
};
|
|
87
|
-
|
|
88
|
-
return SUMMARY_METHOD.map(
|
|
80
|
+
this.getSummaryMethodsOptions = () => {
|
|
81
|
+
return SUMMARY_METHOD.map(method => {
|
|
89
82
|
return {
|
|
90
83
|
label: /*#__PURE__*/React.createElement("span", {
|
|
91
84
|
className: "select-option-name"
|
|
@@ -94,83 +87,88 @@ var SummarySettings = /*#__PURE__*/function (_Component) {
|
|
|
94
87
|
};
|
|
95
88
|
});
|
|
96
89
|
};
|
|
97
|
-
|
|
98
|
-
return summaryMethodsOptions.find(
|
|
99
|
-
return m.value === method;
|
|
100
|
-
}) || summaryMethodsOptions[0];
|
|
90
|
+
this.getSelectedMethodOption = (method, summaryMethodsOptions) => {
|
|
91
|
+
return summaryMethodsOptions.find(m => m.value === method) || summaryMethodsOptions[0];
|
|
101
92
|
};
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
93
|
+
this.renderSummaryTypes = () => {
|
|
94
|
+
let {
|
|
95
|
+
label
|
|
96
|
+
} = this.props;
|
|
97
|
+
const selectedSummaryType = this.getSelectedSummaryType();
|
|
105
98
|
return /*#__PURE__*/React.createElement("div", {
|
|
106
99
|
className: "statistic-chart-parameter-item"
|
|
107
100
|
}, /*#__PURE__*/React.createElement("label", null, label), /*#__PURE__*/React.createElement(DTableSelect, {
|
|
108
101
|
classNamePrefix: 'statistic-chart-summary-types',
|
|
109
102
|
value: selectedSummaryType,
|
|
110
|
-
onChange:
|
|
111
|
-
options:
|
|
103
|
+
onChange: this.onChangeSummaryType,
|
|
104
|
+
options: this.summaryTypeOptions
|
|
112
105
|
}));
|
|
113
106
|
};
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
107
|
+
this.getSelectedSummaryType = () => {
|
|
108
|
+
const {
|
|
109
|
+
summaryType = 'count',
|
|
110
|
+
statItem,
|
|
111
|
+
useMultipleSummaryColumns
|
|
112
|
+
} = this.props;
|
|
120
113
|
if (summaryType === SUMMARY_TYPE.COUNT) {
|
|
121
|
-
return
|
|
114
|
+
return this.summaryTypeOptions[0];
|
|
122
115
|
}
|
|
123
116
|
if (statItem.type === STAT_TYPE.COMBINATION_CHART && statItem.y_axis_left_group_by_multiple_numeric_column && useMultipleSummaryColumns) {
|
|
124
|
-
return
|
|
117
|
+
return this.summaryTypeOptions[2];
|
|
125
118
|
}
|
|
126
|
-
return
|
|
119
|
+
return this.summaryTypeOptions[1];
|
|
127
120
|
};
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
121
|
+
this.onChangeSummaryType = option => {
|
|
122
|
+
const type = option.value;
|
|
123
|
+
let {
|
|
124
|
+
summaryType
|
|
125
|
+
} = this.props;
|
|
131
126
|
if (type === summaryType) return;
|
|
132
|
-
|
|
127
|
+
this.props.onChangeSummaryType(type);
|
|
133
128
|
};
|
|
134
|
-
|
|
135
|
-
|
|
129
|
+
this.onSelectSummaryColumn = option => {
|
|
130
|
+
this.props.onSelectSummaryColumn(option.value.key);
|
|
136
131
|
};
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
132
|
+
this.renderNumericColumn = () => {
|
|
133
|
+
const {
|
|
134
|
+
summaryColumn
|
|
135
|
+
} = this.props;
|
|
136
|
+
const selectedColumnOption = this.numericColumnsOptions.find(o => o.value.key === summaryColumn) || null;
|
|
142
137
|
return /*#__PURE__*/React.createElement("div", {
|
|
143
138
|
className: "statistic-chart-parameter-item"
|
|
144
139
|
}, /*#__PURE__*/React.createElement("label", null, intl.get('Numeric_column')), /*#__PURE__*/React.createElement(DTableSelect, {
|
|
145
140
|
value: selectedColumnOption,
|
|
146
|
-
onChange:
|
|
147
|
-
options:
|
|
141
|
+
onChange: this.onSelectSummaryColumn,
|
|
142
|
+
options: this.numericColumnsOptions,
|
|
148
143
|
placeholder: intl.get('Select_a_column'),
|
|
149
|
-
noOptionsMessage:
|
|
144
|
+
noOptionsMessage: () => {
|
|
150
145
|
return /*#__PURE__*/React.createElement("span", null, intl.get('No_options'));
|
|
151
146
|
}
|
|
152
147
|
}));
|
|
153
148
|
};
|
|
154
|
-
|
|
155
|
-
|
|
149
|
+
this.renderSummaryMethod = () => {
|
|
150
|
+
let selectedMethodOption = this.getSelectedMethodOption(this.props.summaryMethod, this.summaryMethodsOptions);
|
|
156
151
|
return /*#__PURE__*/React.createElement("div", {
|
|
157
152
|
className: "statistic-chart-parameter-item"
|
|
158
153
|
}, /*#__PURE__*/React.createElement("label", null, intl.get('Summary_method')), /*#__PURE__*/React.createElement(DTableSelect, {
|
|
159
154
|
value: selectedMethodOption,
|
|
160
|
-
onChange:
|
|
161
|
-
options:
|
|
155
|
+
onChange: this.onSelectSummaryMethod,
|
|
156
|
+
options: this.summaryMethodsOptions
|
|
162
157
|
}));
|
|
163
158
|
};
|
|
164
|
-
|
|
165
|
-
|
|
159
|
+
this.onSelectSummaryMethod = option => {
|
|
160
|
+
this.props.onSelectSummaryMethod(option.value);
|
|
166
161
|
};
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
statItem
|
|
170
|
-
onSelectSummaryColumn
|
|
171
|
-
onSelectSummaryMethod
|
|
172
|
-
|
|
173
|
-
|
|
162
|
+
this.renderNumericSummaryItem = () => {
|
|
163
|
+
const {
|
|
164
|
+
statItem,
|
|
165
|
+
onSelectSummaryColumn,
|
|
166
|
+
onSelectSummaryMethod
|
|
167
|
+
} = this.props;
|
|
168
|
+
const {
|
|
169
|
+
type
|
|
170
|
+
} = statItem;
|
|
171
|
+
let column_key, summary_method;
|
|
174
172
|
if (type === STAT_TYPE.COMBINATION_CHART) {
|
|
175
173
|
column_key = statItem.y_axis_left_summary_column;
|
|
176
174
|
summary_method = statItem.y_axis_left_summary_method;
|
|
@@ -178,45 +176,45 @@ var SummarySettings = /*#__PURE__*/function (_Component) {
|
|
|
178
176
|
return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(NumericSummaryItem, {
|
|
179
177
|
statItem: statItem,
|
|
180
178
|
key: "number-column-".concat(0),
|
|
181
|
-
numericColumnsOptions:
|
|
182
|
-
summaryMethodOptions:
|
|
179
|
+
numericColumnsOptions: this.numericColumnsOptions,
|
|
180
|
+
summaryMethodOptions: this.summaryMethodsOptions,
|
|
183
181
|
index: 0,
|
|
184
182
|
numericColumnItem: {
|
|
185
|
-
column_key
|
|
186
|
-
summary_method
|
|
183
|
+
column_key,
|
|
184
|
+
summary_method
|
|
187
185
|
},
|
|
188
|
-
onChangeColumnOption:
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
onChangeSummaryMethod: function onChangeSummaryMethod(index, option) {
|
|
192
|
-
return onSelectSummaryMethod(option.value);
|
|
193
|
-
}
|
|
194
|
-
}), _this.renderGroupbyNumericColumns(), Array.isArray(_this.numericColumnsOptions) && _this.numericColumnsOptions.length > 0 && /*#__PURE__*/React.createElement("div", {
|
|
186
|
+
onChangeColumnOption: (index, option) => onSelectSummaryColumn(option.value.key),
|
|
187
|
+
onChangeSummaryMethod: (index, option) => onSelectSummaryMethod(option.value)
|
|
188
|
+
}), this.renderGroupbyNumericColumns(), Array.isArray(this.numericColumnsOptions) && this.numericColumnsOptions.length > 0 && /*#__PURE__*/React.createElement("div", {
|
|
195
189
|
className: "statistics-add-number-column",
|
|
196
|
-
onClick:
|
|
190
|
+
onClick: this.onAddNumericColumn
|
|
197
191
|
}, /*#__PURE__*/React.createElement("span", {
|
|
198
192
|
className: "number-column-item dtable-font dtable-icon-add-table"
|
|
199
193
|
}), /*#__PURE__*/React.createElement("span", {
|
|
200
194
|
className: "number-column-item add-number-column-description"
|
|
201
195
|
}, intl.get('Add_new_numeric_column'))));
|
|
202
196
|
};
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
y_axis_left_group_by_numeric_columns
|
|
197
|
+
this.onDeleteNumericColumnItem = index => {
|
|
198
|
+
let {
|
|
199
|
+
y_axis_left_group_by_numeric_columns
|
|
200
|
+
} = this.props.statItem || {};
|
|
206
201
|
y_axis_left_group_by_numeric_columns = y_axis_left_group_by_numeric_columns || [];
|
|
207
|
-
y_axis_left_group_by_numeric_columns =
|
|
202
|
+
y_axis_left_group_by_numeric_columns = [...y_axis_left_group_by_numeric_columns];
|
|
208
203
|
y_axis_left_group_by_numeric_columns.splice(index - 1, 1);
|
|
209
|
-
|
|
210
|
-
y_axis_left_group_by_numeric_columns:
|
|
204
|
+
this.props.updateStatItem(Object.assign({}, this.props.statItem, {
|
|
205
|
+
y_axis_left_group_by_numeric_columns: [...y_axis_left_group_by_numeric_columns]
|
|
211
206
|
}));
|
|
212
207
|
};
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
208
|
+
this.onAddNumericColumn = () => {
|
|
209
|
+
let {
|
|
210
|
+
statItem
|
|
211
|
+
} = this.props;
|
|
212
|
+
let {
|
|
213
|
+
y_axis_left_group_by_numeric_columns
|
|
214
|
+
} = statItem || {};
|
|
215
|
+
let newNumericColumnKey = this.numericColumnsOptions[0].value.key;
|
|
218
216
|
if (Array.isArray(y_axis_left_group_by_numeric_columns)) {
|
|
219
|
-
y_axis_left_group_by_numeric_columns =
|
|
217
|
+
y_axis_left_group_by_numeric_columns = [...y_axis_left_group_by_numeric_columns];
|
|
220
218
|
y_axis_left_group_by_numeric_columns.push({
|
|
221
219
|
column_key: newNumericColumnKey,
|
|
222
220
|
summary_method: SUMMARY_METHOD[0]
|
|
@@ -227,61 +225,68 @@ var SummarySettings = /*#__PURE__*/function (_Component) {
|
|
|
227
225
|
summary_method: SUMMARY_METHOD[0]
|
|
228
226
|
}];
|
|
229
227
|
}
|
|
230
|
-
|
|
231
|
-
y_axis_left_group_by_numeric_columns:
|
|
228
|
+
this.props.updateStatItem(Object.assign({}, this.props.statItem, {
|
|
229
|
+
y_axis_left_group_by_numeric_columns: [...y_axis_left_group_by_numeric_columns]
|
|
232
230
|
}));
|
|
233
231
|
};
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
y_axis_left_group_by_numeric_columns
|
|
232
|
+
this.onChangeNumericSummaryColumn = (index, columnOption) => {
|
|
233
|
+
let {
|
|
234
|
+
y_axis_left_group_by_numeric_columns
|
|
235
|
+
} = this.props.statItem || {};
|
|
237
236
|
y_axis_left_group_by_numeric_columns = y_axis_left_group_by_numeric_columns || [];
|
|
238
|
-
y_axis_left_group_by_numeric_columns =
|
|
239
|
-
|
|
237
|
+
y_axis_left_group_by_numeric_columns = [...y_axis_left_group_by_numeric_columns];
|
|
238
|
+
let selectedItem = y_axis_left_group_by_numeric_columns[index - 1];
|
|
240
239
|
selectedItem = Object.assign({}, selectedItem, {
|
|
241
240
|
column_key: columnOption.value.key
|
|
242
241
|
});
|
|
243
242
|
y_axis_left_group_by_numeric_columns[index - 1] = selectedItem;
|
|
244
|
-
|
|
245
|
-
y_axis_left_group_by_numeric_columns
|
|
243
|
+
this.props.updateStatItem(Object.assign({}, this.props.statItem, {
|
|
244
|
+
y_axis_left_group_by_numeric_columns
|
|
246
245
|
}));
|
|
247
246
|
};
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
y_axis_left_group_by_numeric_columns
|
|
247
|
+
this.onChangeNumericSummaryMethod = (index, option) => {
|
|
248
|
+
let {
|
|
249
|
+
y_axis_left_group_by_numeric_columns
|
|
250
|
+
} = this.props.statItem || {};
|
|
251
251
|
y_axis_left_group_by_numeric_columns = y_axis_left_group_by_numeric_columns || [];
|
|
252
|
-
y_axis_left_group_by_numeric_columns =
|
|
253
|
-
|
|
252
|
+
y_axis_left_group_by_numeric_columns = [...y_axis_left_group_by_numeric_columns];
|
|
253
|
+
let selectedItem = y_axis_left_group_by_numeric_columns[index - 1];
|
|
254
254
|
selectedItem = Object.assign({}, selectedItem, {
|
|
255
255
|
summary_method: option.value
|
|
256
256
|
});
|
|
257
257
|
y_axis_left_group_by_numeric_columns[index - 1] = selectedItem;
|
|
258
|
-
|
|
259
|
-
y_axis_left_group_by_numeric_columns
|
|
258
|
+
this.props.updateStatItem(Object.assign({}, this.props.statItem, {
|
|
259
|
+
y_axis_left_group_by_numeric_columns
|
|
260
260
|
}));
|
|
261
261
|
};
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
262
|
+
this.renderGroupbyNumericColumns = () => {
|
|
263
|
+
const {
|
|
264
|
+
statItem
|
|
265
|
+
} = this.props;
|
|
266
|
+
let {
|
|
267
|
+
y_axis_left_group_by_numeric_columns
|
|
268
|
+
} = statItem;
|
|
265
269
|
if (!y_axis_left_group_by_numeric_columns || !Array.isArray(y_axis_left_group_by_numeric_columns)) return null;
|
|
266
|
-
return y_axis_left_group_by_numeric_columns.map(
|
|
270
|
+
return y_axis_left_group_by_numeric_columns.map((item, index) => {
|
|
267
271
|
return /*#__PURE__*/React.createElement(NumericSummaryItem, {
|
|
268
272
|
statItem: statItem,
|
|
269
273
|
key: "number-column-".concat(index),
|
|
270
|
-
numericColumnsOptions:
|
|
271
|
-
summaryMethodOptions:
|
|
274
|
+
numericColumnsOptions: this.numericColumnsOptions,
|
|
275
|
+
summaryMethodOptions: this.summaryMethodsOptions,
|
|
272
276
|
index: index + 1,
|
|
273
277
|
numericColumnItem: item,
|
|
274
|
-
onDeleteNumericColumnItem:
|
|
275
|
-
onChangeColumnOption:
|
|
276
|
-
onChangeSummaryMethod:
|
|
278
|
+
onDeleteNumericColumnItem: this.onDeleteNumericColumnItem,
|
|
279
|
+
onChangeColumnOption: this.onChangeNumericSummaryColumn,
|
|
280
|
+
onChangeSummaryMethod: this.onChangeNumericSummaryMethod
|
|
277
281
|
});
|
|
278
282
|
});
|
|
279
283
|
};
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
statItem
|
|
283
|
-
summaryType
|
|
284
|
-
useMultipleSummaryColumns
|
|
284
|
+
this.useMultipleSummaryColumns = () => {
|
|
285
|
+
const {
|
|
286
|
+
statItem,
|
|
287
|
+
summaryType,
|
|
288
|
+
useMultipleSummaryColumns
|
|
289
|
+
} = this.props;
|
|
285
290
|
if (statItem.type === STAT_TYPE.COMBINATION_CHART) {
|
|
286
291
|
if (useMultipleSummaryColumns && summaryType === SUMMARY_TYPE.ADVANCED && statItem.y_axis_left_group_by_multiple_numeric_column) {
|
|
287
292
|
return true;
|
|
@@ -289,31 +294,30 @@ var SummarySettings = /*#__PURE__*/function (_Component) {
|
|
|
289
294
|
}
|
|
290
295
|
return false;
|
|
291
296
|
};
|
|
292
|
-
|
|
293
|
-
|
|
294
|
-
|
|
295
|
-
|
|
296
|
-
|
|
297
|
-
|
|
298
|
-
|
|
297
|
+
const {
|
|
298
|
+
numericColumns,
|
|
299
|
+
getColumnsOptions
|
|
300
|
+
} = props;
|
|
301
|
+
this.numericColumnsOptions = getColumnsOptions(numericColumns);
|
|
302
|
+
this.summaryMethodsOptions = this.getSummaryMethodsOptions();
|
|
303
|
+
this.summaryExplanation = this.getSummaryExplanation();
|
|
304
|
+
this.summaryTypeOptions = this.getSummaryTypeOptions();
|
|
299
305
|
}
|
|
300
|
-
|
|
301
|
-
|
|
302
|
-
|
|
303
|
-
|
|
304
|
-
|
|
305
|
-
|
|
306
|
-
|
|
307
|
-
}
|
|
306
|
+
componentWillReceiveProps(nextProps) {
|
|
307
|
+
if (nextProps.selectedTableId !== this.props.selectedTableId) {
|
|
308
|
+
const {
|
|
309
|
+
numericColumns,
|
|
310
|
+
getColumnsOptions
|
|
311
|
+
} = nextProps;
|
|
312
|
+
this.numericColumnsOptions = getColumnsOptions(numericColumns);
|
|
308
313
|
}
|
|
309
|
-
}
|
|
310
|
-
|
|
311
|
-
|
|
312
|
-
|
|
313
|
-
|
|
314
|
-
|
|
315
|
-
|
|
316
|
-
}
|
|
317
|
-
|
|
318
|
-
}(Component);
|
|
314
|
+
}
|
|
315
|
+
render() {
|
|
316
|
+
const {
|
|
317
|
+
summaryType
|
|
318
|
+
} = this.props;
|
|
319
|
+
const _useMultipleSummaryColumns = this.useMultipleSummaryColumns();
|
|
320
|
+
return /*#__PURE__*/React.createElement(Fragment, null, this.renderSummaryTypes(), !_useMultipleSummaryColumns && summaryType === SUMMARY_TYPE.ADVANCED && /*#__PURE__*/React.createElement(Fragment, null, this.renderNumericColumn(), this.renderSummaryMethod()), _useMultipleSummaryColumns && this.renderNumericSummaryItem());
|
|
321
|
+
}
|
|
322
|
+
}
|
|
319
323
|
export default SummarySettings;
|