修复mapv图层和ECharts图层移除事件问题

shanligang · shanligang · commit 3a02dfd37e51 · 2017-11-30T17:04:31.000+08:00
diff --git a/src/leaflet/overlay/EChartsLayer.js b/src/leaflet/overlay/EChartsLayer.js
@@ -146,6 +146,14 @@ export var EchartsLayer = L.Layer.extend({
         this._ec.setOption(this._echartsOptions);
     },
 
+    onRemove: function (map) {
+        for (var i in this._layers) {
+          map.removeLayer(this._layers[i]);
+        }
+        // 销毁echarts实例
+        this._ec.dispose();
+    },
+
     _initEchartsContainer: function () {
         var size = this._map.getSize();
         var _div = document.createElement('div');
diff --git a/src/leaflet/overlay/MapVLayer.js b/src/leaflet/overlay/MapVLayer.js
@@ -67,11 +67,11 @@ export var MapVLayer = L.Layer.extend({
      */
     onRemove: function (map) {
         L.DomUtil.remove(this.container);
-        map.off({
-            moveend: this.draw,
-            zoomstart: this._hide,
-            zoomend: this._show
-        }, this);
+        // map.off({
+        //     moveend: this.draw,
+        //     zoomstart: this._hide,
+        //     zoomend: this._show
+        // }, this);
     },
 
     /**
diff --git a/src/leaflet/overlay/mapv/MapVRenderer.js b/src/leaflet/overlay/mapv/MapVRenderer.js
@@ -30,9 +30,12 @@ export default class MapVRenderer extends BaseLayer {
         this.canvasLayer = layer;
         this.clickEvent = this.clickEvent.bind(this);
         this.mousemoveEvent = this.mousemoveEvent.bind(this);
-        this.map.on('movestart', this.moveStartEvent.bind(this));
-        this.map.on('moveend', this.moveEndEvent.bind(this));
-        this.map.on('zoomstart', this.zoomStartEvent.bind(this));
+        this._moveStartEvent = this.moveStartEvent.bind(this);
+        this._moveEndEvent = this.moveEndEvent.bind(this);
+        this._zoomstart = this.zoomStartEvent.bind(this);
+        this.map.on('movestart', this._moveStartEvent);
+        this.map.on('moveend', this._moveEndEvent);
+        this.map.on('zoomstart', this._zoomstart);
         this.bindEvent();
     }
 
@@ -72,6 +75,9 @@ export default class MapVRenderer extends BaseLayer {
                 map.on('mousemove', this.mousemoveEvent);
             }
         }
+        this.map.off('movestart', this._moveStartEvent);
+        this.map.off('moveend', this._moveEndEvent);
+        this.map.off('zoomstart', this._zoomStartEvent);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -30,9 +30,12 @@ export default class MapVRenderer extends BaseLayer {`
`30`	`30`	`this.canvasLayer = layer;`
`31`	`31`	`this.clickEvent = this.clickEvent.bind(this);`
`32`	`32`	`this.mousemoveEvent = this.mousemoveEvent.bind(this);`
`33`		`- this.map.on('movestart', this.moveStartEvent.bind(this));`
`34`		`- this.map.on('moveend', this.moveEndEvent.bind(this));`
`35`		`- this.map.on('zoomstart', this.zoomStartEvent.bind(this));`
	`33`	`+ this._moveStartEvent = this.moveStartEvent.bind(this);`
	`34`	`+ this._moveEndEvent = this.moveEndEvent.bind(this);`
	`35`	`+ this._zoomstart = this.zoomStartEvent.bind(this);`
	`36`	`+ this.map.on('movestart', this._moveStartEvent);`
	`37`	`+ this.map.on('moveend', this._moveEndEvent);`
	`38`	`+ this.map.on('zoomstart', this._zoomstart);`
`36`	`39`	`this.bindEvent();`
`37`	`40`	`}`
`38`	`41`
`@@ -72,6 +75,9 @@ export default class MapVRenderer extends BaseLayer {`
`72`	`75`	`map.on('mousemove', this.mousemoveEvent);`
`73`	`76`	`}`
`74`	`77`	`}`
	`78`	`+ this.map.off('movestart', this._moveStartEvent);`
	`79`	`+ this.map.off('moveend', this._moveEndEvent);`
	`80`	`+ this.map.off('zoomstart', this._zoomStartEvent);`
`75`	`81`	`}`
`76`	`82`
`77`	`83`	`/**`