@ives_xxz/framework 1.2.4 → 1.2.6

package/manager/FWLayerManager.ts

@@ -123,22 +123,18 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
 
     let ctr = new data.type();
 
-    if (ctr.layerType == FWSystemDefine.FWLayerType.POPUP_QUEUE && !this.layerQueue.isEmpty()) {
-      this.layerQueue.add(ctr.layerData);
-      return;
-    }
-
     /** 如果不是重复打开的Layer,不是需要添加进队列末尾的,并且已经存在于注册表中的 不进行重复打开 */
-    if (
-      this.layerRegistry.has(data.type) &&
-      !ctr.isRepeatOpen &&
-      ctr.layerType != FWSystemDefine.FWLayerType.POPUP_QUEUE
-    ) {
+    if (this.layerRegistry.has(data.type) && !ctr.isRepeatOpen) {
       return;
     }
 
     this.layerRegistry.add(data.type);
 
+    if (ctr.layerType == FWSystemDefine.FWLayerType.POPUP_QUEUE && !this.layerQueue.isEmpty()) {
+      this.layerQueue.add(ctr.layerData);
+      return;
+    }
+
     ctr.initialize();
 
     const layerData = this.createLayerData(ctr);
@@ -200,17 +196,15 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
     }
     let ctr = new data.type();
 
-    if (ctr.layerType == FWSystemDefine.FWLayerType.POPUP_QUEUE && !this.layerQueue.isEmpty()) {
-      this.layerQueue.add(ctr.layerData);
+    /** 如果不是重复打开的Layer,不是需要添加进队列末尾的,并且已经存在于注册表中的 不进行重复打开 */
+    if (this.layerRegistry.has(data.type) && !ctr.isRepeatOpen) {
       return;
     }
 
-    /** 如果不是重复打开的Layer,不是需要添加进队列末尾的,并且已经存在于注册表中的 不进行重复打开 */
-    if (
-      this.layerRegistry.has(data.type) &&
-      !ctr.isRepeatOpen &&
-      ctr.layerType != FWSystemDefine.FWLayerType.POPUP_QUEUE
-    ) {
+    this.layerRegistry.add(data.type);
+
+    if (ctr.layerType == FWSystemDefine.FWLayerType.POPUP_QUEUE && !this.layerQueue.isEmpty()) {
+      this.layerQueue.add(ctr.layerData);
       return;
     }
 
@@ -251,7 +245,8 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
     if (ctr.layerType !== FWSystemDefine.FWLayerType.PERMANENT) {
       this.layerStack.push(layerData);
     }
-    const a = Symbol['addExternalReference'];
+
+    this.layerRegistry.delete(data.type);
 
     const proxy = new Proxy(ctr, {
       get: (target, prop) => {

package/package.json

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

package/service/socket/FWSocket.ts

@@ -170,7 +170,7 @@ export default class FWSocket implements FW.Socket {
       return;
     }
 
-    this.socket.close();
+    this.socket?.close();
     this.socket = null;
 
     this.createSocket(this.address, this.tag, this.sender, this.handle, {

package/utils/FWTask.ts

@@ -20,13 +20,13 @@ export default class FWTask implements FW.Task {
 
   readonly id: number;
 
-  constructor(options?: Partial<FW.TaskOptions>) {
-    this.id = options?.taskId || 0;
+  constructor(options: FW.TaskOptions) {
+    this.id = options.taskId || Date.now();
     this.taskCounter = 0;
     this.totalTaskDuration = 0;
-    this.log = options?.log ?? true;
-    this.frameBudget = options?.frameBudget ?? 16;
-    this.tasksFrameCount = options?.tasksFrameCount ?? 3;
+    this.log = options.log ?? true;
+    this.frameBudget = options.frameBudget ?? 16;
+    this.tasksFrameCount = options.tasksFrameCount ?? 3;
     this.performanceData = {
       frameTimes: [],
       detailedFrames: [],
@@ -138,13 +138,11 @@ export default class FWTask implements FW.Task {
         });
       }
 
-      if ((result?.value as any)?.message) {
-        frameTasks.push({
-          taskId: taskId,
-          result: result.done ? FWEventDefine.TaskEvent.COMPLETE : FWEventDefine.TaskEvent.YIELDED,
-          message: (result?.value as any)?.message,
-        });
-      }
+      frameTasks.push({
+        taskId: taskId,
+        result: result.done ? FWEventDefine.TaskEvent.COMPLETE : FWEventDefine.TaskEvent.YIELDED,
+        message: (result?.value as any)?.message,
+      });
 
       processed++;
     }