@antv/l7-component 2.19.7 → 2.19.8

package/es/control/layerSwitch.d.ts

@@ -1,7 +1,12 @@
 import { ILayer } from '@antv/l7-core';
 import SelectControl, { ControlOptionItem, ISelectControlOption } from './baseControl/selectControl';
+export type LayerSwitchItem = {
+    layer: ILayer;
+    name?: string;
+    img?: string;
+};
 export interface ILayerSwitchOption extends ISelectControlOption {
-    layers: Array<ILayer | string>;
+    layers: Array<ILayer | string | LayerSwitchItem>;
 }
 export { LayerSwitch };
 export default class LayerSwitch extends SelectControl<ILayerSwitchOption> {

package/es/control/layerSwitch.js

@@ -12,6 +12,9 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 import { createL7Icon } from "../utils/icon";
 import SelectControl from "./baseControl/selectControl";
 export { LayerSwitch };
+function isLayerSwitchItem(obj) {
+  return obj && obj.layer;
+}
 var LayerSwitch = /*#__PURE__*/function (_SelectControl) {
   _inherits(LayerSwitch, _SelectControl);
   var _super = _createSuper(LayerSwitch);
@@ -58,7 +61,11 @@ var LayerSwitch = /*#__PURE__*/function (_SelectControl) {
         var layerInstances = [];
         layers.forEach(function (layer) {
           if (layer instanceof Object) {
-            layerInstances.push(layer);
+            if (isLayerSwitchItem(layer)) {
+              layerInstances.push(layer.layer);
+            } else {
+              layerInstances.push(layer);
+            }
           }
           if (typeof layer === 'string') {
             var targetLayer = layerService.getLayer(layer) || layerService.getLayerByName(layer);
@@ -92,6 +99,32 @@ var LayerSwitch = /*#__PURE__*/function (_SelectControl) {
   }, {
     key: "getLayerOptions",
     value: function getLayerOptions() {
+      var _this2 = this;
+      var layers = this.controlOption.layers;
+      var isAllImg = layers === null || layers === void 0 ? void 0 : layers.every(function (item) {
+        return item.img;
+      });
+      if (layers) {
+        return layers === null || layers === void 0 ? void 0 : layers.map(function (layer) {
+          if (isLayerSwitchItem(layer)) {
+            return {
+              text: layer.name || layer.layer.name,
+              value: layer.layer.name,
+              img: isAllImg ? layer.img : undefined
+            };
+          } else if (typeof layer === 'string') {
+            var targetLayer = _this2.layerService.getLayer(layer) || _this2.layerService.getLayerByName(layer);
+            return {
+              text: targetLayer === null || targetLayer === void 0 ? void 0 : targetLayer.name,
+              value: targetLayer === null || targetLayer === void 0 ? void 0 : targetLayer.name
+            };
+          }
+          return {
+            text: layer.name,
+            value: layer.name
+          };
+        });
+      }
       return this.layers.map(function (layer) {
         return {
           text: layer.name,

package/es/marker.js

@@ -9,7 +9,7 @@ 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, bindAll, DOM, isPC } 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) {

package/es/popup/layerPopup.d.ts

@@ -64,7 +64,7 @@ export default class LayerPopup extends Popup<ILayerPopupOption> {
     protected onLayerMouseOut(layer: ILayer, e: any): void;
     protected onLayerClick: (layer: ILayer, e: any) => void;
     protected onSceneClick: () => void;
-    protected onSourceUpdate(layer: ILayer): void;
+    protected onSourceUpdate(): void;
     /**
      * 通过当前图层和对应选中的元素获取气泡展示的 HTML 内容
      * @param layer

package/es/popup/layerPopup.js

@@ -102,8 +102,14 @@ var LayerPopup = /*#__PURE__*/function (_Popup) {
   }, {
     key: "setOptions",
     value: function setOptions(option) {
+      var _newOption$items;
       this.unbindLayerEvent();
-      _get(_getPrototypeOf(LayerPopup.prototype), "setOptions", this).call(this, option);
+      var newOption = _objectSpread({}, option);
+      var trigger = option.trigger || this.popupOption.trigger;
+      if (((_newOption$items = newOption.items) === null || _newOption$items === void 0 ? void 0 : _newOption$items.length) === 0 && trigger === 'hover') {
+        newOption.followCursor = false;
+      }
+      _get(_getPrototypeOf(LayerPopup.prototype), "setOptions", this).call(this, newOption);
       this.bindLayerEvent();
       return this;
     }
@@ -162,7 +168,7 @@ var LayerPopup = /*#__PURE__*/function (_Popup) {
           }
         }
         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 onSourceUpdate = _this2.onSourceUpdate.bind(_this2, layer);
+        var onSourceUpdate = _this2.onSourceUpdate.bind(_this2);
         source === null || source === void 0 ? void 0 : source.on('update', onSourceUpdate);
         layerInfo.onSourceUpdate = onSourceUpdate;
         _this2.layerConfigMap.set(layer, layerInfo);
@@ -235,7 +241,7 @@ var LayerPopup = /*#__PURE__*/function (_Popup) {
     }
   }, {
     key: "onSourceUpdate",
-    value: function onSourceUpdate(layer) {
+    value: function onSourceUpdate() {
       this.hide();
       this.displayFeatureInfo = undefined;
     }

package/es/popup/popup.js

@@ -522,7 +522,7 @@ var Popup = /*#__PURE__*/function (_EventEmitter) {
 
         // this.closeButton.type = 'button';
         closeButton.setAttribute('aria-label', 'Close popup');
-        closeButton.addEventListener('click', function (e) {
+        closeButton.addEventListener('click', function () {
           _this4.hide();
         });
 

package/lib/control/layerSwitch.js

@@ -18,6 +18,9 @@ var _icon = require("../utils/icon");
 var _selectControl = _interopRequireDefault(require("./baseControl/selectControl"));
 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); }; }
 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; } }
+function isLayerSwitchItem(obj) {
+  return obj && obj.layer;
+}
 var LayerSwitch = /*#__PURE__*/function (_SelectControl) {
   (0, _inherits2.default)(LayerSwitch, _SelectControl);
   var _super = _createSuper(LayerSwitch);
@@ -64,7 +67,11 @@ var LayerSwitch = /*#__PURE__*/function (_SelectControl) {
         var layerInstances = [];
         layers.forEach(function (layer) {
           if (layer instanceof Object) {
-            layerInstances.push(layer);
+            if (isLayerSwitchItem(layer)) {
+              layerInstances.push(layer.layer);
+            } else {
+              layerInstances.push(layer);
+            }
           }
           if (typeof layer === 'string') {
             var targetLayer = layerService.getLayer(layer) || layerService.getLayerByName(layer);
@@ -98,6 +105,32 @@ var LayerSwitch = /*#__PURE__*/function (_SelectControl) {
   }, {
     key: "getLayerOptions",
     value: function getLayerOptions() {
+      var _this2 = this;
+      var layers = this.controlOption.layers;
+      var isAllImg = layers === null || layers === void 0 ? void 0 : layers.every(function (item) {
+        return item.img;
+      });
+      if (layers) {
+        return layers === null || layers === void 0 ? void 0 : layers.map(function (layer) {
+          if (isLayerSwitchItem(layer)) {
+            return {
+              text: layer.name || layer.layer.name,
+              value: layer.layer.name,
+              img: isAllImg ? layer.img : undefined
+            };
+          } else if (typeof layer === 'string') {
+            var targetLayer = _this2.layerService.getLayer(layer) || _this2.layerService.getLayerByName(layer);
+            return {
+              text: targetLayer === null || targetLayer === void 0 ? void 0 : targetLayer.name,
+              value: targetLayer === null || targetLayer === void 0 ? void 0 : targetLayer.name
+            };
+          }
+          return {
+            text: layer.name,
+            value: layer.name
+          };
+        });
+      }
       return this.layers.map(function (layer) {
         return {
           text: layer.name,

package/lib/popup/layerPopup.js

@@ -108,8 +108,14 @@ var LayerPopup = /*#__PURE__*/function (_Popup) {
   }, {
     key: "setOptions",
     value: function setOptions(option) {
+      var _newOption$items;
       this.unbindLayerEvent();
-      (0, _get2.default)((0, _getPrototypeOf2.default)(LayerPopup.prototype), "setOptions", this).call(this, option);
+      var newOption = (0, _objectSpread2.default)({}, option);
+      var trigger = option.trigger || this.popupOption.trigger;
+      if (((_newOption$items = newOption.items) === null || _newOption$items === void 0 ? void 0 : _newOption$items.length) === 0 && trigger === 'hover') {
+        newOption.followCursor = false;
+      }
+      (0, _get2.default)((0, _getPrototypeOf2.default)(LayerPopup.prototype), "setOptions", this).call(this, newOption);
       this.bindLayerEvent();
       return this;
     }
@@ -168,7 +174,7 @@ var LayerPopup = /*#__PURE__*/function (_Popup) {
           }
         }
         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 onSourceUpdate = _this2.onSourceUpdate.bind(_this2, layer);
+        var onSourceUpdate = _this2.onSourceUpdate.bind(_this2);
         source === null || source === void 0 ? void 0 : source.on('update', onSourceUpdate);
         layerInfo.onSourceUpdate = onSourceUpdate;
         _this2.layerConfigMap.set(layer, layerInfo);
@@ -241,7 +247,7 @@ var LayerPopup = /*#__PURE__*/function (_Popup) {
     }
   }, {
     key: "onSourceUpdate",
-    value: function onSourceUpdate(layer) {
+    value: function onSourceUpdate() {
       this.hide();
       this.displayFeatureInfo = undefined;
     }

package/lib/popup/popup.js

@@ -528,7 +528,7 @@ var Popup = /*#__PURE__*/function (_EventEmitter) {
 
         // this.closeButton.type = 'button';
         closeButton.setAttribute('aria-label', 'Close popup');
-        closeButton.addEventListener('click', function (e) {
+        closeButton.addEventListener('click', function () {
           _this4.hide();
         });
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antv/l7-component",
-  "version": "2.19.7",
+  "version": "2.19.8",
   "description": "",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -26,8 +26,8 @@
   "author": "lzxue",
   "license": "ISC",
   "dependencies": {
-    "@antv/l7-core": "2.19.7",
-    "@antv/l7-utils": "2.19.7",
+    "@antv/l7-core": "2.19.8",
+    "@antv/l7-utils": "2.19.8",
     "@babel/runtime": "^7.7.7",
     "eventemitter3": "^4.0.0",
     "inversify": "^5.0.1",
@@ -35,12 +35,12 @@
     "supercluster": "^7.0.0"
   },
   "devDependencies": {
-    "@antv/l7-layers": "2.19.7",
-    "@antv/l7-test-utils": "2.19.7",
+    "@antv/l7-layers": "2.19.8",
+    "@antv/l7-test-utils": "2.19.8",
     "gcoord": "^0.3.2",
     "less": "^4.1.3"
   },
-  "gitHead": "6199318706a4a9a4a29a886123d8bbdcb50b1501",
+  "gitHead": "9111d4c9dcbeca5df641a994215c062e5b209311",
   "publishConfig": {
     "access": "public"
   }