@zgfe/modules-event 1.0.29-zhongyuanE.0 → 1.0.29-zhongyuanE.3

package/es/components/eventFilter/index.js

@@ -68,28 +68,25 @@ var EventFilter = function EventFilter(props) {
     _useState12 = _slicedToArray(_useState11, 2),
     filter = _useState12[0],
     setFilter = _useState12[1];
-  var _useState13 = useState(),
-    _useState14 = _slicedToArray(_useState13, 2),
-    bizAttributeSelectorValue = _useState14[0],
-    setBizAttributeSelectorValue = _useState14[1];
-  var _useState15 = useState(_.isArray(props.value) ? props.value.map(function (id) {
+  var bizAttributeSelectorValue = useRef();
+  var _useState13 = 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),
-    eventList = _useState16[0],
-    setEventList = _useState16[1];
-  var _useState17 = useState(true),
+    isCascadeOpen = _useState16[0],
+    setIsCascadeOpen = _useState16[1];
+  var _useState17 = useState(false),
     _useState18 = _slicedToArray(_useState17, 2),
-    isCascadeOpen = _useState18[0],
-    setIsCascadeOpen = _useState18[1];
-  var _useState19 = useState(false),
+    isCascadeShow = _useState18[0],
+    setIsCascadeShow = _useState18[1];
+  var _useState19 = useState(),
     _useState20 = _slicedToArray(_useState19, 2),
-    isCascadeShow = _useState20[0],
-    setIsCascadeShow = _useState20[1];
-  var _useState21 = useState(),
-    _useState22 = _slicedToArray(_useState21, 2),
-    relationConfig = _useState22[0],
-    setRelationConfig = _useState22[1];
+    relationConfig = _useState20[0],
+    setRelationConfig = _useState20[1];
   useEffect(function () {
     var _data = props.value;
     if (_data) {
@@ -101,9 +98,7 @@ var EventFilter = function EventFilter(props) {
         setCount(_data === null || _data === void 0 ? void 0 : _data.filters.conditions.length);
       }
       if (_data.dimension) {
-        setBizAttributeSelectorValue(function () {
-          return _objectSpread({}, _data.dimension);
-        });
+        bizAttributeSelectorValue.current = _objectSpread({}, _data.dimension);
       }
     }
     ajax(Apis.getEventSwitch, {
@@ -134,7 +129,7 @@ var EventFilter = function EventFilter(props) {
     if ((event === null || event === void 0 ? void 0 : event.id) === -1) {
       return;
     }
-    if (count >= 5) {
+    if (count >= 20) {
       return;
     }
     setIsAdd(true);
@@ -189,17 +184,17 @@ var EventFilter = function EventFilter(props) {
       setGroup(event.group);
     }
     setEventList([]);
-    setBizAttributeSelectorValue(undefined);
+    bizAttributeSelectorValue.current = undefined;
     setFilter(undefined);
     setIsAdd(false);
     setCount(0);
   };
   var onChangeAttr = function onChangeAttr(attr) {
     if (attr === undefined) {
-      setBizAttributeSelectorValue(undefined);
+      bizAttributeSelectorValue.current = undefined;
     } else {
       var _value = attr.propCategory === 'eventProp' ? attr.id : attr.name;
-      setBizAttributeSelectorValue({
+      bizAttributeSelectorValue.current = _objectSpread(_objectSpread({}, attr), {}, {
         propCategory: attr.propCategory,
         category: attr.category,
         value: _value,
@@ -221,8 +216,8 @@ var EventFilter = function EventFilter(props) {
       if (filter) {
         _event.filters = filter;
       }
-      if (bizAttributeSelectorValue) {
-        var _dimension = _.cloneDeep(bizAttributeSelectorValue);
+      if (bizAttributeSelectorValue.current) {
+        var _dimension = _.cloneDeep(bizAttributeSelectorValue.current);
         setEnableSelectChart && setEnableSelectChart(judgeIsArea(_dimension.value));
         setIsCity && setIsCity(judgeIsCity(_dimension.value));
         if (!judgeIsArea(_dimension.value)) {
@@ -234,7 +229,7 @@ var EventFilter = function EventFilter(props) {
       _event.eventGroupId = group.id !== 0 ? group.id : undefined;
       props.onChange && props.onChange(_event);
     }
-  }, [bizAttributeSelectorValue, filter, event, group, eventList]);
+  }, [bizAttributeSelectorValue.current, filter, event, group, eventList]);
   return /*#__PURE__*/React.createElement("div", {
     className: classPrefix
   }, /*#__PURE__*/React.createElement("div", {
@@ -257,7 +252,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,
+    value: bizAttributeSelectorValue.current,
     enableDelete: true,
     onChange: onChangeAttr,
     onDelete: function onDelete() {

package/es/components/searchPanel/index.js

@@ -96,9 +96,10 @@ var SearchPanel = function SearchPanel(props) {
   }, /*#__PURE__*/React.createElement(BizDatePickerV2, {
     defaultValue: time,
     onChange: onChangeTime,
-    selectRange: 6000,
     dateTypeList: [DatePickerTypes.Unit.minute, DatePickerTypes.Unit.hour, DatePickerTypes.Unit.day, DatePickerTypes.Unit.week, DatePickerTypes.Unit.month],
-    selectRangeUnit: "days"
+    selectRange: 36,
+    timeRangeOpen: 36,
+    selectRangeUnit: "months"
   }), /*#__PURE__*/React.createElement(BizTargetDimension, {
     normalOptions: currentNormalOptions,
     value: dimension,

package/package.json

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