@zgfe/modules-settings 2.0.0-zhongyuan.42 → 2.0.0-zhongyuan.44

package/es/modules/createDemand/index.js

@@ -246,7 +246,10 @@ var CreateDemand = function CreateDemand(props) {
           return _objectSpread(_objectSpread({}, item), {}, {
             describe: item.pointDescribe,
             pageImgUrl: item.pageImgUrl || '',
-            imgPath: item.imgPath || ''
+            imgPath: item.imgPath || '',
+            aliasName: item.event.aliasName,
+            eventAttrList: item.event.eventAttrList,
+            triggeringOccasion: item.event.triggeringOccasion
           });
         }) : []);
         setIsHandle(res === null || res === void 0 ? void 0 : res.data.isHandle);
@@ -365,6 +368,14 @@ var CreateDemand = function CreateDemand(props) {
           message.success('保存成功');
           props.onBack && props.onBack();
         }
+        setPointEventInfo(function (val) {
+          return val === null || val === void 0 ? void 0 : val.map(function (item, index) {
+            var _res$data;
+            return _objectSpread(_objectSpread({}, item), {}, {
+              id: (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.pointEventInfo[index].id
+            });
+          });
+        });
         // props.onSubmit && props.onSubmit()
       } else {
         message.error('保存失败');

package/es/modules/demandManage/index.js

@@ -34,7 +34,8 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
     route = _useContext.route,
     router = _useContext.router,
     routes = _useContext.routes,
-    authority = _useContext.authority;
+    authority = _useContext.authority,
+    currentUser = _useContext.currentUser;
   var _useState = useState(),
     _useState2 = _slicedToArray(_useState, 2),
     demandInfo = _useState2[0],
@@ -157,10 +158,15 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
             message.error('无查看权限');
             return;
           }
-          props.onDeal && props.onDeal('revocation', {
-            type: 'manage',
-            demand: data
-          });
+          if (currentUser && (currentUser.isAdmin || currentUser.id == data.currentProcessorId || currentUser.id == data.creatorId)) {
+            props.onDeal && props.onDeal('revocation', {
+              type: 'manage',
+              demand: data
+            });
+          } else {
+            message.error('无法处理该流程!');
+            return;
+          }
           // router &&
           //   router?.push({
           //     name: routes.createDemand,
@@ -298,10 +304,14 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
       type: "link",
       onClick: function onClick() {
         // getDemand('revocation');
-        props.onDeal && props.onDeal('revocation', {
-          type: 'edit',
-          demand: props.record
-        });
+        if ((currentUser === null || currentUser === void 0 ? void 0 : currentUser.id) == props.record.creatorId || (currentUser === null || currentUser === void 0 ? void 0 : currentUser.isAdmin)) {
+          props.onDeal && props.onDeal('revocation', {
+            type: 'edit',
+            demand: props.record
+          });
+        } else {
+          message.error('只有需求提起人或管理员才能修改需求!');
+        }
       }
     }, "\u7F16\u8F91")));
   };

package/es/modules/pointMap/createMetaDrawer.js

@@ -61,12 +61,12 @@ var CreateMeta = function CreateMeta(props) {
       setEventAttrList([]);
       setIsChange(false);
       setIsCopy(false);
-    }
-    if (props.data) {
-      setHomeType(props.isEdit ? 'update' : 'get');
-      initData(props.data);
-    } else {
-      setHomeType('create');
+      if (props.data) {
+        setHomeType(props.isEdit ? 'update' : 'get');
+        initData(props.data);
+      } else {
+        setHomeType('create');
+      }
     }
   }, [props.isShow]);
   var initData = function initData(data) {

package/es/modules/pointMap/pageInfo.js

@@ -18,7 +18,7 @@ function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length)
 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; } }
 function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
 import { BizDialog, BizGlobalDataContext, IconFont } from '@zgfe/business-lib';
-import { Input, message, Button, Table, notification, Upload, Image, Checkbox, Empty, Tooltip, Popover, Modal, Drawer } from 'antd';
+import { Input, message, Button, Table, notification, Upload, Image, Checkbox, Empty, Tooltip, Popover, Modal, Drawer, Spin } from 'antd';
 import React, { useContext, useEffect, useState } from 'react';
 import _ from 'lodash';
 import './styles/pageInfo.less';
