@zgfe/modules-event 0.0.2-event.32 → 0.0.2-event.34
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.
|
@@ -98,7 +98,7 @@ var EventChart = function EventChart(props) {
|
|
|
98
98
|
if (!res) {
|
|
99
99
|
return;
|
|
100
100
|
}
|
|
101
|
-
var _data = getChartDataEventAliasName(res.data, eventGroupList, params.userGroup.length);
|
|
101
|
+
var _data = params.dimension ? res.data : getChartDataEventAliasName(res.data, eventGroupList, params.userGroup.length);
|
|
102
102
|
console.log('chartData?.length-2', _data);
|
|
103
103
|
if (params.userGroup.length > 1) {
|
|
104
104
|
setDataSource(getUserGroupsCompareData(_data));
|
|
@@ -78,6 +78,13 @@ var EventContent = function EventContent(props) {
|
|
|
78
78
|
}
|
|
79
79
|
} else {
|
|
80
80
|
setEnableSelectChart(false);
|
|
81
|
+
if (searchData.chartType === 'map') {
|
|
82
|
+
setSearchData(function (data) {
|
|
83
|
+
return _objectSpread(_objectSpread({}, data), {}, {
|
|
84
|
+
chartType: 'line'
|
|
85
|
+
});
|
|
86
|
+
});
|
|
87
|
+
}
|
|
81
88
|
}
|
|
82
89
|
}
|
|
83
90
|
if (timer) clearTimeout(timer);
|
|
@@ -119,7 +126,7 @@ var EventContent = function EventContent(props) {
|
|
|
119
126
|
return;
|
|
120
127
|
}
|
|
121
128
|
var result = res.data;
|
|
122
|
-
var _data = getChartDataEventAliasName(result, eventGroupList, searchData.userGroup.length);
|
|
129
|
+
var _data = searchData.dimension ? result : getChartDataEventAliasName(result, eventGroupList, searchData.userGroup.length);
|
|
123
130
|
setShowList(_data ? getDefaultShow(_data) : []);
|
|
124
131
|
setEventData(getUserGroupsCompareData(_data));
|
|
125
132
|
setFinalSearchData(_objectSpread({}, searchData));
|