@zgfe/modules-event 1.0.29-zhongyuan1.0 → 1.0.29-zhongyuanE.2
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.
|
@@ -68,40 +68,37 @@ var EventFilter = function EventFilter(props) {
|
|
|
68
68
|
_useState12 = _slicedToArray(_useState11, 2),
|
|
69
69
|
filter = _useState12[0],
|
|
70
70
|
setFilter = _useState12[1];
|
|
71
|
-
var
|
|
72
|
-
|
|
73
|
-
bizAttributeSelectorValue = _useState14[0],
|
|
74
|
-
setBizAttributeSelectorValue = _useState14[1];
|
|
75
|
-
var _useState15 = useState(_.isArray(props.value) ? props.value.map(function (id) {
|
|
71
|
+
var bizAttributeSelectorValue = useRef();
|
|
72
|
+
var _useState13 = useState(_.isArray(props.value) ? props.value.map(function (id) {
|
|
76
73
|
return eventIdMap[id];
|
|
77
74
|
}) : props.analysisType === 'eventProp' && ((_props$value = props.value) === null || _props$value === void 0 ? void 0 : _props$value.id) ? [eventIdMap[(_props$value2 = props.value) === null || _props$value2 === void 0 ? void 0 : _props$value2.id]] : []),
|
|
75
|
+
_useState14 = _slicedToArray(_useState13, 2),
|
|
76
|
+
eventList = _useState14[0],
|
|
77
|
+
setEventList = _useState14[1];
|
|
78
|
+
var _useState15 = useState(true),
|
|
78
79
|
_useState16 = _slicedToArray(_useState15, 2),
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
var _useState17 = useState(
|
|
80
|
+
isCascadeOpen = _useState16[0],
|
|
81
|
+
setIsCascadeOpen = _useState16[1];
|
|
82
|
+
var _useState17 = useState(false),
|
|
82
83
|
_useState18 = _slicedToArray(_useState17, 2),
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
var _useState19 = useState(
|
|
84
|
+
isCascadeShow = _useState18[0],
|
|
85
|
+
setIsCascadeShow = _useState18[1];
|
|
86
|
+
var _useState19 = useState(),
|
|
86
87
|
_useState20 = _slicedToArray(_useState19, 2),
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
var _useState21 = useState(),
|
|
90
|
-
_useState22 = _slicedToArray(_useState21, 2),
|
|
91
|
-
relationConfig = _useState22[0],
|
|
92
|
-
setRelationConfig = _useState22[1];
|
|
88
|
+
relationConfig = _useState20[0],
|
|
89
|
+
setRelationConfig = _useState20[1];
|
|
93
90
|
useEffect(function () {
|
|
94
91
|
var _data = props.value;
|
|
95
92
|
if (_data) {
|
|
96
93
|
if (_data && _data.id) {
|
|
97
94
|
setShowDimension(true);
|
|
98
95
|
}
|
|
99
|
-
if (_data.filters) {
|
|
100
|
-
setFilter(_data.filters);
|
|
101
|
-
setCount(_data.filters.conditions.length);
|
|
96
|
+
if (_data === null || _data === void 0 ? void 0 : _data.filters) {
|
|
97
|
+
setFilter(_data === null || _data === void 0 ? void 0 : _data.filters);
|
|
98
|
+
setCount(_data === null || _data === void 0 ? void 0 : _data.filters.conditions.length);
|
|
102
99
|
}
|
|
103
100
|
if (_data.dimension) {
|
|
104
|
-
|
|
101
|
+
bizAttributeSelectorValue.current = _objectSpread({}, _data.dimension);
|
|
105
102
|
}
|
|
106
103
|
}
|
|
107
104
|
ajax(Apis.getEventSwitch, {
|
|
@@ -187,17 +184,17 @@ var EventFilter = function EventFilter(props) {
|
|
|
187
184
|
setGroup(event.group);
|
|
188
185
|
}
|
|
189
186
|
setEventList([]);
|
|
190
|
-
|
|
187
|
+
bizAttributeSelectorValue.current = undefined;
|
|
191
188
|
setFilter(undefined);
|
|
192
189
|
setIsAdd(false);
|
|
193
190
|
setCount(0);
|
|
194
191
|
};
|
|
195
192
|
var onChangeAttr = function onChangeAttr(attr) {
|
|
196
193
|
if (attr === undefined) {
|
|
197
|
-
|
|
194
|
+
bizAttributeSelectorValue.current = undefined;
|
|
198
195
|
} else {
|
|
199
196
|
var _value = attr.propCategory === 'eventProp' ? attr.id : attr.name;
|
|
200
|
-
|
|
197
|
+
bizAttributeSelectorValue.current = _objectSpread(_objectSpread({}, attr), {}, {
|
|
201
198
|
propCategory: attr.propCategory,
|
|
202
199
|
category: attr.category,
|
|
203
200
|
value: _value,
|
|
@@ -219,8 +216,8 @@ var EventFilter = function EventFilter(props) {
|
|
|
219
216
|
if (filter) {
|
|
220
217
|
_event.filters = filter;
|
|
221
218
|
}
|
|
222
|
-
if (bizAttributeSelectorValue) {
|
|
223
|
-
var _dimension = _.cloneDeep(bizAttributeSelectorValue);
|
|
219
|
+
if (bizAttributeSelectorValue.current) {
|
|
220
|
+
var _dimension = _.cloneDeep(bizAttributeSelectorValue.current);
|
|
224
221
|
setEnableSelectChart && setEnableSelectChart(judgeIsArea(_dimension.value));
|
|
225
222
|
setIsCity && setIsCity(judgeIsCity(_dimension.value));
|
|
226
223
|
if (!judgeIsArea(_dimension.value)) {
|
|
@@ -232,7 +229,7 @@ var EventFilter = function EventFilter(props) {
|
|
|
232
229
|
_event.eventGroupId = group.id !== 0 ? group.id : undefined;
|
|
233
230
|
props.onChange && props.onChange(_event);
|
|
234
231
|
}
|
|
235
|
-
}, [bizAttributeSelectorValue, filter, event, group, eventList]);
|
|
232
|
+
}, [bizAttributeSelectorValue.current, filter, event, group, eventList]);
|
|
236
233
|
return /*#__PURE__*/React.createElement("div", {
|
|
237
234
|
className: classPrefix
|
|
238
235
|
}, /*#__PURE__*/React.createElement("div", {
|
|
@@ -255,7 +252,7 @@ var EventFilter = function EventFilter(props) {
|
|
|
255
252
|
enableUserProp: analysisType === 'eventProp' ? false : true,
|
|
256
253
|
enableEnvProp: true,
|
|
257
254
|
eventIdList: [event === null || event === void 0 ? void 0 : event.id],
|
|
258
|
-
value: bizAttributeSelectorValue,
|
|
255
|
+
value: bizAttributeSelectorValue.current,
|
|
259
256
|
enableDelete: true,
|
|
260
257
|
onChange: onChangeAttr,
|
|
261
258
|
onDelete: function onDelete() {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@zgfe/modules-event",
|
|
3
|
-
"version": "1.0.29-
|
|
3
|
+
"version": "1.0.29-zhongyuanE.2",
|
|
4
4
|
"module": "es/index.js",
|
|
5
5
|
"typings": "es/index.d.ts",
|
|
6
6
|
"private": false,
|
|
@@ -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": "38dc1e7a327050b52776054192a67c9516238e1f",
|
|
58
58
|
"gitHooks": {
|
|
59
59
|
"pre-commit": "lint-staged"
|
|
60
60
|
}
|