@@ -99,27 +99,32 @@ var PageInfo = function PageInfo(props) {
     _useState28 = _slicedToArray(_useState27, 2),
     isHasData = _useState28[0],
     setIsHasData = _useState28[1];
-  // 记录删除的有id的页面埋点
-  var _useState29 = useState([]),
+  //设置加载动画
+  var _useState29 = useState(false),
     _useState30 = _slicedToArray(_useState29, 2),
-    deleteEventIds = _useState30[0],
-    setDeleteEventIds = _useState30[1];
-  var _useState31 = useState(''),
+    mapLoading = _useState30[0],
+    setMapLoading = _useState30[1];
+  // 记录删除的有id的页面埋点
+  var _useState31 = useState([]),
     _useState32 = _slicedToArray(_useState31, 2),
-    eventKey = _useState32[0],
-    setEventKey = _useState32[1];
-  var _useState33 = useState(),
+    deleteEventIds = _useState32[0],
+    setDeleteEventIds = _useState32[1];
+  var _useState33 = useState(''),
     _useState34 = _slicedToArray(_useState33, 2),
-    id = _useState34[0],
-    setId = _useState34[1];
+    eventKey = _useState34[0],
+    setEventKey = _useState34[1];
   var _useState35 = useState(),
     _useState36 = _slicedToArray(_useState35, 2),
-    showIndex = _useState36[0],
-    setShowIndex = _useState36[1];
-  var _useState37 = useState({}),
+    id = _useState36[0],
+    setId = _useState36[1];
+  var _useState37 = useState(),
     _useState38 = _slicedToArray(_useState37, 2),
-    eventData = _useState38[0],
-    setEventData = _useState38[1];
+    showIndex = _useState38[0],
+    setShowIndex = _useState38[1];
+  var _useState39 = useState({}),
+    _useState40 = _slicedToArray(_useState39, 2),
+    eventData = _useState40[0],
+    setEventData = _useState40[1];
   var changeItemInfo = function changeItemInfo(i, key, v) {
     var dealData = _.clone(eventAttrList);
     dealData[i]['isEdit'] = true;
@@ -127,7 +132,7 @@ var PageInfo = function PageInfo(props) {
     setEventAttrList(dealData);
   };
   //埋点筛选
-  var _useState39 = useState([{
+  var _useState41 = useState([{
       label: '在线埋点',
       sum: 0,
       value: 1
@@ -136,28 +141,32 @@ var PageInfo = function PageInfo(props) {
       sum: 0,
       value: 0
     }]),
-    _useState40 = _slicedToArray(_useState39, 2),
-    navList = _useState40[0],
-    setNavList = _useState40[1];
-  var _useState41 = useState(0),
     _useState42 = _slicedToArray(_useState41, 2),
-    navIndex = _useState42[0],
-    setNavIndex = _useState42[1];
-  //创建元事件
-  var _useState43 = useState(false),
+    navList = _useState42[0],
+    setNavList = _useState42[1];
+  var _useState43 = useState(1),
     _useState44 = _slicedToArray(_useState43, 2),
-    createMetaShow = _useState44[0],
-    setCreateMetaShow = _useState44[1];
-  //元事件内容
-  var _useState45 = useState(),
+    navIndex = _useState44[0],
+    setNavIndex = _useState44[1];
+  //创建元事件
+  var _useState45 = useState(false),
     _useState46 = _slicedToArray(_useState45, 2),
-    metaData = _useState46[0],
-    setMetaData = _useState46[1];
-  //日志管理
-  var _useState47 = useState(false),
+    createMetaShow = _useState46[0],
+    setCreateMetaShow = _useState46[1];
+  //元事件内容
+  var _useState47 = useState(),
     _useState48 = _slicedToArray(_useState47, 2),
-    recordShow = _useState48[0],
-    setRecordShow = _useState48[1];
+    metaData = _useState48[0],
+    setMetaData = _useState48[1];
+  var _useState49 = useState(),
+    _useState50 = _slicedToArray(_useState49, 2),
+    metaDataIndex = _useState50[0],
+    setMetaDataIndex = _useState50[1];
+  //日志管理
+  var _useState51 = useState(false),
+    _useState52 = _slicedToArray(_useState51, 2),
+    recordShow = _useState52[0],
+    setRecordShow = _useState52[1];
   useEffect(function () {
     // console.log('props.pageData', props.pageData);
     if (!props.pageData) {
@@ -171,6 +180,7 @@ var PageInfo = function PageInfo(props) {
     props.onChangePageStatus && props.onChangePageStatus(isEdit);
   }, [isEdit]);
   var getPageConfig = function getPageConfig() {
+    setMapLoading(true);
     request(apis.getPageConfig, {
       method: 'post',
       data: {
@@ -180,6 +190,7 @@ var PageInfo = function PageInfo(props) {
       }
     }).then(function (res) {
       if (res && res.code === '100000') {
+        setMapLoading(false);
         setIsEmpty(false);
         setIsEdit(false);
         setPageName(res.data.detail ? res.data.detail.pageName : props.pageData.name);
@@ -523,6 +534,7 @@ var PageInfo = function PageInfo(props) {
             //打开元事件
             setCreateMetaShow(true);
             setMetaData(record);
+            setMetaDataIndex(index);
           }
         }
       }, eventName ? eventName : '选择元事件', !eventName && /*#__PURE__*/React.createElement(IconFont, {
@@ -561,7 +573,7 @@ var PageInfo = function PageInfo(props) {
     dataIndex: 'describe',
     key: 'describe',
     ellipsis: true,
-    width: 198,
+    width: 180,
     render: function render(describe, record, index) {
       if (isEdit || isSelect) {
         return /*#__PURE__*/React.createElement(BizEditText, {
@@ -631,7 +643,7 @@ var PageInfo = function PageInfo(props) {
       title: '昨日',
       dataIndex: 'yesterdayEvent',
       key: 'yesterdayEvent',
-      width: 80,
+      width: 60,
       render: function render(value) {
         return /*#__PURE__*/React.createElement("div", {
           className: "".concat(classPrefix, "-content-select")
@@ -641,7 +653,7 @@ var PageInfo = function PageInfo(props) {
       title: '近7天',
       dataIndex: 'pre7Event',
       key: 'pre7Event',
-      width: 80,
+      width: 70,
       render: function render(value) {
         return /*#__PURE__*/React.createElement("div", {
           className: "".concat(classPrefix, "-content-select")
@@ -662,7 +674,7 @@ var PageInfo = function PageInfo(props) {
     title: '操作',
     dataIndex: 'set',
     key: 'set',
-    width: 72,
+    width: 60,
     fixed: 'right',
     render: function render(_, record, index) {
       return /*#__PURE__*/React.createElement(DealDom, {
@@ -673,7 +685,7 @@ var PageInfo = function PageInfo(props) {
   }] : [{
     title: '操作',
     dataIndex: 'record',
-    width: 72,
+    width: 60,
     fixed: 'right',
     render: function render(_, record, index) {
       return /*#__PURE__*/React.createElement(Button, {
@@ -686,10 +698,10 @@ var PageInfo = function PageInfo(props) {
     }
   }]));
   var DealDom = function DealDom(props) {
-    var _useState49 = useState(false),
-      _useState50 = _slicedToArray(_useState49, 2),
-      open = _useState50[0],
-      setOpen = _useState50[1];
+    var _useState53 = useState(false),
+      _useState54 = _slicedToArray(_useState53, 2),
+      open = _useState54[0],
+      setOpen = _useState54[1];
     var handleOpenChange = function handleOpenChange(newOpen) {
       setOpen(newOpen);
     };
@@ -816,10 +828,12 @@ var PageInfo = function PageInfo(props) {
       style: {
         justifyContent: 'center'
       }
+    }, /*#__PURE__*/React.createElement(Spin, {
+      spinning: mapLoading
     }, /*#__PURE__*/React.createElement(Empty, {
       image: Empty.PRESENTED_IMAGE_SIMPLE,
       description: "\u6682\u65E0\u6570\u636E"
-    })));
+    }))));
   }
   var onCancel = function onCancel() {
     if (!props.pageData) {
@@ -873,8 +887,10 @@ var PageInfo = function PageInfo(props) {
         setShowIndex(void 0);
       }, 3000);
     } else {
-      setEventAttrList(eventAttrList.map(function (res) {
-        return res.eventId == data.eventId ? data : res;
+      setEventAttrList(eventAttrList.map(function (res, index) {
+        return metaDataIndex == index ? _objectSpread(_objectSpread({}, res), {}, {
+          eventAttrList: data.eventAttrList
+        }) : res;
       }));
     }
   };
@@ -923,7 +939,9 @@ var PageInfo = function PageInfo(props) {
     style: {
       marginRight: 8
     }
-  }), "\u7F16\u8F91"))))), /*#__PURE__*/React.createElement("div", {
+  }), "\u7F16\u8F91"))))), /*#__PURE__*/React.createElement(Spin, {
+    spinning: mapLoading
+  }, /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-content")
   }, /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-info")
@@ -1084,7 +1102,7 @@ var PageInfo = function PageInfo(props) {
     },
     pagination: false,
     sticky: true
-  })), isShowCircleSelect && (/*#__PURE__*/React.createElement(BizDialog, {
+  }))), isShowCircleSelect && (/*#__PURE__*/React.createElement(BizDialog, {
     width: 720,
     closable: true,
     title: '位置圈选',

package/es/modules/pointMap/styles/pageInfo.less

@@ -3,6 +3,12 @@
   height: 100%;
   background-color: #fff;
   border-radius: 8px;
+  > .ant-spin-nested-loading {
+    height: 100%;
+    .ant-spin-container {
+      height: 100%;
+    }
+  }
   .bianji1-button:hover {
     background: rgba(22, 93, 255, 0.04);
     border: 1px solid #1454e5;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-settings",
-  "version": "2.0.0-zhongyuan.42",
+  "version": "2.0.0-zhongyuan.44",
   "private": false,
   "module": "es/index.js",
   "typings": "es/index.d.ts",
@@ -67,7 +67,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "6f88dc3a4332378d946e366c140752af52f81b52",
+  "gitHead": "5b3eaf7f95bf4a5a78dffc8ec889ed7cd0f9f0fb",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }