@zgfe/modules-event 0.0.2-event.9 → 0.1.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 (45) hide show
  1. package/es/components/eventFilter/index.js +49 -20
  2. package/es/components/eventFilter/styles/index.less +6 -3
  3. package/es/components/eventFilter/types.d.ts +4 -0
  4. package/es/components/index.d.ts +1 -2
  5. package/es/components/index.js +1 -2
  6. package/es/components/renderContent/index.d.ts +1 -1
  7. package/es/components/renderContent/index.js +19 -18
  8. package/es/components/renderContent/styles/index.less +3 -8
  9. package/es/components/renderContent/types.d.ts +0 -1
  10. package/es/components/searchPanel/index.js +24 -6
  11. package/es/components/searchPanel/types.d.ts +2 -0
  12. package/es/components/table/index.js +16 -20
  13. package/es/components/table/styles/index.less +73 -7
  14. package/es/components/table/types.d.ts +1 -0
  15. package/es/components/topBar/index.js +42 -27
  16. package/es/components/topBar/styles/index.less +14 -0
  17. package/es/components/topBar/types.d.ts +4 -1
  18. package/es/constants/fields.js +4 -4
  19. package/es/modules/chart/index.d.ts +1 -1
  20. package/es/modules/chart/index.js +53 -41
  21. package/es/modules/chart/types.d.ts +1 -0
  22. package/es/modules/content/index.js +72 -57
  23. package/es/modules/content/types.d.ts +1 -2
  24. package/es/modules/content/utils.d.ts +6 -1
  25. package/es/modules/content/utils.js +30 -3
  26. package/es/modules/home/demo/create.js +10 -2
  27. package/es/modules/home/demo/edit.js +56 -32
  28. package/es/modules/home/demo/index.js +4 -0
  29. package/es/modules/home/demo/scene.js +4 -0
  30. package/es/modules/home/index.js +67 -34
  31. package/es/modules/home/styles/index.less +7 -2
  32. package/es/modules/home/types.d.ts +5 -0
  33. package/es/modules/topPanel/index.js +39 -31
  34. package/es/modules/topPanel/styles/index.less +11 -1
  35. package/es/modules/topPanel/types.d.ts +7 -4
  36. package/es/style/index.less +6 -3
  37. package/es/types.d.ts +2 -0
  38. package/es/utils/formData.d.ts +8 -1
  39. package/es/utils/formData.js +139 -30
  40. package/package.json +3 -3
  41. package/es/components/common/index.d.ts +0 -6
  42. package/es/components/common/index.js +0 -17
  43. package/es/components/common/styles/index.less +0 -27
  44. package/es/components/table/images/empty.png +0 -0
  45. package/es/style/image/noData.png +0 -0
@@ -35,16 +35,24 @@ export default (function () {
35
35
  setSearchParams(searchData);
36
36
  setDetailParams(data);
37
37
  };
38
+ var onChange = function onChange(data) {
39
+ console.log('查询参数改变了:', data);
40
+ };
41
+ var onLossWarning = function onLossWarning(warningId) {
42
+ console.log('设置预警流失', warningId);
43
+ };
38
44
  return /*#__PURE__*/React.createElement(DemoWrapper, {
39
45
  needMeta: true,
40
- defaultApp: 266
46
+ defaultApp: 461
41
47
  }, isDetail ? /*#__PURE__*/React.createElement("div", null, JSON.stringify(detailParams), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement(Button, {
42
48
  onClick: function onClick() {
43
49
  return setIsDetail(false);
44
50
  }
45
51
  }, "\u8FD4\u56DE")) : /*#__PURE__*/React.createElement(ModuleEvent, {
52
+ onChange: onChange,
46
53
  defaultValue: searchParams,
47
54
  afterEditTarget: afterEditTarget,
48
- onUserDrill: onUserDrill
55
+ onUserDrill: onUserDrill,
56
+ onLossWarning: onLossWarning
49
57
  }));
50
58
  });
@@ -10,44 +10,64 @@ import { ModuleEvent } from '../../../index';
10
10
  import { requestConfig } from '../../../utils/ajaxConfig';
11
11
  import { Button } from 'antd';
12
12
  var defaultValue = {
13
- id: 7565,
14
- name: '测试6666',
15
- type: 0,
16
13
  enlarged: 0,
17
- panelId: 400900,
14
+ id: 2526,
15
+ isPerfect: 1,
16
+ name: '事件分析',
17
+ reqParam: {
18
+ data: {
19
+ app_id: 251,
20
+ module: 'event',
21
+ time: {
22
+ begin: '2023-09-16',
23
+ end: '2023-09-23',
24
+ relative: [7, 0],
25
+ unit: 'day'
26
+ },
27
+ analysisIndex: 'number',
28
+ chartType: 'map',
29
+ id: 16818,
30
+ name: 'click',
31
+ dimension: {
32
+ propCategory: 'envProp',
33
+ category: 'fixed',
34
+ value: 'area',
35
+ id: 0
36
+ },
37
+ userGroup: [0],
38
+ appId: 251
39
+ },
40
+ chosen_data: []
41
+ },
42
+ type: 0,
43
+ unExistEvent: '',
44
+ renderType: 'normal',
45
+ source: 'PANEL',
46
+ panelId: 286,
18
47
  panelType: 'edit',
19
48
  data: {
20
- chartType: 'line',
21
- analysisIndex: 'per',
22
- id: 7565,
23
- name: '测试6666',
24
- appId: 266,
25
- platform: 1,
26
- userGroup: [933, 935],
49
+ app_id: 251,
50
+ module: 'event',
27
51
  time: {
28
- unit: 'day',
29
- relative: [14, 0],
30
- begin: '2023-08-04',
31
- end: '2023-08-18'
52
+ begin: '2023-09-16',
53
+ end: '2023-09-23',
54
+ relative: [7, 0],
55
+ unit: 'day'
32
56
  },
57
+ analysisIndex: 'number',
58
+ chartType: 'map',
59
+ id: 16818,
60
+ name: 'click',
33
61
  dimension: {
34
- propCategory: 'eventProp',
35
- value: 151045
62
+ propCategory: 'envProp',
63
+ category: 'fixed',
64
+ value: 'area',
65
+ id: 0
36
66
  },
37
- filters: {
38
- relation: 'and',
39
- conditions: [{
40
- attrId: 151045,
41
- propCategory: 'eventProp',
42
- type: 1,
43
- operator: 'equal',
44
- values: ['55'],
45
- dimensionSub: 'event_attr',
46
- label: '应用名称',
47
- attrName: '应用名称'
48
- }]
49
- }
50
- }
67
+ userGroup: [0],
68
+ appId: 251
69
+ },
70
+ chosen_data: []
51
71
  };
