@zgfe/modules-event 1.0.29-zhongyuan.2 → 1.0.29-zhongyuan.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.
|
@@ -95,7 +95,7 @@ var SearchPanel = function SearchPanel(props) {
|
|
|
95
95
|
}, /*#__PURE__*/React.createElement(BizDatePickerV2, {
|
|
96
96
|
defaultValue: time,
|
|
97
97
|
onChange: onChangeTime,
|
|
98
|
-
selectRange:
|
|
98
|
+
selectRange: 6000,
|
|
99
99
|
selectRangeUnit: "days"
|
|
100
100
|
}), /*#__PURE__*/React.createElement(BizTargetDimension, {
|
|
101
101
|
normalOptions: currentNormalOptions,
|
|
@@ -165,9 +165,9 @@ var EventContent = /*#__PURE__*/React.forwardRef(function (props, ref) {
|
|
|
165
165
|
if (['bar', 'pie', 'map'].indexOf(searchData.chartType) !== -1) {
|
|
166
166
|
_data = getSortData(_data);
|
|
167
167
|
} else {
|
|
168
|
-
var
|
|
168
|
+
var _data2, _data2$series$;
|
|
169
169
|
_sortData = sortOriginalData(dataTemp, {
|
|
170
|
-
columnKey: "field".concat(((_data$series$ =
|
|
170
|
+
columnKey: "field".concat(((_data2 = _data) === null || _data2 === void 0 ? void 0 : (_data2$series$ = _data2.series[0]) === null || _data2$series$ === void 0 ? void 0 : _data2$series$.values.length) - 1),
|
|
171
171
|
order: 'descend'
|
|
172
172
|
});
|
|
173
173
|
}
|
|
@@ -8,8 +8,9 @@ import { ajax } from '@zgfe/business-lib';
|
|
|
8
8
|
import { Apis } from '../../constants';
|
|
9
9
|
import _ from 'lodash';
|
|
10
10
|
export var getMapChartData = function getMapChartData(data) {
|
|
11
|
+
var _data$series;
|
|
11
12
|
var _data = _.cloneDeep(data);
|
|
12
|
-
_data.series.map(function (item) {
|
|
13
|
+
_data === null || _data === void 0 ? void 0 : (_data$series = _data.series) === null || _data$series === void 0 ? void 0 : _data$series.map(function (item) {
|
|
13
14
|
if (item.names.length > 1) {
|
|
14
15
|
if (item.names[1] === '新疆维吾尔自治区') {
|
|
15
16
|
item.names = [item.names[0], '新疆'];
|
package/es/utils/formData.js
CHANGED
|
@@ -192,7 +192,7 @@ export function getColumns(eventGroupList, userPropList, eventEnvList, columnDat
|
|
|
192
192
|
export function getChartDataEventAliasName(dataSource, eventGroupList) {
|
|
193
193
|
var data = _.cloneDeep(dataSource);
|
|
194
194
|
var series = [];
|
|
195
|
-
data.series.map(function (item) {
|
|
195
|
+
data === null || data === void 0 ? void 0 : data.series.map(function (item) {
|
|
196
196
|
item.originalNames = item.names;
|
|
197
197
|
item.names = item.names.length > 1 ? [item.names[0], getEventAliasName(item.names[1], eventGroupList)] : [getEventAliasName(item.names[0], eventGroupList)];
|
|
198
198
|
series.push(item);
|
|
@@ -223,7 +223,7 @@ export function getEventAliasId(name, eventGroupList) {
|
|
|
223
223
|
return eventId;
|
|
224
224
|
}
|
|
225
225
|
export function getSortData(data) {
|
|
226
|
-
var series = data.series;
|
|
226
|
+
var series = data === null || data === void 0 ? void 0 : data.series;
|
|
227
227
|
var sort = function sort(obj1, obj2) {
|
|
228
228
|
var val1 = obj1.values[0];
|
|
229
229
|
var val2 = obj2.values[0];
|
|
@@ -239,20 +239,20 @@ export function getSortData(data) {
|
|
|
239
239
|
return data;
|
|
240
240
|
}
|
|
241
241
|
export function getUserGroupsCompareData(data) {
|
|
242
|
-
if (data.series.length <= 0) {
|
|
242
|
+
if ((data === null || data === void 0 ? void 0 : data.series.length) <= 0) {
|
|
243
243
|
return data;
|
|
244
244
|
} else {
|
|
245
245
|
var _data = _.cloneDeep(data);
|
|
246
246
|
var _series = [];
|
|
247
|
-
_data.series.map(function (item, index) {
|
|
247
|
+
_data === null || _data === void 0 ? void 0 : _data.series.map(function (item, index) {
|
|
248
248
|
_series.push(item);
|
|
249
|
-
_data.series.map(function (_item, _index) {
|
|
249
|
+
_data === null || _data === void 0 ? void 0 : _data.series.map(function (_item, _index) {
|
|
250
250
|
if (item.names[1] === _item.names[1] && index !== _index) {
|
|
251
251
|
_series.push(_item);
|
|
252
|
-
delete _data.series[_index];
|
|
252
|
+
_data === null || _data === void 0 ? true : delete _data.series[_index];
|
|
253
253
|
}
|
|
254
254
|
});
|
|
255
|
-
delete _data.series[index];
|
|
255
|
+
_data === null || _data === void 0 ? true : delete _data.series[index];
|
|
256
256
|
});
|
|
257
257
|
_data.series = _series;
|
|
258
258
|
return _data;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@zgfe/modules-event",
|
|
3
|
-
"version": "1.0.29-zhongyuan.
|
|
3
|
+
"version": "1.0.29-zhongyuan.4",
|
|
4
4
|
"module": "es/index.js",
|
|
5
5
|
"typings": "es/index.d.ts",
|
|
6
6
|
"private": false,
|
|
@@ -41,7 +41,7 @@
|
|
|
41
41
|
"@types/lodash": "^4.14.191",
|
|
42
42
|
"@umijs/fabric": "^2.8.1",
|
|
43
43
|
"@umijs/test": "^3.0.5",
|
|
44
|
-
"@zgfe/business-lib": "1.2.70-hxd.
|
|
44
|
+
"@zgfe/business-lib": "1.2.70-hxd.5",
|
|
45
45
|
"antd": "^4.22.6",
|
|
46
46
|
"dumi": "^1.1.0",
|
|
47
47
|
"echarts": "^5.3.2",
|
|
@@ -54,7 +54,7 @@
|
|
|
54
54
|
"react": "^16.12.0 || ^17.0.0",
|
|
55
55
|
"yorkie": "^2.0.0"
|
|
56
56
|
},
|
|
57
|
-
"gitHead": "
|
|
57
|
+
"gitHead": "3efe679cc2e7965b79c2a546d0bbf8383e1e35b8",
|
|
58
58
|
"gitHooks": {
|
|
59
59
|
"pre-commit": "lint-staged"
|
|
60
60
|
}
|