@antv/l7-component 2.20.20 → 2.21.1

package/es/control/baseControl/control.d.ts

@@ -1,7 +1,6 @@
-import type { IControl, IControlService, IGlobalConfigService, ILayerService, IMapService, IRendererService, ISceneService, PositionName } from '@antv/l7-core';
+import type { IControl, IControlService, IGlobalConfigService, ILayerService, IMapService, IRendererService, ISceneService, L7Container, PositionName } from '@antv/l7-core';
 import { PositionType } from '@antv/l7-core';
 import EventEmitter from 'eventemitter3';
-import type { Container } from 'inversify';
 import type { ControlEvent } from '../../interface';
 export { PositionType } from '@antv/l7-core';
 export { Control };
@@ -31,7 +30,7 @@ export default class Control<O extends IControlOption = IControlOption> extends
      * @protected
      */
     protected isShow: boolean;
-    protected sceneContainer: Container;
+    protected sceneContainer: L7Container;
     protected scene: ISceneService;
     protected mapsService: IMapService;
     protected renderService: IRendererService;
@@ -49,7 +48,7 @@ export default class Control<O extends IControlOption = IControlOption> extends
      * 当 Control 被添加至 Scene 中，被 controlService 调用的方法
      * @param sceneContainer
      */
-    addTo(sceneContainer: Container): this;
+    addTo(sceneContainer: L7Container): this;
     /**
      * 将控件移除时触发
      */

package/es/control/baseControl/control.js

@@ -8,7 +8,7 @@ import _getPrototypeOf from "@babel/runtime/helpers/esm/getPrototypeOf";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
-import { PositionType, TYPES } from '@antv/l7-core';
+import { PositionType } from '@antv/l7-core';
 import { DOM } from '@antv/l7-utils';
 import EventEmitter from 'eventemitter3';
 export { PositionType } from '@antv/l7-core';
