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
package/es/utils/sql-utils.js
CHANGED
|
@@ -1,15 +1,17 @@
|
|
|
1
1
|
import { CellType, filter2SqlCondition, TableUtils, Views } from 'dtable-store';
|
|
2
2
|
import { STATISTICS_COUNT_TYPE, STAT_TYPE, TIME_COLUMN_LIST } from '../constants';
|
|
3
|
-
export
|
|
3
|
+
export const getSqlOrder = (sortType, groupName) => {
|
|
4
4
|
if (!sortType) {
|
|
5
5
|
return "order by ".concat(groupName);
|
|
6
6
|
}
|
|
7
7
|
return '';
|
|
8
8
|
};
|
|
9
|
-
export
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
9
|
+
export const getSqlGroup = (granularity, column) => {
|
|
10
|
+
const {
|
|
11
|
+
name,
|
|
12
|
+
type
|
|
13
|
+
} = column;
|
|
14
|
+
let columnName = "`".concat(name, "`");
|
|
13
15
|
if (TIME_COLUMN_LIST.includes(type)) {
|
|
14
16
|
if (granularity && granularity.includes(STATISTICS_COUNT_TYPE.DAY)) {
|
|
15
17
|
return "ISODATE(".concat(columnName, ")");
|
|
@@ -37,57 +39,66 @@ export var getSqlGroup = function getSqlGroup(granularity, column) {
|
|
|
37
39
|
}
|
|
38
40
|
return "`".concat(columnName, "`");
|
|
39
41
|
};
|
|
40
|
-
export
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
42
|
+
export const getPieChartSqlGroupName = (statisticRecord, selectedColumn, groupName) => {
|
|
43
|
+
const {
|
|
44
|
+
original_name_list,
|
|
45
|
+
name_list
|
|
46
|
+
} = statisticRecord;
|
|
47
|
+
let sqlString = '';
|
|
48
|
+
const list = original_name_list.length > 0 ? original_name_list : name_list;
|
|
49
|
+
list.forEach((item, index) => {
|
|
46
50
|
if (index === 0) {
|
|
47
51
|
sqlString += getSqlGroupName(name_list[0], original_name_list[0], selectedColumn);
|
|
48
52
|
} else {
|
|
49
|
-
|
|
53
|
+
const sqlName = getSqlGroupName(name_list[index], original_name_list[index], selectedColumn);
|
|
50
54
|
sqlString = "".concat(sqlString, " or ").concat(groupName, "=").concat(sqlName);
|
|
51
55
|
}
|
|
52
56
|
});
|
|
53
57
|
return sqlString;
|
|
54
58
|
};
|
|
55
|
-
export
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
59
|
+
export const getSqlString = (statItem, statisticRecord, _ref) => {
|
|
60
|
+
let {
|
|
61
|
+
isColumn,
|
|
62
|
+
isCurrentView,
|
|
63
|
+
isRow,
|
|
64
|
+
getTableById
|
|
65
|
+
} = _ref;
|
|
66
|
+
const {
|
|
67
|
+
table_id,
|
|
68
|
+
view_id,
|
|
69
|
+
column_groupby_column_key,
|
|
70
|
+
column_groupby_multiple_numeric_column,
|
|
71
|
+
type
|
|
72
|
+
} = statItem;
|
|
73
|
+
const selectedTable = getTableById(table_id);
|
|
74
|
+
const selectedView = Views.getViewById(selectedTable.views, view_id);
|
|
75
|
+
const {
|
|
76
|
+
groupName,
|
|
77
|
+
selectedColumn,
|
|
78
|
+
columnGroupName,
|
|
79
|
+
columnSelectedColumn
|
|
80
|
+
} = getDatabaseGroupName(statItem, selectedTable, {
|
|
81
|
+
isCurrentView
|
|
82
|
+
});
|
|
83
|
+
const sqlCondition = filter2SqlCondition(selectedTable, selectedView);
|
|
84
|
+
const isGroup = column_groupby_column_key && !column_groupby_multiple_numeric_column;
|
|
85
|
+
const {
|
|
86
|
+
name,
|
|
87
|
+
original_name,
|
|
88
|
+
group_original_name,
|
|
89
|
+
group_name
|
|
90
|
+
} = statisticRecord;
|
|
91
|
+
let sqlName = getSqlGroupName(name, original_name, selectedColumn);
|
|
81
92
|
if ((type === STAT_TYPE.PIE || type === STAT_TYPE.RING) && original_name === 'Others') {
|
|
82
93
|
sqlName = getPieChartSqlGroupName(statisticRecord, selectedColumn, groupName);
|
|
83
94
|
}
|
|
84
|
-
|
|
95
|
+
let sqlGroupName;
|
|
85
96
|
if (isGroup) {
|
|
86
97
|
sqlGroupName = getSqlGroupName(group_name, group_original_name, columnSelectedColumn);
|
|
87
98
|
}
|
|
88
|
-
|
|
99
|
+
let sqlString;
|
|
89
100
|
if (STAT_TYPE.PIVOT_TABLE === type) {
|
|
90
|
-
|
|
101
|
+
let pivotGroupName = "".concat(isGroup ? "".concat(columnGroupName, "=").concat(sqlGroupName) : '');
|
|
91
102
|
if (isColumn) {
|
|
92
103
|
if (sqlCondition && pivotGroupName) {
|
|
93
104
|
sqlString = "select * from ".concat(selectedTable.name, " ").concat(sqlCondition, " and ").concat(pivotGroupName, " limit 5000");
|
|
@@ -118,23 +129,26 @@ export var getSqlString = function getSqlString(statItem, statisticRecord, _ref)
|
|
|
118
129
|
}
|
|
119
130
|
return sqlString;
|
|
120
131
|
};
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
type
|
|
132
|
+
const getSqlGroupName = (name, original_name, column) => {
|
|
133
|
+
const {
|
|
134
|
+
type
|
|
135
|
+
} = column || {};
|
|
124
136
|
if (type === CellType.SINGLE_SELECT || type === CellType.MULTIPLE_SELECT) {
|
|
125
137
|
return "'".concat(name, "'");
|
|
126
138
|
}
|
|
127
|
-
|
|
139
|
+
const newName = original_name ? original_name : name;
|
|
128
140
|
if (typeof newName === 'number') {
|
|
129
141
|
return newName;
|
|
130
142
|
}
|
|
131
143
|
return "'".concat(newName, "'");
|
|
132
144
|
};
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
145
|
+
const getGroupName = (selectedColumn, _ref2) => {
|
|
146
|
+
let {
|
|
147
|
+
groupby_date_granularity,
|
|
148
|
+
groupby_geolocation_granularity
|
|
149
|
+
} = _ref2;
|
|
150
|
+
let groupName = "`".concat(selectedColumn.name, "`");
|
|
151
|
+
const isTimeColumn = TIME_COLUMN_LIST.includes(selectedColumn.type);
|
|
138
152
|
if (isTimeColumn) {
|
|
139
153
|
groupName = getSqlGroup(groupby_date_granularity, selectedColumn);
|
|
140
154
|
} else if (selectedColumn.type === CellType.GEOLOCATION) {
|
|
@@ -142,14 +156,14 @@ var getGroupName = function getGroupName(selectedColumn, _ref3) {
|
|
|
142
156
|
}
|
|
143
157
|
return groupName;
|
|
144
158
|
};
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
isColumn =
|
|
148
|
-
|
|
149
|
-
|
|
159
|
+
const getDatabaseGroupName = (statItem, selectedTable, _ref3) => {
|
|
160
|
+
let {
|
|
161
|
+
isColumn = false,
|
|
162
|
+
isCurrentView = false
|
|
163
|
+
} = _ref3;
|
|
150
164
|
if (isCurrentView) return '';
|
|
151
|
-
|
|
152
|
-
|
|
165
|
+
const type = statItem.type;
|
|
166
|
+
let groupName, selectedColumn, columnGroupName, columnSelectedColumn;
|
|
153
167
|
switch (type) {
|
|
154
168
|
case STAT_TYPE.BAR:
|
|
155
169
|
case STAT_TYPE.BAR_GROUP:
|
|
@@ -164,11 +178,13 @@ var getDatabaseGroupName = function getDatabaseGroupName(statItem, selectedTable
|
|
|
164
178
|
case STAT_TYPE.HORIZONTAL_GROUP_BAR:
|
|
165
179
|
case STAT_TYPE.STACKED_HORIZONTAL_BAR:
|
|
166
180
|
{
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
181
|
+
let groupby_column_key, groupby_date_granularity, groupby_geolocation_granularity;
|
|
182
|
+
const {
|
|
183
|
+
column_groupby_multiple_numeric_column,
|
|
184
|
+
column_groupby_column_key,
|
|
185
|
+
column_groupby_date_granularity,
|
|
186
|
+
column_groupby_geolocation_granularity
|
|
187
|
+
} = statItem;
|
|
172
188
|
if (type === STAT_TYPE.PIE || type === STAT_TYPE.RING || type === STAT_TYPE.TREEMAP) {
|
|
173
189
|
groupby_column_key = statItem.groupby_column_key;
|
|
174
190
|
groupby_date_granularity = statItem.groupby_date_granularity;
|
|
@@ -191,16 +207,18 @@ var getDatabaseGroupName = function getDatabaseGroupName(statItem, selectedTable
|
|
|
191
207
|
}
|
|
192
208
|
selectedColumn = TableUtils.getTableColumnByKey(selectedTable, groupby_column_key);
|
|
193
209
|
groupName = getGroupName(selectedColumn, {
|
|
194
|
-
groupby_date_granularity
|
|
195
|
-
groupby_geolocation_granularity
|
|
210
|
+
groupby_date_granularity,
|
|
211
|
+
groupby_geolocation_granularity
|
|
196
212
|
});
|
|
197
213
|
break;
|
|
198
214
|
}
|
|
199
215
|
case STAT_TYPE.MAP:
|
|
200
216
|
case STAT_TYPE.MAP_BUBBLE:
|
|
201
217
|
{
|
|
202
|
-
|
|
203
|
-
|
|
218
|
+
const {
|
|
219
|
+
geolocation_granularity,
|
|
220
|
+
geo_column
|
|
221
|
+
} = statItem;
|
|
204
222
|
selectedColumn = TableUtils.getTableColumnByKey(selectedTable, geo_column);
|
|
205
223
|
groupName = getSqlGroup(geolocation_granularity, selectedColumn);
|
|
206
224
|
break;
|
|
@@ -209,21 +227,27 @@ var getDatabaseGroupName = function getDatabaseGroupName(statItem, selectedTable
|
|
|
209
227
|
case STAT_TYPE.WORLD_MAP_BUBBLE:
|
|
210
228
|
case STAT_TYPE.MIRROR:
|
|
211
229
|
{
|
|
212
|
-
|
|
230
|
+
const {
|
|
231
|
+
column
|
|
232
|
+
} = statItem;
|
|
213
233
|
selectedColumn = TableUtils.getTableColumnByKey(selectedTable, column);
|
|
214
234
|
groupName = selectedColumn.name;
|
|
215
235
|
break;
|
|
216
236
|
}
|
|
217
237
|
case STAT_TYPE.HEAT_MAP:
|
|
218
238
|
{
|
|
219
|
-
|
|
239
|
+
const {
|
|
240
|
+
time_column
|
|
241
|
+
} = statItem;
|
|
220
242
|
selectedColumn = TableUtils.getTableColumnByKey(selectedTable, time_column);
|
|
221
243
|
groupName = "ISODATE(".concat(selectedColumn.name, ")");
|
|
222
244
|
break;
|
|
223
245
|
}
|
|
224
246
|
case STAT_TYPE.SCATTER:
|
|
225
247
|
{
|
|
226
|
-
|
|
248
|
+
const {
|
|
249
|
+
group_column
|
|
250
|
+
} = statItem;
|
|
227
251
|
selectedColumn = TableUtils.getTableColumnByKey(selectedTable, group_column);
|
|
228
252
|
groupName = selectedColumn.name;
|
|
229
253
|
break;
|
|
@@ -235,31 +259,37 @@ var getDatabaseGroupName = function getDatabaseGroupName(statItem, selectedTable
|
|
|
235
259
|
}
|
|
236
260
|
case STAT_TYPE.COMPARE_BAR:
|
|
237
261
|
{
|
|
238
|
-
|
|
239
|
-
|
|
262
|
+
const {
|
|
263
|
+
x_axis_column_key,
|
|
264
|
+
x_axis_date_granularity
|
|
265
|
+
} = statItem;
|
|
240
266
|
selectedColumn = TableUtils.getTableColumnByKey(selectedTable, x_axis_column_key);
|
|
241
267
|
groupName = getSqlGroup(x_axis_date_granularity, selectedColumn);
|
|
242
268
|
break;
|
|
243
269
|
}
|
|
244
270
|
case STAT_TYPE.COMBINATION_CHART:
|
|
245
271
|
{
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
|
|
272
|
+
const {
|
|
273
|
+
x_axis_column_key,
|
|
274
|
+
x_axis_date_granularity: groupby_date_granularity,
|
|
275
|
+
x_axis_geolocation_granularity: groupby_geolocation_granularity
|
|
276
|
+
} = statItem;
|
|
277
|
+
selectedColumn = TableUtils.getTableColumnByKey(selectedTable, x_axis_column_key);
|
|
250
278
|
if (!selectedColumn) return [];
|
|
251
279
|
groupName = "`".concat(selectedColumn.name, "`");
|
|
252
280
|
if (TIME_COLUMN_LIST.includes(selectedColumn.type)) {
|
|
253
|
-
groupName = getSqlGroup(
|
|
281
|
+
groupName = getSqlGroup(groupby_date_granularity, selectedColumn);
|
|
254
282
|
} else if (selectedColumn.type === CellType.GEOLOCATION) {
|
|
255
|
-
groupName = getSqlGroup(
|
|
283
|
+
groupName = getSqlGroup(groupby_geolocation_granularity, selectedColumn);
|
|
256
284
|
}
|
|
257
285
|
break;
|
|
258
286
|
}
|
|
259
287
|
case STAT_TYPE.TREND_CHART:
|
|
260
288
|
{
|
|
261
|
-
|
|
262
|
-
|
|
289
|
+
const {
|
|
290
|
+
date_column,
|
|
291
|
+
date_granularity
|
|
292
|
+
} = statItem;
|
|
263
293
|
selectedColumn = TableUtils.getTableColumnByKey(selectedTable, date_column);
|
|
264
294
|
groupName = getSqlGroup(date_granularity, selectedColumn);
|
|
265
295
|
break;
|
|
@@ -267,7 +297,9 @@ var getDatabaseGroupName = function getDatabaseGroupName(statItem, selectedTable
|
|
|
267
297
|
case STAT_TYPE.COMPLETENESS_CHART:
|
|
268
298
|
case STAT_TYPE.GROUP_COMPLETENESS_CHART:
|
|
269
299
|
{
|
|
270
|
-
|
|
300
|
+
const {
|
|
301
|
+
name_column
|
|
302
|
+
} = statItem;
|
|
271
303
|
selectedColumn = TableUtils.getTableColumnByKey(selectedTable, name_column);
|
|
272
304
|
groupName = "`".concat(selectedColumn.name, "`");
|
|
273
305
|
break;
|
|
@@ -279,24 +311,26 @@ var getDatabaseGroupName = function getDatabaseGroupName(statItem, selectedTable
|
|
|
279
311
|
}
|
|
280
312
|
case STAT_TYPE.PIVOT_TABLE:
|
|
281
313
|
{
|
|
282
|
-
|
|
283
|
-
|
|
284
|
-
|
|
285
|
-
|
|
286
|
-
|
|
287
|
-
|
|
288
|
-
|
|
289
|
-
|
|
290
|
-
|
|
314
|
+
let {
|
|
315
|
+
groupby_column_key,
|
|
316
|
+
groupby_date_granularity,
|
|
317
|
+
groupby_geolocation_granularity,
|
|
318
|
+
column_groupby_column_key,
|
|
319
|
+
column_groupby_date_granularity,
|
|
320
|
+
column_groupby_geolocation_granularity,
|
|
321
|
+
column_groupby_multiple_numeric_column
|
|
322
|
+
} = statItem;
|
|
323
|
+
if (!column_groupby_multiple_numeric_column && column_groupby_column_key) {
|
|
324
|
+
columnSelectedColumn = TableUtils.getTableColumnByKey(selectedTable, column_groupby_column_key);
|
|
291
325
|
columnGroupName = getGroupName(columnSelectedColumn, {
|
|
292
|
-
groupby_date_granularity:
|
|
293
|
-
groupby_geolocation_granularity:
|
|
326
|
+
groupby_date_granularity: column_groupby_date_granularity,
|
|
327
|
+
groupby_geolocation_granularity: column_groupby_geolocation_granularity
|
|
294
328
|
});
|
|
295
329
|
}
|
|
296
|
-
selectedColumn = TableUtils.getTableColumnByKey(selectedTable,
|
|
330
|
+
selectedColumn = TableUtils.getTableColumnByKey(selectedTable, groupby_column_key);
|
|
297
331
|
groupName = getGroupName(selectedColumn, {
|
|
298
|
-
groupby_date_granularity
|
|
299
|
-
groupby_geolocation_granularity
|
|
332
|
+
groupby_date_granularity,
|
|
333
|
+
groupby_geolocation_granularity
|
|
300
334
|
});
|
|
301
335
|
break;
|
|
302
336
|
}
|
|
@@ -304,9 +338,9 @@ var getDatabaseGroupName = function getDatabaseGroupName(statItem, selectedTable
|
|
|
304
338
|
break;
|
|
305
339
|
}
|
|
306
340
|
return {
|
|
307
|
-
groupName
|
|
308
|
-
selectedColumn
|
|
309
|
-
columnGroupName
|
|
310
|
-
columnSelectedColumn
|
|
341
|
+
groupName,
|
|
342
|
+
selectedColumn,
|
|
343
|
+
columnGroupName,
|
|
344
|
+
columnSelectedColumn
|
|
311
345
|
};
|
|
312
346
|
};
|