@zgfe/modules-interval 1.0.3-alpha.21 → 1.0.3-alpha.23

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

@@ -10,7 +10,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import { Switch, Tooltip, message } from 'antd';
+import { Tooltip, message } from 'antd';
 import React, { useEffect, useRef, useState } from 'react';
 import { BizEventSelector, IconFont, BizAttrConditionGroup } from '@zgfe/business-lib';
 import "./styles/index.less";
@@ -82,9 +82,6 @@ var EventFilter = function EventFilter(props) {
       }
     }
   }, []);
-  useEffect(function () {
-    setRelevancy(props.relevancyChecked || false);
-  }, [props.relevancyChecked]);
 
   // 添加筛选
   var onAdd = function onAdd() {
@@ -140,9 +137,6 @@ var EventFilter = function EventFilter(props) {
       delete _dimension.key;
       _event.dimension = _dimension;
     }
-    if (props.relevancy && relevancy !== undefined) {
-      _event.relevancy = relevancy;
-    }
     props.onChange && props.onChange(_event);
   }, [bizAttributeSelectorValue, filter, event, relevancy]);
   return /*#__PURE__*/React.createElement("div", {
@@ -180,22 +174,7 @@ var EventFilter = function EventFilter(props) {
     onClick: function onClick() {
       return onAdd();
     }
-  }))), props !== null && props !== void 0 && props.relevancy ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Tooltip, {
-    placement: "top",
-    title: props.relevancyFl ? '请选择开始和结束事件' : ''
-  }, /*#__PURE__*/React.createElement(Switch, {
-    size: "default",
-    style: {
-      marginLeft: 24
-    },
-    checked: relevancy && !props.relevancyFl,
-    disabled: props.relevancyFl,
-    onChange: function onChange(checked) {
-      return setRelevancy(checked);
-    }
-  })), /*#__PURE__*/React.createElement("span", {
-    className: "switch-title"
-  }, "\u8BBE\u7F6E\u5173\u8054\u5C5E\u6027")) : ''), (filter || isAdd) && /*#__PURE__*/React.createElement("div", {
+  })))), (filter || isAdd) && /*#__PURE__*/React.createElement("div", {
     className: "".concat(count > 0 ? 'attr-box-show' : '', " top")
   }, /*#__PURE__*/React.createElement(BizAttrConditionGroup, {
     ref: conditionRef,

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

@@ -47,10 +47,7 @@ export interface ConditionsnProps {
 export interface EventFilterProps {
     id?: string;
     value?: eventProps;
-    relevancyFl?: boolean;
-    relevancy?: boolean;
-    relevancyChecked?: boolean;
     subject?: SubjectTypes.Subject;
     analysisType?: 'user' | 'eventProp';
-    onChange?: (event: eventProps) => {};
+    onChange?: (event: eventProps) => void;
 }

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

@@ -167,7 +167,9 @@ var EventContent = function EventContent(props) {
   var onChangeSearch = function onChangeSearch(data, flag) {
     data.id ? setEventId(data.id) : setEventId(-1);
     setSearchData(function (_searchData) {
-      return _objectSpread(_objectSpread(_objectSpread({}, _searchData), data), {}, {
+      return _objectSpread(_objectSpread({}, data), {}, {
+        time: _searchData.time,
+        platform: _searchData.platform,
         userGroup: data.analysisSubject ? undefined : data.userGroup,
         analysisSubject: data.analysisSubject ? data.analysisSubject : undefined
       });

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

@@ -11,7 +11,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useContext, useEffect, useState } from 'react';
-import { Form, Button, Radio } from 'antd';
+import { Form, Button, Radio, Space, Switch } from 'antd';
 import { BizAttributeSelector, BizSelect, BizUserGroupHeader, useSubject } from '@zgfe/business-lib';
 import EventFilter from "../../components/eventFilter";
 import "./styles/index.less";
@@ -19,7 +19,7 @@ import { AnalysisMode } from "./types";
 import { IntervalContext } from "../../types";
 var classPrefix = 'top-panel-interval';
 var TopPanel = function TopPanel(props) {
-  var _props$defaultValue, _props$defaultValue2, _props$defaultValue3, _defaultValue$associa, _defaultValue$associa2, _finalSearchData$asso, _finalSearchData$asso2, _defaultValue$associa3, _finalSearchData$asso3, _defaultValue$associa4, _finalSearchData$asso4, _defaultValue$associa5, _finalSearchData$asso5, _defaultValue$associa6, _finalSearchData$asso6, _defaultValue$associa7, _finalSearchData$asso7, _defaultValue$associa8, _finalSearchData$asso8, _defaultValue$associa9, _finalSearchData$asso9, _defaultValue$associa10, _finalSearchData$asso10, _defaultValue$dimensi, _finalSearchData$dime, _defaultValue$dimensi2, _finalSearchData$dime2, _defaultValue$dimensi3, _finalSearchData$dime3, _defaultValue$dimensi4, _finalSearchData$dime4, _currentParams$start2, _currentParams$end2, _currentParams$start3, _currentParams$end3;
+  var _props$defaultValue, _props$defaultValue2, _props$defaultValue3, _defaultValue$associa, _defaultValue$associa2, _finalSearchData$asso, _finalSearchData$asso2, _defaultValue$associa3, _finalSearchData$asso3, _defaultValue$associa4, _finalSearchData$asso4, _defaultValue$associa5, _finalSearchData$asso5, _defaultValue$associa6, _finalSearchData$asso6, _defaultValue$associa7, _finalSearchData$asso7, _defaultValue$associa8, _finalSearchData$asso8, _defaultValue$associa9, _finalSearchData$asso9, _defaultValue$associa10, _finalSearchData$asso10, _defaultValue$dimensi, _finalSearchData$dime, _defaultValue$dimensi2, _finalSearchData$dime2, _defaultValue$dimensi3, _finalSearchData$dime3, _defaultValue$dimensi4, _finalSearchData$dime4;
   var defaultValue = props.defaultValue,
     loading = props.loading,
     collapseRef = props.collapseRef,
@@ -27,23 +27,19 @@ var TopPanel = function TopPanel(props) {
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
-  var _useState = useState(null),
+  var _useState = useState(),
     _useState2 = _slicedToArray(_useState, 2),
-    startId = _useState2[0],
-    setStartId = _useState2[1];
-  var _useState3 = useState(null),
+    startEvent = _useState2[0],
+    setStartEvent = _useState2[1];
+  var _useState3 = useState(),
     _useState4 = _slicedToArray(_useState3, 2),
-    endId = _useState4[0],
-    setEndId = _useState4[1];
+    endEvent = _useState4[0],
+    setEndEvent = _useState4[1];
   // 关联属性
   var _useState5 = useState(false),
     _useState6 = _slicedToArray(_useState5, 2),
     relevancy = _useState6[0],
     setRelevancy = _useState6[1];
-  var _useState7 = useState(true),
-    _useState8 = _slicedToArray(_useState7, 2),
-    relevancyFl = _useState8[0],
-    setRelevancyFl = _useState8[1];
   var _useSubject = useSubject(),
     subjectList = _useSubject.subjectList,
     subjectLoading = _useSubject.loading;
@@ -51,87 +47,31 @@ var TopPanel = function TopPanel(props) {
     subjectEnable = _useContext.subjectEnable;
   var _ref = defaultValue || {},
     userGroup = _ref.userGroup;
-  // 细分属性初始值
+  var _useState7 = useState('user'),
+    _useState8 = _slicedToArray(_useState7, 2),
+    analysisType = _useState8[0],
+    setAnalysisType = _useState8[1];
   var _useState9 = useState(),
     _useState10 = _slicedToArray(_useState9, 2),
-    bizAttributeSelectorValue = _useState10[0],
-    setBizAttributeSelectorValue = _useState10[1];
-  var _useState11 = useState('user'),
+    currentSubject = _useState10[0],
+    setCurrentSubject = _useState10[1];
+  var _useState11 = useState(false),
     _useState12 = _slicedToArray(_useState11, 2),
-    analysisType = _useState12[0],
-    setAnalysisType = _useState12[1];
-  var _useState13 = useState(),
-    _useState14 = _slicedToArray(_useState13, 2),
-    currentSubject = _useState14[0],
-    setCurrentSubject = _useState14[1];
-  var _useState15 = useState(false),
-    _useState16 = _slicedToArray(_useState15, 2),
-    inited = _useState16[0],
-    setInited = _useState16[1];
-  var _useState17 = useState(),
-    _useState18 = _slicedToArray(_useState17, 2),
-    currentParams = _useState18[0],
-    setCurrentParams = _useState18[1];
-  var _useState19 = useState(true),
-    _useState20 = _slicedToArray(_useState19, 2),
-    searchDisabled = _useState20[0],
-    setSearchDisabled = _useState20[1];
-  // 用户组和事件变更
-  var onValuesChange = function onValuesChange(data, allData) {
-    var _data = {};
-    setRelevancyFl(false);
-    if (allData.start) {
-      if (allData.start.id !== null) {
-        var _allData$start;
-        _data = allData.start;
-        setStartId(allData.start.id);
-        setRelevancy(allData === null || allData === void 0 ? void 0 : (_allData$start = allData.start) === null || _allData$start === void 0 ? void 0 : _allData$start.relevancy);
-      } else {
-        setRelevancyFl(true);
-      }
-    }
-    if (allData.end) {
-      if (allData.end.id !== null) {
-        _data = allData.end;
-        setEndId(allData.end.id);
-      } else {
-        setRelevancyFl(true);
-      }
-    }
-    if (allData.userGroup) {
-      _data.userGroup = allData.userGroup;
-      if (_data.userGroup.length <= 0) _data.userGroup = [0];
+    inited = _useState12[0],
+    setInited = _useState12[1];
+  var formRef = React.useRef(null);
+  function onSearch(values) {
+    if (props.onChange) {
+      props.onChange(_objectSpread(_objectSpread({}, values), {}, {
+        analysisSubject: values.analysisSubject ? {
+          subjectId: values.analysisSubject.id,
+          subjectName: values.analysisSubject.subjectName,
+          subjectAlias: values.analysisSubject.subjectAlias,
+          unit: values.analysisSubject.unit
+        } : undefined
+      }), true);
     }
-    setCurrentParams(_objectSpread(_objectSpread({}, allData), {}, {
-      analysisSubject: allData.analysisSubject ? {
-        subjectId: allData.analysisSubject.id,
-        subjectName: allData.analysisSubject.subjectName,
-        subjectAlias: allData.analysisSubject.subjectAlias,
-        unit: allData.analysisSubject.unit
-      } : undefined
-    }));
-  };
-  useEffect(function () {
-    var _currentParams$start, _currentParams$start$, _currentParams$start$2, _currentParams$end, _currentParams$end$fi, _currentParams$end$fi2;
-    var conditionValid = true;
-    currentParams === null || currentParams === void 0 ? void 0 : (_currentParams$start = currentParams.start) === null || _currentParams$start === void 0 ? void 0 : (_currentParams$start$ = _currentParams$start.filters) === null || _currentParams$start$ === void 0 ? void 0 : (_currentParams$start$2 = _currentParams$start$.conditions) === null || _currentParams$start$2 === void 0 ? void 0 : _currentParams$start$2.forEach(function (item) {
-      var _item$values;
-      if (!/null/.test(item.operator || '') && !((_item$values = item.values) !== null && _item$values !== void 0 && _item$values.length)) {
-        conditionValid = false;
-      }
-    });
-    currentParams === null || currentParams === void 0 ? void 0 : (_currentParams$end = currentParams.end) === null || _currentParams$end === void 0 ? void 0 : (_currentParams$end$fi = _currentParams$end.filters) === null || _currentParams$end$fi === void 0 ? void 0 : (_currentParams$end$fi2 = _currentParams$end$fi.conditions) === null || _currentParams$end$fi2 === void 0 ? void 0 : _currentParams$end$fi2.forEach(function (item) {
-      var _item$values2;
-      if (!/null/.test(item.operator || '') && !((_item$values2 = item.values) !== null && _item$values2 !== void 0 && _item$values2.length)) {
-        conditionValid = false;
-      }
-    });
-    if (loading || !(currentParams !== null && currentParams !== void 0 && currentParams.start) || !(currentParams !== null && currentParams !== void 0 && currentParams.start.id) || !(currentParams !== null && currentParams !== void 0 && currentParams.end) || !(currentParams !== null && currentParams !== void 0 && currentParams.end.id) || !conditionValid || relevancy && !(currentParams !== null && currentParams !== void 0 && currentParams.associatedNextAttr) && !(currentParams !== null && currentParams !== void 0 && currentParams.associatedNextAttr) || analysisType === 'eventProp' && !currentSubject) {
-      setSearchDisabled(true);
-    } else {
-      setSearchDisabled(false);
-    }
-  }, [currentParams]);
+  }
   var resetting = function resetting() {
     form.resetFields();
     form.setFieldsValue({
@@ -157,47 +97,6 @@ var TopPanel = function TopPanel(props) {
       associatedNextAttr: undefined
     }, true);
   };
-  // 细分属性
-  var onChangeAttr = function onChangeAttr(attr, type) {
-    if (attr === undefined) {
-      // 删除细分属性
-      switch (type) {
-        case 'associatedPreAttr':
-          form.setFieldsValue({
-            associatedPreAttr: undefined
-          });
-          props.onChange({
-            associatedPreAttr: undefined
-          }, true);
-          break;
-        case 'associatedNextAttr':
-          form.setFieldsValue({
-            associatedNextAttr: undefined
-          });
-          props.onChange({
-            associatedNextAttr: undefined
-          }, true);
-          break;
-        case 'dimension':
-          form.setFieldsValue({
-            dimension: undefined
-          });
-          props.onChange({
-            dimension: undefined
-          }, true);
-          break;
-      }
-      setBizAttributeSelectorValue(undefined);
-    } else {
-      var _value = attr.propCategory === 'eventProp' ? attr.id : attr.name;
-      setBizAttributeSelectorValue({
-        propCategory: attr.propCategory,
-        category: attr.category,
-        value: _value,
-        key: attr.propCategory === 'eventProp' ? attr.id : attr.propCategory + '-' + _value
-      });
-    }
-  };
   useEffect(function () {
     if (!defaultValue) {
       setInited(true);
@@ -214,6 +113,7 @@ var TopPanel = function TopPanel(props) {
   if (!inited) return null;
   return /*#__PURE__*/React.createElement(Form, {
     form: form,
+    ref: formRef,
     component: "div",
     colon: false,
     className: "panel-form-interval",
@@ -246,7 +146,7 @@ var TopPanel = function TopPanel(props) {
       analysisModel: (defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.analysisModel) || AnalysisMode.common
     },
     scrollToFirstError: true,
-    onValuesChange: onValuesChange
+    onFinish: onSearch
   }, subjectEnable && /*#__PURE__*/React.createElement(Form.Item, {
     label: "\u5206\u6790\u4E3B\u4F53",
     className: "panel-form-interval-item"
@@ -269,7 +169,15 @@ var TopPanel = function TopPanel(props) {
   })), analysisType === 'eventProp' && /*#__PURE__*/React.createElement(Form.Item, {
     label: "\u4E3B\u4F53\u540D\u79F0",
     name: "analysisSubject",
-    className: "panel-form-interval-item"
+    className: "panel-form-interval-item",
+    rules: [{
+      validator: function validator(rule, value) {
+        if (!value) {
+          return Promise.reject('请选择主体名称');
+        }
+        return Promise.resolve();
+      }
+    }]
   }, /*#__PURE__*/React.createElement(BizSelect, {
     options: subjectList,
     aliasField: "subjectAlias",
@@ -298,17 +206,56 @@ var TopPanel = function TopPanel(props) {
     className: "collapseRefs"
   }, /*#__PURE__*/React.createElement(Form.Item, {
     label: "\u5F00\u59CB\u4E8B\u4EF6",
-    name: "start"
+    style: {
+      marginBottom: '8px',
+      position: 'relative'
+    }
+  }, /*#__PURE__*/React.createElement(Form.Item, {
+    name: "start",
+    style: {
+      marginBottom: 0
+    },
+    rules: [{
+      validator: function validator(rule, value) {
+        var _value$filters, _value$filters$condit;
+        if (!value || !value.id) {
+          return Promise.reject('请选择开始事件');
+        }
+        var conditionValIsNull = false;
+        value === null || value === void 0 ? void 0 : (_value$filters = value.filters) === null || _value$filters === void 0 ? void 0 : (_value$filters$condit = _value$filters.conditions) === null || _value$filters$condit === void 0 ? void 0 : _value$filters$condit.forEach(function (item) {
+          var _item$values;
+          if (!/null/.test(item.operator || '') && !((_item$values = item.values) !== null && _item$values !== void 0 && _item$values.length)) {
+            conditionValIsNull = true;
+          }
+        });
+        if (conditionValIsNull) {
+          return Promise.reject('请填写完整的条件');
+        }
+        return Promise.resolve();
+      }
+    }]
   }, /*#__PURE__*/React.createElement(EventFilter, {
     subject: currentSubject,
-    relevancyFl: relevancyFl,
-    relevancy: true,
-    relevancyChecked: relevancy,
     key: "".concat(currentSubject === null || currentSubject === void 0 ? void 0 : currentSubject.subjectName, "-start"),
-    analysisType: analysisType
-  })), relevancy ? /*#__PURE__*/React.createElement(Form.Item, {
+    analysisType: analysisType,
+    onChange: setStartEvent
+  })), /*#__PURE__*/React.createElement(Space, {
+    align: "baseline",
+    style: {
+      position: 'absolute',
+      top: '9px',
+      left: '295px'
+    }
+  }, /*#__PURE__*/React.createElement(Switch, {
+    checked: relevancy,
+    onChange: setRelevancy
+  }), /*#__PURE__*/React.createElement("span", {
+    className: "switch-title"
+  }, "\u8BBE\u7F6E\u5173\u8054\u5C5E\u6027"))), relevancy && /*#__PURE__*/React.createElement(Form.Item, {
     className: "associated"
-  }, /*#__PURE__*/React.createElement("span", {
+  }, /*#__PURE__*/React.createElement(Space, {
+    align: "baseline"
+  }, /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("span", {
     className: "associated-link"
   }, /*#__PURE__*/React.createElement("i", {
     style: {
@@ -319,61 +266,90 @@ var TopPanel = function TopPanel(props) {
     className: "associated-label"
   }, "\u5C5E\u60271"), /*#__PURE__*/React.createElement(Form.Item, {
     name: "associatedPreAttr",
-    style: {
-      display: 'inline-block',
-      marginRight: 28
-    }
+    rules: [{
+      validator: function validator(rule, value) {
+        if (!value || !value.dimensionSub) {
+          return Promise.reject('请选择属性1');
+        }
+        return Promise.resolve();
+      }
+    }]
   }, /*#__PURE__*/React.createElement(BizAttributeSelector, {
     enableEventProp: true,
     enableUserProp: false,
     enableEnvProp: false,
-    eventIdList: [startId],
-    value: bizAttributeSelectorValue,
+    eventIdList: [startEvent === null || startEvent === void 0 ? void 0 : startEvent.id],
     enableDelete: true,
-    onChange: onChangeAttr,
-    key: "".concat(currentParams === null || currentParams === void 0 ? void 0 : (_currentParams$start2 = currentParams.start) === null || _currentParams$start2 === void 0 ? void 0 : _currentParams$start2.id, "-").concat(currentParams === null || currentParams === void 0 ? void 0 : (_currentParams$end2 = currentParams.end) === null || _currentParams$end2 === void 0 ? void 0 : _currentParams$end2.id, "-pre"),
+    key: "".concat(startEvent === null || startEvent === void 0 ? void 0 : startEvent.id, "-").concat(endEvent === null || endEvent === void 0 ? void 0 : endEvent.id, "-pre"),
     onDelete: function onDelete() {
-      onChangeAttr(undefined, 'associatedPreAttr');
+      var _formRef$current;
+      (_formRef$current = formRef.current) === null || _formRef$current === void 0 ? void 0 : _formRef$current.setFieldValue('associatedPreAttr', undefined);
     }
-  })), /*#__PURE__*/React.createElement("span", {
+  }))), /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("span", {
     className: "associated-label"
   }, "\u5C5E\u60272"), /*#__PURE__*/React.createElement(Form.Item, {
     name: "associatedNextAttr",
-    style: {
-      display: 'inline-block'
-    }
+    rules: [{
+      validator: function validator(rule, value) {
+        if (!value || !value.dimensionSub) {
+          return Promise.reject('请选择属性2');
+        }
+        return Promise.resolve();
+      }
+    }]
   }, /*#__PURE__*/React.createElement(BizAttributeSelector, {
     enableEventProp: true,
     enableUserProp: false,
     enableEnvProp: false,
-    eventIdList: [endId],
-    value: bizAttributeSelectorValue,
+    eventIdList: [endEvent === null || endEvent === void 0 ? void 0 : endEvent.id],
     enableDelete: true,
-    onChange: onChangeAttr,
-    key: "".concat(currentParams === null || currentParams === void 0 ? void 0 : (_currentParams$start3 = currentParams.start) === null || _currentParams$start3 === void 0 ? void 0 : _currentParams$start3.id, "-").concat(currentParams === null || currentParams === void 0 ? void 0 : (_currentParams$end3 = currentParams.end) === null || _currentParams$end3 === void 0 ? void 0 : _currentParams$end3.id, "-next"),
+    key: "".concat(startEvent === null || startEvent === void 0 ? void 0 : startEvent.id, "-").concat(endEvent === null || endEvent === void 0 ? void 0 : endEvent.id, "-next"),
     onDelete: function onDelete() {
-      onChangeAttr(undefined, 'associatedNextAttr');
+      var _formRef$current2;
+      (_formRef$current2 = formRef.current) === null || _formRef$current2 === void 0 ? void 0 : _formRef$current2.setFieldValue('associatedNextAttr', undefined);
     }
-  })), /*#__PURE__*/React.createElement("i", {
+  }))), /*#__PURE__*/React.createElement("i", {
     style: {
       lineHeight: '32px',
       marginLeft: '28px',
       cursor: 'pointer'
     },
     onClick: function onClick() {
-      onChangeAttr(undefined, 'associatedPreAttr');
-      onChangeAttr(undefined, 'associatedNextAttr');
+      var _formRef$current3, _formRef$current4;
+      (_formRef$current3 = formRef.current) === null || _formRef$current3 === void 0 ? void 0 : _formRef$current3.setFieldValue('associatedPreAttr', undefined);
+      (_formRef$current4 = formRef.current) === null || _formRef$current4 === void 0 ? void 0 : _formRef$current4.setFieldValue('associatedNextAttr', undefined);
       setRelevancy(false);
-      setRelevancyFl(true);
     },
     className: "bsicon qingchu"
-  })) : '', /*#__PURE__*/React.createElement(Form.Item, {
+  }))), /*#__PURE__*/React.createElement(Form.Item, {
     label: "\u7ED3\u675F\u4E8B\u4EF6",
-    name: "end"
+    name: "end",
+    rules: [{
+      validator: function validator(rule, value) {
+        var _value$filters2, _value$filters2$condi;
+        if (!value || !value.id) {
+          return Promise.reject('请选择结束事件');
+        }
+        var conditionValIsNull = false;
+        value === null || value === void 0 ? void 0 : (_value$filters2 = value.filters) === null || _value$filters2 === void 0 ? void 0 : (_value$filters2$condi = _value$filters2.conditions) === null || _value$filters2$condi === void 0 ? void 0 : _value$filters2$condi.forEach(function (item) {
+          var _item$values2;
+          if (!/null/.test(item.operator || '') && !((_item$values2 = item.values) !== null && _item$values2 !== void 0 && _item$values2.length)) {
+            conditionValIsNull = true;
+          }
+        });
+        if (conditionValIsNull) {
+          return Promise.reject('请填写完整的条件');
+        }
+        return Promise.resolve();
+      }
+    }]
   }, /*#__PURE__*/React.createElement(EventFilter, {
     subject: currentSubject,
     analysisType: analysisType,
-    key: "".concat(currentSubject === null || currentSubject === void 0 ? void 0 : currentSubject.subjectName, "-start")
+    key: "".concat(currentSubject === null || currentSubject === void 0 ? void 0 : currentSubject.subjectName, "-start"),
+    onChange: function onChange(val) {
+      setEndEvent(val);
+    }
   })), /*#__PURE__*/React.createElement(Form.Item, {
     label: "\u6309\u5C5E\u6027\u7EC6\u5206",
     name: "dimension",
@@ -383,12 +359,11 @@ var TopPanel = function TopPanel(props) {
     enableUserProp: analysisType === 'user',
     enableEnvProp: true,
     key: "".concat(currentSubject === null || currentSubject === void 0 ? void 0 : currentSubject.subjectName, "-dimension"),
-    eventIdList: startId === endId ? [startId] : [startId, endId],
-    value: bizAttributeSelectorValue,
+    eventIdList: (startEvent === null || startEvent === void 0 ? void 0 : startEvent.id) === (endEvent === null || endEvent === void 0 ? void 0 : endEvent.id) ? [startEvent === null || startEvent === void 0 ? void 0 : startEvent.id] : [startEvent === null || startEvent === void 0 ? void 0 : startEvent.id, endEvent === null || endEvent === void 0 ? void 0 : endEvent.id],
     enableDelete: true,
-    onChange: onChangeAttr,
     onDelete: function onDelete() {
-      onChangeAttr(undefined, 'dimension');
+      var _formRef$current5;
+      (_formRef$current5 = formRef.current) === null || _formRef$current5 === void 0 ? void 0 : _formRef$current5.setFieldValue('dimension', undefined);
     }
   })), /*#__PURE__*/React.createElement(Form.Item, {
     label: "\u5206\u6790\u6A21\u578B",
@@ -404,10 +379,10 @@ var TopPanel = function TopPanel(props) {
     onClick: resetting
   }, "\u91CD\u7F6E"), /*#__PURE__*/React.createElement(Button, {
     loading: loading || subjectLoading,
-    disabled: searchDisabled,
     type: "primary",
     onClick: function onClick() {
-      props.onChange(currentParams, (finalSearchData === null || finalSearchData === void 0 ? void 0 : finalSearchData.chartType) === 'boxplot' ? true : false);
+      var _formRef$current6;
+      (_formRef$current6 = formRef.current) === null || _formRef$current6 === void 0 ? void 0 : _formRef$current6.submit();
     }
   }, "\u67E5\u8BE2"))));
 };

package/dist/esm/modules/topPanel/styles/index.less

@@ -17,6 +17,9 @@
 }
 
 .panel-form-interval {
+  .ant-form-item-explain-error {
+    margin-left: 24px;
+  }
   &-item {
     .ant-form-item-label {
       padding-left: 24px !important;
@@ -203,5 +206,8 @@
       line-height: 32px;
       text-align: right;
     }
+    .ant-form-item-explain-error {
+      margin-left: 0 !important;
+    }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-interval",
-  "version": "1.0.3-alpha.21",
+  "version": "1.0.3-alpha.23",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -62,5 +62,5 @@
     "umi-request": "^1.4.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "b651e48103829fa09cd9a621c59ab42b7d5c9c13"
+  "gitHead": "dfb9bfb4e6f4672dc2f8633b785d87fb05eafd40"
 }