@cc-component/cc-ex-component 1.8.3 → 1.8.7

package/assets/core/BaseReference.ts

@@ -26,7 +26,7 @@ export class BaseReference extends Component {
 
     //#endregion
     defineProperty(propertyKey: string) {
-        Object.defineProperty(this, propertyKey, { get: () => this.rc?.get(propertyKey), set: (value) => { }, configurable: true });
+        if (!this[propertyKey]) Object.defineProperty(this, propertyKey, { get: () => this.rc?.get(propertyKey), set: (value) => { }, configurable: true });
     }
 
 

package/assets/core/BaseWindow.ts

@@ -54,7 +54,8 @@ export class BaseWindow extends BaseReference {
     public pop(param?: { is_anim?: boolean, param?: any, finish?: Function }) {
         //this.maskAinm(false)
         this.paramClose = param;
-        this.param?.callBack?.(param?.param)//回调方法
+        //this.param?.close?.(param?.param)//回调方法
+        ExComponentModule.EmitCloseWindow(this.param, param?.param)
         if (param?.is_anim && this.root && this.maskOpacity) {
             this.hideAnim()
         } else {
@@ -87,8 +88,8 @@ export class BaseWindow extends BaseReference {
     }
 
     destroyNode() {
-        this.paramClose?.param?.finish()
-        setTimeout(() => { if (this.node && this.node.isValid) { this.destroyWindow() } });
+        this.paramClose?.finish()
+        if (this.node && this.node.isValid) { this.destroyWindow() }
     }
     maskAinm(show: boolean) {
         if (!this.maskOpacity) return

package/assets/core/ViewModel.ts

@@ -537,23 +537,23 @@ function updateStatus(data: IBindingData, com: Component, value: any, self: any)
     switch (data.type) {
         case 'cc.Label':
             if (data.reset) {
-                if (value !== undefined || value !== null) data.reset.call(self, value, com);
+                if (value != undefined && value !== null && value != 'undefined') data.reset.call(self, value, com);
             } else {
-                if (value != undefined && value !== null) (com as Label).string = value?.toString() || '';
+                if (value != undefined && value !== null && value != 'undefined') (com as Label).string = value?.toString() || '';
             }
             break;
         case 'cc.RichText':
             if (data.reset) {
-                if (value !== undefined || value !== null) data.reset.call(self, value, com);
+                if (value !== undefined && value !== null && value != 'undefined') data.reset.call(self, value, com);
             } else
-                if (value != undefined && value !== null)
+                if (value != undefined && value !== null && value != 'undefined')
                     (com as RichText).string = value?.toString() || '';
             break;
         case 'cc.Sprite':
             // 假设 value 是 SpriteFrame 路径或资源
             // 需要额外处理资源加载逻辑
             if (data.reset) {
-                if (value !== undefined || value !== null) data.reset.call(self, value, com);
+                if (value !== undefined && value !== null) data.reset.call(self, value, com);
             } else
                 if (value != undefined && value !== null) {
                     if (value instanceof SpriteFrame)
@@ -570,19 +570,19 @@ function updateStatus(data: IBindingData, com: Component, value: any, self: any)
         case 'cc.Button':
             const com_btn = (com as Button);
             if (data.reset) {
-                if (value !== undefined || value !== null) data.reset.call(self, value, com);
+                if (value !== undefined && value !== null) data.reset.call(self, value, com);
             } else
-                if (value !== undefined || value !== null) com_btn.node.active = value ?? true;
+                if (value !== undefined && value !== null) com_btn.node.active = value ?? true;
             break;
         case 'cc.ProgressBar':
             if (data.reset) {
-                if (value !== undefined || value !== null) data.reset.call(self, value, com);
+                if (value !== undefined && value !== null) data.reset.call(self, value, com);
             } else
                 if (value != undefined && value !== null) (com as ProgressBar).progress = Number(value) || 0;
             break;
         case 'sp.Skeleton':
             if (data.reset) {
-                if (value !== undefined || value !== null) data.reset.call(self, value, com);
+                if (value !== undefined && value !== null) data.reset.call(self, value, com);
             } else
                 if (value != undefined && value !== null)
                     if (value instanceof sp.SkeletonData)
@@ -605,7 +605,7 @@ function updateStatus(data: IBindingData, com: Component, value: any, self: any)
             {
                 const com_sld = (com as Slider);
                 if (data.reset) {
-                    if (value !== undefined || value !== null) data.reset.call(self, value, com);
+                    if (value !== undefined && value !== null) data.reset.call(self, value, com);
                 } else
                     if (value != undefined && value !== null) com_sld.progress = Number(value) || 0;
             }
@@ -614,7 +614,7 @@ function updateStatus(data: IBindingData, com: Component, value: any, self: any)
             {
                 const com_tg = (com as Toggle);
                 if (data.reset) {
-                    if (value !== undefined || value !== null) data.reset.call(self, value, com);
+                    if (value !== undefined && value !== null) data.reset.call(self, value, com);
                 } else
                     if (value != undefined && value !== null) com_tg.isChecked = Boolean(value);
             }
@@ -623,7 +623,7 @@ function updateStatus(data: IBindingData, com: Component, value: any, self: any)
             {
                 const com_eb = (com as EditBox);
                 if (data.reset) {
-                    if (value !== undefined || value !== null) data.reset.call(self, value, com);
+                    if (value !== undefined && value !== null) data.reset.call(self, value, com);
                 } else
                     if (value != undefined && value !== null) com_eb.string = value?.toString() || '';
             }
@@ -632,7 +632,7 @@ function updateStatus(data: IBindingData, com: Component, value: any, self: any)
             {
                 const com_tgc = (com as ToggleContainer);
                 if (data.reset) {
-                    if (value !== undefined || value !== null) data.reset.call(self, value, com);
+                    if (value !== undefined && value !== null) data.reset.call(self, value, com);
                 }
                 //事件
                 if (com_tgc.checkEvents.length <= 0) {

package/assets/core/ViewSearch.ts

@@ -21,7 +21,7 @@ const inject_vsearch = function (key, targetDataBinding) {
         }
 
         if (instance == null) {
-            if (DEBUG) console.error(`没有找到属性 ${key}->${tag}`);
+            if (DEBUG) console.log(`警告：没有找到属性 ${key}->${tag}`);
             continue;
         }
         this[property.name] = instance;

package/assets/interface/ExComponentModule.ts

@@ -17,6 +17,7 @@ export class ExComponentModule {
     paramSprite: { loadSprite: (param: { bundle: string, path: string }) => Promise<SpriteFrame>, getSprite: (param: { bundle: string, path: string }) => SpriteFrame }
     paramSpine: { loadSpine: (param: { bundle: string, path: string }) => Promise<sp.SkeletonData>, getSpine: (param: { bundle: string, path: string }) => sp.SkeletonData }
     paramUIWindow: { onLoad: (config: any, viewModel: any) => void }
+    paramClose: { close: (openParam: any, closeParam: any) => void }
 
     ResetBaseWindow: string = "BaseWindow";
     static Init() {
@@ -29,6 +30,9 @@ export class ExComponentModule {
     static OnButtonClick(param: { click: (comp: Button) => void }) {
         ExComponentModule.Ins.param = param
     }
+    static OnCloseWindow(param: { close: (openParam: any, param: any) => void }) {
+        ExComponentModule.Ins.paramClose = param
+    }
 
     static ResetBaseWindow(name?: string, isGet?: boolean) {
         if (!isGet) ExComponentModule.Ins.ResetBaseWindow = name
@@ -70,7 +74,12 @@ export class ExComponentModule {
     static EmitUIWindow(param: any, viewModel: any) {
         return ExComponentModule.Ins.paramUIWindow?.onLoad?.(param, viewModel)
     }
+
+    static EmitCloseWindow(openParam: any, closeParam: any) {
+        return ExComponentModule.Ins.paramClose?.close?.(openParam, closeParam)
+    }
 }
+
 window.ExComponentModule = ExComponentModule;
 
 

package/assets/interface/Interface.ts

@@ -21,6 +21,8 @@ declare global {
         function EnableButtonScale(param: { enable: boolean });
         /**监听所有按钮的点击事件 */
         function OnButtonClick(param: { click: (comp: Button) => void });
+        /**监听窗口的关闭 */
+        function OnCloseWindow(param: { close: (openParam: any, closeParam: any) => void });
         /**监听加载图片 */
         function OnLoadSprite(param: { loadSprite: (param: { bundle: string, path: string }) => Promise<SpriteFrame>, getSprite: (param: { bundle: string, path: string }) => SpriteFrame });
         function OnLoadSpine(param: { loadSpine: (param: { bundle: string, path: string }) => Promise<sp.SkeletonData>, getSpine: (param: { bundle: string, path: string }) => sp.SkeletonData });
@@ -37,5 +39,6 @@ declare global {
         function EmitLoadSpine(param: any): Promise<sp.SkeletonData>;
         function EmitGetSpine(param: any): sp.SkeletonData;
         function EmitUIWindow(param: IConfig, viewModel: any);
+        function EmitCloseWindow(openParam: any, closeParam: any);
     }
 }

package/package.json

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