@cc-component/cc-ex-component 2.0.3 → 2.0.5

package/assets/core/ViewModel.ts

@@ -110,6 +110,8 @@ export function BindViewModel<T extends new () => any>(constructor: T) {
 
             const self = this
             const map = bindingMap.get(className)
+            const childPromises: Promise<void>[] = []; // 👈 收集子组件的 Promise
+
             for (const [propertyKey, value] of map) {
                 //属性绑定
                 this.initReferenceCollector();
@@ -120,12 +122,16 @@ export function BindViewModel<T extends new () => any>(constructor: T) {
                 const classname = js.getClassName(com)
                 value.type = classname
                 //绑定自定义的继承BaseReference 的类的viewModel
+                // ✅ 关键：为每个 BaseReference 子组件创建 Promise
                 if (com instanceof BaseReference) {
-                    const onLoadFinished = com.onLoadFinished;
+                    let resolveFn: () => void;
+                    childPromises.push(new Promise<void>((resolve) => { resolveFn = resolve; }));
+                    const originalOnLoadFinished = com.onLoadFinished;
                     com.onLoadFinished = function () {
-                        self.viewModel[propertyKey] = com.viewModel
-                        onLoadFinished.call(com);
-                    }
+                        self.viewModel[propertyKey] = com.viewModel;
+                        originalOnLoadFinished?.call(com);
+                        resolveFn(); // 👈 子组件完成，resolve Promise
+                    };
                 }
                 //console.log('属性绑定', propertyKey, value.type, com, this)
                 // 记录绑定关系到实例
@@ -140,7 +146,14 @@ export function BindViewModel<T extends new () => any>(constructor: T) {
 
             this.onLoadFinish();
             onLoad.call(this);
-            this.onLoadFinished();
+            // ✅ 关键：等待所有子组件完成后，再执行父组件的 onLoadFinished
+            if (childPromises.length > 0) {
+                Promise.all(childPromises).then(() => { this.onLoadFinished(); });
+            } else {
+                // 如果没有子组件，直接执行
+                this.onLoadFinished();
+            }
+
         };
     };
 
@@ -182,7 +195,7 @@ export function BindFunc(path?: string) {
         bindingMapFunc.get(className)!.set(propertyKey, funcName);
     };
 }
-/**绑定自定义viewModel */
+/**绑定自定义界面的viewModel */
 export function BindData(viewName?: string) {
     return function (target: any, propertyKey: string) {
         const call = () => {
@@ -192,9 +205,9 @@ export function BindData(viewName?: string) {
         const viewClassName = viewName ? viewName : call()
         const className = target.constructor
         if (!bindingMapView.has(viewClassName)) { bindingMapView.set(viewClassName, { key: '', manager: null }); }
-        bindingMapView.get(viewClassName)!.key = propertyKey
-        bindingMapView.get(viewClassName)!.manager = className
-
+        const data = bindingMapView.get(viewClassName)
+        data.key = propertyKey
+        data.manager = className
     };
 }
 
@@ -283,6 +296,7 @@ export function ViewModel<T extends new (...args: any[]) => Component>(Base: T)
             const self = this as any;
             return new Proxy(obj, {
                 get(target, key: string) {
+
                     // ✅ 跳过 $ 开头的属性：直接返回原始值，不代理
                     if (key.startsWith(skip)) {
                         return target[key];
@@ -293,6 +307,12 @@ export function ViewModel<T extends new (...args: any[]) => Component>(Base: T)
                     //     console.log(`get ${pathPrefix}----${key}`);
                     //     return self._makeReactive(value, `${pathPrefix}.${key}`);
                     // }
+
+                    //绑定的方法
+                    const funcName = bindingMapFunc.get(self.className)?.get(key)
+                    if (funcName) {
+                        return self[funcName]?.()
+                    }
                     return value;
                 },
                 set(target, key: string, value: any) {
@@ -420,7 +440,10 @@ export function ViewModel<T extends new (...args: any[]) => Component>(Base: T)
         }
 
         private refreshFuncName() {
-            this.funcMap.forEach((value, key) => { this[key]?.(value) })
+            // console.error('刷新数据失败:', this.funcMap)
+            this.funcMap.forEach((value, key) => {
+                this[key]?.(value)
+            })
         }
 
         resetButtonScale(btn: Button) {

package/package.json

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