@zgfe/modules-interval 1.0.11-zbank.1 → 1.0.11-zhongbang.0

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

@@ -53,9 +53,11 @@ var ModuleInterval = function ModuleInterval(props) {
     _useState12 = _slicedToArray(_useState11, 2),
     showList = _useState12[0],
     setShowList = _useState12[1];
+  var _useState13 = useState(false),
+    _useState14 = _slicedToArray(_useState13, 1),
+    subjectEnable = _useState14[0];
   // 初始化
   useEffect(function () {
-    // 设置初始值
     if (!props.defaultValue) {
       initSearch();
     } else {
@@ -114,7 +116,7 @@ var ModuleInterval = function ModuleInterval(props) {
       userPropList: userPropList,
       searchData: searchData,
       setSearchData: setSearchData,
-      subjectEnable: false,
+      subjectEnable: subjectEnable,
       panelName: title,
       includeToday: props.includeToday,
       enableAddScene: props.defaultValue && props.defaultValue.enableAddScene === false ? false : true,

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

@@ -12,7 +12,7 @@ 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 { Form, Button, Radio, Space, Switch } from 'antd';
-import { BizAttributeSelector, BizSelect, BizUserGroupHeader } from '@zgfe/business-lib';
+import { BizAttributeSelector, BizSelect, BizUserGroupHeader, useSubject } from '@zgfe/business-lib';
 import EventFilter from "../../components/eventFilter";
 import "./styles/index.less";
 import { AnalysisMode } from "./types";
@@ -40,6 +40,9 @@ var TopPanel = function TopPanel(props) {
     _useState6 = _slicedToArray(_useState5, 2),
     relevancy = _useState6[0],
     setRelevancy = _useState6[1];
+  var _useSubject = useSubject(),
+    subjectList = _useSubject.subjectList,
+    subjectLoading = _useSubject.loading;
   var _useContext = useContext(IntervalContext),
     subjectEnable = _useContext.subjectEnable;
   var _ref = defaultValue || {},
@@ -95,6 +98,7 @@ var TopPanel = function TopPanel(props) {
     }, true);
   };
   useEffect(function () {
+    if (subjectLoading) return;
     if (!defaultValue) {
       setInited(true);
       return;
@@ -105,8 +109,14 @@ var TopPanel = function TopPanel(props) {
     } 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);
-  }, []);
+  }, [subjectLoading]);
   if (!inited) return null;
   return /*#__PURE__*/React.createElement(Form, {
     form: form,
@@ -163,6 +173,31 @@ 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",
@@ -213,9 +248,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$current;
+      var _formRef$current4;
       setStartEvent(evt);
-      (_formRef$current = formRef.current) === null || _formRef$current === void 0 ? void 0 : _formRef$current.setFieldValue('dimension', undefined);
+      (_formRef$current4 = formRef.current) === null || _formRef$current4 === void 0 ? void 0 : _formRef$current4.setFieldValue('dimension', undefined);
     }
   })), /*#__PURE__*/React.createElement(Space, {
     align: "baseline",
@@ -260,8 +295,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$current2;
-      (_formRef$current2 = formRef.current) === null || _formRef$current2 === void 0 ? void 0 : _formRef$current2.setFieldValue('associatedPreAttr', undefined);
+      var _formRef$current5;
+      (_formRef$current5 = formRef.current) === null || _formRef$current5 === void 0 ? void 0 : _formRef$current5.setFieldValue('associatedPreAttr', undefined);
     }
   }))), /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("span", {
     className: "associated-label"
@@ -283,8 +318,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$current3;
-      (_formRef$current3 = formRef.current) === null || _formRef$current3 === void 0 ? void 0 : _formRef$current3.setFieldValue('associatedNextAttr', undefined);
+      var _formRef$current6;
+      (_formRef$current6 = formRef.current) === null || _formRef$current6 === void 0 ? void 0 : _formRef$current6.setFieldValue('associatedNextAttr', undefined);
     }
   }))), /*#__PURE__*/React.createElement("i", {
     style: {
@@ -293,9 +328,9 @@ var TopPanel = function TopPanel(props) {
       cursor: 'pointer'
     },
     onClick: function onClick() {
-      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);
+      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);
     },
     className: "bsicon qingchu"
@@ -328,9 +363,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$current6;
+      var _formRef$current9;
       setEndEvent(val);
-      (_formRef$current6 = formRef.current) === null || _formRef$current6 === void 0 ? void 0 : _formRef$current6.setFieldValue('dimension', undefined);
+      (_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",
@@ -345,8 +380,8 @@ var TopPanel = function TopPanel(props) {
     showCommonProp: true,
     enableDelete: true,
     onDelete: function onDelete() {
-      var _formRef$current7;
-      (_formRef$current7 = formRef.current) === null || _formRef$current7 === void 0 ? void 0 : _formRef$current7.setFieldValue('dimension', undefined);
+      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",
@@ -361,11 +396,11 @@ var TopPanel = function TopPanel(props) {
   }, /*#__PURE__*/React.createElement(Button, {
     onClick: resetting
   }, "\u91CD\u7F6E"), /*#__PURE__*/React.createElement(Button, {
-    loading: loading,
+    loading: loading || subjectLoading,
     type: "primary",
     onClick: function onClick() {
-      var _formRef$current8;
-      (_formRef$current8 = formRef.current) === null || _formRef$current8 === void 0 ? void 0 : _formRef$current8.submit();
+      var _formRef$current11;
+      (_formRef$current11 = formRef.current) === null || _formRef$current11 === void 0 ? void 0 : _formRef$current11.submit();
     }
   }, "\u67E5\u8BE2"))));
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-interval",
-  "version": "1.0.11-zbank.1",
+  "version": "1.0.11-zhongbang.0",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -62,5 +62,5 @@
     "umi-request": "^1.4.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "958028bde1725a5ff202ef73e5acf28464ca6956"
+  "gitHead": "26afc0ed55929a0df0020cc52da948954ff5559d"
 }