52
72
  export default (function () {
53
73
  var _useState = useState(false),
@@ -74,14 +94,18 @@ export default (function () {
74
94
  setSearchParams(searchData);
75
95
  setDetailParams(data);
76
96
  };
97
+ var onChange = function onChange(data) {
98
+ console.log('查询参数改变了:', data);
99
+ };
77
100
  return /*#__PURE__*/React.createElement(DemoWrapper, {
78
101
  needMeta: true,
79
- defaultApp: 266
102
+ defaultApp: 251
80
103
  }, isDetail ? /*#__PURE__*/React.createElement("div", null, JSON.stringify(detailParams), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement(Button, {
81
104
  onClick: function onClick() {
82
105
  return setIsDetail(false);
83
106
  }
84
107
  }, "\u8FD4\u56DE")) : /*#__PURE__*/React.createElement(ModuleEvent, {
108
+ onChange: onChange,
85
109
  defaultValue: searchParams,
86
110
  afterEditTarget: afterEditTarget,
87
111
  onUserDrill: onUserDrill
@@ -35,6 +35,9 @@ export default (function () {
35
35
  setSearchParams(searchData);
36
36
  setDetailParams(data);
37
37
  };
38
+ var onChange = function onChange(data) {
39
+ console.log('查询参数改变了:', data);
40
+ };
38
41
  return /*#__PURE__*/React.createElement(DemoWrapper, {
39
42
  needMeta: true,
40
43
  defaultApp: 204
@@ -43,6 +46,7 @@ export default (function () {
43
46
  return setIsDetail(false);
44
47
  }
45
48
  }, "\u8FD4\u56DE")) : /*#__PURE__*/React.createElement(ModuleEvent, {
49
+ onChange: onChange,
46
50
  defaultValue: searchParams,
47
51
  afterEditTarget: afterEditTarget,
48
52
  onUserDrill: onUserDrill
@@ -71,6 +71,9 @@ export default (function () {
71
71
  setSearchParams(searchData);
72
72
  setDetailParams(data);
73
73
  };
74
+ var onChange = function onChange(data) {
75
+ console.log('查询参数改变了:', data);
76
+ };
74
77
  return /*#__PURE__*/React.createElement(DemoWrapper, {
75
78
  needMeta: true,
76
79
  defaultApp: 266
@@ -79,6 +82,7 @@ export default (function () {
79
82
  return setIsDetail(false);
80
83
  }
81
84
  }, "\u8FD4\u56DE")) : /*#__PURE__*/React.createElement(ModuleEvent, {
85
+ onChange: onChange,
82
86
  defaultValue: searchParams,
83
87
  afterEditTarget: afterEditTarget,
84
88
  onUserDrill: onUserDrill
@@ -15,55 +15,72 @@ import { EventContext } from '../../types';
15
15
  import { getInitDate } from '../../constants/initData';
16
16
  import EventContent from '../content';
17
17
  import { chartTypes } from '../../constants';
18
- var classPrefix = 'event-container';
18
+ var classPrefix = 'event-module-container';
19
+ var onChangeTimer = -1;
19
20
  var ModuleEvent = function ModuleEvent(props) {
20
- console.log('ModuleEvent-props', props);
21
21
  var _useContext = useContext(BizGlobalDataContext),
22
22
  currentApp = _useContext.currentApp,
23
23
  eventGroupList = _useContext.eventGroupList,
24
24
  eventEnvList = _useContext.eventEnvList,
25
25
  userPropList = _useContext.userPropList,
26
26
  userGroupList = _useContext.userGroupList;
27
- console.log('BizGlobalDataContext', eventGroupList, eventEnvList, userPropList);
28
27
  var _useState = useState(),
29
28
  _useState2 = _slicedToArray(_useState, 2),
30
29
  searchData = _useState2[0],
31
30
  setSearchData = _useState2[1];
32
- var _useState3 = useState(false),
31
+ var _useState3 = useState(),
33
32
  _useState4 = _slicedToArray(_useState3, 2),
34
- loading = _useState4[0],
35
- setLoading = _useState4[1];
36
- var _useState5 = useState(true),
33
+ finalSearchData = _useState4[0],
34
+ setFinalSearchData = _useState4[1];
35
+ var onChangeUrlParam = function onChangeUrlParam(data) {
36
+ clearTimeout(onChangeTimer);
37
+ onChangeTimer = setTimeout(function () {
38
+ props.onChange({
39
+ data: data
40
+ });
41
+ }, 500);
42
+ };
43
+ var _useState5 = useState(),
37
44
  _useState6 = _slicedToArray(_useState5, 2),
38
- pageLoading = _useState6[0],
39
- setPageLoading = _useState6[1];
40
- var _useState7 = useState(),
45
+ selectEventData = _useState6[0],
46
+ setSelectEventData = _useState6[1];
47
+ var _useState7 = useState(true),
41
48
  _useState8 = _slicedToArray(_useState7, 2),
42
- title = _useState8[0],
43
- setTitle = _useState8[1];
44
- var _useState9 = useState(),
49
+ loading = _useState8[0],
50
+ setLoading = _useState8[1];
51
+ var _useState9 = useState(true),
45
52
  _useState10 = _slicedToArray(_useState9, 2),
46
- panelId = _useState10[0],
47
- setPanelId = _useState10[1];
53
+ pageLoading = _useState10[0],
54
+ setPageLoading = _useState10[1];
48
55
  var _useState11 = useState(),
49
56
  _useState12 = _slicedToArray(_useState11, 2),
50
- elementId = _useState12[0],
51
- setElementId = _useState12[1];
57
+ title = _useState12[0],
58
+ setTitle = _useState12[1];
52
59
  var _useState13 = useState(),
53
60
  _useState14 = _slicedToArray(_useState13, 2),
54
- showList = _useState14[0],
55
- setShowList = _useState14[1];
61
+ panelId = _useState14[0],
62
+ setPanelId = _useState14[1];
63
+ var _useState15 = useState(),
64
+ _useState16 = _slicedToArray(_useState15, 2),
65
+ elementId = _useState16[0],
66
+ setElementId = _useState16[1];
67
+ var _useState17 = useState(),
68
+ _useState18 = _slicedToArray(_useState17, 2),
69
+ showList = _useState18[0],
70
+ setShowList = _useState18[1];
56
71
  useEffect(function () {
57
72
  setPageLoading(true);
58
73
  if (props.defaultValue) {
59
74
  setShowList(props.defaultValue.chosen_data);
60
75
  setPanelId(props.defaultValue.panelId);
61
76
  setTitle(props.defaultValue.name);
77
+ if (props.defaultValue.id) {
78
+ setElementId(props.defaultValue.id);
79
+ }
62
80
  if (props.defaultValue.data) {
63
81
  setSearchData(props.defaultValue.data);
64
- setElementId(props.defaultValue.id);
65
82
  } else {
66
- initSearch();
83
+ initSearch(props.defaultValue.userGroup);
67
84
  }
68
85
  } else {
69
86
  initSearch();
@@ -72,22 +89,30 @@ var ModuleEvent = function ModuleEvent(props) {
72
89
  setPageLoading(false);
73
90
  }, 0);
74
91
  }, []);
75
- var initSearch = function initSearch() {
92
+ var initSearch = function initSearch(userGroup) {
76
93
  setSearchData({
77
- userGroup: (userGroupList === null || userGroupList === void 0 ? void 0 : userGroupList.length) > 0 ? [userGroupList[0].id] : [0],
94
+ userGroup: userGroup ? userGroup : (userGroupList === null || userGroupList === void 0 ? void 0 : userGroupList.length) > 0 ? [userGroupList[0].id] : [0],
78
95
  time: getInitDate(props.includeToday),
79
96
  chartType: 'line'
80
97
  });
81
98
  };
82
- var changeLoading = function changeLoading(flag) {
83
- setLoading(flag);
99
+ var onSelectEvent = function onSelectEvent(id, name) {
100
+ if ((searchData === null || searchData === void 0 ? void 0 : searchData.id) === undefined) {
101
+ setSelectEventData({
102
+ analysisIndex: searchData === null || searchData === void 0 ? void 0 : searchData.analysisIndex,
103
+ chartType: searchData === null || searchData === void 0 ? void 0 : searchData.chartType,
104
+ time: searchData === null || searchData === void 0 ? void 0 : searchData.time,
105
+ userGroup: searchData === null || searchData === void 0 ? void 0 : searchData.userGroup,
106
+ id: id,
107
+ name: name
108
+ });
109
+ }
84
110
  };
85
111
  if (pageLoading) {
86
112
  return /*#__PURE__*/React.createElement(Spin, null);
87
113
  }
88
- return /*#__PURE__*/React.createElement(Spin, {
89
- spinning: loading,
90
- wrapperClassName: classPrefix
114
+ return /*#__PURE__*/React.createElement("div", {
115
+ className: classPrefix
91
116
  }, /*#__PURE__*/React.createElement(BizTargetFromPanel, {
92
117
  value: panelId ? {
93
118
  panelId: panelId,
@@ -100,13 +125,15 @@ var ModuleEvent = function ModuleEvent(props) {
100
125
  }, searchData)
101
126
  }
102
127
  } : undefined,
128
+ disabled: props === null || props === void 0 ? void 0 : props.panelDisabled,
103
129
  styleOptions: chartTypes,
104
- afterEditTarget: props.afterEditTarget,
105
- children: ""
130
+ afterEditTarget: props.afterEditTarget
106
131
  }), !panelId && /*#__PURE__*/React.createElement("div", {
107
132
  className: "".concat(classPrefix, "-header-title")
108
133
  }, "\u4E8B\u4EF6\u5206\u6790"), /*#__PURE__*/React.createElement(EventContext.Provider, {
109
134
  value: {
135
+ loading: loading,
136
+ setLoading: setLoading,
110
137
  panelId: panelId,
111
138
  elementId: elementId,
112
139
  eventGroupList: eventGroupList,
@@ -114,18 +141,24 @@ var ModuleEvent = function ModuleEvent(props) {
114
141
  userPropList: userPropList,
115
142
  searchData: searchData,
116
143
  setSearchData: setSearchData,
144
+ finalSearchData: finalSearchData,
145
+ setFinalSearchData: setFinalSearchData,
146
+ onChangeUrlParam: onChangeUrlParam,
147
+ selectEventData: selectEventData,
148
+ onSelectEvent: onSelectEvent,
117
149
  panelName: title,
118
150
  includeToday: props.includeToday,
151
+ showWarning: props.showWarning,
119
152
  enableAddScene: props.defaultValue && props.defaultValue.enableAddScene === false ? false : true,
120
- changeLoading: changeLoading,
121
153
  afterEditTarget: props.afterEditTarget,
122
- onUserDrill: props.onUserDrill
154
+ onUserDrill: props.onUserDrill,
155
+ onLossWarning: props.onLossWarning,
156
+ enableGenerateReport: props.enableGenerateReport
123
157
  }
124
158
  }, /*#__PURE__*/React.createElement(EventContent, {
125
- defaultValue: props.defaultValue ? props.defaultValue.data : undefined,
159
+ elementId: elementId,
126
160
  value: searchData,
127
161
  show: showList,
128
- onChange: setSearchData,
129
162
  initSearch: initSearch
130
163
  })));
131
164
  };
@@ -1,7 +1,7 @@
1
- .event-container {
1
+ .event-module-container {
2
2
  width: 100%;
3
3
  min-width: 1000px;
4
- height: 100%;
4
+ height: auto;
5
5
  background: #fafafb;
6
6
  &-header-title {
7
7
  height: 48px;
@@ -41,4 +41,9 @@
41
41
  .biz-layout-panel-content {
42
42
  height: auto;
43
43
  }
44
+
45
+ .biz-layout-collapse-container {
46
+ align-items: center;
47
+ height: 24px;
48
+ }
44
49
  }
@@ -2,9 +2,14 @@ import { SearchValue, UserDrillParamsProp } from '../../types';
2
2
  export declare namespace EventProps {
3
3
  interface Props {
4
4
  defaultValue?: Value;
5
+ panelDisabled?: boolean;
5
6
  includeToday?: boolean;
6
7
  afterEditTarget?: (type: string, value?: any) => void;
7
8
  onUserDrill: (data: UserDrillParamsProp, searchData: SearchValue) => void;
9
+ onLossWarning?: (id: number) => void;
10
+ showWarning?: boolean;
11
+ enableGenerateReport?: boolean;
12
+ onChange: (data: Value | undefined) => void;
8
13
  }
9
14
  interface Value {
10
15
  panelId?: number;
@@ -4,35 +4,48 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
4
4
  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
5
  function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
6
6
  function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
7
- import React from 'react';
7
+ import React, { useState } from 'react';
8
8
  import { Form, Button } from 'antd';
9
9
  import { BizUserGroupHeader } from '@zgfe/business-lib';
10
10
  import EventFilter from '../../components/eventFilter';
11
11
  import './styles/index.less';
12
12
  var classPrefix = 'top-panel';
13
13
  var TopPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
14
- var defaultValue = props.defaultValue,
14
+ var value = props.value,
15
15
  ajaxFlag = props.ajaxFlag,
16
16
  finalSearchData = props.finalSearchData,
17
- fetchRequest = props.fetchRequest;
17
+ fetchRequest = props.fetchRequest,
18
+ setIsCity = props.setIsCity,
19
+ setEnableSelectChart = props.setEnableSelectChart;
20
+ var _useState = useState(false),
21
+ _useState2 = _slicedToArray(_useState, 2),
22
+ searchDisabled = _useState2[0],
23
+ setSearchDisabled = _useState2[1];
24
+ var _useState3 = useState(false),
25
+ _useState4 = _slicedToArray(_useState3, 2),
26
+ marginStyle = _useState4[0],
27
+ setmarginStyle = _useState4[1];
28
+ var countChange = function countChange(count) {
29
+ setmarginStyle(count > 0 ? true : false);
30
+ };
18
31
  var _Form$useForm = Form.useForm(),
19
32
  _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
20
33
  form = _Form$useForm2[0];
21
- var userGroup = defaultValue.userGroup;
34
+ var userGroup = value.userGroup;
22
35
  var onValuesChange = function onValuesChange(data, allData) {
23
36
  var _data = {};
24
- console.log('用户组和事件变更', allData);
25
37
  if (allData.filterConditions) {
26
38
  if (allData.filterConditions.id !== -100) {
27
39
  _data = allData.filterConditions;
28
40
  }
29
41
  }
30
42
  if (allData.userGroup) {
31
- _data.userGroup = [];
32
- allData.userGroup.map(function (item) {
33
- _data.userGroup && _data.userGroup.push(item.id);
43
+ _data.userGroup = allData.userGroup.filter(function (item) {
44
+ return item !== undefined;
34
45
  });
35
- if (_data.userGroup.length <= 0) _data.userGroup = [0];
46
+ if (_data.userGroup.length <= 0 || _data.userGroup.length === 1 && _data.userGroup[0].length <= 0) {
47
+ _data.userGroup = [0];
48
+ }
36
49
  }
37
50
  if (data.filterConditions) {
38
51
  if (finalSearchData && finalSearchData.id && data.filterConditions.id === finalSearchData.id) {
@@ -41,15 +54,12 @@ var TopPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
41
54
  ajaxFlag = true;
42
55
  }
43
56
  }
44
- console.log('用户组和事件变更-2', _data);
45
57
  props.onChange(_data, ajaxFlag);
46
58
  };
47
59
  var resetting = function resetting() {
48
60
  form.resetFields();
49
61
  form.setFieldsValue({
50
- userGroup: [{
51
- id: 0
52
- }],
62
+ userGroup: [0],
53
63
  filterConditions: null
54
64
  });
55
65
  props.onChange({
@@ -66,18 +76,12 @@ var TopPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
66
76
  colon: false,
67
77
  layout: "vertical",
68
78
  initialValues: {
69
- userGroup: userGroup ? userGroup.map(function (item) {
70
- return {
71
- id: item
72
- };
73
- }) : [{
74
- id: 0
75
- }],
79
+ userGroup: userGroup ? userGroup : [0],
76
80
  filterConditions: {
77
- id: defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.id,
78
- name: defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.name,
79
- dimension: defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.dimension,
80
- filters: defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.filters
81
+ id: value === null || value === void 0 ? void 0 : value.id,
82
+ name: value === null || value === void 0 ? void 0 : value.name,
83
+ dimension: value === null || value === void 0 ? void 0 : value.dimension,
84
+ filters: value === null || value === void 0 ? void 0 : value.filters
81
85
  }
82
86
  },
83
87
  scrollToFirstError: true,
@@ -86,21 +90,25 @@ var TopPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
86
90
  label: "",
87
91
  name: "userGroup"
88
92
  }, /*#__PURE__*/React.createElement(BizUserGroupHeader, {
89
- max: 3
93
+ max: 3,
94
+ enableTags: true
90
95
  })), /*#__PURE__*/React.createElement("div", {
91
96
  ref: ref
92
97
  }, /*#__PURE__*/React.createElement(Form.Item, {
93
98
  label: "\u4E8B\u4EF6",
94
99
  name: "filterConditions",
95
- style: {
96
- paddingLeft: '24px'
97
- }
98
- }, /*#__PURE__*/React.createElement(EventFilter, null)), /*#__PURE__*/React.createElement("div", {
99
- className: "".concat(classPrefix, "-form-botton-box")
100
+ className: "".concat(classPrefix, "-form-event")
101
+ }, /*#__PURE__*/React.createElement(EventFilter, {
102
+ setSearchDisabled: setSearchDisabled,
103
+ countChange: countChange,
104
+ setIsCity: setIsCity,
105
+ setEnableSelectChart: setEnableSelectChart
106
+ })), /*#__PURE__*/React.createElement("div", {
107
+ className: "".concat(classPrefix, "-form-botton-box ").concat(marginStyle ? 'margin-style' : '')
100
108
  }, /*#__PURE__*/React.createElement(Button, {
101
109
  onClick: resetting
102
110
  }, "\u91CD\u7F6E"), /*#__PURE__*/React.createElement(Button, {
103
- disabled: ajaxFlag,
111
+ disabled: ajaxFlag || searchDisabled,
104
112
  type: "primary",
105
113
  onClick: function onClick() {
106
114
  fetchRequest(true);
@@ -1,8 +1,15 @@
1
1
  .top-panel {
2
+ &-form-event {
3
+ margin-bottom: 0;
4
+ .ant-form-item-label {
5
+ padding-left: 24px;
6
+ font-weight: 500;
7
+ }
8
+ }
2
9
  &-form-botton-box {
3
10
  display: flex;
4
11
  justify-content: flex-end;
5
- margin-top: 24px;
12
+ margin-top: 12px;
6
13
  margin-right: 24px;
7
14
  > :nth-child(1) {
8
15
  margin-right: 16px;
@@ -11,4 +18,7 @@
11
18
  border-color: #29bd52;
12
19
  }
13
20
  }
21
+ &-form-botton-box.margin-style {
22
+ margin-top: 20px;
23
+ }
14
24
  }
@@ -1,5 +1,5 @@
1
1
  import { AttrConditionTypes } from '@zgfe/business-lib';
2
- import { bizAttributeSelectorValueProp, SearchValue } from '../../types';
2
+ import { bizAttributeSelectorValueProp, SearchValue, EventChartTypes } from '../../types';
3
3
  interface filterConditions {
4
4
  id?: number;
5
5
  name?: string;
@@ -9,17 +9,20 @@ interface filterConditions {
9
9
  export interface FormDataProps {
10
10
  userGroup?: {
11
11
  id: number;
12
- }[];
12
+ }[] | any[];
13
13
  filterConditions?: filterConditions;
14
14
  }
15
15
  export interface FormHandelDataProps extends filterConditions {
16
- userGroup?: number[];
16
+ userGroup?: any[];
17
+ chartType?: EventChartTypes | undefined;
17
18
  }
18
19
  export interface TopPanelProps {
19
- defaultValue?: SearchValue;
20
+ value?: SearchValue;
20
21
  onChange: (data: SearchValue, flag: boolean) => void;
21
22
  ajaxFlag: boolean;
22
23
  finalSearchData?: SearchValue;
23
24
  fetchRequest: (flag?: boolean) => void;
25
+ setIsCity?: Function;
26
+ setEnableSelectChart?: Function;
24
27
  }
25
28
  export {};
@@ -39,10 +39,7 @@
39
39
  &-link {
40
40
  display: flex;
41
41
  justify-content: flex-end;
42
- cursor: pointer;
43
42
  &:hover {
44
- color: @primary-color;
45
- // text-decoration: underline;
46
43
  .a-yanjingkai {
47
44
  display: block;
48
45
  }
@@ -52,6 +49,12 @@
52
49
  margin-right: 10px;
53
50
  }
54
51
  }
52
+ &-link:not(.not-to-detail) {
53
+ cursor: pointer;
54
+ &:hover {
55
+ color: @primary-color;
56
+ }
57
+ }
55
58
  }
56
59
  &-table-event-data {
57
60
  text-align: right !important;
package/es/types.d.ts CHANGED
@@ -5,6 +5,7 @@ export interface bizAttributeSelectorValueProp {
5
5
  propCategory?: string;
6
6
  category?: string;
7
7
  value?: number | string;
8
+ id?: number;
8
9
  key?: number | string;
9
10
  }
10
11
  export interface eventProps {
@@ -52,6 +53,7 @@ export interface ResponseDataProps {
52
53
  export interface SeriesProps {
53
54
  names?: string[];
54
55
  values: number[];
56
+ originalNames?: string[];
55
57
  index?: string;
56
58
  duration?: TableChildrenProps[];
57
59
  diyTarget?: boolean;
@@ -1,11 +1,18 @@
1
1
  import { AttrConditionTypes } from '@zgfe/business-lib';
2
2
  import type { ColumnsType } from 'antd/es/table';
3
+ import { eventChartProps } from '../modules/chart/types';
3
4
  import { EventGroup, UserProp, EnvProp } from '@zgfe/business-lib/es/attributeSelector/types';
4
5
  import { ResponseDataProps, SearchValue } from '../types';
5
6
  import { EventProps } from '../modules/home/types';
6
7
  import '../style/index.less';
7
- export declare function getColumns(eventGroupList: EventGroup[] | undefined, userPropList: UserProp[] | undefined, eventEnvList: EnvProp[] | undefined, columnData: string[], userGroup: number[], searchData: SearchValue, showList: string[], onShowCallback: Function, onClickToDetailCallback: Function): ColumnsType<EventProps.ColumnsDataType>;
8
+ export declare function getColumns(eventGroupList: EventGroup[] | undefined, userPropList: UserProp[] | undefined, eventEnvList: EnvProp[] | undefined, columnData: string[], userGroup: number[] | string[], searchData: SearchValue, showList: string[], onShowCallback: Function, onClickToDetailCallback: Function, onSelectEvent?: (id: number, name: string) => void): ColumnsType<EventProps.ColumnsDataType>;
9
+ export declare function getChartDataEventAliasName(dataSource: eventChartProps.ChartTypesProps, eventGroupList: EventGroup[] | undefined): eventChartProps.ChartTypesProps;
10
+ export declare function getEventAliasName(name: string, eventGroupList: EventGroup[] | undefined): string;
11
+ export declare function getEventAliasId(name: string, eventGroupList: EventGroup[] | undefined): number;
12
+ export declare function getSortData(data: ResponseDataProps): ResponseDataProps;
13
+ export declare function getUserGroupsCompareData(data: ResponseDataProps): ResponseDataProps;
8
14
  export declare function marketEventGroupList(eventGroupList: EventGroup[] | undefined): string[];
15
+ export declare function getWarningId(searchData: SearchValue, eventData: ResponseDataProps, eventGroupList: EventGroup[] | undefined): number;
9
16
  export declare function getAttrLabel(attrData: AttrConditionTypes.ItemValue, eventGroupList: EventGroup[] | undefined, userPropList: UserProp[] | undefined, eventEnvList: EnvProp[] | undefined): string | undefined;
10
17
  export declare function formTableData(originalData: ResponseDataProps, userGroups: number[], attrNum: number, showList?: string[]): EventProps.ColumnsDataType[];
11
18
  export declare function getDefaultShow(source: ResponseDataProps): string[];