@zgfe/modules-dm 1.0.34-heyh.20 → 1.0.34-heyh.22
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.
- package/es/components/demo.js +1 -1
- package/es/constants/api.js +1 -1
- package/es/modules/dataCollection/collectionEventList.js +1 -1
- package/es/modules/dataCollection/components/createVirtualDrawer.js +4 -2
- package/es/modules/dataCollection/components/eventGroupingDrawer.js +68 -45
- package/es/modules/dataCollection/components/selectAttributes.js +20 -11
- package/es/modules/dataCollection/components/sortableComponnet.js +18 -13
- package/es/modules/dataCollection/components/tablePlus.js +3 -1
- package/es/modules/dataCollection/components/virtualTablePlus.js +1 -1
- package/es/modules/dataCollection/styles/index.less +40 -18
- package/es/modules/dataCollection/virtualEventList.js +1 -1
- package/es/utils/index.d.ts +8 -4
- package/es/utils/index.js +54 -20
- package/package.json +2 -2
package/es/components/demo.js
CHANGED
package/es/constants/api.js
CHANGED
|
@@ -67,7 +67,7 @@ var apis = {
|
|
|
67
67
|
orderEvent: '/zg/web/v2/event/orderEvent',
|
|
68
68
|
// 新增批量隐藏事件.
|
|
69
69
|
hiddenEvent: '/zg/web/v2/event/hiddenEvent',
|
|
70
|
-
//
|
|
70
|
+
// 元事件是否在虚拟事件中使用
|
|
71
71
|
checkEventStatus: '/zg/web/v2/event/checkEventStatus',
|
|
72
72
|
// 收藏虚拟事件.
|
|
73
73
|
updateVirtualEventStatus: '/zg/web/v2/event/virtual/updateVirtualEventStatus'
|
|
@@ -365,7 +365,7 @@ var CollectionEventList = function CollectionEventList(props) {
|
|
|
365
365
|
}), /*#__PURE__*/React.createElement(Input, {
|
|
366
366
|
className: "top-input",
|
|
367
367
|
onChange: eventNameChange,
|
|
368
|
-
placeholder: "\
|
|
368
|
+
placeholder: "\u8BF7\u8F93\u5165\u4E8B\u4EF6\u540D\u79F0\u6216\u522B\u540D",
|
|
369
369
|
prefix: /*#__PURE__*/React.createElement(IconFont, {
|
|
370
370
|
type: "sousuo"
|
|
371
371
|
})
|
|
@@ -38,6 +38,7 @@ var CreateVirtualDrawer = function CreateVirtualDrawer(props) {
|
|
|
38
38
|
_useState4 = _slicedToArray(_useState3, 2),
|
|
39
39
|
formSubmitData = _useState4[0],
|
|
40
40
|
setFormSubmitData = _useState4[1];
|
|
41
|
+
var attrMaxLength = 100;
|
|
41
42
|
var _useContext = useContext(BizGlobalDataContext),
|
|
42
43
|
currentApp = _useContext.currentApp,
|
|
43
44
|
eventGroupList = _useContext.eventGroupList;
|
|
@@ -69,7 +70,7 @@ var CreateVirtualDrawer = function CreateVirtualDrawer(props) {
|
|
|
69
70
|
// 保存
|
|
70
71
|
var onFinish = function onFinish(data) {
|
|
71
72
|
var _data = getDelectAttributesData(_.cloneDeep(data.eventJson), eventGroupList);
|
|
72
|
-
if (_data[0] && _data[0].attrList && _data[0].attrList.length >
|
|
73
|
+
if (_data[0] && _data[0].attrList && _data[0].attrList.length > attrMaxLength) {
|
|
73
74
|
setSubmitData(data);
|
|
74
75
|
setSelectAttributesData(_data);
|
|
75
76
|
setSelectAttributesShow(true);
|
|
@@ -263,7 +264,8 @@ var CreateVirtualDrawer = function CreateVirtualDrawer(props) {
|
|
|
263
264
|
selectAttributesShow: selectAttributesShow,
|
|
264
265
|
setSelectAttributesShow: setSelectAttributesShow,
|
|
265
266
|
selectAttributesData: selectAttributesData,
|
|
266
|
-
selectAttributesHandle: selectAttributesHandle
|
|
267
|
+
selectAttributesHandle: selectAttributesHandle,
|
|
268
|
+
attrMaxLength: attrMaxLength
|
|
267
269
|
})));
|
|
268
270
|
};
|
|
269
271
|
export default CreateVirtualDrawer;
|
|
@@ -15,7 +15,7 @@ import { Input, Modal, message, Drawer, Popover, Checkbox, Select, Button } from
|
|
|
15
15
|
import { DragDropContext, Droppable, Draggable } from 'react-beautiful-dnd';
|
|
16
16
|
import request from '../../../utils/ajax';
|
|
17
17
|
import apis from '../../../constants/api';
|
|
18
|
-
import { eventListHandle, groupListSort, eventCheckedAll, openChangeData, eventShowOrHiddenData, eventMoveData, getAppID } from '../../../utils/index';
|
|
18
|
+
import { eventListHandle, groupListSort, eventCheckedAll, openChangeData, eventShowOrHiddenData, eventMoveData, getAppID, eventShow } from '../../../utils/index';
|
|
19
19
|
import React, { Fragment, useContext, useEffect, useState } from 'react';
|
|
20
20
|
import _ from 'lodash';
|
|
21
21
|
import SortableComponnet from './sortableComponnet';
|
|
@@ -30,14 +30,19 @@ var EventGroupingDrawer = function EventGroupingDrawer(props) {
|
|
|
30
30
|
_useState2 = _slicedToArray(_useState, 2),
|
|
31
31
|
groupingData = _useState2[0],
|
|
32
32
|
setGroupingData = _useState2[1];
|
|
33
|
+
// const [initialData, setInitialData] = useState([]);
|
|
33
34
|
var _useState3 = useState(false),
|
|
34
35
|
_useState4 = _slicedToArray(_useState3, 2),
|
|
35
36
|
isDragDisabled = _useState4[0],
|
|
36
37
|
setIsDragDisabled = _useState4[1];
|
|
37
|
-
var _useState5 = useState(
|
|
38
|
+
var _useState5 = useState(''),
|
|
38
39
|
_useState6 = _slicedToArray(_useState5, 2),
|
|
39
|
-
|
|
40
|
-
|
|
40
|
+
searchData = _useState6[0],
|
|
41
|
+
setSearchData = _useState6[1];
|
|
42
|
+
var _useState7 = useState(false),
|
|
43
|
+
_useState8 = _slicedToArray(_useState7, 2),
|
|
44
|
+
loading = _useState8[0],
|
|
45
|
+
setLoading = _useState8[1];
|
|
41
46
|
var queryList = function queryList() {
|
|
42
47
|
setLoading(true);
|
|
43
48
|
request(apis.queryCollectionEventList, {
|
|
@@ -49,8 +54,10 @@ var EventGroupingDrawer = function EventGroupingDrawer(props) {
|
|
|
49
54
|
}
|
|
50
55
|
}).then(function (res) {
|
|
51
56
|
if (res && res.data) {
|
|
52
|
-
eventListHandle(res.data);
|
|
53
|
-
|
|
57
|
+
var _data = eventListHandle(res.data);
|
|
58
|
+
// setInitialData(_data);
|
|
59
|
+
// setGroupingData(eventShow(_.cloneDeep(_data), searchData));
|
|
60
|
+
setGroupingData(_data);
|
|
54
61
|
}
|
|
55
62
|
setLoading(false);
|
|
56
63
|
});
|
|
@@ -58,9 +65,17 @@ var EventGroupingDrawer = function EventGroupingDrawer(props) {
|
|
|
58
65
|
useEffect(function () {
|
|
59
66
|
if (eventGroupingShow) queryList();
|
|
60
67
|
}, [eventGroupingShow]);
|
|
68
|
+
// 搜索
|
|
69
|
+
var onSearchChange = function onSearchChange(e) {
|
|
70
|
+
var _value = e.currentTarget.value;
|
|
71
|
+
setSearchData(_value);
|
|
72
|
+
setGroupingData(eventShow(_.cloneDeep(groupingData), _value));
|
|
73
|
+
};
|
|
74
|
+
// 全选&取消全选
|
|
61
75
|
var onChangeAll = function onChangeAll(groupId) {
|
|
62
76
|
setGroupingData(_.cloneDeep(eventCheckedAll(groupId, groupingData)));
|
|
63
77
|
};
|
|
78
|
+
// 展开&收起
|
|
64
79
|
var openChange = function openChange(groupId) {
|
|
65
80
|
setGroupingData(_.cloneDeep(openChangeData(groupId, groupingData)));
|
|
66
81
|
};
|
|
@@ -77,6 +92,7 @@ var EventGroupingDrawer = function EventGroupingDrawer(props) {
|
|
|
77
92
|
ids: ids
|
|
78
93
|
}
|
|
79
94
|
}).then(function () {
|
|
95
|
+
// queryList();
|
|
80
96
|
refresh();
|
|
81
97
|
});
|
|
82
98
|
}
|
|
@@ -129,26 +145,26 @@ var EventGroupingDrawer = function EventGroupingDrawer(props) {
|
|
|
129
145
|
}
|
|
130
146
|
};
|
|
131
147
|
// 移动
|
|
132
|
-
var
|
|
133
|
-
_useState8 = _slicedToArray(_useState7, 2),
|
|
134
|
-
eventMoveShow = _useState8[0],
|
|
135
|
-
setEventMoveShow = _useState8[1];
|
|
136
|
-
var _useState9 = useState(-1),
|
|
148
|
+
var _useState9 = useState(undefined),
|
|
137
149
|
_useState10 = _slicedToArray(_useState9, 2),
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
var _useState11 = useState(
|
|
150
|
+
eventMoveShow = _useState10[0],
|
|
151
|
+
setEventMoveShow = _useState10[1];
|
|
152
|
+
var _useState11 = useState(-1),
|
|
141
153
|
_useState12 = _slicedToArray(_useState11, 2),
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
var _useState13 = useState(
|
|
154
|
+
eventMoveChangeId = _useState12[0],
|
|
155
|
+
setEventMoveChangeId = _useState12[1];
|
|
156
|
+
var _useState13 = useState([]),
|
|
145
157
|
_useState14 = _slicedToArray(_useState13, 2),
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
var _useState15 = useState(
|
|
158
|
+
eventMoveOption = _useState14[0],
|
|
159
|
+
setEventMoveOption = _useState14[1];
|
|
160
|
+
var _useState15 = useState(0),
|
|
149
161
|
_useState16 = _slicedToArray(_useState15, 2),
|
|
150
|
-
|
|
151
|
-
|
|
162
|
+
eventMoveLength = _useState16[0],
|
|
163
|
+
setEventMoveLength = _useState16[1];
|
|
164
|
+
var _useState17 = useState(''),
|
|
165
|
+
_useState18 = _slicedToArray(_useState17, 2),
|
|
166
|
+
eventMoveIds = _useState18[0],
|
|
167
|
+
setEventMoveIds = _useState18[1];
|
|
152
168
|
var eventMove = function eventMove(groupId) {
|
|
153
169
|
var data = eventMoveData(groupId, groupingData, setGroupingData);
|
|
154
170
|
setEventMoveOption(data.groupingOption);
|
|
@@ -206,18 +222,18 @@ var EventGroupingDrawer = function EventGroupingDrawer(props) {
|
|
|
206
222
|
}, "\u786E\u5B9A")));
|
|
207
223
|
};
|
|
208
224
|
// 创建分组 & 修改分组名
|
|
209
|
-
var
|
|
210
|
-
_useState18 = _slicedToArray(_useState17, 2),
|
|
211
|
-
createOrEditGrpup = _useState18[0],
|
|
212
|
-
setCreateOrEditGrpup = _useState18[1];
|
|
213
|
-
var _useState19 = useState(-1),
|
|
225
|
+
var _useState19 = useState(null),
|
|
214
226
|
_useState20 = _slicedToArray(_useState19, 2),
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
var _useState21 = useState(
|
|
227
|
+
createOrEditGrpup = _useState20[0],
|
|
228
|
+
setCreateOrEditGrpup = _useState20[1];
|
|
229
|
+
var _useState21 = useState(-1),
|
|
218
230
|
_useState22 = _slicedToArray(_useState21, 2),
|
|
219
|
-
|
|
220
|
-
|
|
231
|
+
grpupModalSelectGrpupId = _useState22[0],
|
|
232
|
+
setGrpupModalSelectGrpupId = _useState22[1];
|
|
233
|
+
var _useState23 = useState(''),
|
|
234
|
+
_useState24 = _slicedToArray(_useState23, 2),
|
|
235
|
+
grpupNameInput = _useState24[0],
|
|
236
|
+
setGrpupNameInput = _useState24[1];
|
|
221
237
|
var GrpupModalHandle = function GrpupModalHandle() {
|
|
222
238
|
if (grpupNameInput === '') {
|
|
223
239
|
message.error('请填写分组名');
|
|
@@ -263,22 +279,28 @@ var EventGroupingDrawer = function EventGroupingDrawer(props) {
|
|
|
263
279
|
},
|
|
264
280
|
destroyOnClose: true,
|
|
265
281
|
open: eventGroupingShow,
|
|
266
|
-
extra: /*#__PURE__*/React.createElement(
|
|
267
|
-
type: "primary",
|
|
268
|
-
size: "small",
|
|
269
|
-
onClick: function onClick() {
|
|
270
|
-
setCreateOrEditGrpup('create');
|
|
271
|
-
}
|
|
272
|
-
}, "\u521B\u5EFA\u5206\u7EC4"), /*#__PURE__*/React.createElement(IconFont, {
|
|
282
|
+
extra: /*#__PURE__*/React.createElement(IconFont, {
|
|
273
283
|
type: "qingchu",
|
|
274
284
|
onClick: function onClick() {
|
|
275
285
|
setEventGroupingShow(false);
|
|
276
286
|
setEventMoveShow(undefined);
|
|
277
287
|
}
|
|
278
|
-
})
|
|
288
|
+
})
|
|
279
289
|
}, /*#__PURE__*/React.createElement(BizLoading, {
|
|
280
|
-
spinning: loading
|
|
281
|
-
|
|
290
|
+
spinning: loading,
|
|
291
|
+
loadingText: ""
|
|
292
|
+
}, /*#__PURE__*/React.createElement("div", {
|
|
293
|
+
className: "".concat(classPrefix, "-top-box")
|
|
294
|
+
}, /*#__PURE__*/React.createElement(Input, {
|
|
295
|
+
placeholder: "\u8BF7\u8F93\u5165\u4E8B\u4EF6\u540D\u79F0\u6216\u522B\u540D",
|
|
296
|
+
onChange: onSearchChange
|
|
297
|
+
}), /*#__PURE__*/React.createElement(Button, {
|
|
298
|
+
type: "primary",
|
|
299
|
+
size: "small",
|
|
300
|
+
onClick: function onClick() {
|
|
301
|
+
setCreateOrEditGrpup('create');
|
|
302
|
+
}
|
|
303
|
+
}, "\u521B\u5EFA\u5206\u7EC4")), /*#__PURE__*/React.createElement(DragDropContext, {
|
|
282
304
|
onDragEnd: onDragEnd
|
|
283
305
|
}, groupingData.map(function (item, index) {
|
|
284
306
|
return /*#__PURE__*/React.createElement(Droppable, {
|
|
@@ -324,9 +346,9 @@ var EventGroupingDrawer = function EventGroupingDrawer(props) {
|
|
|
324
346
|
setGrpupNameInput(item.groupName ? item.groupName : '未分组');
|
|
325
347
|
setGrpupModalSelectGrpupId(item.groupId);
|
|
326
348
|
}
|
|
327
|
-
})), /*#__PURE__*/React.createElement("div", null, item.
|
|
349
|
+
})), /*#__PURE__*/React.createElement("div", null, item.count, "\u4E2A\u6307\u6807")), /*#__PURE__*/React.createElement("div", {
|
|
328
350
|
className: "operate-right"
|
|
329
|
-
}, item.
|
|
351
|
+
}, item.count > 0 && /*#__PURE__*/React.createElement(Fragment, null, /*#__PURE__*/React.createElement(Checkbox, {
|
|
330
352
|
checked: item.checked,
|
|
331
353
|
onChange: function onChange() {
|
|
332
354
|
return onChangeAll(item.groupId);
|
|
@@ -366,7 +388,8 @@ var EventGroupingDrawer = function EventGroupingDrawer(props) {
|
|
|
366
388
|
groupId: item.groupId,
|
|
367
389
|
groupingData: groupingData,
|
|
368
390
|
setGroupingData: setGroupingData,
|
|
369
|
-
refresh: refresh
|
|
391
|
+
refresh: refresh,
|
|
392
|
+
searchData: searchData
|
|
370
393
|
}))));
|
|
371
394
|
}));
|
|
372
395
|
});
|
|
@@ -17,7 +17,8 @@ var SelectAttributes = function SelectAttributes(props) {
|
|
|
17
17
|
var selectAttributesShow = props.selectAttributesShow,
|
|
18
18
|
setSelectAttributesShow = props.setSelectAttributesShow,
|
|
19
19
|
selectAttributesData = props.selectAttributesData,
|
|
20
|
-
selectAttributesHandle = props.selectAttributesHandle
|
|
20
|
+
selectAttributesHandle = props.selectAttributesHandle,
|
|
21
|
+
attrMaxLength = props.attrMaxLength;
|
|
21
22
|
// 下拉菜单是否显示
|
|
22
23
|
var _useState = useState(false),
|
|
23
24
|
_useState2 = _slicedToArray(_useState, 2),
|
|
@@ -65,7 +66,7 @@ var SelectAttributes = function SelectAttributes(props) {
|
|
|
65
66
|
ofEventId: item.ofEventId
|
|
66
67
|
});
|
|
67
68
|
_attrShowList.push(item.label);
|
|
68
|
-
if (_selectValue.length <
|
|
69
|
+
if (_selectValue.length < attrMaxLength) {
|
|
69
70
|
_selectValue.push(item.label);
|
|
70
71
|
}
|
|
71
72
|
});
|
|
@@ -81,7 +82,7 @@ var SelectAttributes = function SelectAttributes(props) {
|
|
|
81
82
|
};
|
|
82
83
|
// 保存
|
|
83
84
|
var handleOk = function handleOk() {
|
|
84
|
-
if (selectValue.length >
|
|
85
|
+
if (selectValue.length > attrMaxLength) {
|
|
85
86
|
message.error('最多可选择100个属性');
|
|
86
87
|
} else {
|
|
87
88
|
selectAttributesHandle(selectValue);
|
|
@@ -107,6 +108,10 @@ var SelectAttributes = function SelectAttributes(props) {
|
|
|
107
108
|
return _label !== label;
|
|
108
109
|
}));
|
|
109
110
|
} else {
|
|
111
|
+
if (selectValue.length >= 100) {
|
|
112
|
+
message.error('限制最大勾选数量为100');
|
|
113
|
+
return;
|
|
114
|
+
}
|
|
110
115
|
setSelectValue([].concat(_toConsumableArray(selectValue), [label]));
|
|
111
116
|
}
|
|
112
117
|
};
|
|
@@ -136,7 +141,7 @@ var SelectAttributes = function SelectAttributes(props) {
|
|
|
136
141
|
onChange: function onChange() {
|
|
137
142
|
return onSelectAttributesChange(_item.label);
|
|
138
143
|
}
|
|
139
|
-
}, _item.label)) : null;
|
|
144
|
+
}, _item.alias ? "".concat(_item.alias, "(").concat(_item.label, ")") : _item.label)) : null;
|
|
140
145
|
});
|
|
141
146
|
}
|
|
142
147
|
});
|
|
@@ -166,7 +171,7 @@ var SelectAttributes = function SelectAttributes(props) {
|
|
|
166
171
|
onClick: function onClick() {
|
|
167
172
|
return onSelectEventIdChange(item.id);
|
|
168
173
|
}
|
|
169
|
-
}, /*#__PURE__*/React.createElement("span", null, item.name), /*#__PURE__*/React.createElement("span", null, item.attrList.length));
|
|
174
|
+
}, /*#__PURE__*/React.createElement("span", null, item.alias ? item.alias : item.name), /*#__PURE__*/React.createElement("span", null, item.attrList.length));
|
|
170
175
|
})), /*#__PURE__*/React.createElement("div", {
|
|
171
176
|
className: "".concat(classPrefix, "-box-right")
|
|
172
177
|
}, /*#__PURE__*/React.createElement(BizSearchInput, {
|
|
@@ -184,27 +189,31 @@ var SelectAttributes = function SelectAttributes(props) {
|
|
|
184
189
|
},
|
|
185
190
|
open: visible,
|
|
186
191
|
onOpenChange: onVisibleChange,
|
|
187
|
-
getPopupContainer:
|
|
192
|
+
getPopupContainer: function getPopupContainer() {
|
|
188
193
|
return document.getElementById("".concat(classPrefix, "-select"));
|
|
189
|
-
}
|
|
194
|
+
},
|
|
190
195
|
destroyPopupOnHide: props.defaultSelectAble
|
|
191
196
|
}, /*#__PURE__*/React.createElement("div", {
|
|
192
|
-
className: "".concat(classPrefix, "-select"),
|
|
193
197
|
id: "".concat(classPrefix, "-select")
|
|
194
|
-
}, /*#__PURE__*/React.createElement(
|
|
198
|
+
}, /*#__PURE__*/React.createElement("div", null, "\u5C5E\u6027\u6700\u591A\u5C55\u793A100\u4E2A\uFF0C\u8BF7\u9009\u62E9\u6240\u9700\u5C5E\u6027"), /*#__PURE__*/React.createElement("div", {
|
|
199
|
+
className: "".concat(classPrefix, "-select")
|
|
200
|
+
}, /*#__PURE__*/React.createElement("div", null, "\u5C5E\u6027"), /*#__PURE__*/React.createElement(Select, {
|
|
195
201
|
mode: "tags",
|
|
196
202
|
maxTagCount: 3,
|
|
197
203
|
maxTagTextLength: 5,
|
|
198
204
|
style: {
|
|
199
205
|
width: '100%'
|
|
200
206
|
},
|
|
201
|
-
placeholder: "
|
|
207
|
+
placeholder: "\u8BF7\u9009\u62E9\u5C5E\u6027",
|
|
202
208
|
getPopupContainer: function getPopupContainer() {
|
|
203
209
|
return document.getElementById("".concat(classPrefix, "-select"));
|
|
204
210
|
},
|
|
205
211
|
value: selectValue,
|
|
212
|
+
onFocus: function onFocus() {
|
|
213
|
+
return setVisible(true);
|
|
214
|
+
},
|
|
206
215
|
onChange: handleSelectChange,
|
|
207
216
|
options: options
|
|
208
|
-
}))));
|
|
217
|
+
})))));
|
|
209
218
|
};
|
|
210
219
|
export default SelectAttributes;
|
|
@@ -16,7 +16,8 @@ var SortableComponnet = function SortableComponnet(props) {
|
|
|
16
16
|
groupId = props.groupId,
|
|
17
17
|
groupingData = props.groupingData,
|
|
18
18
|
setGroupingData = props.setGroupingData,
|
|
19
|
-
refresh = props.refresh
|
|
19
|
+
refresh = props.refresh,
|
|
20
|
+
searchData = props.searchData;
|
|
20
21
|
// 需要拖动的元素的容器
|
|
21
22
|
var SortableItem = SortableElement(function (data) {
|
|
22
23
|
var _data$value = data.value,
|
|
@@ -39,7 +40,7 @@ var SortableComponnet = function SortableComponnet(props) {
|
|
|
39
40
|
var SortableItemNotDrag = function SortableItemNotDrag(data) {
|
|
40
41
|
var item = data.item,
|
|
41
42
|
index = data.index;
|
|
42
|
-
var name = item.alias_name ? item.alias_name : item.event_name;
|
|
43
|
+
var name = item.alias_name ? "".concat(item.alias_name, "(").concat(item.event_name, ")") : item.event_name;
|
|
43
44
|
return /*#__PURE__*/React.createElement(Tooltip, {
|
|
44
45
|
title: "".concat(item.owner === 'zg_vtl' ? '虚拟事件' : '元事件', " | ").concat(name),
|
|
45
46
|
key: index
|
|
@@ -61,20 +62,24 @@ var SortableComponnet = function SortableComponnet(props) {
|
|
|
61
62
|
return /*#__PURE__*/React.createElement("div", {
|
|
62
63
|
key: componnetIndex
|
|
63
64
|
}, componnetData.map(function (item, index) {
|
|
64
|
-
if (
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
65
|
+
if (item.searchShow === 1) {
|
|
66
|
+
if (groupId !== -1 && searchData === "") {
|
|
67
|
+
return /*#__PURE__*/React.createElement(SortableItem, {
|
|
68
|
+
key: "item-".concat(index),
|
|
69
|
+
index: index,
|
|
70
|
+
value: {
|
|
71
|
+
item: item,
|
|
72
|
+
index: index
|
|
73
|
+
}
|
|
74
|
+
});
|
|
75
|
+
} else {
|
|
76
|
+
return SortableItemNotDrag({
|
|
69
77
|
item: item,
|
|
70
78
|
index: index
|
|
71
|
-
}
|
|
72
|
-
}
|
|
79
|
+
});
|
|
80
|
+
}
|
|
73
81
|
} else {
|
|
74
|
-
return
|
|
75
|
-
item: item,
|
|
76
|
-
index: index
|
|
77
|
-
});
|
|
82
|
+
return null;
|
|
78
83
|
}
|
|
79
84
|
}));
|
|
80
85
|
});
|
|
@@ -469,15 +469,18 @@
|
|
|
469
469
|
}
|
|
470
470
|
&-formSubmit {
|
|
471
471
|
position: absolute;
|
|
472
|
-
background: #fff;
|
|
473
|
-
width: 100%;
|
|
474
|
-
border-top: 1px solid #F2F3F4;
|
|
475
472
|
right: 0;
|
|
476
473
|
bottom: 0;
|
|
477
|
-
padding: 24px;
|
|
478
474
|
display: flex;
|
|
479
475
|
gap: 16px;
|
|
480
476
|
justify-content: end;
|
|
477
|
+
width: 100%;
|
|
478
|
+
padding: 24px;
|
|
479
|
+
background: #fff;
|
|
480
|
+
border-top: 1px solid #f2f3f4;
|
|
481
|
+
}
|
|
482
|
+
.ant-drawer-content{
|
|
483
|
+
overflow: unset!important;
|
|
481
484
|
}
|
|
482
485
|
}
|
|
483
486
|
|
|
@@ -558,13 +561,6 @@
|
|
|
558
561
|
}
|
|
559
562
|
}
|
|
560
563
|
}
|
|
561
|
-
// .checkbox-item {
|
|
562
|
-
// display: flex;
|
|
563
|
-
// flex-shrink: 0;
|
|
564
|
-
// align-items: center;
|
|
565
|
-
// height: 40px;
|
|
566
|
-
// margin: 0;
|
|
567
|
-
// }
|
|
568
564
|
.event-hidden {
|
|
569
565
|
color: #ccd0d4;
|
|
570
566
|
}
|
|
@@ -573,6 +569,18 @@
|
|
|
573
569
|
display: none;
|
|
574
570
|
}
|
|
575
571
|
}
|
|
572
|
+
&-top-box {
|
|
573
|
+
display: flex;
|
|
574
|
+
align-items: center;
|
|
575
|
+
justify-content: space-between;
|
|
576
|
+
.ant-input {
|
|
577
|
+
width: 374px;
|
|
578
|
+
border: none;
|
|
579
|
+
}
|
|
580
|
+
}
|
|
581
|
+
.ant-drawer-content{
|
|
582
|
+
overflow:unset!important;
|
|
583
|
+
}
|
|
576
584
|
.ant-drawer-title {
|
|
577
585
|
span {
|
|
578
586
|
margin-left: 8px;
|
|
@@ -584,11 +592,6 @@
|
|
|
584
592
|
display: none;
|
|
585
593
|
}
|
|
586
594
|
.ant-drawer-extra {
|
|
587
|
-
display: flex;
|
|
588
|
-
justify-content: center;
|
|
589
|
-
> :nth-child(1) {
|
|
590
|
-
margin-right: 15px;
|
|
591
|
-
}
|
|
592
595
|
.qingchu {
|
|
593
596
|
font-size: 20px !important;
|
|
594
597
|
cursor: pointer;
|
|
@@ -705,11 +708,25 @@
|
|
|
705
708
|
}
|
|
706
709
|
}
|
|
707
710
|
&-select {
|
|
708
|
-
|
|
709
|
-
|
|
711
|
+
margin-top: 16px;
|
|
712
|
+
display: flex;
|
|
713
|
+
justify-content: flex-start;
|
|
714
|
+
align-items: center;
|
|
715
|
+
gap: 10px;
|
|
716
|
+
>:nth-child(1){
|
|
717
|
+
width: 32px;
|
|
718
|
+
color: #5F6085;
|
|
710
719
|
}
|
|
711
720
|
}
|
|
712
721
|
&-modal-box {
|
|
722
|
+
.ant-modal-header{
|
|
723
|
+
padding-bottom: 0!important;
|
|
724
|
+
}
|
|
725
|
+
.ant-modal-body{
|
|
726
|
+
>:nth-child(1){
|
|
727
|
+
color: #021429;
|
|
728
|
+
}
|
|
729
|
+
}
|
|
713
730
|
.ant-modal-close-x {
|
|
714
731
|
display: none;
|
|
715
732
|
}
|
|
@@ -727,6 +744,11 @@
|
|
|
727
744
|
}
|
|
728
745
|
}
|
|
729
746
|
}
|
|
747
|
+
#select-attributes-select{
|
|
748
|
+
.ant-select-dropdown {
|
|
749
|
+
display: none !important;
|
|
750
|
+
}
|
|
751
|
+
}
|
|
730
752
|
|
|
731
753
|
.sortable-componnet-sortableList {
|
|
732
754
|
z-index: 9999;
|
|
@@ -254,7 +254,7 @@ var VirtualEventList = function VirtualEventList() {
|
|
|
254
254
|
}), /*#__PURE__*/React.createElement(Input, {
|
|
255
255
|
className: "top-input",
|
|
256
256
|
onChange: eventNameChange,
|
|
257
|
-
placeholder: "\
|
|
257
|
+
placeholder: "\u8BF7\u8F93\u5165\u4E8B\u4EF6\u540D\u79F0\u6216\u522B\u540D",
|
|
258
258
|
prefix: /*#__PURE__*/React.createElement(IconFont, {
|
|
259
259
|
type: "sousuo"
|
|
260
260
|
})
|
package/es/utils/index.d.ts
CHANGED
|
@@ -34,6 +34,14 @@ export declare const openChangeData: (groupId: number, groupingData: any) => any
|
|
|
34
34
|
* 指标分组管理:事件全选处理
|
|
35
35
|
*/
|
|
36
36
|
export declare const eventCheckedAll: (groupId: number, groupingData: any) => any;
|
|
37
|
+
/**
|
|
38
|
+
* 指标分组管理:分组中事件列表初始化
|
|
39
|
+
*/
|
|
40
|
+
export declare const eventListHandle: (data: any) => any;
|
|
41
|
+
/**
|
|
42
|
+
* 指标分组管理:搜索事件名称或别名,判断是否展示
|
|
43
|
+
*/
|
|
44
|
+
export declare const eventShow: (data: any, searchData: string) => any;
|
|
37
45
|
/**
|
|
38
46
|
* 指标分组管理:单个事件选中处理
|
|
39
47
|
*/
|
|
@@ -42,10 +50,6 @@ export declare const eventChecked: (groupId: number, eventId: number, groupingDa
|
|
|
42
50
|
* 指标分组管理:分组排序
|
|
43
51
|
*/
|
|
44
52
|
export declare const groupListSort: (result: any, groupingData: any, setGroupingData: Function) => any;
|
|
45
|
-
/**
|
|
46
|
-
* 指标分组管理:分组中事件列表初始化
|
|
47
|
-
*/
|
|
48
|
-
export declare const eventListHandle: (data: any) => void;
|
|
49
53
|
export declare const getAppID: (currentApp: any) => any;
|
|
50
54
|
export declare const nullToEmptyString: (data: any) => any;
|
|
51
55
|
/**
|
package/es/utils/index.js
CHANGED
|
@@ -193,11 +193,64 @@ export var eventCheckedAll = function eventCheckedAll(groupId, groupingData) {
|
|
|
193
193
|
item.checked = false;
|
|
194
194
|
}
|
|
195
195
|
item.eventList.map(function (_item) {
|
|
196
|
-
_item.checked = item.checked;
|
|
196
|
+
if (_item.searchShow === 1) _item.checked = item.checked;
|
|
197
197
|
});
|
|
198
198
|
});
|
|
199
199
|
return groupingData;
|
|
200
200
|
};
|
|
201
|
+
/**
|
|
202
|
+
* 指标分组管理:分组中事件列表初始化
|
|
203
|
+
*/
|
|
204
|
+
export var eventListHandle = function eventListHandle(data) {
|
|
205
|
+
var _open = false;
|
|
206
|
+
data.map(function (item) {
|
|
207
|
+
item.checked = false;
|
|
208
|
+
item.open = false;
|
|
209
|
+
item.count = item.eventList.length;
|
|
210
|
+
if (item.eventList.length > 0) {
|
|
211
|
+
item.eventList = item.eventList.filter(function (_item) {
|
|
212
|
+
_item.searchShow = 1;
|
|
213
|
+
return _item.is_delete === 0;
|
|
214
|
+
});
|
|
215
|
+
if (item.eventList.length > 0 && !_open) {
|
|
216
|
+
_open = true;
|
|
217
|
+
item.open = true;
|
|
218
|
+
}
|
|
219
|
+
}
|
|
220
|
+
});
|
|
221
|
+
return data;
|
|
222
|
+
};
|
|
223
|
+
/**
|
|
224
|
+
* 指标分组管理:搜索事件名称或别名,判断是否展示
|
|
225
|
+
*/
|
|
226
|
+
export var eventShow = function eventShow(data, searchData) {
|
|
227
|
+
data.map(function (item) {
|
|
228
|
+
var count = 0; // 搜索实时展示的指标数量
|
|
229
|
+
var len = 0; // 当前选中的指标数量
|
|
230
|
+
item.eventList.map(function (_item) {
|
|
231
|
+
if (searchData === "") {
|
|
232
|
+
_item.searchShow = 1;
|
|
233
|
+
count++;
|
|
234
|
+
} else {
|
|
235
|
+
if (_item.event_name.indexOf(searchData) !== -1 || (_item === null || _item === void 0 ? void 0 : _item.alias_name) && (_item === null || _item === void 0 ? void 0 : _item.alias_name.indexOf(searchData)) !== -1) {
|
|
236
|
+
_item.searchShow = 1;
|
|
237
|
+
count++;
|
|
238
|
+
} else {
|
|
239
|
+
_item.searchShow = 0;
|
|
240
|
+
_item.checked = false;
|
|
241
|
+
}
|
|
242
|
+
}
|
|
243
|
+
if (_item.checked) len++;
|
|
244
|
+
});
|
|
245
|
+
if (count == len) {
|
|
246
|
+
item.checked = true;
|
|
247
|
+
} else {
|
|
248
|
+
item.checked = false;
|
|
249
|
+
}
|
|
250
|
+
item.count = count;
|
|
251
|
+
});
|
|
252
|
+
return data;
|
|
253
|
+
};
|
|
201
254
|
/**
|
|
202
255
|
* 指标分组管理:单个事件选中处理
|
|
203
256
|
*/
|
|
@@ -241,25 +294,6 @@ export var groupListSort = function groupListSort(result, groupingData, setGroup
|
|
|
241
294
|
setGroupingData(_groupingData);
|
|
242
295
|
return ids.join(',');
|
|
243
296
|
};
|
|
244
|
-
/**
|
|
245
|
-
* 指标分组管理:分组中事件列表初始化
|
|
246
|
-
*/
|
|
247
|
-
export var eventListHandle = function eventListHandle(data) {
|
|
248
|
-
var _open = false;
|
|
249
|
-
data.map(function (item) {
|
|
250
|
-
item.checked = false;
|
|
251
|
-
item.open = false;
|
|
252
|
-
if (item.eventList.length > 0) {
|
|
253
|
-
item.eventList = item.eventList.filter(function (_item) {
|
|
254
|
-
return _item.is_delete === 0;
|
|
255
|
-
});
|
|
256
|
-
if (item.eventList.length > 0 && !_open) {
|
|
257
|
-
_open = true;
|
|
258
|
-
item.open = true;
|
|
259
|
-
}
|
|
260
|
-
}
|
|
261
|
-
});
|
|
262
|
-
};
|
|
263
297
|
// 获取appId,为了解决之前遇到切换应用但是currentApp里面的appId不更新的问题
|
|
264
298
|
export var getAppID = function getAppID(currentApp) {
|
|
265
299
|
var href = window.location.href;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@zgfe/modules-dm",
|
|
3
|
-
"version": "1.0.34-heyh.
|
|
3
|
+
"version": "1.0.34-heyh.22",
|
|
4
4
|
"license": "ISC",
|
|
5
5
|
"module": "es/index.js",
|
|
6
6
|
"typings": "es/index.d.ts",
|
|
@@ -52,7 +52,7 @@
|
|
|
52
52
|
"umi-request": "^1.4.0",
|
|
53
53
|
"yorkie": "^2.0.0"
|
|
54
54
|
},
|
|
55
|
-
"gitHead": "
|
|
55
|
+
"gitHead": "e8f2bba6c835cf6b57788d0feb48cf9ac4951032",
|
|
56
56
|
"gitHooks": {
|
|
57
57
|
"pre-commit": "lint-staged"
|
|
58
58
|
}
|