@cc-component/cc-ex-component 1.9.9 → 2.0.2

package/assets/core/BaseReference.ts

@@ -17,12 +17,14 @@ export class BaseReference extends Component {
         refList.forEach((value) => { this.defineProperty(value); });
     }
 
-    onLoadFinish() {
+    private onLoadFinish() {
         if (this.vmParams) {
             this.viewModel?.refreshUI(this.vmParams)
             this.vmParams = null
         }
     }
+    onLoadFinished() {
+    }
 
     //#endregion
     defineProperty(propertyKey: string) {

package/assets/core/ViewModel.ts

@@ -20,6 +20,8 @@ import { YXPagelayout } from '../lib/collectView/lib_collect/yx-page-layout';
 import { SpriteFrame } from 'cc';
 import { tween } from 'cc';
 import { v3 } from 'cc';
+import { BaseReference } from '../core/BaseReference';
+
 
 interface IBindingData extends ITableViewEvents, IBindingDataEvents {
     dataPath: string;
@@ -69,6 +71,7 @@ interface ICollectViewEvents {
 // 全局存储绑定关系: { className -> { uiProp: dataPath } }
 const bindingMap = new Map<any, Map<string, IBindingData>>();
 const bindingMapFunc = new Map<any, Map<string, string>>();
+const bindingMapView = new Map<any, { key: string, manager: any }>();
 
 const baseData = 'viewModel'
 const skip = "func"
@@ -105,6 +108,7 @@ export function BindViewModel<T extends new () => any>(constructor: T) {
             const instance = new constructor();
             this[baseData] = this._makeReactive(instance, baseData);
 
+            const self = this
             const map = bindingMap.get(className)
             for (const [propertyKey, value] of map) {
                 //属性绑定
@@ -115,7 +119,15 @@ export function BindViewModel<T extends new () => any>(constructor: T) {
                 const com = this[propertyKey];
                 const classname = js.getClassName(com)
                 value.type = classname
-                //                console.log('属性绑定', propertyKey, value.type, com, this)
+                //绑定自定义的继承BaseReference 的类的viewModel
+                if (com instanceof BaseReference) {
+                    const onLoadFinished = com.onLoadFinished;
+                    com.onLoadFinished = function () {
+                        self.viewModel[propertyKey] = com.viewModel
+                        onLoadFinished.call(com);
+                    }
+                }
+                //console.log('属性绑定', propertyKey, value.type, com, this)
                 // 记录绑定关系到实例
                 //this._bindings.push({ uiProp: value.propertyKey, dataPath: value.dataPath });
                 this._bindings[value.dataPath] = value.propertyKey;
@@ -162,7 +174,7 @@ export function Bind<T extends Component>(path?: string, param?: IBindingDataEve
     };
 }
 
-export function BindFunc<T extends Component>(path?: string, param?: IBindingDataEvents) {
+export function BindFunc(path?: string) {
     return function (target: any, propertyKey: string) {
         const className = target.constructor.prototype
         const funcName = path ? path : propertyKey
@@ -170,7 +182,17 @@ export function BindFunc<T extends Component>(path?: string, param?: IBindingDat
         bindingMapFunc.get(className)!.set(propertyKey, funcName);
     };
 }
+/**绑定自定义viewModel */
+export function BindData(viewName?: string) {
+    return function (target: any, propertyKey: string) {
+        const viewClassName = viewName ? viewName : propertyKey
+        const className = target.constructor
+        if (!bindingMapView.has(viewClassName)) { bindingMapView.set(viewClassName, { key: '', manager: null }); }
+        bindingMapView.get(viewClassName)!.key = propertyKey
+        bindingMapView.get(viewClassName)!.manager = className
 
+    };
+}
 
 export function BindTable<T extends Component>(dataPath: string, param?: ITableViewEvents) {
     dataPath = baseData + '.' + dataPath;
@@ -222,20 +244,21 @@ export function ViewModel<T extends new (...args: any[]) => Component>(Base: T)
         _bindings: Record<string, string> = {}; // key: dataPath, value: uiProp
 
         viewModel: any
-        touch_start = 'CALL_TOUCH_START'
-        touch_move = 'CALL_TOUCH_MOVE'
-        touch_end = 'CALL_TOUCH_END'
-        touch_cancel = 'CALL_TOUCH_CANCEL'
-
-        touch_start_scale = 'touch_start_scale'
-        touch_end_scale = 'touch_end_scale'
-        touch_cancel_scale = 'touch_cancel_scale'
-
-        touch_click = 'CALL_CLICK'
-        touch_slide = 'CALL_SLIDE_EVENT'
-        touch_toggle = 'CALL_TOGGLE_EVENT'
-        touch_editbox = 'CALL_EDITBOX_EVENT'
-        className: any
+        private touch_start = 'CALL_TOUCH_START'
+        private touch_move = 'CALL_TOUCH_MOVE'
+        private touch_end = 'CALL_TOUCH_END'
+        private touch_cancel = 'CALL_TOUCH_CANCEL'
+
+        private touch_start_scale = 'touch_start_scale'
+        private touch_end_scale = 'touch_end_scale'
+        private touch_cancel_scale = 'touch_cancel_scale'
+
+        private touch_click = 'CALL_CLICK'
+        private touch_slide = 'CALL_SLIDE_EVENT'
+        private touch_toggle = 'CALL_TOGGLE_EVENT'
+        private touch_editbox = 'CALL_EDITBOX_EVENT'
+        /**是对象 */
+        private className: any
 
         /**ui配置 */
         config: {
@@ -343,13 +366,13 @@ export function ViewModel<T extends new (...args: any[]) => Component>(Base: T)
         protected onLoad(): void {
             super.onLoad()
             this.isOnLoad = true;
-            this.bindFunc()
             this.onTouch()
             this.managerData()
         }
         // 在 withDataBinding 返回的 class 中
         protected onDestroy(): void {
             this.unbindViewModel();
+            this.bindData(false)
             super.onDestroy?.();
         }
 
@@ -357,6 +380,7 @@ export function ViewModel<T extends new (...args: any[]) => Component>(Base: T)
 
         onLoadFinished() {
             this.refreshFuncName()
+            this.bindData(true)
         }
 
         managerData() {
@@ -372,7 +396,14 @@ export function ViewModel<T extends new (...args: any[]) => Component>(Base: T)
             // this.offTouch()
         }
 
-        bindFunc() {
+
+        bindData(isBind: boolean) {
+            const name = js.getClassName(this)
+            const managerData = bindingMapView.get(name)
+            if (managerData) {
+                const manager: any = ExComponentModule.EmitBindData(managerData.manager)
+                manager[managerData.key] = isBind ? this.viewModel : null
+            }
         }
 
         private refreshData(key: string, value: any) {
@@ -597,10 +628,12 @@ export function ViewModel<T extends new (...args: any[]) => Component>(Base: T)
     };
 }
 
+
+
 function updateStatus(data: IBindingData, com: Component, value: any, self: any) {
     const sx = data.dataPath.split('.').pop();
     const tempData = { value: value, skip: false }
-    //console.log("updateStatus", data.propertyKey)
+    // console.log("updateStatus", data.propertyKey, data.type, com)
     switch (data.type) {
         case 'cc.Label':
             if (data.reset) {
@@ -826,11 +859,13 @@ function updateStatus(data: IBindingData, com: Component, value: any, self: any)
         case 'cc.Node':
             break;
         default: {
-            // if (com) console.error(`请检查类型: ${data.type}`);
+            if (com) {
+                // console.error(`请检查类型: ${data.type}---${data.dataPath}--${data.propertyKey}`);
+            }
             break
         }
-    }
 
+    }
 }
 // assets/cc-ex-component/core/ViewModel.ts
 

package/assets/interface/ExComponentModule.ts

@@ -20,7 +20,7 @@ export class ExComponentModule {
     paramSpinePlay: { play: (param: { spine: sp.Skeleton, value: { path: string, bundle: string, param?: ISpinePlayData[] } }) => void }
 
 
-    paramUIWindow: { onLoad: (config: any, viewModel: any) => void }
+    paramUIWindow: { onLoad: (config: any, viewModel: any) => void, bindData: (className: any) => any }
     paramClose: { close: (openParam: any, closeParam: any) => void }
 
     ResetBaseWindow: string = "BaseWindow";
@@ -46,7 +46,7 @@ export class ExComponentModule {
         if (!isGet) ExComponentModule.Ins.ResetBaseWindow = name
         return ExComponentModule.Ins.ResetBaseWindow
     }
-    static OnVMManager(param: { onLoad: (config: any, viewModel: any) => void }) {
+    static OnVMManager(param: { onLoad: (config: any, viewModel: any) => void, bindData: (className: any) => any }) {
         ExComponentModule.Ins.paramUIWindow = param
     }
 
@@ -88,6 +88,10 @@ export class ExComponentModule {
         return ExComponentModule.Ins.paramUIWindow?.onLoad?.(param, viewModel)
     }
 
+    static EmitBindData(className: any) {
+        return ExComponentModule.Ins.paramUIWindow?.bindData?.(className)
+    }
+
     static EmitCloseWindow(openParam: any, closeParam: any) {
         return ExComponentModule.Ins.paramClose?.close?.(openParam, closeParam)
     }

package/assets/interface/Interface.ts

@@ -35,7 +35,8 @@ declare global {
         /**重置基础窗口 */
         function ResetBaseWindow(name?: string, isGet?: boolean);
         /**监听UI onLoad 给模块manager 赋值  */
-        function OnVMManager(param: { onLoad: (config: IConfig, viewModel: any) => void });
+        function OnVMManager(param: { onLoad: (config: IConfig, viewModel: any) => void, bindData: (className: string) => any });
+
         /**组件：内部使用方法 */
         function Emit(btn: Button);
         function EmitAnim();
@@ -45,6 +46,7 @@ declare global {
         function EmitLoadSpine(param: any): Promise<sp.SkeletonData>;
         function EmitGetSpine(param: any): sp.SkeletonData;
         function EmitUIWindow(param: IConfig, viewModel: any);
+        function EmitBindData(className: any);
         function EmitCloseWindow(openParam: any, closeParam: any);
         function EmitSpinePlay(param: { spine: sp.Skeleton, value: { path: string, bundle: string, param?: ISpinePlayData[] } });
     }

package/package.json

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