@zgfe/modules-interval 1.0.9 → 1.0.10-qirui.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 (51) hide show
  1. package/dist/esm/components/common/styles/index.less +3 -3
  2. package/dist/esm/components/eventFilter/index.js +17 -21
  3. package/dist/esm/components/eventFilter/types.d.ts +4 -3
  4. package/dist/esm/components/renderContent/index.js +1 -1
  5. package/dist/esm/components/searchPanel/index.js +3 -4
  6. package/dist/esm/components/table/index.js +5 -4
  7. package/dist/esm/components/topBar/index.js +4 -4
  8. package/dist/esm/components/topBar/types.d.ts +3 -2
  9. package/dist/esm/constants/apis.d.ts +1 -5
  10. package/dist/esm/constants/apis.js +15 -4
  11. package/dist/esm/modules/chart/index.js +4 -3
  12. package/dist/esm/modules/chart/intervalChart.js +1 -1
  13. package/dist/esm/modules/chart/types.d.ts +1 -0
  14. package/dist/esm/modules/content/index.js +28 -44
  15. package/dist/esm/modules/content/types.d.ts +4 -3
  16. package/dist/esm/modules/content/utils.d.ts +2 -0
  17. package/dist/esm/modules/content/utils.js +4 -2
  18. package/dist/esm/modules/home/demo/edit.js +1 -1
  19. package/dist/esm/modules/home/demo/index.js +200 -15
  20. package/dist/esm/modules/home/demo/scene.js +1 -1
  21. package/dist/esm/modules/home/index.d.ts +2 -2
  22. package/dist/esm/modules/home/index.js +59 -46
  23. package/dist/esm/modules/home/styles/index.less +6 -0
  24. package/dist/esm/modules/home/types.d.ts +7 -4
  25. package/dist/esm/modules/home/types.js +2 -2
  26. package/dist/esm/modules/topPanel/index.js +244 -127
  27. package/dist/esm/modules/topPanel/styles/index.less +29 -2
  28. package/dist/esm/modules/topPanel/types.d.ts +6 -9
  29. package/dist/esm/modules/topPanel/types.js +5 -1
  30. package/dist/esm/style/index.less +14 -0
  31. package/dist/esm/types.d.ts +25 -28
  32. package/dist/esm/types.js +1 -1
  33. package/dist/esm/utils/formData.d.ts +7 -2
  34. package/dist/esm/utils/formData.js +64 -12
  35. package/package.json +9 -4
  36. package/dist/esm/assets/business/demo.css +0 -539
  37. package/dist/esm/assets/business/demo_index.html +0 -3316
  38. package/dist/esm/assets/business/iconfont.css +0 -559
  39. package/dist/esm/assets/business/iconfont.js +0 -43
  40. package/dist/esm/assets/business/iconfont.json +0 -961
  41. package/dist/esm/assets/business/iconfont.ttf +0 -0
  42. package/dist/esm/assets/business/iconfont.woff +0 -0
  43. package/dist/esm/assets/business/iconfont.woff2 +0 -0
  44. package/dist/esm/assets/icons/demo.css +0 -539
  45. package/dist/esm/assets/icons/demo_index.html +0 -9618
  46. package/dist/esm/assets/icons/iconfont.css +0 -1655
  47. package/dist/esm/assets/icons/iconfont.js +0 -43
  48. package/dist/esm/assets/icons/iconfont.json +0 -2879
  49. package/dist/esm/assets/icons/iconfont.ttf +0 -0
  50. package/dist/esm/assets/icons/iconfont.woff +0 -0
  51. package/dist/esm/assets/icons/iconfont.woff2 +0 -0
@@ -1,6 +1,9 @@
1
1
  @import '~@zgfe/business-lib/es/assets/styles/inner.less';
2
2
 
3
3
  .mi-common-interval {
4
+ .ant-spin-nested-loading {
5
+ width: 100%;
6
+ }
4
7
  &-loading-icon {
5
8
  z-index: 1000;
6
9
  display: inline-block;
@@ -35,6 +38,3 @@
35
38
  color: #ccc;
36
39
  }
37
40
  }
38
- .ant-spin-nested-loading {
39
- width: 100%;
40
- }
@@ -10,7 +10,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
10
10
  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; }
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
- import { Switch, Tooltip, message } from 'antd';
13
+ import { Tooltip, message } from 'antd';
14
14
  import React, { useEffect, useRef, useState } from 'react';
15
15
  import { BizEventSelector, IconFont, BizAttrConditionGroup } from '@zgfe/business-lib';
16
16
  import "./styles/index.less";
@@ -137,9 +137,6 @@ var EventFilter = function EventFilter(props) {
137
137
  delete _dimension.key;
138
138
  _event.dimension = _dimension;
139
139
  }
140
- if (props.relevancy && relevancy !== undefined) {
141
- _event.relevancy = relevancy;
142
- }
143
140
  props.onChange && props.onChange(_event);
144
141
  }, [bizAttributeSelectorValue, filter, event, relevancy]);
145
142
  return /*#__PURE__*/React.createElement("div", {
@@ -149,10 +146,24 @@ var EventFilter = function EventFilter(props) {
149
146
  showBuiltInTarget: false,
150
147
  popupContainer: false,
151
148
  defaultSelectAble: false,
149
+ destroyPopupOnHide: true,
152
150
  value: {
153
151
  event: event
154
152
  },
155
153
  onChange: onChangeEvent,
154
+ filter: function filter(event) {
155
+ if (!props.subject) return true;
156
+ var propMatch = false;
157
+ for (var i = 0; i < event.attrList.length; i++) {
158
+ var _props$subject;
159
+ var attr = event.attrList[i];
160
+ if (attr.label === ((_props$subject = props.subject) === null || _props$subject === void 0 ? void 0 : _props$subject.subjectName)) {
161
+ propMatch = true;
162
+ break;
163
+ }
164
+ }
165
+ return propMatch;
166
+ },
156
167
  placeholder: "\u8BF7\u9009\u62E9\u4E8B\u4EF6"
157
168
  }), /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Tooltip, {
158
169
  placement: "top",
@@ -163,28 +174,13 @@ var EventFilter = function EventFilter(props) {
163
174
  onClick: function onClick() {
164
175
  return onAdd();
165
176
  }
166
- }))), props !== null && props !== void 0 && props.relevancy ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Tooltip, {
167
- placement: "top",
168
- title: props.relevancyFl ? '请选择开始和结束事件' : ''
169
- }, /*#__PURE__*/React.createElement(Switch, {
170
- size: "default",
171
- style: {
172
- marginLeft: 24
173
- },
174
- checked: relevancy && !props.relevancyFl,
175
- disabled: props.relevancyFl,
176
- onChange: function onChange(checked) {
177
- return setRelevancy(checked);
178
- }
179
- })), /*#__PURE__*/React.createElement("span", {
180
- className: "switch-title"
181
- }, "\u8BBE\u7F6E\u5173\u8054\u5C5E\u6027")) : ''), (filter || isAdd) && /*#__PURE__*/React.createElement("div", {
177
+ })))), (filter || isAdd) && /*#__PURE__*/React.createElement("div", {
182
178
  className: "".concat(count > 0 ? 'attr-box-show' : '', " top")
183
179
  }, /*#__PURE__*/React.createElement(BizAttrConditionGroup, {
184
180
  ref: conditionRef,
185
181
  value: filter,
186
- onlyAnd: true,
187
182
  enableEventProp: true,
183
+ enableUserProp: props.analysisType === 'user',
188
184
  enableDelete: true,
189
185
  eventIdList: [event.id],
190
186
  onChange: onChangeFilters,
@@ -1,3 +1,4 @@
1
+ import SubjectTypes from '@zgfe/business-lib/es/hooks/types/subject';
1
2
  import { eventProps } from '../../types';
2
3
  /**
3
4
  * 事件属性
@@ -46,7 +47,7 @@ export interface ConditionsnProps {
46
47
  export interface EventFilterProps {
47
48
  id?: string;
48
49
  value?: eventProps;
49
- relevancyFl?: boolean;
50
- relevancy?: boolean;
51
- onChange?: (event: eventProps) => {};
50
+ subject?: SubjectTypes.Subject;
51
+ analysisType?: 'user' | 'eventProp';
52
+ onChange?: (event: eventProps) => void;
52
53
  }
@@ -30,7 +30,7 @@ var ContentPanel = function ContentPanel(props) {
30
30
  setShowList(names);
31
31
  if (props.onChangeShow) props.onChangeShow(names);
32
32
  };
33
- if (loading) {
33
+ if (!loading) {
34
34
  return /*#__PURE__*/React.createElement(Spin, {
35
35
  className: "".concat(classPrefix, "-spin-container"),
36
36
  tip: "\u67E5\u8BE2\u4E2D...",
@@ -13,12 +13,12 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
13
13
  import { BizDatePicker, BizSelect } from '@zgfe/business-lib';
14
14
  import React, { useContext, useEffect, useState } from 'react';
15
15
  import { chartTypeOptions, getInitDate } from "../../constants";
16
- import { EventContext } from "../../types";
16
+ import { IntervalContext } from "../../types";
17
17
  import "./styles/index.less";
18
18
  import { extractNames } from "../../utils/formData";
19
19
  var classPrefix = 'search-panel-interval';
20
20
  var SearchPanel = function SearchPanel(props) {
21
- var _useContext = useContext(EventContext),
21
+ var _useContext = useContext(IntervalContext),
22
22
  includeToday = _useContext.includeToday;
23
23
  // 当前时间段
24
24
  var _useState = useState(props.time || getInitDate(includeToday)),
@@ -105,9 +105,8 @@ var SearchPanel = function SearchPanel(props) {
105
105
  display: 'flex'
106
106
  }
107
107
  }, /*#__PURE__*/React.createElement(BizDatePicker, {
108
- dateTypeList: ['day', 'week', 'month'],
108
+ dateTypeList: ['day', 'week', 'month', 'custom'],
109
109
  value: time,
110
- mode: "simple",
111
110
  includeToday: true,
112
111
  onChange: onChangeTime
113
112
  }), /*#__PURE__*/React.createElement(BizSelect, {
@@ -17,7 +17,7 @@ import { message } from 'antd';
17
17
  import { formTableData, getColumns } from "../../utils/formData";
18
18
  import "./styles/index.less";
19
19
  import { searchDataParams } from "../../modules/content/utils";
20
- import { EventContext } from "../../types";
20
+ import { IntervalContext } from "../../types";
21
21
  var classPrefix = 'mi-interval-table';
22
22
  var EventTable = function EventTable(props) {
23
23
  var _dataSource$appData2;
@@ -36,8 +36,9 @@ var EventTable = function EventTable(props) {
36
36
  eventEnvList = _useContext.eventEnvList,
37
37
  userPropList = _useContext.userPropList,
38
38
  authority = _useContext.authority;
39
- var _useContext2 = useContext(EventContext),
40
- panelName = _useContext2.panelName;
39
+ var _useContext2 = useContext(IntervalContext),
40
+ panelName = _useContext2.panelName,
41
+ onUserDrill = _useContext2.onUserDrill;
41
42
 
42
43
  // 按属性排序后的数据(用于合并行)
43
44
  var _useState3 = useState({
@@ -70,7 +71,7 @@ var EventTable = function EventTable(props) {
70
71
  var _dataSource$appData;
71
72
  var _searchData$userGroup = searchData.userGroup,
72
73
  userGroup = _searchData$userGroup === void 0 ? [0] : _searchData$userGroup;
73
- var _getColumns = getColumns(eventGroupList, userPropList, eventEnvList, (dataSource === null || dataSource === void 0 ? void 0 : (_dataSource$appData = dataSource.appData) === null || _dataSource$appData === void 0 ? void 0 : _dataSource$appData.x_axis) || [], dataSource, userGroup, searchData, showList);
74
+ var _getColumns = getColumns(eventGroupList, userPropList, eventEnvList, (dataSource === null || dataSource === void 0 ? void 0 : (_dataSource$appData = dataSource.appData) === null || _dataSource$appData === void 0 ? void 0 : _dataSource$appData.x_axis) || [], dataSource, userGroup, searchData, showList, onUserDrill);
74
75
  return _getColumns;
75
76
  }, [dataSource === null || dataSource === void 0 ? void 0 : (_dataSource$appData2 = dataSource.appData) === null || _dataSource$appData2 === void 0 ? void 0 : _dataSource$appData2.x_axis, showList, sortTable, panelName]);
76
77
 
@@ -14,12 +14,12 @@ import { Button } from 'antd';
14
14
  import React, { useContext, useEffect, useState } from 'react';
15
15
  import { BizAddToPanel, BizAddToScene, BizGlobalDataContext } from '@zgfe/business-lib';
16
16
  import "./styles/index.less";
17
- import { EventContext } from "../../types";
17
+ import { IntervalContext } from "../../types";
18
18
  import { chartTypes, platformOption } from "../../constants/fields";
19
19
  import { appVersionType } from '@zgfe/business-lib/es/context';
20
20
  var classPrefix = 'modules-interval-topbar';
21
21
  var TopBar = function TopBar(props) {
22
- var _useContext = useContext(EventContext),
22
+ var _useContext = useContext(IntervalContext),
23
23
  panelId = _useContext.panelId,
24
24
  afterEditTarget = _useContext.afterEditTarget;
25
25
  var _useState = useState(false),
@@ -105,7 +105,7 @@ var TopBar = function TopBar(props) {
105
105
  appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
106
106
  module: 'interval'
107
107
  }, searchData), {}, {
108
- chartType: 'line'
108
+ chartType: 'boxplot'
109
109
  }),
110
110
  onOk: function onOk(data) {
111
111
  return _onOk('scene', data);
@@ -118,7 +118,7 @@ var TopBar = function TopBar(props) {
118
118
  type: "primary",
119
119
  disabled: showLoading || !authority[100143],
120
120
  onClick: function onClick() {
121
- props.onUserDrill({
121
+ props.onJumpWarning({
122
122
  appId: Number(currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId),
123
123
  module: 'interval',
124
124
  platform: 0,
@@ -1,4 +1,5 @@
1
- import { ResponseDataProps, SearchValue, UserDrillParamsProp } from '../../types';
1
+ import { IntervalProps } from '../../modules/home/types';
2
+ import { ResponseDataProps, SearchValue } from '../../types';
2
3
  export interface TopBarProps {
3
4
  /**
4
5
  * @description 标题
@@ -6,6 +7,6 @@ export interface TopBarProps {
6
7
  searchData?: SearchValue;
7
8
  loading?: boolean;
8
9
  eventData?: ResponseDataProps;
9
- onUserDrill: (data: UserDrillParamsProp, searchData: SearchValue) => void;
10
+ onJumpWarning: IntervalProps.Props['onJumpWarning'];
10
11
  platformChange: (data: number) => void;
11
12
  }
@@ -1,6 +1,2 @@
1
- declare const Apis: {
2
- dataList: string;
3
- getEventDataSql: string;
4
- eventDownloadReport: string;
5
- };
1
+ declare const Apis: Record<string, string>;
6
2
  export default Apis;
@@ -1,7 +1,18 @@
1
1
  var Apis = {
2
- // dataList: '/zg/web/v2/data/eventDataList',
3
- dataList: '/zg/web/v2/interval/intervalData',
4
- getEventDataSql: '/zg/web/v2/dataSql/getEventDataSql',
5
- eventDownloadReport: '/zg/web/v2/interval/downLoadintervalData'
2
+ dataList: '/interval/intervalData',
3
+ getEventDataSql: '/dataSql/getEventDataSql',
4
+ eventDownloadReport: '/interval/downLoadintervalData',
5
+ /**
6
+ * 用户下钻
7
+ */
8
+ userDrill: '/interval/userDrill',
9
+ /**
10
+ * 主体下钻
11
+ */
12
+ subjectDrill: '/interval/eventDrill',
13
+ querySubjectDisplay: '/analysisSubject/querySubDisplay'
6
14
  };
15
+ for (var key in Apis) {
16
+ Apis[key] = "/zg/web/v2".concat(Apis[key]);
17
+ }
7
18
  export default Apis;
@@ -97,12 +97,13 @@ var IntervalEventChart = function IntervalEventChart(props) {
97
97
  dataSource: dataSource,
98
98
  showList: showList,
99
99
  dataSourceList: dataSourceList,
100
- params: params
101
- }), (params === null || params === void 0 ? void 0 : params.chartType) === 'line' ? /*#__PURE__*/React.createElement(EventTable, {
100
+ params: params,
101
+ onlyChart: props.onlyChart
102
+ }), !props.onlyChart && /*#__PURE__*/React.createElement(EventTable, {
102
103
  dataSource: dataSource,
103
104
  searchData: params,
104
105
  showList: [],
105
106
  changeShow: onChangeShow
106
- }) : null);
107
+ }));
107
108
  };
108
109
  export default IntervalEventChart;
@@ -87,7 +87,7 @@ var IntervalChart = function IntervalChart(props) {
87
87
  right: 3,
88
88
  height: 20 // 设置内置的dataZoom的高度
89
89
  }, {
90
- show: (params === null || params === void 0 ? void 0 : params.module) === 'interval' ? false : true,
90
+ show: props.onlyChart ? false : true,
91
91
  type: 'slider',
92
92
  bottom: '38px',
93
93
  xAxisIndex: [0],
@@ -13,6 +13,7 @@ export declare namespace eventChartProps {
13
13
  */
14
14
  dataSource?: ChartTypesProps;
15
15
  dataSourceList?: DisplaySetup[];
16
+ onlyChart?: boolean;
16
17
  /**
17
18
  * 查询条件
18
19
  */
@@ -14,14 +14,13 @@ import { ajax, BizGlobalDataContext, BizLayout, BizTargetFromPanelContext } from
14
14
  import React, { useContext, useEffect, useRef, useState } from 'react';
15
15
  import Request from 'umi-request';
16
16
  import TopBar from "../../components/topBar";
17
- import { EventContext } from "../../types";
17
+ import { IntervalContext } from "../../types";
18
18
  import "./styles/index.less";
19
19
  import { Apis } from "../../constants";
20
20
  import { judgeIsCity, judgeIsArea, getValue, searchDataParams } from "./utils";
21
21
  import { ContentPanel, SearchPanel } from "../../components";
22
22
  import TopPanel from "../topPanel";
23
23
  import { message } from 'antd';
24
- var timer = 0;
25
24
  var CancelToken = Request.CancelToken;
26
25
  var cancel;
27
26
  var classPrefix = 'interval-content';
@@ -56,15 +55,11 @@ var EventContent = function EventContent(props) {
56
55
  _useState12 = _slicedToArray(_useState11, 2),
57
56
  isCity = _useState12[0],
58
57
  setIsCity = _useState12[1];
59
- var _useState13 = useState(false),
58
+ var _useState13 = useState(-1),
60
59
  _useState14 = _slicedToArray(_useState13, 2),
61
- ajaxFlag = _useState14[0],
62
- setAjaxFlag = _useState14[1];
63
- var _useState15 = useState(-1),
64
- _useState16 = _slicedToArray(_useState15, 2),
65
- eventId = _useState16[0],
66
- setEventId = _useState16[1];
67
- var _useContext2 = useContext(EventContext),
60
+ eventId = _useState14[0],
61
+ setEventId = _useState14[1];
62
+ var _useContext2 = useContext(IntervalContext),
68
63
  searchData = _useContext2.searchData,
69
64
  setSearchData = _useContext2.setSearchData,
70
65
  eventGroupList = _useContext2.eventGroupList,
@@ -72,11 +67,17 @@ var EventContent = function EventContent(props) {
72
67
  userPropList = _useContext2.userPropList;
73
68
  var _useContext3 = useContext(BizTargetFromPanelContext),
74
69
  handleSearch = _useContext3.handleSearch;
70
+ var _useState15 = useState(),
71
+ _useState16 = _slicedToArray(_useState15, 2),
72
+ searchTimer = _useState16[0],
73
+ setSearchTimer = _useState16[1];
75
74
  var collapseRef = useRef();
76
75
  // 初始化
77
76
  useEffect(function () {
78
77
  if (props.defaultValue) {
79
78
  setEventId(props.defaultValue.id);
79
+ } else {
80
+ setLoading(false);
80
81
  }
81
82
  }, [props.defaultValue]);
82
83
  useEffect(function () {
@@ -88,42 +89,28 @@ var EventContent = function EventContent(props) {
88
89
  setIsCity(judgeIsCity(_attrName));
89
90
  }
90
91
  }
91
- if (timer) clearTimeout(timer);
92
- var flag = true;
93
- timer = setTimeout(function () {
94
- if (flag) {
95
- fetchRequest(false);
96
- }
97
- }, 500);
92
+ if (!searchData || !searchData.analysisModel) return;
93
+ if (searchTimer) clearTimeout(searchTimer);
94
+ setSearchTimer(setTimeout(function () {
95
+ fetchRequest();
96
+ }, 300));
98
97
  return function () {
99
- // 清理异步任务
100
- if (timer) clearTimeout(timer);
101
- flag = false;
98
+ clearTimeout(searchTimer);
102
99
  };
103
100
  }, [searchData]);
104
101
  useEffect(function () {
105
102
  handleSearch && handleSearch(loading);
106
103
  }, [loading]);
107
- useEffect(function () {
108
- if (ajaxFlag) {
109
- fetchRequest(true);
110
- }
111
- }, [ajaxFlag]);
104
+
112
105
  // 查询
113
- var fetchRequest = function fetchRequest(flag) {
106
+ var fetchRequest = function fetchRequest() {
114
107
  var _searchData$start, _searchData$end, _searchData$associate, _searchData$associate2, _searchData$associate3;
115
- if (flag !== undefined) setAjaxFlag(flag);
116
- if (!ajaxFlag) return;
117
108
  if ((searchData === null || searchData === void 0 ? void 0 : (_searchData$start = searchData.start) === null || _searchData$start === void 0 ? void 0 : _searchData$start.id) === null || (searchData === null || searchData === void 0 ? void 0 : (_searchData$end = searchData.end) === null || _searchData$end === void 0 ? void 0 : _searchData$end.id) === null) {
118
109
  setLoading(false);
119
110
  return;
120
111
  }
121
112
  setEventData(undefined);
122
113
  setLoading(true);
123
- // 取消上次未完成的请求
124
- // if (typeof cancel === 'function') {
125
- // cancel();
126
- // }
127
114
  if (searchData !== null && searchData !== void 0 && (_searchData$associate = searchData.associatedNextAttr) !== null && _searchData$associate !== void 0 && _searchData$associate.type && (searchData === null || searchData === void 0 ? void 0 : (_searchData$associate2 = searchData.associatedPreAttr) === null || _searchData$associate2 === void 0 ? void 0 : _searchData$associate2.type) !== (searchData === null || searchData === void 0 ? void 0 : (_searchData$associate3 = searchData.associatedNextAttr) === null || _searchData$associate3 === void 0 ? void 0 : _searchData$associate3.type)) {
128
115
  setLoading(false);
129
116
  return message.error('您查询的属性不一致,暂不支持查询');
@@ -159,7 +146,6 @@ var EventContent = function EventContent(props) {
159
146
  setSearchData(function (value) {
160
147
  return _objectSpread(_objectSpread({}, value), data);
161
148
  });
162
- setAjaxFlag(true);
163
149
  };
164
150
 
165
151
  // 改变显示内容
@@ -174,25 +160,26 @@ var EventContent = function EventContent(props) {
174
160
  platform: data
175
161
  });
176
162
  });
177
- setTimeout(function () {
178
- setAjaxFlag(true);
179
- }, 100);
180
163
  };
181
164
 
182
165
  // TopPanel组件数值变更
183
- var onChangeSearch = function onChangeSearch(data, flag) {
166
+ var onChangeSearch = function onChangeSearch(data) {
184
167
  data.id ? setEventId(data.id) : setEventId(-1);
185
168
  setSearchData(function (_searchData) {
186
- return _objectSpread(_objectSpread({}, _searchData), data);
169
+ return _objectSpread(_objectSpread({}, data), {}, {
170
+ time: _searchData.time,
171
+ platform: _searchData.platform,
172
+ userGroup: data.analysisSubject ? undefined : data.userGroup,
173
+ analysisSubject: data.analysisSubject ? data.analysisSubject : undefined
174
+ });
187
175
  });
188
- setAjaxFlag(false);
189
176
  };
190
177
  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(TopBar, {
191
178
  searchData: searchData,
192
179
  loading: loading,
193
180
  eventData: eventData,
194
181
  platformChange: platformChange,
195
- onUserDrill: props.onUserDrill
182
+ onJumpWarning: props.onJumpWarning
196
183
  }), /*#__PURE__*/React.createElement(BizLayout, {
197
184
  showTitle: false,
198
185
  hasCollapse: true,
@@ -202,11 +189,8 @@ var EventContent = function EventContent(props) {
202
189
  collapseRef: collapseRef,
203
190
  onChange: onChangeSearch,
204
191
  defaultValue: searchData,
205
- urlParam: props.urlParam,
206
- ajaxFlag: ajaxFlag,
207
192
  loading: loading,
208
- finalSearchData: finalSearchData,
209
- fetchRequest: fetchRequest
193
+ finalSearchData: finalSearchData
210
194
  })
211
195
  }, /*#__PURE__*/React.createElement("div", {
212
196
  className: classPrefix
@@ -1,4 +1,5 @@
1
- import { SearchValue, UserDrillParamsProp } from '../../types';
1
+ import { SearchValue } from '../../types';
2
+ import { IntervalProps } from '../home/types';
2
3
  export declare namespace EventContentProps {
3
4
  interface Props {
4
5
  /**
@@ -9,7 +10,6 @@ export declare namespace EventContentProps {
9
10
  * 默认值
10
11
  */
11
12
  value: SearchValue;
12
- urlParam?: SearchValue;
13
13
  /**
14
14
  * 展示列表
15
15
  */
@@ -18,7 +18,8 @@ export declare namespace EventContentProps {
18
18
  * 是否查询中
19
19
  */
20
20
  onSearching?: (flag: boolean) => void;
21
- onUserDrill: (data: UserDrillParamsProp, searchData: SearchValue) => void;
21
+ onUserDrill: IntervalProps.Props['onUserDrill'];
22
+ onJumpWarning: IntervalProps.Props['onJumpWarning'];
22
23
  /**
23
24
  * 查询条件回调
24
25
  */
@@ -51,5 +51,7 @@ export declare function searchDataParams(params: any): {
51
51
  } | null;
52
52
  associatedPreAttr: any;
53
53
  associatedNextAttr: any;
54
+ analysisModel: any;
55
+ analysisSubject: any;
54
56
  };
55
57
  export declare function transformData(data: any[][]): string[];
@@ -91,12 +91,14 @@ export function searchDataParams(params) {
91
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
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
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,
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.name : null,
95
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
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
97
  } : null,
98
98
  associatedPreAttr: params === null || params === void 0 ? void 0 : (_params$associatedPre = params.associatedPreAttr) === null || _params$associatedPre === void 0 ? void 0 : _params$associatedPre.id,
99
- associatedNextAttr: params === null || params === void 0 ? void 0 : (_params$associatedNex = params.associatedNextAttr) === null || _params$associatedNex === void 0 ? void 0 : _params$associatedNex.id
99
+ associatedNextAttr: params === null || params === void 0 ? void 0 : (_params$associatedNex = params.associatedNextAttr) === null || _params$associatedNex === void 0 ? void 0 : _params$associatedNex.id,
100
+ analysisModel: params.analysisModel,
101
+ analysisSubject: params.analysisSubject
100
102
  };
101
103
  }
102
104
  export function transformData(data) {
@@ -17,7 +17,7 @@ var defaultValue = {
17
17
  panelId: 400900,
18
18
  panelType: 'edit',
19
19
  data: {
20
- chartType: 'line',
20
+ chartType: 'boxplot',
21
21
  analysisIndex: 'per',
22
22
  id: 7565,
23
23
  name: '测试6666',