@zgfe/modules-interval 1.0.0-interval.1 → 1.0.0-interval.11

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 (44) hide show
  1. package/dist/esm/components/common/index.js +1 -1
  2. package/dist/esm/components/common/styles/index.less +1 -1
  3. package/dist/esm/components/eventFilter/index.js +5 -5
  4. package/dist/esm/components/eventFilter/styles/index.less +1 -1
  5. package/dist/esm/components/eventFilter/types.d.ts +1 -0
  6. package/dist/esm/components/renderContent/index.js +8 -11
  7. package/dist/esm/components/renderContent/styles/index.less +12 -2
  8. package/dist/esm/components/searchPanel/index.js +8 -3
  9. package/dist/esm/components/searchPanel/styles/index.less +1 -2
  10. package/dist/esm/components/table/index.d.ts +0 -1
  11. package/dist/esm/components/table/index.js +13 -87
  12. package/dist/esm/components/table/styles/index.less +1 -1
  13. package/dist/esm/components/topBar/index.js +20 -9
  14. package/dist/esm/components/topBar/styles/index.less +1 -1
  15. package/dist/esm/components/topBar/types.d.ts +3 -1
  16. package/dist/esm/constants/apis.js +1 -1
  17. package/dist/esm/constants/fields.js +4 -4
  18. package/dist/esm/index.d.ts +2 -2
  19. package/dist/esm/index.js +2 -2
  20. package/dist/esm/modules/chart/index.js +4 -3
  21. package/dist/esm/modules/chart/intervalChart.js +4 -2
  22. package/dist/esm/modules/chart/types.d.ts +1 -1
  23. package/dist/esm/modules/content/index.js +33 -77
  24. package/dist/esm/modules/content/styles/index.less +1 -1
  25. package/dist/esm/modules/content/types.d.ts +2 -1
  26. package/dist/esm/modules/content/utils.d.ts +38 -0
  27. package/dist/esm/modules/content/utils.js +57 -1
  28. package/dist/esm/modules/home/demo/create.js +2 -5
  29. package/dist/esm/modules/home/demo/edit.js +2 -5
  30. package/dist/esm/modules/home/demo/index.js +3 -6
  31. package/dist/esm/modules/home/demo/scene.js +2 -5
  32. package/dist/esm/modules/home/index.d.ts +2 -2
  33. package/dist/esm/modules/home/index.js +5 -4
  34. package/dist/esm/modules/home/styles/index.less +1 -1
  35. package/dist/esm/modules/topPanel/index.js +103 -51
  36. package/dist/esm/modules/topPanel/styles/index.less +20 -13
  37. package/dist/esm/modules/topPanel/types.d.ts +3 -1
  38. package/dist/esm/style/index.less +8 -1
  39. package/dist/esm/types.d.ts +2 -2
  40. package/dist/esm/utils/formData.d.ts +28 -6
  41. package/dist/esm/utils/formData.js +99 -31
  42. package/package.json +2 -2
  43. package/dist/esm/utils/base64.d.ts +0 -29
  44. package/dist/esm/utils/base64.js +0 -132
@@ -1,6 +1,6 @@
1
1
  import React from 'react';
2
2
  import "./styles/index.less";
3
- var classPrefix = 'mi-common';
3
+ var classPrefix = 'mi-common-interval';
4
4
 
5
5
  // 加载按钮
6
6
  export var MiSpin = function MiSpin() {
@@ -1,6 +1,6 @@
1
1
  @import '~@zgfe/business-lib/es/assets/styles/inner.less';
2
2
 
3
- .mi-common {
3
+ .mi-common-interval {
4
4
  &-loading-icon {
5
5
  z-index: 1000;
6
6
  display: inline-block;
@@ -15,7 +15,7 @@ import React, { useEffect, useRef, useState } from 'react';
15
15
  import { BizEventSelector, IconFont, BizAttrConditionGroup } from '@zgfe/business-lib';
16
16
  import "./styles/index.less";
17
17
  import _ from 'lodash';
18
- var classPrefix = 'eventfilter-box';
18
+ var classPrefix = 'interval-box';
19
19
  var EventFilter = function EventFilter(props) {
20
20
  // 筛选条件个数
21
21
  var _useState = useState(0),
@@ -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],
@@ -105,7 +105,7 @@ var EventFilter = function EventFilter(props) {
105
105
  }
106
106
  };
107
107
  var onChangeEvent = function onChangeEvent(event) {
108
- if (event && event.event && event.event.id === -100) {
108
+ if (event && event.event && event.event.id === null) {
109
109
  setEventOverview(false);
110
110
  } else {
111
111
  setEventOverview(true);
@@ -142,7 +142,7 @@ var EventFilter = function EventFilter(props) {
142
142
  return /*#__PURE__*/React.createElement("div", {
143
143
  className: classPrefix
144
144
  }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(BizEventSelector, {
145
- showAllEvent: true,
145
+ showAllEvent: false,
146
146
  showBuiltInTarget: false,
147
147
  popupContainer: false,
148
148
  defaultSelectAble: false,
@@ -1,4 +1,4 @@
1
- .eventfilter-box {
1
+ .interval-box {
2
2
  > :nth-child(1) {
3
3
  display: flex;
4
4
  display: flex;
@@ -44,6 +44,7 @@ export interface ConditionsnProps {
44
44
  * EventFilter组件
45
45
  */
46
46
  export interface EventFilterProps {
47
+ id?: string;
47
48
  value?: eventProps;
48
49
  relevancy?: boolean;
49
50
  onChange?: (event: eventProps) => {};
@@ -9,9 +9,9 @@ import React, { useEffect, useState } from 'react';
9
9
  import { MiNone, MiSpin } from '..';
10
10
  import "./styles/index.less";
11
11
  import EventChart from "../../modules/chart";
12
- var classPrefix = 'render-content';
12
+ var classPrefix = 'render-content-interval';
13
13
  var ContentPanel = function ContentPanel(props) {
14
- var _eventData$xAxis;
14
+ var _eventData$appData, _eventData$appData$se;
15
15
  var loading = props.loading,
16
16
  eventData = props.eventData,
17
17
  searchData = props.searchData;
@@ -41,18 +41,15 @@ var ContentPanel = function ContentPanel(props) {
41
41
  className: classPrefix
42
42
  }, /*#__PURE__*/React.createElement("div", {
43
43
  className: "".concat(classPrefix, "-chart-container")
44
- }, eventData ? /*#__PURE__*/React.createElement(EventChart, {
45
- dataSource: eventData,
46
- params: searchData,
47
- showList: showList
48
- }) : /*#__PURE__*/React.createElement(MiNone, {
49
- label: "\u6682\u65E0\u6570\u636E"
50
- })), eventData && (_eventData$xAxis = eventData.xAxis) !== null && _eventData$xAxis !== void 0 && _eventData$xAxis.length ? /*#__PURE__*/React.createElement(EventChart, {
44
+ }, eventData && (_eventData$appData = eventData.appData) !== null && _eventData$appData !== void 0 && (_eventData$appData$se = _eventData$appData.series) !== null && _eventData$appData$se !== void 0 && _eventData$appData$se.length ? /*#__PURE__*/React.createElement(EventChart, {
51
45
  type: "grid",
52
46
  dataSource: eventData,
53
47
  params: searchData,
54
- showList: showList,
55
48
  onChangeShow: onChangeShow
56
- }) : null);
49
+ }) : /*#__PURE__*/React.createElement("div", {
50
+ className: "".concat(classPrefix, "-MiNone")
51
+ }, /*#__PURE__*/React.createElement(MiNone, {
52
+ label: "\u6682\u65E0\u6570\u636E"
53
+ }))));
57
54
  };
58
55
  export default ContentPanel;
@@ -1,5 +1,4 @@
1
-
2
- .render-content {
1
+ .render-content-interval {
3
2
  &-chart-container {
4
3
  display: flex;
5
4
  flex-direction: column;
@@ -14,6 +13,17 @@
14
13
  }
15
14
  }
16
15
 
16
+ &-MiNone {
17
+ display: flex;
18
+ align-items: center;
19
+ justify-content: center;
20
+ width: 100%;
21
+ height: 368px;
22
+ padding: 24px 16px;
23
+ border: 1px solid #ecedf0;
24
+ border-radius: 8px;
25
+ }
26
+
17
27
  &-spin-container {
18
28
  display: flex;
19
29
  align-items: center;
@@ -16,7 +16,7 @@ import { chartTypeOptions, getInitDate } from "../../constants";
16
16
  import { EventContext } from "../../types";
17
17
  import "./styles/index.less";
18
18
  import { extractNames } from "../../utils/formData";
19
- var classPrefix = 'search-panel';
19
+ var classPrefix = 'search-panel-interval';
20
20
  var SearchPanel = function SearchPanel(props) {
21
21
  var _useContext = useContext(EventContext),
22
22
  includeToday = _useContext.includeToday;
@@ -105,10 +105,15 @@ var SearchPanel = function SearchPanel(props) {
105
105
  display: 'flex'
106
106
  }
107
107
  }, /*#__PURE__*/React.createElement(BizDatePicker, {
108
- defaultValue: time,
109
- onChange: onChangeTime
108
+ dateTypeList: ['day', 'week', 'month'],
109
+ value: time,
110
+ mode: "simple",
111
+ includeToday: true,
112
+ onChange: onChangeTime,
113
+ selectRange: 365
110
114
  }), /*#__PURE__*/React.createElement(BizSelect, {
111
115
  multiple: true,
116
+ disable: displaySetupList.length === 0,
112
117
  onChange: onDimensionChange,
113
118
  className: "".concat(classPrefix, "-select"),
114
119
  placeholder: "\u8BF7\u9009\u62E9\u663E\u793A\u8BBE\u7F6E",
@@ -1,5 +1,4 @@
1
-
2
- .search-panel {
1
+ .search-panel-interval {
3
2
  display: flex;
4
3
  align-items: center;
5
4
  justify-content: space-between;
@@ -1,5 +1,4 @@
1
1
  import React from 'react';
2
- import 'highlight.js/styles/vs.css';
3
2
  import { EventTableProps } from './types';
4
3
  import './styles/index.less';
5
4
  declare const EventTable: React.FC<EventTableProps>;
@@ -10,19 +10,17 @@ 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 { ajax, BizGlobalDataContext, BizTable, IconFont } from '@zgfe/business-lib';
13
+ import { ajax, base64, BizGlobalDataContext, BizTable, IconFont } from '@zgfe/business-lib';
14
14
  import React, { useContext, useEffect, useMemo, useState } from 'react';
15
- import 'highlight.js/styles/vs.css';
16
- import base64 from "../../utils/base64";
17
15
  import { Apis } from "../../constants";
18
16
  import { message } from 'antd';
19
17
  import { formTableData, getColumns } from "../../utils/formData";
20
18
  import "./styles/index.less";
21
- import { getValue } from "../../modules/content/utils";
19
+ import { searchDataParams } from "../../modules/content/utils";
22
20
  import { EventContext } from "../../types";
23
- var classPrefix = 'mi-table';
21
+ var classPrefix = 'mi-interval-table';
24
22
  var EventTable = function EventTable(props) {
25
- var _dataSource$app_data2;
23
+ var _dataSource$appData2;
26
24
  var dataSource = props.dataSource,
27
25
  searchData = props.searchData,
28
26
  showList = props.showList;
@@ -63,106 +61,34 @@ var EventTable = function EventTable(props) {
63
61
  var sortData = formTableData(dataSource);
64
62
  setSearchTable(sortData);
65
63
  setSortTable(sortData);
66
- setTableData(sortData === null || sortData === void 0 ? void 0 : sortData.slice(0, 10));
64
+ setTableData(sortData);
67
65
  }, [dataSource]);
68
66
 
69
67
  // 表格column
70
68
  var columns = useMemo(function () {
71
- var _dataSource$app_data;
69
+ var _dataSource$appData;
72
70
  var _searchData$userGroup = searchData.userGroup,
73
71
  userGroup = _searchData$userGroup === void 0 ? [0] : _searchData$userGroup;
74
-
75
- // // 用户钻取
76
- // const onClickToDetail = (item: EventProps.ColumnsDataType, time: string, count: number) => {
77
- // let _time = time.split('|');
78
- // let groupValue = '';
79
- // // 有细分属性
80
- // if (searchData.dimension && item.dimension) {
81
- // groupValue = item.dimension;
82
- // } else {
83
- // // 有事件,无细分属性 || 事件概览
84
- // eventGroupList?.forEach((group) => {
85
- // group.eventList?.forEach((event) => {
86
- // if (event.name === item.name) {
87
- // groupValue = event.id.toString();
88
- // }
89
- // });
90
- // });
91
- // }
92
-
93
- // onUserDrill &&
94
- // onUserDrill(
95
- // {
96
- // appId: currentApp?.appId,
97
- // platform: currentApp?.platform || 0,
98
- // count,
99
- // module: 'event',
100
- // params: {
101
- // groupValue,
102
- // id: searchData.id,
103
- // userGroup: searchData.userGroup,
104
- // chartType: searchData.chartType,
105
- // conditions: searchData.filters?.conditions,
106
- // dimension: searchData.dimension,
107
- // dataType: searchData.id ? 'event' : 'overview',
108
- // time: {
109
- // ...searchData.time,
110
- // begin: _time[0],
111
- // end: _time.length > 1 ? _time[1] : _time[0],
112
- // },
113
- // },
114
- // source: 'EVENT',
115
- // url: '/zg/web/v2/data/appEventBatch',
116
- // },
117
- // {
118
- // source: 'EVENT',
119
- // ...defaultSearch,
120
- // name: panelName,
121
- // data: searchData,
122
- // },
123
- // );
124
- // };
125
- var _getColumns = getColumns(eventGroupList, userPropList, eventEnvList, (dataSource === null || dataSource === void 0 ? void 0 : (_dataSource$app_data = dataSource.app_data) === null || _dataSource$app_data === void 0 ? void 0 : _dataSource$app_data.x_axis) || [], userGroup, searchData, showList
126
- // onClickToDetail,
127
- );
128
-
72
+ 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);
129
73
  return _getColumns;
130
- }, [dataSource === null || dataSource === void 0 ? void 0 : (_dataSource$app_data2 = dataSource.app_data) === null || _dataSource$app_data2 === void 0 ? void 0 : _dataSource$app_data2.x_axis, showList, sortTable, panelName]);
74
+ }, [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]);
131
75
 
132
76
  // 监听分页变化,如果页码发生变化则调用合并行方法
133
77
  var onChangeTable = function onChangeTable(pagination) {
134
- var startNum = (pagination.current - 1) * pagination.pageSize;
135
- var endNum = pagination.current * pagination.pageSize;
136
78
  setPageData({
137
79
  pageSize: pagination.pageSize,
138
80
  current: pagination.current
139
81
  });
140
- setTableData(searchTable === null || searchTable === void 0 ? void 0 : searchTable.slice(startNum, endNum));
141
82
  };
142
83
 
143
84
  // 下载数据
144
85
  var download = function download() {
145
- var _searchData$userGroup2;
146
- var seriesNames = [];
147
- // 有用户群
148
- if (searchData !== null && searchData !== void 0 && searchData.userGroup && (searchData === null || searchData === void 0 ? void 0 : (_searchData$userGroup2 = searchData.userGroup) === null || _searchData$userGroup2 === void 0 ? void 0 : _searchData$userGroup2.length) > 1) {
149
- seriesNames.push(base64.encode('用户群'));
150
- }
151
- // 有细分属性
152
- if (searchData !== null && searchData !== void 0 && searchData.dimension) {
153
- seriesNames.push(base64.encode(getValue(searchData === null || searchData === void 0 ? void 0 : searchData.dimension, eventGroupList, eventEnvList, userPropList).label));
154
- }
155
- // 事件(有事件-无细分属性 || 事件概览)
156
- if (searchData.id && !searchData.dimension || !searchData.id) {
157
- seriesNames.push(base64.encode('事件'));
158
- }
86
+ var obj = searchDataParams(searchData);
159
87
  var params = _objectSpread(_objectSpread({
160
- appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
161
- platform: (currentApp === null || currentApp === void 0 ? void 0 : currentApp.platform) || 0
162
- }, searchData), {}, {
88
+ appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId
89
+ }, obj), {}, {
163
90
  down: {
164
- fname: base64.encode('间隔分析'),
165
- titles: seriesNames
91
+ fname: base64.encode('间隔分析', false)
166
92
  }
167
93
  });
168
94
  ajax(Apis.eventDownloadReport, {
@@ -191,7 +117,7 @@ var EventTable = function EventTable(props) {
191
117
  rowKey: "key",
192
118
  scroll: {
193
119
  x: 800,
194
- y: 200
120
+ y: 550
195
121
  },
196
122
  onChange: onChangeTable
197
123
  }));
@@ -1,4 +1,4 @@
1
- .mi-table {
1
+ .mi-interval-table {
2
2
  width: 100%;
3
3
  margin-top: 16px;
4
4
 
@@ -16,9 +16,10 @@ import { BizAddToPanel, BizAddToScene, BizGlobalDataContext } from '@zgfe/busine
16
16
  import "./styles/index.less";
17
17
  import { EventContext } from "../../types";
18
18
  import { chartTypes, platformOption } from "../../constants/fields";
19
- var classPrefix = 'modules-event-topbar';
19
+ import { searchDataParams } from "../../modules/content/utils";
20
+ var classPrefix = 'modules-interval-topbar';
20
21
  var TopBar = function TopBar(props) {
21
- // console.log('TopBar', props);
22
+ var _props$eventData, _props$eventData$appD, _props$eventData$appD2, _props$eventData2, _props$eventData2$app, _props$eventData2$app2, _props$eventData3, _props$eventData3$app, _props$eventData3$app2;
22
23
  var _useContext = useContext(EventContext),
23
24
  panelId = _useContext.panelId,
24
25
  afterEditTarget = _useContext.afterEditTarget,
@@ -66,6 +67,7 @@ var TopBar = function TopBar(props) {
66
67
  }, !panelId && /*#__PURE__*/React.createElement("div", {
67
68
  className: "".concat(classPrefix, "-panel")
68
69
  }, /*#__PURE__*/React.createElement(Button, {
70
+ disabled: !(props !== null && props !== void 0 && props.eventData) || (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,
69
71
  onClick: function onClick() {
70
72
  setShowPanel(true);
71
73
  }
@@ -73,8 +75,8 @@ var TopBar = function TopBar(props) {
73
75
  type: panelType,
74
76
  params: _objectSpread({
75
77
  app_id: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
76
- module: 'event'
77
- }, searchData),
78
+ module: 'interval'
79
+ }, searchDataParams(searchData)),
78
80
  styleOptions: chartTypes,
79
81
  onCancel: function onCancel() {
80
82
  return closeHandle('panel');
@@ -85,27 +87,36 @@ var TopBar = function TopBar(props) {
85
87
  })), enableAddScene && /*#__PURE__*/React.createElement("div", {
86
88
  className: "".concat(classPrefix, "-scene")
87
89
  }, /*#__PURE__*/React.createElement(Button, {
90
+ disabled: !(props !== null && props !== void 0 && props.eventData) || (props === null || props === void 0 ? void 0 : (_props$eventData2 = props.eventData) === null || _props$eventData2 === void 0 ? void 0 : (_props$eventData2$app = _props$eventData2.appData) === null || _props$eventData2$app === void 0 ? void 0 : (_props$eventData2$app2 = _props$eventData2$app.series) === null || _props$eventData2$app2 === void 0 ? void 0 : _props$eventData2$app2.length) === 0,
88
91
  onClick: function onClick() {
89
92
  setShowScene(true);
90
93
  }
91
94
  }, "\u6DFB\u52A0\u5E38\u7528\u573A\u666F"), showScene && /*#__PURE__*/React.createElement(BizAddToScene, {
92
95
  params: _objectSpread({
93
96
  app_id: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
94
- module: 'event'
95
- }, searchData),
97
+ module: 'interval'
98
+ }, searchDataParams(searchData)),
96
99
  onOk: function onOk(data) {
97
100
  return _onOk('scene', data);
98
101
  },
99
102
  onCancel: function onCancel() {
100
103
  return closeHandle('scene');
101
104
  }
102
- })), /*#__PURE__*/React.createElement(Button, {
105
+ })), (currentApp === null || currentApp === void 0 ? void 0 : currentApp.appVersion) === 1 || (currentApp === null || currentApp === void 0 ? void 0 : currentApp.appVersion) === 2 ? /*#__PURE__*/React.createElement(Button, {
103
106
  className: "".concat(classPrefix, "-earlywarning"),
104
107
  type: "primary",
108
+ disabled: !(props !== null && props !== void 0 && props.eventData) || (props === null || props === void 0 ? void 0 : (_props$eventData3 = props.eventData) === null || _props$eventData3 === void 0 ? void 0 : (_props$eventData3$app = _props$eventData3.appData) === null || _props$eventData3$app === void 0 ? void 0 : (_props$eventData3$app2 = _props$eventData3$app.series) === null || _props$eventData3$app2 === void 0 ? void 0 : _props$eventData3$app2.length) === 0,
105
109
  onClick: function onClick() {
106
- return console.log('设置流失预警');
110
+ props.onUserDrill({
111
+ appId: Number(currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId),
112
+ module: 'interval',
113
+ platform: 0,
114
+ count: 0,
115
+ source: '',
116
+ url: ''
117
+ }, searchData);
107
118
  }
108
- }, "\u8BBE\u7F6E\u6D41\u5931\u9884\u8B66"), /*#__PURE__*/React.createElement("div", {
119
+ }, "\u8BBE\u7F6E\u6D41\u5931\u9884\u8B66") : null, /*#__PURE__*/React.createElement("div", {
109
120
  className: "".concat(classPrefix, "-platform")
110
121
  }, platformOption.map(function (item) {
111
122
  return /*#__PURE__*/React.createElement("div", {
@@ -1,6 +1,6 @@
1
1
  @import '~@zgfe/business-lib/es/assets/styles/inner.less';
2
2
 
3
- .modules-event-topbar {
3
+ .modules-interval-topbar {
4
4
  display: flex;
5
5
  justify-content: flex-end;
6
6
  margin: 8px 0;
@@ -1,8 +1,10 @@
1
- import { SearchValue } from '../../types';
1
+ import { ResponseDataProps, SearchValue, UserDrillParamsProp } from '../../types';
2
2
  export interface TopBarProps {
3
3
  /**
4
4
  * @description 标题
5
5
  */
6
6
  searchData?: SearchValue;
7
+ eventData?: ResponseDataProps;
8
+ onUserDrill: (data: UserDrillParamsProp, searchData: SearchValue) => void;
7
9
  platformChange: (data: number) => void;
8
10
  }
@@ -2,6 +2,6 @@ var Apis = {
2
2
  // dataList: '/zg/web/v2/data/eventDataList',
3
3
  dataList: '/zg/web/v2/interval/intervalData',
4
4
  getEventDataSql: '/zg/web/v2/dataSql/getEventDataSql',
5
- eventDownloadReport: '/zg/web/v2/data/eventDownloadReport'
5
+ eventDownloadReport: '/zg/web/v2/interval/downLoadintervalData'
6
6
  };
7
7
  export default Apis;
@@ -2,14 +2,14 @@ export var platformOption = [{
2
2
  key: 0,
3
3
  value: '全部'
4
4
  }, {
5
- key: 1,
6
- value: 'Android'
5
+ key: 3,
6
+ value: 'JS'
7
7
  }, {
8
8
  key: 2,
9
9
  value: 'IOS'
10
10
  }, {
11
- key: 3,
12
- value: 'JS'
11
+ key: 1,
12
+ value: 'Android'
13
13
  }];
14
14
  export var chartTypes = [{
15
15
  label: '趋势图',
@@ -1,4 +1,4 @@
1
1
  /// <reference path="../typings.d.ts" />
2
2
  import EventChart from './modules/chart';
3
- import ModuleEvent from './modules/home';
4
- export { ModuleEvent, EventChart };
3
+ import ModuleInterval from './modules/home';
4
+ export { ModuleInterval, EventChart };
package/dist/esm/index.js CHANGED
@@ -1,4 +1,4 @@
1
1
  /// <reference path="../typings.d.ts" />
2
2
  import EventChart from "./modules/chart";
3
- import ModuleEvent from "./modules/home";
4
- export { ModuleEvent, EventChart };
3
+ import ModuleInterval from "./modules/home";
4
+ export { ModuleInterval, EventChart };
@@ -18,7 +18,7 @@ import { Apis } from "../../constants";
18
18
  import { Spin } from 'antd';
19
19
  import IntervalChart from "./intervalChart";
20
20
  var EventChart = function EventChart(props) {
21
- var _dataSource$app_data, _dataSource$app_data$, _dataSource$app_data2, _dataSource$app_data3;
21
+ var _dataSource$appData;
22
22
  var params = props.params;
23
23
  // 显示内容
24
24
  var _useState = useState(),
@@ -81,7 +81,7 @@ var EventChart = function EventChart(props) {
81
81
  className: "spin-container"
82
82
  });
83
83
  }
84
- if (!dataSource || !(dataSource !== null && dataSource !== void 0 && (_dataSource$app_data = dataSource.app_data) !== null && _dataSource$app_data !== void 0 && (_dataSource$app_data$ = _dataSource$app_data.x_axis) !== null && _dataSource$app_data$ !== void 0 && _dataSource$app_data$.length || dataSource !== null && dataSource !== void 0 && (_dataSource$app_data2 = dataSource.app_data) !== null && _dataSource$app_data2 !== void 0 && (_dataSource$app_data3 = _dataSource$app_data2.series) !== null && _dataSource$app_data3 !== void 0 && _dataSource$app_data3.length)) {
84
+ if (!dataSource || !(dataSource !== null && dataSource !== void 0 && (_dataSource$appData = dataSource.appData) !== null && _dataSource$appData !== void 0 && _dataSource$appData.series.length)) {
85
85
  return /*#__PURE__*/React.createElement(MiNone, {
86
86
  label: "\u6682\u65E0\u6570\u636E"
87
87
  });
@@ -89,7 +89,8 @@ var EventChart = function EventChart(props) {
89
89
  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(IntervalChart, {
90
90
  dataSource: dataSource,
91
91
  showList: showList,
92
- dataSourceList: dataSourceList
92
+ dataSourceList: dataSourceList,
93
+ params: params
93
94
  }), /*#__PURE__*/React.createElement(EventTable, {
94
95
  dataSource: dataSource,
95
96
  searchData: params,
@@ -11,6 +11,7 @@ import { renderToString } from 'react-dom/server';
11
11
  import CustomTooltip from "./customTooltip";
12
12
  import { chartColors } from "../../constants";
13
13
  import { getRandomColor } from "../../constants/color";
14
+ import { convertDateArray } from "../../utils/formData";
14
15
  var IntervalChart = function IntervalChart(props) {
15
16
  var _useState = useState({}),
16
17
  _useState2 = _slicedToArray(_useState, 2),
@@ -18,7 +19,8 @@ var IntervalChart = function IntervalChart(props) {
18
19
  setOption = _useState2[1];
19
20
  useEffect(function () {
20
21
  var _props$showList, _seriesData$series;
21
- var seriesData = props === null || props === void 0 ? void 0 : (_props$showList = props.showList) === null || _props$showList === void 0 ? void 0 : _props$showList.app_data;
22
+ var seriesData = props === null || props === void 0 ? void 0 : (_props$showList = props.showList) === null || _props$showList === void 0 ? void 0 : _props$showList.appData;
23
+ var params = props === null || props === void 0 ? void 0 : props.params;
22
24
  var eCharts = {
23
25
  tooltip: {
24
26
  trigger: 'item',
@@ -41,7 +43,7 @@ var IntervalChart = function IntervalChart(props) {
41
43
  type: 'category',
42
44
  boundaryGap: true,
43
45
  nameGap: 30,
44
- data: seriesData === null || seriesData === void 0 ? void 0 : seriesData.x_axis,
46
+ data: convertDateArray(params, seriesData === null || seriesData === void 0 ? void 0 : seriesData.xAxis),
45
47
  splitArea: {
46
48
  show: false
47
49
  },
@@ -3,7 +3,7 @@ import { SearchValue } from '../../types';
3
3
  import { DisplaySetup } from '../../components/searchPanel/types';
4
4
  export declare namespace eventChartProps {
5
5
  interface ChartTypesProps extends ChartTypes.Value {
6
- app_data: any;
6
+ appData: any;
7
7
  xAxis: [];
8
8
  x_axis: [];
9
9
  }