optimize Eventable performance (#2102)

* optimize Eventable once performance

* fix

* optimize Eventable on and off  performance

* fix

* fix

Author: deyihu

src/core/Eventable.js

@@ -1,11 +1,15 @@
 import Browser from './Browser';
-import { extend, isString, isNil } from './util';
+import { extend, isString, isNil, UID, isNumber } from './util';
 import { stopPropagation } from './util/dom';
 /**
  * This provides methods used for event handling. It's a mixin and not meant to be used directly.
  * @mixin Eventable
  */
 
+function generateWrapKey(eventType) {
+    return 'Z__' + eventType;
+}
+
 const Eventable = Base =>
 
     class extends Base {
@@ -38,14 +42,29 @@ const Eventable = Base =>
             if (!context) {
                 context = this;
             }
+            //检测handler是否被监听过
+            const isAdd = isNumber(handler._id);
+            handler._id = UID();
             let handlerChain;
             for (let ii = 0, ll = eventTypes.length; ii < ll; ii++) {
                 evtType = eventTypes[ii];
+                const wrapKey = generateWrapKey(evtType);
+                if (handler[wrapKey]) {
+                    handler[wrapKey]._id = handler._id;
+                }
                 handlerChain = this._eventMap[evtType];
                 if (!handlerChain) {
                     handlerChain = [];
                     this._eventMap[evtType] = handlerChain;
                 }
+                //没有监听过的handler直接入列
+                if (!isAdd) {
+                    handlerChain.push({
+                        handler: handler,
+                        context: context
+                    });
+                    continue;
+                }
                 const l = handlerChain.length;
                 if (l > 0) {
                     for (let i = 0; i < l; i++) {
@@ -127,17 +146,21 @@ const Eventable = Base =>
             if (!handler) {
                 return this;
             }
+            //没有监听过的handler直接忽略
+            if (!isNumber(handler._id)) {
+                return this;
+            }
             const eventTypes = eventsOff.split(' ');
             let eventType, listeners, wrapKey;
             if (!context) {
                 context = this;
             }
             for (let j = 0, jl = eventTypes.length; j < jl; j++) {
                 eventType = eventTypes[j].toLowerCase();
-                wrapKey = 'Z__' + eventType;
+                wrapKey = generateWrapKey(eventType);
                 listeners = this._eventMap[eventType];
                 if (!listeners) {
-                    return this;
+                    continue;
                 }
                 for (let i = listeners.length - 1; i >= 0; i--) {
                     const listener = listeners[i];
@@ -245,8 +268,8 @@ const Eventable = Base =>
         }
 
         _wrapOnceHandler(evtType, handler, context) {
-            const me = this;
-            const key = 'Z__' + evtType;
+            // const me = this;
+            const key = generateWrapKey(evtType);
             let called = false;
             const fn = function onceHandler() {
                 if (called) {
@@ -259,7 +282,8 @@ const Eventable = Base =>
                 } else {
                     handler.apply(this, arguments);
                 }
-                me.off(evtType, onceHandler, this);
+                onceHandler._called = true;
+                // me.off(evtType, onceHandler, this);
             };
             fn[key] = handler;
             return fn;
@@ -310,7 +334,8 @@ const Eventable = Base =>
             if (!this._eventMap) {
                 return this;
             }
-            const handlerChain = this._eventMap[eventType.toLowerCase()];
+            eventType = eventType.toLowerCase();
+            const handlerChain = this._eventMap[eventType];
             if (!handlerChain) {
                 return this;
             }
@@ -326,6 +351,10 @@ const Eventable = Base =>
                 if (!queue[i]) {
                     continue;
                 }
+                const handler = queue[i].handler;
+                if (handler._called) {
+                    continue;
+                }
                 context = queue[i].context;
                 bubble = true;
                 passed = extend({}, param);
@@ -341,6 +370,17 @@ const Eventable = Base =>
                     }
                 }
             }
+            const eventQueue = this._eventMap[eventType];
+            if (eventQueue) {
+                const queueExcludeOnce = [];
+                for (let i = 0, len = eventQueue.length; i < len; i++) {
+                    const handler = eventQueue[i].handler;
+                    if (!handler._called) {
+                        queueExcludeOnce.push(eventQueue[i]);
+                    }
+                }
+                this._eventMap[eventType] = queueExcludeOnce;
+            }
             return this;
         }
     };

test/layer/VectorLayerSpec.js

@@ -133,8 +133,8 @@ describe('VectorLayer.Spec', function () {
 
         it('all type of geometry in seamlessZoom', function (done) {
             map.config('seamlessZoom', true);
-            layer.on('forceRenderOnZooming', true);
-            layer.on('drawImmediate', true);
+            layer.config('forceRenderOnZooming', true);
+            layer.config('drawImmediate', true);
             var geometries = GEN_GEOMETRIES_OF_ALL_TYPES();
             map.on('zoomend', function () {
                 done();