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

package/es/modules/createDemand/constants.js

@@ -54,10 +54,9 @@ var columnsEvent = function columnsEvent(gotoPage, isControl, getPointMap) {
     render: function render(eventName, data) {
       return /*#__PURE__*/React.createElement("a", {
         onClick: function onClick() {
-          return gotoPage && gotoPage('event', eventName);
+          return getPointMap && getPointMap(data);
         }
       }, eventName);
-      //新 getPointMap && getPointMap(data)
     }
   }].concat(_toConsumableArray(isControl ? [{
     title: '审批详情',

package/es/modules/createDemand/index.js

@@ -1089,21 +1089,22 @@ var CreateDemand = function CreateDemand(props) {
     className: "button",
     onClick: function onClick() {
       props.setIsShowSelectList && props.setIsShowSelectList(function (val) {
-        setPointEventInfo([].concat(_toConsumableArray(pointEventInfo || []), _toConsumableArray(val.map(function (val) {
+        var eventList = val.map(function (val) {
           return _objectSpread(_objectSpread({}, val), {}, {
-            status: 0
+            status: val.status || 0
           });
-        }))));
+        });
+        setPointEventInfo(eventList);
         onCreate('save', {
-          pointEventIds: val.filter(function (res) {
+          pointEventIds: eventList.filter(function (res) {
             return res.id;
           }).map(function (res) {
             return res.id;
           }),
-          pointEventStatus: val.map(function (res) {
+          pointEventStatus: eventList.map(function (res) {
             return 0;
           }),
-          eventList: val
+          eventList: eventList
         });
       }, pointEventInfo);
     }

package/es/modules/pointMap/createMetaDrawer.js

@@ -70,7 +70,6 @@ var CreateMeta = function CreateMeta(props) {
     }
   }, [props.isShow]);
   var initData = function initData(data) {
-    console.log(data, 'props');
     form.setFieldsValue({
       aliasName: data.aliasName,
       eventName: data.eventName,
@@ -204,6 +203,7 @@ var CreateMeta = function CreateMeta(props) {
           margin: '-10px 0'
         }
       }, /*#__PURE__*/React.createElement(BizEditText, {
+        canEdit: homeType != 'get',
         value: text,
         max: 128,
         placeholder: '请输入事件属性名',
@@ -224,6 +224,7 @@ var CreateMeta = function CreateMeta(props) {
           margin: '-10px 0'
         }
       }, /*#__PURE__*/React.createElement(BizEditText, {
+        canEdit: homeType != 'get',
         value: aliasName,
         max: 128,
         placeholder: '请输入属性别名',
@@ -242,6 +243,7 @@ var CreateMeta = function CreateMeta(props) {
         marginRight: 8
       }
     }, "*"), /*#__PURE__*/React.createElement(Select, {
+      disabled: homeType == 'get',
       defaultValue: 0,
       style: {
         width: 120,
@@ -294,7 +296,7 @@ var CreateMeta = function CreateMeta(props) {
             color: '#5f6085'
           }
         }),
-        // disabled={rowClassNameHandle(record) == 'error-row' || isDemo ? true : false}
+        disabled: homeType == 'get',
         onChange: function onChange(e) {
           setIsChange(true);
           changeItemInfo(index, 'type', e);
@@ -336,6 +338,7 @@ var CreateMeta = function CreateMeta(props) {
         }
       }),
       // onChange={(e) => props.eventActiveFilter(e, 'is_stop')}
+      disabled: homeType == 'get',
       options: [{
         value: -1,
         label: '加密方式'
@@ -368,7 +371,7 @@ var CreateMeta = function CreateMeta(props) {
             color: '#5f6085'
           }
         }),
-        // disabled={rowClassNameHandle(record) == 'error-row' || isDemo ? true : false}
+        disabled: homeType == 'get',
         onChange: function onChange(e) {
           setIsChange(true);
           changeItemInfo(index, 'encryptionType', e);
@@ -385,7 +388,8 @@ var CreateMeta = function CreateMeta(props) {
         }]
       }));
     }
-  }, {
+  }];
+  homeType != 'get' && columns.push({
     title: '操作',
     dataIndex: 'set',
     key: 'set',
@@ -398,7 +402,7 @@ var CreateMeta = function CreateMeta(props) {
         }
       }, "\u5220\u9664");
     }
-  }];
+  });
   var _useState15 = useState(''),
     _useState16 = _slicedToArray(_useState15, 2),
     scrollY = _useState16[0],

package/es/modules/pointMap/pageInfo.js

@@ -37,103 +37,89 @@ var getImgUrl = function getImgUrl(src, pageId) {
   //   : `${'https://test01.zhugeapi.com'}/web/img/report/${pageId}/${src}`;
 };
 var PageInfo = function PageInfo(props) {
-  console.log(props, 'props');
   var classPrefix = 'setting-point-map-page';
   var _useContext = useContext(BizGlobalDataContext),
     currentApp = _useContext.currentApp,
     isDemo = _useContext.isDemo,
     authority = _useContext.authority;
-  var _useState = useState(false),
+  var _useState = useState(''),
     _useState2 = _slicedToArray(_useState, 2),
-    isShowDel = _useState2[0],
-    setIsShowDel = _useState2[1];
+    pageName = _useState2[0],
+    setPageName = _useState2[1];
   var _useState3 = useState(''),
     _useState4 = _slicedToArray(_useState3, 2),
-    pageName = _useState4[0],
-    setPageName = _useState4[1];
-  var _useState5 = useState(''),
+    describe = _useState4[0],
+    setDescribe = _useState4[1];
+  var _useState5 = useState(false),
     _useState6 = _slicedToArray(_useState5, 2),
-    describe = _useState6[0],
-    setDescribe = _useState6[1];
-  var _useState7 = useState([]),
+    isShowCircleSelect = _useState6[0],
+    setIsShowCircleSelect = _useState6[1];
+  var _useState7 = useState(),
     _useState8 = _slicedToArray(_useState7, 2),
-    eventAttrList = _useState8[0],
-    setEventAttrList = _useState8[1];
-  var _useState9 = useState(),
+    selectIndex = _useState8[0],
+    setSelectIndex = _useState8[1];
+  var _useState9 = useState(false),
     _useState10 = _slicedToArray(_useState9, 2),
-    currentEventAttr = _useState10[0],
-    setCurrentEventAttr = _useState10[1];
-  var _useState11 = useState(false),
-    _useState12 = _slicedToArray(_useState11, 2),
-    isShowBack = _useState12[0],
-    setIsShowBack = _useState12[1];
-  var _useState13 = useState(false),
+    isChange = _useState10[0],
+    setIsChange = _useState10[1];
+  var _useState11 = useState(props.isSelect),
+    _useState12 = _slicedToArray(_useState11, 1),
+    isSelect = _useState12[0];
+  var _useState13 = useState(),
     _useState14 = _slicedToArray(_useState13, 2),
-    isShowCircleSelect = _useState14[0],
-    setIsShowCircleSelect = _useState14[1];
-  var _useState15 = useState(),
+    circleImg = _useState14[0],
+    setCircleImg = _useState14[1];
+  // const [isReadPicCircle, setIsReadPicCircle] = useState(false);
+  // const [isEditPicCircle, setIsEditPicCircle] = useState(false);
+  var _useState15 = useState(props.isSelect ? props.selectPoint : []),
     _useState16 = _slicedToArray(_useState15, 2),
-    selectIndex = _useState16[0],
-    setSelectIndex = _useState16[1];
-  var _useState17 = useState(false),
+    selectPoint = _useState16[0],
+    setSelectPoint = _useState16[1];
+  var _useState17 = useState(props.isSelect ? props.selectPoint : []),
     _useState18 = _slicedToArray(_useState17, 2),
-    isChange = _useState18[0],
-    setIsChange = _useState18[1];
-  // props.isSelect
+    eventAttrList = _useState18[0],
+    setEventAttrList = _useState18[1];
   var _useState19 = useState(false),
-    _useState20 = _slicedToArray(_useState19, 1),
-    isSelect = _useState20[0];
-  var _useState21 = useState(),
+    _useState20 = _slicedToArray(_useState19, 2),
+    isEmpty = _useState20[0],
+    setIsEmpty = _useState20[1];
+  var _useState21 = useState(false),
     _useState22 = _slicedToArray(_useState21, 2),
-    circleImg = _useState22[0],
-    setCircleImg = _useState22[1];
-  // const [isReadPicCircle, setIsReadPicCircle] = useState(false);
-  // const [isEditPicCircle, setIsEditPicCircle] = useState(false);
-  var _useState23 = useState(isSelect ? [] : props.selectPoint),
+    isEdit = _useState22[0],
+    setIsEdit = _useState22[1];
+  var _useState23 = useState(),
     _useState24 = _slicedToArray(_useState23, 2),
-    selectPoint = _useState24[0],
-    setSelectPoint = _useState24[1];
-  var _useState25 = useState(false),
+    imgPath = _useState24[0],
+    setImgPath = _useState24[1];
+  var _useState25 = useState(),
     _useState26 = _slicedToArray(_useState25, 2),
-    isEmpty = _useState26[0],
-    setIsEmpty = _useState26[1];
+    imgUrl = _useState26[0],
+    setImgUrl = _useState26[1];
   var _useState27 = useState(false),
     _useState28 = _slicedToArray(_useState27, 2),
-    isEdit = _useState28[0],
-    setIsEdit = _useState28[1];
-  var _useState29 = useState(),
+    isHasData = _useState28[0],
+    setIsHasData = _useState28[1];
+  // 记录删除的有id的页面埋点
+  var _useState29 = useState([]),
     _useState30 = _slicedToArray(_useState29, 2),
-    imgPath = _useState30[0],
-    setImgPath = _useState30[1];
-  var _useState31 = useState(),
+    deleteEventIds = _useState30[0],
+    setDeleteEventIds = _useState30[1];
+  var _useState31 = useState(''),
     _useState32 = _slicedToArray(_useState31, 2),
-    imgUrl = _useState32[0],
-    setImgUrl = _useState32[1];
-  var _useState33 = useState(false),
+    eventKey = _useState32[0],
+    setEventKey = _useState32[1];
+  var _useState33 = useState(),
     _useState34 = _slicedToArray(_useState33, 2),
-    isHasData = _useState34[0],
-    setIsHasData = _useState34[1];
-  // 记录删除的有id的页面埋点
-  var _useState35 = useState([]),
+    id = _useState34[0],
+    setId = _useState34[1];
+  var _useState35 = useState(),
     _useState36 = _slicedToArray(_useState35, 2),
-    deleteEventIds = _useState36[0],
-    setDeleteEventIds = _useState36[1];
-  var _useState37 = useState(''),
+    showIndex = _useState36[0],
+    setShowIndex = _useState36[1];
+  var _useState37 = useState({}),
     _useState38 = _slicedToArray(_useState37, 2),
-    eventKey = _useState38[0],
-    setEventKey = _useState38[1];
-  var _useState39 = useState(),
-    _useState40 = _slicedToArray(_useState39, 2),
-    id = _useState40[0],
-    setId = _useState40[1];
-  var _useState41 = useState(),
-    _useState42 = _slicedToArray(_useState41, 2),
-    showIndex = _useState42[0],
-    setShowIndex = _useState42[1];
-  var _useState43 = useState({}),
-    _useState44 = _slicedToArray(_useState43, 2),
-    eventData = _useState44[0],
-    setEventData = _useState44[1];
+    eventData = _useState38[0],
+    setEventData = _useState38[1];
   var changeItemInfo = function changeItemInfo(i, key, v) {
     var dealData = _.clone(eventAttrList);
     dealData[i]['isEdit'] = true;
@@ -141,7 +127,7 @@ var PageInfo = function PageInfo(props) {
     setEventAttrList(dealData);
   };
   //埋点筛选
-  var _useState45 = useState([{
+  var _useState39 = useState([{
       label: '在线埋点',
       sum: 0,
       value: 1
@@ -150,28 +136,28 @@ var PageInfo = function PageInfo(props) {
       sum: 0,
       value: 0
     }]),
-    _useState46 = _slicedToArray(_useState45, 2),
-    navList = _useState46[0],
-    setNavList = _useState46[1];
-  var _useState47 = useState(0),
-    _useState48 = _slicedToArray(_useState47, 2),
-    navIndex = _useState48[0],
-    setNavIndex = _useState48[1];
+    _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 _useState49 = useState(false),
-    _useState50 = _slicedToArray(_useState49, 2),
-    createMetaShow = _useState50[0],
-    setCreateMetaShow = _useState50[1];
+  var _useState43 = useState(false),
+    _useState44 = _slicedToArray(_useState43, 2),
+    createMetaShow = _useState44[0],
+    setCreateMetaShow = _useState44[1];
   //元事件内容
-  var _useState51 = useState(),
-    _useState52 = _slicedToArray(_useState51, 2),
-    metaData = _useState52[0],
-    setMetaData = _useState52[1];
+  var _useState45 = useState(),
+    _useState46 = _slicedToArray(_useState45, 2),
+    metaData = _useState46[0],
+    setMetaData = _useState46[1];
   //日志管理
-  var _useState53 = useState(false),
-    _useState54 = _slicedToArray(_useState53, 2),
-    recordShow = _useState54[0],
-    setRecordShow = _useState54[1];
+  var _useState47 = useState(false),
+    _useState48 = _slicedToArray(_useState47, 2),
+    recordShow = _useState48[0],
+    setRecordShow = _useState48[1];
   useEffect(function () {
     // console.log('props.pageData', props.pageData);
     if (!props.pageData) {
@@ -465,9 +451,7 @@ var PageInfo = function PageInfo(props) {
       var _selectPoint = [];
       eventAttrList.map(function (v) {
         _selectPoint.push(_objectSpread(_objectSpread({}, v), {}, {
-          pageName: pageName,
-          pageId: id,
-          pageImgUrl: imgPath
+          pointSelect: v.pointSelect || {}
         }));
       });
       setSelectPoint(_selectPoint);
@@ -702,10 +686,10 @@ var PageInfo = function PageInfo(props) {
     }
   }]));
   var DealDom = function DealDom(props) {
-    var _useState55 = useState(false),
-      _useState56 = _slicedToArray(_useState55, 2),
-      open = _useState56[0],
-      setOpen = _useState56[1];
+    var _useState49 = useState(false),
+      _useState50 = _slicedToArray(_useState49, 2),
+      open = _useState50[0],
+      setOpen = _useState50[1];
     var handleOpenChange = function handleOpenChange(newOpen) {
       setOpen(newOpen);
     };
@@ -752,17 +736,6 @@ var PageInfo = function PageInfo(props) {
       }
     }, "\u79FB\u9664"));
   };
-  var _useState57 = useState(''),
-    _useState58 = _slicedToArray(_useState57, 2),
-    scrollY = _useState58[0],
-    setScrollY = _useState58[1];
-  //页面加载完成后才能获取到对应的元素及其位置
-  var onClose = function onClose() {
-    if (isChange) {
-      setIsShowBack(true);
-      return;
-    }
-  };
   var getBase64 = function getBase64(img, callback) {
     var reader = new FileReader();
     reader.addEventListener('load', function () {
@@ -855,7 +828,6 @@ var PageInfo = function PageInfo(props) {
       getPageConfig();
     }
     setIsEdit(false);
-    setIsShowBack(false);
   };
   var addNewEvent = function addNewEvent() {
     //新埋点管理
@@ -891,7 +863,10 @@ var PageInfo = function PageInfo(props) {
         imgPath: '',
         index: eventAttrList.length,
         key: new Date() * 1,
-        eventAttrList: data.eventAttrList
+        eventAttrList: data.eventAttrList,
+        pageName: pageName,
+        pageId: id,
+        pageImgUrl: imgPath
       }].concat(_toConsumableArray(eventAttrList)));
       setShowIndex(eventAttrList.length);
       setTimeout(function () {
@@ -919,7 +894,6 @@ var PageInfo = function PageInfo(props) {
     size: 16
   }), "\u9875\u9762\u7BA1\u7406"), isEdit ? (/*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Button, {
     onClick: function onClick() {
-      // setIsShowBack(true)
       Modal.confirm({
         wrapClassName: "".concat(classPrefix, "-confirm"),
         title: '提示',
@@ -1103,7 +1077,7 @@ var PageInfo = function PageInfo(props) {
         return res.isOnline == navIndex;
       }
     }).filter(function (res) {
-      return res.pageName == pageName;
+      return res.pageName == pageName || !isSelect;
     }),
     scroll: {
       y: window.innerHeight - 380

package/package.json

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