dzkcc-mflow 0.0.42 → 0.0.44

package/dist/libs/BaseView.d.ts

@@ -3,8 +3,6 @@ import { IView, IEventManager, ICocosResManager } from '../core';
 export declare abstract class BaseView extends Component implements IView {
     /** @internal */
     private readonly __isIView__;
-    /** @internal */
-    private __group__;
     private _eventProxy?;
     private _eventHandlers;
     protected get event(): IEventManager;

package/dist/libs/BaseView.js

@@ -7,8 +7,6 @@ class BaseView extends Component {
         super(...arguments);
         /** @internal */
         this.__isIView__ = true;
-        /** @internal */
-        this.__group__ = undefined;
         this._eventHandlers = [];
         this._loaderHandlers = [];
     }

package/dist/libs/UIManager.d.ts

@@ -53,10 +53,7 @@ export interface UIPreloadConfig {
     /** 预加载延迟（毫秒） */
     delay?: number;
 }
-interface IInternalView extends IView {
-    __isIView__: boolean;
-}
-type ICocosView = IInternalView & Component;
+type ICocosView = IView & Component;
 declare abstract class CcocosUIManager implements IUIManager {
     getTopView(): IView | undefined;
     open<T extends keyof UIRegistry>(viewClass: T, args?: UIOpenOptions): Promise<InstanceType<UIRegistry[T]>>;
@@ -121,6 +118,12 @@ export declare class UIManager extends CcocosUIManager {
      * 获取所有活跃的视图节点（排除遮罩节点）
      */
     private _getActiveViews;
+    /**
+     * 从给定的Node对象上获得IView类型的脚本
+     * @param target
+     * @returns
+     */
+    private _getIViewFromNode;
     /**
      * 通过prefab创建Node对象
      * @param args

package/dist/libs/UIManager.js

@@ -184,6 +184,31 @@ class UIManager extends CcocosUIManager {
     _getActiveViews() {
         return UIRoot.children.filter(child => child !== _uiMask && child.name !== '__UIMask__');
     }
+    /**
+     * 从给定的Node对象上获得IView类型的脚本
+     * @param target
+     * @returns
+     */
+    _getIViewFromNode(target) {
+        const comps = target.components;
+        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;
+            }
+        }
+        console.warn(`No view found in ${target.name}`);
+    }
     /**
      * 通过prefab创建Node对象
      * @param args
@@ -282,7 +307,7 @@ class UIManager extends CcocosUIManager {
             if (!view) {
                 return;
             }
-            const group = this._view2group.get(view);
+            const group = this._view2group.get(view.node);
             if (group && group.trim() != "") {
                 // 栈式UI：调用 _internalCloseAndPop 来处理返回逻辑
                 this._internalCloseAndPop(group, false);
@@ -387,15 +412,7 @@ class UIManager extends CcocosUIManager {
         }
         // 获取最后一个视图节点（最顶层）
         const target = activeViews[activeViews.length - 1];
-        const comps = target.components;
-        for (let i = 0; i < comps.length; i++) {
-            const comp = comps[i];
-            if ("__isIView__" in comp && comp.__isIView__) {
-                return comp;
-            }
-        }
-        console.warn(`No view found in ${target.name}`);
-        return undefined;
+        return this._getIViewFromNode(target);
     }
     //----------------------------------------------------------
     _load(viewKey) {
@@ -499,7 +516,7 @@ class UIManager extends CcocosUIManager {
                     top.node.removeFromParent();
                 }
                 // 标记视图所属组并入栈
-                this._view2group.set(view, group);
+                this._view2group.set(view.node, group);
                 stack.push(view);
                 addChild(view.node);
                 this._adjustMaskLayer();
@@ -531,8 +548,8 @@ class UIManager extends CcocosUIManager {
             try {
                 // 移除当前栈顶视图
                 const removed = stack.pop();
+                this._view2group.delete(removed.node);
                 yield this._remove(removed, destroy);
-                this._view2group.delete(removed);
                 // 恢复上一个视图
                 const top = stack[stack.length - 1];
                 if (top) {
@@ -612,6 +629,12 @@ class UIManager extends CcocosUIManager {
             console.warn(`No stack found for group ${group}`);
             return;
         }
+        //forEach 方法会按插入顺序遍历所有 初始存在的元素，即使元素在遍历过程中被删除，也不会影响剩余元素的遍历（已删除的元素不会被重复遍历，但未遍历的元素仍会被处理）。因此可直接在回调中判断并删除目标元素。
+        this._view2group.forEach((value, key, map) => {
+            if (value === group) {
+                map.delete(key);
+            }
+        });
         // 清空栈中所有视图，不播放动画
         while (stack.length > 0) {
             const view = stack.pop();
@@ -619,9 +642,6 @@ class UIManager extends CcocosUIManager {
                 this._remove(view, destroy, true);
             }
         }
-        for (const view of this._view2group.keys()) {
-            this._view2group.delete(view);
-        }
         // 调整遮罩层级
         this._adjustMaskLayer();
     }
@@ -630,19 +650,15 @@ class UIManager extends CcocosUIManager {
      */
     _internalCloseAll(destroy) {
         const activeViews = this._getActiveViews();
-        for (const node of activeViews) {
-            const comps = node.components;
-            for (let i = 0; i < comps.length; i++) {
-                const comp = comps[i];
-                if ("__isIView__" in comp && comp.__isIView__) {
-                    this._remove(comp, destroy, true);
-                    break;
-                }
+        for (const target of activeViews) {
+            const comp = this._getIViewFromNode(target);
+            if (comp) {
+                this._remove(comp, destroy, true);
+                break;
             }
         }
-        for (const view of this._view2group.keys()) {
-            this._view2group.delete(view);
-        }
+        // 情况所有UI组引用
+        this._view2group.clear();
         // 清空所有栈
         this._groupStacks.clear();
         // 调整遮罩

package/package.json

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