@zgfe/modules-event 1.0.29-zhongyuanE.7 → 1.0.29-zhongyuanE.9

package/es/components/eventFilter/index.js

@@ -69,25 +69,28 @@ var EventFilter = function EventFilter(props) {
     _useState12 = _slicedToArray(_useState11, 2),
     filter = _useState12[0],
     setFilter = _useState12[1];
-  var bizAttributeSelectorValue = useRef();
-  var _useState13 = useState(_.isArray(props.value) ? props.value.map(function (id) {
+  var _useState13 = useState(),
+    _useState14 = _slicedToArray(_useState13, 2),
+    bizAttributeSelectorValue = _useState14[0],
+    setBizAttributeSelectorValue = _useState14[1];
+  var _useState15 = useState(_.isArray(props.value) ? props.value.map(function (id) {
       return eventIdMap[id];
     }) : 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]] : []),
-    _useState14 = _slicedToArray(_useState13, 2),
-    eventList = _useState14[0],
-    setEventList = _useState14[1];
-  var _useState15 = useState(true),
     _useState16 = _slicedToArray(_useState15, 2),
-    isCascadeOpen = _useState16[0],
-    setIsCascadeOpen = _useState16[1];
-  var _useState17 = useState(false),
+    eventList = _useState16[0],
+    setEventList = _useState16[1];
+  var _useState17 = useState(true),
     _useState18 = _slicedToArray(_useState17, 2),
-    isCascadeShow = _useState18[0],
-    setIsCascadeShow = _useState18[1];
-  var _useState19 = useState(),
+    isCascadeOpen = _useState18[0],
+    setIsCascadeOpen = _useState18[1];
+  var _useState19 = useState(false),
     _useState20 = _slicedToArray(_useState19, 2),
-    relationConfig = _useState20[0],
-    setRelationConfig = _useState20[1];
+    isCascadeShow = _useState20[0],
+    setIsCascadeShow = _useState20[1];
+  var _useState21 = useState(),
+    _useState22 = _slicedToArray(_useState21, 2),
+    relationConfig = _useState22[0],
+    setRelationConfig = _useState22[1];
   useEffect(function () {
     var _data = props.value;
     if (_data) {
@@ -99,7 +102,9 @@ var EventFilter = function EventFilter(props) {
         setCount(_data === null || _data === void 0 ? void 0 : _data.filters.conditions.length);
       }
       if (_data.dimension) {
-        bizAttributeSelectorValue.current = _objectSpread({}, _data.dimension);
+        setBizAttributeSelectorValue(function () {
+          return _objectSpread({}, _data.dimension);
+        });
       }
     }
     ajax(Apis.getEventSwitch, {
@@ -185,40 +190,26 @@ var EventFilter = function EventFilter(props) {
       setGroup(event.group);
     }
     setEventList([]);
-    bizAttributeSelectorValue.current = undefined;
+    setBizAttributeSelectorValue(undefined);
     setFilter(undefined);
     setIsAdd(false);
     setCount(0);
   };
   var onChangeAttr = function onChangeAttr(attr) {
     if (attr === undefined) {
-      bizAttributeSelectorValue.current = undefined;
+      setBizAttributeSelectorValue(undefined);
     } else {
       var _value = attr.propCategory === 'eventProp' ? attr.id : attr.name;
-      bizAttributeSelectorValue.current = _objectSpread(_objectSpread({}, attr), {}, {
-        propCategory: attr.propCategory,
-        category: attr.category,
-        value: _value,
-        id: attr.id,
-        encryptionType: attr.encryptionType
+      setBizAttributeSelectorValue(function () {
+        return _objectSpread(_objectSpread({}, attr), {}, {
+          propCategory: attr.propCategory,
+          category: attr.category,
+          value: _value,
+          id: attr.id,
+          encryptionType: attr.encryptionType
+        });
       });
     }
-    var _event = {
-      id: event === null || event === void 0 ? void 0 : event.id,
-      name: event === null || event === void 0 ? void 0 : event.name,
-      dimension: undefined
-    };
-    if (bizAttributeSelectorValue.current) {
-      var _dimension = _.cloneDeep(bizAttributeSelectorValue.current);
-      setEnableSelectChart && setEnableSelectChart(judgeIsArea(_dimension.value));
-      setIsCity && setIsCity(judgeIsCity(_dimension.value));
-      if (!judgeIsArea(_dimension.value)) {
-        if (searchData.chartType === 'map') _event.chartType = 'line';
-      }
-      delete _dimension.key;
-      _event.dimension = _dimension;
-    }
-    props.onChange && props.onChange(_event);
   };
   useEffect(function () {
     if (analysisType === 'eventProp' && eventList.length > 1) {
@@ -233,10 +224,20 @@ var EventFilter = function EventFilter(props) {
       if (filter) {
         _event.filters = filter;
       }
+      if (bizAttributeSelectorValue) {
+        var _dimension = _.cloneDeep(bizAttributeSelectorValue);
+        setEnableSelectChart && setEnableSelectChart(judgeIsArea(_dimension.value));
+        setIsCity && setIsCity(judgeIsCity(_dimension.value));
+        if (!judgeIsArea(_dimension.value)) {
+          if (searchData.chartType === 'map') _event.chartType = 'line';
+        }
+        delete _dimension.key;
+        _event.dimension = _dimension;
+      }
       _event.eventGroupId = group.id !== 0 ? group.id : undefined;
       props.onChange && props.onChange(_event);
     }
-  }, [filter, event, group, eventList]);
+  }, [bizAttributeSelectorValue, filter, event, group, eventList]);
   return /*#__PURE__*/React.createElement("div", {
     className: classPrefix
   }, /*#__PURE__*/React.createElement("div", {
@@ -259,7 +260,7 @@ var EventFilter = function EventFilter(props) {
     enableUserProp: analysisType === 'eventProp' ? false : true,
     enableEnvProp: true,
     eventIdList: [event === null || event === void 0 ? void 0 : event.id],
-    value: bizAttributeSelectorValue.current,
+    value: bizAttributeSelectorValue,
     enableDelete: true,
     onChange: onChangeAttr,
     onDelete: function onDelete() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-event",
-  "version": "1.0.29-zhongyuanE.7",
+  "version": "1.0.29-zhongyuanE.9",
   "module": "es/index.js",
   "typings": "es/index.d.ts",
   "private": false,
@@ -54,7 +54,7 @@
     "react": "^16.12.0 || ^17.0.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "245784a034043cba9041692adb5d17fe87a27c83",
+  "gitHead": "3e507be85cc6ecbdd60366f9d8a3402494eafcae",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }