@ives_xxz/framework 1.6.1 → 1.6.3

package/FW.d.ts

@@ -1170,6 +1170,7 @@ declare namespace FW {
     enable?: boolean;
     responseTime?: number;
     lastResponseTimestamp?: number;
+    data?: any;
   };
 
   type FWEvent = {

package/controller/FWLayerController.ts

@@ -1,11 +1,8 @@
-import { FWSystemDefine } from "../define/FWSystemDefine";
-import FWLayer from "../layer/FWLayer";
-import { FWLayerData } from "../manager/FWLayerManager";
-import { FrameworkBase } from "../FrameworkBase";
-export abstract class FWLayerController
-  extends FrameworkBase
-  implements FW.LayerController
-{
+import { FWSystemDefine } from '../define/FWSystemDefine';
+import FWLayer from '../layer/FWLayer';
+import { FWLayerData } from '../manager/FWLayerManager';
+import { FrameworkBase } from '../FrameworkBase';
+export abstract class FWLayerController extends FrameworkBase implements FW.LayerController {
   readonly entry: FW.Entry = FW.Entry;
   /** layer数据 */
   layerData: FWLayerData;
@@ -78,20 +75,16 @@ export abstract class FWLayerController
     referenceNode: cc.Node,
     type?: {
       prototype: T;
-    }
+    },
   ) {
     return this.find(path, referenceNode)?.getComponent<T>(type);
   }
 
-  getComponentsInChildren<T extends cc.Component = cc.Component>(type: {
-    prototype: T;
-  }) {
+  getComponentsInChildren<T extends cc.Component = cc.Component>(type: { prototype: T }) {
     return this.layer.getComponentsInChildren(type);
   }
 
-  getComponentInChildren<T extends cc.Component = cc.Component>(type: {
-    prototype: T;
-  }) {
+  getComponentInChildren<T extends cc.Component = cc.Component>(type: { prototype: T }) {
     return this.layer.getComponentInChildren(type);
   }
 
@@ -100,16 +93,12 @@ export abstract class FWLayerController
    */
   registerEvent(args: FW.RegisterArgs): void {
     args.target = args.target || this;
-    args.CCEvent?.forEach(
-      (v) => (v.responseInterval = this.defaultResponseInterval)
-    );
-    args.FWEvent?.forEach(
-      (v) => (v.responseInterval = this.defaultResponseInterval)
-    );
+    args.CCEvent?.forEach((v) => (v.responseInterval = this.defaultResponseInterval));
+    args.FWEvent?.forEach((v) => (v.responseInterval = this.defaultResponseInterval));
     return this.entry.uiMgr.register({
       target: this,
-      CCEvent: args?.CCEvent ? args?.CCEvent : [],
-      FWEvent: args?.FWEvent ? args?.FWEvent : [],
+      CCEvent: args?.CCEvent || undefined,
+      FWEvent: args?.FWEvent || undefined,
     });
   }
 
@@ -117,7 +106,7 @@ export abstract class FWLayerController
     target: cc.Node,
     cb: (event: cc.Event) => void,
     responseInterval?: number,
-    eventName?: string
+    eventName?: string,
   ): this {
     this.registerEvent({
       target: this,
@@ -138,7 +127,7 @@ export abstract class FWLayerController
     eventName: string,
     cb: (event: cc.Event) => void,
     target?: cc.Node,
-    responseInterval?: number
+    responseInterval?: number,
   ): this {
     this.registerEvent({
       target: target || this,

package/expand/FWDecorator.ts

@@ -336,10 +336,15 @@ export function AutoRegisterCCEvent(nodePath: string, eventName?: string) {
       }
 
       if (targetNode) {
-        this.registerCCEvent(evt, {
-          cb: originalMethod.bind(this),
-          target: targetNode,
-        });
+        this.registerEvent({
+  CCEvent: [
+    {
+      eventName: evt,
+      cb: originalMethod.bind(this),
+      target: targetNode,
+    }
+  ]
+});
         FWLog.debug(`自动注册事件: ${nodePath} -> ${propertyKey}`);
       } else {
         FWLog.warn(`自动注册事件失败: 未找到节点 ${nodePath}`);
@@ -359,10 +364,15 @@ export function AutoRegisterFWEvent(eventName: any) {
 
     target.onInit = function (...args) {
       originalOnInit?.call(this, args);
-      this.registerCCEvent(eventName, {
-        cb: originalMethod.bind(this),
-        target: this,
-      });
+      this.registerEvent({
+  CCEvent: [
+    {
+      eventName: eventName,
+      cb: originalMethod.bind(this),
+      target: this,
+    }
+  ]
+});
     };
   };
 }

package/language/FWLanguage.ts

@@ -38,14 +38,17 @@ export default abstract class FWLanguage extends cc.Component {
   }
 
   protected onLoad(): void {
-    FW.Entry.evtMgr.register(
-      FWEventDefine.LanguageEvent.LANGUAGE_CHANGE,
-      () => {
+    this.registerEvent({
+  FWEvent: [
+    {
+      eventName: FWEventDefine.LanguageEvent.LANGUAGE_CHANGE,
+      cb: () => {
         this._language = FW.Entry.languageMgr.getLanguageIndex();
         this.onLanguageChange();
-      },
-      this
-    );
+      }
+    }
+  ]
+});
   }
 
   protected onEnable(): void {

package/manager/FWPromiseManager.ts

@@ -61,6 +61,7 @@ export default class FWPromiseManager
         }
 
         const onAbort = () => {
+          FWLog.debug("promise abort");
           timerSchedule?.unSchedule();
           if (promiseProxy.status === FWSystemDefine.FWPromiseStatus.PENDING) {
             promiseProxy.status = FWSystemDefine.FWPromiseStatus.CANCELLED;

package/package.json

@@ -1,11 +1,9 @@
 {
   "name": "@ives_xxz/framework",
-  "version": "1.6.1",
+  "version": "1.6.3",
   "description": "cocoscreator 2.x mvc framework",
   "main": "index.js",
-  "keywords": [
-    "123456"
-  ],
+  "keywords": ["123456"],
   "author": "ives",
   "license": "ISC"
 }

package/service/http/FWHttp.ts

@@ -77,7 +77,9 @@ export default class FWHttp extends FWService {
           ...FWSystemConfig.PromiseConfig.http,
           retryCondition(error, retryCount) {
             return (
-              xhr.readyState != 4 || (xhr.status !== 200 && retryCount < 3)
+              error ||
+              xhr.readyState != 4 ||
+              (xhr.status !== 200 && retryCount < 3)
             );
           },
         }