@cc-component/cc-ex-component 1.2.8 → 1.3.0

package/assets/core/BaseReference.ts

@@ -18,8 +18,12 @@ export class BaseReference extends Component {
     }
 
     onLoadFinish() {
-        if (this.vmParams) this.viewModel?.refreshUI(this.vmParams)
+        if (this.vmParams) {
+            this.viewModel?.refreshUI(this.vmParams)
+            // this.vmParams = null
+        }
     }
+
     //#endregion
     defineProperty(propertyKey: string) {
         Object.defineProperty(this, propertyKey, { get: () => this.rc?.get(propertyKey), set: (value) => { }, configurable: true });
@@ -28,6 +32,11 @@ export class BaseReference extends Component {
 
     refreshUI(vmParams: any) {
         this.vmParams = vmParams;
+        if (this.vmParams) {
+            this.viewModel?.refreshUI(this.vmParams)
+            ///  this.vmParams = null
+        }
+
     }
     protected onDestroy(): void {
 

package/assets/core/BaseReference.ts.meta

@@ -2,7 +2,7 @@
   "ver": "4.0.24",
   "importer": "typescript",
   "imported": true,
-  "uuid": "80f3a1bc-0def-46f0-9d80-766558915dba",
+  "uuid": "98261244-ef30-417a-bedf-15c9cb6ad132",
   "files": [],
   "subMetas": {},
   "userData": {}

package/assets/core/BaseViewModelData.ts.meta

@@ -2,7 +2,7 @@
   "ver": "4.0.24",
   "importer": "typescript",
   "imported": true,
-  "uuid": "b0c7d937-f05a-4775-b75a-37fd1c14f007",
+  "uuid": "e59e775b-f518-478a-9c7f-ce9ffa52d555",
   "files": [],
   "subMetas": {},
   "userData": {}

package/assets/core/ReferenceComponent.ts

@@ -1,5 +1,6 @@
 import { Sprite } from "cc";
 import { assetManager } from "cc";
+import { Button } from "cc";
 import { Enum } from "cc";
 import { _decorator, Component, js, Node } from "cc";
 import { EDITOR_NOT_IN_PREVIEW } from "cc/env";
@@ -84,6 +85,7 @@ export class ReferenceComponent extends Component {
     comList2 = ["YXCollectionView", "TableView"]
     comList_base = ["EditBox", "Toggle", "ToggleContainer", "Slider", "Button", "ProgressBar"]
 
+    skipList = ["Button"]//跳过按钮类型
     protected onLoad(): void {
         if (EDITOR_NOT_IN_PREVIEW) {//处理编辑器逻辑
             this.initNodeList();
@@ -212,7 +214,6 @@ export class ReferenceComponent extends Component {
     public refreshUI(data: ${iinterface}) { super.refreshUI(data); }   
     
     // ✅ 使用新装饰器（自动响应式 + 路径推导）
-    @BindViewModel(${className}Data)
     viewModel: ${className}Data;`
         text += viewModel + "\n\n"
         text += `    // ✅ UI属性`
@@ -253,10 +254,12 @@ export class ReferenceComponent extends Component {
                 bind_pix = `@BindTable`
             }
 
-            let bind = `${bind_pix}("${name}"${this.comList.includes(type) ? event : ""})`
-            if (true) {
-                bind = `${bind_pix}("${name}"${this.comList2.includes(type) ? event : ""})`
+
+            let bind = `${bind_pix}("${name}"${this.comList2.includes(type) ? event : ""})`
+            if (this.skipList.includes(type)) {
+                bind = `${bind_pix}()`
             }
+
             if (this.comList_base.includes(type)) {
 
                 eventStr += `
@@ -299,12 +302,14 @@ export class ReferenceComponent extends Component {
             let key = data.key;
             let name = key[0].toLowerCase() + key.substring(1);
             const type = this.getPropertyType(data.com)
-            //@ts-ignore
-            let line = `    ${name}: ${this.getDataTypeByComponentType(type)};`//`private get ${name}() { return this.rc.get("${key}", ${this.getPropertyType(data.node)}); }`;
-            sx += line + "" + (index < this.nodes.length - 1 ? "\n" : "");
+            if (!this.skipList.includes(type)) {
+                //@ts-ignore
+                let line = `    ${name}: ${this.getDataTypeByComponentType(type)};`//`private get ${name}() { return this.rc.get("${key}", ${this.getPropertyType(data.node)}); }`;
+                sx += line + "" + (index < this.nodes.length - 1 ? "\n" : "");
 
-            let line_sx = `        this.${name} = ${this.getDataTypeByComponentTypeValue(type)}`
-            sx_this += line_sx + (index < this.nodes.length - 1 ? "\n" : "");
+                let line_sx = `        this.${name} = ${this.getDataTypeByComponentTypeValue(type)}`
+                sx_this += line_sx + (index < this.nodes.length - 1 ? "\n" : "");
+            }
         });
 
         text = `
@@ -371,6 +376,7 @@ const { ccclass, property } = _decorator;
         this.viewModel.loadData()
     }`
         const classView = `
+@BindViewModel(${className}Data)
 @ccclass('${className}')
 export class ${className} extends ViewModel(BaseReference) {${sx.text}\n${onload}\n\n${sx.event}\n}`
 

package/assets/core/ReferenceComponent.ts.meta

@@ -2,7 +2,7 @@
   "ver": "4.0.24",
   "importer": "typescript",
   "imported": true,
-  "uuid": "f34b484e-1368-4fe7-b8a5-432c5db1d7db",
+  "uuid": "68335bb8-9bdb-4226-9099-45c109a36775",
   "files": [],
   "subMetas": {},
   "userData": {}

package/assets/core/ViewModel.ts

@@ -16,10 +16,12 @@ import { YXFlowLayout } from '../lib/collectView/lib_collect/yx-flow-layout';
 import { math } from 'cc';
 import { YXCollectionView, YXIndexPath } from '../lib/collectView/lib_collect/yx-collection-view';
 import { EventTouch } from 'cc';
+import { YXPagelayout } from '../lib/collectView/lib_collect/yx-page-layout';
 
 interface IBindingData extends ITableViewEvents, IBindingDataEvents {
     dataPath: string;
     type: any;
+    propertyKey?: string;
     // 允许任意额外属性
     [key: string]: any;
 }
@@ -73,6 +75,50 @@ export const refMap: Map<string, string[]> = new Map();
 //     "cc.Toggle": Toggle,
 //     "cc.Button": Button,
 // }
+export function BindViewModel<T extends new () => any>(constructor: T) {
+    return function (target: any) {
+        const onLoad = target.prototype.onLoad;
+        /**
+         * 重载onload 注入更新
+         */
+        target.prototype.onLoad = function () {
+            onLoad.call(this);
+            const className = js.getClassName(target);
+            if (!bindingMap.has(className)) {
+                bindingMap.set(className, new Map());
+            }
+            //console.log('onLoad我的', this.node.name)
+            if (!this._bindings) this._bindings = [];
+
+            const map = bindingMap.get(className)
+            for (const [propertyKey, value] of map) {
+                //属性绑定
+                this.initReferenceCollector();
+                this.defineProperty(propertyKey);
+
+                //设置类型
+                const com = this[propertyKey];
+                const classname = js.getClassName(com)
+                value.type = classname
+                //                console.log('属性绑定', propertyKey, value.type, com, this)
+                // 记录绑定关系到实例
+                this._bindings.push({ uiProp: value.propertyKey, dataPath: value.dataPath });
+                // 初始化 UI
+                const value_data = this._getNestedValue(this, value.dataPath);
+                const data = map.get(propertyKey)
+                updateStatus(data, com, value_data, this);
+            }
+
+            // 创建实例并转为响应式
+            const vm_data = 'viewModel'
+            const instance = new constructor();
+            this[vm_data] = this._makeReactive(instance, vm_data);
+
+            this.onLoadFinish();
+        };
+    };
+
+}
 
 /**
  * 数据绑定装饰器
@@ -80,50 +126,35 @@ export const refMap: Map<string, string[]> = new Map();
  * @param reset 重写赋值方法，自定义实现. 参数：(self 组件所在的父类，com 组件，value 值)          
  * @param event 点击事件，滑动事件，等等. 参数：(self 组件所在的父类)
  */
-export function Bind<T extends Component>(dataPath: string, param?: IBindingDataEvents) {
-    dataPath = baseData + '.' + dataPath;
+export function Bind<T extends Component>(path?: string, param?: IBindingDataEvents) {
+    const dataPath = baseData + '.' + path;
     return function (target: any, propertyKey: string) {
-        const className = js.getClassName(target.constructor);
-        if (!bindingMap.has(className)) {
-            bindingMap.set(className, new Map());
-        }
+        const className = js.getClassName(target);
         const data: IBindingData = {
-            dataPath: dataPath, type: null, reset: param?.reset, event: param?.event,
+            propertyKey: propertyKey,
+            dataPath: dataPath, type: className, reset: param?.reset, event: param?.event,
             itemSize: null,
             cellForItemAt: null,
             numberOfItems: null,
+            touchStart: param?.touchStart,
+            touchMove: param?.touchMove,
+            touchEnd: param?.touchEnd,
+            touchCancel: param?.touchCancel,
         }
 
+        if (!bindingMap.has(className)) { bindingMap.set(className, new Map()); }
         bindingMap.get(className)!.set(propertyKey, data);
-        // 重写 onLoad 以初始化绑定
-        const originalOnLoad = target.constructor.prototype.onLoad;
-        target.constructor.prototype.onLoad = function () {
-            originalOnLoad?.call(this);
-            const com = this[propertyKey];
-            const classname = js.getClassName(com)
-            data.type = classname;
-            bindingMap.get(className)!.set(propertyKey, data);
-            // 初始化 UI
-            const value = this._getNestedValue(this, dataPath);
-            if (com) {
-                updateStatus(data, com, value, this)
-            }
-
-            // 记录绑定关系到实例
-            if (!this._bindings) this._bindings = [];
-            this._bindings.push({ uiProp: propertyKey, dataPath });
-        };
     };
 }
 
+
 export function BindTable<T extends Component>(dataPath: string, param?: ITableViewEvents) {
     dataPath = baseData + '.' + dataPath;
     return function (target: any, propertyKey: string) {
         const className = js.getClassName(target.constructor);
-        if (!bindingMap.has(className)) {
-            bindingMap.set(className, new Map());
-        }
         const data: IBindingData = {
+            propertyKey: propertyKey,
+
             dataPath: dataPath, type: null,
             itemSize: param.itemSize,
             cellForItemAt: param.cellForItemAt,
@@ -131,26 +162,8 @@ export function BindTable<T extends Component>(dataPath: string, param?: ITableV
             onTouchCellAt: param.onTouchCellAt,
             moveFinish: param.moveFinish,
         }
-
+        if (!bindingMap.has(className)) { bindingMap.set(className, new Map()); }
         bindingMap.get(className)!.set(propertyKey, data);
-        // 重写 onLoad 以初始化绑定
-        const originalOnLoad = target.constructor.prototype.onLoad;
-        target.constructor.prototype.onLoad = function () {
-            originalOnLoad?.call(this);
-            const com = this[propertyKey];
-            const classname = js.getClassName(com)
-            data.type = classname;
-            bindingMap.get(className)!.set(propertyKey, data);
-            // 初始化 UI
-            const value = this._getNestedValue(this, dataPath);
-            if (com) {
-                updateStatus(data, com, value, this)
-            }
-
-            // 记录绑定关系到实例
-            if (!this._bindings) this._bindings = [];
-            this._bindings.push({ uiProp: propertyKey, dataPath });
-        };
     };
 }
 
@@ -158,11 +171,9 @@ export function BindCollect<T extends Component>(dataPath: string, param?: IColl
     dataPath = baseData + '.' + dataPath;
     return function (target: any, propertyKey: string) {
         const className = js.getClassName(target.constructor);
-        if (!bindingMap.has(className)) {
-            bindingMap.set(className, new Map());
-        }
 
         const data: IBindingData = {
+            propertyKey: propertyKey,
             dataPath: dataPath, type: null,
             layout: param.layout,
             cellForItemAt: param.cellForItemAt as any,
@@ -170,31 +181,8 @@ export function BindCollect<T extends Component>(dataPath: string, param?: IColl
             itemSize: param.itemSize as any,
             onTouchCellAt: param.onTouchCellAt,
         }
-
-        // layout: (self: any) => YXFlowLayout,
-        // cellForItemAt: (self: any, indexPath: YXIndexPath, collectionView: YXCollectionView) => Node
-        // itemSize?: ((self: any, indexPath: YXIndexPath, layout: YXFlowLayout, collectionView: YXCollectionView) => math.Size),
-        // onTouchCellAt?: (self: any, indexPath: YXIndexPath) => void
-        // numberOfItems?: ((self: any, section: number, collectionView: YXCollectionView) => number);
+        if (!bindingMap.has(className)) { bindingMap.set(className, new Map()); }
         bindingMap.get(className)!.set(propertyKey, data);
-        // 重写 onLoad 以初始化绑定
-        const originalOnLoad = target.constructor.prototype.onLoad;
-        target.constructor.prototype.onLoad = function () {
-            originalOnLoad?.call(this);
-            const com = this[propertyKey];
-            const classname = js.getClassName(com)
-            data.type = classname;
-            bindingMap.get(className)!.set(propertyKey, data);
-            // 初始化 UI
-            const value = this._getNestedValue(this, dataPath);
-            if (com) {
-                updateStatus(data, com, value, this)
-            }
-
-            // 记录绑定关系到实例
-            if (!this._bindings) this._bindings = [];
-            this._bindings.push({ uiProp: propertyKey, dataPath });
-        };
     };
 }
 /**
@@ -285,19 +273,20 @@ 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)
     switch (data.type) {
         case 'cc.Label':
             if (data.reset) {
                 data.reset(self, value, com);
             } else {
-                if (value) (com as Label).string = value?.toString() || '';
+                if (value != undefined && value !== null) (com as Label).string = value?.toString() || '';
             }
             break;
         case 'cc.RichText':
             if (data.reset) {
                 data.reset(self, value, com);
             } else
-                if (value)
+                if (value != undefined && value !== null)
                     (com as RichText).string = value?.toString() || '';
             break;
         case 'cc.Sprite':
@@ -306,7 +295,7 @@ function updateStatus(data: IBindingData, com: Component, value: any, self: any)
             if (data.reset) {
                 data.reset(self, value, com);
             } else
-                if (value) (com as Sprite).spriteFrame = value;
+                if (value != undefined && value !== null) (com as Sprite).spriteFrame = value;
             break;
         case 'cc.Button':
             const com_btn = (com as Button);
@@ -316,21 +305,25 @@ function updateStatus(data: IBindingData, com: Component, value: any, self: any)
                 com_btn.node.active = value ?? true;
 
             //事件点击
+
             const touch_click = 'CallClick'
-            com_btn.node.off(Button.EventType.CLICK, com_btn[touch_click]);
-            tempData.skip = true;
-            const btnCall = (btn) => {
-                tempData.value = btn.node.active
-                self.viewModel[sx] = tempData
-                data.event?.(self)
-                self[`onClick_${sx}`]?.(btn)
+            if (!com_btn[touch_click]) {
+                const sx = data.propertyKey;
+                com_btn.node.off(Button.EventType.CLICK, com_btn[touch_click]);
+                tempData.skip = true;
+                const btnCall = (btn) => {
+                    tempData.value = btn.node.active
+                    self.viewModel[sx] = tempData
+                    data.event?.(self)
+                    self[`onClick_${sx}`]?.(btn)
+                }
+                com_btn[touch_click] = btnCall
+                com_btn.node.on(Button.EventType.CLICK, btnCall);
             }
-            com_btn[touch_click] = btnCall
-            com_btn.node.on(Button.EventType.CLICK, com_btn[touch_click]);
 
             //touch
-            if (data.touchStart) {
-                const touch_start = 'CALL_TOUCH_START'
+            let touch_start = 'CALL_TOUCH_START'
+            if (data.touchStart && !com_btn[touch_start]) {
                 com_btn.node.off(Node.EventType.TOUCH_START, com_btn[touch_start]);
                 const call_start = (btn) => {
                     data.touchStart?.(self, btn)
@@ -338,8 +331,8 @@ function updateStatus(data: IBindingData, com: Component, value: any, self: any)
                 com_btn[touch_start] = call_start
                 com_btn.node.on(Node.EventType.TOUCH_START, com_btn[touch_start]);
             }
-            if (data.touchMove) {
-                const touch_start = 'CALL_TOUCH_MOVE'
+            touch_start = 'CALL_TOUCH_MOVE'
+            if (data.touchMove && !com_btn[touch_start]) {
                 com_btn.node.off(Node.EventType.TOUCH_MOVE, com_btn[touch_start]);
                 const call_start = (btn) => {
                     data.touchMove?.(self, btn)
@@ -347,8 +340,8 @@ function updateStatus(data: IBindingData, com: Component, value: any, self: any)
                 com_btn[touch_start] = call_start
                 com_btn.node.on(Node.EventType.TOUCH_MOVE, com_btn[touch_start]);
             }
-            if (data.touchEnd) {
-                const touch_start = 'CALL_TOUCH_END'
+            touch_start = 'CALL_TOUCH_END'
+            if (data.touchEnd && !com_btn[touch_start]) {
                 com_btn.node.off(Node.EventType.TOUCH_END, com_btn[touch_start]);
                 const call_start = (btn) => {
                     data.touchEnd?.(self, btn)
@@ -356,8 +349,8 @@ function updateStatus(data: IBindingData, com: Component, value: any, self: any)
                 com_btn[touch_start] = call_start
                 com_btn.node.on(Node.EventType.TOUCH_END, com_btn[touch_start]);
             }
-            if (data.touchCancel) {
-                const touch_start = 'CALL_TOUCH_CANCEL'
+            touch_start = 'CALL_TOUCH_CANCEL'
+            if (data.touchCancel && !com_btn[touch_start]) {
                 com_btn.node.off(Node.EventType.TOUCH_CANCEL, com_btn[touch_start]);
                 const call_start = (btn) => {
                     data.touchCancel?.(self, btn)
@@ -370,70 +363,88 @@ function updateStatus(data: IBindingData, com: Component, value: any, self: any)
             if (data.reset) {
                 data.reset(self, value, com);
             } else
-                if (value) (com as ProgressBar).progress = Number(value) || 0;
+                if (value != undefined && value !== null) (com as ProgressBar).progress = Number(value) || 0;
             break;
         case 'cc.Skeleton':
             if (data.reset) {
                 data.reset(self, value, com);
             } else
-                if (value) (com as sp.Skeleton).skeletonData = value
+                if (value != undefined && value !== null) (com as sp.Skeleton).skeletonData = value
             break;
         case 'cc.Slider':
-            const com_sld = (com as Slider);
-            if (data.reset) {
-                data.reset(self, value, com);
-            } else
-                if (value) com_sld.progress = Number(value) || 0;
-
-            //事件
-            com_sld.node.off("slide", com_sld['slideCall'], self)
-            tempData.skip = true;
-            const slideCall = (slider) => {
-                tempData.value = slider.progress
-                self.viewModel[sx] = tempData
-                data.event?.(self)
-                self[`onClick_${sx}`]?.(slider)
+            {
+                const com_sld = (com as Slider);
+                if (data.reset) {
+                    data.reset(self, value, com);
+                } else
+                    if (value != undefined && value !== null) com_sld.progress = Number(value) || 0;
+
+                //事件
+                const touch_click = 'slideCall'
+                if (!com_sld[touch_click]) {
+                    const sx = data.propertyKey;
+                    com_sld.node.off("slide", com_sld[touch_click], self)
+                    tempData.skip = true;
+                    const slideCall = (slider) => {
+                        tempData.value = slider.progress
+                        self.viewModel[sx] = tempData
+                        data.event?.(self)
+                        self[`onClick_${sx}`]?.(slider)
+                    }
+                    com_sld[touch_click] = slideCall
+                    com_sld.node.on('slide', slideCall, self);
+                }
             }
-            com_sld['slideCall'] = slideCall
-            com_sld.node.on('slide', slideCall, self);
             break;
         case 'cc.Toggle':
-            const com_tg = (com as Toggle);
-            if (data.reset) {
-                data.reset(self, value, com);
-            } else
-                if (value) com_tg.isChecked = Boolean(value);
-
-            //事件
-            com_tg.node.off(Toggle.EventType.TOGGLE, com_tg['toggleCall'], self)
-            tempData.skip = true;
-            const toggleCall = (toggle) => {
-                tempData.value = toggle.isChecked
-                self.viewModel[sx] = tempData
-                data.event?.(self)
-                self[`onClick_${sx}`]?.(toggle)
+            {
+                const com_tg = (com as Toggle);
+                if (data.reset) {
+                    data.reset(self, value, com);
+                } else
+                    if (value != undefined && value !== null) com_tg.isChecked = Boolean(value);
+
+                //事件
+                const touch_click = 'toggleCall'
+                if (!com_tg[touch_click]) {
+                    const sx = data.propertyKey;
+                    com_tg.node.off(Toggle.EventType.TOGGLE, com_tg[touch_click], self)
+                    tempData.skip = true;
+                    const toggleCall = (toggle) => {
+                        tempData.value = toggle.isChecked
+                        self.viewModel[sx] = tempData
+                        data.event?.(self)
+                        self[`onClick_${sx}`]?.(toggle)
+                    }
+                    com_tg[touch_click] = toggleCall
+                    com_tg.node.on(Toggle.EventType.TOGGLE, toggleCall, self);
+                }
             }
-            com_tg['toggleCall'] = toggleCall
-            com_tg.node.on(Toggle.EventType.TOGGLE, toggleCall, self);
             break;
         case 'cc.EditBox':
-            const com_eb = (com as EditBox);
-            if (data.reset) {
-                data.reset(self, value, com);
-            } else
-                if (value) com_eb.string = value?.toString() || '';
-
-            //事件
-            com_eb.node.off("text-changed", com_eb['ebCall'], self)
-            tempData.skip = true;
-            const ebCall = (editbox: EditBox) => {
-                tempData.value = editbox.textLabel.string
-                self.viewModel[sx] = tempData
-                data.event?.(self)
-                self[`onClick_${sx}`]?.(editbox)
+            {
+                const com_eb = (com as EditBox);
+                if (data.reset) {
+                    data.reset(self, value, com);
+                } else
+                    if (value != undefined && value !== null) com_eb.string = value?.toString() || '';
+
+                //事件
+                const touch_click = 'ebCall'
+                if (!com_eb[touch_click]) {
+                    const sx = data.propertyKey;
+                    com_eb.node.off("text-changed", com_eb[touch_click], self)
+                    tempData.skip = true;
+                    const ebCall = (editbox: EditBox) => {
+                        tempData.value = editbox.textLabel.string
+                        self.viewModel[sx] = tempData
+                        data.event?.(self)
+                        self[`onClick_${sx}`]?.(editbox)
+                    }
+                    com_eb[touch_click] = ebCall
+                    com_eb.node.on('text-changed', ebCall, self);
+                }
             }
-            com_eb['ebCall'] = ebCall
-            com_eb.node.on('text-changed', ebCall, self);
             break;
         case 'cc.ToggleContainer':
             {
@@ -444,6 +455,7 @@ function updateStatus(data: IBindingData, com: Component, value: any, self: any)
 
                 //事件
                 if (com_tgc.checkEvents.length <= 0) {
+                    const sx = data.propertyKey;
                     const funcName = "onClick_ToggleContainer"
                     const clickEventHandler = new EventHandler();
                     clickEventHandler.target = self.node; // 这个 node 节点是你的事件处理代码组件所属的节点
@@ -474,7 +486,7 @@ function updateStatus(data: IBindingData, com: Component, value: any, self: any)
                 // ✅ 关键：不要缓存 count，而是通过 dataPath 动态取值
                 const getLatestDataLength = () => {
                     const latestValue = self._getNestedValue(self, data.dataPath);
-                    return Array.isArray(latestValue) ? latestValue.length : 0;
+                    return latestValue ? latestValue.length : 0;
                 };
 
                 if (com_list.isInit) {
@@ -525,13 +537,21 @@ function updateStatus(data: IBindingData, com: Component, value: any, self: any)
                     // const width = 100
                     // const height = 163
                     // layout.itemSize = math.size(width, height)
-                    table_collection.layout = data.layout()
+                    table_collection.layout = data.layout(self)
                     // 注册列表内需要使用的 cell 节点类型
                     // 这个演示是通过编辑器绑定的，可以查看场景内 list 节点里的 register cells 配置
                     // this.table_collection.register('cell', () => instantiate('your cell prefab'))
                     // 确定列表内一共需要显示多少条内容
                     //  table_collection.isCenterShow = false;//少于宽度，居中显示
-                    table_collection.numberOfItems = () => getLatestDataLength()
+                    table_collection.numberOfItems = () => {
+                        const count = data.numberOfItems ? data.numberOfItems(self) : getLatestDataLength()
+                        if (table_collection.layout instanceof YXPagelayout) {
+                            table_collection.layout.dataCount = count
+                            return count * 3
+                        } else {
+                            return count
+                        }
+                    }
                     table_collection.cellForItemAt = (indexPath, collectionView) => {
                         return data.cellForItemAt(self, indexPath, collectionView as any) // 返回这个节点给列表显示
                     }
@@ -547,8 +567,9 @@ function updateStatus(data: IBindingData, com: Component, value: any, self: any)
                 table_collection.reloadData()
             }
             break;
-        default:
-            console.error(`请检查类型: ${data.type}`);
+        default: {
+            if (com) console.error(`请检查类型: ${data.type}`);
+        }
     }
 
 }
@@ -560,33 +581,11 @@ function updateStatus(data: IBindingData, com: Component, value: any, self: any)
  * 响应式数据装饰器
  * 自动将属性转为响应式对象，并使用属性名作为路径前缀
  */
-export function BindViewModel<T extends new () => any>(constructor: T) {
-    return function (target: any, propertyKey: string) {
-        const originalOnLoad = target.constructor.prototype.onLoad;
-        target.constructor.prototype.onLoad = function () {
-            // 创建实例并转为响应式
-            const instance = new constructor();
-            this[propertyKey] = this._makeReactive(instance, propertyKey);
-            originalOnLoad?.call(this);
-        };
-    };
-}
 
 // 定义装饰器
 export function Ref(target: any, propertyKey: string) {
-
     const className = js.getClassName(target)
     if (!refMap.has(className)) { refMap.set(className, []) }
     const refList = refMap.get(className)
-    if (refList.length <= 0) {
-        const originalOnLoad = target.constructor.prototype.onLoad;
-        target.constructor.prototype.onLoad = function (this: any) {
-            this.initReferenceCollector();
-            this.defineProperty(propertyKey);
-            originalOnLoad?.call(this);
-            this.onLoadFinish();
-        };
-
-    }
     refList.push(propertyKey)
 }

package/assets/core/ViewModel.ts.meta

@@ -2,7 +2,7 @@
   "ver": "4.0.24",
   "importer": "typescript",
   "imported": true,
-  "uuid": "91193c30-a004-4bca-bfc0-45fb594eea0f",
+  "uuid": "f772ca0d-0c21-4688-9be2-33a210303849",
   "files": [],
   "subMetas": {},
   "userData": {}