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

package/es/modules/createDemand/index.js

@@ -349,7 +349,9 @@ var CreateDemand = function CreateDemand(props) {
         id: props.data.demand.id
       } : {}), {}, {
         completionTime: completionTime * 1,
-        pointEventIds: pointEventInfo === null || pointEventInfo === void 0 ? void 0 : pointEventInfo.map(function (item) {
+        pointEventIds: pointEventInfo === null || pointEventInfo === void 0 ? void 0 : pointEventInfo.filter(function (res) {
+          return res.id;
+        }).map(function (item) {
           return item.id;
         }),
         pointEventStatus: type != 'flow' ? pointEventInfo === null || pointEventInfo === void 0 ? void 0 : pointEventInfo.map(function (item) {
@@ -881,7 +883,7 @@ var CreateDemand = function CreateDemand(props) {
   };
   //埋点地图列表
   var getPointEventInfo = function getPointEventInfo() {
-    return (pointEventInfo || []).filter(function (item) {
+    return pointEventInfo.filter(function (item) {
       return new RegExp(_.escapeRegExp(eventKey), 'i').test((item.eventName || '') + (item.pageName || ''));
     });
   };
@@ -1087,13 +1089,15 @@ var CreateDemand = function CreateDemand(props) {
     className: "button",
     onClick: function onClick() {
       props.setIsShowSelectList && props.setIsShowSelectList(function (val) {
-        setPointEventInfo(_toConsumableArray(val.map(function (val) {
+        setPointEventInfo([].concat(_toConsumableArray(pointEventInfo || []), _toConsumableArray(val.map(function (val) {
           return _objectSpread(_objectSpread({}, val), {}, {
             status: 0
           });
-        })));
+        }))));
         onCreate('save', {
-          pointEventIds: val.map(function (res) {
+          pointEventIds: val.filter(function (res) {
+            return res.id;
+          }).map(function (res) {
             return res.id;
           }),
           pointEventStatus: val.map(function (res) {
@@ -1120,7 +1124,9 @@ var CreateDemand = function CreateDemand(props) {
       });
       setPointEventInfo(list);
       onCreate('save', {
-        pointEventIds: list.map(function (res) {
+        pointEventIds: list.filter(function (res) {
+          return res.id;
+        }).map(function (res) {
           return res.id;
         }),
         pointEventStatus: list.map(function (res) {

package/es/modules/pointMap/pageInfo.js

@@ -144,11 +144,11 @@ var PageInfo = function PageInfo(props) {
   var _useState45 = useState([{
       label: '在线埋点',
       sum: 0,
-      value: 0
+      value: 1
     }, {
       label: '下线埋点',
       sum: 0,
-      value: 1
+      value: 0
     }]),
     _useState46 = _slicedToArray(_useState45, 2),
     navList = _useState46[0],
@@ -205,38 +205,38 @@ var PageInfo = function PageInfo(props) {
           uuid: res.data.detail.uuid,
           zosFileKey: res.data.detail.zosFileKey
         } : undefined);
-        // if (!isSelect) {
-        // getPointTree()
-        setEventAttrList(res.data.eventInfos ? res.data.eventInfos.map(function (item, index) {
-          return {
-            id: item.id,
-            eventId: item.eventId,
-            eventName: item.eventName,
-            describe: item.pointDescribe,
-            pointSelect: item.pointSelect,
-            pv: item.pv,
-            imgPath: item.zosImgUrl ? getImgUrl(item.zosImgUrl, props.pageData.id) : '',
-            key: uuid(),
-            index: index,
-            approvalStatus: item.approvalStatus,
-            operationType: item.operationType,
-            del: item.del || 0
-          };
-        }) : []);
-        //计算出当前上线和下线总合数量
-        setNavList(navList.map(function (nav) {
-          var sum = 0;
-          res.data.eventInfos && res.data.eventInfos.map(function (item, index) {
-            if (nav.value == item.del) {
-              sum += 1;
-            }
-          });
-          return _objectSpread(_objectSpread({}, nav), {}, {
-            sum: sum
-          });
-        }));
+        if (!isSelect) {
+          // getPointTree()
+          setEventAttrList(res.data.eventInfos ? res.data.eventInfos.map(function (item, index) {
+            return {
+              id: item.id,
+              eventId: item.eventId,
+              eventName: item.eventName,
+              describe: item.pointDescribe,
+              pointSelect: item.pointSelect,
+              pv: item.pv,
+              imgPath: item.zosImgUrl ? getImgUrl(item.zosImgUrl, props.pageData.id) : '',
+              key: uuid(),
+              index: index,
+              approvalStatus: item.approvalStatus,
+              operationType: item.operationType,
+              isOnline: item.isOnline || 0
+            };
+          }) : []);
+          //计算出当前上线和下线总合数量
+          setNavList(navList.map(function (nav) {
+            var sum = 0;
+            res.data.eventInfos && res.data.eventInfos.map(function (item, index) {
+              if (nav.value == item.isOnline) {
+                sum += 1;
+              }
+            });
+            return _objectSpread(_objectSpread({}, nav), {}, {
+              sum: sum
+            });
+          }));
+        }
       }
-      // }
     }).catch(function (err) {
       console.log(err);
     });
@@ -459,16 +459,23 @@ var PageInfo = function PageInfo(props) {
     setSelectPoint(_selectPoint);
     props.onChangeSelectObj && props.onChangeSelectObj(_selectPoint);
   };
+  //监听埋点列表修改自动选择
+  if (isSelect) {
+    useEffect(function () {
+      var _selectPoint = [];
+      eventAttrList.map(function (v) {
+        _selectPoint.push(_objectSpread(_objectSpread({}, v), {}, {
+          pageName: pageName,
+          pageId: id,
+          pageImgUrl: imgPath
+        }));
+      });
+      setSelectPoint(_selectPoint);
+      props.onChangeSelectObj && props.onChangeSelectObj(_selectPoint);
+    }, [eventAttrList]);
+  }
   // 表格列表筛选项
-  var _useState55 = useState(0),
-    _useState56 = _slicedToArray(_useState55, 2),
-    type = _useState56[0],
-    setType = _useState56[1];
-  var _useState57 = useState(-1),
-    _useState58 = _slicedToArray(_useState57, 2),
-    encryption_type = _useState58[0],
-    setEncryptionType = _useState58[1];
-  var columns = [].concat(_toConsumableArray(!isEdit ? [{
+  var columns = [].concat(_toConsumableArray(!isEdit && !isSelect ? [{
     title: (/*#__PURE__*/React.createElement(Checkbox, {
       checked: checkedAllHandle(),
       onChange: function onChange(e) {
@@ -495,8 +502,8 @@ var PageInfo = function PageInfo(props) {
     sorter: function sorter(a, b) {
       return a.index - b.index;
     },
-    render: function render(text) {
-      return /*#__PURE__*/React.createElement("span", null, text + 1);
+    render: function render(text, record, index) {
+      return /*#__PURE__*/React.createElement("span", null, index + 1);
     }
   }, {
     title: (/*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("span", {
@@ -623,16 +630,50 @@ var PageInfo = function PageInfo(props) {
         size: 16
       }), "\u5708\u9009")));
     }
-  }, {
-    title: '访问量',
-    dataIndex: 'pv',
-    key: 'pv',
-    width: 92,
-    render: function render(pv) {
-      return /*#__PURE__*/React.createElement("div", {
-        className: "".concat(classPrefix, "-content-select")
-      }, pv || pv === 0 ? pv : '-');
-    }
+  },
+  // {
+  //   title: '访问量',
+  //   dataIndex: 'pv',
+  //   key: 'pv',
+  //   width: 92,
+  //   render: (pv) => {
+  //     return <div className={`${classPrefix}-content-select`}>{pv || pv === 0 ? pv : '-'}</div>;
+  //   },
+  // },
+  // 新
+  {
+    title: '数据量',
+    children: [{
+      title: '昨日',
+      dataIndex: 'yesterdayEvent',
+      key: 'yesterdayEvent',
+      width: 80,
+      render: function render(value) {
+        return /*#__PURE__*/React.createElement("div", {
+          className: "".concat(classPrefix, "-content-select")
+        }, value || value === 0 ? value : '-');
+      }
+    }, {
+      title: '近7天',
+      dataIndex: 'pre7Event',
+      key: 'pre7Event',
+      width: 80,
+      render: function render(value) {
+        return /*#__PURE__*/React.createElement("div", {
+          className: "".concat(classPrefix, "-content-select")
+        }, value || value === 0 ? value : '-');
+      }
+    }, {
+      title: '近30天',
+      dataIndex: 'pre30Event',
+      key: 'pre30Event',
+      width: 80,
+      render: function render(value) {
+        return /*#__PURE__*/React.createElement("div", {
+          className: "".concat(classPrefix, "-content-select")
+        }, value || value === 0 ? value : '-');
+      }
+    }]
   }], _toConsumableArray(isEdit || isSelect ? [{
     title: '操作',
     dataIndex: 'set',
@@ -661,10 +702,10 @@ var PageInfo = function PageInfo(props) {
     }
   }]));
   var DealDom = function DealDom(props) {
-    var _useState59 = useState(false),
-      _useState60 = _slicedToArray(_useState59, 2),
-      open = _useState60[0],
-      setOpen = _useState60[1];
+    var _useState55 = useState(false),
+      _useState56 = _slicedToArray(_useState55, 2),
+      open = _useState56[0],
+      setOpen = _useState56[1];
     var handleOpenChange = function handleOpenChange(newOpen) {
       setOpen(newOpen);
     };
@@ -711,10 +752,10 @@ var PageInfo = function PageInfo(props) {
       }
     }, "\u79FB\u9664"));
   };
-  var _useState61 = useState(''),
-    _useState62 = _slicedToArray(_useState61, 2),
-    scrollY = _useState62[0],
-    setScrollY = _useState62[1];
+  var _useState57 = useState(''),
+    _useState58 = _slicedToArray(_useState57, 2),
+    scrollY = _useState58[0],
+    setScrollY = _useState58[1];
   //页面加载完成后才能获取到对应的元素及其位置
   var onClose = function onClose() {
     if (isChange) {
@@ -846,7 +887,7 @@ var PageInfo = function PageInfo(props) {
         triggeringOccasion: data.triggeringOccasion,
         aliasName: data.aliasName,
         describe: '',
-        pointSelect: '',
+        pointSelect: undefined,
         imgPath: '',
         index: eventAttrList.length,
         key: new Date() * 1,
@@ -1059,8 +1100,10 @@ var PageInfo = function PageInfo(props) {
       if (isEdit || isSelect) {
         return true;
       } else {
-        return res.del == navIndex;
+        return res.isOnline == navIndex;
       }
+    }).filter(function (res) {
+      return res.pageName == pageName;
     }),
     scroll: {
       y: window.innerHeight - 380

package/package.json

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