@ives_xxz/framework 1.5.8 → 1.5.9

package/manager/FWLayerManager.ts

@@ -9,6 +9,7 @@ import FWLogic from "../logic/FWLogic";
 import FWData from "../data/FWData";
 import FWSocketSender from "../service/socket/FWSocketSender";
 import FWSocketHandle from "../service/socket/FWSocketHandle";
+import Framework from "../Framework";
 
 const ADD_EXTERNAL_REFERENCE: string = "addExternalReference";
 
@@ -296,18 +297,39 @@ class FWLayerDataManager {
     }
   }
 
+  private findBundleNameByClassName(name: string): string | undefined {
+    const registeredComponents = Framework.getRegisteredComponents();
+
+    const bundleNames = Array.from(registeredComponents.keys());
+
+    for (const bundleName of bundleNames) {
+      if (this.doesClassNameContainBundleName(name, bundleName)) {
+        return bundleName;
+      }
+    }
+    return undefined;
+  }
+
+  private doesClassNameContainBundleName(
+    className: string,
+    bundleName: string
+  ): boolean {
+    const bundleNameLower = bundleName.toLowerCase();
+    const classNameLower = className.toLowerCase();
+    return classNameLower.includes(bundleNameLower);
+  }
+
   /**
    * 生成数据
    */
   private generationData(ctr: FW.LayerController): FWLayerData {
     const layerData = new FWLayerData();
     const layerType = ctr.layerType;
+    const constructorName = ctr.constructor.name;
+    const bundleName = this.findBundleNameByClassName(constructorName);
+    const configTag = FWSystemDefine.FWBindTag.CONFIG;
 
-    ctr.config = FW.Entry.getComponent(FWAssetConfig);
-    ctr.logic = FW.Entry.getComponent(FWLogic);
-    ctr.data = FW.Entry.getComponent(FWData);
-    ctr.sender = FW.Entry.getComponent(FWSocketSender);
-    ctr.handle = FW.Entry.getComponent(FWSocketHandle);
+    ctr.config = FW.Entry.getComponent(`${bundleName}${configTag}`);
 
     layerData.layerRenderOrder = ctr.renderOrder;
     layerData.layerAssetProperty = ctr.layerAssetProperty;
@@ -561,20 +583,6 @@ class FWLayerOpenManager {
     return true;
   }
 
-  /**
-   * 获取undefined结果
-   */
-  private getUndefinedResult<Ctr>(isAsync: boolean): Promise<Ctr> | Ctr {
-    return isAsync ? Promise.resolve(undefined) : undefined;
-  }
-
-  /**
-   * 包装结果
-   */
-  private wrapResult<Ctr>(result: Ctr, isAsync: boolean): Promise<Ctr> | Ctr {
-    return isAsync ? Promise.resolve(result) : result;
-  }
-
   /**
    * 异步生成Layer
    */

package/manager/FWPromiseManager.ts

@@ -29,6 +29,7 @@ export default class FWPromiseManager
     const retryInterval = options.retryInterval || 0;
     let retryCount = 0;
     let timerSchedule: FW.TimerSchedule;
+
     const createPromise = (): Promise<T> => {
       return new Promise<T>((resolve, reject) => {
         if (options.timeout && options.timeout > 0) {

package/package.json

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