dtable-statistic 4.3.3 → 4.3.4
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 +3 -10
- package/es/calculator/base-calculator.js +12 -20
- package/es/calculator/basic-chart-calculator.js +65 -72
- package/es/calculator/combination-calculator.js +57 -64
- package/es/calculator/compare-bar-calculator.js +26 -33
- package/es/calculator/completeness-calculator.js +30 -37
- package/es/calculator/copy-value.js +1 -7
- package/es/calculator/dashboard-calculator.js +13 -20
- package/es/calculator/heat-map-calculator.js +18 -25
- package/es/calculator/horizontal-bar-calculator.js +8 -15
- package/es/calculator/index.js +35 -42
- package/es/calculator/map-calculator.js +22 -29
- package/es/calculator/mirror-calculator.js +20 -27
- package/es/calculator/number-card-calculator.js +10 -17
- package/es/calculator/pivot-table-calculator.js +58 -65
- package/es/calculator/scatter-calculator.js +14 -21
- package/es/calculator/thread-manager.js +1 -7
- package/es/calculator/trend-calculator.js +22 -29
- package/es/calculator/workers/basic-chart-calculator-worker.js +76 -83
- package/es/calculator/workers/calculator.worker.js +30 -33
- package/es/calculator/workers/card-calculator-worker.js +13 -19
- package/es/calculator/workers/combination-calculator-worker.js +46 -53
- package/es/calculator/workers/compare-bar-chart-calculator-worker.js +22 -29
- package/es/calculator/workers/completeness-calculator-worker.js +34 -41
- package/es/calculator/workers/dashboard-calculator-worker.js +18 -24
- package/es/calculator/workers/mirror-calculator-worker.js +22 -29
- package/es/calculator/workers/pivot-table-calculator-worker.js +77 -84
- package/es/calculator/workers/scatter-calculator-worker.js +20 -27
- package/es/calculator/workers/trend-calculator-worker.js +27 -34
- package/es/calculator/world-map-calculator.js +17 -24
- package/es/components/common-add-tool.js +5 -12
- package/es/components/dialog/chart-addition-edit-dialog.js +12 -20
- package/es/components/dialog/chart-addition-widgets/chart-selector.js +101 -108
- package/es/components/dialog/color-theme-dialog.js +15 -22
- package/es/components/dialog/delete-confirmation-dialog.js +11 -18
- package/es/components/dialog/enlarged-chart-dialog.js +20 -28
- package/es/components/dialog/new-table-dialog.js +16 -23
- package/es/components/dialog/new-view-dialog.js +14 -21
- package/es/components/dialog/rename-view-dialog.js +14 -22
- package/es/components/dialog/statistic-record-dialog/index.js +37 -45
- package/es/components/dialog/statistic-types-dialog/index.js +14 -22
- package/es/components/dialog/table-select-dialog.js +15 -23
- package/es/components/dropdown-menu/statistic-dropdown-menu.js +41 -49
- package/es/components/dtable-popover.js +12 -19
- package/es/components/dtable-search-input.js +13 -21
- package/es/components/dtable-select.js +15 -21
- package/es/components/icon.js +4 -11
- package/es/components/index.js +11 -76
- package/es/components/loading.js +3 -10
- package/es/components/modal-portal.js +5 -12
- package/es/components/popover/color-rules/color-rule.js +25 -33
- package/es/components/popover/color-rules/index.js +6 -14
- package/es/components/popover/color-rules/rule-filters/filter.js +27 -34
- package/es/components/popover/color-rules/rule-filters/index.js +17 -25
- package/es/components/popover/color-rules/rule-filters/number-input.js +9 -17
- package/es/components/popover/color-rules-popover.js +24 -32
- package/es/components/popover/color-selector-popover.js +10 -17
- package/es/components/seatable-radio/index.js +9 -16
- package/es/components/select/index.js +2 -9
- package/es/components/select/option-group.js +19 -27
- package/es/components/select/option.js +6 -14
- package/es/components/select/select.js +17 -25
- package/es/components/toast/alert.js +24 -31
- package/es/components/toast/index.js +3 -10
- package/es/components/toast/toast.js +12 -20
- package/es/components/toast/toastManager.js +9 -17
- package/es/components/toast/toaster.js +6 -14
- package/es/constants/color-rules.js +6 -12
- package/es/constants/dtable-select-style.js +4 -9
- package/es/constants/event-types.js +4 -10
- package/es/constants/index.js +67 -96
- package/es/constants/key-codes.js +0 -2
- package/es/constants/map.js +2 -8
- package/es/constants/model.js +20 -26
- package/es/constants/regions.js +3 -8
- package/es/constants/zIndexes.js +1 -7
- package/es/custom-g2.js +208 -236
- package/es/dashboard.js +50 -58
- package/es/desktop-dashboard.js +47 -55
- package/es/index.js +3 -6
- package/es/locale/index.js +10 -13
- package/es/locale/lang/de.js +1 -7
- package/es/locale/lang/en.js +1 -7
- package/es/locale/lang/fr.js +1 -7
- package/es/locale/lang/zh_CN.js +1 -7
- package/es/mobile-dashboard.js +38 -46
- package/es/model/bar-group.js +11 -19
- package/es/model/bar.js +10 -18
- package/es/model/base-model.js +2 -9
- package/es/model/basic-number-card.js +8 -16
- package/es/model/collaborators.js +2 -9
- package/es/model/combination.js +12 -20
- package/es/model/compare-bar.js +16 -24
- package/es/model/completeness-group.js +8 -16
- package/es/model/completeness.js +5 -13
- package/es/model/custom-bar.js +6 -14
- package/es/model/dashboard.js +6 -14
- package/es/model/generic-model.js +133 -141
- package/es/model/heat-map.js +11 -19
- package/es/model/horizontal-bar-group.js +10 -18
- package/es/model/horizontal-bar.js +10 -18
- package/es/model/index.js +53 -185
- package/es/model/map.js +15 -23
- package/es/model/mirror.js +13 -21
- package/es/model/pie.js +10 -18
- package/es/model/ring.js +11 -19
- package/es/model/scatter.js +6 -14
- package/es/model/statistic-dashboard.js +2 -9
- package/es/model/table.js +10 -18
- package/es/model/trend.js +12 -20
- package/es/model/world-map.js +13 -21
- package/es/service/chart-service.js +7 -14
- package/es/service/dashboard-service.js +34 -41
- package/es/service/map-json.js +8 -14
- package/es/stat-editor/chart-name-editor.js +8 -15
- package/es/stat-editor/index.js +16 -24
- package/es/stat-editor/stat-settings/advance-chart-settings/basic-number-card-settings.js +21 -29
- package/es/stat-editor/stat-settings/advance-chart-settings/combination-settings.js +49 -57
- package/es/stat-editor/stat-settings/advance-chart-settings/dashboard-chart-settings.js +23 -31
- package/es/stat-editor/stat-settings/advance-chart-settings/geo-granularity-settings.js +4 -11
- package/es/stat-editor/stat-settings/advance-chart-settings/heat-map-settings.js +19 -27
- package/es/stat-editor/stat-settings/advance-chart-settings/index.js +43 -51
- package/es/stat-editor/stat-settings/advance-chart-settings/map-settings.js +23 -31
- package/es/stat-editor/stat-settings/advance-chart-settings/mirror-settings.js +23 -31
- package/es/stat-editor/stat-settings/advance-chart-settings/style-setting/combination-style-setting.js +37 -45
- package/es/stat-editor/stat-settings/advance-chart-settings/style-setting/heat-map-settings.js +19 -27
- package/es/stat-editor/stat-settings/advance-chart-settings/style-setting/map-setting.js +26 -34
- package/es/stat-editor/stat-settings/advance-chart-settings/summary-settings.js +47 -55
- package/es/stat-editor/stat-settings/advance-chart-settings/trend-chart-settings.js +22 -30
- package/es/stat-editor/stat-settings/advance-chart-settings/world-map-settings.js +18 -26
- package/es/stat-editor/stat-settings/basic-chart-settings/advance-bar-chart-settings.js +27 -35
- package/es/stat-editor/stat-settings/basic-chart-settings/bar-settings.js +24 -32
- package/es/stat-editor/stat-settings/basic-chart-settings/completeness-chart-settings.js +33 -41
- package/es/stat-editor/stat-settings/basic-chart-settings/custom-bar-settings.js +22 -30
- package/es/stat-editor/stat-settings/basic-chart-settings/groupby-settings.js +27 -26
- package/es/stat-editor/stat-settings/basic-chart-settings/horizontal-axis-group-settings.js +46 -54
- package/es/stat-editor/stat-settings/basic-chart-settings/horizontal-bar-settings.js +23 -31
- package/es/stat-editor/stat-settings/basic-chart-settings/horizontal-group-chart-settings.js +26 -34
- package/es/stat-editor/stat-settings/basic-chart-settings/index.js +77 -85
- package/es/stat-editor/stat-settings/basic-chart-settings/pie-settings.js +21 -29
- package/es/stat-editor/stat-settings/basic-chart-settings/pivot-table-settings.js +73 -81
- package/es/stat-editor/stat-settings/basic-chart-settings/scatter-settings.js +16 -24
- package/es/stat-editor/stat-settings/basic-chart-settings/stack-item-settings.js +19 -27
- package/es/stat-editor/stat-settings/basic-chart-settings/stacks-settings.js +18 -26
- package/es/stat-editor/stat-settings/basic-chart-settings/style-setting/bar-chart-style-setting.js +49 -57
- package/es/stat-editor/stat-settings/basic-chart-settings/style-setting/completeness-style.js +17 -25
- package/es/stat-editor/stat-settings/basic-chart-settings/style-setting/horizontal-bar-chart-style.js +47 -55
- package/es/stat-editor/stat-settings/basic-chart-settings/style-setting/label-font-size-editor.js +11 -19
- package/es/stat-editor/stat-settings/basic-chart-settings/style-setting/pie-chart-style-settings.js +45 -53
- package/es/stat-editor/stat-settings/basic-chart-settings/style-setting/time-compare-style.js +9 -17
- package/es/stat-editor/stat-settings/basic-chart-settings/summary-method-setting.js +20 -28
- package/es/stat-editor/stat-settings/basic-chart-settings/summary-settings.js +30 -38
- package/es/stat-editor/stat-settings/basic-chart-settings/time-comparison-settings.js +50 -58
- package/es/stat-editor/stat-settings/basic-chart-settings/timer-picker.js +17 -25
- package/es/stat-editor/stat-settings/basic-chart-settings/y-axis-group-settings.js +47 -55
- package/es/stat-editor/stat-settings/color-setting/color-group-selector.js +11 -19
- package/es/stat-editor/stat-settings/color-setting/color-picker.js +12 -19
- package/es/stat-editor/stat-settings/color-setting/color-use-type-selector.js +62 -70
- package/es/stat-editor/stat-settings/map/map-level.js +13 -20
- package/es/stat-editor/stat-settings/map/map-province-city.js +20 -27
- package/es/stat-editor/stat-settings/public-setting/axis-label-position-setting.js +11 -19
- package/es/stat-editor/stat-settings/public-setting/base-settings.js +20 -28
- package/es/stat-editor/stat-settings/public-setting/calender.js +22 -29
- package/es/stat-editor/stat-settings/public-setting/column-settings.js +6 -13
- package/es/stat-editor/stat-settings/public-setting/custom-title-setting.js +9 -16
- package/es/stat-editor/stat-settings/public-setting/data-sort-setting.js +13 -21
- package/es/stat-editor/stat-settings/public-setting/ind-toggle-setting.js +8 -15
- package/es/stat-editor/stat-settings/public-setting/min-max-setting.js +11 -19
- package/es/stat-editor/stat-settings/public-setting/numeric-summary-item.js +27 -35
- package/es/stat-editor/stat-settings/public-setting/toggle-setting.js +8 -15
- package/es/stat-editor/stat-settings/public-setting/type-settings/index.js +18 -26
- package/es/stat-list/chart-preview.js +20 -28
- package/es/stat-list/index.js +27 -35
- package/es/stat-view/area-chart.js +43 -50
- package/es/stat-view/bar-chart.js +47 -54
- package/es/stat-view/base-chart.js +24 -32
- package/es/stat-view/basic-number-card.js +19 -26
- package/es/stat-view/combination-chart.js +49 -56
- package/es/stat-view/compare-chart.js +39 -46
- package/es/stat-view/completeness-chart.js +28 -35
- package/es/stat-view/custom-bar.js +31 -38
- package/es/stat-view/dashboard-chart.js +15 -22
- package/es/stat-view/heat-map.js +43 -50
- package/es/stat-view/horizontal-bar-chart.js +51 -58
- package/es/stat-view/index.js +73 -80
- package/es/stat-view/line-chart.js +39 -46
- package/es/stat-view/map.js +33 -40
- package/es/stat-view/mirror.js +21 -28
- package/es/stat-view/pie-chart.js +29 -36
- package/es/stat-view/pivot-table/index.js +32 -39
- package/es/stat-view/pivot-table/one-dimension-table-no-numeric-columns.js +31 -39
- package/es/stat-view/pivot-table/one-dimension-table-with-numeric-columns.js +29 -37
- package/es/stat-view/pivot-table/pivot-table-display-name.js +46 -54
- package/es/stat-view/pivot-table/two-dimension-table.js +62 -70
- package/es/stat-view/ring-chart.js +38 -45
- package/es/stat-view/scatter-chart.js +30 -37
- package/es/stat-view/treemap-chart.js +37 -44
- package/es/stat-view/trend-chart.js +32 -39
- package/es/stat-view/world-map.js +33 -40
- package/es/tabs/index.js +32 -40
- package/es/tabs/tab.js +26 -34
- package/es/utils/basic-chart-utils.js +2 -9
- package/es/utils/cell-format.js +14 -22
- package/es/utils/cell-value.js +7 -14
- package/es/utils/collaborator.js +4 -13
- package/es/utils/color-utils.js +18 -29
- package/es/utils/column-utils.js +18 -29
- package/es/utils/column.js +4 -11
- package/es/utils/common-utils.js +41 -65
- package/es/utils/date-format.js +2 -8
- package/es/utils/export-table-utils.js +82 -91
- package/es/utils/index.js +11 -100
- package/es/utils/map.js +26 -36
- package/es/utils/model.js +6 -14
- package/es/utils/object.js +6 -15
- package/es/utils/pivot-table.js +16 -23
- package/es/utils/row-utils.js +23 -33
- package/es/utils/search.js +21 -29
- package/es/utils/sql-utils.js +65 -75
- package/es/utils/stat-utils.js +60 -66
- package/es/utils/trend-utils.js +32 -40
- package/package.json +1 -1
|
@@ -1,12 +1,5 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
|
|
4
|
-
Object.defineProperty(exports, "__esModule", {
|
|
5
|
-
value: true
|
|
6
|
-
});
|
|
7
|
-
exports.default = void 0;
|
|
8
|
-
var _commonUtils = require("../utils/common-utils");
|
|
9
|
-
var _model = _interopRequireWildcard(require("../model"));
|
|
1
|
+
import { generatorUniqueId } from '../utils/common-utils';
|
|
2
|
+
import ChartModelConfig, { GenericModel } from '../model';
|
|
10
3
|
class ChartService {
|
|
11
4
|
constructor(_ref) {
|
|
12
5
|
let {
|
|
@@ -17,8 +10,8 @@ class ChartService {
|
|
|
17
10
|
generatorChart() {
|
|
18
11
|
let statistic = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
|
|
19
12
|
let table = arguments.length > 1 ? arguments[1] : undefined;
|
|
20
|
-
const object = new
|
|
21
|
-
const ChartModel =
|
|
13
|
+
const object = new GenericModel(statistic);
|
|
14
|
+
const ChartModel = ChartModelConfig[object.type];
|
|
22
15
|
if (!ChartModel) return null;
|
|
23
16
|
return new ChartModel(object, table);
|
|
24
17
|
}
|
|
@@ -32,7 +25,7 @@ class ChartService {
|
|
|
32
25
|
const {
|
|
33
26
|
stat_items
|
|
34
27
|
} = dashboard;
|
|
35
|
-
const statId =
|
|
28
|
+
const statId = generatorUniqueId(stat_items);
|
|
36
29
|
const {
|
|
37
30
|
_id: view_id
|
|
38
31
|
} = activeView;
|
|
@@ -54,7 +47,7 @@ class ChartService {
|
|
|
54
47
|
const {
|
|
55
48
|
stat_items
|
|
56
49
|
} = dashboard;
|
|
57
|
-
const statId =
|
|
50
|
+
const statId = generatorUniqueId(stat_items);
|
|
58
51
|
const {
|
|
59
52
|
name
|
|
60
53
|
} = originalStatItem;
|
|
@@ -78,4 +71,4 @@ class ChartService {
|
|
|
78
71
|
}, activeTable);
|
|
79
72
|
}
|
|
80
73
|
}
|
|
81
|
-
|
|
74
|
+
export default ChartService;
|
|
@@ -1,14 +1,7 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
value: true
|
|
6
|
-
});
|
|
7
|
-
exports.default = void 0;
|
|
8
|
-
var _statisticDashboard = _interopRequireDefault(require("../model/statistic-dashboard"));
|
|
9
|
-
var _utils = require("../utils");
|
|
10
|
-
var _commonUtils = require("../utils/common-utils");
|
|
11
|
-
var _constants = require("../constants");
|
|
1
|
+
import StatisticDashBoard from '../model/statistic-dashboard';
|
|
2
|
+
import { hasOwnProperty } from '../utils';
|
|
3
|
+
import { generatorUniqueId } from '../utils/common-utils';
|
|
4
|
+
import { DASHBOARD_ACTION_TYPE, STAT_TYPE, SUMMARY_TYPE } from '../constants';
|
|
12
5
|
const ADVANCED_STATISTICS_NAME = 'advanced-statistics';
|
|
13
6
|
class DashBoardService {
|
|
14
7
|
constructor(_ref) {
|
|
@@ -34,8 +27,8 @@ class DashBoardService {
|
|
|
34
27
|
|
|
35
28
|
// init default dashboard if neither base-statistics nor advanced-statistics
|
|
36
29
|
if (!hasBaseStatistics && !hasAdvancedStatistics) {
|
|
37
|
-
this.statistics = [new
|
|
38
|
-
_id:
|
|
30
|
+
this.statistics = [new StatisticDashBoard({
|
|
31
|
+
_id: generatorUniqueId([]),
|
|
39
32
|
stat_items: [],
|
|
40
33
|
name: this.defaultDashboardName
|
|
41
34
|
})];
|
|
@@ -44,7 +37,7 @@ class DashBoardService {
|
|
|
44
37
|
this.needSave = false;
|
|
45
38
|
|
|
46
39
|
// convert to advance-statistic
|
|
47
|
-
if (hasBaseStatistics && !
|
|
40
|
+
if (hasBaseStatistics && !hasOwnProperty(this.statistics[0], 'stat_items')) {
|
|
48
41
|
this.needSave = true;
|
|
49
42
|
this.convert2AdvanceStatistic();
|
|
50
43
|
}
|
|
@@ -64,23 +57,23 @@ class DashBoardService {
|
|
|
64
57
|
type
|
|
65
58
|
} = chart;
|
|
66
59
|
switch (type) {
|
|
67
|
-
case
|
|
60
|
+
case STAT_TYPE.PIVOT_TABLE:
|
|
68
61
|
{
|
|
69
62
|
return this.convertPivotTable(chart);
|
|
70
63
|
}
|
|
71
|
-
case
|
|
64
|
+
case STAT_TYPE.BAR:
|
|
72
65
|
{
|
|
73
66
|
return this.convertChartBar(chart);
|
|
74
67
|
}
|
|
75
|
-
case
|
|
68
|
+
case STAT_TYPE.LINE:
|
|
76
69
|
{
|
|
77
70
|
return this.convertChartLine(chart);
|
|
78
71
|
}
|
|
79
|
-
case
|
|
72
|
+
case STAT_TYPE.PIE:
|
|
80
73
|
{
|
|
81
74
|
return this.chartService.generatorChart({
|
|
82
75
|
...chart,
|
|
83
|
-
type:
|
|
76
|
+
type: STAT_TYPE.RING
|
|
84
77
|
});
|
|
85
78
|
}
|
|
86
79
|
default:
|
|
@@ -89,8 +82,8 @@ class DashBoardService {
|
|
|
89
82
|
}
|
|
90
83
|
}
|
|
91
84
|
}).filter(Boolean);
|
|
92
|
-
this.statistics = [new
|
|
93
|
-
_id:
|
|
85
|
+
this.statistics = [new StatisticDashBoard({
|
|
86
|
+
_id: generatorUniqueId([]),
|
|
94
87
|
stat_items: statItems,
|
|
95
88
|
name: this.defaultDashboardName
|
|
96
89
|
})];
|
|
@@ -103,7 +96,7 @@ class DashBoardService {
|
|
|
103
96
|
let convertedChart = {
|
|
104
97
|
...chart
|
|
105
98
|
};
|
|
106
|
-
if (summary_type ===
|
|
99
|
+
if (summary_type === SUMMARY_TYPE.ADVANCED && summary_columns_option && summary_columns_option.length > 0) {
|
|
107
100
|
convertedChart.column_groupby_multiple_numeric_column = true;
|
|
108
101
|
}
|
|
109
102
|
return this.chartService.generatorChart(convertedChart);
|
|
@@ -121,9 +114,9 @@ class DashBoardService {
|
|
|
121
114
|
};
|
|
122
115
|
const isGroupbyMultipleNumericColumns = column_groupby_multiple_numeric_column && column_groupby_numeric_column_keys && column_groupby_numeric_column_keys.length > 0;
|
|
123
116
|
if (column_groupby_column_key || isGroupbyMultipleNumericColumns) {
|
|
124
|
-
convertedChart.type =
|
|
117
|
+
convertedChart.type = STAT_TYPE.BAR_GROUP;
|
|
125
118
|
if (y_axis_use_stack) {
|
|
126
|
-
convertedChart.type =
|
|
119
|
+
convertedChart.type = STAT_TYPE.BAR_STACK;
|
|
127
120
|
}
|
|
128
121
|
if (isGroupbyMultipleNumericColumns) {
|
|
129
122
|
convertedChart.column_groupby_multiple_numeric_column = column_groupby_multiple_numeric_column;
|
|
@@ -150,7 +143,7 @@ class DashBoardService {
|
|
|
150
143
|
...chart
|
|
151
144
|
};
|
|
152
145
|
if (column_groupby_column_key) {
|
|
153
|
-
convertedChart.type =
|
|
146
|
+
convertedChart.type = STAT_TYPE.GROUP_LINE;
|
|
154
147
|
if (isGroupbyMultipleNumericColumns) {
|
|
155
148
|
convertedChart.column_groupby_multiple_numeric_column = column_groupby_multiple_numeric_column;
|
|
156
149
|
convertedChart.column_groupby_numeric_columns = column_groupby_numeric_column_keys.map(key => {
|
|
@@ -165,7 +158,7 @@ class DashBoardService {
|
|
|
165
158
|
return this.chartService.generatorChart(convertedChart);
|
|
166
159
|
}
|
|
167
160
|
getAdvancedStatistics(value) {
|
|
168
|
-
if (!value || !
|
|
161
|
+
if (!value || !hasOwnProperty(value, 'plugin_settings') || !hasOwnProperty(value.plugin_settings, ADVANCED_STATISTICS_NAME)) {
|
|
169
162
|
return [];
|
|
170
163
|
}
|
|
171
164
|
return value.plugin_settings[ADVANCED_STATISTICS_NAME] || [];
|
|
@@ -179,7 +172,7 @@ class DashBoardService {
|
|
|
179
172
|
advancedStatistics.forEach(dashboard => {
|
|
180
173
|
let convertedDashboard = {
|
|
181
174
|
...dashboard,
|
|
182
|
-
_id:
|
|
175
|
+
_id: generatorUniqueId(mergedStatistics),
|
|
183
176
|
from_advanced: true
|
|
184
177
|
};
|
|
185
178
|
let convertedCharts = Array.isArray(dashboard.stat_items) ? dashboard.stat_items.map(chart => {
|
|
@@ -189,10 +182,10 @@ class DashBoardService {
|
|
|
189
182
|
};
|
|
190
183
|
|
|
191
184
|
// fix code spell from advanced
|
|
192
|
-
if (
|
|
185
|
+
if (hasOwnProperty(chart, 'column_groupby_mutiple_numeric_column')) {
|
|
193
186
|
convertedChart.column_groupby_multiple_numeric_column = chart.column_groupby_mutiple_numeric_column;
|
|
194
187
|
}
|
|
195
|
-
if (
|
|
188
|
+
if (hasOwnProperty(chart, 'y_axis_left_group_by_mutiple_numeric_column')) {
|
|
196
189
|
convertedChart.y_axis_left_group_by_multiple_numeric_column = chart.y_axis_left_group_by_mutiple_numeric_column;
|
|
197
190
|
}
|
|
198
191
|
return convertedChart;
|
|
@@ -247,7 +240,7 @@ class DashBoardService {
|
|
|
247
240
|
payload
|
|
248
241
|
} = _ref2;
|
|
249
242
|
switch (action) {
|
|
250
|
-
case
|
|
243
|
+
case DASHBOARD_ACTION_TYPE.MODIFY_COLOR_THEME:
|
|
251
244
|
{
|
|
252
245
|
const {
|
|
253
246
|
colorThemeName
|
|
@@ -260,7 +253,7 @@ class DashBoardService {
|
|
|
260
253
|
});
|
|
261
254
|
break;
|
|
262
255
|
}
|
|
263
|
-
case
|
|
256
|
+
case DASHBOARD_ACTION_TYPE.ADD_DASHBOARD:
|
|
264
257
|
{
|
|
265
258
|
const {
|
|
266
259
|
dashboard
|
|
@@ -268,7 +261,7 @@ class DashBoardService {
|
|
|
268
261
|
this.statistics = [...this.statistics, dashboard];
|
|
269
262
|
break;
|
|
270
263
|
}
|
|
271
|
-
case
|
|
264
|
+
case DASHBOARD_ACTION_TYPE.RENAME_DASHBOARD:
|
|
272
265
|
{
|
|
273
266
|
const {
|
|
274
267
|
index,
|
|
@@ -282,7 +275,7 @@ class DashBoardService {
|
|
|
282
275
|
this.statistics = updatedStatistics;
|
|
283
276
|
break;
|
|
284
277
|
}
|
|
285
|
-
case
|
|
278
|
+
case DASHBOARD_ACTION_TYPE.DELETE_DASHBOARD:
|
|
286
279
|
{
|
|
287
280
|
const {
|
|
288
281
|
index
|
|
@@ -295,7 +288,7 @@ class DashBoardService {
|
|
|
295
288
|
this.statistics = updatedStatistics;
|
|
296
289
|
break;
|
|
297
290
|
}
|
|
298
|
-
case
|
|
291
|
+
case DASHBOARD_ACTION_TYPE.MOVE_DASHBOARD:
|
|
299
292
|
{
|
|
300
293
|
const {
|
|
301
294
|
draggedDashboardId,
|
|
@@ -323,7 +316,7 @@ class DashBoardService {
|
|
|
323
316
|
this.statistics = updatedStatistics;
|
|
324
317
|
break;
|
|
325
318
|
}
|
|
326
|
-
case
|
|
319
|
+
case DASHBOARD_ACTION_TYPE.MODIFY_DASHBOARD_LAYOUT:
|
|
327
320
|
{
|
|
328
321
|
const {
|
|
329
322
|
index,
|
|
@@ -365,7 +358,7 @@ class DashBoardService {
|
|
|
365
358
|
this.statistics = updatedStatistics;
|
|
366
359
|
break;
|
|
367
360
|
}
|
|
368
|
-
case
|
|
361
|
+
case DASHBOARD_ACTION_TYPE.ADD_CHART:
|
|
369
362
|
{
|
|
370
363
|
const {
|
|
371
364
|
index,
|
|
@@ -390,7 +383,7 @@ class DashBoardService {
|
|
|
390
383
|
this.statistics = updatedStatistics;
|
|
391
384
|
break;
|
|
392
385
|
}
|
|
393
|
-
case
|
|
386
|
+
case DASHBOARD_ACTION_TYPE.DELETE_CHART:
|
|
394
387
|
{
|
|
395
388
|
const {
|
|
396
389
|
index,
|
|
@@ -409,7 +402,7 @@ class DashBoardService {
|
|
|
409
402
|
this.statistics = updatedStatistics;
|
|
410
403
|
break;
|
|
411
404
|
}
|
|
412
|
-
case
|
|
405
|
+
case DASHBOARD_ACTION_TYPE.MODIFY_CHART:
|
|
413
406
|
{
|
|
414
407
|
const {
|
|
415
408
|
index,
|
|
@@ -429,7 +422,7 @@ class DashBoardService {
|
|
|
429
422
|
this.statistics = updatedStatistics;
|
|
430
423
|
break;
|
|
431
424
|
}
|
|
432
|
-
case
|
|
425
|
+
case DASHBOARD_ACTION_TYPE.MOVE_CHART_TO_VIEW:
|
|
433
426
|
{
|
|
434
427
|
const {
|
|
435
428
|
index,
|
|
@@ -450,7 +443,7 @@ class DashBoardService {
|
|
|
450
443
|
if (!Array.isArray(targetDashboard.stat_items)) {
|
|
451
444
|
targetDashboard.stat_items = [];
|
|
452
445
|
} else {
|
|
453
|
-
newChartId =
|
|
446
|
+
newChartId = generatorUniqueId(targetDashboard.statItems);
|
|
454
447
|
}
|
|
455
448
|
movedChart = Object.assign(movedChart, {
|
|
456
449
|
_id: newChartId,
|
|
@@ -474,4 +467,4 @@ class DashBoardService {
|
|
|
474
467
|
return this.getStatistics();
|
|
475
468
|
}
|
|
476
469
|
}
|
|
477
|
-
|
|
470
|
+
export default DashBoardService;
|
package/es/service/map-json.js
CHANGED
|
@@ -1,11 +1,5 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
Object.defineProperty(exports, "__esModule", {
|
|
4
|
-
value: true
|
|
5
|
-
});
|
|
6
|
-
exports.MapJsonService = void 0;
|
|
7
|
-
var _map = require("../constants/map");
|
|
8
|
-
var _regions = require("../constants/regions");
|
|
1
|
+
import { MAP_LEVEL } from '../constants/map';
|
|
2
|
+
import { regions } from '../constants/regions';
|
|
9
3
|
class MapJsonService {
|
|
10
4
|
constructor(_ref) {
|
|
11
5
|
let {
|
|
@@ -18,7 +12,7 @@ class MapJsonService {
|
|
|
18
12
|
}
|
|
19
13
|
getNameEnByMapLocation(mapLocation) {
|
|
20
14
|
const provinceName = mapLocation && mapLocation.province;
|
|
21
|
-
const province = provinceName &&
|
|
15
|
+
const province = provinceName && regions.find(province => province.name === provinceName);
|
|
22
16
|
if (!province) return null;
|
|
23
17
|
let nameEN = {
|
|
24
18
|
province_name_en: province.name_en
|
|
@@ -40,15 +34,15 @@ class MapJsonService {
|
|
|
40
34
|
*/
|
|
41
35
|
getMapJsonQueryUrl(mapLevel, mapLocation) {
|
|
42
36
|
switch (mapLevel) {
|
|
43
|
-
case
|
|
37
|
+
case MAP_LEVEL.WORLD:
|
|
44
38
|
{
|
|
45
39
|
return 'world';
|
|
46
40
|
}
|
|
47
|
-
case
|
|
41
|
+
case MAP_LEVEL.COUNTRY:
|
|
48
42
|
{
|
|
49
43
|
return 'china';
|
|
50
44
|
}
|
|
51
|
-
case
|
|
45
|
+
case MAP_LEVEL.PROVINCE:
|
|
52
46
|
{
|
|
53
47
|
const nameEn = this.getNameEnByMapLocation(mapLocation);
|
|
54
48
|
const provinceNameEn = nameEn && nameEn.province_name_en;
|
|
@@ -57,7 +51,7 @@ class MapJsonService {
|
|
|
57
51
|
}
|
|
58
52
|
return "region-mapjson/".concat(provinceNameEn, "/").concat(provinceNameEn);
|
|
59
53
|
}
|
|
60
|
-
case
|
|
54
|
+
case MAP_LEVEL.CITY:
|
|
61
55
|
{
|
|
62
56
|
const nameEn = this.getNameEnByMapLocation(mapLocation);
|
|
63
57
|
const provinceNameEn = nameEn && nameEn.province_name_en;
|
|
@@ -137,4 +131,4 @@ class MapJsonService {
|
|
|
137
131
|
delete this.urlMapJsonQuerying[url];
|
|
138
132
|
}
|
|
139
133
|
}
|
|
140
|
-
|
|
134
|
+
export { MapJsonService };
|
|
@@ -1,13 +1,6 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
Object.defineProperty(exports, "__esModule", {
|
|
5
|
-
value: true
|
|
6
|
-
});
|
|
7
|
-
exports.default = void 0;
|
|
8
|
-
var _react = _interopRequireWildcard(require("react"));
|
|
9
|
-
var _reactstrap = require("reactstrap");
|
|
10
|
-
class ChartNameEditor extends _react.Component {
|
|
1
|
+
import React, { Component, Fragment } from 'react';
|
|
2
|
+
import { Input } from 'reactstrap';
|
|
3
|
+
class ChartNameEditor extends Component {
|
|
11
4
|
constructor(props) {
|
|
12
5
|
super(props);
|
|
13
6
|
this.onRenameToggle = () => {
|
|
@@ -48,21 +41,21 @@ class ChartNameEditor extends _react.Component {
|
|
|
48
41
|
name,
|
|
49
42
|
editable
|
|
50
43
|
} = this.state;
|
|
51
|
-
return /*#__PURE__*/
|
|
44
|
+
return /*#__PURE__*/React.createElement("div", {
|
|
52
45
|
className: "statistic-chart-editing-name"
|
|
53
|
-
}, editable ? /*#__PURE__*/
|
|
46
|
+
}, editable ? /*#__PURE__*/React.createElement(Input, {
|
|
54
47
|
defaultValue: name,
|
|
55
48
|
className: "statistic-rename",
|
|
56
49
|
onBlur: this.updateStatName,
|
|
57
50
|
autoFocus: true,
|
|
58
51
|
onChange: this.onChange,
|
|
59
52
|
onKeyDown: this.onKeyDown
|
|
60
|
-
}) : /*#__PURE__*/
|
|
53
|
+
}) : /*#__PURE__*/React.createElement(Fragment, null, /*#__PURE__*/React.createElement("span", {
|
|
61
54
|
className: "statistic-table-title-name"
|
|
62
|
-
}, name), /*#__PURE__*/
|
|
55
|
+
}, name), /*#__PURE__*/React.createElement("span", {
|
|
63
56
|
className: "dtable-font dtable-icon-rename",
|
|
64
57
|
onClick: this.onRenameToggle
|
|
65
58
|
})));
|
|
66
59
|
}
|
|
67
60
|
}
|
|
68
|
-
|
|
61
|
+
export default ChartNameEditor;
|
package/es/stat-editor/index.js
CHANGED
|
@@ -1,18 +1,10 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
exports.default = void 0;
|
|
9
|
-
var _react = _interopRequireWildcard(require("react"));
|
|
10
|
-
var _chartNameEditor = _interopRequireDefault(require("./chart-name-editor"));
|
|
11
|
-
var _statView = _interopRequireDefault(require("../stat-view"));
|
|
12
|
-
var _basicChartSettings = _interopRequireDefault(require("./stat-settings/basic-chart-settings"));
|
|
13
|
-
var _advanceChartSettings = _interopRequireDefault(require("./stat-settings/advance-chart-settings"));
|
|
14
|
-
var _constants = require("../constants");
|
|
15
|
-
class StatEditor extends _react.Component {
|
|
1
|
+
import React, { Component } from 'react';
|
|
2
|
+
import ChartNameEditor from './chart-name-editor';
|
|
3
|
+
import StatView from '../stat-view';
|
|
4
|
+
import BasicChartSettings from './stat-settings/basic-chart-settings';
|
|
5
|
+
import AdvancedChartSettings from './stat-settings/advance-chart-settings';
|
|
6
|
+
import { BASIC_STAT_TYPES, STAT_TYPE } from '../constants';
|
|
7
|
+
class StatEditor extends Component {
|
|
16
8
|
render() {
|
|
17
9
|
const {
|
|
18
10
|
getTables,
|
|
@@ -27,17 +19,17 @@ class StatEditor extends _react.Component {
|
|
|
27
19
|
const {
|
|
28
20
|
type
|
|
29
21
|
} = statItem;
|
|
30
|
-
const showStatName = !(type ===
|
|
31
|
-
return /*#__PURE__*/
|
|
22
|
+
const showStatName = !(type === STAT_TYPE.BASIC_NUMBER_CARD || type === STAT_TYPE.DASHBOARD);
|
|
23
|
+
return /*#__PURE__*/React.createElement("div", {
|
|
32
24
|
className: "statistic-chart-edit-container"
|
|
33
|
-
}, /*#__PURE__*/
|
|
25
|
+
}, /*#__PURE__*/React.createElement("div", {
|
|
34
26
|
className: "statistic-stat-wrapper"
|
|
35
|
-
}, showStatName && /*#__PURE__*/
|
|
27
|
+
}, showStatName && /*#__PURE__*/React.createElement(ChartNameEditor, {
|
|
36
28
|
name: statItem.name,
|
|
37
29
|
updateStatName: this.props.modifyChartName
|
|
38
|
-
}), /*#__PURE__*/
|
|
30
|
+
}), /*#__PURE__*/React.createElement("div", {
|
|
39
31
|
className: "statistic-chart-view-container"
|
|
40
|
-
}, /*#__PURE__*/
|
|
32
|
+
}, /*#__PURE__*/React.createElement(StatView, {
|
|
41
33
|
isEdit: true,
|
|
42
34
|
isPreview: false,
|
|
43
35
|
isEnlarge: false,
|
|
@@ -51,7 +43,7 @@ class StatEditor extends _react.Component {
|
|
|
51
43
|
queryMapJson: this.props.queryMapJson,
|
|
52
44
|
updateStatItem: this.props.modifyChart,
|
|
53
45
|
toggleStatisticRecordsDialog: this.props.toggleStatisticRecordsDialog
|
|
54
|
-
}))),
|
|
46
|
+
}))), BASIC_STAT_TYPES.includes(statItem.type) ? /*#__PURE__*/React.createElement(BasicChartSettings, {
|
|
55
47
|
statItem: statItem,
|
|
56
48
|
labelColorConfigs: labelColorConfigs,
|
|
57
49
|
eventBus: eventBus,
|
|
@@ -60,7 +52,7 @@ class StatEditor extends _react.Component {
|
|
|
60
52
|
getTableById: getTableById,
|
|
61
53
|
getConvertedChart: this.props.getConvertedChart,
|
|
62
54
|
updateStatItem: this.props.modifyChart
|
|
63
|
-
}) : /*#__PURE__*/
|
|
55
|
+
}) : /*#__PURE__*/React.createElement(AdvancedChartSettings, {
|
|
64
56
|
statItem: statItem,
|
|
65
57
|
labelColorConfigs: labelColorConfigs,
|
|
66
58
|
eventBus: eventBus,
|
|
@@ -72,4 +64,4 @@ class StatEditor extends _react.Component {
|
|
|
72
64
|
}));
|
|
73
65
|
}
|
|
74
66
|
}
|
|
75
|
-
|
|
67
|
+
export default StatEditor;
|
|
@@ -1,19 +1,11 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
}
|
|
8
|
-
|
|
9
|
-
var _react = _interopRequireWildcard(require("react"));
|
|
10
|
-
var _reactstrap = require("reactstrap");
|
|
11
|
-
var _reactIntlUniversal = _interopRequireDefault(require("react-intl-universal"));
|
|
12
|
-
var _columnSettings = _interopRequireDefault(require("../public-setting/column-settings"));
|
|
13
|
-
var _components = require("../../../components");
|
|
14
|
-
var _baseSettings = _interopRequireDefault(require("../public-setting/base-settings"));
|
|
15
|
-
var _constants = require("../../../constants");
|
|
16
|
-
class BasicNumberCardSettings extends _react.Component {
|
|
1
|
+
import React, { Component, Fragment } from 'react';
|
|
2
|
+
import { Input } from 'reactstrap';
|
|
3
|
+
import intl from 'react-intl-universal';
|
|
4
|
+
import ColumnSettings from '../public-setting/column-settings';
|
|
5
|
+
import { DTableSelect } from '../../../components';
|
|
6
|
+
import BaseSettings from '../public-setting/base-settings';
|
|
7
|
+
import { STATISTICS_COUNT_SHOW, SUMMARY_METHOD } from '../../../constants';
|
|
8
|
+
class BasicNumberCardSettings extends Component {
|
|
17
9
|
constructor(props) {
|
|
18
10
|
super(props);
|
|
19
11
|
this.getSelectedStatColumnOption = () => {
|
|
@@ -30,12 +22,12 @@ class BasicNumberCardSettings extends _react.Component {
|
|
|
30
22
|
}));
|
|
31
23
|
};
|
|
32
24
|
this.getSummaryMethodsOptions = () => {
|
|
33
|
-
let numberCardSummaryMethod = ['Row_count', ...
|
|
25
|
+
let numberCardSummaryMethod = ['Row_count', ...SUMMARY_METHOD];
|
|
34
26
|
return numberCardSummaryMethod.map(method => {
|
|
35
27
|
return {
|
|
36
|
-
label: /*#__PURE__*/
|
|
28
|
+
label: /*#__PURE__*/React.createElement("span", {
|
|
37
29
|
className: "select-option-name"
|
|
38
|
-
},
|
|
30
|
+
}, intl.get(STATISTICS_COUNT_SHOW[method])),
|
|
39
31
|
value: method
|
|
40
32
|
};
|
|
41
33
|
});
|
|
@@ -54,9 +46,9 @@ class BasicNumberCardSettings extends _react.Component {
|
|
|
54
46
|
summary_method
|
|
55
47
|
} = statItem;
|
|
56
48
|
let selectedMethodOption = this.getSelectedMethodOption(summary_method, this.summaryMethodsOptions);
|
|
57
|
-
return /*#__PURE__*/
|
|
49
|
+
return /*#__PURE__*/React.createElement("div", {
|
|
58
50
|
className: "statistic-chart-parameter-item"
|
|
59
|
-
}, /*#__PURE__*/
|
|
51
|
+
}, /*#__PURE__*/React.createElement("label", null, intl.get('Summary_method')), /*#__PURE__*/React.createElement(DTableSelect, {
|
|
60
52
|
value: selectedMethodOption,
|
|
61
53
|
onChange: this.onSelectSummaryMethod,
|
|
62
54
|
options: this.summaryMethodsOptions
|
|
@@ -86,9 +78,9 @@ class BasicNumberCardSettings extends _react.Component {
|
|
|
86
78
|
const {
|
|
87
79
|
statName
|
|
88
80
|
} = this.state;
|
|
89
|
-
return /*#__PURE__*/
|
|
81
|
+
return /*#__PURE__*/React.createElement(Fragment, null, /*#__PURE__*/React.createElement("div", {
|
|
90
82
|
className: "statistic-chart-parameter-item"
|
|
91
|
-
}, /*#__PURE__*/
|
|
83
|
+
}, /*#__PURE__*/React.createElement("label", null, intl.get('Label')), /*#__PURE__*/React.createElement(Input, {
|
|
92
84
|
type: "text",
|
|
93
85
|
value: statName,
|
|
94
86
|
placeholder: statItem.name,
|
|
@@ -128,7 +120,7 @@ class BasicNumberCardSettings extends _react.Component {
|
|
|
128
120
|
if (settingType === 'style') {
|
|
129
121
|
return this.getStyleSetting();
|
|
130
122
|
}
|
|
131
|
-
return /*#__PURE__*/
|
|
123
|
+
return /*#__PURE__*/React.createElement(Fragment, null, /*#__PURE__*/React.createElement(BaseSettings, {
|
|
132
124
|
statItem: statItem,
|
|
133
125
|
selectedTableId: selectedTableId,
|
|
134
126
|
selectedViewId: statItem.view_id,
|
|
@@ -137,17 +129,17 @@ class BasicNumberCardSettings extends _react.Component {
|
|
|
137
129
|
getTableById: this.props.getTableById,
|
|
138
130
|
getConvertedChart: this.props.getConvertedChart,
|
|
139
131
|
updateStatItem: updateStatItem
|
|
140
|
-
}), /*#__PURE__*/
|
|
132
|
+
}), /*#__PURE__*/React.createElement("div", {
|
|
141
133
|
className: "statistic-chart-parameter-divider"
|
|
142
|
-
}), /*#__PURE__*/
|
|
134
|
+
}), /*#__PURE__*/React.createElement("div", {
|
|
143
135
|
className: "statistic-chart-parameter-item"
|
|
144
|
-
}, /*#__PURE__*/
|
|
136
|
+
}, /*#__PURE__*/React.createElement("label", null, intl.get('Statistic_field')), /*#__PURE__*/React.createElement(ColumnSettings, {
|
|
145
137
|
columnsOptions: this.numericColumnOptions,
|
|
146
138
|
selectedColumnOption: selectedColumnOption,
|
|
147
139
|
onChangeSelectedColumn: this.onSelectStatColumn
|
|
148
|
-
})), /*#__PURE__*/
|
|
140
|
+
})), /*#__PURE__*/React.createElement("div", {
|
|
149
141
|
className: "statistic-chart-parameter-item"
|
|
150
142
|
}, this.renderSummaryMethod()));
|
|
151
143
|
}
|
|
152
144
|
}
|
|
153
|
-
|
|
145
|
+
export default BasicNumberCardSettings;
|