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

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/pointMap/pageInfo.js

@@ -79,8 +79,7 @@ var PageInfo = function PageInfo(props) {
     _useState18 = _slicedToArray(_useState17, 2),
     isChange = _useState18[0],
     setIsChange = _useState18[1];
-  // props.isSelect
-  var _useState19 = useState(false),
+  var _useState19 = useState(props.isSelect),
     _useState20 = _slicedToArray(_useState19, 1),
     isSelect = _useState20[0];
   var _useState21 = useState(),
@@ -89,7 +88,7 @@ var PageInfo = function PageInfo(props) {
     setCircleImg = _useState22[1];
   // const [isReadPicCircle, setIsReadPicCircle] = useState(false);
   // const [isEditPicCircle, setIsEditPicCircle] = useState(false);
-  var _useState23 = useState(isSelect ? [] : props.selectPoint),
+  var _useState23 = useState([]),
     _useState24 = _slicedToArray(_useState23, 2),
     selectPoint = _useState24[0],
     setSelectPoint = _useState24[1];
@@ -891,7 +890,8 @@ var PageInfo = function PageInfo(props) {
         imgPath: '',
         index: eventAttrList.length,
         key: new Date() * 1,
-        eventAttrList: data.eventAttrList
+        eventAttrList: data.eventAttrList,
+        pageName: pageName
       }].concat(_toConsumableArray(eventAttrList)));
       setShowIndex(eventAttrList.length);
       setTimeout(function () {
@@ -1103,7 +1103,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.41",
   "private": false,
   "module": "es/index.js",
   "typings": "es/index.d.ts",
@@ -67,7 +67,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "ed2ddab815c391cba7365f83e20a8cd1987d63b7",
+  "gitHead": "77345198b0b2d6dea2b77cc32c33cb2cca488d15",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }