@cc-component/cc-ex-component 1.4.0 → 1.4.1

package/assets/core/ViewModel.ts

@@ -57,10 +57,10 @@ interface ICollectViewEvents {
 }
 
 // 全局存储绑定关系: { className -> { uiProp: dataPath } }
-const bindingMap = new Map<string, Map<string, IBindingData>>();
+const bindingMap = new Map<any, Map<string, IBindingData>>();
 const baseData = 'viewModel'
 const skip = "$"
-export const refMap: Map<string, string[]> = new Map();
+export const refMap: Map<any, string[]> = new Map();
 
 // const comType = {
 //     "cc.Sprite": typeof Sprite,
@@ -83,12 +83,12 @@ export function BindViewModel<T extends new () => any>(constructor: T) {
          */
         target.prototype.onLoad = function () {
             onLoad.call(this);
-            const className = js.getClassName(target);
+            const className = target.prototype//js.getClassName(target);
             if (!bindingMap.has(className)) {
                 bindingMap.set(className, new Map());
             }
             this.className = className;
-            //console.log('onLoad我的', this.node.name)
+            console.log('onLoad我的', this.node.name, this.className)
             if (!this._bindings) this._bindings = [];
 
             const map = bindingMap.get(className)
@@ -130,7 +130,7 @@ export function BindViewModel<T extends new () => any>(constructor: T) {
 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);
+        const className = target.constructor.prototype
         const data: IBindingData = {
             propertyKey: propertyKey,
             dataPath: dataPath, type: className, reset: param?.reset, event: param?.event,
@@ -152,7 +152,7 @@ export function Bind<T extends Component>(path?: string, param?: IBindingDataEve
 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);
+        const className = target
         const data: IBindingData = {
             propertyKey: propertyKey,
 
@@ -171,8 +171,7 @@ export function BindTable<T extends Component>(dataPath: string, param?: ITableV
 export function BindCollect<T extends Component>(dataPath: string, param?: ICollectViewEvents) {
     dataPath = baseData + '.' + dataPath;
     return function (target: any, propertyKey: string) {
-        const className = js.getClassName(target.constructor);
-
+        const className = target
         const data: IBindingData = {
             propertyKey: propertyKey,
             dataPath: dataPath, type: null,
@@ -203,7 +202,7 @@ export function ViewModel<T extends new (...args: any[]) => Component>(Base: T)
         touch_slide = 'CALL_SLIDE_EVENT'
         touch_toggle = 'CALL_TOGGLE_EVENT'
         touch_editbox = 'CALL_EDITBOX_EVENT'
-        className: string = ''
+        className: any
         // 创建响应式数据
         _makeReactive<T extends object>(obj: T, pathPrefix: string): T {
             const self = this as any;
@@ -251,7 +250,7 @@ export function ViewModel<T extends new (...args: any[]) => Component>(Base: T)
                 if (fullPath === dataPath) {
                     const com = this[uiProp]
                     if (com) {
-                        const classname = js.getClassName(this)
+                        const classname = this.constructor.prototype
                         const data = bindingMap.get(classname).get(uiProp)
                         const value = this._getNestedValue(this, data.dataPath);
                         updateStatus(data, com, value, this)
@@ -269,6 +268,12 @@ export function ViewModel<T extends new (...args: any[]) => Component>(Base: T)
 
         }
 
+        // protected onLoad(): void {
+        //     super.onLoad()
+        //     console.error('打印名称', js.getClassName(this))
+        //     const className = js.getClassName(this)
+        //   //  ecs.getSingleton()
+        // }
         // 在 withDataBinding 返回的 class 中
         protected onDestroy(): void {
             this.unbindViewModel();
@@ -666,8 +671,7 @@ function updateStatus(data: IBindingData, com: Component, value: any, self: any)
 
 // 定义装饰器
 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 (!refMap.has(target)) { refMap.set(target, []) }
+    const refList = refMap.get(target)
     refList.push(propertyKey)
 }

package/package.json

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