@vtx/map 1.1.16 → 1.1.18

package/lib/VtxMap/OlMap/Map.js

@@ -296,7 +296,7 @@ var OlMap = /*#__PURE__*/function (_React$Component) {
 
 
         if (t.props.showControl) {
-          t.showControl(t.props.showControl);
+          t.showControl(t.props);
         } // 画热力图
 
 
@@ -878,7 +878,7 @@ var OlMap = /*#__PURE__*/function (_React$Component) {
           anchor: [-drawParam.parameter.markerContentX || -15, -drawParam.parameter.markerContentY || -15],
           anchorXUnits: 'pixels',
           anchorYUnits: 'pixels',
-          src: drawParam.parameter.url || "".concat(_default2["default"].mapServerURL, "/images/defaultMarker.png"),
+          src: drawParam.parameter.url || require("../images/defaultMarker.png"),
           opacity: 1,
           scale: drawParam.parameter.scale || 1
         })
@@ -893,7 +893,7 @@ var OlMap = /*#__PURE__*/function (_React$Component) {
               anchor: [-drawParam.parameter.markerContentX || -15, -drawParam.parameter.markerContentY || -15],
               anchorXUnits: 'pixels',
               anchorYUnits: 'pixels',
-              src: drawParam.parameter.url || "".concat(_default2["default"].mapServerURL, "/images/defaultMarker.png"),
+              src: drawParam.parameter.url || require("../images/defaultMarker.png"),
               opacity: 1,
               scale: drawParam.parameter.scale || 1
             })
@@ -973,7 +973,7 @@ var OlMap = /*#__PURE__*/function (_React$Component) {
               id: t.drawParam.data.id,
               longitude: lng,
               latitude: lat,
-              url: t.drawParam.parameter.url || "".concat(_default2["default"].mapServerURL, "/images/defaultMarker.png"),
+              url: t.drawParam.parameter.url || require("../images/defaultMarker.png"),
               config: _objectSpread({}, t.drawParam.parameter)
             }], 'point'); //处理点返回参数
 
