dtable-statistic 4.2.1 → 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,7 +1,3 @@
|
|
|
1
|
-
import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
|
|
2
|
-
import _createClass from "@babel/runtime/helpers/esm/createClass";
|
|
3
|
-
import _inherits from "@babel/runtime/helpers/esm/inherits";
|
|
4
|
-
import _createSuper from "@babel/runtime/helpers/esm/createSuper";
|
|
5
1
|
import React, { Component, Fragment } from 'react';
|
|
6
2
|
import { Input } from 'reactstrap';
|
|
7
3
|
import intl from 'react-intl-universal';
|
|
@@ -13,23 +9,19 @@ import CombinationStyleSettings from './style-setting/combination-style-setting'
|
|
|
13
9
|
import ToggleSetting from '../public-setting/toggle-setting';
|
|
14
10
|
import SummarySettings from './summary-settings';
|
|
15
11
|
import { BASIC_CHART_COLUMN_LIST, DATE_GRANULARITY, GEOLOCATION_GRANULARITY, STATISTICS_COUNT_SHOW, SUMMARY_METHOD, SUMMARY_TYPE } from '../../../constants';
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
12
|
+
const DATE_COLUMN_OPTIONS = ['date', 'mtime', 'ctime'];
|
|
13
|
+
const DATE_GRANULARITY_LIST = [DATE_GRANULARITY.DAY, DATE_GRANULARITY.WEEK, DATE_GRANULARITY.MONTH, DATE_GRANULARITY.QUARTER, DATE_GRANULARITY.YEAR];
|
|
14
|
+
const GEOLOCATION_GRANULARITY_LIST = [GEOLOCATION_GRANULARITY.PROVINCE, GEOLOCATION_GRANULARITY.CITY, GEOLOCATION_GRANULARITY.DISTRICT];
|
|
15
|
+
const GROUP_TYPES = {
|
|
20
16
|
COUNT: 'count',
|
|
21
17
|
SINGLE_NUMERIC_COLUMN: 'single_numeric_column',
|
|
22
18
|
MULTIPLE_NUMERIC_COLUMN: 'multiple_numeric_column'
|
|
23
19
|
};
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
_classCallCheck(this, CombinationSettings);
|
|
30
|
-
_this = _super.call(this, props);
|
|
31
|
-
_this.getGranularityOptions = function (options) {
|
|
32
|
-
return options.map(function (g) {
|
|
20
|
+
class CombinationSettings extends Component {
|
|
21
|
+
constructor(props) {
|
|
22
|
+
super(props);
|
|
23
|
+
this.getGranularityOptions = options => {
|
|
24
|
+
return options.map(g => {
|
|
33
25
|
return {
|
|
34
26
|
value: g,
|
|
35
27
|
label: /*#__PURE__*/React.createElement("span", {
|
|
@@ -38,90 +30,88 @@ var CombinationSettings = /*#__PURE__*/function (_Component) {
|
|
|
38
30
|
};
|
|
39
31
|
});
|
|
40
32
|
};
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
33
|
+
this.renderGroupbyDateGranularity = () => {
|
|
34
|
+
const {
|
|
35
|
+
statItem
|
|
36
|
+
} = this.props;
|
|
37
|
+
let selectedDateGranularity = this.getSelectedDateGranularity(statItem.x_axis_date_granularity);
|
|
44
38
|
return /*#__PURE__*/React.createElement("div", {
|
|
45
39
|
className: "mt-1"
|
|
46
40
|
}, /*#__PURE__*/React.createElement(DTableSelect, {
|
|
47
41
|
value: selectedDateGranularity,
|
|
48
|
-
onChange:
|
|
49
|
-
options:
|
|
42
|
+
onChange: this.onSelectGroupbyDateGranularity,
|
|
43
|
+
options: this.dateGranularityOptions
|
|
50
44
|
}));
|
|
51
45
|
};
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
if (newDateGranularity ===
|
|
55
|
-
|
|
46
|
+
this.onSelectGroupbyDateGranularity = option => {
|
|
47
|
+
let newDateGranularity = option.value;
|
|
48
|
+
if (newDateGranularity === this.props.statItem.x_axis_date_granularity) return;
|
|
49
|
+
this.props.updateStatItem(Object.assign({}, this.props.statItem, {
|
|
56
50
|
x_axis_date_granularity: newDateGranularity
|
|
57
51
|
}));
|
|
58
52
|
};
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
53
|
+
this.renderGroupbyGeolocationGranularity = () => {
|
|
54
|
+
const {
|
|
55
|
+
statItem
|
|
56
|
+
} = this.props;
|
|
57
|
+
let selectedGeolocationGranularity = this.getSelectedGeolocationGranularity(statItem.x_axis_geolocation_granularity);
|
|
58
|
+
if (this.geolocationGranularityOptions.length === 0) return null;
|
|
63
59
|
return /*#__PURE__*/React.createElement("div", {
|
|
64
60
|
className: "mt-1"
|
|
65
61
|
}, /*#__PURE__*/React.createElement(DTableSelect, {
|
|
66
62
|
value: selectedGeolocationGranularity,
|
|
67
|
-
onChange:
|
|
68
|
-
options:
|
|
63
|
+
onChange: this.onSelectGroupbyGeolocationGranularity,
|
|
64
|
+
options: this.geolocationGranularityOptions
|
|
69
65
|
}));
|
|
70
66
|
};
|
|
71
|
-
|
|
72
|
-
return
|
|
73
|
-
return g.value === geolocationGranularity;
|
|
74
|
-
}) || _this.geolocationGranularityOptions[2];
|
|
67
|
+
this.getSelectedGeolocationGranularity = geolocationGranularity => {
|
|
68
|
+
return this.geolocationGranularityOptions.find(g => g.value === geolocationGranularity) || this.geolocationGranularityOptions[2];
|
|
75
69
|
};
|
|
76
|
-
|
|
77
|
-
return
|
|
78
|
-
return g.value === dateGranularity;
|
|
79
|
-
}) || _this.dateGranularityOptions[2];
|
|
70
|
+
this.getSelectedDateGranularity = dateGranularity => {
|
|
71
|
+
return this.dateGranularityOptions.find(g => g.value === dateGranularity) || this.dateGranularityOptions[2];
|
|
80
72
|
};
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
if (newGeolocationGranularity ===
|
|
84
|
-
|
|
73
|
+
this.onSelectGroupbyGeolocationGranularity = geolocationGranularityOption => {
|
|
74
|
+
let newGeolocationGranularity = geolocationGranularityOption.value;
|
|
75
|
+
if (newGeolocationGranularity === this.props.statItem.x_axis_geolocation_granularity) return;
|
|
76
|
+
this.props.updateStatItem(Object.assign({}, this.props.statItem, {
|
|
85
77
|
x_axis_geolocation_granularity: newGeolocationGranularity
|
|
86
78
|
}));
|
|
87
79
|
};
|
|
88
|
-
|
|
80
|
+
this.getAvailableColumns = columns => {
|
|
89
81
|
if (!columns || !Array.isArray(columns)) return [];
|
|
90
|
-
return columns.filter(
|
|
91
|
-
return BASIC_CHART_COLUMN_LIST.includes(c.type);
|
|
92
|
-
});
|
|
82
|
+
return columns.filter(c => BASIC_CHART_COLUMN_LIST.includes(c.type));
|
|
93
83
|
};
|
|
94
|
-
|
|
95
|
-
return
|
|
96
|
-
return option.value.key === _this.props.statItem.x_axis_column_key;
|
|
97
|
-
});
|
|
84
|
+
this.getSelectedStatColumnOption = () => {
|
|
85
|
+
return this.columnsOptions.find(option => option.value.key === this.props.statItem.x_axis_column_key);
|
|
98
86
|
};
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
getTableById
|
|
102
|
-
selectedTableId
|
|
103
|
-
statItem
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
87
|
+
this.onSelectStatColumn = option => {
|
|
88
|
+
const {
|
|
89
|
+
getTableById,
|
|
90
|
+
selectedTableId,
|
|
91
|
+
statItem
|
|
92
|
+
} = this.props;
|
|
93
|
+
let {
|
|
94
|
+
x_axis_column_key,
|
|
95
|
+
x_axis_geolocation_granularity,
|
|
96
|
+
x_axis_date_granularity
|
|
97
|
+
} = this.props.statItem;
|
|
98
|
+
const new_column = option.value.key;
|
|
109
99
|
if (x_axis_column_key === new_column) return;
|
|
110
|
-
|
|
111
|
-
type
|
|
112
|
-
key
|
|
100
|
+
const {
|
|
101
|
+
type,
|
|
102
|
+
key
|
|
103
|
+
} = option.value;
|
|
113
104
|
if (type === CellType.DATE) {
|
|
114
|
-
x_axis_date_granularity =
|
|
105
|
+
x_axis_date_granularity = this.dateGranularityOptions[2].value;
|
|
115
106
|
} else {
|
|
116
107
|
x_axis_date_granularity = null;
|
|
117
108
|
}
|
|
118
109
|
if (type === CellType.GEOLOCATION) {
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
geo_format = _ref.geo_format;
|
|
110
|
+
const selectedTable = getTableById(selectedTableId);
|
|
111
|
+
const geoColumn = selectedTable.columns.find(column => column.key === key) || {};
|
|
112
|
+
const {
|
|
113
|
+
geo_format
|
|
114
|
+
} = geoColumn.data || {};
|
|
125
115
|
if (geo_format === 'province') {
|
|
126
116
|
x_axis_geolocation_granularity = 'province';
|
|
127
117
|
} else if (geo_format === 'province_city') {
|
|
@@ -134,14 +124,14 @@ var CombinationSettings = /*#__PURE__*/function (_Component) {
|
|
|
134
124
|
} else {
|
|
135
125
|
x_axis_geolocation_granularity = null;
|
|
136
126
|
}
|
|
137
|
-
|
|
127
|
+
this.props.updateStatItem(Object.assign({}, statItem, {
|
|
138
128
|
x_axis_column_key: new_column,
|
|
139
|
-
x_axis_date_granularity
|
|
140
|
-
x_axis_geolocation_granularity
|
|
129
|
+
x_axis_date_granularity,
|
|
130
|
+
x_axis_geolocation_granularity
|
|
141
131
|
}));
|
|
142
132
|
};
|
|
143
|
-
|
|
144
|
-
return SUMMARY_METHOD.map(
|
|
133
|
+
this.getSummaryMethodsOptions = () => {
|
|
134
|
+
return SUMMARY_METHOD.map(method => {
|
|
145
135
|
return {
|
|
146
136
|
label: /*#__PURE__*/React.createElement("span", {
|
|
147
137
|
className: "select-option-name"
|
|
@@ -150,39 +140,45 @@ var CombinationSettings = /*#__PURE__*/function (_Component) {
|
|
|
150
140
|
};
|
|
151
141
|
});
|
|
152
142
|
};
|
|
153
|
-
|
|
154
|
-
return summaryMethodsOptions.find(
|
|
155
|
-
return m.value === method;
|
|
156
|
-
}) || summaryMethodsOptions[0];
|
|
143
|
+
this.getSelectedMethodOption = (method, summaryMethodsOptions) => {
|
|
144
|
+
return summaryMethodsOptions.find(m => m.value === method) || summaryMethodsOptions[0];
|
|
157
145
|
};
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
name:
|
|
146
|
+
this.onSaveName = event => {
|
|
147
|
+
this.props.updateStatItem(Object.assign({}, this.props.statItem, {
|
|
148
|
+
name: this.state.statName
|
|
161
149
|
}));
|
|
162
150
|
};
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
151
|
+
this.getStyleSetting = () => {
|
|
152
|
+
const {
|
|
153
|
+
statItem
|
|
154
|
+
} = this.props;
|
|
155
|
+
const {
|
|
156
|
+
statName
|
|
157
|
+
} = this.state;
|
|
166
158
|
return /*#__PURE__*/React.createElement(Fragment, null, /*#__PURE__*/React.createElement("div", {
|
|
167
159
|
className: "statistic-chart-parameter-item"
|
|
168
160
|
}, /*#__PURE__*/React.createElement("label", null, intl.get('X-axis')), /*#__PURE__*/React.createElement(Input, {
|
|
169
161
|
type: "text",
|
|
170
|
-
onBlur:
|
|
171
|
-
onChange:
|
|
162
|
+
onBlur: this.onSaveName,
|
|
163
|
+
onChange: this.onChangeName,
|
|
172
164
|
value: statName,
|
|
173
165
|
placeholder: statItem.name
|
|
174
166
|
})));
|
|
175
167
|
};
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
168
|
+
this.onChangeSummaryType = (option, position) => {
|
|
169
|
+
const {
|
|
170
|
+
statItem
|
|
171
|
+
} = this.props;
|
|
172
|
+
let {
|
|
173
|
+
y_axis_right_summary_type,
|
|
174
|
+
y_axis_left_summary_type,
|
|
175
|
+
y_axis_right_summary_column,
|
|
176
|
+
y_axis_left_summary_column,
|
|
177
|
+
y_axis_left_group_by_multiple_numeric_column,
|
|
178
|
+
y_axis_left_summary_method,
|
|
179
|
+
y_axis_left_group_by_numeric_columns
|
|
180
|
+
} = statItem;
|
|
181
|
+
let newSummaryType = option === GROUP_TYPES.COUNT ? SUMMARY_TYPE.COUNT : SUMMARY_TYPE.ADVANCED;
|
|
186
182
|
if (position === 'left') {
|
|
187
183
|
if (newSummaryType === SUMMARY_TYPE.COUNT && y_axis_left_summary_type === SUMMARY_TYPE.COUNT) return;
|
|
188
184
|
if (option === GROUP_TYPES.SINGLE_NUMERIC_COLUMN && !y_axis_left_group_by_multiple_numeric_column && y_axis_left_summary_type !== SUMMARY_TYPE.COUNT) return;
|
|
@@ -205,43 +201,47 @@ var CombinationSettings = /*#__PURE__*/function (_Component) {
|
|
|
205
201
|
y_axis_left_group_by_multiple_numeric_column = true;
|
|
206
202
|
y_axis_left_group_by_numeric_columns = [];
|
|
207
203
|
}
|
|
208
|
-
|
|
204
|
+
this.props.updateStatItem(Object.assign({}, statItem, {
|
|
209
205
|
y_axis_left_summary_type: newSummaryType,
|
|
210
|
-
y_axis_left_summary_column
|
|
211
|
-
y_axis_left_summary_method
|
|
212
|
-
y_axis_left_group_by_multiple_numeric_column
|
|
213
|
-
y_axis_left_group_by_numeric_columns
|
|
206
|
+
y_axis_left_summary_column,
|
|
207
|
+
y_axis_left_summary_method,
|
|
208
|
+
y_axis_left_group_by_multiple_numeric_column,
|
|
209
|
+
y_axis_left_group_by_numeric_columns
|
|
214
210
|
}));
|
|
215
211
|
return;
|
|
216
212
|
}
|
|
217
213
|
if (y_axis_right_summary_type === newSummaryType) return;
|
|
218
214
|
y_axis_right_summary_type = newSummaryType;
|
|
219
|
-
|
|
215
|
+
let y_axis_right_summary_method = SUMMARY_METHOD[0];
|
|
220
216
|
if (newSummaryType === SUMMARY_TYPE.COUNT) {
|
|
221
217
|
y_axis_right_summary_column = null;
|
|
222
218
|
y_axis_right_summary_method = null;
|
|
223
219
|
}
|
|
224
|
-
|
|
220
|
+
this.props.updateStatItem(Object.assign({}, statItem, {
|
|
225
221
|
y_axis_right_summary_type: newSummaryType,
|
|
226
|
-
y_axis_right_summary_column
|
|
227
|
-
y_axis_right_summary_method
|
|
222
|
+
y_axis_right_summary_column,
|
|
223
|
+
y_axis_right_summary_method
|
|
228
224
|
}));
|
|
229
225
|
};
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
226
|
+
this.onSelectSummaryColumn = (option, position) => {
|
|
227
|
+
const {
|
|
228
|
+
statItem
|
|
229
|
+
} = this.props;
|
|
230
|
+
let {
|
|
231
|
+
y_axis_right_summary_column,
|
|
232
|
+
y_axis_left_summary_column,
|
|
233
|
+
y_axis_left_summary_method,
|
|
234
|
+
y_axis_right_summary_method
|
|
235
|
+
} = statItem;
|
|
236
|
+
const newSummaryColumnKey = option;
|
|
237
237
|
if (position === 'left') {
|
|
238
238
|
if (y_axis_left_summary_column === newSummaryColumnKey) return;
|
|
239
239
|
if (!y_axis_left_summary_method) {
|
|
240
240
|
y_axis_left_summary_method = 'Sum';
|
|
241
241
|
}
|
|
242
|
-
|
|
242
|
+
this.props.updateStatItem(Object.assign({}, statItem, {
|
|
243
243
|
y_axis_left_summary_column: newSummaryColumnKey,
|
|
244
|
-
y_axis_left_summary_method
|
|
244
|
+
y_axis_left_summary_method
|
|
245
245
|
}));
|
|
246
246
|
return;
|
|
247
247
|
}
|
|
@@ -249,168 +249,166 @@ var CombinationSettings = /*#__PURE__*/function (_Component) {
|
|
|
249
249
|
if (!y_axis_right_summary_method) {
|
|
250
250
|
y_axis_right_summary_method = 'Sum';
|
|
251
251
|
}
|
|
252
|
-
|
|
252
|
+
this.props.updateStatItem(Object.assign({}, statItem, {
|
|
253
253
|
y_axis_right_summary_column: newSummaryColumnKey,
|
|
254
|
-
y_axis_right_summary_method
|
|
254
|
+
y_axis_right_summary_method
|
|
255
255
|
}));
|
|
256
256
|
};
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
257
|
+
this.onSelectSummaryMethod = (option, position) => {
|
|
258
|
+
const {
|
|
259
|
+
statItem
|
|
260
|
+
} = this.props;
|
|
261
|
+
const {
|
|
262
|
+
y_axis_right_summary_method,
|
|
263
|
+
y_axis_left_summary_method
|
|
264
|
+
} = statItem;
|
|
265
|
+
const newSummaryColumnMethod = option;
|
|
262
266
|
if (position === 'left') {
|
|
263
267
|
if (y_axis_left_summary_method !== newSummaryColumnMethod) {
|
|
264
|
-
|
|
268
|
+
this.props.updateStatItem(Object.assign({}, statItem, {
|
|
265
269
|
y_axis_left_summary_method: newSummaryColumnMethod
|
|
266
270
|
}));
|
|
267
271
|
}
|
|
268
272
|
return;
|
|
269
273
|
}
|
|
270
274
|
if (y_axis_right_summary_method !== newSummaryColumnMethod) {
|
|
271
|
-
|
|
275
|
+
this.props.updateStatItem(Object.assign({}, statItem, {
|
|
272
276
|
y_axis_right_summary_method: newSummaryColumnMethod
|
|
273
277
|
}));
|
|
274
278
|
}
|
|
275
279
|
};
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
|
|
280
|
-
|
|
280
|
+
this.onToggleIncludeEmpty = () => {
|
|
281
|
+
let {
|
|
282
|
+
statItem
|
|
283
|
+
} = this.props;
|
|
284
|
+
let {
|
|
285
|
+
x_axis_include_empty
|
|
286
|
+
} = statItem || {};
|
|
287
|
+
let updated = {
|
|
281
288
|
x_axis_include_empty: !x_axis_include_empty
|
|
282
289
|
};
|
|
283
|
-
|
|
290
|
+
this.props.updateStatItem(Object.assign({}, statItem, updated));
|
|
284
291
|
};
|
|
285
|
-
|
|
286
|
-
|
|
287
|
-
|
|
288
|
-
|
|
292
|
+
this.renderIncludeEmpty = () => {
|
|
293
|
+
const {
|
|
294
|
+
statItem
|
|
295
|
+
} = this.props;
|
|
296
|
+
let {
|
|
297
|
+
x_axis_include_empty
|
|
298
|
+
} = statItem || {};
|
|
289
299
|
return /*#__PURE__*/React.createElement("div", {
|
|
290
300
|
className: "mt-1"
|
|
291
301
|
}, /*#__PURE__*/React.createElement(ToggleSetting, {
|
|
292
302
|
isChecked: x_axis_include_empty || false,
|
|
293
|
-
handleToggleChange:
|
|
303
|
+
handleToggleChange: this.onToggleIncludeEmpty,
|
|
294
304
|
label: intl.get('Including_empty_cell')
|
|
295
305
|
}));
|
|
296
306
|
};
|
|
297
|
-
|
|
298
|
-
|
|
299
|
-
|
|
300
|
-
|
|
301
|
-
|
|
302
|
-
|
|
303
|
-
|
|
304
|
-
|
|
305
|
-
|
|
307
|
+
const {
|
|
308
|
+
getColumnsOptions,
|
|
309
|
+
statItem: _statItem,
|
|
310
|
+
columns: _columns
|
|
311
|
+
} = props;
|
|
312
|
+
const availableColumns = this.getAvailableColumns(_columns);
|
|
313
|
+
this.columnsOptions = getColumnsOptions(availableColumns);
|
|
314
|
+
this.summaryMethodsOptions = this.getSummaryMethodsOptions();
|
|
315
|
+
this.dateGranularityOptions = this.getGranularityOptions(DATE_GRANULARITY_LIST);
|
|
316
|
+
this.geolocationGranularityOptions = this.getGranularityOptions(GEOLOCATION_GRANULARITY_LIST);
|
|
317
|
+
this.state = {
|
|
306
318
|
statName: _statItem.name
|
|
307
319
|
};
|
|
308
|
-
return _this;
|
|
309
320
|
}
|
|
310
|
-
|
|
311
|
-
|
|
312
|
-
|
|
313
|
-
|
|
314
|
-
|
|
315
|
-
|
|
316
|
-
|
|
317
|
-
|
|
318
|
-
}
|
|
321
|
+
UNSAFE_componentWillReceiveProps(nextProps) {
|
|
322
|
+
if (nextProps.selectedTableId !== this.props.selectedTableId) {
|
|
323
|
+
const {
|
|
324
|
+
getColumnsOptions,
|
|
325
|
+
columns
|
|
326
|
+
} = nextProps;
|
|
327
|
+
const availableColumns = this.getAvailableColumns(columns);
|
|
328
|
+
this.columnsOptions = getColumnsOptions(availableColumns);
|
|
319
329
|
}
|
|
320
|
-
}
|
|
321
|
-
|
|
322
|
-
|
|
323
|
-
|
|
324
|
-
|
|
325
|
-
|
|
326
|
-
|
|
327
|
-
|
|
328
|
-
|
|
329
|
-
|
|
330
|
-
|
|
331
|
-
|
|
332
|
-
|
|
333
|
-
|
|
334
|
-
|
|
335
|
-
|
|
336
|
-
|
|
337
|
-
|
|
338
|
-
|
|
339
|
-
|
|
340
|
-
|
|
341
|
-
|
|
342
|
-
|
|
343
|
-
|
|
344
|
-
|
|
345
|
-
|
|
346
|
-
|
|
347
|
-
|
|
348
|
-
|
|
349
|
-
|
|
350
|
-
eventBus: eventBus,
|
|
351
|
-
updateStatItem: updateStatItem
|
|
352
|
-
});
|
|
353
|
-
}
|
|
354
|
-
return /*#__PURE__*/React.createElement(Fragment, null, /*#__PURE__*/React.createElement(BaseSettings, {
|
|
355
|
-
statItem: statItem,
|
|
330
|
+
}
|
|
331
|
+
render() {
|
|
332
|
+
const selectedColumnOption = this.getSelectedStatColumnOption();
|
|
333
|
+
const {
|
|
334
|
+
getTables,
|
|
335
|
+
getViews,
|
|
336
|
+
getTableById,
|
|
337
|
+
statItem,
|
|
338
|
+
eventBus,
|
|
339
|
+
updateStatItem,
|
|
340
|
+
selectedTableId,
|
|
341
|
+
settingType,
|
|
342
|
+
getColumnsOptions
|
|
343
|
+
} = this.props;
|
|
344
|
+
const {
|
|
345
|
+
x_axis_column_key,
|
|
346
|
+
y_axis_left_summary_type,
|
|
347
|
+
y_axis_right_summary_type,
|
|
348
|
+
y_axis_left_summary_method,
|
|
349
|
+
y_axis_right_summary_method,
|
|
350
|
+
y_axis_left_summary_column,
|
|
351
|
+
y_axis_right_summary_column
|
|
352
|
+
} = statItem;
|
|
353
|
+
const selectedTable = getTableById(selectedTableId);
|
|
354
|
+
let groupbyColumn = x_axis_column_key && TableUtils.getTableColumnByKey(selectedTable, x_axis_column_key);
|
|
355
|
+
let {
|
|
356
|
+
type: groupbyColumnType
|
|
357
|
+
} = groupbyColumn || {};
|
|
358
|
+
if (settingType === 'style') {
|
|
359
|
+
return /*#__PURE__*/React.createElement(CombinationStyleSettings, {
|
|
356
360
|
selectedTableId: selectedTableId,
|
|
357
|
-
selectedViewId: statItem.view_id,
|
|
358
|
-
getTables: getTables,
|
|
359
|
-
getViews: getViews,
|
|
360
|
-
getTableById: this.props.getTableById,
|
|
361
|
-
getConvertedChart: this.props.getConvertedChart,
|
|
362
|
-
updateStatItem: updateStatItem
|
|
363
|
-
}), /*#__PURE__*/React.createElement("div", {
|
|
364
|
-
className: "statistic-chart-parameter-divider"
|
|
365
|
-
}), /*#__PURE__*/React.createElement("div", {
|
|
366
|
-
className: "statistic-chart-parameter-item"
|
|
367
|
-
}, /*#__PURE__*/React.createElement("label", null, intl.get('X-axis')), /*#__PURE__*/React.createElement(ColumnSettings, {
|
|
368
|
-
columnsOptions: this.columnsOptions,
|
|
369
|
-
selectedColumnOption: selectedColumnOption,
|
|
370
|
-
onChangeSelectedColumn: this.onSelectStatColumn
|
|
371
|
-
}), DATE_COLUMN_OPTIONS.includes(groupbyColumnType) && this.renderGroupbyDateGranularity(), groupbyColumnType === CellType.GEOLOCATION && this.renderGroupbyGeolocationGranularity(), this.renderIncludeEmpty()), /*#__PURE__*/React.createElement(SummarySettings, {
|
|
372
|
-
useMultipleSummaryColumns: true,
|
|
373
|
-
chartType: 'combination_chart',
|
|
374
|
-
label: intl.get('Y-axis(left side)'),
|
|
375
361
|
statItem: statItem,
|
|
376
|
-
|
|
377
|
-
summaryType: y_axis_left_summary_type,
|
|
378
|
-
summaryMethod: y_axis_left_summary_method,
|
|
379
|
-
summaryColumn: y_axis_left_summary_column,
|
|
380
|
-
numericColumns: this.props.numericColumns,
|
|
381
|
-
getColumnsOptions: getColumnsOptions,
|
|
382
|
-
onChangeSummaryType: function onChangeSummaryType(option) {
|
|
383
|
-
return _this2.onChangeSummaryType(option, 'left');
|
|
384
|
-
},
|
|
385
|
-
onSelectSummaryColumn: function onSelectSummaryColumn(option) {
|
|
386
|
-
return _this2.onSelectSummaryColumn(option, 'left');
|
|
387
|
-
},
|
|
388
|
-
onSelectSummaryMethod: function onSelectSummaryMethod(option) {
|
|
389
|
-
return _this2.onSelectSummaryMethod(option, 'left');
|
|
390
|
-
},
|
|
362
|
+
eventBus: eventBus,
|
|
391
363
|
updateStatItem: updateStatItem
|
|
392
|
-
})
|
|
393
|
-
chartType: 'combination_chart',
|
|
394
|
-
label: intl.get('Y-axis(right side)'),
|
|
395
|
-
statItem: statItem,
|
|
396
|
-
selectedTableId: selectedTableId,
|
|
397
|
-
summaryType: y_axis_right_summary_type,
|
|
398
|
-
summaryMethod: y_axis_right_summary_method,
|
|
399
|
-
summaryColumn: y_axis_right_summary_column,
|
|
400
|
-
numericColumns: this.props.numericColumns,
|
|
401
|
-
getColumnsOptions: getColumnsOptions,
|
|
402
|
-
onChangeSummaryType: function onChangeSummaryType(option) {
|
|
403
|
-
return _this2.onChangeSummaryType(option, 'right');
|
|
404
|
-
},
|
|
405
|
-
onSelectSummaryColumn: function onSelectSummaryColumn(option) {
|
|
406
|
-
return _this2.onSelectSummaryColumn(option, 'right');
|
|
407
|
-
},
|
|
408
|
-
onSelectSummaryMethod: function onSelectSummaryMethod(option) {
|
|
409
|
-
return _this2.onSelectSummaryMethod(option, 'right');
|
|
410
|
-
}
|
|
411
|
-
}));
|
|
364
|
+
});
|
|
412
365
|
}
|
|
413
|
-
|
|
414
|
-
|
|
415
|
-
|
|
366
|
+
return /*#__PURE__*/React.createElement(Fragment, null, /*#__PURE__*/React.createElement(BaseSettings, {
|
|
367
|
+
statItem: statItem,
|
|
368
|
+
selectedTableId: selectedTableId,
|
|
369
|
+
selectedViewId: statItem.view_id,
|
|
370
|
+
getTables: getTables,
|
|
371
|
+
getViews: getViews,
|
|
372
|
+
getTableById: this.props.getTableById,
|
|
373
|
+
getConvertedChart: this.props.getConvertedChart,
|
|
374
|
+
updateStatItem: updateStatItem
|
|
375
|
+
}), /*#__PURE__*/React.createElement("div", {
|
|
376
|
+
className: "statistic-chart-parameter-divider"
|
|
377
|
+
}), /*#__PURE__*/React.createElement("div", {
|
|
378
|
+
className: "statistic-chart-parameter-item"
|
|
379
|
+
}, /*#__PURE__*/React.createElement("label", null, intl.get('X-axis')), /*#__PURE__*/React.createElement(ColumnSettings, {
|
|
380
|
+
columnsOptions: this.columnsOptions,
|
|
381
|
+
selectedColumnOption: selectedColumnOption,
|
|
382
|
+
onChangeSelectedColumn: this.onSelectStatColumn
|
|
383
|
+
}), DATE_COLUMN_OPTIONS.includes(groupbyColumnType) && this.renderGroupbyDateGranularity(), groupbyColumnType === CellType.GEOLOCATION && this.renderGroupbyGeolocationGranularity(), this.renderIncludeEmpty()), /*#__PURE__*/React.createElement(SummarySettings, {
|
|
384
|
+
useMultipleSummaryColumns: true,
|
|
385
|
+
chartType: 'combination_chart',
|
|
386
|
+
label: intl.get('Y-axis(left side)'),
|
|
387
|
+
statItem: statItem,
|
|
388
|
+
selectedTableId: selectedTableId,
|
|
389
|
+
summaryType: y_axis_left_summary_type,
|
|
390
|
+
summaryMethod: y_axis_left_summary_method,
|
|
391
|
+
summaryColumn: y_axis_left_summary_column,
|
|
392
|
+
numericColumns: this.props.numericColumns,
|
|
393
|
+
getColumnsOptions: getColumnsOptions,
|
|
394
|
+
onChangeSummaryType: option => this.onChangeSummaryType(option, 'left'),
|
|
395
|
+
onSelectSummaryColumn: option => this.onSelectSummaryColumn(option, 'left'),
|
|
396
|
+
onSelectSummaryMethod: option => this.onSelectSummaryMethod(option, 'left'),
|
|
397
|
+
updateStatItem: updateStatItem
|
|
398
|
+
}), /*#__PURE__*/React.createElement(SummarySettings, {
|
|
399
|
+
chartType: 'combination_chart',
|
|
400
|
+
label: intl.get('Y-axis(right side)'),
|
|
401
|
+
statItem: statItem,
|
|
402
|
+
selectedTableId: selectedTableId,
|
|
403
|
+
summaryType: y_axis_right_summary_type,
|
|
404
|
+
summaryMethod: y_axis_right_summary_method,
|
|
405
|
+
summaryColumn: y_axis_right_summary_column,
|
|
406
|
+
numericColumns: this.props.numericColumns,
|
|
407
|
+
getColumnsOptions: getColumnsOptions,
|
|
408
|
+
onChangeSummaryType: option => this.onChangeSummaryType(option, 'right'),
|
|
409
|
+
onSelectSummaryColumn: option => this.onSelectSummaryColumn(option, 'right'),
|
|
410
|
+
onSelectSummaryMethod: option => this.onSelectSummaryMethod(option, 'right')
|
|
411
|
+
}));
|
|
412
|
+
}
|
|
413
|
+
}
|
|
416
414
|
export default CombinationSettings;
|