@zgfe/modules-interval 1.0.11-zhongbang.4 → 1.0.11-zhongbang.6

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

@@ -97,7 +97,7 @@ var EventContent = function EventContent(props) {
     return function () {
       clearTimeout(searchTimer);
     };
-  }, [searchData]);
+  }, [searchData, eventId]);
   useEffect(function () {
     handleSearch && handleSearch(loading);
   }, [loading]);

package/dist/esm/modules/topPanel/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 React, { useContext, useEffect, useState } from 'react';
+import React, { useContext, useState } from 'react';
 import { Form, Button, Radio, Space, Switch } from 'antd';
 import { BizAttributeSelector, BizSelect, BizUserGroupHeader } from '@zgfe/business-lib';
 import EventFilter from "../../components/eventFilter";
@@ -40,8 +40,6 @@ var TopPanel = function TopPanel(props) {
     _useState6 = _slicedToArray(_useState5, 2),
     relevancy = _useState6[0],
     setRelevancy = _useState6[1];
-  var subjectList = [];
-  var subjectLoading = false;
   var _useContext = useContext(IntervalContext),
     subjectEnable = _useContext.subjectEnable;
   var _ref = defaultValue || {},
@@ -54,10 +52,6 @@ var TopPanel = function TopPanel(props) {
     _useState10 = _slicedToArray(_useState9, 2),
     currentSubject = _useState10[0],
     setCurrentSubject = _useState10[1];
-  var _useState11 = useState(false),
-    _useState12 = _slicedToArray(_useState11, 2),
-    inited = _useState12[0],
-    setInited = _useState12[1];
   var formRef = React.useRef(null);
   function onSearch(values) {
     if (props.onChange) {
@@ -96,27 +90,6 @@ var TopPanel = function TopPanel(props) {
       associatedNextAttr: undefined
     }, true);
   };
-  useEffect(function () {
-    if (subjectLoading) return;
-    if (!defaultValue) {
-      setInited(true);
-      return;
-    }
-    setInited(false);
-    if (defaultValue.analysisSubject) {
-      setAnalysisType('eventProp');
-    } else {
-      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);
-  }, []);
-  if (!inited) return null;
   return /*#__PURE__*/React.createElement(Form, {
     form: form,
     ref: formRef,
@@ -172,31 +145,6 @@ var TopPanel = function TopPanel(props) {
       setAnalysisType(val.value);
       resetting();
     }
-  })), analysisType === 'eventProp' && /*#__PURE__*/React.createElement(Form.Item, {
-    label: "\u4E3B\u4F53\u540D\u79F0",
-    name: "analysisSubject",
-    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: "",
     name: "userGroup",
@@ -247,9 +195,9 @@ var TopPanel = function TopPanel(props) {
     key: "".concat(currentSubject === null || currentSubject === void 0 ? void 0 : currentSubject.subjectName, "-start"),
     analysisType: analysisType,
     onChange: function onChange(evt) {
-      var _formRef$current4;
+      var _formRef$current;
       setStartEvent(evt);
-      (_formRef$current4 = formRef.current) === null || _formRef$current4 === void 0 ? void 0 : _formRef$current4.setFieldValue('dimension', undefined);
+      (_formRef$current = formRef.current) === null || _formRef$current === void 0 ? void 0 : _formRef$current.setFieldValue('dimension', undefined);
     }
   })), /*#__PURE__*/React.createElement(Space, {
     align: "baseline",
@@ -294,8 +242,8 @@ var TopPanel = function TopPanel(props) {
     enableDelete: true,
     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() {
-      var _formRef$current5;
-      (_formRef$current5 = formRef.current) === null || _formRef$current5 === void 0 ? void 0 : _formRef$current5.setFieldValue('associatedPreAttr', undefined);
+      var _formRef$current2;
+      (_formRef$current2 = formRef.current) === null || _formRef$current2 === void 0 ? void 0 : _formRef$current2.setFieldValue('associatedPreAttr', undefined);
     }
   }))), /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("span", {
     className: "associated-label"
@@ -317,8 +265,8 @@ var TopPanel = function TopPanel(props) {
     enableDelete: true,
     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() {
-      var _formRef$current6;
-      (_formRef$current6 = formRef.current) === null || _formRef$current6 === void 0 ? void 0 : _formRef$current6.setFieldValue('associatedNextAttr', undefined);
+      var _formRef$current3;
+      (_formRef$current3 = formRef.current) === null || _formRef$current3 === void 0 ? void 0 : _formRef$current3.setFieldValue('associatedNextAttr', undefined);
     }
   }))), /*#__PURE__*/React.createElement("i", {
     style: {
@@ -327,9 +275,9 @@ var TopPanel = function TopPanel(props) {
       cursor: 'pointer'
     },
     onClick: function onClick() {
-      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);
+      var _formRef$current4, _formRef$current5;
+      (_formRef$current4 = formRef.current) === null || _formRef$current4 === void 0 ? void 0 : _formRef$current4.setFieldValue('associatedPreAttr', undefined);
+      (_formRef$current5 = formRef.current) === null || _formRef$current5 === void 0 ? void 0 : _formRef$current5.setFieldValue('associatedNextAttr', undefined);
       setRelevancy(false);
     },
     className: "bsicon qingchu"
@@ -362,9 +310,9 @@ var TopPanel = function TopPanel(props) {
     analysisType: analysisType,
     key: "".concat(currentSubject === null || currentSubject === void 0 ? void 0 : currentSubject.subjectName, "-start"),
     onChange: function onChange(val) {
-      var _formRef$current9;
+      var _formRef$current6;
       setEndEvent(val);
-      (_formRef$current9 = formRef.current) === null || _formRef$current9 === void 0 ? void 0 : _formRef$current9.setFieldValue('dimension', undefined);
+      (_formRef$current6 = formRef.current) === null || _formRef$current6 === void 0 ? void 0 : _formRef$current6.setFieldValue('dimension', undefined);
     }
   })), /*#__PURE__*/React.createElement(Form.Item, {
     label: "\u6309\u5C5E\u6027\u7EC6\u5206",
@@ -379,8 +327,8 @@ var TopPanel = function TopPanel(props) {
     showCommonProp: true,
     enableDelete: true,
     onDelete: function onDelete() {
-      var _formRef$current10;
-      (_formRef$current10 = formRef.current) === null || _formRef$current10 === void 0 ? void 0 : _formRef$current10.setFieldValue('dimension', undefined);
+      var _formRef$current7;
+      (_formRef$current7 = formRef.current) === null || _formRef$current7 === void 0 ? void 0 : _formRef$current7.setFieldValue('dimension', undefined);
     }
   })), /*#__PURE__*/React.createElement(Form.Item, {
     label: "\u5206\u6790\u6A21\u578B",
@@ -395,11 +343,11 @@ var TopPanel = function TopPanel(props) {
   }, /*#__PURE__*/React.createElement(Button, {
     onClick: resetting
   }, "\u91CD\u7F6E"), /*#__PURE__*/React.createElement(Button, {
-    loading: loading || subjectLoading,
+    loading: loading,
     type: "primary",
     onClick: function onClick() {
-      var _formRef$current11;
-      (_formRef$current11 = formRef.current) === null || _formRef$current11 === void 0 ? void 0 : _formRef$current11.submit();
+      var _formRef$current8;
+      (_formRef$current8 = formRef.current) === null || _formRef$current8 === void 0 ? void 0 : _formRef$current8.submit();
     }
   }, "\u67E5\u8BE2"))));
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-interval",
-  "version": "1.0.11-zhongbang.4",
+  "version": "1.0.11-zhongbang.6",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -62,5 +62,5 @@
     "umi-request": "^1.4.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "7ffafa1933fe3557aa377b3c92a6ff22d834c4d8"
+  "gitHead": "7fb204b5ca8ac312ddec17c623776f80e22bb869"
 }