@antv/l7-component 2.14.7 → 2.15.1

package/es/control/exportImage.js

@@ -1,3 +1,4 @@
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
@@ -167,7 +168,9 @@ var ExportImage = /*#__PURE__*/function (_ButtonControl) {
 
               case 5:
                 layerImage = _context3.sent;
-                return _context3.abrupt("return", this.mergeImage(mapImage, layerImage));
+                return _context3.abrupt("return", this.mergeImage.apply(this, _toConsumableArray([mapImage, layerImage].filter(function (base64) {
+                  return base64;
+                }))));
 
               case 7:
               case "end":

package/es/marker.js

@@ -77,8 +77,6 @@ var Marker = /*#__PURE__*/function (_EventEmitter) {
       this.registerMarkerEvent(element);
       this.mapsService.on('camerachange', this.update); // 注册高德1.x 的地图事件监听
 
-      this.mapsService.on('viewchange', this.update); // 注册高德2.0 的地图事件监听
-
       this.update();
       this.added = true;
       this.emit('added');
@@ -90,10 +88,8 @@ var Marker = /*#__PURE__*/function (_EventEmitter) {
       if (this.mapsService) {
         this.mapsService.off('click', this.onMapClick);
         this.mapsService.off('move', this.update);
-        this.mapsService.off('moveend', this.update); // this.mapsService.off('mousedown', this.addDragHandler);
-        // this.mapsService.off('touchstart', this.addDragHandler);
-        // this.mapsService.off('mouseup', this.onUp);
-        // this.mapsService.off('touchend', this.onUp);
+        this.mapsService.off('moveend', this.update);
+        this.mapsService.off('camerachange', this.update);
       }
 
       this.unRegisterMarkerEvent();
@@ -388,15 +384,12 @@ var Marker = /*#__PURE__*/function (_EventEmitter) {
           element.style[key] = value;
         }
       });
-      element.addEventListener('click', function (e) {
-        _this5.onMapClick(e);
-      });
-      element.addEventListener('click', this.eventHandle);
       applyAnchorClass(element, anchor, 'marker');
     }
   }, {
     key: "registerMarkerEvent",
     value: function registerMarkerEvent(element) {
+      element.addEventListener('click', this.onMapClick);
       element.addEventListener('mousemove', this.eventHandle);
       element.addEventListener('click', this.eventHandle);
       element.addEventListener('mousedown', this.eventHandle);
@@ -412,6 +405,7 @@ var Marker = /*#__PURE__*/function (_EventEmitter) {
     key: "unRegisterMarkerEvent",
     value: function unRegisterMarkerEvent() {
       var element = this.getElement();
+      element.removeEventListener('click', this.onMapClick);
       element.removeEventListener('mousemove', this.eventHandle);
       element.removeEventListener('click', this.eventHandle);
       element.removeEventListener('mousedown', this.eventHandle);

package/lib/control/exportImage.js

@@ -9,6 +9,8 @@ exports.default = exports.ExportImage = void 0;
 
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
@@ -182,7 +184,9 @@ var ExportImage = /*#__PURE__*/function (_ButtonControl) {
 
               case 5:
                 layerImage = _context3.sent;
-                return _context3.abrupt("return", this.mergeImage(mapImage, layerImage));
+                return _context3.abrupt("return", this.mergeImage.apply(this, (0, _toConsumableArray2.default)([mapImage, layerImage].filter(function (base64) {
+                  return base64;
+                }))));
 
               case 7:
               case "end":

package/lib/marker.js

@@ -91,8 +91,6 @@ var Marker = /*#__PURE__*/function (_EventEmitter) {
       this.registerMarkerEvent(element);
       this.mapsService.on('camerachange', this.update); // 注册高德1.x 的地图事件监听
 
-      this.mapsService.on('viewchange', this.update); // 注册高德2.0 的地图事件监听
-
       this.update();
       this.added = true;
       this.emit('added');
@@ -104,10 +102,8 @@ var Marker = /*#__PURE__*/function (_EventEmitter) {
       if (this.mapsService) {
         this.mapsService.off('click', this.onMapClick);
         this.mapsService.off('move', this.update);
-        this.mapsService.off('moveend', this.update); // this.mapsService.off('mousedown', this.addDragHandler);
-        // this.mapsService.off('touchstart', this.addDragHandler);
-        // this.mapsService.off('mouseup', this.onUp);
-        // this.mapsService.off('touchend', this.onUp);
+        this.mapsService.off('moveend', this.update);
+        this.mapsService.off('camerachange', this.update);
       }
 
       this.unRegisterMarkerEvent();
@@ -404,15 +400,12 @@ var Marker = /*#__PURE__*/function (_EventEmitter) {
           element.style[key] = value;
         }
       });
-      element.addEventListener('click', function (e) {
-        _this5.onMapClick(e);
-      });
-      element.addEventListener('click', this.eventHandle);
       (0, _l7Utils.applyAnchorClass)(element, anchor, 'marker');
     }
   }, {
     key: "registerMarkerEvent",
     value: function registerMarkerEvent(element) {
+      element.addEventListener('click', this.onMapClick);
       element.addEventListener('mousemove', this.eventHandle);
       element.addEventListener('click', this.eventHandle);
       element.addEventListener('mousedown', this.eventHandle);
@@ -428,6 +421,7 @@ var Marker = /*#__PURE__*/function (_EventEmitter) {
     key: "unRegisterMarkerEvent",
     value: function unRegisterMarkerEvent() {
       var element = this.getElement();
+      element.removeEventListener('click', this.onMapClick);
       element.removeEventListener('mousemove', this.eventHandle);
       element.removeEventListener('click', this.eventHandle);
       element.removeEventListener('mousedown', this.eventHandle);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antv/l7-component",
-  "version": "2.14.7",
+  "version": "2.15.1",
   "description": "",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -26,8 +26,8 @@
   "author": "lzxue",
   "license": "ISC",
   "dependencies": {
-    "@antv/l7-core": "2.14.7",
-    "@antv/l7-utils": "2.14.7",
+    "@antv/l7-core": "2.15.1",
+    "@antv/l7-utils": "2.15.1",
     "@babel/runtime": "^7.7.7",
     "eventemitter3": "^4.0.0",
     "inversify": "^5.0.1",
@@ -36,12 +36,12 @@
     "supercluster": "^7.0.0"
   },
   "devDependencies": {
-    "@antv/l7-layers": "2.14.7",
-    "@antv/l7-test-utils": "2.14.7",
+    "@antv/l7-layers": "2.15.1",
+    "@antv/l7-test-utils": "2.15.1",
     "gcoord": "^0.3.2",
     "less": "^4.1.3"
   },
-  "gitHead": "66930cd0d38ec341382493065defb77911c38d15",
+  "gitHead": "8185d8864534a426f6744f3c035f2fb4dcc1b3ba",
   "publishConfig": {
     "access": "public"
   }