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

package/es/modules/createDemand/index.js

@@ -1087,11 +1087,11 @@ 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) {
+        setPointEventInfo(_toConsumableArray(val.map(function (val) {
           return _objectSpread(_objectSpread({}, val), {}, {
             status: 0
           });
-        }))));
+        })));
         onCreate('save', {
           pointEventIds: val.map(function (res) {
             return res.id;

package/es/modules/pointMap/pageInfo.js

@@ -80,7 +80,7 @@ var PageInfo = function PageInfo(props) {
     isChange = _useState18[0],
     setIsChange = _useState18[1];
   // props.isSelect
-  var _useState19 = useState(props.isSelect),
+  var _useState19 = useState(false),
     _useState20 = _slicedToArray(_useState19, 1),
     isSelect = _useState20[0];
   var _useState21 = useState(),
@@ -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 || 1
-            };
-          }) : []);
-          //计算出当前上线和下线总合数量
-          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,
+            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
+          });
+        }));
       }
+      // }
     }).catch(function (err) {
       console.log(err);
     });
@@ -623,49 +623,16 @@ var PageInfo = function PageInfo(props) {
         size: 16
       }), "\u5708\u9009")));
     }
-  },
-  // {
-  //   title: '访问量',
-  //   dataIndex: 'pv',
-  //   key: 'pv',
-  //   width: 92,
-  //   render: (pv) => {
-  //     return <div className={`${classPrefix}-content-select`}>{pv || pv === 0 ? pv : '-'}</div>;
-  //   },
-  // },
-  {
-    title: '数据量',
-    children: [{
-      title: '昨日',
-      dataIndex: 'time1',
-      key: 'time1',
-      width: 80,
-      render: function render(value) {
-        return /*#__PURE__*/React.createElement("div", {
-          className: "".concat(classPrefix, "-content-select")
-        }, value || value === 0 ? value : '-');
-      }
-    }, {
-      title: '近7天',
-      dataIndex: 'time1',
-      key: 'time1',
-      width: 80,
-      render: function render(value) {
-        return /*#__PURE__*/React.createElement("div", {
-          className: "".concat(classPrefix, "-content-select")
-        }, value || value === 0 ? value : '-');
-      }
-    }, {
-      title: '近30天',
-      dataIndex: 'time1',
-      key: 'time1',
-      width: 80,
-      render: function render(value) {
-        return /*#__PURE__*/React.createElement("div", {
-          className: "".concat(classPrefix, "-content-select")
-        }, value || value === 0 ? value : '-');
-      }
-    }]
+  }, {
+    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 : '-');
+    }
   }], _toConsumableArray(isEdit || isSelect ? [{
     title: '操作',
     dataIndex: 'set',
@@ -1088,6 +1055,12 @@ var PageInfo = function PageInfo(props) {
     rowKey: 'uuid',
     dataSource: (eventAttrList || []).filter(function (item) {
       return new RegExp(_.escapeRegExp(eventKey), 'i').test(item.eventName || '');
+    }).filter(function (res) {
+      if (isEdit || isSelect) {
+        return true;
+      } else {
+        return res.del == navIndex;
+      }
     }),
     scroll: {
       y: window.innerHeight - 380

package/package.json

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