@ives_xxz/framework 2.1.13 → 2.1.14

package/controller/FWLayerController.ts

@@ -173,6 +173,6 @@ export abstract class FWLayerController extends FW.FrameworkBase implements FW.L
   }
   /** 关闭layer */
   close() {
-    FW.Entry.layerMgr.close(this);
+    return FW.Entry.layerMgr.close(this);
   }
 }

package/expand/FWDecorator.ts

@@ -24,6 +24,16 @@ export function FWPropertyNode($opt?: ParamType): FW.PropertyDecorator {
   return ($target, $propertyKey: string, $descriptorOrInitializer) => {
     if (!$target.hasOwnProperty(KeyChild)) {
       $target[KeyChild] = [];
+
+      const oldOnLoad: () => void = $target.onLoad || undefined;
+      $target.onLoad = function () {
+        const cache = $target[KeyChild];
+        cache.forEach(($vo) => {
+          const node = searchChild(this.node, $vo.childName);
+          this[$vo.propertyKey] = node;
+        });
+        oldOnLoad && oldOnLoad.apply(this);
+      };
     }
 
     const cache: { propertyKey: string; childName: string }[] = $target[KeyChild];
@@ -36,52 +46,25 @@ export function FWPropertyNode($opt?: ParamType): FW.PropertyDecorator {
     } else {
       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)));
-        oldOnLoad && oldOnLoad.apply(this);
-      };
-    }
   };
 }
 
 const KeyChildMulti = CookDecoratorKey('child_cache_multi');
 
