@cc-component/cc-ex-component 1.5.2 → 1.5.4

package/assets/core/ReferenceComponent.ts

@@ -225,17 +225,17 @@ export class ReferenceComponent extends Component {
             let name = key[0].toLowerCase() + key.substring(1);
             const type = this.getPropertyType(data.com)
             let bind_pix = `@Bind`
-            let event = `,{ event(this:${className}) { } }`
+            let event = `,{ event(this:${className}Window) { } }`
             if (type === "YXCollectionView") {
                 event = `, {
-        layout(this:${className}) {
+        layout(this:${className}Window) {
             const layout = new YXFlowLayout();
             layout.horizontalSpacing = 10;
             layout.verticalSpacing = 20;
             layout.itemSize = () => math.size(100, 100);
             return layout;
         },
-        cellForItemAt(this:${className}, indexPath, collectionView) {
+        cellForItemAt(this:${className}Window, indexPath, collectionView) {
             const node = collectionView.dequeueReusableCell("cell", indexPath);
             //node.getComponent(TableVIewItem).refreshUI(this.viewModel.${name}[indexPath.row])
             return node;
@@ -246,7 +246,7 @@ export class ReferenceComponent extends Component {
             } else if (type === "TableView") {
                 event = `, {
         itemSize: () => math.size(100, 100),
-        cellForItemAt(this:${className}, indexPath, collectionView) {
+        cellForItemAt(this:${className}Window, indexPath, collectionView) {
             const node = collectionView.dequeueReusableCell("cell", indexPath)
             //node.getComponent(TableVIewItem).refreshUI(this.viewModel.${name}[indexPath.row])
             return node
@@ -323,11 +323,6 @@ ${sx}
 //#region ⚠️ ------------数据对象
 class ${data} extends BaseViewModelData implements ${iinterface} {
 ${sx}
-
-    // ✅ 本界面内部调用
-    loadData() {
-${sx_this}
-    }
 }
 //#endregion END`;
         if (isCopy) {
@@ -376,7 +371,7 @@ const { ccclass, property } = _decorator;
     }
 
     start() {
-        this.viewModel.loadData()
+        
     }`
         const classView = `
 @BindViewModel(${className}Data)

package/assets/core/ViewModel.ts

@@ -112,9 +112,8 @@ export function BindViewModel<T extends new () => any>(constructor: T) {
                 updateStatus(data, com, value_data, this);
             }
             // 创建实例并转为响应式
-            const vm_data = 'viewModel'
             const instance = new constructor();
-            this[vm_data] = this._makeReactive(instance, vm_data);
+            this[baseData] = this._makeReactive(instance, baseData);
             this.onLoadFinish();
             onLoad.call(this);
 
@@ -281,17 +280,12 @@ export function ViewModel<T extends new (...args: any[]) => Component>(Base: T)
             this._bindings = [];
             // 2. 替换 data 为普通对象（破坏 Proxy 响应式）
             this.viewModel = null
-
+            this.managerData()
         }
 
         protected onLoad(): void {
             super.onLoad()
-            if (this.config) {
-                const module = this.config.module;
-                const name = this.config.name.replace('Window', '');
-                const manager: any = (js.getClassByName(`${module}Manager`))
-                manager.Ins[`${name}Data`] = this.viewModel
-            }
+            this.managerData()
         }
         // 在 withDataBinding 返回的 class 中
         protected onDestroy(): void {
@@ -300,6 +294,15 @@ export function ViewModel<T extends new (...args: any[]) => Component>(Base: T)
         }
 
 
+        managerData() {
+            if (this.config) {
+                const module = this.config.module;
+                const name = this.config.name.replace('Window', '');
+                const manager: any = (js.getClassByName(`${module}Manager`))
+                manager.Ins[`${name}Data`] = this.viewModel
+            }
+        }
+
 
         protected onEnable(): void {
             this.onTouch()

package/package.json

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