dzkcc-mflow 0.0.43 → 0.0.45

package/dist/core/Api.d.ts

@@ -53,12 +53,23 @@ export interface IManager {
     /** 销毁 */
     dispose(): void;
 }
+/**
+ * UI打开选项
+ */
+export interface UIOpenConfig {
+    /** 是否显示等待视图 */
+    showLoading?: boolean;
+    /** 是否可点击遮罩关闭 */
+    clickToCloseMask?: boolean;
+    /** 自定义参数 */
+    args?: any;
+}
 /**
  * View 基接口 - 视图生命周期
  */
 export interface IView {
     /** 进入视图 */
-    onEnter(args?: any): void;
+    onEnter(args?: UIOpenConfig): void;
     /** 退出视图 */
     onExit(): void;
     /** 暂停视图（被其他视图覆盖） */

package/dist/libs/BaseView.d.ts

@@ -1,19 +1,34 @@
 import { Component } from 'cc';
-import { IView, IEventManager, ICocosResManager } from '../core';
+import { IView, IEventManager, ICocosResManager, UIOpenConfig } 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;
     private _loaderProxy?;
     private _loaderHandlers;
     protected get res(): ICocosResManager;
+    private _openConfig;
+    /**
+     * 打开时传入的配置数据
+     * 仅供框架内部使用，业务使用 this.args代替
+     */
+    /** @internal */
+    get __config__(): UIOpenConfig | undefined;
+    /**
+     * 打开时传入的配置数据
+     * 仅供框架内部使用，业务使用 this.args代替
+     */
+    /** @internal */
+    set __config__(config: UIOpenConfig | undefined);
+    /**
+     * UIOpenConfig.args
+     */
+    protected get args(): any;
     abstract onPause(): void;
     abstract onResume(): void;
-    abstract onEnter(args?: any): void;
+    abstract onEnter(args?: UIOpenConfig): void;
     onExit(): void;
     protected onDestroy(): void;
     /**

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 = [];
     }
@@ -55,6 +53,29 @@ class BaseView extends Component {
         }
         return this._loaderProxy;
     }
+    /**
+     * 打开时传入的配置数据
+     * 仅供框架内部使用，业务使用 this.args代替
+     */
+    /** @internal */
+    get __config__() {
+        return this._openConfig;
+    }
+    /**
+     * 打开时传入的配置数据
+     * 仅供框架内部使用，业务使用 this.args代替
+     */
+    /** @internal */
+    set __config__(config) {
+        this._openConfig = config;
+    }
+    /**
+     * UIOpenConfig.args
+     */
+    get args() {
+        var _a;
+        return (_a = this._openConfig) === null || _a === void 0 ? void 0 : _a.args;
+    }
     onExit() {
         // 自动清理所有事件监听
         this._eventHandlers.forEach(({ key, listener }) => {

package/dist/libs/UIManager.d.ts

@@ -1,24 +1,11 @@
 import { Component, Node, Color } from "cc";
-import { IUIManager, IView } from "../core";
+import { IUIManager, IView, UIOpenConfig } from "../core";
 /**
  * UI遮罩配置选项
  */
-export interface UIMaskOptions {
+export interface UIMaskConfig {
     /** 遮罩颜色 */
     color?: Color;
-    /** 是否可点击关闭顶层UI */
-    clickToClose?: boolean;
-}
-/**
- * UI打开选项
- */
-export interface UIOpenOptions {
-    /** 是否显示等待视图 */
-    showLoading?: boolean;
-    /** 是否可点击遮罩关闭 */
-    clickToClose?: boolean;
-    /** 自定义参数 */
-    args?: any;
 }
 /**
  * 等待视图配置
@@ -53,21 +40,20 @@ export interface UIPreloadConfig {
     /** 预加载延迟（毫秒） */
     delay?: number;
 }
-interface IInternalView extends IView {
-    __isIView__: boolean;
-}
-type ICocosView = IInternalView & Component;
+type ICocosView = IView & Component & {
+    __config__: UIOpenConfig | undefined;
+};
 declare abstract class CcocosUIManager implements IUIManager {
     getTopView(): IView | undefined;
-    open<T extends keyof UIRegistry>(viewClass: T, args?: UIOpenOptions): Promise<InstanceType<UIRegistry[T]>>;
+    open<T extends keyof UIRegistry>(viewClass: T, args?: UIOpenConfig): Promise<InstanceType<UIRegistry[T]>>;
     close<T extends keyof UIRegistry>(viewClass: T): Promise<void>;
-    openAndPush<T extends keyof UIRegistry>(viewClass: T, group: string, args?: UIOpenOptions): Promise<InstanceType<UIRegistry[T]>>;
+    openAndPush<T extends keyof UIRegistry>(viewClass: T, group: string, args?: UIOpenConfig): Promise<InstanceType<UIRegistry[T]>>;
     closeAndPop(group: string, destroy?: boolean): Promise<void>;
     clearStack(group: string, destroy?: boolean): void;
     closeAll(destroy?: boolean): void;
-    protected abstract _internalOpen(viewKey: string, args?: UIOpenOptions): Promise<ICocosView>;
+    protected abstract _internalOpen(viewKey: string, args?: UIOpenConfig): Promise<ICocosView>;
     protected abstract _internalClose(viewKey: string | IView, destory?: boolean): Promise<void>;
-    protected abstract _internalOpenAndPush(viewKey: string, group: string, args?: UIOpenOptions): Promise<ICocosView>;
+    protected abstract _internalOpenAndPush(viewKey: string, group: string, args?: UIOpenConfig): Promise<ICocosView>;
     protected abstract _internalCloseAndPop(group: string, destroy?: boolean): Promise<void>;
     protected abstract _internalClearStack(group: string, destroy?: boolean): void;
     protected abstract _internalGetTopView(): ICocosView | undefined;
@@ -91,7 +77,7 @@ export declare class UIManager extends CcocosUIManager {
     /**
      * 设置遮罩配置
      */
-    setMaskConfig(options: UIMaskOptions): void;
+    setMaskConfig(options: UIMaskConfig): void;
     /**
      * 设置等待视图配置
      */
@@ -121,6 +107,12 @@ export declare class UIManager extends CcocosUIManager {
      * 获取所有活跃的视图节点（排除遮罩节点）
      */
     private _getActiveViews;
+    /**
+     * 从给定的Node对象上获得IView类型的脚本
+     * @param target
+     * @returns
+     */
+    private _getIViewFromNode;
     /**
      * 通过prefab创建Node对象
      * @param args
@@ -165,9 +157,9 @@ export declare class UIManager extends CcocosUIManager {
     protected _internalGetTopView(): ICocosView | undefined;
     private _load;
     private _loadInternal;
-    protected _internalOpen(viewKey: string, options?: UIOpenOptions): Promise<ICocosView>;
+    protected _internalOpen(viewKey: string, options?: UIOpenConfig): Promise<ICocosView>;
     protected _internalClose(viewKeyOrInstance: string | IView, destroy?: boolean): Promise<void>;
-    protected _internalOpenAndPush(viewKey: string, group: string, options?: UIOpenOptions): Promise<ICocosView>;
+    protected _internalOpenAndPush(viewKey: string, group: string, options?: UIOpenConfig): Promise<ICocosView>;
     protected _internalCloseAndPop(group: string, destroy?: boolean): Promise<void>;
     /**
      * 移除视图

package/dist/libs/UIManager.js

@@ -98,11 +98,11 @@ class UIManager extends CcocosUIManager {
         this._loadingPromises = new Map();
         this._lruOrder = [];
         this._preloadedViews = new Set();
-        this._maskOptions = { clickToClose: true };
+        this._maskOptions = {};
         this._loadingConfig = { enabled: true, delay: 200, minShowTime: 500 };
         this._cacheConfig = { maxSize: 10, enableLRU: true };
         this._preloadConfig = { views: [], delay: 1000 };
-        this._openOptions = { showLoading: true, clickToClose: true };
+        this._openOptions = { showLoading: true, clickToCloseMask: true };
         this._setupMaskClickHandler();
         this._startPreload();
     }
@@ -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
@@ -275,13 +300,14 @@ class UIManager extends CcocosUIManager {
      */
     _setupMaskClickHandler() {
         UIMask.on(Node.EventType.TOUCH_END, (event) => {
-            if (!this._maskOptions.clickToClose) {
-                return;
-            }
+            var _a;
             const view = this._internalGetTopView();
             if (!view) {
                 return;
             }
+            if (!((_a = view.__config__) === null || _a === void 0 ? void 0 : _a.clickToCloseMask)) {
+                return;
+            }
             const group = this._view2group.get(view.node);
             if (group && group.trim() != "") {
                 // 栈式UI：调用 _internalCloseAndPop 来处理返回逻辑
@@ -387,25 +413,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__) {
-                /**
-                 * 这里需要注意：
-                 * 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}`);
-        return undefined;
+        return this._getIViewFromNode(target);
     }
     //----------------------------------------------------------
     _load(viewKey) {
@@ -455,6 +463,7 @@ class UIManager extends CcocosUIManager {
                 const view = yield this._load(viewKey);
                 addChild(view.node);
                 this._adjustMaskLayer();
+                view.__config__ = op;
                 // 先执行onEnter初始化，再播放动画
                 view.onEnter(op.args);
                 // 播放打开动画
@@ -513,6 +522,7 @@ class UIManager extends CcocosUIManager {
                 stack.push(view);
                 addChild(view.node);
                 this._adjustMaskLayer();
+                view.__config__ = op;
                 // 先执行onEnter初始化，再播放动画
                 view.onEnter(op.args);
                 // 播放打开动画
@@ -622,6 +632,13 @@ 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();
@@ -629,9 +646,6 @@ class UIManager extends CcocosUIManager {
                 this._remove(view, destroy, true);
             }
         }
-        for (const view of this._view2group.keys()) {
-            this._view2group.delete(view);
-        }
         // 调整遮罩层级
         this._adjustMaskLayer();
     }
@@ -640,19 +654,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.43",
+    "version": "0.0.45",
     "description": "A modular design and process management framework developed for the cocos engine, suitable for decoupling and dependency injection.",
     "author": "duanzhk",
     "license": "MIT",