@cc-component/cc-ex-component 1.3.4 → 1.3.7

package/assets/core/BaseWindow.ts

@@ -39,7 +39,7 @@ export class BaseWindow extends BaseReference {
     * @param param.comp 关闭的按钮组件
     * @param param.time 关闭的按钮的时间 
     */
-    public close(param?: { is_anim?: boolean, param?: any, finish?: Function }) {
+    public pop(param?: { is_anim?: boolean, param?: any, finish?: Function }) {
         this.paramClose = param;
         this.param?.callBack?.(param?.param)//回调方法
         if (param?.is_anim && this.root && this.maskOpacity) {

package/assets/core/ReferenceComponent.ts

@@ -265,7 +265,7 @@ export class ReferenceComponent extends Component {
 
                 eventStr += `
     ${pix}${name}(comp: ${type === "ToggleContainer" ? "Toggle" : type}) {
-        
+    ${name === 'close' ? '    super.pop()' : ''}
     }\n`
 
             }
@@ -348,6 +348,7 @@ ${sx_this}
         let importStr = `
 import { Label, RichText, ProgressBar, Sprite, EditBox, Toggle, Slider, ToggleContainer, Button, math, SpriteFrame, _decorator , Node} from 'cc';
 import { ViewModel, BindViewModel, BindTable, BindCollect, Bind, Ref, BaseViewModelData, YXCollectionView, YXFlowLayout, TableView, BaseWindow } from 'db://assets/pkg-export/@cc-component/cc-ex-component';
+import { ${this.baseWindowName}} } from 'db://assets/start/Interface/custom/${this.baseWindowName}';
 const { ccclass, property } = _decorator;`
 
         if (this.isComDebug) {

package/assets/core/ViewModel.ts

@@ -87,6 +87,7 @@ export function BindViewModel<T extends new () => any>(constructor: T) {
             if (!bindingMap.has(className)) {
                 bindingMap.set(className, new Map());
             }
+            this.className = className;
             //console.log('onLoad我的', this.node.name)
             if (!this._bindings) this._bindings = [];
 
@@ -192,8 +193,17 @@ export function ViewModel<T extends new (...args: any[]) => Component>(Base: T)
     return class extends Base {
         // 绑定关系存储
         _bindings: { uiProp: string; dataPath: string }[] = [];
-
         viewModel: any
+        touch_start = 'CALL_TOUCH_START'
+        touch_move = 'CALL_TOUCH_MOVE'
+        touch_end = 'CALL_TOUCH_END'
+        touch_cancel = 'CALL_TOUCH_CANCEL'
+
+        touch_click = 'CALL_CLICK'
+        touch_slide = 'CALL_SLIDE_EVENT'
+        touch_toggle = 'CALL_TOGGLE_EVENT'
+        touch_editbox = 'CALL_EDITBOX_EVENT'
+        className: string = ''
         // 创建响应式数据
         _makeReactive<T extends object>(obj: T, pathPrefix: string): T {
             const self = this as any;
@@ -266,6 +276,181 @@ export function ViewModel<T extends new (...args: any[]) => Component>(Base: T)
         }
 
 
+
+        protected onEnable(): void {
+            this.onTouch()
+        }
+
+        protected onDisable(): void {
+            this.offTouch()
+        }
+
+        onTouch() {
+            const map = bindingMap.get(this.className)
+            for (const [propertyKey, value] of map) {
+                const com = this[propertyKey];
+                const value_data = this._getNestedValue(this, value.dataPath);
+                const data = map.get(propertyKey)
+                this.touch(data, com, value_data, this);
+            }
+        }
+
+        offTouch() {
+            const map = bindingMap.get(this.className)
+            for (const [propertyKey, value] of map) {
+                const com_btn = this[propertyKey];
+                if (com_btn[this.touch_click]) {
+                    com_btn.node.off(Button.EventType.CLICK, com_btn[this.touch_click]);
+                    com_btn[this.touch_click] = null
+                }
+                if (com_btn[this.touch_start]) {
+                    com_btn.node.off(Node.EventType.TOUCH_START, com_btn[this.touch_start]);
+                    com_btn[this.touch_start] = null
+                }
+                if (com_btn[this.touch_move]) {
+                    com_btn.node.off(Node.EventType.TOUCH_MOVE, com_btn[this.touch_move]);
+                    com_btn[this.touch_move] = null
+                }
+                if (com_btn[this.touch_end]) {
+                    com_btn.node.off(Node.EventType.TOUCH_END, com_btn[this.touch_end]);
+                    com_btn[this.touch_end] = null
+                }
+
+                if (com_btn[this.touch_cancel]) {
+                    com_btn.node.off(Node.EventType.TOUCH_CANCEL, com_btn[this.touch_cancel]);
+                    com_btn[this.touch_cancel] = null
+                }
+
+                if (com_btn[this.touch_slide]) {
+                    com_btn.node.off("slide", com_btn[this.touch_slide], this)
+                    com_btn[this.touch_slide] = null
+                }
+
+                if (com_btn[this.touch_toggle]) {
+                    com_btn.node.off(Toggle.EventType.TOGGLE, com_btn[this.touch_toggle], self)
+                    com_btn[this.touch_toggle] = null
+                }
+
+                if (com_btn[this.touch_editbox]) {
+                    com_btn.node.off("text-changed", com_btn[this.touch_editbox], self)
+                    com_btn[this.touch_editbox] = null
+                }
+
+            }
+        }
+
+
+        touch(data: IBindingData, com_btn: Component, value: any, self: any) {
+            if (data.type === "cc.Button") {
+                const tempData = { value: value, skip: false }
+                //点击
+                const touch_click = this.touch_click;
+                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);
+                }
+                //事件
+                let touch_start = this.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)
+                    }
+                    com_btn[touch_start] = call_start
+                    com_btn.node.on(Node.EventType.TOUCH_START, com_btn[touch_start]);
+                }
+                touch_start = this.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)
+                    }
+                    com_btn[touch_start] = call_start
+                    com_btn.node.on(Node.EventType.TOUCH_MOVE, com_btn[touch_start]);
+                }
+                touch_start = this.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)
+                    }
+                    com_btn[touch_start] = call_start
+                    com_btn.node.on(Node.EventType.TOUCH_END, com_btn[touch_start]);
+                }
+                touch_start = this.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)
+                    }
+                    com_btn[touch_start] = call_start
+                    com_btn.node.on(Node.EventType.TOUCH_CANCEL, com_btn[touch_start]);
+                }
+            }
+            else if (data.type === 'cc.Slider') {
+                const tempData = { value: value, skip: false }
+                //事件
+                const touch_click = this.touch_slide
+                if (!com_btn[touch_click]) {
+                    const sx = data.propertyKey;
+                    com_btn.node.off("slide", com_btn[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_btn[touch_click] = slideCall
+                    com_btn.node.on('slide', slideCall, self);
+                }
+            }
+            else if (data.type === 'cc.Toggle') {
+                const tempData = { value: value, skip: false }
+                //事件
+                const touch_click = this.touch_toggle
+                if (!com_btn[touch_click]) {
+                    const sx = data.propertyKey;
+                    com_btn.node.off(Toggle.EventType.TOGGLE, com_btn[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_btn[touch_click] = toggleCall
+                    com_btn.node.on(Toggle.EventType.TOGGLE, toggleCall, self);
+                }
+            }
+            else if (data.type === 'cc.EditBox') {
+                const tempData = { value: value, skip: false }
+                //事件
+                const touch_click = this.touch_editbox
+                if (!com_btn[touch_click]) {
+                    const sx = data.propertyKey;
+                    com_btn.node.off("text-changed", com_btn[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_btn[touch_click] = ebCall
+                    com_btn.node.on('text-changed', ebCall, self);
+                }
+            }
+        }
     };
 }
 
@@ -303,61 +488,6 @@ function updateStatus(data: IBindingData, com: Component, value: any, self: any)
                 data.reset(self, value, com);
             } else
                 com_btn.node.active = value ?? true;
-
-            //事件点击
-
-            const touch_click = 'CallClick'
-            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);
-            }
-
-            //touch
-            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)
-                }
-                com_btn[touch_start] = call_start
-                com_btn.node.on(Node.EventType.TOUCH_START, com_btn[touch_start]);
-            }
-            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)
-                }
-                com_btn[touch_start] = call_start
-                com_btn.node.on(Node.EventType.TOUCH_MOVE, com_btn[touch_start]);
-            }
-            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)
-                }
-                com_btn[touch_start] = call_start
-                com_btn.node.on(Node.EventType.TOUCH_END, com_btn[touch_start]);
-            }
-            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)
-                }
-                com_btn[touch_start] = call_start
-                com_btn.node.on(Node.EventType.TOUCH_CANCEL, com_btn[touch_start]);
-            }
             break;
         case 'cc.ProgressBar':
             if (data.reset) {
@@ -378,22 +508,6 @@ function updateStatus(data: IBindingData, com: Component, value: any, self: any)
                     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);
-                }
             }
             break;
         case 'cc.Toggle':
@@ -403,22 +517,6 @@ function updateStatus(data: IBindingData, com: Component, value: any, self: any)
                     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);
-                }
             }
             break;
         case 'cc.EditBox':
@@ -428,22 +526,6 @@ function updateStatus(data: IBindingData, com: Component, value: any, self: any)
                     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);
-                }
             }
             break;
         case 'cc.ToggleContainer':
@@ -452,7 +534,6 @@ function updateStatus(data: IBindingData, com: Component, value: any, self: any)
                 if (data.reset) {
                     data.reset(self, value, com);
                 }
-
                 //事件
                 if (com_tgc.checkEvents.length <= 0) {
                     const sx = data.propertyKey;

package/assets/ex/ExCommon.ts

@@ -6,6 +6,7 @@ import { TweenManager } from "./ExTween";
 import { Slider } from "cc";
 import { ProgressBar, tween, Sprite, view, v3, Button, Label, Animation } from "cc";
 import { Color } from "cc";
+import { EventTouch } from "cc";
 
 declare global {
     interface String {
@@ -632,11 +633,13 @@ sp.Skeleton.prototype.fromHEX = function (this: sp.Skeleton, hex: string): void
 // 保存原始方法
 const originalOnTouchEnded = Button.prototype["_onTouchEnded"];
 // 重写 _onTouchEnded
-Button.prototype["_onTouchEnded"] = function (...args: any[]) {
+Button.prototype["_onTouchEnded"] = function (event: EventTouch) {
     // 播放点击音效
     ExComponentModule.Emit(this);
+    this.node.emit('click', this)
     // 调用原始逻辑
-    return originalOnTouchEnded.apply(this, args);
+    // EventHandler.emitEvents(this.clickEvents, event);
+    return originalOnTouchEnded.call(this, event);
 };
 
 export { };

package/package.json

@@ -1,19 +1,19 @@
-{
-    "name": "@cc-component/cc-ex-component",
-    "version": "1.3.4",
-    "engine": ">=3.8.6",
-    "description": "系统组件添加常用扩展方法",
-    "main": "index.ts",
-    "scripts": {
-        "test": "echo \"Error: no test specified\" && exit 1"
-    },
-    "repository": {
-        "type": "git",
-        "url": "https://gitee.com/YangFanHome/cc-ex-component"
-    },
-    "publishConfig": {
-        "access": "public",
-        "registry": "https://registry.npmjs.org"
-    },
-    "license": "MIT"
+{
+    "name": "@cc-component/cc-ex-component",
+    "version": "1.3.7",
+    "engine": ">=3.8.6",
+    "description": "系统组件添加常用扩展方法",
+    "main": "index.ts",
+    "scripts": {
+        "test": "echo \"Error: no test specified\" && exit 1"
+    },
+    "repository": {
+        "type": "git",
+        "url": "https://gitee.com/YangFanHome/cc-ex-component"
+    },
+    "publishConfig": {
+        "access": "public",
+        "registry": "https://registry.npmjs.org"
+    },
+    "license": "MIT"
 }