@zgfe/modules-interval 1.0.3-alpha.3 → 1.0.3-alpha.31

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

@@ -12,12 +12,12 @@ function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefine
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useContext, useEffect, useState } from 'react';
 import { Spin } from 'antd';
-import { BizGlobalDataContext, BizTargetFromPanel } from '@zgfe/business-lib';
+import { BizGlobalDataContext, BizTargetFromPanel, ajax } from '@zgfe/business-lib';
 import "./styles/index.less";
 import { IntervalContext } from "../../types";
 import { getInitDate } from "../../constants/initData";
 import EventContent from "../content";
-import { chartTypes } from "../../constants";
+import { Apis, chartTypes } from "../../constants";
 var classPrefix = 'interval-module-container';
 var ModuleInterval = function ModuleInterval(props) {
   // 属性
@@ -36,43 +36,52 @@ var ModuleInterval = function ModuleInterval(props) {
     _useState4 = _slicedToArray(_useState3, 2),
     loading = _useState4[0],
     setLoading = _useState4[1];
-  var _useState5 = useState(true),
-    _useState6 = _slicedToArray(_useState5, 2),
-    pageLoading = _useState6[0],
-    setPageLoading = _useState6[1];
   // 指标标题
+  var _useState5 = useState(),
+    _useState6 = _slicedToArray(_useState5, 2),
+    title = _useState6[0],
+    setTitle = _useState6[1];
   var _useState7 = useState(),
     _useState8 = _slicedToArray(_useState7, 2),
-    title = _useState8[0],
-    setTitle = _useState8[1];
+    panelId = _useState8[0],
+    setPanelId = _useState8[1];
   var _useState9 = useState(),
     _useState10 = _slicedToArray(_useState9, 2),
-    panelId = _useState10[0],
-    setPanelId = _useState10[1];
+    elementId = _useState10[0],
+    setElementId = _useState10[1];
   var _useState11 = useState(),
     _useState12 = _slicedToArray(_useState11, 2),
-    elementId = _useState12[0],
-    setElementId = _useState12[1];
-  var _useState13 = useState(),
+    showList = _useState12[0],
+    setShowList = _useState12[1];
+  var _useState13 = useState(false),
     _useState14 = _slicedToArray(_useState13, 2),
-    showList = _useState14[0],
-    setShowList = _useState14[1];
+    subjectEnable = _useState14[0],
+    setSubjectEnable = _useState14[1];
   // 初始化
   useEffect(function () {
-    setPageLoading(true);
-    // 设置初始值
-    if (!props.defaultValue) {
-      initSearch();
-    } else {
-      setShowList(props.defaultValue.chosen_data);
-      setPanelId(props.defaultValue.panelId);
-      setElementId(props.defaultValue.id);
-      setTitle(props.defaultValue.name);
-      setSearchData(props.defaultValue.data);
-    }
-    setTimeout(function () {
-      setPageLoading(false);
-    }, 0);
+    setLoading(true);
+    ajax(Apis.querySubjectDisplay, {
+      method: 'post',
+      data: {
+        appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId
+      }
+    }).then(function (res) {
+      if (!res) return;
+      setSubjectEnable(res.data);
+      // 设置初始值
+      if (!props.defaultValue) {
+        initSearch();
+      } else {
+        setShowList(props.defaultValue.chosen_data);
+        setPanelId(props.defaultValue.panelId);
+        setElementId(props.defaultValue.id);
+        setTitle(props.defaultValue.name);
+        setSearchData(props.defaultValue.data);
+      }
+      setTimeout(function () {
+        setLoading(false);
+      });
+    });
   }, []);
 
   // 查询条件初始化
@@ -80,20 +89,21 @@ var ModuleInterval = function ModuleInterval(props) {
     setSearchData({
       userGroup: (userGroupList === null || userGroupList === void 0 ? void 0 : userGroupList.length) > 0 ? [userGroupList[0].id] : [0],
       time: getInitDate(props.includeToday),
-      chartType: 'line'
+      chartType: 'boxplot'
     });
   };
-
-  // 改变loading
-  var changeLoading = function changeLoading(flag) {
-    setLoading(flag);
-  };
-  if (pageLoading) {
-    return /*#__PURE__*/React.createElement(Spin, null);
+  useEffect(function () {
+    if (props.onChange) props.onChange(searchData);
+  }, [searchData]);
+  if (loading) {
+    return /*#__PURE__*/React.createElement("div", {
+      className: classPrefix
+    }, /*#__PURE__*/React.createElement(Spin, {
+      className: "".concat(classPrefix, "-loading")
+    }));
   }
-  return /*#__PURE__*/React.createElement(Spin, {
-    spinning: loading,
-    wrapperClassName: classPrefix
+  return /*#__PURE__*/React.createElement("div", {
+    className: classPrefix
   }, /*#__PURE__*/React.createElement(BizTargetFromPanel, {
     value: panelId ? {
       panelId: panelId,
@@ -102,7 +112,7 @@ var ModuleInterval = function ModuleInterval(props) {
         name: title,
         params: _objectSpread({
           app_id: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
-          module: 'event'
+          module: 'interval'
         }, searchData)
       }
     } : undefined,
@@ -121,10 +131,11 @@ var ModuleInterval = function ModuleInterval(props) {
       userPropList: userPropList,
       searchData: searchData,
       setSearchData: setSearchData,
+      subjectEnable: subjectEnable,
       panelName: title,
       includeToday: props.includeToday,
       enableAddScene: props.defaultValue && props.defaultValue.enableAddScene === false ? false : true,
-      changeLoading: changeLoading,
+      changeLoading: setLoading,
       afterEditTarget: props.afterEditTarget,
       onUserDrill: props.onUserDrill,
       onJumpWarning: props.onJumpWarning
@@ -133,7 +144,6 @@ var ModuleInterval = function ModuleInterval(props) {
     defaultValue: props.defaultValue ? props.defaultValue.data : undefined,
     value: searchData,
     show: showList,
-    urlParam: props.urlParam,
     onUserDrill: props.onUserDrill,
     onJumpWarning: props.onJumpWarning,
     onChange: setSearchData,

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

@@ -8,6 +8,12 @@
   min-width: 1000px;
   height: 100%;
   background: #fafafb;
+  &-loading {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    height: 100%;
+  }
   .interval-layout {
     .biz-layout-collapse-container {
       height: 24px;

package/dist/esm/modules/home/types.d.ts

@@ -6,7 +6,6 @@ export declare namespace IntervalProps {
          * @description   默认查询值
          */
         defaultValue?: Value;
-        urlParam?: SearchValue;
         /**
          * @description   看板是否可禁用, true禁用
          */
@@ -23,8 +22,9 @@ export declare namespace IntervalProps {
         /**
          * 用户钻取
          */
-        onUserDrill: (data: IntervalDrillParams) => void;
+        onUserDrill: (data: IntervalDrillParams, isSubject: boolean) => void;
         onJumpWarning: (data: Record<string, any>, searchData: SearchValue) => void;
+        onChange?: (data: SearchValue) => void;
     }
     interface Value {
         /**
@@ -70,6 +70,8 @@ export declare namespace IntervalProps {
         min?: number;
         perValue?: number;
         peopleNum?: number;
+        names?: string[];
+        total?: number;
         children?: ColumnsDataType[];
     }
 }

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

@@ -10,93 +10,68 @@ 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 React, { useState } from 'react';
-import { Form, Button, Radio } from 'antd';
+import React, { useContext, useEffect, useState } from 'react';
+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";
 import { AnalysisMode } from "./types";
+import { IntervalContext } from "../../types";
 var classPrefix = 'top-panel-interval';
 var TopPanel = function TopPanel(props) {
-  var _props$urlParam, _props$urlParam2, _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 _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,
-    finalSearchData = props.finalSearchData,
-    fetchRequest = props.fetchRequest;
+    finalSearchData = props.finalSearchData;
   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;
-  var _ref = defaultValue,
+  var _useContext = useContext(IntervalContext),
+    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 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);
-      }
+    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);
     }
-    if (allData.userGroup) {
-      _data.userGroup = allData.userGroup;
-      if (_data.userGroup.length <= 0) _data.userGroup = [0];
-    }
-    props.onChange(_objectSpread(_objectSpread({}, allData), {}, {
-      analysisSubject: allData.analysisSubject ? {
-        subjectId: allData.analysisSubject.id,
-        subjectName: allData.analysisSubject.subjectName,
-        subjectAlias: allData.analysisSubject.subjectAlias,
-        unit: allData.analysisSubject.unit
-      } : undefined
-    }), (finalSearchData === null || finalSearchData === void 0 ? void 0 : finalSearchData.chartType) === 'boxplot' ? true : false);
-  };
+  }
   var resetting = function resetting() {
     form.resetFields();
     form.setFieldsValue({
@@ -122,55 +97,37 @@ 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);
+  useEffect(function () {
+    if (subjectLoading) return;
+    if (!defaultValue) {
+      setInited(true);
+      return;
+    }
+    setInited(false);
+    if (defaultValue.analysisSubject) {
+      setAnalysisType('eventProp');
     } 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
-      });
+      setAnalysisType('user');
     }
-  };
+    if (defaultValue.analysisSubject) {
+      setCurrentSubject(subjectList.find(function (item) {
+        var _defaultValue$analysi;
+        return item.id === (defaultValue === null || defaultValue === void 0 ? void 0 : (_defaultValue$analysi = defaultValue.analysisSubject) === null || _defaultValue$analysi === void 0 ? void 0 : _defaultValue$analysi.subjectId);
+      }));
+    }
+    setInited(true);
+  }, [subjectLoading]);
+  if (!inited) return null;
   return /*#__PURE__*/React.createElement(Form, {
     form: form,
+    ref: formRef,
     component: "div",
     colon: false,
     className: "panel-form-interval",
     layout: "vertical",
     initialValues: {
-      userGroup: props !== null && props !== void 0 && (_props$urlParam = props.urlParam) !== null && _props$urlParam !== void 0 && _props$urlParam.userGroup ? props === null || props === void 0 ? void 0 : (_props$urlParam2 = props.urlParam) === null || _props$urlParam2 === void 0 ? void 0 : _props$urlParam2.userGroup : userGroup ? userGroup : [0],
+      userGroup: props !== null && props !== void 0 && (_props$defaultValue = props.defaultValue) !== null && _props$defaultValue !== void 0 && _props$defaultValue.userGroup ? props === null || props === void 0 ? void 0 : (_props$defaultValue2 = props.defaultValue) === null || _props$defaultValue2 === void 0 ? void 0 : _props$defaultValue2.userGroup : userGroup ? userGroup : [0],
+      analysisSubject: props === null || props === void 0 ? void 0 : (_props$defaultValue3 = props.defaultValue) === null || _props$defaultValue3 === void 0 ? void 0 : _props$defaultValue3.analysisSubject,
       start: _objectSpread(_objectSpread({}, defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.start), {}, {
         relevancy: defaultValue !== null && defaultValue !== void 0 && (_defaultValue$associa = defaultValue.associated_next_attr) !== null && _defaultValue$associa !== void 0 && _defaultValue$associa.event_id && defaultValue !== null && defaultValue !== void 0 && (_defaultValue$associa2 = defaultValue.associated_pre_attr) !== null && _defaultValue$associa2 !== void 0 && _defaultValue$associa2.event_id || finalSearchData !== null && finalSearchData !== void 0 && (_finalSearchData$asso = finalSearchData.associatedNextAttr) !== null && _finalSearchData$asso !== void 0 && _finalSearchData$asso.eventId && finalSearchData !== null && finalSearchData !== void 0 && (_finalSearchData$asso2 = finalSearchData.associatedPreAttr) !== null && _finalSearchData$asso2 !== void 0 && _finalSearchData$asso2.eventId ? true : false
       }),
@@ -196,8 +153,8 @@ var TopPanel = function TopPanel(props) {
       analysisModel: (defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.analysisModel) || AnalysisMode.common
     },
     scrollToFirstError: true,
-    onValuesChange: onValuesChange
-  }, /*#__PURE__*/React.createElement(Form.Item, {
+    onFinish: onSearch
+  }, subjectEnable && /*#__PURE__*/React.createElement(Form.Item, {
     label: "\u5206\u6790\u4E3B\u4F53",
     className: "panel-form-interval-item"
   }, /*#__PURE__*/React.createElement(BizSelect, {
@@ -219,14 +176,27 @@ 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",
     labelField: "subjectName",
     keyField: "id",
     onChange: function onChange(val) {
+      var _formRef$current, _formRef$current2, _formRef$current3;
       setCurrentSubject(val);
+      setRelevancy(false);
+      (_formRef$current = formRef.current) === null || _formRef$current === void 0 ? void 0 : _formRef$current.setFieldValue('start', undefined);
+      (_formRef$current2 = formRef.current) === null || _formRef$current2 === void 0 ? void 0 : _formRef$current2.setFieldValue('end', undefined);
+      (_formRef$current3 = formRef.current) === null || _formRef$current3 === void 0 ? void 0 : _formRef$current3.setFieldValue('dimension', undefined);
     }
   })), analysisType === 'user' && /*#__PURE__*/React.createElement(Form.Item, {
     label: "",
@@ -243,14 +213,61 @@ 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: [{
+      validateTrigger: ['onBlur'],
+      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
-  })), relevancy ? /*#__PURE__*/React.createElement(Form.Item, {
+    key: "".concat(currentSubject === null || currentSubject === void 0 ? void 0 : currentSubject.subjectName, "-start"),
+    analysisType: analysisType,
+    onChange: function onChange(evt) {
+      var _formRef$current4;
+      setStartEvent(evt);
+      (_formRef$current4 = formRef.current) === null || _formRef$current4 === void 0 ? void 0 : _formRef$current4.setFieldValue('dimension', undefined);
+    }
+  })), /*#__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: {
@@ -261,71 +278,108 @@ 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(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$current5;
+      (_formRef$current5 = formRef.current) === null || _formRef$current5 === void 0 ? void 0 : _formRef$current5.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(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$current6;
+      (_formRef$current6 = formRef.current) === null || _formRef$current6 === void 0 ? void 0 : _formRef$current6.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$current7, _formRef$current8;
+      (_formRef$current7 = formRef.current) === null || _formRef$current7 === void 0 ? void 0 : _formRef$current7.setFieldValue('associatedPreAttr', undefined);
+      (_formRef$current8 = formRef.current) === null || _formRef$current8 === void 0 ? void 0 : _formRef$current8.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: [{
+      validateTrigger: ['onBlur'],
+      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
+    subject: currentSubject,
+    analysisType: analysisType,
+    key: "".concat(currentSubject === null || currentSubject === void 0 ? void 0 : currentSubject.subjectName, "-start"),
+    onChange: function onChange(val) {
+      var _formRef$current9;
+      setEndEvent(val);
+      (_formRef$current9 = formRef.current) === null || _formRef$current9 === void 0 ? void 0 : _formRef$current9.setFieldValue('dimension', undefined);
+    }
   })), /*#__PURE__*/React.createElement(Form.Item, {
     label: "\u6309\u5C5E\u6027\u7EC6\u5206",
     name: "dimension",
     className: "dimension-interval"
   }, /*#__PURE__*/React.createElement(BizAttributeSelector, {
     enableEventProp: true,
-    enableUserProp: true,
+    enableUserProp: analysisType === 'user',
     enableEnvProp: true,
-    eventIdList: startId === endId ? [startId] : [startId, endId],
-    value: bizAttributeSelectorValue,
+    key: "".concat(currentSubject === null || currentSubject === void 0 ? void 0 : currentSubject.subjectName, "-dimension-").concat(startEvent === null || startEvent === void 0 ? void 0 : startEvent.id, "-").concat(endEvent === null || endEvent === void 0 ? void 0 : endEvent.id, "}"),
+    eventIdList: [(startEvent === null || startEvent === void 0 ? void 0 : startEvent.id) || 0, (endEvent === null || endEvent === void 0 ? void 0 : endEvent.id) || 0],
+    showCommonProp: true,
     enableDelete: true,
-    onChange: onChangeAttr,
     onDelete: function onDelete() {
-      onChangeAttr(undefined, 'dimension');
+      var _formRef$current10;
+      (_formRef$current10 = formRef.current) === null || _formRef$current10 === void 0 ? void 0 : _formRef$current10.setFieldValue('dimension', undefined);
     }
   })), /*#__PURE__*/React.createElement(Form.Item, {
     label: "\u5206\u6790\u6A21\u578B",
@@ -341,10 +395,10 @@ var TopPanel = function TopPanel(props) {
     onClick: resetting
   }, "\u91CD\u7F6E"), /*#__PURE__*/React.createElement(Button, {
     loading: loading || subjectLoading,
-    disabled: loading || !startId || !endId || relevancy && !(defaultValue !== null && defaultValue !== void 0 && defaultValue.associatedNextAttr) && !(defaultValue !== null && defaultValue !== void 0 && defaultValue.associatedNextAttr),
     type: "primary",
     onClick: function onClick() {
-      fetchRequest(true);
+      var _formRef$current11;
+      (_formRef$current11 = formRef.current) === null || _formRef$current11 === void 0 ? void 0 : _formRef$current11.submit();
     }
   }, "\u67E5\u8BE2"))));
 };