@vtx/map 1.1.39 → 1.1.41

package/lib/VtxMap/OlMap/Map.js

@@ -432,10 +432,24 @@ var OlMap = /*#__PURE__*/function (_React$Component) {
           });
 
           if (feature) {
-            var target = feature.getProperties(); //  top: e.clientY,//当前点所在的位置(屏幕)
+            var target = feature.getProperties();
+            var id = '';
+            var elementId = '';
+
+            if ((0, _lodash.isArray)(target.features)) {
+              // 处理聚合点击
+              var properties = target.features[0].getProperties();
+              id = properties.id;
+              elementId = properties.id;
+              target = target.features;
+            } else {
+              id = target.id;
+              elementId = target.element;
+            } //  top: e.clientY,//当前点所在的位置(屏幕)
             // left: e.clientX,
 
-            t.clickGraphic(target.id || target.elementId, evt, target);
+
+            t.clickGraphic(id || elementId, evt, target);
           } else {
             t.clickMap(evt);
           }
@@ -3299,9 +3313,10 @@ var OlMap = /*#__PURE__*/function (_React$Component) {
       function clusterMemberStyle(clusterMember) {
         var style = clusterMember.getStyle();
         var image = style && style.getImage ? style.getImage() : null;
+        var text = style && style.getText ? style.getText() : null;
         return new ol.style.Style({
-          geometry: clusterMember.getGeometry(),
-          image: image
+          image: image,
+          text: text
         });
       }
 
@@ -3371,7 +3386,7 @@ var OlMap = /*#__PURE__*/function (_React$Component) {
       function clusterStyle(feature) {
         var size = feature.get('features').length;
 
-        if (size > 1) {
+        if (size > 2) {
           return [new ol.style.Style({
             image: new ol.style.Circle({
               radius: 20,
@@ -3398,15 +3413,17 @@ var OlMap = /*#__PURE__*/function (_React$Component) {
             })
           })];
         } else {
-          var originalFeature = feature.get('features')[0];
-          return clusterMemberStyle(originalFeature);
+          return feature.get('features').map(function (originalFeature) {
+            return clusterMemberStyle(originalFeature);
+          });
         }
       }
     }
   }, {
     key: "clearCluster",
-    value: function clearCluster() {
+    value: function clearCluster(arg) {
       var t = this;
+      var ids = arg && (arg === null || arg === void 0 ? void 0 : arg.length) > 0 ? arg : t.state.pointIds;
 
       if (t.clusterInfo.clusterHulls) {
         t.state.gis.removeLayer(t.clusterInfo.clusterHulls);
@@ -3423,10 +3440,12 @@ var OlMap = /*#__PURE__*/function (_React$Component) {
         t.clusterInfo.clusterCircles = null;
       }
 
-      t.props.mapPoints.map(function (item) {
-        if (t.GM.getGraphic(item.id)) {
-          t.GM.removeGraphic(item.id);
+      ids.map(function (id) {
+        if (t.GM.getGraphic(id)) {
+          t.GM.removeGraphic(id);
         }
+
+        t.state.pointIds.splice(t.state.pointIds.indexOf(id), 1);
       });
       t.addPoint(t.props.mapPoints);
       t.refresh();
@@ -4185,8 +4204,10 @@ var OlMap = /*#__PURE__*/function (_React$Component) {
 
       if (typeof setCluster == 'boolean' && setCluster || setCluster && setCluster !== t.props.setCluster) {
         t.cluster(mapCluster);
-      } else if (setCluster !== t.props.setCluster) {
-        t.clearCluster();
+      }
+
+      if (!setCluster && setCluster !== t.props.setCluster) {
+        t.clearCluster(mapCluster);
       } //图元编辑调用