@zgfe/modules-dm 1.0.2-dm.0 → 1.0.2-dm.10
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/modules/dataCollection/collectionAttributeList.js +38 -43
- package/es/modules/dataCollection/collectionEventList.js +15 -4
- package/es/modules/dataCollection/index.d.ts +3 -1
- package/es/modules/dataCollection/index.js +2 -1
- package/es/modules/dataCollection/styles/index.less +42 -8
- package/es/modules/dataCollection/tablePlus.js +43 -18
- package/es/modules/dataManage/index.d.ts +4 -1
- package/es/modules/dataManage/index.js +28 -4
- package/es/modules/dataPlan/addEventOrUser.js +13 -11
- package/es/modules/dataPlan/addPlan.d.ts +1 -0
- package/es/modules/dataPlan/addPlan.js +64 -23
- package/es/modules/dataPlan/index.js +2 -1
- package/es/store/action.d.ts +7 -0
- package/es/store/action.js +5 -0
- package/es/store/index.d.ts +8 -0
- package/es/store/index.js +42 -0
- package/es/store/state.d.ts +4 -0
- package/es/store/state.js +6 -0
- package/package.json +2 -2
|
@@ -38,7 +38,7 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
|
|
|
38
38
|
var _useState = useState(true),
|
|
39
39
|
_useState2 = _slicedToArray(_useState, 2),
|
|
40
40
|
loading = _useState2[0],
|
|
41
|
-
setLoading = _useState2[1]; // 判断是否在方案中: 处理表格class添加异常样式 | 处理表格行异常信息展示,true异常
|
|
41
|
+
setLoading = _useState2[1]; // 判断是否在方案中: 处理表格class添加异常样式 | 处理表格行异常信息展示, true异常
|
|
42
42
|
|
|
43
43
|
|
|
44
44
|
var rowRenderHandle = function rowRenderHandle(name) {
|
|
@@ -47,13 +47,17 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
|
|
|
47
47
|
|
|
48
48
|
return (queryPlanData === null || queryPlanData === void 0 ? void 0 : (_queryPlanData$unexpe = queryPlanData.unexpectedPropList) === null || _queryPlanData$unexpe === void 0 ? void 0 : _queryPlanData$unexpe.indexOf(name)) != -1 && isOpen == 1 ? true : false;
|
|
49
49
|
} else {
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
50
|
+
if (isOpen != 1) {
|
|
51
|
+
return false;
|
|
52
|
+
} else {
|
|
53
|
+
var _temp2, _temp2$attrList;
|
|
54
|
+
|
|
55
|
+
var _temp = {};
|
|
56
|
+
queryPlanData.eventPlanAndRealDataDiff.map(function (item) {
|
|
57
|
+
if (item.eventName == (eventAttrsData === null || eventAttrsData === void 0 ? void 0 : eventAttrsData.event_name)) _temp = item;
|
|
58
|
+
});
|
|
59
|
+
return Object.keys(_temp).length <= 0 ? true : ((_temp2 = _temp) === null || _temp2 === void 0 ? void 0 : (_temp2$attrList = _temp2.attrList) === null || _temp2$attrList === void 0 ? void 0 : _temp2$attrList.indexOf(name)) == -1 ? true : false;
|
|
60
|
+
}
|
|
57
61
|
}
|
|
58
62
|
}; // 用户属性列表
|
|
59
63
|
|
|
@@ -97,17 +101,7 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
|
|
|
97
101
|
setUserAttrData(_temp);
|
|
98
102
|
setLoading(false);
|
|
99
103
|
}
|
|
100
|
-
}, [source]); //
|
|
101
|
-
|
|
102
|
-
var _useState5 = useState(''),
|
|
103
|
-
_useState6 = _slicedToArray(_useState5, 2),
|
|
104
|
-
planName = _useState6[0],
|
|
105
|
-
setPlanName = _useState6[1];
|
|
106
|
-
|
|
107
|
-
var PlanNameChange = function PlanNameChange(e) {
|
|
108
|
-
setPlanName(e.currentTarget.value);
|
|
109
|
-
}; // 复制属性名称
|
|
110
|
-
|
|
104
|
+
}, [source]); // 复制属性名称
|
|
111
105
|
|
|
112
106
|
var copyAttrName = function copyAttrName(name) {
|
|
113
107
|
navigator.clipboard.writeText(name);
|
|
@@ -115,10 +109,10 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
|
|
|
115
109
|
}; // 别名foucs
|
|
116
110
|
|
|
117
111
|
|
|
118
|
-
var
|
|
119
|
-
|
|
120
|
-
aliasFocusData =
|
|
121
|
-
setAliasFocusData =
|
|
112
|
+
var _useState5 = useState(''),
|
|
113
|
+
_useState6 = _slicedToArray(_useState5, 2),
|
|
114
|
+
aliasFocusData = _useState6[0],
|
|
115
|
+
setAliasFocusData = _useState6[1];
|
|
122
116
|
|
|
123
117
|
var aliasFocus = function aliasFocus(e) {
|
|
124
118
|
setAliasFocusData(e.currentTarget.value);
|
|
@@ -141,7 +135,7 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
|
|
|
141
135
|
message.success('修改成功');
|
|
142
136
|
}
|
|
143
137
|
}).catch(function (err) {
|
|
144
|
-
message.
|
|
138
|
+
message.error('修改失败');
|
|
145
139
|
}).finally(function () {});
|
|
146
140
|
}; // 表格列
|
|
147
141
|
|
|
@@ -292,25 +286,25 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
|
|
|
292
286
|
dataIndex: 'mapping_value'
|
|
293
287
|
}];
|
|
294
288
|
|
|
295
|
-
var
|
|
289
|
+
var _useState7 = useState([]),
|
|
290
|
+
_useState8 = _slicedToArray(_useState7, 2),
|
|
291
|
+
attrExcelData = _useState8[0],
|
|
292
|
+
setAttrExcelData = _useState8[1];
|
|
293
|
+
|
|
294
|
+
var _useState9 = useState(false),
|
|
296
295
|
_useState10 = _slicedToArray(_useState9, 2),
|
|
297
|
-
|
|
298
|
-
|
|
296
|
+
attrAliasNameShow = _useState10[0],
|
|
297
|
+
setAttrAliasNameShow = _useState10[1];
|
|
299
298
|
|
|
300
|
-
var _useState11 = useState(
|
|
299
|
+
var _useState11 = useState(0),
|
|
301
300
|
_useState12 = _slicedToArray(_useState11, 2),
|
|
302
|
-
|
|
303
|
-
|
|
301
|
+
attrId = _useState12[0],
|
|
302
|
+
setattrId = _useState12[1];
|
|
304
303
|
|
|
305
304
|
var _useState13 = useState(0),
|
|
306
305
|
_useState14 = _slicedToArray(_useState13, 2),
|
|
307
|
-
|
|
308
|
-
|
|
309
|
-
|
|
310
|
-
var _useState15 = useState(0),
|
|
311
|
-
_useState16 = _slicedToArray(_useState15, 2),
|
|
312
|
-
batchId = _useState16[0],
|
|
313
|
-
setBatchId = _useState16[1];
|
|
306
|
+
batchId = _useState14[0],
|
|
307
|
+
setBatchId = _useState14[1];
|
|
314
308
|
|
|
315
309
|
var uploadProps = {
|
|
316
310
|
maxCount: 1,
|
|
@@ -333,15 +327,16 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
|
|
|
333
327
|
setAttrExcelData(res.values);
|
|
334
328
|
}
|
|
335
329
|
}).catch(function (err) {
|
|
336
|
-
message.
|
|
330
|
+
message.error('上传失败');
|
|
337
331
|
});
|
|
332
|
+
return false;
|
|
338
333
|
}
|
|
339
334
|
}; // 清空属性值别名excel数据
|
|
340
335
|
|
|
341
|
-
var
|
|
342
|
-
|
|
343
|
-
clearFlag =
|
|
344
|
-
setClearFlag =
|
|
336
|
+
var _useState15 = useState(false),
|
|
337
|
+
_useState16 = _slicedToArray(_useState15, 2),
|
|
338
|
+
clearFlag = _useState16[0],
|
|
339
|
+
setClearFlag = _useState16[1];
|
|
345
340
|
|
|
346
341
|
var clearData = function clearData() {
|
|
347
342
|
setAttrExcelData([]);
|
|
@@ -366,7 +361,7 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
|
|
|
366
361
|
setAttrAliasNameShow(false);
|
|
367
362
|
}
|
|
368
363
|
}).catch(function (err) {
|
|
369
|
-
message.
|
|
364
|
+
message.error('操作失败');
|
|
370
365
|
});
|
|
371
366
|
}; // 获取已设置的属性值别名列表
|
|
372
367
|
|
|
@@ -24,7 +24,8 @@ var CollectionEventList = function CollectionEventList(props) {
|
|
|
24
24
|
|
|
25
25
|
var _useContext = useContext(BizGlobalDataContext),
|
|
26
26
|
currentApp = _useContext.currentApp,
|
|
27
|
-
isDemo = _useContext.isDemo;
|
|
27
|
+
isDemo = _useContext.isDemo; // const { updateEventMetas } = props;
|
|
28
|
+
|
|
28
29
|
|
|
29
30
|
var _useState = useState(0),
|
|
30
31
|
_useState2 = _slicedToArray(_useState, 2),
|
|
@@ -150,6 +151,11 @@ var CollectionEventList = function CollectionEventList(props) {
|
|
|
150
151
|
|
|
151
152
|
|
|
152
153
|
var createEventGroup = function createEventGroup() {
|
|
154
|
+
if (eventNameInput == '') {
|
|
155
|
+
message.error('请输入分组名称');
|
|
156
|
+
return;
|
|
157
|
+
}
|
|
158
|
+
|
|
153
159
|
if (eventNameInput.length > 20) {
|
|
154
160
|
message.error('名称不可超过20字符');
|
|
155
161
|
return;
|
|
@@ -169,8 +175,10 @@ var CollectionEventList = function CollectionEventList(props) {
|
|
|
169
175
|
queryList();
|
|
170
176
|
}
|
|
171
177
|
}).catch(function (err) {
|
|
172
|
-
message.
|
|
173
|
-
}).finally(function () {
|
|
178
|
+
message.error('创建失败');
|
|
179
|
+
}).finally(function () {
|
|
180
|
+
setEventNameInput('');
|
|
181
|
+
});
|
|
174
182
|
}; // 筛选:显示状态 | 采集状态
|
|
175
183
|
|
|
176
184
|
|
|
@@ -306,13 +314,16 @@ var CollectionEventList = function CollectionEventList(props) {
|
|
|
306
314
|
setEventAttrListShow: setEventAttrListShow
|
|
307
315
|
}), /*#__PURE__*/React.createElement(Modal, {
|
|
308
316
|
title: "\u521B\u5EFA\u5206\u7EC4",
|
|
317
|
+
destroyOnClose: true,
|
|
309
318
|
visible: eventNameShow,
|
|
310
319
|
onOk: createEventGroup,
|
|
311
320
|
onCancel: function onCancel() {
|
|
312
|
-
|
|
321
|
+
setEventNameShow(false);
|
|
322
|
+
setEventNameInput('');
|
|
313
323
|
}
|
|
314
324
|
}, /*#__PURE__*/React.createElement(Input, {
|
|
315
325
|
placeholder: "\u8BF7\u8F93\u5165\u5206\u7EC4\u540D",
|
|
326
|
+
value: eventNameInput,
|
|
316
327
|
onChange: function onChange(e) {
|
|
317
328
|
return setEventNameInput(e.currentTarget.value);
|
|
318
329
|
}
|
|
@@ -23,7 +23,8 @@ var DataCollection = function DataCollection(props) {
|
|
|
23
23
|
|
|
24
24
|
var _useContext = useContext(BizGlobalDataContext),
|
|
25
25
|
currentApp = _useContext.currentApp,
|
|
26
|
-
isDemo = _useContext.isDemo;
|
|
26
|
+
isDemo = _useContext.isDemo; // const { updateEventMetas } = props;
|
|
27
|
+
|
|
27
28
|
|
|
28
29
|
var _useState = useState(1),
|
|
29
30
|
_useState2 = _slicedToArray(_useState, 2),
|
|
@@ -81,7 +81,13 @@
|
|
|
81
81
|
display: inline-block !important;
|
|
82
82
|
}
|
|
83
83
|
}
|
|
84
|
+
.alias_name_popover {
|
|
85
|
+
width: 200px;
|
|
86
|
+
word-break: break-all;
|
|
87
|
+
background: red;
|
|
88
|
+
}
|
|
84
89
|
.alias_name {
|
|
90
|
+
background: #fff !important;
|
|
85
91
|
border: none;
|
|
86
92
|
}
|
|
87
93
|
.ant-input:focus,
|
|
@@ -93,6 +99,16 @@
|
|
|
93
99
|
}
|
|
94
100
|
.group-row {
|
|
95
101
|
border-top: 12px solid #f5f5f5;
|
|
102
|
+
.ant-table-cell-fix-left {
|
|
103
|
+
left: 0px;
|
|
104
|
+
display: block;
|
|
105
|
+
width: 500px;
|
|
106
|
+
background: #fff;
|
|
107
|
+
}
|
|
108
|
+
.ant-table-cell-fix-left-first::after,
|
|
109
|
+
.ant-table-cell-fix-left-last::after {
|
|
110
|
+
box-shadow: none;
|
|
111
|
+
}
|
|
96
112
|
td {
|
|
97
113
|
padding: 6px 16px;
|
|
98
114
|
}
|
|
@@ -105,7 +121,7 @@
|
|
|
105
121
|
}
|
|
106
122
|
.group-box {
|
|
107
123
|
display: flex;
|
|
108
|
-
width:
|
|
124
|
+
width: 800px;
|
|
109
125
|
line-height: 30px;
|
|
110
126
|
.ant-input {
|
|
111
127
|
width: 150px;
|
|
@@ -115,13 +131,13 @@
|
|
|
115
131
|
margin-right: 4px;
|
|
116
132
|
font-size: 18px !important;
|
|
117
133
|
}
|
|
118
|
-
.group-text {
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
}
|
|
134
|
+
// .group-text {
|
|
135
|
+
// display: -webkit-box;
|
|
136
|
+
// width: 120px;
|
|
137
|
+
// overflow: hidden;
|
|
138
|
+
// -webkit-box-orient: vertical;
|
|
139
|
+
// -webkit-line-clamp: 1;
|
|
140
|
+
// }
|
|
125
141
|
.group-handle {
|
|
126
142
|
margin-left: 30px;
|
|
127
143
|
cursor: pointer;
|
|
@@ -163,6 +179,7 @@
|
|
|
163
179
|
display: none;
|
|
164
180
|
margin-left: 10px;
|
|
165
181
|
font-size: 16px !important;
|
|
182
|
+
cursor: pointer;
|
|
166
183
|
}
|
|
167
184
|
.copy-text:hover {
|
|
168
185
|
color: @primary-color;
|
|
@@ -171,6 +188,7 @@
|
|
|
171
188
|
.collect-icon-active {
|
|
172
189
|
margin: 0 4px;
|
|
173
190
|
font-size: 16px !important;
|
|
191
|
+
cursor: pointer;
|
|
174
192
|
}
|
|
175
193
|
.collect-icon {
|
|
176
194
|
color: #999;
|
|
@@ -201,6 +219,9 @@
|
|
|
201
219
|
cursor: pointer;
|
|
202
220
|
user-select: none;
|
|
203
221
|
}
|
|
222
|
+
.set-error {
|
|
223
|
+
color: #86909c;
|
|
224
|
+
}
|
|
204
225
|
}
|
|
205
226
|
}
|
|
206
227
|
}
|
|
@@ -220,9 +241,22 @@
|
|
|
220
241
|
&:hover {
|
|
221
242
|
.fuzhi {
|
|
222
243
|
display: inline-block;
|
|
244
|
+
cursor: pointer;
|
|
223
245
|
}
|
|
224
246
|
}
|
|
225
247
|
}
|
|
248
|
+
.alias_name {
|
|
249
|
+
background: #fff !important;
|
|
250
|
+
border: none;
|
|
251
|
+
cursor: pointer;
|
|
252
|
+
}
|
|
253
|
+
.ant-input:focus,
|
|
254
|
+
.ant-input-focused {
|
|
255
|
+
background-color: #fff !important;
|
|
256
|
+
border-bottom: 1px solid @primary-color;
|
|
257
|
+
border-radius: 0 !important;
|
|
258
|
+
box-shadow: none !important;
|
|
259
|
+
}
|
|
226
260
|
.attr_alias_name {
|
|
227
261
|
cursor: pointer;
|
|
228
262
|
user-select: none;
|
|
@@ -24,6 +24,7 @@ var Option = Select.Option;
|
|
|
24
24
|
import React, { useState, useContext } from 'react';
|
|
25
25
|
import './styles/index.less';
|
|
26
26
|
import _ from 'lodash';
|
|
27
|
+
import { DmContext } from '../../store';
|
|
27
28
|
|
|
28
29
|
var TablePlus = function TablePlus(props) {
|
|
29
30
|
var classPrefix = 'table-plus';
|
|
@@ -33,7 +34,10 @@ var TablePlus = function TablePlus(props) {
|
|
|
33
34
|
|
|
34
35
|
var _useContext = useContext(BizGlobalDataContext),
|
|
35
36
|
currentApp = _useContext.currentApp,
|
|
36
|
-
isDemo = _useContext.isDemo;
|
|
37
|
+
isDemo = _useContext.isDemo;
|
|
38
|
+
|
|
39
|
+
var _useContext2 = useContext(DmContext),
|
|
40
|
+
state = _useContext2.state; // 别名foucs
|
|
37
41
|
|
|
38
42
|
|
|
39
43
|
var _useState = useState(''),
|
|
@@ -58,15 +62,20 @@ var TablePlus = function TablePlus(props) {
|
|
|
58
62
|
}
|
|
59
63
|
}).then(function (res) {
|
|
60
64
|
if (res) {
|
|
61
|
-
message.success('修改成功');
|
|
65
|
+
message.success('修改成功'); // props.Refresh();
|
|
66
|
+
|
|
67
|
+
console.log(state.updateEventMetas);
|
|
68
|
+
state.updateEventMetas ? state.updateEventMetas() : props.Refresh(); // 更新store
|
|
62
69
|
}
|
|
63
70
|
}).catch(function (err) {
|
|
64
|
-
message.
|
|
65
|
-
}).finally(function () {
|
|
71
|
+
message.error('修改失败');
|
|
72
|
+
}).finally(function () {
|
|
73
|
+
setAliasFocusData('');
|
|
74
|
+
});
|
|
66
75
|
}; // 表格class处理
|
|
67
76
|
|
|
68
77
|
|
|
69
|
-
var rowClassNameHandle = function rowClassNameHandle(record
|
|
78
|
+
var rowClassNameHandle = function rowClassNameHandle(record) {
|
|
70
79
|
if (record.groupId != undefined) {
|
|
71
80
|
return 'group-row';
|
|
72
81
|
} else {
|
|
@@ -110,7 +119,7 @@ var TablePlus = function TablePlus(props) {
|
|
|
110
119
|
props.Refresh();
|
|
111
120
|
}
|
|
112
121
|
}).catch(function (err) {
|
|
113
|
-
message.
|
|
122
|
+
message.error('修改失败');
|
|
114
123
|
}).finally(function () {});
|
|
115
124
|
}; // 删除分组
|
|
116
125
|
|
|
@@ -140,7 +149,7 @@ var TablePlus = function TablePlus(props) {
|
|
|
140
149
|
props.Refresh();
|
|
141
150
|
}
|
|
142
151
|
}).catch(function (err) {
|
|
143
|
-
message.
|
|
152
|
+
message.error('删除失败');
|
|
144
153
|
}).finally(function () {});
|
|
145
154
|
}
|
|
146
155
|
});
|
|
@@ -168,7 +177,7 @@ var TablePlus = function TablePlus(props) {
|
|
|
168
177
|
props.Refresh();
|
|
169
178
|
}
|
|
170
179
|
}).catch(function (err) {
|
|
171
|
-
message.
|
|
180
|
+
message.error('删除失败');
|
|
172
181
|
}).finally(function () {});
|
|
173
182
|
}
|
|
174
183
|
});
|
|
@@ -210,7 +219,7 @@ var TablePlus = function TablePlus(props) {
|
|
|
210
219
|
props.Refresh();
|
|
211
220
|
}
|
|
212
221
|
}).catch(function (err) {
|
|
213
|
-
message.
|
|
222
|
+
message.error('修改失败');
|
|
214
223
|
}).finally(function () {});
|
|
215
224
|
}; // 复制事件名称
|
|
216
225
|
|
|
@@ -269,14 +278,16 @@ var TablePlus = function TablePlus(props) {
|
|
|
269
278
|
if (eventGroupId != undefined) _temp = {
|
|
270
279
|
eventGroupId: eventGroupId
|
|
271
280
|
};
|
|
281
|
+
if (type != 'copy') _temp = _objectSpread(_objectSpread({}, _temp), {}, {
|
|
282
|
+
oldEventGroupId: data.groupId
|
|
283
|
+
});
|
|
272
284
|
request(apis.operateGroupRelations, {
|
|
273
285
|
method: 'post',
|
|
274
286
|
data: _objectSpread({
|
|
275
287
|
appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
|
|
276
288
|
platform: 0,
|
|
277
289
|
hasPublicAttrView: true,
|
|
278
|
-
eventIds: groupCheckedData[data.groupId].join(',')
|
|
279
|
-
oldEventGroupId: data.groupId
|
|
290
|
+
eventIds: groupCheckedData[data.groupId].join(',')
|
|
280
291
|
}, _temp)
|
|
281
292
|
}).then(function (res) {
|
|
282
293
|
message.success('成功');
|
|
@@ -286,7 +297,7 @@ var TablePlus = function TablePlus(props) {
|
|
|
286
297
|
delete _groupCheckedData[eventGroupId];
|
|
287
298
|
setGroupCheckedData({});
|
|
288
299
|
}).catch(function (err) {
|
|
289
|
-
message.
|
|
300
|
+
message.error('失败');
|
|
290
301
|
}).finally(function () {
|
|
291
302
|
props.Refresh();
|
|
292
303
|
});
|
|
@@ -401,7 +412,16 @@ var TablePlus = function TablePlus(props) {
|
|
|
401
412
|
key: 'alias_name',
|
|
402
413
|
width: 167,
|
|
403
414
|
render: function render(text, record, index) {
|
|
404
|
-
return /*#__PURE__*/React.createElement(
|
|
415
|
+
return /*#__PURE__*/React.createElement(Popover, {
|
|
416
|
+
content: /*#__PURE__*/React.createElement("div", {
|
|
417
|
+
style: {
|
|
418
|
+
width: '200px',
|
|
419
|
+
wordBreak: 'break-all'
|
|
420
|
+
}
|
|
421
|
+
}, record.alias_name),
|
|
422
|
+
trigger: "hover",
|
|
423
|
+
placement: "top"
|
|
424
|
+
}, /*#__PURE__*/React.createElement(Input, {
|
|
405
425
|
className: "alias_name",
|
|
406
426
|
placeholder: "\u7F16\u8F91\u522B\u540D",
|
|
407
427
|
defaultValue: record.alias_name,
|
|
@@ -409,7 +429,7 @@ var TablePlus = function TablePlus(props) {
|
|
|
409
429
|
onBlur: function onBlur(e) {
|
|
410
430
|
aliasNameBlur(e, record);
|
|
411
431
|
}
|
|
412
|
-
});
|
|
432
|
+
}));
|
|
413
433
|
}
|
|
414
434
|
}, {
|
|
415
435
|
title: '首次上报时间',
|
|
@@ -427,7 +447,7 @@ var TablePlus = function TablePlus(props) {
|
|
|
427
447
|
key: 'last_insert_time',
|
|
428
448
|
width: 187,
|
|
429
449
|
render: function render(text, record, index) {
|
|
430
|
-
return /*#__PURE__*/React.createElement("div", null, record.
|
|
450
|
+
return /*#__PURE__*/React.createElement("div", null, record.last_insert_time);
|
|
431
451
|
}
|
|
432
452
|
}, {
|
|
433
453
|
title: /*#__PURE__*/React.createElement(Select, {
|
|
@@ -462,6 +482,7 @@ var TablePlus = function TablePlus(props) {
|
|
|
462
482
|
style: {
|
|
463
483
|
width: 150
|
|
464
484
|
},
|
|
485
|
+
disabled: rowClassNameHandle(record) == 'error-row' ? true : false,
|
|
465
486
|
onChange: function onChange(e) {
|
|
466
487
|
return eventHiddenChange(e, 'event_hidden', record.event_id);
|
|
467
488
|
},
|
|
@@ -507,6 +528,7 @@ var TablePlus = function TablePlus(props) {
|
|
|
507
528
|
style: {
|
|
508
529
|
width: 150
|
|
509
530
|
},
|
|
531
|
+
disabled: rowClassNameHandle(record) == 'error-row' ? true : false,
|
|
510
532
|
onChange: function onChange(e) {
|
|
511
533
|
return eventHiddenChange(e, 'is_stop', record.event_id);
|
|
512
534
|
},
|
|
@@ -551,6 +573,7 @@ var TablePlus = function TablePlus(props) {
|
|
|
551
573
|
groupName: record.groupName,
|
|
552
574
|
groupId: record.groupId
|
|
553
575
|
});
|
|
576
|
+
setEventNameInput(record.groupName);
|
|
554
577
|
setEventNameShow(true);
|
|
555
578
|
},
|
|
556
579
|
type: "bianji"
|
|
@@ -562,9 +585,9 @@ var TablePlus = function TablePlus(props) {
|
|
|
562
585
|
}));
|
|
563
586
|
} else {
|
|
564
587
|
return /*#__PURE__*/React.createElement("div", {
|
|
565
|
-
className: "set",
|
|
588
|
+
className: "set ".concat(record.owner == 'zg_abp' ? 'set-error' : ''),
|
|
566
589
|
onClick: function onClick() {
|
|
567
|
-
|
|
590
|
+
record.owner != 'zg_abp' ? eventItemDel(record.event_id) : message.error('内置事件无法删除');
|
|
568
591
|
}
|
|
569
592
|
}, "\u5220\u9664");
|
|
570
593
|
}
|
|
@@ -579,7 +602,7 @@ var TablePlus = function TablePlus(props) {
|
|
|
579
602
|
loading: props.loading,
|
|
580
603
|
dataSource: tableHandleData,
|
|
581
604
|
rowClassName: function rowClassName(record, index) {
|
|
582
|
-
return rowClassNameHandle(record
|
|
605
|
+
return rowClassNameHandle(record);
|
|
583
606
|
},
|
|
584
607
|
scroll: {
|
|
585
608
|
x: 1300,
|
|
@@ -588,6 +611,7 @@ var TablePlus = function TablePlus(props) {
|
|
|
588
611
|
pagination: false
|
|
589
612
|
}), /*#__PURE__*/React.createElement(Modal, {
|
|
590
613
|
title: "\u4FEE\u6539\u5206\u7EC4\u540D",
|
|
614
|
+
destroyOnClose: true,
|
|
591
615
|
visible: eventNameShow,
|
|
592
616
|
onOk: eventNameEdit,
|
|
593
617
|
onCancel: function onCancel() {
|
|
@@ -595,6 +619,7 @@ var TablePlus = function TablePlus(props) {
|
|
|
595
619
|
}
|
|
596
620
|
}, /*#__PURE__*/React.createElement(Input, {
|
|
597
621
|
placeholder: "\u8BF7\u8F93\u5165\u5206\u7EC4\u540D",
|
|
622
|
+
value: eventNameInput,
|
|
598
623
|
onChange: function onChange(e) {
|
|
599
624
|
return setEventNameInput(e.currentTarget.value);
|
|
600
625
|
}
|
|
@@ -12,15 +12,30 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
|
|
|
12
12
|
|
|
13
13
|
import { IconFont } from '@zgfe/business-lib';
|
|
14
14
|
import { Menu } from 'antd';
|
|
15
|
-
import React, { useState } from 'react';
|
|
15
|
+
import React, { useState, useEffect } from 'react';
|
|
16
16
|
import './styles/index.less'; // import EventList from './eventList';
|
|
17
17
|
// import UserAttributeList from './userAttributeList';
|
|
18
18
|
|
|
19
|
+
import { DmContext, upDatedDmFun } from '../../store';
|
|
20
|
+
import { ActionType } from '../../store/action';
|
|
19
21
|
import PlanList from '../dataPlan';
|
|
20
22
|
import DataCollection from '../dataCollection';
|
|
21
23
|
|
|
22
24
|
var DataManage = function DataManage(props) {
|
|
23
25
|
var classPrefix = 'data-manage';
|
|
26
|
+
var updateEventMetas = props.updateEventMetas; // const { state, dispatch } = useContext(DmContext);
|
|
27
|
+
|
|
28
|
+
var _upDatedDmFun = upDatedDmFun(),
|
|
29
|
+
_upDatedDmFun2 = _slicedToArray(_upDatedDmFun, 2),
|
|
30
|
+
state = _upDatedDmFun2[0],
|
|
31
|
+
dispatch = _upDatedDmFun2[1];
|
|
32
|
+
|
|
33
|
+
useEffect(function () {
|
|
34
|
+
dispatch({
|
|
35
|
+
type: ActionType.SET_GLOBAL,
|
|
36
|
+
payload: updateEventMetas
|
|
37
|
+
});
|
|
38
|
+
}, []);
|
|
24
39
|
|
|
25
40
|
var _useState = useState('0'),
|
|
26
41
|
_useState2 = _slicedToArray(_useState, 2),
|
|
@@ -44,7 +59,12 @@ var DataManage = function DataManage(props) {
|
|
|
44
59
|
type: "maidianfanganguanli"
|
|
45
60
|
})
|
|
46
61
|
}];
|
|
47
|
-
return /*#__PURE__*/React.createElement(
|
|
62
|
+
return /*#__PURE__*/React.createElement(DmContext.Provider, {
|
|
63
|
+
value: {
|
|
64
|
+
state: state,
|
|
65
|
+
dispatch: dispatch
|
|
66
|
+
}
|
|
67
|
+
}, /*#__PURE__*/React.createElement("div", {
|
|
48
68
|
className: classPrefix
|
|
49
69
|
}, /*#__PURE__*/React.createElement("div", {
|
|
50
70
|
className: "".concat(classPrefix, "-menu")
|
|
@@ -52,7 +72,11 @@ var DataManage = function DataManage(props) {
|
|
|
52
72
|
defaultSelectedKeys: ['0'],
|
|
53
73
|
onSelect: onSelect,
|
|
54
74
|
items: items
|
|
55
|
-
})), menuTab == '0' && /*#__PURE__*/React.createElement(DataCollection, null), menuTab == '1' && /*#__PURE__*/React.createElement(PlanList, null));
|
|
75
|
+
})), menuTab == '0' && /*#__PURE__*/React.createElement(DataCollection, null), menuTab == '1' && /*#__PURE__*/React.createElement(PlanList, null)));
|
|
56
76
|
};
|
|
57
77
|
|
|
58
|
-
export default DataManage;
|
|
78
|
+
export default DataManage; // export default forwardRef<{}, DataManageProps>((props, ref) => (
|
|
79
|
+
// <DmProvider>
|
|
80
|
+
// <DataManage {...props} />
|
|
81
|
+
// </DmProvider>
|
|
82
|
+
// ));
|
|
@@ -212,17 +212,19 @@ var addEventOrUser = function addEventOrUser(props) {
|
|
|
212
212
|
dataIndex: 'propName',
|
|
213
213
|
key: 'propName',
|
|
214
214
|
align: 'center'
|
|
215
|
-
}, {
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
},
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
215
|
+
}, // {
|
|
216
|
+
// title: '值',
|
|
217
|
+
// dataIndex: 'value',
|
|
218
|
+
// key: 'value',
|
|
219
|
+
// align: 'center',
|
|
220
|
+
// },
|
|
221
|
+
// {
|
|
222
|
+
// title: '调用identify接口的时机',
|
|
223
|
+
// dataIndex: 'callTime',
|
|
224
|
+
// key: 'callTime',
|
|
225
|
+
// align: 'center',
|
|
226
|
+
// },
|
|
227
|
+
{
|
|
226
228
|
title: '操作',
|
|
227
229
|
dataIndex: 'set',
|
|
228
230
|
align: 'center'
|
|
@@ -58,7 +58,7 @@ var AddPlan = function AddPlan(props) {
|
|
|
58
58
|
// console.log('获取详情', res.data);
|
|
59
59
|
tableDataHandle(res.data, res.data.propPlanAndRealDataDiff, 'detail');
|
|
60
60
|
}).catch(function (err) {
|
|
61
|
-
message.
|
|
61
|
+
message.error('获取详情数据失败');
|
|
62
62
|
});
|
|
63
63
|
}
|
|
64
64
|
}, [props.detailId]); // 方案名称
|
|
@@ -74,6 +74,11 @@ var AddPlan = function AddPlan(props) {
|
|
|
74
74
|
setPlanName = _useState4[1];
|
|
75
75
|
|
|
76
76
|
var PlanNameChange = function PlanNameChange(e) {
|
|
77
|
+
if (e.currentTarget.value.length > 20) {
|
|
78
|
+
message.error('最多可输入20个字符');
|
|
79
|
+
return;
|
|
80
|
+
}
|
|
81
|
+
|
|
77
82
|
setPlanName(e.currentTarget.value);
|
|
78
83
|
setEditOperate(true);
|
|
79
84
|
e.currentTarget.value != '' ? setplanNameInputStatus('') : null;
|
|
@@ -168,13 +173,28 @@ var AddPlan = function AddPlan(props) {
|
|
|
168
173
|
method: 'post',
|
|
169
174
|
data: data
|
|
170
175
|
}).then(function (res) {
|
|
176
|
+
console.log('111', res);
|
|
177
|
+
|
|
178
|
+
if (res == null) {
|
|
179
|
+
// 接口处理表格异常处理
|
|
180
|
+
message.error('上传失败');
|
|
181
|
+
return;
|
|
182
|
+
}
|
|
183
|
+
|
|
184
|
+
if (Object.keys(res.data).length <= 0) {
|
|
185
|
+
// 破损表格,异常处理
|
|
186
|
+
message.error('上传失败');
|
|
187
|
+
return;
|
|
188
|
+
}
|
|
189
|
+
|
|
171
190
|
message.success('上传成功');
|
|
172
191
|
tableDataHandle(res.data.eventPlanDataStatusList, res.data.userPropPlanList, 'add');
|
|
173
192
|
setEditOperate(true);
|
|
174
193
|
setListTab('1');
|
|
175
194
|
}).catch(function (err) {
|
|
176
|
-
message.
|
|
195
|
+
message.error('上传失败');
|
|
177
196
|
});
|
|
197
|
+
return false;
|
|
178
198
|
}
|
|
179
199
|
}; // 事件列表-渲染数据
|
|
180
200
|
|
|
@@ -357,8 +377,21 @@ var AddPlan = function AddPlan(props) {
|
|
|
357
377
|
});
|
|
358
378
|
|
|
359
379
|
setEventListData(_temp_tableHandleData);
|
|
360
|
-
}; //
|
|
380
|
+
}; // 保存方案按钮是否置灰
|
|
381
|
+
|
|
382
|
+
|
|
383
|
+
var _useState21 = useState(false),
|
|
384
|
+
_useState22 = _slicedToArray(_useState21, 2),
|
|
385
|
+
saveDisabled = _useState22[0],
|
|
386
|
+
setSaveDisabled = _useState22[1];
|
|
361
387
|
|
|
388
|
+
useEffect(function () {
|
|
389
|
+
if (JSON.stringify(eventListData).indexOf('eventName') == -1) {
|
|
390
|
+
setSaveDisabled(true);
|
|
391
|
+
} else {
|
|
392
|
+
setSaveDisabled(false);
|
|
393
|
+
}
|
|
394
|
+
}, [eventListData]); // 保存方案
|
|
362
395
|
|
|
363
396
|
var savePlanData = function savePlanData() {
|
|
364
397
|
if (planName == '') {
|
|
@@ -366,8 +399,15 @@ var AddPlan = function AddPlan(props) {
|
|
|
366
399
|
return;
|
|
367
400
|
}
|
|
368
401
|
|
|
369
|
-
|
|
370
|
-
|
|
402
|
+
var planNameFlag = false;
|
|
403
|
+
props.listData.map(function (item) {
|
|
404
|
+
if (item.planName == planName && item.id != props.detailId) {
|
|
405
|
+
planNameFlag = true;
|
|
406
|
+
}
|
|
407
|
+
});
|
|
408
|
+
|
|
409
|
+
if (planNameFlag) {
|
|
410
|
+
message.error('方案名称与现有方案重复');
|
|
371
411
|
return;
|
|
372
412
|
} // console.log('保存', planName, eventListData, userAttrData);
|
|
373
413
|
|
|
@@ -410,15 +450,15 @@ var AddPlan = function AddPlan(props) {
|
|
|
410
450
|
closeDrawer('save');
|
|
411
451
|
}
|
|
412
452
|
}).catch(function (err) {
|
|
413
|
-
message.
|
|
453
|
+
message.error('保存失败');
|
|
414
454
|
});
|
|
415
455
|
}; // 存储选中的keys
|
|
416
456
|
|
|
417
457
|
|
|
418
|
-
var
|
|
419
|
-
|
|
420
|
-
selectedRowKeys =
|
|
421
|
-
setSelectedRowKeys =
|
|
458
|
+
var _useState23 = useState([]),
|
|
459
|
+
_useState24 = _slicedToArray(_useState23, 2),
|
|
460
|
+
selectedRowKeys = _useState24[0],
|
|
461
|
+
setSelectedRowKeys = _useState24[1];
|
|
422
462
|
|
|
423
463
|
var tableCheck = function tableCheck(e, record) {
|
|
424
464
|
// console.log(e.target.checked, record.key);
|
|
@@ -503,20 +543,20 @@ var AddPlan = function AddPlan(props) {
|
|
|
503
543
|
|
|
504
544
|
setEditOperate(true);
|
|
505
545
|
setSelectedRowKeys([]);
|
|
506
|
-
message.
|
|
546
|
+
message.error('删除成功');
|
|
507
547
|
}; // 是否有编辑操作
|
|
508
548
|
|
|
509
549
|
|
|
510
|
-
var
|
|
511
|
-
|
|
512
|
-
editOperate =
|
|
513
|
-
setEditOperate =
|
|
550
|
+
var _useState25 = useState(false),
|
|
551
|
+
_useState26 = _slicedToArray(_useState25, 2),
|
|
552
|
+
editOperate = _useState26[0],
|
|
553
|
+
setEditOperate = _useState26[1]; // 保存时,方案名称若为空,Input显示校验提示
|
|
514
554
|
|
|
515
555
|
|
|
516
|
-
var
|
|
517
|
-
|
|
518
|
-
planNameInputStatus =
|
|
519
|
-
setplanNameInputStatus =
|
|
556
|
+
var _useState27 = useState(''),
|
|
557
|
+
_useState28 = _slicedToArray(_useState27, 2),
|
|
558
|
+
planNameInputStatus = _useState28[0],
|
|
559
|
+
setplanNameInputStatus = _useState28[1]; // 检索条数
|
|
520
560
|
|
|
521
561
|
|
|
522
562
|
useEffect(function () {
|
|
@@ -535,10 +575,10 @@ var AddPlan = function AddPlan(props) {
|
|
|
535
575
|
}
|
|
536
576
|
}, [listTab, eventListData, userAttrData]);
|
|
537
577
|
|
|
538
|
-
var
|
|
539
|
-
|
|
540
|
-
exportValue =
|
|
541
|
-
setExportValue =
|
|
578
|
+
var _useState29 = useState('导出'),
|
|
579
|
+
_useState30 = _slicedToArray(_useState29, 2),
|
|
580
|
+
exportValue = _useState30[0],
|
|
581
|
+
setExportValue = _useState30[1];
|
|
542
582
|
|
|
543
583
|
return /*#__PURE__*/React.createElement(Drawer, {
|
|
544
584
|
width: '70%',
|
|
@@ -574,6 +614,7 @@ var AddPlan = function AddPlan(props) {
|
|
|
574
614
|
return closeDrawer('close');
|
|
575
615
|
}
|
|
576
616
|
}, "\u53D6\u6D88"), /*#__PURE__*/React.createElement(Button, {
|
|
617
|
+
disabled: saveDisabled,
|
|
577
618
|
onClick: savePlanData,
|
|
578
619
|
type: "primary"
|
|
579
620
|
}, "\u4FDD\u5B58"))), /*#__PURE__*/React.createElement("div", {
|
|
@@ -52,7 +52,7 @@ var PlanList = function PlanList(props) {
|
|
|
52
52
|
message.success('删除成功');
|
|
53
53
|
queryList();
|
|
54
54
|
}).catch(function (err) {
|
|
55
|
-
message.
|
|
55
|
+
message.error('删除失败');
|
|
56
56
|
}).finally(function () {});
|
|
57
57
|
}
|
|
58
58
|
});
|
|
@@ -223,6 +223,7 @@ var PlanList = function PlanList(props) {
|
|
|
223
223
|
// onChange={onChange}
|
|
224
224
|
pagination: false
|
|
225
225
|
})), /*#__PURE__*/React.createElement(AddPlan, {
|
|
226
|
+
listData: listData,
|
|
226
227
|
detailName: detailName,
|
|
227
228
|
drawerShow: drawerShow,
|
|
228
229
|
drawerClose: drawerClose,
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import { Dispatch } from 'react';
|
|
2
|
+
import { State } from './state';
|
|
3
|
+
import { Action } from './action';
|
|
4
|
+
export declare const DmContext: import("react").Context<{
|
|
5
|
+
state: State;
|
|
6
|
+
dispatch: Dispatch<Action>;
|
|
7
|
+
}>;
|
|
8
|
+
export declare const upDatedDmFun: () => [state: State, dispatch: Dispatch<Action>];
|
|
@@ -0,0 +1,42 @@
|
|
|
1
|
+
function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
|
|
2
|
+
|
|
3
|
+
function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
|
|
4
|
+
|
|
5
|
+
function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
|
|
6
|
+
|
|
7
|
+
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; }
|
|
8
|
+
|
|
9
|
+
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; }
|
|
10
|
+
|
|
11
|
+
function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
|
|
12
|
+
|
|
13
|
+
import { useReducer, createContext } from 'react';
|
|
14
|
+
import { initState } from './state';
|
|
15
|
+
import { ActionType } from './action';
|
|
16
|
+
|
|
17
|
+
var DmReducer = function DmReducer(prevState, action) {
|
|
18
|
+
console.log('DmReducer', prevState, action);
|
|
19
|
+
|
|
20
|
+
switch (action.type) {
|
|
21
|
+
case ActionType.SET_GLOBAL:
|
|
22
|
+
return {
|
|
23
|
+
updateEventMetas: action.payload
|
|
24
|
+
};
|
|
25
|
+
|
|
26
|
+
default:
|
|
27
|
+
return initState;
|
|
28
|
+
}
|
|
29
|
+
};
|
|
30
|
+
|
|
31
|
+
export var DmContext = /*#__PURE__*/createContext({
|
|
32
|
+
state: initState,
|
|
33
|
+
dispatch: function dispatch() {}
|
|
34
|
+
});
|
|
35
|
+
export var upDatedDmFun = function upDatedDmFun() {
|
|
36
|
+
var _useReducer = useReducer(DmReducer, initState),
|
|
37
|
+
_useReducer2 = _slicedToArray(_useReducer, 2),
|
|
38
|
+
state = _useReducer2[0],
|
|
39
|
+
dispatch = _useReducer2[1];
|
|
40
|
+
|
|
41
|
+
return [state, dispatch];
|
|
42
|
+
};
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@zgfe/modules-dm",
|
|
3
|
-
"version": "1.0.2-dm.
|
|
3
|
+
"version": "1.0.2-dm.10",
|
|
4
4
|
"module": "es/index.js",
|
|
5
5
|
"typings": "es/index.d.ts",
|
|
6
6
|
"license": "ISC",
|
|
@@ -53,7 +53,7 @@
|
|
|
53
53
|
"umi-request": "^1.4.0",
|
|
54
54
|
"yorkie": "^2.0.0"
|
|
55
55
|
},
|
|
56
|
-
"gitHead": "
|
|
56
|
+
"gitHead": "99ea80ca260424d957ab32ecbac64e20a8aebfe3",
|
|
57
57
|
"gitHooks": {
|
|
58
58
|
"pre-commit": "lint-staged"
|
|
59
59
|
}
|