@antv/l7-component 2.10.5 → 2.10.7

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

@@ -1,8 +1,8 @@
-import { DOM } from '@antv/l7-utils';
+import { ELType } from '@antv/l7-utils/src/dom';
 import Control, { IControlOption } from './control';
 export { ButtonControl };
 export interface IButtonControlOption extends IControlOption {
-    btnIcon?: DOM.ELType | DocumentFragment;
+    btnIcon?: ELType | DocumentFragment;
     btnText?: string;
     title?: string;
     vertical?: boolean;
@@ -27,7 +27,7 @@ export default class ButtonControl<O extends IButtonControlOption = IButtonContr
      * 按钮中图标对应的 DOM
      * @protected
      */
-    protected buttonIcon?: DOM.ELType | DocumentFragment;
+    protected buttonIcon?: ELType | DocumentFragment;
     /**
      * 设置当前按钮
      * @param newIsDisable

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.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/control/zoom.d.ts

@@ -1,10 +1,10 @@
 import { PositionType } from '@antv/l7-core';
-import { DOM } from '@antv/l7-utils';
+import { ELType } from '@antv/l7-utils/src/dom';
 import { Control, IControlOption } from './baseControl';
 export interface IZoomControlOption extends IControlOption {
-    zoomInText: DOM.ELType | string;
+    zoomInText: ELType | string;
     zoomInTitle: string;
-    zoomOutText: DOM.ELType | string;
+    zoomOutText: ELType | string;
     zoomOutTitle: string;
 }
 export { Zoom };

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

@@ -3,8 +3,8 @@ import { Container } from 'inversify';
 import Popup from './popup';
 export declare type LayerField = {
     field: string;
-    formatField?: ((field: string) => string) | string;
-    formatValue?: ((value: any) => any) | string;
+    formatField?: (field: string) => string;
+    formatValue?: (value: any) => any;
     getValue?: (feature: any) => any;
 };
 export declare type LayerPopupConfigItem = {
@@ -12,8 +12,7 @@ export declare type LayerPopupConfigItem = {
     fields: Array<LayerField | string>;
 };
 export interface ILayerPopupOption extends IPopupOption {
-    config?: LayerPopupConfigItem[];
-    items?: LayerPopupConfigItem[];
+    config: LayerPopupConfigItem[];
     trigger: 'hover' | 'click';
 }
 declare type LayerMapInfo = {
@@ -37,7 +36,6 @@ export default class LayerPopup extends Popup<ILayerPopupOption> {
         layer: ILayer;
         featureId: number;
     };
-    protected get layerConfigItems(): LayerPopupConfigItem[];
     addTo(scene: Container): this;
     remove(): this;
     setOptions(option: Partial<ILayerPopupOption>): this;
@@ -65,10 +63,10 @@ export default class LayerPopup extends Popup<ILayerPopupOption> {
     protected getLayerInfoFrag(layer: ILayer, e: any): DocumentFragment;
     /**
      * 通过 Layer 配置访问到真实的 Layer 实例
-     * @param configItem
+     * @param config
      * @protected
      */
-    protected getLayerByConfig(configItem: LayerPopupConfigItem): ILayer | undefined;
+    protected getLayerByConfig(config: LayerPopupConfigItem): ILayer | undefined;
     /**
      * 判断当前展示的 Feature 是否和上一次查看的一致
      * @param layer

package/es/popup/layerPopup.js

@@ -40,16 +40,6 @@ var LayerPopup = /*#__PURE__*/function (_Popup) {
   }
 
   _createClass(LayerPopup, [{
-    key: "layerConfigItems",
-    get: function get() {
-      var _ref;
-
-      var _this$popupOption = this.popupOption,
-          config = _this$popupOption.config,
-          items = _this$popupOption.items;
-      return (_ref = config !== null && config !== void 0 ? config : items) !== null && _ref !== void 0 ? _ref : [];
-    }
-  }, {
     key: "addTo",
     value: function addTo(scene) {
       _get(_getPrototypeOf(LayerPopup.prototype), "addTo", this).call(this, scene);
@@ -104,10 +94,10 @@ var LayerPopup = /*#__PURE__*/function (_Popup) {
     value: function bindLayerEvent() {
       var _this2 = this;
 
-      var trigger = this.popupOption.trigger;
-      this.layerConfigItems.forEach(function (configItem) {
-        var _layer$getSource;
-
+      var _this$popupOption = this.popupOption,
+          config = _this$popupOption.config,
+          trigger = _this$popupOption.trigger;
+      config.forEach(function (configItem) {
         var layer = _this2.getLayerByConfig(configItem);
 
         if (!layer) {
@@ -132,7 +122,7 @@ var LayerPopup = /*#__PURE__*/function (_Popup) {
           layer === null || layer === void 0 ? void 0 : layer.on('click', onClick);
         }
 
-        var source = layer === null || layer === void 0 ? void 0 : (_layer$getSource = layer.getSource) === null || _layer$getSource === void 0 ? void 0 : _layer$getSource.call(layer);
+        var source = layer.getSource();
 
         var onSourceUpdate = _this2.onSourceUpdate.bind(_this2, layer);
 
@@ -152,7 +142,8 @@ var LayerPopup = /*#__PURE__*/function (_Popup) {
     value: function unbindLayerEvent() {
       var _this3 = this;
 
-      this.layerConfigItems.forEach(function (configItem) {
+      var config = this.popupOption.config;
+      config.forEach(function (configItem) {
         var layer = _this3.getLayerByConfig(configItem);
 
         var layerInfo = layer && _this3.layerConfigMap.get(layer);
@@ -179,9 +170,9 @@ var LayerPopup = /*#__PURE__*/function (_Popup) {
         }
 
         if (onSourceUpdate) {
-          var _layer$getSource2;
+          var _layer$getSource;
 
-          layer === null || layer === void 0 ? void 0 : (_layer$getSource2 = layer.getSource()) === null || _layer$getSource2 === void 0 ? void 0 : _layer$getSource2.off('update', onSourceUpdate);
+          layer === null || layer === void 0 ? void 0 : (_layer$getSource = layer.getSource()) === null || _layer$getSource === void 0 ? void 0 : _layer$getSource.off('update', onSourceUpdate);
         }
       });
     }
@@ -200,7 +191,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) {
@@ -258,22 +250,17 @@ var LayerPopup = /*#__PURE__*/function (_Popup) {
 
         var fields = layerInfo.fields;
         fields === null || fields === void 0 ? void 0 : fields.forEach(function (fieldConfig) {
-          var _ref3, _ref4;
-
-          var _ref2 = typeof fieldConfig === 'string' ? // tslint:disable-next-line:no-object-literal-type-assertion
-          {
+          var _ref = typeof fieldConfig === 'string' ? {
             field: fieldConfig
           } : fieldConfig,
-              field = _ref2.field,
-              formatField = _ref2.formatField,
-              formatValue = _ref2.formatValue,
-              getValue = _ref2.getValue;
+              field = _ref.field,
+              formatField = _ref.formatField,
+              formatValue = _ref.formatValue,
+              getValue = _ref.getValue;
 
           var row = DOM.create('div', 'l7-layer-popup__row');
           var value = getValue ? getValue(e.feature) : get(_feature, field);
-          var fieldText = (_ref3 = formatField instanceof Function ? formatField(field) : formatField) !== null && _ref3 !== void 0 ? _ref3 : field;
-          var valueText = (_ref4 = formatValue instanceof Function ? formatValue(value) : formatValue) !== null && _ref4 !== void 0 ? _ref4 : value;
-          row.innerHTML = "<span class=\"l7-layer-popup__key\">".concat(fieldText, "</span>: <span class=\"l7-layer-popup__value\">").concat(valueText, "</span>");
+          row.innerHTML = "".concat(formatField ? formatField(field) : field, ": ").concat(formatValue ? formatValue(value) : value);
           frag.appendChild(row);
         });
       }
@@ -282,14 +269,14 @@ var LayerPopup = /*#__PURE__*/function (_Popup) {
     }
     /**
      * 通过 Layer 配置访问到真实的 Layer 实例
-     * @param configItem
+     * @param config
      * @protected
      */
 
   }, {
     key: "getLayerByConfig",
-    value: function getLayerByConfig(configItem) {
-      var layer = configItem.layer;
+    value: function getLayerByConfig(config) {
+      var layer = config.layer;
 
       if (layer instanceof Object) {
         return layer;

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,
@@ -514,6 +515,7 @@ var Popup = /*#__PURE__*/function (_EventEmitter) {
   }, {
     key: "updateFollowCursor",
     value: function updateFollowCursor(onlyClear) {
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
       var container = this.mapsService.getContainer();
       container.removeEventListener('mousemove', this.onMouseMove);
 

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

@@ -55,16 +55,6 @@ var LayerPopup = /*#__PURE__*/function (_Popup) {
   }
 
   (0, _createClass2.default)(LayerPopup, [{
-    key: "layerConfigItems",
-    get: function get() {
-      var _ref;
-
-      var _this$popupOption = this.popupOption,
-          config = _this$popupOption.config,
-          items = _this$popupOption.items;
-      return (_ref = config !== null && config !== void 0 ? config : items) !== null && _ref !== void 0 ? _ref : [];
-    }
-  }, {
     key: "addTo",
     value: function addTo(scene) {
       (0, _get2.default)((0, _getPrototypeOf2.default)(LayerPopup.prototype), "addTo", this).call(this, scene);
@@ -115,10 +105,10 @@ var LayerPopup = /*#__PURE__*/function (_Popup) {
     value: function bindLayerEvent() {
       var _this2 = this;
 
-      var trigger = this.popupOption.trigger;
-      this.layerConfigItems.forEach(function (configItem) {
-        var _layer$getSource;
-
+      var _this$popupOption = this.popupOption,
+          config = _this$popupOption.config,
+          trigger = _this$popupOption.trigger;
+      config.forEach(function (configItem) {
         var layer = _this2.getLayerByConfig(configItem);
 
         if (!layer) {
@@ -143,7 +133,7 @@ var LayerPopup = /*#__PURE__*/function (_Popup) {
           layer === null || layer === void 0 ? void 0 : layer.on('click', onClick);
         }
 
-        var source = layer === null || layer === void 0 ? void 0 : (_layer$getSource = layer.getSource) === null || _layer$getSource === void 0 ? void 0 : _layer$getSource.call(layer);
+        var source = layer.getSource();
 
         var onSourceUpdate = _this2.onSourceUpdate.bind(_this2, layer);
 
@@ -163,7 +153,8 @@ var LayerPopup = /*#__PURE__*/function (_Popup) {
     value: function unbindLayerEvent() {
       var _this3 = this;
 
-      this.layerConfigItems.forEach(function (configItem) {
+      var config = this.popupOption.config;
+      config.forEach(function (configItem) {
         var layer = _this3.getLayerByConfig(configItem);
 
         var layerInfo = layer && _this3.layerConfigMap.get(layer);
@@ -190,9 +181,9 @@ var LayerPopup = /*#__PURE__*/function (_Popup) {
         }
 
         if (onSourceUpdate) {
-          var _layer$getSource2;
+          var _layer$getSource;
 
-          layer === null || layer === void 0 ? void 0 : (_layer$getSource2 = layer.getSource()) === null || _layer$getSource2 === void 0 ? void 0 : _layer$getSource2.off('update', onSourceUpdate);
+          layer === null || layer === void 0 ? void 0 : (_layer$getSource = layer.getSource()) === null || _layer$getSource === void 0 ? void 0 : _layer$getSource.off('update', onSourceUpdate);
         }
       });
     }
@@ -211,7 +202,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) {
@@ -269,23 +261,18 @@ var LayerPopup = /*#__PURE__*/function (_Popup) {
 
         var fields = layerInfo.fields;
         fields === null || fields === void 0 ? void 0 : fields.forEach(function (fieldConfig) {
-          var _ref3, _ref4;
-
-          var _ref2 = typeof fieldConfig === 'string' ? // tslint:disable-next-line:no-object-literal-type-assertion
-          {
+          var _ref = typeof fieldConfig === 'string' ? {
             field: fieldConfig
           } : fieldConfig,
-              field = _ref2.field,
-              formatField = _ref2.formatField,
-              formatValue = _ref2.formatValue,
-              getValue = _ref2.getValue;
+              field = _ref.field,
+              formatField = _ref.formatField,
+              formatValue = _ref.formatValue,
+              getValue = _ref.getValue;
 
           var row = _l7Utils.DOM.create('div', 'l7-layer-popup__row');
 
           var value = getValue ? getValue(e.feature) : (0, _lodash.get)(_feature, field);
-          var fieldText = (_ref3 = formatField instanceof Function ? formatField(field) : formatField) !== null && _ref3 !== void 0 ? _ref3 : field;
-          var valueText = (_ref4 = formatValue instanceof Function ? formatValue(value) : formatValue) !== null && _ref4 !== void 0 ? _ref4 : value;
-          row.innerHTML = "<span class=\"l7-layer-popup__key\">".concat(fieldText, "</span>: <span class=\"l7-layer-popup__value\">").concat(valueText, "</span>");
+          row.innerHTML = "".concat(formatField ? formatField(field) : field, ": ").concat(formatValue ? formatValue(value) : value);
           frag.appendChild(row);
         });
       }
@@ -294,14 +281,14 @@ var LayerPopup = /*#__PURE__*/function (_Popup) {
     }
     /**
      * 通过 Layer 配置访问到真实的 Layer 实例
-     * @param configItem
+     * @param config
      * @protected
      */
 
   }, {
     key: "getLayerByConfig",
-    value: function getLayerByConfig(configItem) {
-      var layer = configItem.layer;
+    value: function getLayerByConfig(config) {
+      var layer = config.layer;
 
       if (layer instanceof Object) {
         return layer;

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,
@@ -528,6 +529,7 @@ var Popup = /*#__PURE__*/function (_EventEmitter) {
   }, {
     key: "updateFollowCursor",
     value: function updateFollowCursor(onlyClear) {
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
       var container = this.mapsService.getContainer();
       container.removeEventListener('mousemove', this.onMouseMove);
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antv/l7-component",
-  "version": "2.10.5",
+  "version": "2.10.7",
   "description": "",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -26,8 +26,8 @@
   "author": "lzxue",
   "license": "ISC",
   "dependencies": {
-    "@antv/l7-core": "2.10.5",
-    "@antv/l7-utils": "2.10.5",
+    "@antv/l7-core": "2.10.7",
+    "@antv/l7-utils": "2.10.7",
     "@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.5",
+    "@antv/l7-test-utils": "2.10.7",
     "gcoord": "^0.3.2",
     "less": "^4.1.3"
   },
-  "gitHead": "64bee613c3e1daedad46cb78de9a85b992392209",
+  "gitHead": "99a4fe9b4f36e5f4bdac1294e83ff756e9a974d1",
   "publishConfig": {
     "access": "public"
   }