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

package/es/components/eventFilter/index.js

@@ -32,7 +32,8 @@ var EventFilter = function EventFilter(props) {
     currentApp = _useContext.currentApp;
   var _useContext2 = useContext(BizGlobalDataContext),
     _useContext2$eventIdM = _useContext2.eventIdMap,
-    eventIdMap = _useContext2$eventIdM === void 0 ? {} : _useContext2$eventIdM;
+    eventIdMap = _useContext2$eventIdM === void 0 ? {} : _useContext2$eventIdM,
+    envs = _useContext2.envs;
   var _useState = useState(props.value && props.value.filters && props.value.filters.conditions ? props.value.filters.conditions.length : 0),
     _useState2 = _slicedToArray(_useState, 2),
     count = _useState2[0],
@@ -202,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) {
@@ -216,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", {
@@ -263,7 +270,7 @@ var EventFilter = function EventFilter(props) {
     placement: "top",
     title: '添加属性筛选'
   }, /*#__PURE__*/React.createElement(IconFont, {
-    className: "".concat(count >= 5 || (event === null || event === void 0 ? void 0 : event.id) === -1 ? 'disable' : ''),
+    className: "".concat(count >= ((envs === null || envs === void 0 ? void 0 : envs.propertyNum) || 5) || (event === null || event === void 0 ? void 0 : event.id) === -1 ? 'disable' : ''),
     type: "shaixuan",
     onClick: function onClick() {
       return onAdd();

package/es/components/searchPanel/index.js

@@ -99,8 +99,9 @@ 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],
-    selectRange: envs && envs.timeRangeOpen ? envs.timeRangeOpen : 36,
-    timeRangeOpen: envs && envs.timeRangeOpen ? envs.timeRangeOpen : 36
+    selectRangeUnit: "months",
+    selectRange: envs && envs.timeRangeOpen ? envs.timeRangeOpen : 12,
+    timeRangeOpen: envs && envs.timeRangeOpen ? envs.timeRangeOpen : 12
   }), /*#__PURE__*/React.createElement(BizTargetDimension, {
     normalOptions: currentNormalOptions,
     value: dimension,

package/package.json

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