@cc-component/cc-ex-component 2.0.6 → 2.0.8

package/assets/core/ViewModel.ts

@@ -72,6 +72,7 @@ interface ICollectViewEvents {
 const bindingMap = new Map<any, Map<string, IBindingData>>();
 const bindingMapFunc = new Map<any, Map<string, string>>();
 const bindingMapView = new Map<any, { key: string, manager: any }>();
+const bindingMapClick = new Map<any, Map<string, { func: string, subSx: string, subFunc: string }>>();
 
 const baseData = 'viewModel'
 const skip = "func"
@@ -186,6 +187,18 @@ export function Bind<T extends Component>(path?: string, param?: IBindingDataEve
         bindingMap.get(className)!.set(propertyKey, data);
     };
 }
+export function BindClick(propertyName: string, funcName?: string) {
+    return function (target: any, propertyKey: string) {
+        const className = target.constructor.prototype
+        if (!bindingMapClick.has(className)) { bindingMapClick.set(className, new Map()); }
+        const data = bindingMapClick.get(className)
+        if (!data.has(propertyKey)) { data.set(propertyKey, { func: '', subFunc: '', subSx: '' }) }
+        const sub = data.get(propertyKey)
+        sub.func = propertyKey
+        sub.subSx = `${propertyName}`
+        sub.subFunc = `${funcName ?? propertyKey}`
+    };
+}
 
 export function BindFunc(path?: string) {
     return function (target: any, propertyKey: string) {
@@ -409,6 +422,7 @@ export function ViewModel<T extends new (...args: any[]) => Component>(Base: T)
         onLoadFinished() {
             this.refreshFuncName()
             this.bindData(true)
+            this.bindClick();
         }
 
         managerData() {
@@ -424,7 +438,22 @@ export function ViewModel<T extends new (...args: any[]) => Component>(Base: T)
             // this.offTouch()
         }
 
-
+        bindClick() {
+            const data = bindingMapClick.get(this.className)
+            if (data) {
+                const self = this;
+                for (const [key, value] of data) {
+                    const subObj = this[value.subSx]
+                    if (subObj) {
+                        const oriFunc = this[value.subSx][value.subFunc]
+                        this[value.subSx][value.subFunc] = function (...args) {
+                            oriFunc.apply(this, args)
+                            self[value.func](args)
+                        }
+                    }
+                }
+            }
+        }
         bindData(isBind: boolean) {
             const name = js.getClassName(this)
             const managerData = bindingMapView.get(name)

package/assets/ex/ExCommon.ts

@@ -265,8 +265,7 @@ declare module 'cc' {
     interface Label {
         /**动画播放 */
         play(param: {
-            startValue: number,
-            endValue: number,
+            end: number,
             duration: number,
             formatter?: (value: number) => string,
             onComplete?: () => void
@@ -718,27 +717,28 @@ Map.prototype.toObject = function (): Object {
 Label.prototype.play = function (
     this: Label,
     param: {
-        startValue: number,
-        endValue: number,
+        end: number,
         duration: number,
         formatter: (value: number) => string,
         onComplete?: () => void
     }
 ): void {
     const label = this;
-
     // 如果已有动画，先停止
     if (label._currentTween) {
         label._currentTween.stop();
     }
+    const start = label.startValue ?? 0;
+    label.startValue = start;
     // 使用 tween 动画
-    const obj: { value: number } = { value: param.startValue }
+    const obj: { value: number } = { value: start }
     label._currentTween = tween(obj)
         .to(
             param.duration,
-            { value: param.endValue },
+            { value: param.end },
             {
                 onUpdate(target: { value: number }) {
+                    label.startValue = target.value
                     label.string = param.formatter?.(target.value) ?? (Math.floor(target.value) + '');
                 },
                 easing: "quadOut",

package/package.json

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