@zgfe/modules-interval 1.0.11-zb.0 → 1.0.11-zbank.0

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 +0 -9
  2. package/dist/esm/modules/topPanel/index.js +28 -74
  3. package/package.json +2 -2
package/dist/esm/modules/home/index.js CHANGED
@@ -53,14 +53,8 @@ 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, 2),
58
- subjectEnable = _useState14[0],
59
- setSubjectEnable = _useState14[1];
60
56
  // 初始化
61
57
  useEffect(function () {
62
- setLoading(true);
63
- setSubjectEnable(false);
64
58
  // 设置初始值
65
59
  if (!props.defaultValue) {
66
60
  initSearch();
@@ -71,9 +65,6 @@ var ModuleInterval = function ModuleInterval(props) {
71
65
  setTitle(props.defaultValue.name);
72
66
  setSearchData(props.defaultValue.data);
73
67
  }
74
- setTimeout(function () {
75
- setLoading(false);
76
- });
77
68
  }, []);
78
69
 
79
70
  // 查询条件初始化
package/dist/esm/modules/topPanel/index.js CHANGED
@@ -40,37 +40,23 @@ var TopPanel = function TopPanel(props) {
40
40
  _useState6 = _slicedToArray(_useState5, 2),
41
41
  relevancy = _useState6[0],
42
42
  setRelevancy = _useState6[1];
43
- var _useState7 = useState([]),
44
- _useState8 = _slicedToArray(_useState7, 2),
45
- subjectList = _useState8[0],
46
- setSubjectList = _useState8[1];
47
- var _useState9 = useState(true),
48
- _useState10 = _slicedToArray(_useState9, 2),
49
- subjectLoading = _useState10[0],
50
- setSubjectLoading = _useState10[1];
51
43
  var _useContext = useContext(IntervalContext),
52
44
  subjectEnable = _useContext.subjectEnable;
53
45
  var _ref = defaultValue || {},
54
46
  userGroup = _ref.userGroup;
55
- var _useState11 = useState('user'),
47
+ var _useState7 = useState('user'),
48
+ _useState8 = _slicedToArray(_useState7, 2),
49
+ analysisType = _useState8[0],
50
+ setAnalysisType = _useState8[1];
51
+ var _useState9 = useState(),
52
+ _useState10 = _slicedToArray(_useState9, 2),
53
+ currentSubject = _useState10[0],
54
+ setCurrentSubject = _useState10[1];
55
+ var _useState11 = useState(false),
56
56
  _useState12 = _slicedToArray(_useState11, 2),
57
- analysisType = _useState12[0],
58
- setAnalysisType = _useState12[1];
59
- var _useState13 = useState(),
60
- _useState14 = _slicedToArray(_useState13, 2),
61
- currentSubject = _useState14[0],
62
- setCurrentSubject = _useState14[1];
63
- var _useState15 = useState(false),
64
- _useState16 = _slicedToArray(_useState15, 2),
65
- inited = _useState16[0],
66
- setInited = _useState16[1];
57
+ inited = _useState12[0],
58
+ setInited = _useState12[1];
67
59
  var formRef = React.useRef(null);
68
- useEffect(function () {
69
- setTimeout(function () {
70
- setSubjectList([]);
71
- setSubjectLoading(false);
72
- }, 300);
73
- }, []);
74
60
  function onSearch(values) {
75
61
  if (props.onChange) {
76
62
  props.onChange(_objectSpread(_objectSpread({}, values), {}, {
@@ -109,7 +95,6 @@ var TopPanel = function TopPanel(props) {
109
95
  }, true);
110
96
  };
111
97
  useEffect(function () {
112
- if (subjectLoading) return;
113
98
  if (!defaultValue) {
114
99
  setInited(true);
115
100
  return;
@@ -120,14 +105,8 @@ var TopPanel = function TopPanel(props) {
120
105
  } else {
121
106
  setAnalysisType('user');
122
107
  }
123
- if (defaultValue.analysisSubject) {
124
- setCurrentSubject(subjectList.find(function (item) {
125
- var _defaultValue$analysi;
126
- return item.id === (defaultValue === null || defaultValue === void 0 ? void 0 : (_defaultValue$analysi = defaultValue.analysisSubject) === null || _defaultValue$analysi === void 0 ? void 0 : _defaultValue$analysi.subjectId);
127
- }));
128
- }
129
108
  setInited(true);
130
- }, [subjectLoading]);
109
+ }, []);
131
110
  if (!inited) return null;
132
111
  return /*#__PURE__*/React.createElement(Form, {
133
112
  form: form,
@@ -184,31 +163,6 @@ var TopPanel = function TopPanel(props) {
184
163
  setAnalysisType(val.value);
185
164
  resetting();
186
165
  }
187
- })), analysisType === 'eventProp' && /*#__PURE__*/React.createElement(Form.Item, {
188
- label: "\u4E3B\u4F53\u540D\u79F0",
189
- name: "analysisSubject",
190
- className: "panel-form-interval-item",
191
- rules: [{
192
- validator: function validator(rule, value) {
193
- if (!value) {
194
- return Promise.reject('请选择主体名称');
195
- }
196
- return Promise.resolve();
197
- }
198
- }]
199
- }, /*#__PURE__*/React.createElement(BizSelect, {
200
- options: subjectList,
201
- aliasField: "subjectAlias",
202
- labelField: "subjectName",
203
- keyField: "id",
204
- onChange: function onChange(val) {
205
- var _formRef$current, _formRef$current2, _formRef$current3;
206
- setCurrentSubject(val);
207
- setRelevancy(false);
208
- (_formRef$current = formRef.current) === null || _formRef$current === void 0 ? void 0 : _formRef$current.setFieldValue('start', undefined);
209
- (_formRef$current2 = formRef.current) === null || _formRef$current2 === void 0 ? void 0 : _formRef$current2.setFieldValue('end', undefined);
210
- (_formRef$current3 = formRef.current) === null || _formRef$current3 === void 0 ? void 0 : _formRef$current3.setFieldValue('dimension', undefined);
211
- }
212
166
  })), analysisType === 'user' && /*#__PURE__*/React.createElement(Form.Item, {
213
167
  label: "",
214
168
  name: "userGroup",
@@ -259,9 +213,9 @@ var TopPanel = function TopPanel(props) {
259
213
  key: "".concat(currentSubject === null || currentSubject === void 0 ? void 0 : currentSubject.subjectName, "-start"),
260
214
  analysisType: analysisType,
261
215
  onChange: function onChange(evt) {
262
- var _formRef$current4;
216
+ var _formRef$current;
263
217
  setStartEvent(evt);
264
- (_formRef$current4 = formRef.current) === null || _formRef$current4 === void 0 ? void 0 : _formRef$current4.setFieldValue('dimension', undefined);
218
+ (_formRef$current = formRef.current) === null || _formRef$current === void 0 ? void 0 : _formRef$current.setFieldValue('dimension', undefined);
265
219
  }
266
220
  })), /*#__PURE__*/React.createElement(Space, {
267
221
  align: "baseline",
@@ -306,8 +260,8 @@ var TopPanel = function TopPanel(props) {
306
260
  enableDelete: true,
307
261
  key: "".concat(startEvent === null || startEvent === void 0 ? void 0 : startEvent.id, "-").concat(endEvent === null || endEvent === void 0 ? void 0 : endEvent.id, "-pre"),
308
262
  onDelete: function onDelete() {
309
- var _formRef$current5;
310
- (_formRef$current5 = formRef.current) === null || _formRef$current5 === void 0 ? void 0 : _formRef$current5.setFieldValue('associatedPreAttr', undefined);
263
+ var _formRef$current2;
264
+ (_formRef$current2 = formRef.current) === null || _formRef$current2 === void 0 ? void 0 : _formRef$current2.setFieldValue('associatedPreAttr', undefined);
311
265
  }
312
266
  }))), /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("span", {
313
267
  className: "associated-label"
@@ -329,8 +283,8 @@ var TopPanel = function TopPanel(props) {
329
283
  enableDelete: true,
330
284
  key: "".concat(startEvent === null || startEvent === void 0 ? void 0 : startEvent.id, "-").concat(endEvent === null || endEvent === void 0 ? void 0 : endEvent.id, "-next"),
331
285
  onDelete: function onDelete() {
332
- var _formRef$current6;
333
- (_formRef$current6 = formRef.current) === null || _formRef$current6 === void 0 ? void 0 : _formRef$current6.setFieldValue('associatedNextAttr', undefined);
286
+ var _formRef$current3;
287
+ (_formRef$current3 = formRef.current) === null || _formRef$current3 === void 0 ? void 0 : _formRef$current3.setFieldValue('associatedNextAttr', undefined);
334
288
  }
335
289
  }))), /*#__PURE__*/React.createElement("i", {
336
290
  style: {
@@ -339,9 +293,9 @@ var TopPanel = function TopPanel(props) {
339
293
  cursor: 'pointer'
340
294
  },
341
295
  onClick: function onClick() {
342
- var _formRef$current7, _formRef$current8;
343
- (_formRef$current7 = formRef.current) === null || _formRef$current7 === void 0 ? void 0 : _formRef$current7.setFieldValue('associatedPreAttr', undefined);
344
- (_formRef$current8 = formRef.current) === null || _formRef$current8 === void 0 ? void 0 : _formRef$current8.setFieldValue('associatedNextAttr', undefined);
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);
345
299
  setRelevancy(false);
346
300
  },
347
301
  className: "bsicon qingchu"
@@ -374,9 +328,9 @@ var TopPanel = function TopPanel(props) {
374
328
  analysisType: analysisType,
375
329
  key: "".concat(currentSubject === null || currentSubject === void 0 ? void 0 : currentSubject.subjectName, "-start"),
376
330
  onChange: function onChange(val) {
377
- var _formRef$current9;
331
+ var _formRef$current6;
378
332
  setEndEvent(val);
379
- (_formRef$current9 = formRef.current) === null || _formRef$current9 === void 0 ? void 0 : _formRef$current9.setFieldValue('dimension', undefined);
333
+ (_formRef$current6 = formRef.current) === null || _formRef$current6 === void 0 ? void 0 : _formRef$current6.setFieldValue('dimension', undefined);
380
334
  }
381
335
  })), /*#__PURE__*/React.createElement(Form.Item, {
382
336
  label: "\u6309\u5C5E\u6027\u7EC6\u5206",
@@ -391,8 +345,8 @@ var TopPanel = function TopPanel(props) {
391
345
  showCommonProp: true,
392
346
  enableDelete: true,
393
347
  onDelete: function onDelete() {
394
- var _formRef$current10;
395
- (_formRef$current10 = formRef.current) === null || _formRef$current10 === void 0 ? void 0 : _formRef$current10.setFieldValue('dimension', undefined);
348
+ var _formRef$current7;
349
+ (_formRef$current7 = formRef.current) === null || _formRef$current7 === void 0 ? void 0 : _formRef$current7.setFieldValue('dimension', undefined);
396
350
  }
397
351
  })), /*#__PURE__*/React.createElement(Form.Item, {
398
352
  label: "\u5206\u6790\u6A21\u578B",
@@ -407,11 +361,11 @@ var TopPanel = function TopPanel(props) {
407
361
  }, /*#__PURE__*/React.createElement(Button, {
408
362
  onClick: resetting
409
363
  }, "\u91CD\u7F6E"), /*#__PURE__*/React.createElement(Button, {
410
- loading: loading || subjectLoading,
364
+ loading: loading,
411
365
  type: "primary",
412
366
  onClick: function onClick() {
413
- var _formRef$current11;
414
- (_formRef$current11 = formRef.current) === null || _formRef$current11 === void 0 ? void 0 : _formRef$current11.submit();
367
+ var _formRef$current8;
368
+ (_formRef$current8 = formRef.current) === null || _formRef$current8 === void 0 ? void 0 : _formRef$current8.submit();
415
369
  }
416
370
  }, "\u67E5\u8BE2"))));
417
371
  };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zgfe/modules-interval",
3
- "version": "1.0.11-zb.0",
3
+ "version": "1.0.11-zbank.0",
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": "84b8031157b89acebf1d9d300c2e10bb8d88de42"
65
+ "gitHead": "8ec9fa9b85c23d416be5ababb681cdbbad413975"
66
66
  }