@zgfe/modules-event 1.0.29-zhongyuanE.6 → 1.0.29-zhongyuanE.8

package/es/components/eventFilter/index.js

@@ -203,22 +203,6 @@ var EventFilter = function EventFilter(props) {
         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 +217,20 @@ var EventFilter = function EventFilter(props) {
       if (filter) {
         _event.filters = filter;
       }
+      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;
+      }
       _event.eventGroupId = group.id !== 0 ? group.id : undefined;
       props.onChange && props.onChange(_event);
     }
-  }, [filter, event, group, eventList]);
+  }, [bizAttributeSelectorValue.current, filter, event, group, eventList]);
   return /*#__PURE__*/React.createElement("div", {
     className: classPrefix
   }, /*#__PURE__*/React.createElement("div", {

package/es/modules/content/index.js

@@ -65,7 +65,8 @@ var EventContent = /*#__PURE__*/React.forwardRef(function (props, ref) {
     first = _useState10[0],
     setFirst = _useState10[1];
   var _useContext3 = useContext(BizTargetFromPanelContext),
-    handleSearch = _useContext3.handleSearch;
+    handleSearch = _useContext3.handleSearch,
+    disabled = _useContext3.disabled;
   var topPanelRef = useRef();
   useImperativeHandle(ref, function () {
     return {
@@ -105,6 +106,7 @@ var EventContent = /*#__PURE__*/React.forwardRef(function (props, ref) {
     };
   }, [searchData]);
   useEffect(function () {
+    if (disabled) return;
     handleSearch && handleSearch(loading);
   }, [loading]);
   useEffect(function () {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-event",
-  "version": "1.0.29-zhongyuanE.6",
+  "version": "1.0.29-zhongyuanE.8",
   "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": "0f6e60b79948f4c366c8d455559f8d3dcda9b4a4",
+  "gitHead": "3e507be85cc6ecbdd60366f9d8a3402494eafcae",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }