@vtx/map 1.1.30 → 1.1.32

package/lib/VtxMap/OlMap/Map.js

@@ -734,6 +734,10 @@ var OlMap = /*#__PURE__*/function (_React$Component) {
         return t.clearFrameSelect();
       };
 
+      t.state.gis["clearFrameSelectById"] = function (id) {
+        return t.clearFrameSelectById(id);
+      };
+
       t.state.gis["refresh"] = function () {
         t.refresh();
       };
@@ -1167,7 +1171,7 @@ var OlMap = /*#__PURE__*/function (_React$Component) {
       }
 
       t.drawToolbar.on('drawend', function (e) {
-        var _t$frameSelectProps;
+        var _t$frameSelectProps$p;
 
         // 关闭绘制事件
         t.drawToolbar.finishDrawing(); // 移除
@@ -1412,8 +1416,8 @@ var OlMap = /*#__PURE__*/function (_React$Component) {
           t.props.drawEnd(param);
         }
 
-        if (((_t$frameSelectProps = t.frameSelectProps) === null || _t$frameSelectProps === void 0 ? void 0 : _t$frameSelectProps.callback) instanceof Function) {
-          t.frameSelectProps.callback(param);
+        if (((_t$frameSelectProps$p = t.frameSelectProps[param.attributes.id]) === null || _t$frameSelectProps$p === void 0 ? void 0 : _t$frameSelectProps$p.callback) instanceof Function) {
+          t.frameSelectProps[param.attributes.id].callback(param);
         }
       }); //保存绘制图元的id便于后期比对
 
@@ -2006,7 +2010,7 @@ var OlMap = /*#__PURE__*/function (_React$Component) {
       var t = this;
       var params = {},
           type = geometryType || 'polygon',
-          id = data.id || 'frameSelectFeature';
+          id = data.id || "frameSelectFeature_".concat(Math.random());
       params.color = parameter.color || '#FF0000';
       params.lineColor = parameter.lineColor || '#FF0000';
       params.lineOpacity = parameter.lineOpacity || 1;
@@ -2020,7 +2024,7 @@ var OlMap = /*#__PURE__*/function (_React$Component) {
           id: id
         }
       });
-      t.frameSelectProps = {
+      t.frameSelectProps[id] = {
         callback: callback,
         id: id,
         type: geometryType
@@ -2030,8 +2034,19 @@ var OlMap = /*#__PURE__*/function (_React$Component) {
   }, {
     key: "clearFrameSelect",
     value: function clearFrameSelect() {
-      this.removeGraphic(this.frameSelectProps.id, this.frameSelectProps.type);
+      for (var key in this.frameSelectProps) {
+        this.removeGraphic(this.frameSelectProps[key].id, this.frameSelectProps[key].type);
+      }
+
       this.frameSelectProps = {};
+    } // 清除框选ById
+
+  }, {
+    key: "clearFrameSelectById",
+    value: function clearFrameSelectById(id) {
+      var obj = this.frameSelectProps[id];
+      this.removeGraphic(obj.id, obj.type);
+      delete this.frameSelectProps[id];
     }
     /*
     * 添加信息窗口