@cc-component/cc-core 1.7.2 → 1.7.4

package/assets/core/config/CommonEnum.ts

@@ -96,6 +96,6 @@ export interface IInitConfig {
 
 
 export interface IWindowParam {
-    callBack?: Function;
+    close?: Function;
     [key: string]: any;
 }

package/assets/core/config/LayerUI.ts

@@ -4,7 +4,7 @@ import { EnvironmentConfig, IConfig } from './IConfig';
 import { LayerType } from './LayerType';
 import { Canvas, director } from 'cc';
 import { ResourceManager } from '../home/ResourceManager';
-import { IInitConfig } from './CommonEnum';
+import { IBundleConfig, IInitConfig } from './CommonEnum';
 import { ISceneParam } from '../interface/ISceneParam';
 import { BlockInputEvents } from 'cc';
 import { BaseLaunchComponent } from '../home/BaseLaunchComponent';
@@ -33,7 +33,7 @@ export class LayerUI {
 
     loading_call: { open: (finish: () => void) => void, close: () => void }
     progess: { open: (param: ISceneParam, finish: () => void) => void, close: (param: ISceneParam) => void, progess: (param: ISceneParam, progress: number, time?: number) => void }
-
+    window: { willOpen: (comp: IBundleConfig, param: any) => void, open: (comp: IBundleConfig) => void, willClose: (comp: IBundleConfig) => void, close: (comp: IBundleConfig) => void }
     scene: ISceneParam
     launch: BaseLaunchComponent;
 

package/assets/core/interface/App.ts

@@ -137,7 +137,7 @@ export class App {
     static OnRequstNet(param: { open: (finish: (isOk: boolean) => void) => void }) { App.http.param = param; }
     static OnLoading(param: { open: (finish: () => void) => void, close: () => void }) { App.gui.loading_call = param; }
     static OnProgess(param: { open: (param: ISceneParam, finish: () => void) => void, close: (param: ISceneParam) => void, progess: (param: ISceneParam, progress: number, time?: number) => void }) { App.gui.progess = param; }
-
+    static OnWindow(param: { willOpen: (comp: IBundleConfig) => void, open: (comp: IBundleConfig) => void, willClose: (comp: IBundleConfig) => void, close: (comp: IBundleConfig) => void }) { App.gui.window = param; }
     static async Requst<T>(config: IHttpConfig, params?: any, ext?: IExtData): Promise<{ code: number, data: T, msg: string }> {
         return new Promise<{ code: number, data: T, msg: string }>(async (originalResolve, originalReject) => {
             let retries = 0; // 当前重试次数
@@ -205,6 +205,7 @@ export class App {
         return new Promise<T>(async (resolve, reject) => {
             try {
                 const className = config.name ?? config.path.split('/').pop();
+                config.name = className;
                 if (App.IsWindowOpen(className)) {
                     const view = App.GetOpenWindow<Component>(config);
                     resolve(view as T);
@@ -216,18 +217,10 @@ export class App {
                     Logger.warn("重复打开窗口-请检查", config.path)
                     return;
                 }
+                if (!param) { param = {} }
+                App.gui.window?.willOpen?.(config, param)
                 //console.error('打开:', Array.from(App.Instance.openedWindows.keys()), config.path);
                 App.OpenBlockEvents(LayerType.LayerBlockEventsUI, true)
-                if (!param) {
-                    param = {}
-                }
-                //界面回调方法
-                const call = param?.callBack;
-                const backCallback = (arg1: any, arg2: any) => {
-                    call?.(arg1, arg2)
-                }
-                if (param instanceof Object)
-                    param.callBack = backCallback;
 
                 const view = await App.LoadWindow<T>(config, param);
 
@@ -256,6 +249,7 @@ export class App {
                 if (layerUI_list && layerUI_list.length > 0) App.gui.GetLayer(LayerType.LayerGame).active = false;
                 Logger.debug('LayerType.LayerUI 打开窗口记录:', className, list);
                 App.Emit(SystemMessage.OpenWindow, className)
+                App.gui.window?.open?.(config)
 
                 resolve(view);
                 //延迟100毫秒防止连点
@@ -272,6 +266,8 @@ export class App {
         return new Promise<T>(async (resolve, reject) => {
             try {
                 const className = config.name ?? config.path.split('/').pop();
+                //@ts-ignore
+                config.name = className;
                 // 记录打开的窗口--先占位
                 if (config.is_record === undefined || config.is_record) {//默认记录
                     App.Ins.openedWindows.set(className, null);
@@ -287,8 +283,6 @@ export class App {
                     App.Ins.openedWindowsConfig.set(className, config);
                 }
                 //@ts-ignore
-                config.name = className;
-                //@ts-ignore
                 view.config = config;
                 //@ts-ignore
                 if (param) view.param = param;
@@ -396,10 +390,11 @@ export class App {
 
     // 设置窗口关闭监听
     private setupCloseListener(view: Component, className: string) {
-        view.node["old_destroy"] = view.node.destroy
+        const config = App.Ins.openedWindowsConfig.get(className);
+        const old_destroy = view.node.destroy
         view.node.destroy = () => {
             this.removeWindowRecord(className);
-            return view.node["old_destroy"]()
+            return old_destroy.call(view.node)
         }
         // 监听节点销毁事件
         // view.node.once(Node.EventType.NODE_DESTROYED, () => {
@@ -433,6 +428,7 @@ export class App {
         this.openedWindows.delete(className);
         this.openedWindowsConfig.delete(className);
         App.Emit(SystemMessage.CloseWindow, className)
+        App.gui.window?.close?.(config)
     }
 
     // 通过配置关闭窗口

package/assets/core/interface/Interface.ts

@@ -56,6 +56,8 @@ declare global {
     function OnLoading(param: { open: (finish: () => void) => void, close: () => void })
     /**监听：是否打开网络接口重连窗口 -open 回调方法需要执行 finish() 方法 */
     function OnRequstNet(param: { open: (finish: (isOk: boolean) => void) => void })
+    /**监听窗口打开关闭 */
+    function OnWindow(param: { willOpen: (comp: IBundleConfig, param: any) => void, open: (comp: IBundleConfig) => void, willClose: (comp: IBundleConfig) => void, close: (comp: IBundleConfig) => void });
     /**=====================================✅✅Http请求======================= */
     /**网络接口 */
     function Requst<T>(config: IHttpConfig, params?: any, ext?: { is_show_alert?: boolean }): Promise<{ code: number, data: T, msg: string }>;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cc-component/cc-core",
-    "version": "1.7.2",
+    "version": "1.7.4",
     "engine": ">=3.8.6",
     "description": "系统组件添加常用扩展方法",
     "main": "index.ts",