-/** 查找多个节点，并存储为数组 */
 export function FWPropertyNodes(...paths: string[]): FW.PropertyDecorator {
   return ($target: any, $propertyKey: string) => {
     if (!$target.hasOwnProperty(KeyChildMulti)) {
       $target[KeyChildMulti] = [];
-    }
 
-    const cache: { propertyKey: string; childNames: string[] }[] = $target[KeyChildMulti];
-
-    const existingEntry = cache.find(($vo) => $vo.propertyKey === $propertyKey);
-
-    if (!existingEntry) {
-      cache.push({
-        propertyKey: $propertyKey,
-        childNames: paths,
-      });
-    } else {
-      throw new Error(
-        `child 装饰器重复绑定属性：${$propertyKey}, class：${$target.constructor.name}`,
-      );
-    }
-
-    if (cache.length === 1) {
       const oldOnLoad = $target.onLoad;
-
       $target.onLoad = function () {
+        const cache = $target[KeyChildMulti];
         if (!this.node) {
           console.error(`this.node 为空，无法查找子节点`, this);
           return;
         }
         cache.forEach(($vo) => {
           const nodes: cc.Node[] = [];
-
           $vo.childNames.forEach((childName) => {
             const childNode = searchChild(this.node, childName);
             if (!childNode) {
@@ -90,15 +73,27 @@ export function FWPropertyNodes(...paths: string[]): FW.PropertyDecorator {
               nodes.push(childNode);
             }
           });
-
           this[$vo.propertyKey] = nodes;
         });
-
         if (oldOnLoad) {
           oldOnLoad.apply(this);
         }
       };
     }
+
+    const cache: { propertyKey: string; childNames: string[] }[] = $target[KeyChildMulti];
+    const existingEntry = cache.find(($vo) => $vo.propertyKey === $propertyKey);
+
+    if (!existingEntry) {
+      cache.push({
+        propertyKey: $propertyKey,
+        childNames: paths,
+      });
+    } else {
+      throw new Error(
+        `child 装饰器重复绑定属性：${$propertyKey}, class：${$target.constructor.name}`,
+      );
+    }
   };
 }
 
@@ -116,28 +111,10 @@ export function FWPropertyComponent(
   return ($target, $propertyKey: string, $descriptorOrInitializer) => {
     if (!$target.hasOwnProperty(KeyComp)) {
       $target[KeyComp] = [];
-    }
-    const cache: {
-      propertyKey: string;
-      compClass: INewable<cc.Component>;
-      childName: string;
-    }[] = $target[KeyComp];
 
-    if (!cache.some(($vo) => $vo.propertyKey === $propertyKey)) {
-      cache.push({
-        propertyKey: $propertyKey,
-        compClass: $componentClass,
-        childName: $childName || $propertyKey,
-      });
-    } else {
-      if (!$mute) {
-        throw new Error(`component装饰器重复绑定属性：${$propertyKey},class：${$target.name}`);
-      }
-      return;
-    }
-    if (cache.length === 1) {
-      const oldOnLoad: () => void = $target.onLoad || undefined; //$target.onLoad也可以拿到父类的实现
+      const oldOnLoad: () => void = $target.onLoad || undefined;
       $target.onLoad = function () {
+        const cache = $target[KeyComp];
         cache.forEach(($vo) => {
           const node = $vo.childName ? searchChild(this.node, $vo.childName) : this.node;
           if (!node) {
@@ -155,6 +132,25 @@ export function FWPropertyComponent(
         oldOnLoad && oldOnLoad.apply(this);
       };
     }
+
+    const cache: {
+      propertyKey: string;
+      compClass: INewable<cc.Component>;
+      childName: string;
+    }[] = $target[KeyComp];
+
+    if (!cache.some(($vo) => $vo.propertyKey === $propertyKey)) {
+      cache.push({
+        propertyKey: $propertyKey,
+        compClass: $componentClass,
+        childName: $childName || $propertyKey,
+      });
+    } else {
+      if (!$mute) {
+        throw new Error(`component装饰器重复绑定属性：${$propertyKey},class：${$target.name}`);
+      }
+      return;
+    }
   };
 }
 
@@ -176,7 +172,6 @@ export function FWPropertyComponents(
   };
 }
 
-/** 判断是否为空 */
 export function isNull(message?: string) {
   return function (target: any, propertyKey: string) {
     let value: any;
@@ -231,6 +226,7 @@ export function FWDeprecated(description?: string) {
     return descriptor;
   };
 }
+
 export function FWSocketAutoProcessResume() {
   return function (target: any, propertyKey: string, descriptor: PropertyDescriptor) {
     const originalMethod = descriptor.value;

package/manager/FWAssetManager.ts

@@ -1,5 +1,5 @@
-import { FWSystemConfig } from "../config/FWSystemConfig";
-import { FWManager } from "./FWManager";
+import { FWSystemConfig } from '../config/FWSystemConfig';
+import { FWManager } from './FWManager';
 
 /**
  * 资源数据
@@ -46,7 +46,7 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
           const img = data.img;
           const ske = data.ske;
           const atlas = data.atlas;
-          const type = bin ? ".bin" : ".txt";
+          const type = bin ? '.bin' : '.txt';
           cc.assetManager.loadAny(
             [
               { url: atlas, ext: type },
@@ -58,38 +58,34 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
               asset.skeletonJson = assets[1];
               asset.atlasText = assets[0];
               asset.textures.push(texture);
-              asset["textureNames"] = [`${img}.png`];
-              asset["_uuid"] = ske;
+              asset['textureNames'] = [`${img}.png`];
+              asset['_uuid'] = ske;
               resolve(asset);
-            }
+            },
           );
-        }, FWSystemConfig.PromiseConfig.loadAsset).promise
+        }, FWSystemConfig.PromiseConfig.loadAsset).promise,
       );
     } catch (e) {
-      FW.Log.error("从远程加载spine动画资源失败!");
+      FW.Log.error('从远程加载spine动画资源失败!');
     }
   }
 
   /** 加载远程资源 */
   async loadRemote<T extends cc.Asset = cc.Asset>(
     url?: string,
-    cb?: (asset: cc.Asset) => void
+    cb?: (asset: cc.Asset) => void,
   ): Promise<T> {
     return await this.invoke(
       FW.Entry.promiseMgr.execute((resolve, reject, signal) => {
-        cc.assetManager.loadRemote(
-          url,
-          { cacheEnabled: true, maxRetryCount: 3 },
-          (err, asset) => {
-            if (err || !asset) {
-              reject(err);
-            }
-            cb?.(asset as T);
-            resolve(asset as T);
+        cc.assetManager.loadRemote(url, { cacheEnabled: true, maxRetryCount: 3 }, (err, asset) => {
+          if (err || !asset) {
+            reject(err);
           }
-        );
+          cb?.(asset as T);
+          resolve(asset as T);
+        });
       }, FWSystemConfig.PromiseConfig.loadAsset).promise,
-      `loadAssets -> ${url}`
+      `loadAssets -> ${url}`,
     );
   }
 
@@ -99,9 +95,7 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
       return undefined;
     }
 
-    const propertys = Array.isArray(assetProperty)
-      ? assetProperty
-      : [assetProperty];
+    const propertys = Array.isArray(assetProperty) ? assetProperty : [assetProperty];
 
     await Promise.all(
       propertys.map(async (property) => {
@@ -110,19 +104,17 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
         const path = property.path;
         const progress = property.progress;
 
-        if (!bundleName || bundleName === "") {
+        if (!bundleName || bundleName === '') {
           FW.Log.error(`找不到bundle${bundleName},或者bundle未加载!`);
           return undefined;
         }
 
-        if (!path || path === "") {
+        if (!path || path === '') {
           FW.Log.error(`找不到资源路径${path},请检查!`);
           return undefined;
         }
 
-        let bundle: cc.AssetManager.Bundle = await this.resMgr.loadBundle(
-          bundleName
-        );
+        let bundle: cc.AssetManager.Bundle = await this.resMgr.loadBundle(bundleName);
 
         if (!bundle) {
           FW.Log.error(`加载bundle失败,请检查!`);
@@ -134,24 +126,20 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
             bundle.preload(
               path,
               type,
-              (
-                finish: number,
-                total: number,
-                item: cc.AssetManager.RequestItem
-              ) => {
+              (finish: number, total: number, item: cc.AssetManager.RequestItem) => {
                 progress?.(finish, total, item);
               },
               (err: Error, item: cc.AssetManager.RequestItem[]) => {
                 if (err || !item || item?.length == 0) {
-                  reject(err || "preload failed!");
+                  reject(err || 'preload failed!');
                 }
                 resolve(item);
-              }
+              },
             );
           }, FWSystemConfig.PromiseConfig.loadAsset).promise,
-          `preLoadAssets -> ${property.path}`
+          `preLoadAssets -> ${property.path}`,
         );
-      })
+      }),
     );
   }
 
@@ -172,19 +160,17 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
     const progress = assetProperty.progress;
     const autoRelease = assetProperty.autoRelease;
 
-    if (!bundleName || bundleName === "") {
+    if (!bundleName || bundleName === '') {
       FW.Log.error(`找不到bundle${bundleName},或者bundle未加载!`);
       return undefined;
     }
 
-    if (!path || path === "") {
+    if (!path || path === '') {
       FW.Log.error(`找不到资源路径${path},请检查!`);
       return undefined;
     }
 
-    let bundle: cc.AssetManager.Bundle = await this.resMgr.loadBundle(
-      bundleName
-    );
+    let bundle: cc.AssetManager.Bundle = await this.resMgr.loadBundle(bundleName);
 
     if (!bundle) {
       FW.Log.error(`加载bundle失败,请检查!`);
@@ -194,9 +180,9 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
 
     if (this.assetsMap.has(key)) {
       const assetData = this.assetsMap.get(key);
-      if(!assetData.asset.loaded){
+      if (!assetData.asset.loaded) {
         this.assetsMap.delete(key);
-      }else{
+      } else {
         return assetData;
       }
     }
@@ -211,11 +197,7 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
         bundle.load(
           path,
           type,
-          (
-            finish: number,
-            total: number,
-            item: cc.AssetManager.RequestItem
-          ) => {
+          (finish: number, total: number, item: cc.AssetManager.RequestItem) => {
             progress?.(finish, total, item);
           },
           (err: Error, asset: cc.Asset) => {
@@ -225,7 +207,7 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
             }
             assetData.loaded = true;
             assetData.dependentBundle = bundleName;
-            assetData.uuid = asset["_uuid"];
+            assetData.uuid = asset['_uuid'];
             assetData.autoRelease = autoRelease;
             assetData.asset = asset;
             assetData.user = assetProperty.user;
@@ -235,10 +217,10 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
 
             cb?.(assetData);
             resolve(assetData);
-          }
+          },
         );
       }, FWSystemConfig.PromiseConfig.loadAsset).promise,
-      `loadAssets -> ${assetProperty.path}`
+      `loadAssets -> ${assetProperty.path}`,
     );
   }
   /**
@@ -257,19 +239,17 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
     const cb = assetProperty.cb;
     const autoRelease = assetProperty.autoRelease;
 
-    if (!bundleName || bundleName === "") {
+    if (!bundleName || bundleName === '') {
       FW.Log.error(`找不到bundle${bundleName},或者bundle未加载!`);
       return undefined;
     }
 
-    if (!path || path === "") {
+    if (!path || path === '') {
       FW.Log.error(`找不到资源路径${path},请检查!`);
       return undefined;
     }
 
-    const bundle: cc.AssetManager.Bundle = await this.resMgr.loadBundle(
-      bundleName
-    );
+    const bundle: cc.AssetManager.Bundle = await this.resMgr.loadBundle(bundleName);
 
     if (!bundle) {
       FW.Log.error(`加载bundle失败,请检查!`);
@@ -279,7 +259,7 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
     return new Promise(
       (
         resolve: (value: FW.AssetData[] | PromiseLike<FW.AssetData[]>) => void,
-        reject: (reason?: any) => void
+        reject: (reason?: any) => void,
       ) => {
         bundle.loadDir(path, type, (err: Error, assets: cc.Asset[]) => {
           if (err || assets.length === 0) {
@@ -293,7 +273,7 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
             const assetData = new FWAssetData();
             assetData.loaded = true;
             assetData.dependentBundle = bundleName;
-            assetData.uuid = asset["_uuid"];
+            assetData.uuid = asset['_uuid'];
             assetData.autoRelease = autoRelease;
             assetData.asset = asset;
             assetData.type = type;
@@ -302,7 +282,7 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
             const key = `${this.createAssetMapKey({
               bundle: bundleName,
               path: path,
-            })}/${asset.name}${type ? `_${type?.name}` : ""}`;
+            })}/${asset.name}${type ? `_${type?.name}` : ''}`;
 
             this.assetsMap.set(key, assetData);
 
@@ -312,7 +292,7 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
           cb?.(assetDataList);
           resolve(assetDataList);
         });
-      }
+      },
     );
   }
 
@@ -329,18 +309,18 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
     const bundleName = assetProperty.bundle || FW.Entry.bundleName;
     const path = assetProperty.path;
 
-    if (!bundleName || bundleName === "") {
+    if (!bundleName || bundleName === '') {
       FW.Log.error(`找不到bundle${bundleName},或者bundle未加载!`);
       return undefined;
     }
 
-    if (!path || path === "") {
+    if (!path || path === '') {
       FW.Log.error(`找不到资源路径${path},请检查!`);
       return undefined;
     }
 
     if (!this.has(assetProperty)) {
-      FW.Log.error("获取资源失败,请先加载!");
+      FW.Log.error('获取资源失败,请先加载!', assetProperty);
       return undefined;
     }
 
@@ -363,12 +343,12 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
     const path = assetProperty.path;
     const autoRelease = assetProperty.autoRelease;
 
-    if (!bundleName || bundleName === "") {
+    if (!bundleName || bundleName === '') {
       FW.Log.error(`找不到bundle${bundleName},或者bundle未加载!`);
       return undefined;
     }
 
-    if (!path || path === "") {
+    if (!path || path === '') {
       FW.Log.error(`找不到资源路径${path},请检查!`);
       return undefined;
     }

package/manager/FWLayerManager.ts

@@ -151,54 +151,56 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
   /**
    * 关闭layer
    */
-  async close<Ctr extends FW.LayerController = FW.LayerController>(
-    ctr: Ctr,
-  ): Promise<FW.LayerController> {
+  async close<Ctr extends FW.LayerController = FW.LayerController>(ctr: Ctr): Promise<Ctr> {
     if (!ctr) return;
 
-    let layerData = ctr.layerData;
+    return FW.Entry.promiseMgr.execute(async (resolve, reject) => {
+      let layerData = ctr.layerData;
 
-    if (cc.isValid(ctr.layer?.node)) {
-      await ctr.onClose?.();
-      ctr.destroy?.();
-      if (ctr.autoRelease) {
-        FW.Entry.resMgr.releaseAsset(ctr.layerData.layerAssetProperty);
+      if (cc.isValid(ctr.layer?.node)) {
+        await ctr.onClose?.();
+        ctr.destroy?.();
+        if (ctr.autoRelease) {
+          FW.Entry.resMgr.releaseAsset(ctr.layerData.layerAssetProperty);
+        }
+        this.dataManager.notifyExternalRefUpdates(ctr.layerData);
       }
-      this.dataManager.notifyExternalRefUpdates(ctr.layerData);
-    }
 
-    this.dataManager.removeFromMap(layerData?.controllerConstructor);
-    this.dataManager.removeFromRegistry(ctr.layerData?.controllerConstructor);
+      this.dataManager.removeFromMap(layerData?.controllerConstructor);
+      this.dataManager.removeFromRegistry(ctr.layerData?.controllerConstructor);
 
-    const index = this.stackManager.getStack().findIndex((v) => {
-      v.controller == ctr;
-    });
-    if (index > -1) {
-      this.stackManager.getStack().splice(index, 1);
-    }
-
-    /** 如果队列中还有等待打开的layer */
-    if (!this.queueManager.isEmpty()) {
-      const nextLayerData = this.queueManager.getNextLayer();
-      /** 先尝试同步打开 */
-      const nextLayer = this.openSync({
-        parent: nextLayerData.layerParent,
-        position: nextLayerData.layerPosition,
-        type: nextLayerData.controllerConstructor,
+      const index = this.stackManager.getStack().findIndex((v) => {
+        v.controller == ctr;
       });
-      /** 如果同步打开失败,再次尝试异步打开(可能由于资源所在bundle并未提前加载) */
-      if (!nextLayer) {
-        return this.openAsync({
+      if (index > -1) {
+        this.stackManager.getStack().splice(index, 1);
+      }
+
+      /** 如果队列中还有等待打开的layer */
+      if (!this.queueManager.isEmpty()) {
+        const nextLayerData = this.queueManager.getNextLayer();
+        /** 先尝试同步打开 */
+        const nextLayer = this.openSync({
           parent: nextLayerData.layerParent,
           position: nextLayerData.layerPosition,
           type: nextLayerData.controllerConstructor,
         });
+        /** 如果同步打开失败,再次尝试异步打开(可能由于资源所在bundle并未提前加载) */
+        if (!nextLayer) {
+          resolve(
+            this.openAsync({
+              parent: nextLayerData.layerParent,
+              position: nextLayerData.layerPosition,
+              type: nextLayerData.controllerConstructor,
+            }),
+          );
+        } else {
+          resolve(nextLayer as Ctr);
+        }
       } else {
-        return nextLayer;
+        resolve(undefined);
       }
-    } else {
-      return undefined;
-    }
+    }).promise;
   }
 
   getLayerMap(): Map<new () => FW.LayerController, FWLayerData> {

package/package.json

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

package/types/FW.d.ts

@@ -929,7 +929,7 @@ declare namespace FW {
      * @param ctr - 控制器实例
      * @returns 控制器实例
      */
-    hideLayer<Ctr extends FW.LayerController = FWLayerController>(ctr: Ctr): Ctr;
+    hideLayer<Ctr extends LayerController = LayerController>(ctr: Ctr): Ctr;
 
     /**
      * 关闭layer
@@ -937,7 +937,7 @@ declare namespace FW {
      * @param ctr - 控制器实例
      * @returns LayerController实例
      */
-    close<Ctr extends FW.LayerController = FWLayerController>(ctr: Ctr): FWLayerController;
+    close<Ctr extends LayerController = LayerController>(ctr: Ctr): Promise<Ctr>;
 
     /**
      * 从栈关闭指定数量的layer