dzkcc-mflow 0.0.41 → 0.0.43

package/dist/libs/UIManager.d.ts

@@ -54,7 +54,6 @@ export interface UIPreloadConfig {
     delay?: number;
 }
 interface IInternalView extends IView {
-    __group__: string | undefined;
     __isIView__: boolean;
 }
 type ICocosView = IInternalView & Component;
@@ -77,6 +76,7 @@ declare abstract class CcocosUIManager implements IUIManager {
 export declare class UIManager extends CcocosUIManager {
     private _cache;
     private _groupStacks;
+    private _view2group;
     private _inputBlocker;
     private _loadingView;
     private _loadingPromises;

package/dist/libs/UIManager.js

@@ -92,6 +92,7 @@ class UIManager extends CcocosUIManager {
         super();
         this._cache = new Map();
         this._groupStacks = new Map();
+        this._view2group = new Map();
         this._inputBlocker = null;
         this._loadingView = null;
         this._loadingPromises = new Map();
@@ -281,12 +282,10 @@ class UIManager extends CcocosUIManager {
             if (!view) {
                 return;
             }
-            // 区分两种情况处理：
-            // 1. 如果视图有 __group__ 属性且不为 undefined，说明是通过 openAndPush 打开的栈式UI
-            // 2. 否则是通过 open 打开的普通 UI
-            if (view.__group__ && view.__group__.trim() != "") {
+            const group = this._view2group.get(view.node);
+            if (group && group.trim() != "") {
                 // 栈式UI：调用 _internalCloseAndPop 来处理返回逻辑
-                this._internalCloseAndPop(view.__group__, false);
+                this._internalCloseAndPop(group, false);
             }
             else {
                 // 普通UI：直接关闭该视图
@@ -392,6 +391,16 @@ class UIManager extends CcocosUIManager {
         for (let i = 0; i < comps.length; i++) {
             const comp = comps[i];
             if ("__isIView__" in comp && comp.__isIView__) {
+                /**
+                 * 这里需要注意：
+                 * 1、_view2group中存储的是通过getComponent获取的。
+                 * 2、这里是通过所node.components获取的。
+                 * 3、这俩种方式获得的引用可能是不同的(_view2group.get(comp) == undefined)
+                 * 4、所以这里需要通过comp.constructor来获取视图类型，然后通过getComponent获取引用，确保一致。
+                 * 5、但我选择了_view2group使用node当作key，这样更稳定。
+                */
+                // const viewType = comp.constructor as new () => ICocosView;
+                // return target.getComponent(viewType) as ICocosView;
                 return comp;
             }
         }
@@ -500,7 +509,7 @@ class UIManager extends CcocosUIManager {
                     top.node.removeFromParent();
                 }
                 // 标记视图所属组并入栈
-                view.__group__ = group;
+                this._view2group.set(view.node, group);
                 stack.push(view);
                 addChild(view.node);
                 this._adjustMaskLayer();
@@ -531,7 +540,9 @@ class UIManager extends CcocosUIManager {
             this._blockInput(true);
             try {
                 // 移除当前栈顶视图
-                yield this._remove(stack.pop(), destroy);
+                const removed = stack.pop();
+                this._view2group.delete(removed.node);
+                yield this._remove(removed, destroy);
                 // 恢复上一个视图
                 const top = stack[stack.length - 1];
                 if (top) {
@@ -570,9 +581,8 @@ class UIManager extends CcocosUIManager {
                 yield this._remove(viewInstance, destroy);
                 return;
             }
-            // 处理视图实例
+            // 获取视图实例
             const viewInstance = viewKeyOrInstance;
-            viewInstance.__group__ = undefined;
             if (!skipAnimation) {
                 // * 播放关闭动画,使用async是必要的，因为：
                 // * 确保动画播放完成后再执行onExit和节点移除，不然还没播放动画了，UI就已经没了
@@ -619,6 +629,9 @@ class UIManager extends CcocosUIManager {
                 this._remove(view, destroy, true);
             }
         }
+        for (const view of this._view2group.keys()) {
+            this._view2group.delete(view);
+        }
         // 调整遮罩层级
         this._adjustMaskLayer();
     }
@@ -637,6 +650,9 @@ class UIManager extends CcocosUIManager {
                 }
             }
         }
+        for (const view of this._view2group.keys()) {
+            this._view2group.delete(view);
+        }
         // 清空所有栈
         this._groupStacks.clear();
         // 调整遮罩

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "dzkcc-mflow",
-    "version": "0.0.41",
+    "version": "0.0.43",
     "description": "A modular design and process management framework developed for the cocos engine, suitable for decoupling and dependency injection.",
     "author": "duanzhk",
     "license": "MIT",