@ives_xxz/framework 1.6.2 → 1.6.4

package/manager/FWUiManager.ts

@@ -1,6 +1,6 @@
-import { searchChild } from "../expand/FWDecorator";
-import FWLog from "../log/FWLog";
-import { FWManager } from "./FWManager";
+import { searchChild } from '../expand/FWDecorator';
+import FWLog from '../log/FWLog';
+import { FWManager } from './FWManager';
 
 export default class FWUiManager extends FWManager implements FW.UiManager {
   private eventMap: Map<
@@ -113,7 +113,7 @@ export default class FWUiManager extends FWManager implements FW.UiManager {
 
   register(args: FW.RegisterArgs) {
     if (!args.target) {
-      FWLog.error("注册事件失败,目标为空!");
+      FWLog.error('注册事件失败,目标为空!');
       return;
     }
 
@@ -131,11 +131,7 @@ export default class FWUiManager extends FWManager implements FW.UiManager {
 
               if (!evt.enable) return;
 
-              /** 检测触发间隔 */
-              if (
-                Date.now() - evt.lastResponseTimestamp <
-                evt.responseInterval
-              ) {
+              if (Date.now() - evt.lastResponseTimestamp < evt.responseInterval) {
                 return;
               }
 
@@ -143,9 +139,9 @@ export default class FWUiManager extends FWManager implements FW.UiManager {
               if (button && !button.interactable) return;
 
               evt.lastResponseTimestamp = Date.now();
-              evt.cb?.bind(args.target)?.(e, c);
+              evt.cb?.bind(args.target)?.(e, c, evt.data);
             },
-            args.target
+            args.target,
           );
           this.eventMap.set(this.uniqueId, {
             uniqueId: this.uniqueId,
@@ -168,12 +164,9 @@ export default class FWUiManager extends FWManager implements FW.UiManager {
             args7?: FW.EventManagerArgs,
             args8?: FW.EventManagerArgs,
             args9?: FW.EventManagerArgs,
-            args10?: FW.EventManagerArgs
+            args10?: FW.EventManagerArgs,
           ) => {
-            if (
-              Date.now() - evt.lastResponseTimestamp <
-              (evt.responseInterval || 0)
-            ) {
+            if (Date.now() - evt.lastResponseTimestamp < (evt.responseInterval || 0)) {
               return;
             }
             evt.lastResponseTimestamp = Date.now();
@@ -187,10 +180,10 @@ export default class FWUiManager extends FWManager implements FW.UiManager {
               args7,
               args8,
               args9,
-              args10
+              args10,
             );
           },
-          args.target
+          args.target,
         );
 
         this.eventMap.set(this.uniqueId, {

package/package.json

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

package/service/http/FWHttp.ts

@@ -1,7 +1,7 @@
-import { FWSystemConfig } from "../../config/FWSystemConfig";
-import { FWSystemDefine } from "../../define/FWSystemDefine";
-import FWLog from "../../log/FWLog";
-import FWService from "../FWService";
+import { FWSystemConfig } from '../../config/FWSystemConfig';
+import { FWSystemDefine } from '../../define/FWSystemDefine';
+import FWLog from '../../log/FWLog';
+import FWService from '../FWService';
 
 export default class FWHttp extends FWService {
   public initialize() {}
@@ -12,30 +12,18 @@ export default class FWHttp extends FWService {
     url: string,
     params?: string,
     cb?: (response: string) => void,
-    tag?: string
+    tag?: string,
   ): Promise<string> {
-    return this.process(
-      url,
-      params,
-      cb,
-      tag,
-      FWSystemDefine.FWHttpRequestType.GET
-    );
+    return this.process(url, params, cb, tag, FWSystemDefine.FWHttpRequestType.GET);
   }
 
   protected async postMessage(
     url: string,
     params?: string,
     cb?: (response: string) => void,
-    tag?: string
+    tag?: string,
   ): Promise<string> {
-    return this.process(
-      url,
-      params,
-      cb,
-      tag,
-      FWSystemDefine.FWHttpRequestType.POST
-    );
+    return this.process(url, params, cb, tag, FWSystemDefine.FWHttpRequestType.POST);
   }
 
   private async process(
@@ -43,56 +31,48 @@ export default class FWHttp extends FWService {
     params: string,
     cb: (response: any) => void,
     tag: string,
-    type: FWSystemDefine.FWHttpRequestType
+    type: FWSystemDefine.FWHttpRequestType,
   ): Promise<string> {
     let xhr: XMLHttpRequest;
 
-    const promiseProxy: FW.PromiseProxy<string> =
-      FW.Entry.promiseMgr.execute<string>(
-        (resolve, reject, signal, reason) => {
-          xhr = new XMLHttpRequest();
+    const promiseProxy: FW.PromiseProxy<string> = FW.Entry.promiseMgr.execute<string>(
+      (resolve, reject, signal, reason) => {
+        xhr = new XMLHttpRequest();
 
-          xhr.onreadystatechange = () => {
-            if (xhr.readyState == 4 && xhr.status === 200) {
-              cb?.(xhr.response);
-              resolve(xhr.response);
-            }
-          };
+        xhr.onreadystatechange = () => {
+          if (xhr.readyState == 4 && xhr.status === 200) {
+            cb?.(xhr.response);
+            resolve(xhr.response);
+          }
+        };
 
-          xhr.onerror = (err: any) => {
-            FWLog.error(err);
-            this.onError?.(err);
-            reject(`http request error:${err}`);
-          };
+        xhr.onerror = (err: any) => {
+          FWLog.error(err);
+          this.onError?.(err);
+          reject(`http request error:${err}`);
+        };
 
-          xhr.ontimeout = () => {
-            this.onTimeout?.();
-            reject(`http request timeout!`);
-          };
+        xhr.ontimeout = () => {
+          this.onTimeout?.();
+          reject(`http request timeout!`);
+        };
 
-          xhr.open(type, url, true);
-          xhr.send(params);
+        xhr.open(type, url, true);
+        xhr.send(params);
+      },
+      {
+        ...FWSystemConfig.PromiseConfig.http,
+        retryCondition(error, retryCount) {
+          return error || xhr.readyState != 4 || (xhr.status !== 200 && retryCount < 3);
         },
-        {
-          ...FWSystemConfig.PromiseConfig.http,
-          retryCondition(error, retryCount) {
-            return (
-              error ||
-              xhr.readyState != 4 ||
-              (xhr.status !== 200 && retryCount < 3)
-            );
-          },
-        }
-      );
+      },
+    );
 
     promiseProxy.addAbortEventListener(() => {
       xhr.abort();
     });
 
-    return await this.invoke(
-      promiseProxy.promise,
-      tag ? `http request ->${tag}` : ""
-    );
+    return await this.invoke(promiseProxy.promise, tag ? `http request ->${tag}` : '');
   }
 
   onError?(err: any);