@@ -80,12 +80,12 @@ var Control = /*#__PURE__*/function (_ref) {
     key: "addTo",
     value: function addTo(sceneContainer) {
       // 初始化各个 Service 实例
-      this.mapsService = sceneContainer.get(TYPES.IMapService);
-      this.renderService = sceneContainer.get(TYPES.IRendererService);
-      this.layerService = sceneContainer.get(TYPES.ILayerService);
-      this.controlService = sceneContainer.get(TYPES.IControlService);
-      this.configService = sceneContainer.get(TYPES.IGlobalConfigService);
-      this.scene = sceneContainer.get(TYPES.ISceneService);
+      this.mapsService = sceneContainer.mapService;
+      this.renderService = sceneContainer.rendererService;
+      this.layerService = sceneContainer.layerService;
+      this.controlService = sceneContainer.controlService;
+      this.configService = sceneContainer.globalConfigService;
+      this.scene = sceneContainer.sceneService;
       this.sceneContainer = sceneContainer;
       this.isShow = true;
 

package/es/control/swipe.d.ts

@@ -1,5 +1,4 @@
-import type { ILayer } from '@antv/l7-core';
-import type { Container } from 'inversify';
+import type { ILayer, L7Container } from '@antv/l7-core';
 import type { IControlOption } from './baseControl';
 import { Control } from './baseControl';
 export interface ISwipeControlOption extends IControlOption {
@@ -32,7 +31,7 @@ export default class Swipe extends Control<ISwipeControlOption> {
     private maskLayer;
     getDefault(): ISwipeControlOption;
     onAdd(): HTMLElement;
-    addTo(sceneContainer: Container): this;
+    addTo(sceneContainer: L7Container): this;
     onRemove(): void;
     show(): void;
     hide(): void;

package/es/control/swipe.js

@@ -11,7 +11,7 @@ import _getPrototypeOf from "@babel/runtime/helpers/esm/getPrototypeOf";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
-import { TYPES, createLayerContainer } from '@antv/l7-core';
+import { createLayerContainer } from '@antv/l7-core';
 import { PolygonLayer } from '@antv/l7-layers';
 import { DOM } from '@antv/l7-utils';
 import { Control } from "./baseControl";
@@ -55,7 +55,6 @@ var Swipe = /*#__PURE__*/function (_Control) {
             });
             // fallthrough
           }
-
         case 'mousemove':
         case 'touchmove':
           {
@@ -121,12 +120,10 @@ var Swipe = /*#__PURE__*/function (_Control) {
       }
     });
     _defineProperty(_assertThisInitialized(_this), "getMaskLayer", function () {
+      console.log(_this.getMaskGeoData());
       return new PolygonLayer({
         visible: false
-      }).source({
-        type: 'FeatureCollection',
-        features: []
-      }).shape('fill').color('red').style({
+      }).source(_this.getMaskGeoData()).shape('fill').color('red').style({
         opacity: 0.1
       });
     });
@@ -177,12 +174,12 @@ var Swipe = /*#__PURE__*/function (_Control) {
     key: "addTo",
     value: function addTo(sceneContainer) {
       // 初始化各个 Service 实例
-      this.mapsService = sceneContainer.get(TYPES.IMapService);
-      this.renderService = sceneContainer.get(TYPES.IRendererService);
-      this.layerService = sceneContainer.get(TYPES.ILayerService);
-      this.controlService = sceneContainer.get(TYPES.IControlService);
-      this.configService = sceneContainer.get(TYPES.IGlobalConfigService);
-      this.scene = sceneContainer.get(TYPES.ISceneService);
+      this.mapsService = sceneContainer.mapService;
+      this.renderService = sceneContainer.rendererService;
+      this.layerService = sceneContainer.layerService;
+      this.controlService = sceneContainer.controlService;
+      this.configService = sceneContainer.globalConfigService;
+      this.scene = sceneContainer.sceneService;
       this.sceneContainer = sceneContainer;
       this.isShow = true;
 
@@ -204,17 +201,16 @@ var Swipe = /*#__PURE__*/function (_Control) {
       // this.scene.getSceneContainer().appendChild(this.container);
       this.mapsService.getMarkerContainer().appendChild(this.container);
       this.maskLayer = this.getMaskLayer();
-      this.updateMask();
       this.registerEvent();
 
-      // 给图层挂载掩膜
-      this.addMaskToLayers(layers, false);
-      this.addMaskToLayers(rightLayers, true);
-
       // 添加掩膜图层到 scene
       var layerContainer = createLayerContainer(sceneContainer);
-      this.maskLayer.setContainer(layerContainer, sceneContainer);
+      this.maskLayer.setContainer(layerContainer);
       this.scene.addLayer(this.maskLayer);
+
+      // 给图层挂载掩膜
+      this.addMaskToLayers(layers, false);
+      this.addMaskToLayers(rightLayers, true);
       this.emit('add', this);
       return this;
     }

package/es/marker-layer.d.ts

@@ -1,6 +1,5 @@
-import type { IMarker } from '@antv/l7-core';
+import type { IMarker, L7Container } from '@antv/l7-core';
 import { EventEmitter } from 'eventemitter3';
-import type { Container } from 'inversify';
 import type { IMarkerLayerOption } from './interface';
 export default class MarkerLayer extends EventEmitter {
     private markers;
@@ -26,7 +25,7 @@ export default class MarkerLayer extends EventEmitter {
             className: string;
         };
     };
-    addTo(scene: Container): this;
+    addTo(scene: L7Container): this;
     private setContainerSize;
     private getContainerSize;
     addMarker(marker: IMarker): void;

package/es/marker-layer.js

@@ -8,7 +8,6 @@ import _getPrototypeOf from "@babel/runtime/helpers/esm/getPrototypeOf";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
-import { TYPES } from '@antv/l7-core';
 import { DOM, Satistics, bindAll, boundsContains, lodashUtil, padBounds } from '@antv/l7-utils';
 import { EventEmitter } from 'eventemitter3';
 // @ts-ignore
@@ -56,7 +55,7 @@ var MarkerLayer = /*#__PURE__*/function (_EventEmitter) {
     value: function addTo(scene) {
       // this.remove();
       this.scene = scene;
-      this.mapsService = scene.get(TYPES.IMapService);
+      this.mapsService = scene.mapService;
       if (this.markerLayerOption.cluster) {
         this.initCluster();
         this.update();
@@ -64,7 +63,6 @@ var MarkerLayer = /*#__PURE__*/function (_EventEmitter) {
         this.mapsService.on('camerachange', this.update); // amap1.x 更新事件
         this.mapsService.on('viewchange', this.update); // amap2.0 更新事件
       }
-
       this.mapsService.on('camerachange', this.setContainerSize.bind(this)); // amap1.x 更新事件
       this.mapsService.on('viewchange', this.setContainerSize.bind(this)); // amap2.0 更新事件
       this.addMarkers();

package/es/marker.d.ts

@@ -1,13 +1,10 @@
-import type { ILngLat, IMarkerContainerAndBounds, IMarkerOption, IPoint, IPopup } from '@antv/l7-core';
+import type { ILngLat, IMarkerContainerAndBounds, IMarkerOption, IPoint, IPopup, L7Container } from '@antv/l7-core';
 import { anchorType } from '@antv/l7-utils';
 import { EventEmitter } from 'eventemitter3';
-import type { Container } from 'inversify';
 export default class Marker extends EventEmitter {
     private markerOption;
-    private defaultMarker;
     private popup;
     private mapsService;
-    private sceneSerive;
     private lngLat;
     private scene;
     private added;
@@ -21,7 +18,7 @@ export default class Marker extends EventEmitter {
         color: string;
         draggable: boolean;
     };
-    addTo(scene: Container): this;
+    addTo(scene: L7Container): this;
     remove(): this;
     setLnglat(lngLat: ILngLat | IPoint): this;
     getLnglat(): ILngLat;

package/es/marker.js

@@ -8,9 +8,9 @@ import _getPrototypeOf from "@babel/runtime/helpers/esm/getPrototypeOf";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
-import { TYPES } from '@antv/l7-core';
-import { DOM, anchorType, applyAnchorClass, bindAll, isPC, anchorTranslate } from '@antv/l7-utils';
+import { DOM, anchorTranslate, anchorType, applyAnchorClass, bindAll, isPC } from '@antv/l7-utils';
 import { EventEmitter } from 'eventemitter3';
+
 //  marker 支持 dragger 未完成
 var Marker = /*#__PURE__*/function (_EventEmitter) {
   _inherits(Marker, _EventEmitter);
@@ -58,7 +58,7 @@ var Marker = /*#__PURE__*/function (_EventEmitter) {
       _this.preLngLat = e.lnglat;
       _this.emit('dragging', newLngLat);
     });
-    _defineProperty(_assertThisInitialized(_this), "onMarkerDragEnd", function (e) {
+    _defineProperty(_assertThisInitialized(_this), "onMarkerDragEnd", function () {
       _this.mapsService.setMapStatus({
         dragEnable: true,
         zoomEnable: true
@@ -100,16 +100,11 @@ var Marker = /*#__PURE__*/function (_EventEmitter) {
   }, {
     key: "addTo",
     value: function addTo(scene) {
-      // this.remove();
       this.scene = scene;
-      this.mapsService = scene.get(TYPES.IMapService);
-      this.sceneSerive = scene.get(TYPES.ISceneService);
+      this.mapsService = scene.mapService;
       var element = this.markerOption.element;
-      // this.sceneSerive.getSceneContainer().appendChild(element as HTMLElement);
       this.mapsService.getMarkerContainer().appendChild(element);
       this.registerMarkerEvent(element);
-      //天地图仅监听zoomchange 不注册camerachane,对于平移,在mapsService中实现
-      // this.mapsService.on('zoomchange', this.updatePositionWhenZoom);
       this.mapsService.on('camerachange', this.update); // 注册高德1.x 的地图事件监听
       this.update();
       this.updateDraggable();
@@ -124,7 +119,6 @@ var Marker = /*#__PURE__*/function (_EventEmitter) {
         this.mapsService.off('click', this.onMapClick);
         this.mapsService.off('move', this.update);
         this.mapsService.off('moveend', this.update);
-        // this.mapsService.off('zoomchange', this.update);
         this.mapsService.off('camerachange', this.update);
       }
       this.unRegisterMarkerEvent();
@@ -407,7 +401,6 @@ var Marker = /*#__PURE__*/function (_EventEmitter) {
         }
         element.style.left = pos.x + offsets[0] + 'px';
         element.style.top = pos.y - offsets[1] + 'px';
-        console.log(element.style.left);
       }
     }
   }, {
@@ -419,7 +412,6 @@ var Marker = /*#__PURE__*/function (_EventEmitter) {
         color = _this$markerOption4.color,
         anchor = _this$markerOption4.anchor;
       if (!element) {
-        this.defaultMarker = true;
         element = DOM.create('div');
         this.markerOption.element = element;
         var svg = document.createElementNS('http://www.w3.org/2000/svg', 'svg');

package/es/popup/layerPopup.d.ts

@@ -1,6 +1,5 @@
-import type { ILayer, IPopupOption } from '@antv/l7-core';
+import type { ILayer, IPopupOption, L7Container } from '@antv/l7-core';
 import { DOM } from '@antv/l7-utils';
-import type { Container } from 'inversify';
 import Popup from './popup';
 type ElementType = DOM.ElementType;
 export type LayerField = {
@@ -46,7 +45,7 @@ export default class LayerPopup extends Popup<ILayerPopupOption> {
         featureId: number;
     };
     protected get layerConfigItems(): LayerPopupConfigItem[];
-    addTo(scene: Container): this;
+    addTo(scene: L7Container): this;
     remove(): this;
     setOptions(option: Partial<ILayerPopupOption>): this;
     protected getDefault(option: Partial<ILayerPopupOption>): ILayerPopupOption;

package/es/popup/popup.d.ts

@@ -1,7 +1,6 @@
-import type { ILayerService, ILngLat, IMapService, IPopup, IPopupOption, ISceneService } from '@antv/l7-core';
+import type { ILayerService, ILngLat, IMapService, IPopup, IPopupOption, ISceneService, L7Container } from '@antv/l7-core';
 import { DOM } from '@antv/l7-utils';
 import { EventEmitter } from 'eventemitter3';
-import type { Container } from 'inversify';
 type ElementType = DOM.ElementType;
 export { Popup };
 export default class Popup<O extends IPopupOption = IPopupOption> extends EventEmitter implements IPopup {
@@ -13,7 +12,7 @@ export default class Popup<O extends IPopupOption = IPopupOption> extends EventE
     protected mapsService: IMapService;
     protected sceneService: ISceneService;
     protected layerService: ILayerService;
-    protected scene: Container;
+    protected scene: L7Container;
     /**
      * 关闭按钮对应的 DOM
      * @protected
@@ -53,7 +52,7 @@ export default class Popup<O extends IPopupOption = IPopupOption> extends EventE
     protected set lngLat(newLngLat: ILngLat);
     constructor(cfg?: Partial<O>);
     getIsShow(): boolean;
-    addTo(scene: Container): this;
+    addTo(scene: L7Container): this;
     remove(): this | undefined;
     /**
      * 获取 option 配置

package/es/popup/popup.js

@@ -8,8 +8,7 @@ import _getPrototypeOf from "@babel/runtime/helpers/esm/getPrototypeOf";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
-import { TYPES } from '@antv/l7-core';
-import { anchorTranslate, anchorType, applyAnchorClass, DOM } from '@antv/l7-utils';
+import { DOM, anchorTranslate, anchorType, applyAnchorClass } from '@antv/l7-utils';
 import { EventEmitter } from 'eventemitter3';
 import { createL7Icon } from "../utils/icon";
 export { Popup };
@@ -84,12 +83,6 @@ var Popup = /*#__PURE__*/function (_EventEmitter) {
       if (!_this.mapsService || _this.popupOption.followCursor) {
         return;
       }
-      var _this$lngLat2 = _this.lngLat,
-        lng = _this$lngLat2.lng,
-        lat = _this$lngLat2.lat;
-      var _this$mapsService$lng2 = _this.mapsService.lngLatToContainer([lng, lat]),
-        x = _this$mapsService$lng2.x,
-        y = _this$mapsService$lng2.y;
       var map = ev.map;
       var viewHalf = map.getSize();
       viewHalf.x = viewHalf.x / 2;
@@ -195,9 +188,9 @@ var Popup = /*#__PURE__*/function (_EventEmitter) {
   }, {
     key: "addTo",
     value: function addTo(scene) {
-      this.mapsService = scene.get(TYPES.IMapService);
-      this.sceneService = scene.get(TYPES.ISceneService);
-      this.layerService = scene.get(TYPES.ILayerService);
+      this.mapsService = scene.mapService;
+      this.sceneService = scene.sceneService;
+      this.layerService = scene.layerService;
       //天地图仅监听zoomchange 不注册camerachane,对于平移,在mapsService中实现
       // this.mapsService.on('zoomchange', this.updateWhenZoom);
       this.mapsService.on('camerachange', this.update);
@@ -390,9 +383,9 @@ var Popup = /*#__PURE__*/function (_EventEmitter) {
   }, {
     key: "panToPopup",
     value: function panToPopup() {
-      var _this$lngLat3 = this.lngLat,
-        lng = _this$lngLat3.lng,
-        lat = _this$lngLat3.lat;
+      var _this$lngLat2 = this.lngLat,
+        lng = _this$lngLat2.lng,
+        lat = _this$lngLat2.lat;
       if (this.popupOption.autoPan) {
         this.mapsService.panTo([lng, lat]);
       }

package/es/utils/popper.js

@@ -48,7 +48,6 @@ export var Popper = /*#__PURE__*/function (_EventEmitter) {
       DOM.removeClass(_this.popperDOM, 'l7-popper-hide');
       _this.isShow = true;
       if (_this.option.unique) {
-        // console.log(Popper.conflictPopperList.length);
         Popper.conflictPopperList.forEach(function (popper) {
           if (popper !== _assertThisInitialized(_this) && popper.isShow) {
             popper.hide();

package/lib/control/baseControl/control.js

@@ -92,12 +92,12 @@ var Control = exports.default = exports.Control = /*#__PURE__*/function (_ref) {
     key: "addTo",
     value: function addTo(sceneContainer) {
       // 初始化各个 Service 实例
-      this.mapsService = sceneContainer.get(_l7Core.TYPES.IMapService);
-      this.renderService = sceneContainer.get(_l7Core.TYPES.IRendererService);
-      this.layerService = sceneContainer.get(_l7Core.TYPES.ILayerService);
-      this.controlService = sceneContainer.get(_l7Core.TYPES.IControlService);
-      this.configService = sceneContainer.get(_l7Core.TYPES.IGlobalConfigService);
-      this.scene = sceneContainer.get(_l7Core.TYPES.ISceneService);
+      this.mapsService = sceneContainer.mapService;
+      this.renderService = sceneContainer.rendererService;
+      this.layerService = sceneContainer.layerService;
+      this.controlService = sceneContainer.controlService;
+      this.configService = sceneContainer.globalConfigService;
+      this.scene = sceneContainer.sceneService;
       this.sceneContainer = sceneContainer;
       this.isShow = true;
 

package/lib/control/swipe.js

@@ -61,7 +61,6 @@ var Swipe = exports.default = exports.Swipe = /*#__PURE__*/function (_Control) {
             });
             // fallthrough
           }
-
         case 'mousemove':
         case 'touchmove':
           {
@@ -127,12 +126,10 @@ var Swipe = exports.default = exports.Swipe = /*#__PURE__*/function (_Control) {
       }
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "getMaskLayer", function () {
+      console.log(_this.getMaskGeoData());
       return new _l7Layers.PolygonLayer({
         visible: false
-      }).source({
-        type: 'FeatureCollection',
-        features: []
-      }).shape('fill').color('red').style({
+      }).source(_this.getMaskGeoData()).shape('fill').color('red').style({
         opacity: 0.1
       });
     });
@@ -183,12 +180,12 @@ var Swipe = exports.default = exports.Swipe = /*#__PURE__*/function (_Control) {
     key: "addTo",
     value: function addTo(sceneContainer) {
       // 初始化各个 Service 实例
-      this.mapsService = sceneContainer.get(_l7Core.TYPES.IMapService);
-      this.renderService = sceneContainer.get(_l7Core.TYPES.IRendererService);
-      this.layerService = sceneContainer.get(_l7Core.TYPES.ILayerService);
-      this.controlService = sceneContainer.get(_l7Core.TYPES.IControlService);
-      this.configService = sceneContainer.get(_l7Core.TYPES.IGlobalConfigService);
-      this.scene = sceneContainer.get(_l7Core.TYPES.ISceneService);
+      this.mapsService = sceneContainer.mapService;
+      this.renderService = sceneContainer.rendererService;
+      this.layerService = sceneContainer.layerService;
+      this.controlService = sceneContainer.controlService;
+      this.configService = sceneContainer.globalConfigService;
+      this.scene = sceneContainer.sceneService;
       this.sceneContainer = sceneContainer;
       this.isShow = true;
 
@@ -210,17 +207,16 @@ var Swipe = exports.default = exports.Swipe = /*#__PURE__*/function (_Control) {
       // this.scene.getSceneContainer().appendChild(this.container);
       this.mapsService.getMarkerContainer().appendChild(this.container);
       this.maskLayer = this.getMaskLayer();
-      this.updateMask();
       this.registerEvent();
 
-      // 给图层挂载掩膜
-      this.addMaskToLayers(layers, false);
-      this.addMaskToLayers(rightLayers, true);
-
       // 添加掩膜图层到 scene
       var layerContainer = (0, _l7Core.createLayerContainer)(sceneContainer);
-      this.maskLayer.setContainer(layerContainer, sceneContainer);
+      this.maskLayer.setContainer(layerContainer);
       this.scene.addLayer(this.maskLayer);
+
+      // 给图层挂载掩膜
+      this.addMaskToLayers(layers, false);
+      this.addMaskToLayers(rightLayers, true);
       this.emit('add', this);
       return this;
     }

package/lib/marker-layer.js

@@ -13,7 +13,6 @@ var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits
 var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _l7Core = require("@antv/l7-core");
 var _l7Utils = require("@antv/l7-utils");
 var _eventemitter = require("eventemitter3");
 var _supercluster = _interopRequireDefault(require("supercluster/dist/supercluster"));
@@ -62,7 +61,7 @@ var MarkerLayer = exports.default = /*#__PURE__*/function (_EventEmitter) {
     value: function addTo(scene) {
       // this.remove();
       this.scene = scene;
-      this.mapsService = scene.get(_l7Core.TYPES.IMapService);
+      this.mapsService = scene.mapService;
       if (this.markerLayerOption.cluster) {
         this.initCluster();
         this.update();
@@ -70,7 +69,6 @@ var MarkerLayer = exports.default = /*#__PURE__*/function (_EventEmitter) {
         this.mapsService.on('camerachange', this.update); // amap1.x 更新事件
         this.mapsService.on('viewchange', this.update); // amap2.0 更新事件
       }
-
       this.mapsService.on('camerachange', this.setContainerSize.bind(this)); // amap1.x 更新事件
       this.mapsService.on('viewchange', this.setContainerSize.bind(this)); // amap2.0 更新事件
       this.addMarkers();

package/lib/marker.js

@@ -13,7 +13,6 @@ var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits
 var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _l7Core = require("@antv/l7-core");
 var _l7Utils = require("@antv/l7-utils");
 var _eventemitter = require("eventemitter3");
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
@@ -65,7 +64,7 @@ var Marker = exports.default = /*#__PURE__*/function (_EventEmitter) {
       _this.preLngLat = e.lnglat;
       _this.emit('dragging', newLngLat);
     });
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "onMarkerDragEnd", function (e) {
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "onMarkerDragEnd", function () {
       _this.mapsService.setMapStatus({
         dragEnable: true,
         zoomEnable: true
@@ -107,16 +106,11 @@ var Marker = exports.default = /*#__PURE__*/function (_EventEmitter) {
   }, {
     key: "addTo",
     value: function addTo(scene) {
-      // this.remove();
       this.scene = scene;
-      this.mapsService = scene.get(_l7Core.TYPES.IMapService);
-      this.sceneSerive = scene.get(_l7Core.TYPES.ISceneService);
+      this.mapsService = scene.mapService;
       var element = this.markerOption.element;
-      // this.sceneSerive.getSceneContainer().appendChild(element as HTMLElement);
       this.mapsService.getMarkerContainer().appendChild(element);
       this.registerMarkerEvent(element);
-      //天地图仅监听zoomchange 不注册camerachane,对于平移,在mapsService中实现
-      // this.mapsService.on('zoomchange', this.updatePositionWhenZoom);
       this.mapsService.on('camerachange', this.update); // 注册高德1.x 的地图事件监听
       this.update();
       this.updateDraggable();
@@ -131,7 +125,6 @@ var Marker = exports.default = /*#__PURE__*/function (_EventEmitter) {
         this.mapsService.off('click', this.onMapClick);
         this.mapsService.off('move', this.update);
         this.mapsService.off('moveend', this.update);
-        // this.mapsService.off('zoomchange', this.update);
         this.mapsService.off('camerachange', this.update);
       }
       this.unRegisterMarkerEvent();
@@ -414,7 +407,6 @@ var Marker = exports.default = /*#__PURE__*/function (_EventEmitter) {
         }
         element.style.left = pos.x + offsets[0] + 'px';
         element.style.top = pos.y - offsets[1] + 'px';
-        console.log(element.style.left);
       }
     }
   }, {
@@ -426,7 +418,6 @@ var Marker = exports.default = /*#__PURE__*/function (_EventEmitter) {
         color = _this$markerOption4.color,
         anchor = _this$markerOption4.anchor;
       if (!element) {
-        this.defaultMarker = true;
         element = _l7Utils.DOM.create('div');
         this.markerOption.element = element;
         var svg = document.createElementNS('http://www.w3.org/2000/svg', 'svg');

package/lib/popup/popup.js

@@ -13,7 +13,6 @@ var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits
 var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _l7Core = require("@antv/l7-core");
 var _l7Utils = require("@antv/l7-utils");
 var _eventemitter = require("eventemitter3");
 var _icon = require("../utils/icon");
@@ -90,12 +89,6 @@ var Popup = exports.default = exports.Popup = /*#__PURE__*/function (_EventEmitt
       if (!_this.mapsService || _this.popupOption.followCursor) {
         return;
       }
-      var _this$lngLat2 = _this.lngLat,
-        lng = _this$lngLat2.lng,
-        lat = _this$lngLat2.lat;
-      var _this$mapsService$lng2 = _this.mapsService.lngLatToContainer([lng, lat]),
-        x = _this$mapsService$lng2.x,
-        y = _this$mapsService$lng2.y;
       var map = ev.map;
       var viewHalf = map.getSize();
       viewHalf.x = viewHalf.x / 2;
@@ -201,9 +194,9 @@ var Popup = exports.default = exports.Popup = /*#__PURE__*/function (_EventEmitt
   }, {
     key: "addTo",
     value: function addTo(scene) {
-      this.mapsService = scene.get(_l7Core.TYPES.IMapService);
-      this.sceneService = scene.get(_l7Core.TYPES.ISceneService);
-      this.layerService = scene.get(_l7Core.TYPES.ILayerService);
+      this.mapsService = scene.mapService;
+      this.sceneService = scene.sceneService;
+      this.layerService = scene.layerService;
       //天地图仅监听zoomchange 不注册camerachane,对于平移,在mapsService中实现
       // this.mapsService.on('zoomchange', this.updateWhenZoom);
       this.mapsService.on('camerachange', this.update);
@@ -396,9 +389,9 @@ var Popup = exports.default = exports.Popup = /*#__PURE__*/function (_EventEmitt
   }, {
     key: "panToPopup",
     value: function panToPopup() {
-      var _this$lngLat3 = this.lngLat,
-        lng = _this$lngLat3.lng,
-        lat = _this$lngLat3.lat;
+      var _this$lngLat2 = this.lngLat,
+        lng = _this$lngLat2.lng,
+        lat = _this$lngLat2.lat;
       if (this.popupOption.autoPan) {
         this.mapsService.panTo([lng, lat]);
       }

package/lib/utils/popper.js

@@ -51,7 +51,6 @@ var Popper = exports.Popper = /*#__PURE__*/function (_EventEmitter) {
       _l7Utils.DOM.removeClass(_this.popperDOM, 'l7-popper-hide');
       _this.isShow = true;
       if (_this.option.unique) {
-        // console.log(Popper.conflictPopperList.length);
         Popper.conflictPopperList.forEach(function (popper) {
           if (popper !== (0, _assertThisInitialized2.default)(_this) && popper.isShow) {
             popper.hide();

package/package.json

@@ -1,47 +1,45 @@
 {
   "name": "@antv/l7-component",
-  "version": "2.20.20",
+  "version": "2.21.1",
   "description": "",
+  "license": "ISC",
+  "author": "lzxue",
+  "sideEffects": true,
   "main": "lib/index.js",
   "module": "es/index.js",
   "types": "es/index.d.ts",
-  "sideEffects": true,
   "files": [
     "lib",
     "es",
     "README.md"
   ],
   "scripts": {
-    "tsc": "tsc --project tsconfig.build.json",
-    "less": "lessc src/css/index.less src/css/index.css",
-    "clean": "rimraf dist; rimraf es; rimraf lib;",
     "build": "father build",
     "build:cjs": "BABEL_ENV=cjs babel src --root-mode upward --out-dir lib --source-maps --extensions .ts,.tsx --delete-dir-on-start --no-comments",
     "build:esm": "BABEL_ENV=esm babel src --root-mode upward --out-dir es --source-maps --extensions .ts,.tsx --delete-dir-on-start --no-comments",
-    "watch": "BABEL_ENV=cjs babel src --watch --root-mode upward --out-dir lib --source-maps --extensions .ts,.tsx --delete-dir-on-start --no-comments",
+    "clean": "rimraf dist; rimraf es; rimraf lib;",
+    "less": "lessc src/css/index.less src/css/index.css",
     "lint:ts": "run-p -c lint:ts-*",
+    "sync": "tnpm sync",
     "test": "umi-test --passWithNoTests",
-    "sync": "tnpm sync"
+    "tsc": "tsc --project tsconfig.build.json",
+    "watch": "BABEL_ENV=cjs babel src --watch --root-mode upward --out-dir lib --source-maps --extensions .ts,.tsx --delete-dir-on-start --no-comments"
   },
-  "author": "lzxue",
-  "license": "ISC",
   "dependencies": {
-    "@antv/l7-core": "2.20.20",
-    "@antv/l7-utils": "2.20.20",
+    "@antv/l7-core": "2.21.1",
+    "@antv/l7-utils": "2.21.1",
     "@babel/runtime": "^7.7.7",
     "eventemitter3": "^4.0.0",
-    "inversify": "^5.0.1",
-    "reflect-metadata": "^0.2.1",
     "supercluster": "^7.0.0"
   },
   "devDependencies": {
-    "@antv/l7-layers": "2.20.20",
-    "@antv/l7-test-utils": "2.20.20",
+    "@antv/l7-layers": "2.21.1",
+    "@antv/l7-test-utils": "2.21.1",
     "gcoord": "^0.3.2",
     "less": "^4.1.3"
   },
-  "gitHead": "1966dbadf9efee8d69d22beb4d89947c158da634",
   "publishConfig": {
     "access": "public"
-  }
+  },
+  "gitHead": "1e0d2e5920f479f77095a2c5eddda8a8d7ac9e0f"
 }