@zgfe/modules-settings 2.0.0-zhongyuan.41 → 2.0.0-zhongyuan.43

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.
@@ -246,7 +246,10 @@ var CreateDemand = function CreateDemand(props) {
246
246
  return _objectSpread(_objectSpread({}, item), {}, {
247
247
  describe: item.pointDescribe,
248
248
  pageImgUrl: item.pageImgUrl || '',
249
- imgPath: item.imgPath || ''
249
+ imgPath: item.imgPath || '',
250
+ aliasName: item.event.aliasName,
251
+ eventAttrList: item.event.eventAttrList,
252
+ triggeringOccasion: item.event.triggeringOccasion
250
253
  });
251
254
  }) : []);
252
255
  setIsHandle(res === null || res === void 0 ? void 0 : res.data.isHandle);
@@ -1089,21 +1092,22 @@ var CreateDemand = function CreateDemand(props) {
1089
1092
  className: "button",
1090
1093
  onClick: function onClick() {
1091
1094
  props.setIsShowSelectList && props.setIsShowSelectList(function (val) {
1092
- setPointEventInfo([].concat(_toConsumableArray(pointEventInfo || []), _toConsumableArray(val.map(function (val) {
1095
+ var eventList = val.map(function (val) {
1093
1096
  return _objectSpread(_objectSpread({}, val), {}, {
1094
- status: 0
1097
+ status: val.status || 0
1095
1098
  });
1096
- }))));
1099
+ });
1100
+ setPointEventInfo(eventList);
1097
1101
  onCreate('save', {
1098
- pointEventIds: val.filter(function (res) {
1102
+ pointEventIds: eventList.filter(function (res) {
1099
1103
  return res.id;
1100
1104
  }).map(function (res) {
1101
1105
  return res.id;
1102
1106
  }),
1103
- pointEventStatus: val.map(function (res) {
1107
+ pointEventStatus: eventList.map(function (res) {
1104
1108
  return 0;
1105
1109
  }),
1106
- eventList: val
1110
+ eventList: eventList
1107
1111
  });
1108
1112
  }, pointEventInfo);
1109
1113
  }
@@ -34,7 +34,8 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
34
34
  route = _useContext.route,
35
35
  router = _useContext.router,
36
36
  routes = _useContext.routes,
37
- authority = _useContext.authority;
37
+ authority = _useContext.authority,
38
+ currentUser = _useContext.currentUser;
38
39
  var _useState = useState(),
39
40
  _useState2 = _slicedToArray(_useState, 2),
40
41
  demandInfo = _useState2[0],
@@ -157,10 +158,15 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
157
158
  message.error('无查看权限');
158
159
  return;
159
160
  }
160
- props.onDeal && props.onDeal('revocation', {
161
- type: 'manage',
162
- demand: data
163
- });
161
+ if (currentUser && (currentUser.isAdmin || currentUser.id == data.currentProcessorId || currentUser.id == data.creatorId)) {
162
+ props.onDeal && props.onDeal('revocation', {
163
+ type: 'manage',
164
+ demand: data
165
+ });
166
+ } else {
167
+ message.error('无法处理该流程!');
168
+ return;
169
+ }
164
170
  // router &&
165
171
  // router?.push({
166
172
  // name: routes.createDemand,
@@ -298,10 +304,14 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
298
304
  type: "link",
299
305
  onClick: function onClick() {
300
306
  // getDemand('revocation');
301
- props.onDeal && props.onDeal('revocation', {
302
- type: 'edit',
303
- demand: props.record
304
- });
307
+ if ((currentUser === null || currentUser === void 0 ? void 0 : currentUser.id) == props.record.creatorId || (currentUser === null || currentUser === void 0 ? void 0 : currentUser.isAdmin)) {
308
+ props.onDeal && props.onDeal('revocation', {
309
+ type: 'edit',
310
+ demand: props.record
311
+ });
312
+ } else {
313
+ message.error('只有需求提起人或管理员才能修改需求!');
314
+ }
305
315
  }
306
316
  }, "\u7F16\u8F91")));
307
317
  };
