@antv/l7-component 2.10.6 → 2.10.9

package/es/control/baseControl/popperControl.js

@@ -66,7 +66,8 @@ var PopperControl = /*#__PURE__*/function (_ButtonControl) {
     value: function getDefault(option) {
       var _option$position;
 
-      var defaultOption = _get(_getPrototypeOf(PopperControl.prototype), "getDefault", this).call(this, option);
+      var defaultOption = _get(_getPrototypeOf(PopperControl.prototype), "getDefault", this).call(this, option); // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+
 
       var position = (_option$position = option === null || option === void 0 ? void 0 : option.position) !== null && _option$position !== void 0 ? _option$position : defaultOption.position;
       return _objectSpread(_objectSpread({}, _get(_getPrototypeOf(PopperControl.prototype), "getDefault", this).call(this, option)), {}, {
@@ -95,8 +96,10 @@ var PopperControl = /*#__PURE__*/function (_ButtonControl) {
       var _this$controlOption = this.controlOption,
           popperClassName = _this$controlOption.popperClassName,
           popperPlacement = _this$controlOption.popperPlacement,
-          popperTrigger = _this$controlOption.popperTrigger;
-      var popperContainer = this.mapsService.getMapContainer();
+          popperTrigger = _this$controlOption.popperTrigger; // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+
+      var popperContainer = this.mapsService.getMapContainer(); // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+
       this.popper = new Popper(this.button, {
         className: popperClassName,
         placement: popperPlacement,

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

@@ -1,16 +1,16 @@
 import { IPopperControlOption, PopperControl } from './popperControl';
-declare type BaseOptionItem = {
+type BaseOptionItem = {
     value: string;
     text: string;
     [key: string]: string;
 };
-declare type NormalOptionItem = BaseOptionItem & {
+type NormalOptionItem = BaseOptionItem & {
     icon?: HTMLElement;
 };
-declare type ImageOptionItem = BaseOptionItem & {
+type ImageOptionItem = BaseOptionItem & {
     img: string;
 };
-export declare type ControlOptionItem = ImageOptionItem | NormalOptionItem;
+export type ControlOptionItem = ImageOptionItem | NormalOptionItem;
 export interface ISelectControlOption extends IPopperControlOption {
     options: ControlOptionItem[];
     defaultValue?: string | string[];

package/es/control/baseControl/selectControl.js

@@ -119,6 +119,7 @@ var SelectControl = /*#__PURE__*/function (_PopperControl) {
       var emitEvent = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
       var finalValue = this.transSelectValue(value);
       this.optionDOMList.forEach(function (optionDOM) {
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         var optionValue = optionDOM.getAttribute(SelectControlConstant.OptionValueAttrKey);
         var checkboxDOM = _this2.getIsMultiple() ? optionDOM.querySelector('input[type=checkbox]') : undefined;
 

package/es/control/fullscreen.js

@@ -121,7 +121,8 @@ var Fullscreen = /*#__PURE__*/function (_ButtonControl) {
     value: function onAdd() {
       var button = _get(_getPrototypeOf(Fullscreen.prototype), "onAdd", this).call(this);
 
-      button.addEventListener('click', this.onClick);
+      button.addEventListener('click', this.onClick); // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+
       this.mapContainer = DOM.getContainer(this.scene.getSceneConfig().id);
       this.mapContainer.addEventListener('fullscreenchange', this.onFullscreenChange);
       return button;

package/es/interface.d.ts

@@ -1,4 +1,4 @@
-export declare type ControlEvent = 'show' | 'hide' | 'add' | 'remove' | string;
+export type ControlEvent = 'show' | 'hide' | 'add' | 'remove' | string;
 export interface IMarkerStyleOption {
     element?: (...args: any[]) => any;
     style: {

package/es/marker-layer.d.ts

@@ -12,6 +12,7 @@ export default class MarkerLayer extends EventEmitter {
     private scene;
     private zoom;
     private bbox;
+    private inited;
     private containerSize;
     constructor(option?: Partial<IMarkerLayerOption>);
     getDefault(): {

package/es/marker-layer.js

@@ -83,6 +83,7 @@ var MarkerLayer = /*#__PURE__*/function (_EventEmitter) {
       this.mapsService.on('viewchange', this.setContainerSize.bind(this)); // amap2.0 更新事件
 
       this.addMarkers();
+      this.inited = true;
       return this;
     } // 设置容器大小
 
@@ -123,7 +124,9 @@ var MarkerLayer = /*#__PURE__*/function (_EventEmitter) {
         }
       }
 
-      this.markers.push(marker);
+      this.markers.push(marker); // if(this.inited) {
+      //   marker.addTo(this.scene);
+      // }
     }
   }, {
     key: "removeMarker",

package/es/popup/layerPopup.d.ts

@@ -1,13 +1,13 @@
 import { ILayer, IPopupOption } from '@antv/l7-core';
 import { Container } from 'inversify';
 import Popup from './popup';
-export declare type LayerField = {
+export type LayerField = {
     field: string;
     formatField?: ((field: string) => string) | string;
     formatValue?: ((value: any) => any) | string;
     getValue?: (feature: any) => any;
 };
-export declare type LayerPopupConfigItem = {
+export type LayerPopupConfigItem = {
     layer: ILayer | string;
     fields: Array<LayerField | string>;
 };
@@ -16,7 +16,7 @@ export interface ILayerPopupOption extends IPopupOption {
     items?: LayerPopupConfigItem[];
     trigger: 'hover' | 'click';
 }
-declare type LayerMapInfo = {
+type LayerMapInfo = {
     onMouseMove?: (layer: ILayer, e: any) => void;
     onMouseOut?: (layer: ILayer, e: any) => void;
     onClick?: (layer: ILayer, e: any) => void;

package/es/popup/layerPopup.js

@@ -200,7 +200,8 @@ var LayerPopup = /*#__PURE__*/function (_Popup) {
       if (!this.isShow) {
         this.show();
       }
-    }
+    } // eslint-disable-next-line @typescript-eslint/no-unused-vars
+
   }, {
     key: "onLayerMouseOut",
     value: function onLayerMouseOut(layer, e) {

package/es/popup/popup.js

@@ -460,7 +460,8 @@ var Popup = /*#__PURE__*/function (_EventEmitter) {
     }
   }, {
     key: "getDefault",
-    value: function getDefault(option) {
+    value: // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    function getDefault(option) {
       // tslint:disable-next-line:no-object-literal-type-assertion
       return {
         closeButton: true,
@@ -498,12 +499,16 @@ var Popup = /*#__PURE__*/function (_EventEmitter) {
     value: function updateCloseOnClick(onlyClear) {
       var _this3 = this;
 
-      this.mapsService.off('click', this.onCloseButtonClick);
+      var mapsService = this.mapsService;
 
-      if (this.popupOption.closeOnClick && !onlyClear) {
-        requestAnimationFrame(function () {
-          _this3.mapsService.on('click', _this3.onCloseButtonClick);
-        });
+      if (mapsService) {
+        this.mapsService.off('click', this.onCloseButtonClick);
+
+        if (this.popupOption.closeOnClick && !onlyClear) {
+          requestAnimationFrame(function () {
+            _this3.mapsService.on('click', _this3.onCloseButtonClick);
+          });
+        }
       }
     }
   }, {
@@ -522,15 +527,19 @@ var Popup = /*#__PURE__*/function (_EventEmitter) {
   }, {
     key: "updateFollowCursor",
     value: function updateFollowCursor(onlyClear) {
-      var _this5 = this;
+      var _this$mapsService,
+          _this5 = this;
 
-      var container = this.mapsService.getContainer();
-      container.removeEventListener('mousemove', this.onMouseMove);
+      var container = (_this$mapsService = this.mapsService) === null || _this$mapsService === void 0 ? void 0 : _this$mapsService.getContainer();
 
-      if (this.popupOption.followCursor && !onlyClear) {
-        requestAnimationFrame(function () {
-          container.addEventListener('mousemove', _this5.onMouseMove);
-        });
+      if (container) {
+        container.removeEventListener('mousemove', this.onMouseMove);
+
+        if (this.popupOption.followCursor && !onlyClear) {
+          requestAnimationFrame(function () {
+            container.addEventListener('mousemove', _this5.onMouseMove);
+          });
+        }
       }
     }
   }, {

package/es/utils/popper.d.ts

@@ -2,15 +2,15 @@ import { EventEmitter } from 'eventemitter3';
 /**
  * 气泡位置枚举
  */
-export declare type PopperPlacement = 'top-start' | 'top' | 'top-end' | 'left-start' | 'left' | 'left-end' | 'bottom-start' | 'bottom' | 'bottom-end' | 'right-start' | 'right' | 'right-end';
+export type PopperPlacement = 'top-start' | 'top' | 'top-end' | 'left-start' | 'left' | 'left-end' | 'bottom-start' | 'bottom' | 'bottom-end' | 'right-start' | 'right' | 'right-end';
 /**
  * 气泡触发类型，当前支持 click 和 hover 两种类型
  */
-export declare type PopperTrigger = 'click' | 'hover';
+export type PopperTrigger = 'click' | 'hover';
 /**
  * 气泡内容类型
  */
-export declare type PopperContent = string | HTMLElement | null;
+export type PopperContent = string | HTMLElement | null;
 export interface IPopperOption {
     placement: PopperPlacement;
     trigger: PopperTrigger;

package/lib/control/baseControl/popperControl.js

@@ -80,7 +80,8 @@ var PopperControl = /*#__PURE__*/function (_ButtonControl) {
     value: function getDefault(option) {
       var _option$position;
 
-      var defaultOption = (0, _get2.default)((0, _getPrototypeOf2.default)(PopperControl.prototype), "getDefault", this).call(this, option);
+      var defaultOption = (0, _get2.default)((0, _getPrototypeOf2.default)(PopperControl.prototype), "getDefault", this).call(this, option); // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+
       var position = (_option$position = option === null || option === void 0 ? void 0 : option.position) !== null && _option$position !== void 0 ? _option$position : defaultOption.position;
       return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _get2.default)((0, _getPrototypeOf2.default)(PopperControl.prototype), "getDefault", this).call(this, option)), {}, {
         popperPlacement: position instanceof Element ? 'bottom' : PopperPlacementMap[position],
@@ -107,8 +108,10 @@ var PopperControl = /*#__PURE__*/function (_ButtonControl) {
       var _this$controlOption = this.controlOption,
           popperClassName = _this$controlOption.popperClassName,
           popperPlacement = _this$controlOption.popperPlacement,
-          popperTrigger = _this$controlOption.popperTrigger;
-      var popperContainer = this.mapsService.getMapContainer();
+          popperTrigger = _this$controlOption.popperTrigger; // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+
+      var popperContainer = this.mapsService.getMapContainer(); // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+
       this.popper = new _popper.Popper(this.button, {
         className: popperClassName,
         placement: popperPlacement,

package/lib/control/baseControl/selectControl.js

@@ -132,6 +132,7 @@ var SelectControl = /*#__PURE__*/function (_PopperControl) {
       var emitEvent = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
       var finalValue = this.transSelectValue(value);
       this.optionDOMList.forEach(function (optionDOM) {
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         var optionValue = optionDOM.getAttribute(SelectControlConstant.OptionValueAttrKey);
         var checkboxDOM = _this2.getIsMultiple() ? optionDOM.querySelector('input[type=checkbox]') : undefined;
 

package/lib/control/fullscreen.js

@@ -136,7 +136,8 @@ var Fullscreen = /*#__PURE__*/function (_ButtonControl) {
     key: "onAdd",
     value: function onAdd() {
       var button = (0, _get2.default)((0, _getPrototypeOf2.default)(Fullscreen.prototype), "onAdd", this).call(this);
-      button.addEventListener('click', this.onClick);
+      button.addEventListener('click', this.onClick); // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+
       this.mapContainer = _l7Utils.DOM.getContainer(this.scene.getSceneConfig().id);
       this.mapContainer.addEventListener('fullscreenchange', this.onFullscreenChange);
       return button;

package/lib/marker-layer.js

@@ -97,6 +97,7 @@ var MarkerLayer = /*#__PURE__*/function (_EventEmitter) {
       this.mapsService.on('viewchange', this.setContainerSize.bind(this)); // amap2.0 更新事件
 
       this.addMarkers();
+      this.inited = true;
       return this;
     } // 设置容器大小
 
@@ -137,7 +138,9 @@ var MarkerLayer = /*#__PURE__*/function (_EventEmitter) {
         }
       }
 
-      this.markers.push(marker);
+      this.markers.push(marker); // if(this.inited) {
+      //   marker.addTo(this.scene);
+      // }
     }
   }, {
     key: "removeMarker",

package/lib/popup/layerPopup.js

@@ -211,7 +211,8 @@ var LayerPopup = /*#__PURE__*/function (_Popup) {
       if (!this.isShow) {
         this.show();
       }
-    }
+    } // eslint-disable-next-line @typescript-eslint/no-unused-vars
+
   }, {
     key: "onLayerMouseOut",
     value: function onLayerMouseOut(layer, e) {

package/lib/popup/popup.js

@@ -474,7 +474,8 @@ var Popup = /*#__PURE__*/function (_EventEmitter) {
     }
   }, {
     key: "getDefault",
-    value: function getDefault(option) {
+    value: // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    function getDefault(option) {
       // tslint:disable-next-line:no-object-literal-type-assertion
       return {
         closeButton: true,
@@ -512,12 +513,16 @@ var Popup = /*#__PURE__*/function (_EventEmitter) {
     value: function updateCloseOnClick(onlyClear) {
       var _this3 = this;
 
-      this.mapsService.off('click', this.onCloseButtonClick);
+      var mapsService = this.mapsService;
 
-      if (this.popupOption.closeOnClick && !onlyClear) {
-        requestAnimationFrame(function () {
-          _this3.mapsService.on('click', _this3.onCloseButtonClick);
-        });
+      if (mapsService) {
+        this.mapsService.off('click', this.onCloseButtonClick);
+
+        if (this.popupOption.closeOnClick && !onlyClear) {
+          requestAnimationFrame(function () {
+            _this3.mapsService.on('click', _this3.onCloseButtonClick);
+          });
+        }
       }
     }
   }, {
@@ -536,15 +541,19 @@ var Popup = /*#__PURE__*/function (_EventEmitter) {
   }, {
     key: "updateFollowCursor",
     value: function updateFollowCursor(onlyClear) {
-      var _this5 = this;
+      var _this$mapsService,
+          _this5 = this;
 
-      var container = this.mapsService.getContainer();
-      container.removeEventListener('mousemove', this.onMouseMove);
+      var container = (_this$mapsService = this.mapsService) === null || _this$mapsService === void 0 ? void 0 : _this$mapsService.getContainer();
 
-      if (this.popupOption.followCursor && !onlyClear) {
-        requestAnimationFrame(function () {
-          container.addEventListener('mousemove', _this5.onMouseMove);
-        });
+      if (container) {
+        container.removeEventListener('mousemove', this.onMouseMove);
+
+        if (this.popupOption.followCursor && !onlyClear) {
+          requestAnimationFrame(function () {
+            container.addEventListener('mousemove', _this5.onMouseMove);
+          });
+        }
       }
     }
   }, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antv/l7-component",
-  "version": "2.10.6",
+  "version": "2.10.9",
   "description": "",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -26,8 +26,8 @@
   "author": "lzxue",
   "license": "ISC",
   "dependencies": {
-    "@antv/l7-core": "2.10.6",
-    "@antv/l7-utils": "2.10.6",
+    "@antv/l7-core": "2.10.9",
+    "@antv/l7-utils": "2.10.9",
     "@babel/runtime": "^7.7.7",
     "eventemitter3": "^4.0.0",
     "inversify": "^5.0.1",
@@ -36,11 +36,11 @@
     "supercluster": "^7.0.0"
   },
   "devDependencies": {
-    "@antv/l7-test-utils": "2.10.6",
+    "@antv/l7-test-utils": "2.10.9",
     "gcoord": "^0.3.2",
     "less": "^4.1.3"
   },
-  "gitHead": "7fc81ea48b86d6aeb0f5351a8c5eb3017f473ccc",
+  "gitHead": "9fe64ef00875f4d96771542c16842468e61a8ef4",
   "publishConfig": {
     "access": "public"
   }