@ives_xxz/framework 1.5.13 → 1.5.14

package/expand/FWDecorator.ts

@@ -1,10 +1,10 @@
-import 'reflect-metadata';
-import FWLog from '../log/FWLog';
+import "reflect-metadata";
+import FWLog from "../log/FWLog";
 
 type PropertyDecorator = (
   $class: Record<string, any>,
   $propertyKey: string | symbol,
-  $descriptorOrInitializer?: any,
+  $descriptorOrInitializer?: any
 ) => void;
 
 const searchChild = function (node: cc.Node, name: string) {
@@ -21,7 +21,7 @@ const searchChild = function (node: cc.Node, name: string) {
 
 const CookDecoratorKey = ($desc: string) => `__ccc_decorator_${$desc}__`;
 
-const KeyChild = CookDecoratorKey('child_cache');
+const KeyChild = CookDecoratorKey("child_cache");
 
 type ParamType = {
   path?: string;
@@ -30,26 +30,33 @@ type ParamType = {
 export function FWPropertyNode($opt?: ParamType): PropertyDecorator {
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   return ($target, $propertyKey: string, $descriptorOrInitializer) => {
-    const cache: { propertyKey: string; childName: string }[] = ($target[KeyChild] ??= []);
+    const cache: { propertyKey: string; childName: string }[] = ($target[
+      KeyChild
+    ] ??= []);
     if (!cache.some(($vo) => $vo.propertyKey === $propertyKey)) {
       cache.push({
         propertyKey: $propertyKey,
         childName: $opt?.path || $propertyKey,
       });
     } else {
-      throw new Error(`child 装饰器重复绑定属性：${$propertyKey},class：${$target?.name}`);
+      throw new Error(
+        `child 装饰器重复绑定属性：${$propertyKey},class：${$target?.name}`
+      );
     }
     if (cache.length === 1) {
       const oldOnLoad: () => void = $target.onLoad || undefined;
       $target.onLoad = function () {
-        cache.forEach(($vo) => (this[$vo.propertyKey] = searchChild(this.node, $vo.childName)));
+        cache.forEach(
+          ($vo) =>
+            (this[$vo.propertyKey] = searchChild(this.node, $vo.childName))
+        );
         oldOnLoad && oldOnLoad.apply(this);
       };
     }
   };
 }
 
-const KeyChildMulti = CookDecoratorKey('child_cache_multi'); // 重新定义 Key，避免冲突
+const KeyChildMulti = CookDecoratorKey("child_cache_multi"); // 重新定义 Key，避免冲突
 
 /** 查找多个节点，并存储为数组 */
 export function FWPropertyNodes(...paths: string[]): PropertyDecorator {
@@ -59,7 +66,8 @@ export function FWPropertyNodes(...paths: string[]): PropertyDecorator {
       $target[KeyChildMulti] = [];
     }
 
-    const cache: { propertyKey: string; childNames: string[] }[] = $target[KeyChildMulti];
+    const cache: { propertyKey: string; childNames: string[] }[] =
+      $target[KeyChildMulti];
 
     // 查找是否已经存在该属性的绑定
     const existingEntry = cache.find(($vo) => $vo.propertyKey === $propertyKey);
@@ -72,7 +80,7 @@ export function FWPropertyNodes(...paths: string[]): PropertyDecorator {
       });
     } else {
       throw new Error(
-        `child 装饰器重复绑定属性：${$propertyKey}, class：${$target.constructor.name}`,
+        `child 装饰器重复绑定属性：${$propertyKey}, class：${$target.constructor.name}`
       );
     }
 
@@ -115,12 +123,12 @@ interface INewable<T = any> extends Function {
   new (...args: any[]): T;
 }
 
-const KeyComp = CookDecoratorKey('comp_cache');
+const KeyComp = CookDecoratorKey("comp_cache");
 
 export function FWPropertyComponent(
   $componentClass: INewable<cc.Component>,
   $childName?: string,
-  $mute = false,
+  $mute = false
 ): PropertyDecorator {
   return ($target, $propertyKey: string, $descriptorOrInitializer) => {
     const cache: {
@@ -136,7 +144,9 @@ export function FWPropertyComponent(
       });
     } else {
       if (!$mute) {
-        throw new Error(`component装饰器重复绑定属性：${$propertyKey},class：${$target.name}`);
+        throw new Error(
+          `component装饰器重复绑定属性：${$propertyKey},class：${$target.name}`
+        );
       }
       return;
     }
@@ -144,18 +154,21 @@ export function FWPropertyComponent(
       const oldOnLoad: () => void = $target.onLoad || undefined; //$target.onLoad也可以拿到父类的实现
       $target.onLoad = function () {
         cache.forEach(($vo) => {
-          const node = $vo.childName ? searchChild(this.node, $vo.childName) : this.node;
+          const node = $vo.childName
+            ? searchChild(this.node, $vo.childName)
+            : this.node;
           if (!node) {
             if (!$mute) {
               throw new Error(
-                `component装饰器没有找到适合的node节点:class：${$target?.name}，组件：${$componentClass?.name}，childName：${$childName}`,
+                `component装饰器没有找到适合的node节点:class：${$target?.name}，组件：${$componentClass?.name}，childName：${$childName}`
               );
             } else {
               return;
             }
           }
           this[$vo.propertyKey] =
-            node.getComponent($vo.compClass) || node.addComponent($vo.compClass);
+            node.getComponent($vo.compClass) ||
+            node.addComponent($vo.compClass);
         });
         oldOnLoad && oldOnLoad.apply(this);
       };
@@ -165,7 +178,7 @@ export function FWPropertyComponent(
 
 export function FWPropertyComponents(
   $componentClass: INewable<cc.Component>,
-  $childName?: string,
+  $childName?: string
 ): PropertyDecorator {
   return ($target, $propertyKey: string, $descriptorOrInitializer) => {
     const componentName = $childName || $propertyKey;
@@ -210,7 +223,11 @@ export function isNull(message?: string) {
 }
 
 export function FWSocketAutoProcessPause() {
-  return function (target: any, propertyKey: string, descriptor: PropertyDescriptor) {
+  return function (
+    target: any,
+    propertyKey: string,
+    descriptor: PropertyDescriptor
+  ) {
     const originalMethod = descriptor.value;
 
     descriptor.value = async function (...args: any[]) {
@@ -218,7 +235,7 @@ export function FWSocketAutoProcessPause() {
         const result = await originalMethod.apply(this, args);
         return result;
       } finally {
-        FWLog.debug('暂停socket消息处理');
+        FWLog.debug("暂停socket消息处理");
         FW.Entry.socketMgr.resumeMessageHandle();
       }
     };
@@ -228,17 +245,25 @@ export function FWSocketAutoProcessPause() {
 }
 
 export function FWDeprecated(description?: string) {
-  return function (target: any, propertyKey: string, descriptor: PropertyDescriptor) {
+  return function (
+    target: any,
+    propertyKey: string,
+    descriptor: PropertyDescriptor
+  ) {
     const originalMethod = descriptor.value;
     descriptor.value = async function (...args: any[]) {
-      FWLog.warn(`${propertyKey}方法已弃用!${description || ''}`);
+      FWLog.warn(`${propertyKey}方法已弃用!${description || ""}`);
       originalMethod.apply(this, args);
     };
     return descriptor;
   };
 }
 export function FWSocketAutoProcessResume() {
-  return function (target: any, propertyKey: string, descriptor: PropertyDescriptor) {
+  return function (
+    target: any,
+    propertyKey: string,
+    descriptor: PropertyDescriptor
+  ) {
     const originalMethod = descriptor.value;
 
     descriptor.value = async function (...args: any[]) {
@@ -246,7 +271,7 @@ export function FWSocketAutoProcessResume() {
         const result = await originalMethod.apply(this, args);
         return result;
       } finally {
-        FWLog.debug('恢复socket消息处理');
+        FWLog.debug("恢复socket消息处理");
         FW.Entry.socketMgr.resumeMessageHandle();
       }
     };
@@ -254,3 +279,91 @@ export function FWSocketAutoProcessResume() {
     return descriptor;
   };
 }
+
+export function RegisterEvents(events: FW.RegisterEventArgs[]) {
+  return function (
+    target: any,
+    propertyKey: string,
+    descriptor: PropertyDescriptor
+  ) {
+    const originalMethod = descriptor.value;
+
+    descriptor.value = function (...args: any[]) {
+      // 在初始化时自动注册事件
+      if (this.registerEvent) {
+        this.registerEvent(events);
+      }
+      return originalMethod.apply(this, args);
+    };
+
+    return descriptor;
+  };
+}
+
+export function AutoRegisterCCEvent(nodePath: string, eventName?: string) {
+  return function (
+    target: any,
+    propertyKey: string,
+    descriptor: PropertyDescriptor
+  ) {
+    const originalMethod = descriptor.value;
+    const originalOnInit = target.onInit;
+    const evt = eventName || cc.Node.EventType.TOUCH_END;
+
+    target.onInit = function () {
+      originalOnInit?.call(this);
+
+      let targetNode: cc.Node | null = null;
+
+      const cachedNodes = this[KeyChild] || [];
+      const cachedNode = cachedNodes.find(
+        (vo: any) => vo.childName === nodePath
+      );
+
+      if (cachedNode && this[cachedNode.propertyKey]) {
+        targetNode = this[cachedNode.propertyKey];
+      } else {
+        targetNode = searchChild(this.layer?.node || this.node, nodePath);
+
+        if (targetNode && !cachedNode) {
+          const cacheKey = `_cached_${nodePath.replace(/\//g, "_")}`;
+          this[cacheKey] = targetNode;
+          if (!this[KeyChild]) this[KeyChild] = [];
+          this[KeyChild].push({
+            propertyKey: cacheKey,
+            childName: nodePath,
+          });
+        }
+      }
+
+      if (targetNode) {
+        this.registerCCEvent(evt, {
+          cb: originalMethod.bind(this),
+          target: targetNode,
+        });
+        FWLog.debug(`自动注册事件: ${nodePath} -> ${propertyKey}`);
+      } else {
+        FWLog.warn(`自动注册事件失败: 未找到节点 ${nodePath}`);
+      }
+    };
+  };
+}
+
+export function AutoRegisterFWEvent(eventName: any) {
+  return function (
+    target: any,
+    propertyKey: string,
+    descriptor: PropertyDescriptor
+  ) {
+    const originalMethod = descriptor.value;
+    const originalOnInit = target.onInit;
+
+    target.onInit = function (...args) {
+      originalOnInit?.call(this, args);
+      this.registerCCEvent(eventName, {
+        cb: originalMethod.bind(this),
+        target: this,
+      });
+    };
+  };
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ives_xxz/framework",
-  "version": "1.5.13",
+  "version": "1.5.14",
   "description": "cocoscreator 2.x mvc framework",
   "main": "index.js",
   "keywords": [