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

package/es/components/eventFilter/index.js

@@ -203,6 +203,22 @@ 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) {
@@ -217,20 +233,10 @@ 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);
     }
-  }, [bizAttributeSelectorValue.current, filter, event, group, eventList]);
+  }, [filter, event, group, eventList]);
   return /*#__PURE__*/React.createElement("div", {
     className: classPrefix
   }, /*#__PURE__*/React.createElement("div", {

package/es/components/searchPanel/index.js

@@ -99,6 +99,7 @@ var SearchPanel = function SearchPanel(props) {
     defaultValue: time,
     onChange: onChangeTime,
     dateTypeList: [DatePickerTypes.Unit.minute, DatePickerTypes.Unit.hour, DatePickerTypes.Unit.day, DatePickerTypes.Unit.week, DatePickerTypes.Unit.month],
+    selectRangeUnit: "months",
     selectRange: envs && envs.timeRangeOpen ? envs.timeRangeOpen : 12,
     timeRangeOpen: envs && envs.timeRangeOpen ? envs.timeRangeOpen : 12
   }), /*#__PURE__*/React.createElement(BizTargetDimension, {

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.5",
+  "version": "1.0.29-zhongyuanE.7",
   "module": "es/index.js",
   "typings": "es/index.d.ts",
   "private": false,
@@ -41,7 +41,7 @@
     "@types/lodash": "^4.14.191",
     "@umijs/fabric": "^2.8.1",
     "@umijs/test": "^3.0.5",
-    "@zgfe/business-lib": "1.2.71-hxd.18",
+    "@zgfe/business-lib": "1.2.71-hxd.22",
     "antd": "^4.22.6",
     "dumi": "^1.1.0",
     "echarts": "^5.3.2",
@@ -54,7 +54,7 @@
     "react": "^16.12.0 || ^17.0.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "0022c2135486b9d4807065c6ba11af49565d1e8a",
+  "gitHead": "245784a034043cba9041692adb5d17fe87a27c83",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }