@zgfe/modules-interval 1.0.3-alpha.22 → 1.0.3-alpha.24

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.
@@ -40,41 +40,31 @@ export default (function () {
40
40
  }
41
41
  }, "\u8FD4\u56DE")) : /*#__PURE__*/React.createElement(ModuleInterval, {
42
42
  afterEditTarget: afterEditTarget,
43
- onUserDrill: onUserDrill,
44
- defaultValue: {
45
- data: {
46
- time: {
47
- begin: '2023-08-01',
48
- end: '2023-10-18',
49
- unit: 'day'
50
- },
51
- chartType: 'boxplot',
52
- start: {
53
- id: 7612,
54
- name: '间隔事件-01',
55
- relevancy: false
56
- },
57
- end: {
58
- id: 7614,
59
- name: '间隔事件-02'
60
- },
61
- dimension: {
62
- alias: '',
63
- eventId: 7612,
64
- id: 151567,
65
- isHidden: 0,
66
- key: 'eventProp-151567',
67
- label: '商品数量',
68
- propCategory: 'eventProp',
69
- type: 2,
70
- realTime: true,
71
- dimensionSub: 'event_attr'
72
- },
73
- userGroups: [0],
74
- analysisModel: 'commonInterval',
75
- analysisIndex: 'number'
76
- }
77
- },
43
+ onUserDrill: onUserDrill
44
+ // defaultValue={{
45
+ // data: {
46
+ // time: { begin: '2023-08-01', end: '2023-10-18', unit: 'day' },
47
+ // chartType: 'boxplot',
48
+ // start: { id: 7612, name: '间隔事件-01', relevancy: false },
49
+ // end: { id: 7614, name: '间隔事件-02' },
50
+ // dimension: {
51
+ // alias: '',
52
+ // eventId: 7612,
53
+ // id: 151567,
54
+ // isHidden: 0,
55
+ // key: 'eventProp-151567',
56
+ // label: '商品数量',
57
+ // propCategory: 'eventProp',
58
+ // type: 2,
59
+ // realTime: true,
60
+ // dimensionSub: 'event_attr',
61
+ // },
62
+ // userGroups: [0],
63
+ // analysisModel: 'commonInterval',
64
+ // analysisIndex: 'number',
65
+ // },
66
+ // }}
67
+ ,
78
68
  onJumpWarning: function onJumpWarning() {}
79
69
  }));
80
70
  });
@@ -11,7 +11,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
11
11
  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; } }
12
12
  function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
13
13
  import React, { useContext, useEffect, useState } from 'react';
14
- import { Form, Button, Radio, Space, Switch, Tooltip } from 'antd';
14
+ import { Form, Button, Radio, Space, Switch } from 'antd';
15
15
  import { BizAttributeSelector, BizSelect, BizUserGroupHeader, useSubject } from '@zgfe/business-lib';
16
16
  import EventFilter from "../../components/eventFilter";
17
17
  import "./styles/index.less";
@@ -184,12 +184,11 @@ var TopPanel = function TopPanel(props) {
184
184
  labelField: "subjectName",
185
185
  keyField: "id",
186
186
  onChange: function onChange(val) {
187
+ var _formRef$current, _formRef$current2;
187
188
  setCurrentSubject(val);
188
189
  setRelevancy(false);
189
- form.setFieldsValue({
190
- start: undefined,
191
- end: undefined
192
- });
190
+ (_formRef$current = formRef.current) === null || _formRef$current === void 0 ? void 0 : _formRef$current.setFieldValue('start', undefined);
191
+ (_formRef$current2 = formRef.current) === null || _formRef$current2 === void 0 ? void 0 : _formRef$current2.setFieldValue('end', undefined);
193
192
  }
194
193
  })), analysisType === 'user' && /*#__PURE__*/React.createElement(Form.Item, {
195
194
  label: "",
@@ -207,16 +206,16 @@ var TopPanel = function TopPanel(props) {
207
206
  }, /*#__PURE__*/React.createElement(Form.Item, {
208
207
  label: "\u5F00\u59CB\u4E8B\u4EF6",
209
208
  style: {
210
- marginBottom: '8px'
209
+ marginBottom: '8px',
210
+ position: 'relative'
211
211
  }
212
- }, /*#__PURE__*/React.createElement(Space, {
213
- align: "baseline"
214
212
  }, /*#__PURE__*/React.createElement(Form.Item, {
215
213
  name: "start",
216
214
  style: {
217
215
  marginBottom: 0
218
216
  },
219
217
  rules: [{
218
+ validateTrigger: ['onBlur'],
220
219
  validator: function validator(rule, value) {
221
220
  var _value$filters, _value$filters$condit;
222
221
  if (!value || !value.id) {
@@ -240,14 +239,19 @@ var TopPanel = function TopPanel(props) {
240
239
  key: "".concat(currentSubject === null || currentSubject === void 0 ? void 0 : currentSubject.subjectName, "-start"),
241
240
  analysisType: analysisType,
242
241
  onChange: setStartEvent
243
- })), /*#__PURE__*/React.createElement(Tooltip, null, /*#__PURE__*/React.createElement(Space, {
244
- align: "baseline"
242
+ })), /*#__PURE__*/React.createElement(Space, {
243
+ align: "baseline",
244
+ style: {
245
+ position: 'absolute',
246
+ top: '9px',
247
+ left: '295px'
248
+ }
245
249
  }, /*#__PURE__*/React.createElement(Switch, {
246
250
  checked: relevancy,
247
251
  onChange: setRelevancy
248
252
  }), /*#__PURE__*/React.createElement("span", {
249
253
  className: "switch-title"
250
- }, "\u8BBE\u7F6E\u5173\u8054\u5C5E\u6027"))))), relevancy && /*#__PURE__*/React.createElement(Form.Item, {
254
+ }, "\u8BBE\u7F6E\u5173\u8054\u5C5E\u6027"))), relevancy && /*#__PURE__*/React.createElement(Form.Item, {
251
255
  className: "associated"
252
256
  }, /*#__PURE__*/React.createElement(Space, {
253
257
  align: "baseline"
@@ -278,8 +282,8 @@ var TopPanel = function TopPanel(props) {
278
282
  enableDelete: true,
279
283
  key: "".concat(startEvent === null || startEvent === void 0 ? void 0 : startEvent.id, "-").concat(endEvent === null || endEvent === void 0 ? void 0 : endEvent.id, "-pre"),
280
284
  onDelete: function onDelete() {
281
- var _formRef$current;
282
- (_formRef$current = formRef.current) === null || _formRef$current === void 0 ? void 0 : _formRef$current.setFieldValue('associatedPreAttr', undefined);
285
+ var _formRef$current3;
286
+ (_formRef$current3 = formRef.current) === null || _formRef$current3 === void 0 ? void 0 : _formRef$current3.setFieldValue('associatedPreAttr', undefined);
283
287
  }
284
288
  }))), /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("span", {
285
289
  className: "associated-label"
@@ -301,8 +305,8 @@ var TopPanel = function TopPanel(props) {
301
305
  enableDelete: true,
302
306
  key: "".concat(startEvent === null || startEvent === void 0 ? void 0 : startEvent.id, "-").concat(endEvent === null || endEvent === void 0 ? void 0 : endEvent.id, "-next"),
303
307
  onDelete: function onDelete() {
304
- var _formRef$current2;
305
- (_formRef$current2 = formRef.current) === null || _formRef$current2 === void 0 ? void 0 : _formRef$current2.setFieldValue('associatedNextAttr', undefined);
308
+ var _formRef$current4;
309
+ (_formRef$current4 = formRef.current) === null || _formRef$current4 === void 0 ? void 0 : _formRef$current4.setFieldValue('associatedNextAttr', undefined);
306
310
  }
307
311
  }))), /*#__PURE__*/React.createElement("i", {
308
312
  style: {
@@ -311,9 +315,9 @@ var TopPanel = function TopPanel(props) {
311
315
  cursor: 'pointer'
312
316
  },
313
317
  onClick: function onClick() {
314
- var _formRef$current3, _formRef$current4;
315
- (_formRef$current3 = formRef.current) === null || _formRef$current3 === void 0 ? void 0 : _formRef$current3.setFieldValue('associatedPreAttr', undefined);
316
- (_formRef$current4 = formRef.current) === null || _formRef$current4 === void 0 ? void 0 : _formRef$current4.setFieldValue('associatedNextAttr', undefined);
318
+ var _formRef$current5, _formRef$current6;
319
+ (_formRef$current5 = formRef.current) === null || _formRef$current5 === void 0 ? void 0 : _formRef$current5.setFieldValue('associatedPreAttr', undefined);
320
+ (_formRef$current6 = formRef.current) === null || _formRef$current6 === void 0 ? void 0 : _formRef$current6.setFieldValue('associatedNextAttr', undefined);
317
321
  setRelevancy(false);
318
322
  },
319
323
  className: "bsicon qingchu"
@@ -321,6 +325,7 @@ var TopPanel = function TopPanel(props) {
321
325
  label: "\u7ED3\u675F\u4E8B\u4EF6",
322
326
  name: "end",
323
327
  rules: [{
328
+ validateTrigger: ['onBlur'],
324
329
  validator: function validator(rule, value) {
325
330
  var _value$filters2, _value$filters2$condi;
326
331
  if (!value || !value.id) {
@@ -358,8 +363,8 @@ var TopPanel = function TopPanel(props) {
358
363
  eventIdList: (startEvent === null || startEvent === void 0 ? void 0 : startEvent.id) === (endEvent === null || endEvent === void 0 ? void 0 : endEvent.id) ? [startEvent === null || startEvent === void 0 ? void 0 : startEvent.id] : [startEvent === null || startEvent === void 0 ? void 0 : startEvent.id, endEvent === null || endEvent === void 0 ? void 0 : endEvent.id],
359
364
  enableDelete: true,
360
365
  onDelete: function onDelete() {
361
- var _formRef$current5;
362
- (_formRef$current5 = formRef.current) === null || _formRef$current5 === void 0 ? void 0 : _formRef$current5.setFieldValue('dimension', undefined);
366
+ var _formRef$current7;
367
+ (_formRef$current7 = formRef.current) === null || _formRef$current7 === void 0 ? void 0 : _formRef$current7.setFieldValue('dimension', undefined);
363
368
  }
364
369
  })), /*#__PURE__*/React.createElement(Form.Item, {
365
370
  label: "\u5206\u6790\u6A21\u578B",
@@ -377,8 +382,8 @@ var TopPanel = function TopPanel(props) {
377
382
  loading: loading || subjectLoading,
378
383
  type: "primary",
379
384
  onClick: function onClick() {
380
- var _formRef$current6;
381
- (_formRef$current6 = formRef.current) === null || _formRef$current6 === void 0 ? void 0 : _formRef$current6.submit();
385
+ var _formRef$current8;
386
+ (_formRef$current8 = formRef.current) === null || _formRef$current8 === void 0 ? void 0 : _formRef$current8.submit();
382
387
  }
383
388
  }, "\u67E5\u8BE2"))));
384
389
  };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zgfe/modules-interval",
3
- "version": "1.0.3-alpha.22",
3
+ "version": "1.0.3-alpha.24",
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": "a2bb7b5a813df9bb5b15e554d989f71df0fac5c0"
65
+ "gitHead": "433301a7b7852818f3fce8c517666a25561a5d55"
66
66
  }