@zgfe/modules-interval 1.0.10-zbfix.2 → 1.0.10-zbfix.4

package/dist/esm/components/eventFilter/index.js

@@ -142,6 +142,13 @@ var EventFilter = function EventFilter(props) {
     }
     props.onChange && props.onChange(_event);
   }, [bizAttributeSelectorValue, filter, event, relevancy]);
+  useEffect(function () {
+    setRelevancy(false);
+    setTimeout(function () {
+      var _props$afterReset;
+      (_props$afterReset = props.afterReset) === null || _props$afterReset === void 0 ? void 0 : _props$afterReset.call(props);
+    });
+  }, [props.resetSwitch]);
   return /*#__PURE__*/React.createElement("div", {
     className: classPrefix
   }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(BizEventSelector, {
@@ -165,13 +172,13 @@ var EventFilter = function EventFilter(props) {
     }
   }))), props !== null && props !== void 0 && props.relevancy ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Tooltip, {
     placement: "top",
-    title: props.relevancyFl ? '请选择开始和结束事件' : ''
+    title: props.disableRelevancy ? '请选择开始和结束事件' : ''
   }, /*#__PURE__*/React.createElement(Switch, {
     size: "default",
     style: {
       marginLeft: 24
     },
-    checked: relevancy && !props.relevancyFl,
+    checked: relevancy,
     onChange: function onChange(checked) {
       return setRelevancy(checked);
     }

package/dist/esm/components/eventFilter/types.d.ts

@@ -46,7 +46,9 @@ export interface ConditionsnProps {
 export interface EventFilterProps {
     id?: string;
     value?: eventProps;
-    relevancyFl?: boolean;
+    disableRelevancy?: boolean;
     relevancy?: boolean;
+    resetSwitch?: boolean;
+    afterReset?: () => void;
     onChange?: (event: eventProps) => {};
 }

package/dist/esm/modules/topPanel/index.js

@@ -45,11 +45,15 @@ var TopPanel = function TopPanel(props) {
     setRelevancyFl = _useState8[1];
   var _ref = defaultValue,
     userGroup = _ref.userGroup;
-  // 细分属性初始值
-  var _useState9 = useState(),
+  var _useState9 = useState(false),
     _useState10 = _slicedToArray(_useState9, 2),
-    bizAttributeSelectorValue = _useState10[0],
-    setBizAttributeSelectorValue = _useState10[1];
+    resetSwitch = _useState10[0],
+    setResetSwitch = _useState10[1];
+  // 细分属性初始值
+  var _useState11 = useState(),
+    _useState12 = _slicedToArray(_useState11, 2),
+    bizAttributeSelectorValue = _useState12[0],
+    setBizAttributeSelectorValue = _useState12[1];
   // 用户组和事件变更
   var onValuesChange = function onValuesChange(data, allData) {
     var _data = {};
@@ -193,7 +197,11 @@ var TopPanel = function TopPanel(props) {
     label: "\u5F00\u59CB\u4E8B\u4EF6",
     name: "start"
   }, /*#__PURE__*/React.createElement(EventFilter, {
-    relevancyFl: relevancyFl,
+    disableRelevancy: relevancyFl,
+    resetSwitch: resetSwitch,
+    afterReset: function afterReset() {
+      setResetSwitch(false);
+    },
     relevancy: true
   })), relevancy ? /*#__PURE__*/React.createElement(Form.Item, {
     className: "associated"
@@ -251,6 +259,8 @@ var TopPanel = function TopPanel(props) {
       onChangeAttr(undefined, 'associatedPreAttr');
       onChangeAttr(undefined, 'associatedNextAttr');
       setRelevancy(false);
+      setRelevancyFl(true);
+      setResetSwitch(true);
     },
     className: "bsicon qingchu"
   })) : '', /*#__PURE__*/React.createElement(Form.Item, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-interval",
-  "version": "1.0.10-zbfix.2",
+  "version": "1.0.10-zbfix.4",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -59,5 +59,5 @@
     "umi-request": "^1.4.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "f819ed966bb98aba0948cb87662c742d1cc4c451"
+  "gitHead": "076e86523d84921e687828bb29b0ef4647efc7b9"
 }