fixed #60

TalkingData · Jan 25, 2019 · dbb4e2f · dbb4e2f
1 parent 346793d
commit dbb4e2f
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 8 deletions.
diff --git a/src/overlay/base/CanvasOverlay.js b/src/overlay/base/CanvasOverlay.js
@@ -5,6 +5,7 @@ import {
     setDevicePixelRatio,
     isString,
     isArray,
+    detectmob,
     isFunction
 } from '../../common/Util';
 import {
@@ -14,6 +15,7 @@ import {
 import Toolbar from '../../map/Toolbar';
 import ToolTip from '../../map/ToolTip';
 let zIndex = 0;
+const isMobile = detectmob();
 
 export default class CanvasOverlay extends BaseClass {
     constructor(opts) {
@@ -58,7 +60,12 @@ export default class CanvasOverlay extends BaseClass {
         map.addEventListener('zoomstart', this._tOnZoomstart);
         map.addEventListener('zoomend', this._tOnZoomend);
         map.addEventListener('mousemove', this._tMousemove);
-        map.addEventListener('click', this._tMouseClick);
+        if (isMobile) {
+            map.addEventListener('touchstart', this._tMouseClick);
+        } else {
+            map.addEventListener('click', this._tMouseClick);
+        }
+
         if (!map._inmapToolBar) {
             map._inmapToolBar = new Toolbar(map.getContainer());
         }
@@ -215,7 +222,11 @@ export default class CanvasOverlay extends BaseClass {
             this._map.removeEventListener('zoomend', this._tOnZoomend);
             this._map.removeEventListener('moving', this._tOnMoving);
             this._map.removeEventListener('mousemove', this._tMousemove);
-            this._map.removeEventListener('click', this._tMouseClick);
+            if (isMobile) {
+                this._map.removeEventListener('touchstart', this._tMouseClick);
+            } else {
+                this._map.removeEventListener('click', this._tMouseClick);
+            }
         }
 
 

diff --git a/src/overlay/base/Parameter.js b/src/overlay/base/Parameter.js
@@ -279,13 +279,18 @@ export default class Parameter extends CanvasOverlay {
      */
     _setlegend(legendConfig, list) {
         if (!this._map) return;
-        let option = {};
-        //legendConfig.list has a higher priority than list
-        if (!(legendConfig.list && legendConfig.list.length > 0)) {
-            option = merge(legendConfig, {
-                list: list
-            });
+        let option = {
 
+        };
+        if ((legendConfig.list && legendConfig.list.length > 0)) {
+            option = {
+                ...legendConfig
+            };
+        } else {
+            option = {
+                ...legendConfig,
+                list
+            };
         }
         this.legend.setOption(option);
     }