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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/dist/esm/modules/home/index.js +6 -3
  2. package/dist/esm/modules/topPanel/index.js +53 -18
  3. package/package.json +2 -2
package/dist/esm/modules/home/index.js CHANGED
@@ -53,9 +53,11 @@ var ModuleInterval = function ModuleInterval(props) {
53
53
  _useState12 = _slicedToArray(_useState11, 2),
54
54
  showList = _useState12[0],
55
55
  setShowList = _useState12[1];
56
+ var _useState13 = useState(false),
57
+ _useState14 = _slicedToArray(_useState13, 1),
58
+ subjectEnable = _useState14[0];
56
59
  // 初始化
57
60
  useEffect(function () {
58
- // 设置初始值
59
61
  if (!props.defaultValue) {
60
62
  initSearch();
61
63
  } else {
@@ -95,7 +97,8 @@ var ModuleInterval = function ModuleInterval(props) {
95
97
  name: title,
96
98
  params: _objectSpread({
97
99
  app_id: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
98
- module: 'interval'
100
+ module: 'interval',
101
+ userGroup: (searchData === null || searchData === void 0 ? void 0 : searchData.userGroup) || (searchData === null || searchData === void 0 ? void 0 : searchData.user_group)
99
102
  }, searchData)
100
103
  }
101
104
  } : undefined,
@@ -114,7 +117,7 @@ var ModuleInterval = function ModuleInterval(props) {
114
117
  userPropList: userPropList,
115
118
  searchData: searchData,
116
119
  setSearchData: setSearchData,
117
- subjectEnable: false,
120
+ subjectEnable: subjectEnable,
118
121
  panelName: title,
119
122
  includeToday: props.includeToday,
120
123
  enableAddScene: props.defaultValue && props.defaultValue.enableAddScene === false ? false : true,
package/dist/esm/modules/topPanel/index.js CHANGED
@@ -12,7 +12,7 @@ function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefine
12
12
  function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
13
13
  import React, { useContext, useEffect, useState } from 'react';
14
14
  import { Form, Button, Radio, Space, Switch } from 'antd';
15
- import { BizAttributeSelector, BizSelect, BizUserGroupHeader } from '@zgfe/business-lib';
15
+ import { BizAttributeSelector, BizSelect, BizUserGroupHeader, useSubject } from '@zgfe/business-lib';
16
16
  import EventFilter from "../../components/eventFilter";
17
17
  import "./styles/index.less";
18
18
  import { AnalysisMode } from "./types";
@@ -40,6 +40,9 @@ var TopPanel = function TopPanel(props) {
40
40
  _useState6 = _slicedToArray(_useState5, 2),
41
41
  relevancy = _useState6[0],
42
42
  setRelevancy = _useState6[1];
43
+ var _useSubject = useSubject(),
44
+ subjectList = _useSubject.subjectList,
45
+ subjectLoading = _useSubject.loading;
43
46
  var _useContext = useContext(IntervalContext),
44
47
  subjectEnable = _useContext.subjectEnable;
45
48
  var _ref = defaultValue || {},
@@ -95,6 +98,7 @@ var TopPanel = function TopPanel(props) {
95
98
  }, true);
96
99
  };
97
100
  useEffect(function () {
101
+ if (subjectLoading) return;
98
102
  if (!defaultValue) {
99
103
  setInited(true);
100
104
  return;
@@ -105,8 +109,14 @@ var TopPanel = function TopPanel(props) {
105
109
  } else {
106
110
  setAnalysisType('user');
107
111
  }
112
+ if (defaultValue.analysisSubject) {
113
+ setCurrentSubject(subjectList.find(function (item) {
114
+ var _defaultValue$analysi;
115
+ return item.id === (defaultValue === null || defaultValue === void 0 ? void 0 : (_defaultValue$analysi = defaultValue.analysisSubject) === null || _defaultValue$analysi === void 0 ? void 0 : _defaultValue$analysi.subjectId);
116
+ }));
117
+ }
108
118
  setInited(true);
109
- }, []);
119
+ }, [subjectLoading]);
110
120
  if (!inited) return null;
111
121
  return /*#__PURE__*/React.createElement(Form, {
112
122
  form: form,
@@ -163,6 +173,31 @@ var TopPanel = function TopPanel(props) {
163
173
  setAnalysisType(val.value);
164
174
  resetting();
165
175
  }
176
+ })), analysisType === 'eventProp' && /*#__PURE__*/React.createElement(Form.Item, {
177
+ label: "\u4E3B\u4F53\u540D\u79F0",
178
+ name: "analysisSubject",
179
+ className: "panel-form-interval-item",
180
+ rules: [{
181
+ validator: function validator(rule, value) {
182
+ if (!value) {
183
+ return Promise.reject('请选择主体名称');
184
+ }
185
+ return Promise.resolve();
186
+ }
187
+ }]
188
+ }, /*#__PURE__*/React.createElement(BizSelect, {
189
+ options: subjectList,
190
+ aliasField: "subjectAlias",
191
+ labelField: "subjectName",
192
+ keyField: "id",
193
+ onChange: function onChange(val) {
194
+ var _formRef$current, _formRef$current2, _formRef$current3;
195
+ setCurrentSubject(val);
196
+ setRelevancy(false);
197
+ (_formRef$current = formRef.current) === null || _formRef$current === void 0 ? void 0 : _formRef$current.setFieldValue('start', undefined);
198
+ (_formRef$current2 = formRef.current) === null || _formRef$current2 === void 0 ? void 0 : _formRef$current2.setFieldValue('end', undefined);
199
+ (_formRef$current3 = formRef.current) === null || _formRef$current3 === void 0 ? void 0 : _formRef$current3.setFieldValue('dimension', undefined);
200
+ }
166
201
  })), analysisType === 'user' && /*#__PURE__*/React.createElement(Form.Item, {
167
202
  label: "",
168
203
  name: "userGroup",
@@ -213,9 +248,9 @@ var TopPanel = function TopPanel(props) {
213
248
  key: "".concat(currentSubject === null || currentSubject === void 0 ? void 0 : currentSubject.subjectName, "-start"),
214
249
  analysisType: analysisType,
215
250
  onChange: function onChange(evt) {
216
- var _formRef$current;
251
+ var _formRef$current4;
217
252
  setStartEvent(evt);
218
- (_formRef$current = formRef.current) === null || _formRef$current === void 0 ? void 0 : _formRef$current.setFieldValue('dimension', undefined);
253
+ (_formRef$current4 = formRef.current) === null || _formRef$current4 === void 0 ? void 0 : _formRef$current4.setFieldValue('dimension', undefined);
219
254
  }
220
255
  })), /*#__PURE__*/React.createElement(Space, {
221
256
  align: "baseline",
@@ -260,8 +295,8 @@ var TopPanel = function TopPanel(props) {
260
295
  enableDelete: true,
261
296
  key: "".concat(startEvent === null || startEvent === void 0 ? void 0 : startEvent.id, "-").concat(endEvent === null || endEvent === void 0 ? void 0 : endEvent.id, "-pre"),
262
297
  onDelete: function onDelete() {
263
- var _formRef$current2;
264
- (_formRef$current2 = formRef.current) === null || _formRef$current2 === void 0 ? void 0 : _formRef$current2.setFieldValue('associatedPreAttr', undefined);
298
+ var _formRef$current5;
299
+ (_formRef$current5 = formRef.current) === null || _formRef$current5 === void 0 ? void 0 : _formRef$current5.setFieldValue('associatedPreAttr', undefined);
265
300
  }
266
301
  }))), /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("span", {
267
302
  className: "associated-label"
@@ -283,8 +318,8 @@ var TopPanel = function TopPanel(props) {
283
318
  enableDelete: true,
284
319
  key: "".concat(startEvent === null || startEvent === void 0 ? void 0 : startEvent.id, "-").concat(endEvent === null || endEvent === void 0 ? void 0 : endEvent.id, "-next"),
285
320
  onDelete: function onDelete() {
286
- var _formRef$current3;
287
- (_formRef$current3 = formRef.current) === null || _formRef$current3 === void 0 ? void 0 : _formRef$current3.setFieldValue('associatedNextAttr', undefined);
321
+ var _formRef$current6;
322
+ (_formRef$current6 = formRef.current) === null || _formRef$current6 === void 0 ? void 0 : _formRef$current6.setFieldValue('associatedNextAttr', undefined);
288
323
  }
289
324
  }))), /*#__PURE__*/React.createElement("i", {
290
325
  style: {
@@ -293,9 +328,9 @@ var TopPanel = function TopPanel(props) {
293
328
  cursor: 'pointer'
294
329
  },
295
330
  onClick: function onClick() {
296
- var _formRef$current4, _formRef$current5;
297
- (_formRef$current4 = formRef.current) === null || _formRef$current4 === void 0 ? void 0 : _formRef$current4.setFieldValue('associatedPreAttr', undefined);
298
- (_formRef$current5 = formRef.current) === null || _formRef$current5 === void 0 ? void 0 : _formRef$current5.setFieldValue('associatedNextAttr', undefined);
331
+ var _formRef$current7, _formRef$current8;
332
+ (_formRef$current7 = formRef.current) === null || _formRef$current7 === void 0 ? void 0 : _formRef$current7.setFieldValue('associatedPreAttr', undefined);
333
+ (_formRef$current8 = formRef.current) === null || _formRef$current8 === void 0 ? void 0 : _formRef$current8.setFieldValue('associatedNextAttr', undefined);
299
334
  setRelevancy(false);
300
335
  },
301
336
  className: "bsicon qingchu"
@@ -328,9 +363,9 @@ var TopPanel = function TopPanel(props) {
328
363
  analysisType: analysisType,
329
364
  key: "".concat(currentSubject === null || currentSubject === void 0 ? void 0 : currentSubject.subjectName, "-start"),
330
365
  onChange: function onChange(val) {
331
- var _formRef$current6;
366
+ var _formRef$current9;
332
367
  setEndEvent(val);
333
- (_formRef$current6 = formRef.current) === null || _formRef$current6 === void 0 ? void 0 : _formRef$current6.setFieldValue('dimension', undefined);
368
+ (_formRef$current9 = formRef.current) === null || _formRef$current9 === void 0 ? void 0 : _formRef$current9.setFieldValue('dimension', undefined);
334
369
  }
335
370
  })), /*#__PURE__*/React.createElement(Form.Item, {
336
371
  label: "\u6309\u5C5E\u6027\u7EC6\u5206",
@@ -345,8 +380,8 @@ var TopPanel = function TopPanel(props) {
345
380
  showCommonProp: true,
346
381
  enableDelete: true,
347
382
  onDelete: function onDelete() {
348
- var _formRef$current7;
349
- (_formRef$current7 = formRef.current) === null || _formRef$current7 === void 0 ? void 0 : _formRef$current7.setFieldValue('dimension', undefined);
383
+ var _formRef$current10;
384
+ (_formRef$current10 = formRef.current) === null || _formRef$current10 === void 0 ? void 0 : _formRef$current10.setFieldValue('dimension', undefined);
350
385
  }
351
386
  })), /*#__PURE__*/React.createElement(Form.Item, {
352
387
  label: "\u5206\u6790\u6A21\u578B",
@@ -361,11 +396,11 @@ var TopPanel = function TopPanel(props) {
361
396
  }, /*#__PURE__*/React.createElement(Button, {
362
397
  onClick: resetting
363
398
  }, "\u91CD\u7F6E"), /*#__PURE__*/React.createElement(Button, {
364
- loading: loading,
399
+ loading: loading || subjectLoading,
365
400
  type: "primary",
366
401
  onClick: function onClick() {
367
- var _formRef$current8;
368
- (_formRef$current8 = formRef.current) === null || _formRef$current8 === void 0 ? void 0 : _formRef$current8.submit();
402
+ var _formRef$current11;
403
+ (_formRef$current11 = formRef.current) === null || _formRef$current11 === void 0 ? void 0 : _formRef$current11.submit();
369
404
  }
370
405
  }, "\u67E5\u8BE2"))));
371
406
  };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zgfe/modules-interval",
3
- "version": "1.0.11-zbank.1",
3
+ "version": "1.0.11-zhongbang.1",
4
4
  "scripts": {
5
5
  "start": "dumi dev",
6
6
  "docs:build": "dumi build",
@@ -62,5 +62,5 @@
62
62
  "umi-request": "^1.4.0",
63
63
  "yorkie": "^2.0.0"
64
64
  },
65
- "gitHead": "958028bde1725a5ff202ef73e5acf28464ca6956"
65
+ "gitHead": "2294b84c9593f1e57ee307a9b26905efa10b4773"
66
66
  }