@@ -981,7 +981,7 @@ var OlMap = /*#__PURE__*/function (_React$Component) {
               id: t.drawParam.data.id,
               attributes: {
                 id: t.drawParam.data.id,
-                url: t.drawParam.parameter.url || "".concat(_default2["default"].mapServerURL, "/images/defaultMarker.png"),
+                url: t.drawParam.parameter.url || require("../images/defaultMarker.png"),
                 config: {
                   width: t.drawParam.parameter.width || 30,
                   height: t.drawParam.parameter.height || 30
@@ -1805,7 +1805,13 @@ var OlMap = /*#__PURE__*/function (_React$Component) {
         var myImage = new Image(cg.width, cg.height);
 
         if (!!item.markerContent) {
-          var nodes = t.parseDom(item.markerContent)[0]; // 创建地图自定义覆盖物
+          var nodes = t.parseDom(item.markerContent)[0]; // 自定义图层需要把事件加在dom上
+
+          nodes.addEventListener("click", function (e) {
+            t.clickGraphic(item.id, _objectSpread(_objectSpread({}, e), {}, {
+              pixel: [e.clientX, e.clientY]
+            }));
+          }); // 创建地图自定义覆盖物
 
           var pop = new ol.Overlay({
             id: item.id,
@@ -1819,7 +1825,7 @@ var OlMap = /*#__PURE__*/function (_React$Component) {
           });
           t.state.gis.addOverlay(pop);
         } else {
-          // item.url || `${configUrl.mapServerURL}/images/defaultMarker.png`,
+          // item.url || require("../images/defaultMarker.png"),
           canvasDataURL(item.url || require("../images/defaultMarker.png"), {
             width: cg.width,
             height: cg.height
@@ -1883,7 +1889,7 @@ var OlMap = /*#__PURE__*/function (_React$Component) {
               anchor: [-cg.markerContentX, -cg.markerContentY],
               anchorXUnits: 'pixels',
               anchorYUnits: 'pixels',
-              // src: item.url || `${configUrl.mapServerURL}/images/defaultMarker.png`,
+              // src: item.url || require("../images/defaultMarker.png"),
               img: myImage,
               imgSize: [cg.width, cg.height],
               opacity: cg.opacity,
@@ -1985,6 +1991,11 @@ var OlMap = /*#__PURE__*/function (_React$Component) {
           if (item.markerContent) {
             var overlay = t.state.gis.getOverlayById(item.id);
             var nodes = t.parseDom(item.markerContent)[0];
+            nodes.addEventListener("click", function (e) {
+              t.clickGraphic(item.id, _objectSpread(_objectSpread({}, e), {}, {
+                pixel: [e.clientX, e.clientY]
+              }));
+            });
             overlay.setElement(nodes);
             overlay.setPosition([parseFloat(item.longitude), parseFloat(item.latitude)]);
             t.state.gis.changed();
@@ -1999,7 +2010,7 @@ var OlMap = /*#__PURE__*/function (_React$Component) {
               anchor: [-cg.markerContentX, -cg.markerContentY],
               anchorXUnits: 'pixels',
               anchorYUnits: 'pixels',
-              // src: item.url || `${configUrl.mapServerURL}/images/defaultMarker.png`,
+              // src: item.url || require("../images/defaultMarker.png"),
               img: myImage,
               imgSize: [cg.width, cg.height],
               opacity: cg.opacity,
@@ -2582,6 +2593,11 @@ var OlMap = /*#__PURE__*/function (_React$Component) {
         //清除对应id的图元数据缓存
 
         t.GM.removeGraphic(id);
+        t.GM.removeGraphicParam(id);
+
+        if (t.state.gis.getOverlayById(id)) {
+          t.state.gis.removeOverlay(t.state.gis.getOverlayById(id));
+        }
       } else {
         return false;
       }
@@ -2784,29 +2800,29 @@ var OlMap = /*#__PURE__*/function (_React$Component) {
         if (config.location == 'tl') {
           $("div.ol-scale-line-".concat(config.location)).css({
             position: 'absolute',
-            left: config.offset[0] + 65,
-            top: config.offset[1],
+            left: config.offset ? config.offset[0] : 0 + 65,
+            top: config.offset ? config.offset[1] : 0,
             textAlign: 'center'
           });
         } else if (config.location == 'bl') {
           $("div.ol-scale-line-".concat(config.location)).css({
             position: 'absolute',
-            left: config.offset[0] + 65,
-            bottom: config.offset[1],
+            left: config.offset ? config.offset[0] : 0 + 65,
+            bottom: config.offset ? config.offset[1] : 0,
             textAlign: 'center'
           });
         } else if (config.location == 'tr') {
           $("div.ol-scale-line-".concat(config.location)).css({
             position: 'absolute',
-            right: config.offset[0] + 65,
-            top: config.offset[1],
+            right: config.offset ? config.offset[0] : 0 + 65,
+            top: config.offset ? config.offset[1] : 0,
             textAlign: 'center'
           });
         } else if (config.location == 'br') {
           $("div.ol-scale-line-".concat(config.location)).css({
             position: 'absolute',
-            right: config.offset[0] + 65,
-            bottom: config.offset[1],
+            right: config.offset ? config.offset[0] : 0 + 65,
+            bottom: config.offset ? config.offset[1] : 0,
             textAlign: 'center'
           });
         }
@@ -4197,7 +4213,7 @@ var Popup = /*#__PURE__*/function (_React$Component2) {
 function getRgbColor(color, opacity) {
   var reg = /^#([0-9A-Fa-f]{3}|[0-9A-Fa-f]{6})$/;
 
-  if (!reg.test(color)) {
+  if (!reg.test(color) && typeof color !== 'string') {
     return;
   }