@zgfe/modules-interval 1.0.0-interval.7 → 1.0.0-interval.9

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 (12) hide show
  1. package/dist/esm/components/eventFilter/index.js +4 -5
  2. package/dist/esm/components/searchPanel/index.js +5 -2
  3. package/dist/esm/components/table/index.js +1 -2
  4. package/dist/esm/components/topBar/index.js +2 -2
  5. package/dist/esm/modules/content/index.js +28 -18
  6. package/dist/esm/modules/content/utils.d.ts +2 -1
  7. package/dist/esm/modules/content/utils.js +13 -10
  8. package/dist/esm/modules/topPanel/index.js +80 -43
  9. package/dist/esm/modules/topPanel/styles/index.less +8 -1
  10. package/dist/esm/modules/topPanel/types.d.ts +2 -0
  11. package/dist/esm/utils/formData.js +10 -8
  12. package/package.json +1 -1
package/dist/esm/components/eventFilter/index.js CHANGED
@@ -31,8 +31,8 @@ var EventFilter = function EventFilter(props) {
31
31
  var conditionRef = useRef(null);
32
32
  // 当前选中的事件
33
33
  var _useState5 = useState({
34
- id: -100,
35
- name: '事件概览'
34
+ id: null,
35
+ name: ''
36
36
  }),
37
37
  _useState6 = _slicedToArray(_useState5, 2),
38
38
  event = _useState6[0],
@@ -92,7 +92,6 @@ var EventFilter = function EventFilter(props) {
92
92
  setIsAdd(true);
93
93
  setTimeout(function () {
94
94
  conditionRef.current.add();
95
- console.log(333331111, conditionRef, conditionRef.current);
96
95
  }, 0);
97
96
  };
98
97
 
@@ -106,7 +105,7 @@ var EventFilter = function EventFilter(props) {
106
105
  }
107
106
  };
108
107
  var onChangeEvent = function onChangeEvent(event) {
109
- if (event && event.event && event.event.id === -100) {
108
+ if (event && event.event && event.event.id === null) {
110
109
  setEventOverview(false);
111
110
  } else {
112
111
  setEventOverview(true);
@@ -143,7 +142,7 @@ var EventFilter = function EventFilter(props) {
143
142
  return /*#__PURE__*/React.createElement("div", {
144
143
  className: classPrefix
145
144
  }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(BizEventSelector, {
146
- showAllEvent: true,
145
+ showAllEvent: false,
147
146
  showBuiltInTarget: false,
148
147
  popupContainer: false,
149
148
  defaultSelectAble: false,
package/dist/esm/components/searchPanel/index.js CHANGED
@@ -42,6 +42,7 @@ var SearchPanel = function SearchPanel(props) {
42
42
  _useState10 = _slicedToArray(_useState9, 2),
43
43
  displaySetupSliceList = _useState10[0],
44
44
  setDisplaySetupSliceList = _useState10[1];
45
+ // const [includeToday, setIncludeToday] = useState(false);
45
46
  // 查询维度
46
47
  var _useState11 = useState({
47
48
  analysisIndex: 'number'
@@ -106,8 +107,10 @@ var SearchPanel = function SearchPanel(props) {
106
107
  }
107
108
  }, /*#__PURE__*/React.createElement(BizDatePicker, {
108
109
  dateTypeList: ['day', 'week', 'month'],
109
- defaultValue: time,
110
- onChange: onChangeTime
110
+ value: time,
111
+ includeToday: true,
112
+ onChange: onChangeTime,
113
+ selectRange: 365
111
114
  }), /*#__PURE__*/React.createElement(BizSelect, {
112
115
  multiple: true,
113
116
  disable: displaySetupList.length === 0,
package/dist/esm/components/table/index.js CHANGED
@@ -85,8 +85,7 @@ var EventTable = function EventTable(props) {
85
85
  var download = function download() {
86
86
  var obj = searchDataParams(searchData);
87
87
  var params = _objectSpread(_objectSpread({
88
- appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
89
- platform: (currentApp === null || currentApp === void 0 ? void 0 : currentApp.platform) || 0
88
+ appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId
90
89
  }, obj), {}, {
91
90
  down: {
92
91
  fname: base64.encode('间隔分析', false)
package/dist/esm/components/topBar/index.js CHANGED
@@ -99,7 +99,7 @@ var TopBar = function TopBar(props) {
99
99
  onCancel: function onCancel() {
100
100
  return closeHandle('scene');
101
101
  }
102
- })), /*#__PURE__*/React.createElement(Button, {
102
+ })), (currentApp === null || currentApp === void 0 ? void 0 : currentApp.appVersion) === 2 ? /*#__PURE__*/React.createElement(Button, {
103
103
  className: "".concat(classPrefix, "-earlywarning"),
104
104
  type: "primary",
105
105
  disabled: (props === null || props === void 0 ? void 0 : (_props$eventData = props.eventData) === null || _props$eventData === void 0 ? void 0 : (_props$eventData$appD = _props$eventData.appData) === null || _props$eventData$appD === void 0 ? void 0 : (_props$eventData$appD2 = _props$eventData$appD.series) === null || _props$eventData$appD2 === void 0 ? void 0 : _props$eventData$appD2.length) === 0,
@@ -113,7 +113,7 @@ var TopBar = function TopBar(props) {
113
113
  url: ''
114
114
  }, searchData);
115
115
  }
116
- }, "\u8BBE\u7F6E\u6D41\u5931\u9884\u8B66"), /*#__PURE__*/React.createElement("div", {
116
+ }, "\u8BBE\u7F6E\u6D41\u5931\u9884\u8B66") : null, /*#__PURE__*/React.createElement("div", {
117
117
  className: "".concat(classPrefix, "-platform")
118
118
  }, platformOption.map(function (item) {
119
119
  return /*#__PURE__*/React.createElement("div", {
package/dist/esm/modules/content/index.js CHANGED
@@ -22,7 +22,6 @@ import { ContentPanel, SearchPanel } from "../../components";
22
22
  import TopPanel from "../topPanel";
23
23
  import { message } from 'antd';
24
24
  var timer = 0;
25
- var ajaxFlag = true;
26
25
  var CancelToken = Request.CancelToken;
27
26
  var cancel;
28
27
  var classPrefix = 'interval-content';
@@ -58,10 +57,14 @@ var EventContent = function EventContent(props) {
58
57
  _useState12 = _slicedToArray(_useState11, 2),
59
58
  isCity = _useState12[0],
60
59
  setIsCity = _useState12[1];
61
- var _useState13 = useState(-1),
60
+ var _useState13 = useState(false),
62
61
  _useState14 = _slicedToArray(_useState13, 2),
63
- eventId = _useState14[0],
64
- setEventId = _useState14[1];
62
+ ajaxFlag = _useState14[0],
63
+ setAjaxFlag = _useState14[1];
64
+ var _useState15 = useState(-1),
65
+ _useState16 = _slicedToArray(_useState15, 2),
66
+ eventId = _useState16[0],
67
+ setEventId = _useState16[1];
65
68
  var _useContext2 = useContext(EventContext),
66
69
  searchData = _useContext2.searchData,
67
70
  setSearchData = _useContext2.setSearchData,
@@ -90,7 +93,7 @@ var EventContent = function EventContent(props) {
90
93
  var flag = true;
91
94
  timer = setTimeout(function () {
92
95
  if (flag) {
93
- fetchRequest();
96
+ fetchRequest(false);
94
97
  }
95
98
  }, 500);
96
99
  return function () {
@@ -102,11 +105,21 @@ var EventContent = function EventContent(props) {
102
105
  useEffect(function () {
103
106
  handleSearch && handleSearch(loading);
104
107
  }, [loading]);
108
+ useEffect(function () {
109
+ if (ajaxFlag) {
110
+ fetchRequest(true);
111
+ }
112
+ }, [ajaxFlag]);
105
113
  // 查询
106
114
  var fetchRequest = function fetchRequest(flag) {
107
115
  var _searchData$associate, _searchData$associate2, _searchData$associate3;
108
- if (flag !== undefined) ajaxFlag = flag;
116
+ if (flag !== undefined) setAjaxFlag(flag);
109
117
  if (!ajaxFlag) return;
118
+ if (!searchData.start.id) {
119
+ setLoading(false);
120
+ return;
121
+ }
122
+ ;
110
123
  setLoading(true);
111
124
  setEventData(undefined);
112
125
  // 取消上次未完成的请求
@@ -117,15 +130,12 @@ var EventContent = function EventContent(props) {
117
130
  return message.error('您查询的属性不一致，暂不支持查询');
118
131
  }
119
132
  var params = searchDataParams(searchData);
120
-
121
- // const params = {"app_id":177,"platform":0,"time":{"dimension_date":"day","begin_date":"2023-09-01","end_date":"2023-09-08"},"user_group":0,"start":{"operator":"and","event_id":16530,"event_name":"查看商品A"},"end":{"operator":"and","event_id":16530,"event_name":"查看商品A"},"dimension":{"sub":"user_attr","category":"fixed","attr_id":743,"user_attr":"name","event_attr":null}}
122
133
  props.onChange && props.onChange(searchData);
123
- console.log(77771111, searchData, params);
134
+ // console.log(77771111, searchData, params);
124
135
  ajax(Apis.dataList, {
125
136
  method: 'post',
126
137
  data: _objectSpread({
127
- appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
128
- platform: (currentApp === null || currentApp === void 0 ? void 0 : currentApp.platform) || 0
138
+ appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId
129
139
  }, params),
130
140
  cancelToken: new CancelToken(function executor(c) {
131
141
  cancel = c;
@@ -148,7 +158,7 @@ var EventContent = function EventContent(props) {
148
158
 
149
159
  // 改变时间和图表类型
150
160
  var onChangeContent = function onChangeContent(data) {
151
- ajaxFlag = true;
161
+ setAjaxFlag(true);
152
162
  setSearchData(function (value) {
153
163
  return _objectSpread(_objectSpread({}, value), data);
154
164
  });
@@ -161,7 +171,7 @@ var EventContent = function EventContent(props) {
161
171
 
162
172
  // 平台变更
163
173
  var platformChange = function platformChange(data) {
164
- ajaxFlag = true;
174
+ setAjaxFlag(true);
165
175
  setSearchData(function (_searchData) {
166
176
  return _objectSpread(_objectSpread({}, _searchData), {}, {
167
177
  platform: data
@@ -171,7 +181,7 @@ var EventContent = function EventContent(props) {
171
181
 
172
182
  // TopPanel组件数值变更
173
183
  var onChangeSearch = function onChangeSearch(data, flag) {
174
- ajaxFlag = flag;
184
+ setAjaxFlag(false);
175
185
  data.id ? setEventId(data.id) : setEventId(-1);
176
186
  setSearchData(function (_searchData) {
177
187
  return _objectSpread(_objectSpread({}, _searchData), data);
@@ -186,15 +196,15 @@ var EventContent = function EventContent(props) {
186
196
  showTitle: false,
187
197
  hasCollapse: true,
188
198
  collapseRef: collapseRef,
189
- topPanel: /*#__PURE__*/React.createElement("div", {
190
- ref: collapseRef
191
- }, /*#__PURE__*/React.createElement(TopPanel, {
199
+ topPanel: /*#__PURE__*/React.createElement(TopPanel, {
200
+ collapseRef: collapseRef,
192
201
  onChange: onChangeSearch,
193
202
  defaultValue: searchData,
194
203
  ajaxFlag: ajaxFlag,
204
+ loading: loading,
195
205
  finalSearchData: finalSearchData,
196
206
  fetchRequest: fetchRequest
197
- }))
207
+ })
198
208
  }, /*#__PURE__*/React.createElement("div", {
199
209
  className: classPrefix
200
210
  }, /*#__PURE__*/React.createElement(SearchPanel, {
package/dist/esm/modules/content/utils.d.ts CHANGED
@@ -31,6 +31,7 @@ export declare function searchDataParams(params: any): {
31
31
  beginDate: any;
32
32
  endDate: any;
33
33
  };
34
+ platform: any;
34
35
  userGroup: any;
35
36
  start: {
36
37
  operator: any;
@@ -51,7 +52,7 @@ export declare function searchDataParams(params: any): {
51
52
  userAttr: any;
52
53
  eventAttr: any;
53
54
  event: any;
54
- };
55
+ } | null;
55
56
  associatedPreAttr: any;
56
57
  associatedNextAttr: any;
57
58
  };
package/dist/esm/modules/content/utils.js CHANGED
@@ -1,3 +1,4 @@
1
+ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
1
2
  /**
2
3
  * 判断当前细分属性是否为”城市“
3
4
  * @param name 属性名称
@@ -74,24 +75,26 @@ export function searchCondition(params) {
74
75
  };
75
76
  }
76
77
  export function searchDataParams(params) {
77
- var _params$time, _params$time2, _params$time3, _params$userGroup$, _params$dimension, _params$dimension2, _params$dimension3, _params$dimension4, _params$dimension5, _params$dimension6, _params$dimension7, _params$dimension8, _params$dimension9, _params$dimension10, _params$dimension11, _params$associatedPre, _params$associatedNex;
78
+ var _params$time, _params$time2, _params$time3, _params$dimension, _params$dimension2, _params$dimension3, _params$dimension4, _params$dimension5, _params$dimension6, _params$dimension7, _params$dimension8, _params$dimension9, _params$dimension10, _params$dimension11, _params$dimension12, _params$associatedPre, _params$associatedNex;
79
+ console.log(777777, params.userGroup, _typeof(params.userGroup[0]));
78
80
  return {
79
81
  time: {
80
82
  dimensionDate: params === null || params === void 0 ? void 0 : (_params$time = params.time) === null || _params$time === void 0 ? void 0 : _params$time.unit,
81
83
  beginDate: params === null || params === void 0 ? void 0 : (_params$time2 = params.time) === null || _params$time2 === void 0 ? void 0 : _params$time2.begin,
82
84
  endDate: params === null || params === void 0 ? void 0 : (_params$time3 = params.time) === null || _params$time3 === void 0 ? void 0 : _params$time3.end
83
85
  },
84
- userGroup: (_params$userGroup$ = params.userGroup[0]) === null || _params$userGroup$ === void 0 ? void 0 : _params$userGroup$.id,
86
+ platform: (params === null || params === void 0 ? void 0 : params.platform) || 0,
87
+ userGroup: _typeof(params.userGroup[0]) === 'object' ? params.userGroup : params.userGroup[0],
85
88
  start: searchCondition(params === null || params === void 0 ? void 0 : params.start),
86
89
  end: searchCondition(params === null || params === void 0 ? void 0 : params.end),
87
- dimension: {
88
- sub: (params === null || params === void 0 ? void 0 : (_params$dimension = params.dimension) === null || _params$dimension === void 0 ? void 0 : _params$dimension.propCategory) === 'userProp' ? 'user_attr' : (params === null || params === void 0 ? void 0 : (_params$dimension2 = params.dimension) === null || _params$dimension2 === void 0 ? void 0 : _params$dimension2.propCategory) === 'eventProp' ? 'event_attr' : params === null || params === void 0 ? void 0 : (_params$dimension3 = params.dimension) === null || _params$dimension3 === void 0 ? void 0 : _params$dimension3.name,
89
- category: (params === null || params === void 0 ? void 0 : (_params$dimension4 = params.dimension) === null || _params$dimension4 === void 0 ? void 0 : _params$dimension4.category) || 'custom',
90
- attrId: params === null || params === void 0 ? void 0 : (_params$dimension5 = params.dimension) === null || _params$dimension5 === void 0 ? void 0 : _params$dimension5.id,
91
- userAttr: (params === null || params === void 0 ? void 0 : (_params$dimension6 = params.dimension) === null || _params$dimension6 === void 0 ? void 0 : _params$dimension6.propCategory) === 'userProp' ? params === null || params === void 0 ? void 0 : (_params$dimension7 = params.dimension) === null || _params$dimension7 === void 0 ? void 0 : _params$dimension7.dimensionSub : null,
92
- eventAttr: (params === null || params === void 0 ? void 0 : (_params$dimension8 = params.dimension) === null || _params$dimension8 === void 0 ? void 0 : _params$dimension8.propCategory) === 'eventProp' ? params === null || params === void 0 ? void 0 : (_params$dimension9 = params.dimension) === null || _params$dimension9 === void 0 ? void 0 : _params$dimension9.label : null,
93
- event: (params === null || params === void 0 ? void 0 : (_params$dimension10 = params.dimension) === null || _params$dimension10 === void 0 ? void 0 : _params$dimension10.propCategory) !== 'envProp' ? params === null || params === void 0 ? void 0 : (_params$dimension11 = params.dimension) === null || _params$dimension11 === void 0 ? void 0 : _params$dimension11.eventId : null
94
- },
90
+ dimension: params !== null && params !== void 0 && (_params$dimension = params.dimension) !== null && _params$dimension !== void 0 && _params$dimension.propCategory ? {
91
+ sub: (params === null || params === void 0 ? void 0 : (_params$dimension2 = params.dimension) === null || _params$dimension2 === void 0 ? void 0 : _params$dimension2.propCategory) === 'userProp' ? 'user_attr' : (params === null || params === void 0 ? void 0 : (_params$dimension3 = params.dimension) === null || _params$dimension3 === void 0 ? void 0 : _params$dimension3.propCategory) === 'eventProp' ? 'event_attr' : params === null || params === void 0 ? void 0 : (_params$dimension4 = params.dimension) === null || _params$dimension4 === void 0 ? void 0 : _params$dimension4.name,
92
+ category: (params === null || params === void 0 ? void 0 : (_params$dimension5 = params.dimension) === null || _params$dimension5 === void 0 ? void 0 : _params$dimension5.category) || 'custom',
93
+ attrId: params === null || params === void 0 ? void 0 : (_params$dimension6 = params.dimension) === null || _params$dimension6 === void 0 ? void 0 : _params$dimension6.id,
94
+ userAttr: (params === null || params === void 0 ? void 0 : (_params$dimension7 = params.dimension) === null || _params$dimension7 === void 0 ? void 0 : _params$dimension7.propCategory) === 'userProp' ? params === null || params === void 0 ? void 0 : (_params$dimension8 = params.dimension) === null || _params$dimension8 === void 0 ? void 0 : _params$dimension8.dimensionSub : null,
95
+ eventAttr: (params === null || params === void 0 ? void 0 : (_params$dimension9 = params.dimension) === null || _params$dimension9 === void 0 ? void 0 : _params$dimension9.propCategory) === 'eventProp' ? params === null || params === void 0 ? void 0 : (_params$dimension10 = params.dimension) === null || _params$dimension10 === void 0 ? void 0 : _params$dimension10.label : null,
96
+ event: (params === null || params === void 0 ? void 0 : (_params$dimension11 = params.dimension) === null || _params$dimension11 === void 0 ? void 0 : _params$dimension11.propCategory) !== 'envProp' ? params === null || params === void 0 ? void 0 : (_params$dimension12 = params.dimension) === null || _params$dimension12 === void 0 ? void 0 : _params$dimension12.eventId : null
97
+ } : null,
95
98
  associatedPreAttr: params === null || params === void 0 ? void 0 : (_params$associatedPre = params.associatedPreAttr) === null || _params$associatedPre === void 0 ? void 0 : _params$associatedPre.id,
96
99
  associatedNextAttr: params === null || params === void 0 ? void 0 : (_params$associatedNex = params.associatedNextAttr) === null || _params$associatedNex === void 0 ? void 0 : _params$associatedNex.id
97
100
  };
package/dist/esm/modules/topPanel/index.js CHANGED
@@ -1,28 +1,30 @@
1
+ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
1
2
  function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
2
3
  function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
3
4
  function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
4
5
  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; }
5
6
  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; } }
6
7
  function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
7
- import React, { useState } from 'react';
8
+ import React, { useEffect, useState } from 'react';
8
9
  import { Form, Button } from 'antd';
9
10
  import { BizAttributeSelector, BizUserGroupHeader } from '@zgfe/business-lib';
10
11
  import EventFilter from "../../components/eventFilter";
11
12
  import "./styles/index.less";
13
+ import _ from 'lodash';
12
14
  var classPrefix = 'top-panel-interval';
13
15
  var TopPanel = function TopPanel(props) {
14
16
  var defaultValue = props.defaultValue,
15
- ajaxFlag = props.ajaxFlag,
16
- finalSearchData = props.finalSearchData,
17
+ loading = props.loading,
18
+ collapseRef = props.collapseRef,
17
19
  fetchRequest = props.fetchRequest;
18
20
  var _Form$useForm = Form.useForm(),
19
21
  _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
20
22
  form = _Form$useForm2[0];
21
- var _useState = useState(-100),
23
+ var _useState = useState(null),
22
24
  _useState2 = _slicedToArray(_useState, 2),
23
25
  startId = _useState2[0],
24
26
  setStartId = _useState2[1];
25
- var _useState3 = useState(-100),
27
+ var _useState3 = useState(null),
26
28
  _useState4 = _slicedToArray(_useState3, 2),
27
29
  endId = _useState4[0],
28
30
  setEndId = _useState4[1];
@@ -47,50 +49,50 @@ var TopPanel = function TopPanel(props) {
47
49
  var onValuesChange = function onValuesChange(data, allData) {
48
50
  var _data = {};
49
51
  if (allData.start) {
50
- if (allData.start.id !== -100) {
52
+ if (allData.start.id !== null) {
51
53
  _data = allData.start;
52
54
  setStartId(allData.start.id);
53
- if (allData.start.relevancy !== undefined) {
54
- // form.setFieldsValue({
55
- // associatedPreAttr: undefined,
56
- // associatedNextAttr: undefined,
57
- // });
58
- }
59
55
  setRelevancy(allData.start.relevancy);
60
56
  }
61
57
  }
62
58
  if (allData.end) {
63
- if (allData.end.id !== -100) {
59
+ if (allData.end.id !== null) {
64
60
  _data = allData.end;
65
61
  setEndId(allData.end.id);
66
62
  }
67
63
  }
68
64
  if (allData.userGroup) {
69
65
  _data.userGroup = [];
70
- allData.userGroup.map(function (item) {
71
- _data.userGroup && _data.userGroup.push(item);
66
+ var app = allData.userGroup.map(function (item) {
67
+ if (_.isArray(item)) {
68
+ return item.map(function (_item) {
69
+ var _item2 = _slicedToArray(_item, 3),
70
+ label = _item2[1],
71
+ layer = _item2[2];
72
+ var result = [label.labelName];
73
+ if (layer !== null && layer !== void 0 && layer.layerLabelName) {
74
+ result.push(layer.layerLabelName);
75
+ }
76
+ return result.join(':');
77
+ });
78
+ } else if (_typeof(item) === 'object' && item !== null && 'id' in item) {
79
+ return item.id;
80
+ }
81
+ }).filter(function (item) {
82
+ return item !== undefined;
72
83
  });
73
- if (_data.userGroup.length <= 0) _data.userGroup = [0];
74
- }
75
- if (data.start) {
76
- // 事件id不变，不自动请求
77
- if (finalSearchData && finalSearchData.id && data.start.id === finalSearchData.id) {
78
- ajaxFlag = false;
79
- } else {
80
- ajaxFlag = true;
81
- }
82
- }
83
- if (data.end) {
84
- // 事件id不变，不自动请求
85
- if (finalSearchData && finalSearchData.id && data.end.id === finalSearchData.id) {
86
- ajaxFlag = false;
87
- } else {
88
- ajaxFlag = true;
89
- }
84
+ allData.userGroup = app;
90
85
  }
91
- props.onChange(allData, ajaxFlag);
86
+ props.onChange(allData, false);
92
87
  };
93
-
88
+ useEffect(function () {
89
+ onChangeAttr(undefined, 'dimension');
90
+ onChangeAttr(undefined, 'associatedPreAttr');
91
+ }, [startId]);
92
+ useEffect(function () {
93
+ onChangeAttr(undefined, 'dimension');
94
+ onChangeAttr(undefined, 'associatedNextAttr');
95
+ }, [endId]);
94
96
  // 重置
95
97
  var resetting = function resetting() {
96
98
  form.resetFields();
@@ -111,9 +113,35 @@ var TopPanel = function TopPanel(props) {
111
113
  }, true);
112
114
  };
113
115
  // 细分属性
114
- var onChangeAttr = function onChangeAttr(attr) {
116
+ var onChangeAttr = function onChangeAttr(attr, type) {
115
117
  if (attr === undefined) {
116
118
  // 删除细分属性
119
+ switch (type) {
120
+ case 'associatedPreAttr':
121
+ form.setFieldsValue({
122
+ associatedPreAttr: undefined
123
+ });
124
+ props.onChange({
125
+ associatedPreAttr: undefined
126
+ }, true);
127
+ break;
128
+ case 'associatedNextAttr':
129
+ form.setFieldsValue({
130
+ associatedNextAttr: undefined
131
+ });
132
+ props.onChange({
133
+ associatedNextAttr: undefined
134
+ }, true);
135
+ break;
136
+ case 'dimension':
137
+ form.setFieldsValue({
138
+ dimension: undefined
139
+ });
140
+ props.onChange({
141
+ dimension: undefined
142
+ }, true);
143
+ break;
144
+ }
117
145
  setBizAttributeSelectorValue(undefined);
118
146
  } else {
119
147
  var _value = attr.propCategory === 'eventProp' ? attr.id : attr.name;
@@ -162,8 +190,18 @@ var TopPanel = function TopPanel(props) {
162
190
  paddingLeft: 0
163
191
  }
164
192
  }, /*#__PURE__*/React.createElement(BizUserGroupHeader, {
193
+ value: [{
194
+ id: 0
195
+ }],
196
+ enableTags: true,
165
197
  max: 1
166
- })), /*#__PURE__*/React.createElement(Form.Item, {
198
+ })), /*#__PURE__*/React.createElement("div", {
199
+ ref: collapseRef,
200
+ style: {
201
+ paddingLeft: 24
202
+ },
203
+ className: "collapseRefs"
204
+ }, /*#__PURE__*/React.createElement(Form.Item, {
167
205
  label: "\u5F00\u59CB\u4E8B\u4EF6",
168
206
  name: "start"
169
207
  }, /*#__PURE__*/React.createElement(EventFilter, {
@@ -197,7 +235,7 @@ var TopPanel = function TopPanel(props) {
197
235
  enableDelete: true,
198
236
  onChange: onChangeAttr,
199
237
  onDelete: function onDelete() {
200
- onChangeAttr(undefined);
238
+ onChangeAttr(undefined, 'associatedPreAttr');
201
239
  }
202
240
  })), /*#__PURE__*/React.createElement("span", {
203
241
  className: "associated-label"
@@ -215,7 +253,7 @@ var TopPanel = function TopPanel(props) {
215
253
  enableDelete: true,
216
254
  onChange: onChangeAttr,
217
255
  onDelete: function onDelete() {
218
- onChangeAttr(undefined);
256
+ onChangeAttr(undefined, 'associatedNextAttr');
219
257
  }
220
258
  }))) : '', /*#__PURE__*/React.createElement(Form.Item, {
221
259
  label: "\u7ED3\u675F\u4E8B\u4EF6",
@@ -232,19 +270,18 @@ var TopPanel = function TopPanel(props) {
232
270
  enableDelete: true,
233
271
  onChange: onChangeAttr,
234
272
  onDelete: function onDelete() {
235
- onChangeAttr(undefined);
273
+ onChangeAttr(undefined, 'dimension');
236
274
  }
237
275
  })), /*#__PURE__*/React.createElement("div", {
238
276
  className: "".concat(classPrefix, "-form-botton-box")
239
277
  }, /*#__PURE__*/React.createElement(Button, {
240
278
  onClick: resetting
241
- }, "\u91CD\u7F6E"), /*#__PURE__*/React.createElement(Button
242
- // disabled={ajaxFlag}
243
- , {
279
+ }, "\u91CD\u7F6E"), /*#__PURE__*/React.createElement(Button, {
280
+ disabled: loading,
244
281
  type: "primary",
245
282
  onClick: function onClick() {
246
283
  fetchRequest(true);
247
284
  }
248
- }, "\u67E5\u8BE2")));
285
+ }, "\u67E5\u8BE2"))));
249
286
  };
250
287
  export default TopPanel;
package/dist/esm/modules/topPanel/styles/index.less CHANGED
@@ -21,7 +21,8 @@
21
21
  .space-item {
22
22
  .ant-space-item {
23
23
  .biz-user-group {
24
- width: 208px;
24
+ width: 100%;
25
+ min-width: 208px;
25
26
  }
26
27
  }
27
28
 
@@ -30,6 +31,12 @@
30
31
  }
31
32
  }
32
33
 
34
+ .collapseRefs {
35
+ .ant-form-item {
36
+ margin-bottom: 12px;
37
+ }
38
+ }
39
+
33
40
  .biz-event-select {
34
41
  width: 208px;
35
42
  }
package/dist/esm/modules/topPanel/types.d.ts CHANGED
@@ -35,6 +35,7 @@ export interface TopPanelProps {
35
35
  * 默认值
36
36
  */
37
37
  defaultValue?: SearchValue;
38
+ loading?: boolean;
38
39
  /**
39
40
  * 数据更新
40
41
  */
@@ -51,4 +52,5 @@ export interface TopPanelProps {
51
52
  * 请求数据方法
52
53
  */
53
54
  fetchRequest: (flag?: boolean) => void;
55
+ collapseRef?: any;
54
56
  }
package/dist/esm/utils/formData.js CHANGED
@@ -176,9 +176,10 @@ export function formTableData(originalData) {
176
176
  return result;
177
177
  }
178
178
  function createNewArray(data) {
179
- var _series$;
180
- var series = data.appData.series;
181
- if (series && ((_series$ = series[0]) === null || _series$ === void 0 ? void 0 : _series$.total.length) === 0) {
179
+ var _series$, _series$$total;
180
+ var _data$appData = data === null || data === void 0 ? void 0 : data.appData,
181
+ series = _data$appData.series;
182
+ if (series && ((_series$ = series[0]) === null || _series$ === void 0 ? void 0 : (_series$$total = _series$.total) === null || _series$$total === void 0 ? void 0 : _series$$total.length) === 0) {
182
183
  return getChildrenData(data, 0);
183
184
  } else {
184
185
  var newArray = series === null || series === void 0 ? void 0 : series.map(function (item, i) {
@@ -228,9 +229,9 @@ export function convertDateArray(params, dateArray) {
228
229
  }
229
230
  }
230
231
  function getChildrenData(data, index) {
231
- var _data$appData = data.appData,
232
- series = _data$appData.series,
233
- xAxis = _data$appData.xAxis;
232
+ var _data$appData2 = data.appData,
233
+ series = _data$appData2.series,
234
+ xAxis = _data$appData2.xAxis;
234
235
  var firstSeries = series === null || series === void 0 ? void 0 : series[index];
235
236
  if (xAxis && firstSeries) {
236
237
  var values = firstSeries.values;
@@ -259,7 +260,7 @@ export function getDefaultShow(source, data) {
259
260
  if (source.appData.series) {
260
261
  var filteredArr = source.appData.series.filter(function (obj) {
261
262
  var names = obj.names;
262
- if (!names) {
263
+ if ((names === null || names === void 0 ? void 0 : names.length) > 0) {
263
264
  return data.some(function (item) {
264
265
  return names.includes(item.label);
265
266
  });
@@ -298,7 +299,8 @@ export function getShowColor(source, showList) {
298
299
  return colors;
299
300
  }
300
301
  export function extractNames(data) {
301
- var series = data.appData.series;
302
+ var _data$appData3 = data === null || data === void 0 ? void 0 : data.appData,
303
+ series = _data$appData3.series;
302
304
  var namesArray = [];
303
305
  if (series) {
304
306
  var _iterator = _createForOfIteratorHelper(series),
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zgfe/modules-interval",
3
- "version": "1.0.0-interval.7",
3
+ "version": "1.0.0-interval.9",
4
4
  "scripts": {
5
5
  "start": "dumi dev",
6
6
  "docs:build": "dumi build",