微调事件命名空间

yoxjs · Jul 12, 2019 · b49c5b4 · b49c5b4
1 parent 1dc5a8f
commit b49c5b4
Showing 1 changed file with 12 additions and 5 deletions.
diff --git a/src/Yox.ts b/src/Yox.ts
@@ -652,12 +652,19 @@ export default class Yox<Computed, Watchers, Events, Methods> implements YoxInte
 
     event = type instanceof CustomEvent ? type : new CustomEvent(type),
 
-    namespace = event.ns || (event.ns = $emitter.parse(event.type)),
-
     args: any[] = [event],
 
     isComplete: boolean
 
+    // 创建完 CustomEvent，如果没有人为操作
+    // 它的 ns 为 undefined
+    // 这里先解析出命名空间，避免每次 fire 都要解析
+    if (isUndef(event.ns)) {
+      const namespace = $emitter.parse(event.type)
+      event.type = namespace.type
+      event.ns = namespace.ns
+    }
+
     // 告诉外部是谁发出的事件
     if (!event.target) {
       event.target = instance
@@ -674,12 +681,12 @@ export default class Yox<Computed, Watchers, Events, Methods> implements YoxInte
     // 如果手动 fire 带上了事件命名空间
     // 则命名空间不能是 native，因为 native 有特殊用处
     if (process.env.NODE_ENV === 'development') {
-      if (namespace.ns === MODIFER_NATIVE) {
-        logger.error(`"${event.type}": The namespace "${MODIFER_NATIVE}" is not permitted.`)
+      if (event.ns === MODIFER_NATIVE) {
+        logger.error(`The namespace "${MODIFER_NATIVE}" is not permitted.`)
       }
     }
 
-    isComplete = $emitter.fire(namespace, args)
+    isComplete = $emitter.fire(event, args)
     if (isComplete) {
       if (downward) {
         if ($children) {