@@ -61,16 +61,15 @@ var CreateMeta = function CreateMeta(props) {
61
61
  setEventAttrList([]);
62
62
  setIsChange(false);
63
63
  setIsCopy(false);
64
- }
65
- if (props.data) {
66
- setHomeType(props.isEdit ? 'update' : 'get');
67
- initData(props.data);
68
- } else {
69
- setHomeType('create');
64
+ if (props.data) {
65
+ setHomeType(props.isEdit ? 'update' : 'get');
66
+ initData(props.data);
67
+ } else {
68
+ setHomeType('create');
69
+ }
70
70
  }
71
71
  }, [props.isShow]);
72
72
  var initData = function initData(data) {
73
- console.log(data, 'props');
74
73
  form.setFieldsValue({
75
74
  aliasName: data.aliasName,
76
75
  eventName: data.eventName,
@@ -204,6 +203,7 @@ var CreateMeta = function CreateMeta(props) {
204
203
  margin: '-10px 0'
205
204
  }
206
205
  }, /*#__PURE__*/React.createElement(BizEditText, {
206
+ canEdit: homeType != 'get',
207
207
  value: text,
208
208
  max: 128,
209
209
  placeholder: '请输入事件属性名',
@@ -224,6 +224,7 @@ var CreateMeta = function CreateMeta(props) {
224
224
  margin: '-10px 0'
225
225
  }
226
226
  }, /*#__PURE__*/React.createElement(BizEditText, {
227
+ canEdit: homeType != 'get',
227
228
  value: aliasName,
228
229
  max: 128,
229
230
  placeholder: '请输入属性别名',
@@ -242,6 +243,7 @@ var CreateMeta = function CreateMeta(props) {
242
243
  marginRight: 8
243
244
  }
244
245
  }, "*"), /*#__PURE__*/React.createElement(Select, {
246
+ disabled: homeType == 'get',
245
247
  defaultValue: 0,
246
248
  style: {
247
249
  width: 120,
@@ -294,7 +296,7 @@ var CreateMeta = function CreateMeta(props) {
294
296
  color: '#5f6085'
295
297
  }
296
298
  }),
297
- // disabled={rowClassNameHandle(record) == 'error-row' || isDemo ? true : false}
299
+ disabled: homeType == 'get',
298
300
  onChange: function onChange(e) {
299
301
  setIsChange(true);
300
302
  changeItemInfo(index, 'type', e);
@@ -336,6 +338,7 @@ var CreateMeta = function CreateMeta(props) {
336
338
  }
337
339
  }),
338
340
  // onChange={(e) => props.eventActiveFilter(e, 'is_stop')}
341
+ disabled: homeType == 'get',
339
342
  options: [{
340
343
  value: -1,
341
344
  label: '加密方式'
@@ -368,7 +371,7 @@ var CreateMeta = function CreateMeta(props) {
368
371
  color: '#5f6085'
369
372
  }
370
373
  }),
371
- // disabled={rowClassNameHandle(record) == 'error-row' || isDemo ? true : false}
374
+ disabled: homeType == 'get',
372
375
  onChange: function onChange(e) {
373
376
  setIsChange(true);
374
377
  changeItemInfo(index, 'encryptionType', e);
@@ -385,7 +388,8 @@ var CreateMeta = function CreateMeta(props) {
385
388
  }]
386
389
  }));
387
390
  }
388
- }, {
391
+ }];
392
+ homeType != 'get' && columns.push({
389
393
  title: '操作',
390
394
  dataIndex: 'set',
391
395
  key: 'set',
@@ -398,7 +402,7 @@ var CreateMeta = function CreateMeta(props) {
398
402
  }
399
403
  }, "\u5220\u9664");
400
404
  }
401
- }];
405
+ });
402
406
  var _useState15 = useState(''),
403
407
  _useState16 = _slicedToArray(_useState15, 2),
404
408
  scrollY = _useState16[0],
@@ -18,7 +18,7 @@ function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length)
18
18
  function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
19
19
  function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
20
20
  import { BizDialog, BizGlobalDataContext, IconFont } from '@zgfe/business-lib';
21
- import { Input, message, Button, Table, notification, Upload, Image, Checkbox, Empty, Tooltip, Popover, Modal, Drawer } from 'antd';
21
+ import { Input, message, Button, Table, notification, Upload, Image, Checkbox, Empty, Tooltip, Popover, Modal, Drawer, Spin } from 'antd';
22
22
  import React, { useContext, useEffect, useState } from 'react';
23
23
  import _ from 'lodash';
24
24
  import './styles/pageInfo.less';
@@ -37,102 +37,94 @@ var getImgUrl = function getImgUrl(src, pageId) {
37
37
  // : `${'https://test01.zhugeapi.com'}/web/img/report/${pageId}/${src}`;
38
38
  };
39
39
  var PageInfo = function PageInfo(props) {
40
- console.log(props, 'props');
41
40
  var classPrefix = 'setting-point-map-page';
42
41
  var _useContext = useContext(BizGlobalDataContext),
43
42
  currentApp = _useContext.currentApp,
44
43
  isDemo = _useContext.isDemo,
45
44
  authority = _useContext.authority;
46
- var _useState = useState(false),
45
+ var _useState = useState(''),
47
46
  _useState2 = _slicedToArray(_useState, 2),
48
- isShowDel = _useState2[0],
49
- setIsShowDel = _useState2[1];
47
+ pageName = _useState2[0],
48
+ setPageName = _useState2[1];
50
49
  var _useState3 = useState(''),
51
50
  _useState4 = _slicedToArray(_useState3, 2),
52
- pageName = _useState4[0],
53
- setPageName = _useState4[1];
54
- var _useState5 = useState(''),
51
+ describe = _useState4[0],
52
+ setDescribe = _useState4[1];
53
+ var _useState5 = useState(false),
55
54
  _useState6 = _slicedToArray(_useState5, 2),
56
- describe = _useState6[0],
57
- setDescribe = _useState6[1];
58
- var _useState7 = useState([]),
55
+ isShowCircleSelect = _useState6[0],
56
+ setIsShowCircleSelect = _useState6[1];
57
+ var _useState7 = useState(),
59
58
  _useState8 = _slicedToArray(_useState7, 2),
60
- eventAttrList = _useState8[0],
61
- setEventAttrList = _useState8[1];
62
- var _useState9 = useState(),
59
+ selectIndex = _useState8[0],
60
+ setSelectIndex = _useState8[1];
61
+ var _useState9 = useState(false),
63
62
  _useState10 = _slicedToArray(_useState9, 2),
64
- currentEventAttr = _useState10[0],
65
- setCurrentEventAttr = _useState10[1];
66
- var _useState11 = useState(false),
67
- _useState12 = _slicedToArray(_useState11, 2),
68
- isShowBack = _useState12[0],
69
- setIsShowBack = _useState12[1];
70
- var _useState13 = useState(false),
63
+ isChange = _useState10[0],
64
+ setIsChange = _useState10[1];
65
+ var _useState11 = useState(props.isSelect),
66
+ _useState12 = _slicedToArray(_useState11, 1),
67
+ isSelect = _useState12[0];
68
+ var _useState13 = useState(),
71
69
  _useState14 = _slicedToArray(_useState13, 2),
72
- isShowCircleSelect = _useState14[0],
73
- setIsShowCircleSelect = _useState14[1];
74
- var _useState15 = useState(),
70
+ circleImg = _useState14[0],
71
+ setCircleImg = _useState14[1];
72
+ // const [isReadPicCircle, setIsReadPicCircle] = useState(false);
73
+ // const [isEditPicCircle, setIsEditPicCircle] = useState(false);
74
+ var _useState15 = useState(props.isSelect ? props.selectPoint : []),
75
75
  _useState16 = _slicedToArray(_useState15, 2),
76
- selectIndex = _useState16[0],
77
- setSelectIndex = _useState16[1];
78
- var _useState17 = useState(false),
76
+ selectPoint = _useState16[0],
77
+ setSelectPoint = _useState16[1];
78
+ var _useState17 = useState(props.isSelect ? props.selectPoint : []),
79
79
  _useState18 = _slicedToArray(_useState17, 2),
80
- isChange = _useState18[0],
81
- setIsChange = _useState18[1];
82
- var _useState19 = useState(props.isSelect),
83
- _useState20 = _slicedToArray(_useState19, 1),
84
- isSelect = _useState20[0];
85
- var _useState21 = useState(),
80
+ eventAttrList = _useState18[0],
81
+ setEventAttrList = _useState18[1];
82
+ var _useState19 = useState(false),
83
+ _useState20 = _slicedToArray(_useState19, 2),
84
+ isEmpty = _useState20[0],
85
+ setIsEmpty = _useState20[1];
86
+ var _useState21 = useState(false),
86
87
  _useState22 = _slicedToArray(_useState21, 2),
87
- circleImg = _useState22[0],
88
- setCircleImg = _useState22[1];
89
- // const [isReadPicCircle, setIsReadPicCircle] = useState(false);
90
- // const [isEditPicCircle, setIsEditPicCircle] = useState(false);
91
- var _useState23 = useState([]),
88
+ isEdit = _useState22[0],
89
+ setIsEdit = _useState22[1];
90
+ var _useState23 = useState(),
92
91
  _useState24 = _slicedToArray(_useState23, 2),
93
- selectPoint = _useState24[0],
94
- setSelectPoint = _useState24[1];
95
- var _useState25 = useState(false),
92
+ imgPath = _useState24[0],
93
+ setImgPath = _useState24[1];
94
+ var _useState25 = useState(),
96
95
  _useState26 = _slicedToArray(_useState25, 2),
97
- isEmpty = _useState26[0],
98
- setIsEmpty = _useState26[1];
96
+ imgUrl = _useState26[0],
97
+ setImgUrl = _useState26[1];
99
98
  var _useState27 = useState(false),
100
99
  _useState28 = _slicedToArray(_useState27, 2),
101
- isEdit = _useState28[0],
102
- setIsEdit = _useState28[1];
103
- var _useState29 = useState(),
100
+ isHasData = _useState28[0],
101
+ setIsHasData = _useState28[1];
102
+ //设置加载动画
103
+ var _useState29 = useState(false),
104
104
  _useState30 = _slicedToArray(_useState29, 2),
105
- imgPath = _useState30[0],
106
- setImgPath = _useState30[1];
107
- var _useState31 = useState(),
105
+ mapLoading = _useState30[0],
106
+ setMapLoading = _useState30[1];
107
+ // 记录删除的有id的页面埋点
108
+ var _useState31 = useState([]),
108
109
  _useState32 = _slicedToArray(_useState31, 2),
109
- imgUrl = _useState32[0],
110
- setImgUrl = _useState32[1];
111
- var _useState33 = useState(false),
110
+ deleteEventIds = _useState32[0],
111
+ setDeleteEventIds = _useState32[1];
112
+ var _useState33 = useState(''),
112
113
  _useState34 = _slicedToArray(_useState33, 2),
113
- isHasData = _useState34[0],
114
- setIsHasData = _useState34[1];
115
- // 记录删除的有id的页面埋点
116
- var _useState35 = useState([]),
114
+ eventKey = _useState34[0],
115
+ setEventKey = _useState34[1];
116
+ var _useState35 = useState(),
117
117
  _useState36 = _slicedToArray(_useState35, 2),
118
- deleteEventIds = _useState36[0],
119
- setDeleteEventIds = _useState36[1];
120
- var _useState37 = useState(''),
118
+ id = _useState36[0],
119
+ setId = _useState36[1];
120
+ var _useState37 = useState(),
121
121
  _useState38 = _slicedToArray(_useState37, 2),
122
- eventKey = _useState38[0],
123
- setEventKey = _useState38[1];
124
- var _useState39 = useState(),
122
+ showIndex = _useState38[0],
123
+ setShowIndex = _useState38[1];
124
+ var _useState39 = useState({}),
125
125
  _useState40 = _slicedToArray(_useState39, 2),
126
- id = _useState40[0],
127
- setId = _useState40[1];
128
- var _useState41 = useState(),
129
- _useState42 = _slicedToArray(_useState41, 2),
130
- showIndex = _useState42[0],
131
- setShowIndex = _useState42[1];
132
- var _useState43 = useState({}),
133
- _useState44 = _slicedToArray(_useState43, 2),
134
- eventData = _useState44[0],
135
- setEventData = _useState44[1];
126
+ eventData = _useState40[0],
127
+ setEventData = _useState40[1];
136
128
  var changeItemInfo = function changeItemInfo(i, key, v) {
137
129
  var dealData = _.clone(eventAttrList);
138
130
  dealData[i]['isEdit'] = true;
@@ -140,7 +132,7 @@ var PageInfo = function PageInfo(props) {
140
132
  setEventAttrList(dealData);
141
133
  };
142
134
  //埋点筛选
143
- var _useState45 = useState([{
135
+ var _useState41 = useState([{
144
136
  label: '在线埋点',
145
137
  sum: 0,
146
138
  value: 1
@@ -149,28 +141,32 @@ var PageInfo = function PageInfo(props) {
149
141
  sum: 0,
150
142
  value: 0
151
143
  }]),
144
+ _useState42 = _slicedToArray(_useState41, 2),
145
+ navList = _useState42[0],
146
+ setNavList = _useState42[1];
147
+ var _useState43 = useState(0),
148
+ _useState44 = _slicedToArray(_useState43, 2),
149
+ navIndex = _useState44[0],
150
+ setNavIndex = _useState44[1];
151
+ //创建元事件
152
+ var _useState45 = useState(false),
152
153
  _useState46 = _slicedToArray(_useState45, 2),
153
- navList = _useState46[0],
154
- setNavList = _useState46[1];
155
- var _useState47 = useState(0),
154
+ createMetaShow = _useState46[0],
155
+ setCreateMetaShow = _useState46[1];
156
+ //元事件内容
157
+ var _useState47 = useState(),
156
158
  _useState48 = _slicedToArray(_useState47, 2),
157
- navIndex = _useState48[0],
158
- setNavIndex = _useState48[1];
159
- //创建元事件
160
- var _useState49 = useState(false),
159
+ metaData = _useState48[0],
160
+ setMetaData = _useState48[1];
161
+ var _useState49 = useState(),
161
162
  _useState50 = _slicedToArray(_useState49, 2),
162
- createMetaShow = _useState50[0],
163
- setCreateMetaShow = _useState50[1];
164
- //元事件内容
165
- var _useState51 = useState(),
166
- _useState52 = _slicedToArray(_useState51, 2),
167
- metaData = _useState52[0],
168
- setMetaData = _useState52[1];
163
+ metaDataIndex = _useState50[0],
164
+ setMetaDataIndex = _useState50[1];
169
165
  //日志管理
170
- var _useState53 = useState(false),
171
- _useState54 = _slicedToArray(_useState53, 2),
172
- recordShow = _useState54[0],
173
- setRecordShow = _useState54[1];
166
+ var _useState51 = useState(false),
167
+ _useState52 = _slicedToArray(_useState51, 2),
168
+ recordShow = _useState52[0],
169
+ setRecordShow = _useState52[1];
174
170
  useEffect(function () {
175
171
  // console.log('props.pageData', props.pageData);
176
172
  if (!props.pageData) {
@@ -184,6 +180,7 @@ var PageInfo = function PageInfo(props) {
184
180
  props.onChangePageStatus && props.onChangePageStatus(isEdit);
185
181
  }, [isEdit]);
186
182
  var getPageConfig = function getPageConfig() {
183
+ setMapLoading(true);
187
184
  request(apis.getPageConfig, {
188
185
  method: 'post',
189
186
  data: {
@@ -193,6 +190,7 @@ var PageInfo = function PageInfo(props) {
193
190
  }
194
191
  }).then(function (res) {
195
192
  if (res && res.code === '100000') {
193
+ setMapLoading(false);
196
194
  setIsEmpty(false);
197
195
  setIsEdit(false);
198
196
  setPageName(res.data.detail ? res.data.detail.pageName : props.pageData.name);
@@ -464,9 +462,7 @@ var PageInfo = function PageInfo(props) {
464
462
  var _selectPoint = [];
465
463
  eventAttrList.map(function (v) {
466
464
  _selectPoint.push(_objectSpread(_objectSpread({}, v), {}, {
467
- pageName: pageName,
468
- pageId: id,
469
- pageImgUrl: imgPath
465
+ pointSelect: v.pointSelect || {}
470
466
  }));
471
467
  });
472
468
  setSelectPoint(_selectPoint);
@@ -538,6 +534,7 @@ var PageInfo = function PageInfo(props) {
538
534
  //打开元事件
539
535
  setCreateMetaShow(true);
540
536
  setMetaData(record);
537
+ setMetaDataIndex(index);
541
538
  }
542
539
  }
543
540
  }, eventName ? eventName : '选择元事件', !eventName && /*#__PURE__*/React.createElement(IconFont, {
@@ -576,7 +573,7 @@ var PageInfo = function PageInfo(props) {
576
573
  dataIndex: 'describe',
577
574
  key: 'describe',
578
575
  ellipsis: true,
579
- width: 198,
576
+ width: 180,
580
577
  render: function render(describe, record, index) {
581
578
  if (isEdit || isSelect) {
582
579
  return /*#__PURE__*/React.createElement(BizEditText, {
@@ -646,7 +643,7 @@ var PageInfo = function PageInfo(props) {
646
643
  title: '昨日',
647
644
  dataIndex: 'yesterdayEvent',
648
645
  key: 'yesterdayEvent',
649
- width: 80,
646
+ width: 60,
650
647
  render: function render(value) {
651
648
  return /*#__PURE__*/React.createElement("div", {
652
649
  className: "".concat(classPrefix, "-content-select")
@@ -656,7 +653,7 @@ var PageInfo = function PageInfo(props) {
656
653
  title: '近7天',
657
654
  dataIndex: 'pre7Event',
658
655
  key: 'pre7Event',
659
- width: 80,
656
+ width: 70,
660
657
  render: function render(value) {
661
658
  return /*#__PURE__*/React.createElement("div", {
662
659
  className: "".concat(classPrefix, "-content-select")
@@ -677,7 +674,7 @@ var PageInfo = function PageInfo(props) {
677
674
  title: '操作',
678
675
  dataIndex: 'set',
679
676
  key: 'set',
680
- width: 72,
677
+ width: 60,
681
678
  fixed: 'right',
682
679
  render: function render(_, record, index) {
683
680
  return /*#__PURE__*/React.createElement(DealDom, {
@@ -688,7 +685,7 @@ var PageInfo = function PageInfo(props) {
688
685
  }] : [{
689
686
  title: '操作',
690
687
  dataIndex: 'record',
691
- width: 72,
688
+ width: 60,
692
689
  fixed: 'right',
693
690
  render: function render(_, record, index) {
694
691
  return /*#__PURE__*/React.createElement(Button, {
@@ -701,10 +698,10 @@ var PageInfo = function PageInfo(props) {
701
698
  }
702
699
  }]));
703
700
  var DealDom = function DealDom(props) {
704
- var _useState55 = useState(false),
705
- _useState56 = _slicedToArray(_useState55, 2),
706
- open = _useState56[0],
707
- setOpen = _useState56[1];
701
+ var _useState53 = useState(false),
702
+ _useState54 = _slicedToArray(_useState53, 2),
703
+ open = _useState54[0],
704
+ setOpen = _useState54[1];
708
705
  var handleOpenChange = function handleOpenChange(newOpen) {
709
706
  setOpen(newOpen);
710
707
  };
@@ -751,17 +748,6 @@ var PageInfo = function PageInfo(props) {
751
748
  }
752
749
  }, "\u79FB\u9664"));
753
750
  };
754
- var _useState57 = useState(''),
755
- _useState58 = _slicedToArray(_useState57, 2),
756
- scrollY = _useState58[0],
757
- setScrollY = _useState58[1];
758
- //页面加载完成后才能获取到对应的元素及其位置
759
- var onClose = function onClose() {
760
- if (isChange) {
761
- setIsShowBack(true);
762
- return;
763
- }
764
- };
765
751
  var getBase64 = function getBase64(img, callback) {
766
752
  var reader = new FileReader();
767
753
  reader.addEventListener('load', function () {
@@ -842,10 +828,12 @@ var PageInfo = function PageInfo(props) {
842
828
  style: {
843
829
  justifyContent: 'center'
844
830
  }
831
+ }, /*#__PURE__*/React.createElement(Spin, {
832
+ spinning: mapLoading
845
833
  }, /*#__PURE__*/React.createElement(Empty, {
846
834
  image: Empty.PRESENTED_IMAGE_SIMPLE,
847
835
  description: "\u6682\u65E0\u6570\u636E"
848
- })));
836
+ }))));
849
837
  }
850
838
  var onCancel = function onCancel() {
851
839
  if (!props.pageData) {
@@ -854,7 +842,6 @@ var PageInfo = function PageInfo(props) {
854
842
  getPageConfig();
855
843
  }
856
844
  setIsEdit(false);
857
- setIsShowBack(false);
858
845
  };
859
846
  var addNewEvent = function addNewEvent() {
860
847
  //新埋点管理
@@ -891,15 +878,19 @@ var PageInfo = function PageInfo(props) {
891
878
  index: eventAttrList.length,
892
879
  key: new Date() * 1,
893
880
  eventAttrList: data.eventAttrList,
894
- pageName: pageName
881
+ pageName: pageName,
882
+ pageId: id,
883
+ pageImgUrl: imgPath
895
884
  }].concat(_toConsumableArray(eventAttrList)));
896
885
  setShowIndex(eventAttrList.length);
897
886
  setTimeout(function () {
898
887
  setShowIndex(void 0);
899
888
  }, 3000);
900
889
  } else {
901
- setEventAttrList(eventAttrList.map(function (res) {
902
- return res.eventId == data.eventId ? data : res;
890
+ setEventAttrList(eventAttrList.map(function (res, index) {
891
+ return metaDataIndex == index ? _objectSpread(_objectSpread({}, res), {}, {
892
+ eventAttrList: data.eventAttrList
893
+ }) : res;
903
894
  }));
904
895
  }
905
896
  };
@@ -919,7 +910,6 @@ var PageInfo = function PageInfo(props) {
919
910
  size: 16
920
911
  }), "\u9875\u9762\u7BA1\u7406"), isEdit ? (/*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Button, {
921
912
  onClick: function onClick() {
922
- // setIsShowBack(true)
923
913
  Modal.confirm({
924
914
  wrapClassName: "".concat(classPrefix, "-confirm"),
925
915
  title: '提示',
@@ -949,7 +939,9 @@ var PageInfo = function PageInfo(props) {
949
939
  style: {
950
940
  marginRight: 8
951
941
  }
952
- }), "\u7F16\u8F91"))))), /*#__PURE__*/React.createElement("div", {
942
+ }), "\u7F16\u8F91"))))), /*#__PURE__*/React.createElement(Spin, {
943
+ spinning: mapLoading
944
+ }, /*#__PURE__*/React.createElement("div", {
953
945
  className: "".concat(classPrefix, "-content")
954
946
  }, /*#__PURE__*/React.createElement("div", {
955
947
  className: "".concat(classPrefix, "-info")
@@ -1110,7 +1102,7 @@ var PageInfo = function PageInfo(props) {
1110
1102
  },
1111
1103
  pagination: false,
1112
1104
  sticky: true
1113
- })), isShowCircleSelect && (/*#__PURE__*/React.createElement(BizDialog, {
1105
+ }))), isShowCircleSelect && (/*#__PURE__*/React.createElement(BizDialog, {
1114
1106
  width: 720,
1115
1107
  closable: true,
1116
1108
  title: '位置圈选',
@@ -3,6 +3,12 @@
3
3
  height: 100%;
4
4
  background-color: #fff;
5
5
  border-radius: 8px;
6
+ > .ant-spin-nested-loading {
7
+ height: 100%;
8
+ .ant-spin-container {
9
+ height: 100%;
10
+ }
11
+ }
6
12
  .bianji1-button:hover {
7
13
  background: rgba(22, 93, 255, 0.04);
8
14
  border: 1px solid #1454e5;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zgfe/modules-settings",
3
- "version": "2.0.0-zhongyuan.41",
3
+ "version": "2.0.0-zhongyuan.43",
4
4
  "private": false,
5
5
  "module": "es/index.js",
6
6
  "typings": "es/index.d.ts",
@@ -67,7 +67,7 @@
67
67
  "publishConfig": {
68
68
  "access": "public"
69
69
  },
70
- "gitHead": "77345198b0b2d6dea2b77cc32c33cb2cca488d15",
70
+ "gitHead": "8b5043d081eb14ac5954fc1bcbcd72681337bb32",
71
71
  "gitHooks": {
72
72
  "pre-commit": "lint-staged"
73
73
  }