@cc-component/cc-ex-component 1.2.3 → 1.2.4

package/assets/core/BaseReference.ts

@@ -1,19 +1,20 @@
 import { _decorator, Component, Node } from 'cc';
 import { ReferenceComponent } from './ReferenceComponent';
 import { BaseViewModelData } from './BaseViewModelData';
+import { refMap } from './ViewModel';
+import { js } from 'cc';
 const { ccclass, property } = _decorator;
 
 @ccclass('BaseReference')
 export class BaseReference extends Component {
-    refMap: Map<string, string> = new Map();
     private rc: ReferenceComponent;
     private vmParams: any;
     viewModel: BaseViewModelData;
     param: any;
     initReferenceCollector() {
         this.rc = this.getComponent(ReferenceComponent);
-        this.refMap.forEach((value, key) => { this.defineProperty(key); });
-        console.error("1111")
+        const refList = refMap.get(js.getClassName(this)) ?? []
+        refList.forEach((value) => { this.defineProperty(value); });
     }
 
     onLoadFinish() {
@@ -21,13 +22,16 @@ export class BaseReference extends Component {
     }
     //#endregion
     defineProperty(propertyKey: string) {
-        Object.defineProperty(this, propertyKey, { get: () => this.rc.get(propertyKey) });
+        Object.defineProperty(this, propertyKey, { get: () => this.rc?.get(propertyKey), set: (value) => { }, configurable: true });
     }
 
 
     refreshUI(vmParams: any) {
         this.vmParams = vmParams;
     }
+    protected onDestroy(): void {
+
+    }
 
 
     // // 在 test 类中添加

package/assets/core/ReferenceComponent.ts

@@ -112,7 +112,8 @@ export class ReferenceComponent extends Component {
     // public get(key: string, type: typeof Node): Node;
     // public get<T extends Component>(key: string, type: new (...args: any[]) => T): T;
     public get(key: string): any {
-        if (this._nodeMap.size == 0) this.initNodeMap();
+        if (!this._nodeMap) { return null }
+        if (this._nodeMap && this._nodeMap.size == 0) this.initNodeMap();
         let node = this._nodeMap.get(key);
         // if (node?.isValid) {
         //     if (type as any === Node) {

package/assets/core/ViewModel.ts

@@ -53,6 +53,8 @@ interface ICollectViewEvents {
 const bindingMap = new Map<string, Map<string, IBindingData>>();
 const baseData = 'viewModel'
 const skip = "$"
+export const refMap: Map<string, string[]> = new Map();
+
 // const comType = {
 //     "cc.Sprite": typeof Sprite,
 //     "cc.Label": Label,
@@ -514,27 +516,25 @@ function updateStatus(data: IBindingData, com: Component, value: any, self: any)
  * 响应式数据装饰器
  * 自动将属性转为响应式对象，并使用属性名作为路径前缀
  */
-export function BindViewModel(initialValue?: 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 initValue = typeof initialValue === 'function'
-                ? initialValue()
-                : (initialValue ?? {});
-            // 创建响应式对象
-            this[propertyKey] = this._makeReactive(initValue, propertyKey);
+            // 创建实例并转为响应式
+            const instance = new constructor();
+            this[propertyKey] = this._makeReactive(instance, propertyKey);
             originalOnLoad?.call(this);
-
         };
     };
 }
 
 // 定义装饰器
 export function Ref(target: any, propertyKey: string) {
-    const refMap: Map<string, string> = target.constructor.prototype.refMap
-    refMap.set(propertyKey, propertyKey)
-    if (refMap.size <= 0) {
+
+    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();
@@ -542,5 +542,7 @@ export function Ref(target: any, propertyKey: string) {
             originalOnLoad?.call(this);
             this.onLoadFinish();
         };
+
     }
+    refList.push(propertyKey)
 }

package/assets/lib/tableView/TableView.ts

@@ -52,7 +52,6 @@ export class TableView extends Component {
         if (this.scrollView) {
             this.scrollView.delegate = delegate
         }
-        console.error("列表初始化完成2")
 
     }
     onLoadFinish(call: () => void) {

package/package.json

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