@cc-component/cc-ex-component 1.2.7 → 1.2.8

package/assets/core/ReferenceComponent.ts

@@ -1,4 +1,5 @@
 import { Sprite } from "cc";
+import { assetManager } from "cc";
 import { Enum } from "cc";
 import { _decorator, Component, js, Node } from "cc";
 import { EDITOR_NOT_IN_PREVIEW } from "cc/env";
@@ -25,6 +26,7 @@ export class ReferenceComponent extends Component {
     @property({ displayName: "复制属性" })
     private get refresh() { return this._refresh; }
     private set refresh(val: boolean) {
+        console.error('打印了')
         if (EDITOR_NOT_IN_PREVIEW) {
             this.initNodeList();
             this.genCode();
@@ -187,6 +189,7 @@ export class ReferenceComponent extends Component {
             text += line;
         });
         Editor.Clipboard.write("text", text);
+
         console.log("已复制到剪切板");
     }
 
@@ -194,8 +197,8 @@ export class ReferenceComponent extends Component {
     private genCodeBind(isCopy: boolean = true, isClass: boolean = false) {
         if (!EDITOR_NOT_IN_PREVIEW) return;
         let text = "";
-        let eventStr: string = "    //#region ✅ 事件"
-        let pix = "onClick_"
+        let eventStr: string = "    //#region ⚠️ ------------方法事件"
+        let pix = "private onClick_"
         // const com = this.node.components.find(v => { return v.reference })
         // const match = com.name.match(/<([^>]+)>/);
         // const className = match && match[1] ? match[1] : "any"
@@ -203,15 +206,16 @@ export class ReferenceComponent extends Component {
         let data = `${className}Data`
         let iinterface = `I${className}Data`
         //console.error("[MLogger Error]", className)
-        const viewModel = `     
+        const viewModel =
+            `\n    //#region ⚠️ ------------自动生成属性
     // ✅ 外部界面调用,刷新UI
     public refreshUI(data: ${iinterface}) { super.refreshUI(data); }   
     
-    //#region ✅ 使用新装饰器（自动响应式 + 路径推导）
+    // ✅ 使用新装饰器（自动响应式 + 路径推导）
     @BindViewModel(${className}Data)
     viewModel: ${className}Data;`
         text += viewModel + "\n\n"
-        text += `    //#region ✅ UI属性`
+        text += `    // ✅ UI属性`
         //生成get属性
         this.nodes.forEach(data => {
             let key = data.key;
@@ -250,7 +254,7 @@ export class ReferenceComponent extends Component {
             }
 
             let bind = `${bind_pix}("${name}"${this.comList.includes(type) ? event : ""})`
-            if (isClass) {
+            if (true) {
                 bind = `${bind_pix}("${name}"${this.comList2.includes(type) ? event : ""})`
             }
             if (this.comList_base.includes(type)) {
@@ -265,12 +269,16 @@ export class ReferenceComponent extends Component {
             let line = `    ${bind} @Ref ${name}: ${type};`
             text += line;
         });
+        text += `\n    //#endregion END`
 
+        text += `\n\n    //#region ⚠️ ------------自定义属性`
+        text += `\n\n    //#endregion END`
 
         if (isCopy) {
             Editor.Clipboard.write("text", text);
             console.log("已复制到剪切板");
         }
+        eventStr += `\n    //#endregion END`
         return { text: text, event: eventStr }
 
     }
@@ -280,33 +288,33 @@ export class ReferenceComponent extends Component {
         if (!EDITOR_NOT_IN_PREVIEW) return;
         let text = ""
         let sx_this = ''
-        let sx = '    \n'
+        let sx = ''
         const className = this.node.name
 
         let data = `${className}Data`
         let iinterface = `I${className}Data`
 
         //生成get属性
-        this.nodes.forEach(data => {
+        this.nodes.forEach((data, index) => {
             let key = data.key;
             let name = key[0].toLowerCase() + key.substring(1);
             const type = this.getPropertyType(data.com)
             //@ts-ignore
             let line = `    ${name}: ${this.getDataTypeByComponentType(type)};`//`private get ${name}() { return this.rc.get("${key}", ${this.getPropertyType(data.node)}); }`;
-            sx += line + "\n";
+            sx += line + "" + (index < this.nodes.length - 1 ? "\n" : "");
 
             let line_sx = `        this.${name} = ${this.getDataTypeByComponentTypeValue(type)}`
-            sx_this += line_sx + '\n'
+            sx_this += line_sx + (index < this.nodes.length - 1 ? "\n" : "");
         });
 
         text = `
-//#region ✅ 数据接口
+//#region ⚠️ ------------数据接口
 export interface ${iinterface}  {
 ${sx}
 }
-        `;
+//#endregion END`;
         text += `
-//#region ✅ 数据VM
+//#region ⚠️ ------------数据对象
 class ${data} extends BaseViewModelData implements ${iinterface} {
 ${sx}
 
@@ -315,7 +323,7 @@ ${sx}
 ${sx_this}
     }
 }
-        `;
+//#endregion END`;
         if (isCopy) {
             Editor.Clipboard.write("text", text);
             console.log("已复制到剪切板");
@@ -331,7 +339,7 @@ ${sx_this}
     private genCodeVmDataAll() {
         if (!EDITOR_NOT_IN_PREVIEW) return;
         let importStr = `
-import { Label, RichText, ProgressBar, Sprite, EditBox, Toggle, Slider, ToggleContainer, Button, math, SpriteFrame, _decorator } from 'cc';
+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, BaseReference } from 'db://assets/pkg-export/@cc-component/cc-ex-component';
 const { ccclass, property } = _decorator;`
 
@@ -354,7 +362,7 @@ const { ccclass, property } = _decorator;
 
         let iinterface = `I${className}Data`
         const onload = `
-    //#region ✅ 初始化
+    //#region ⚠️ ------------初始化
     onLoad(): void {
 
     }
@@ -446,5 +454,4 @@ export class ${className} extends ViewModel(BaseReference) {${sx.text}\n${onload
         };
         return typeMap[compType] ?? 'any'; // 默认 fallback
     }
-
 }

package/assets/core/ViewModel.ts

@@ -15,6 +15,7 @@ import { TableView } from '../lib/tableView/TableView';
 import { YXFlowLayout } from '../lib/collectView/lib_collect/yx-flow-layout';
 import { math } from 'cc';
 import { YXCollectionView, YXIndexPath } from '../lib/collectView/lib_collect/yx-collection-view';
+import { EventTouch } from 'cc';
 
 interface IBindingData extends ITableViewEvents, IBindingDataEvents {
     dataPath: string;
@@ -25,8 +26,12 @@ interface IBindingData extends ITableViewEvents, IBindingDataEvents {
 
 
 interface IBindingDataEvents {
-    reset?: Function;
-    event?: Function;
+    reset?: (self: any, value: any, com: Component) => void;
+    event?: (self: any) => void;
+    touchStart?: (self: any, event: EventTouch) => void;
+    touchMove?: (self: any, event: EventTouch) => void;
+    touchEnd?: (self: any, event: EventTouch) => void;
+    touchCancel?: (self: any, event: EventTouch) => void;
 }
 
 
@@ -310,8 +315,9 @@ function updateStatus(data: IBindingData, com: Component, value: any, self: any)
             } else
                 com_btn.node.active = value ?? true;
 
-            //事件
-            com_btn.node.off(Button.EventType.CLICK, com_btn['btnCall']);
+            //事件点击
+            const touch_click = 'CallClick'
+            com_btn.node.off(Button.EventType.CLICK, com_btn[touch_click]);
             tempData.skip = true;
             const btnCall = (btn) => {
                 tempData.value = btn.node.active
@@ -319,8 +325,46 @@ function updateStatus(data: IBindingData, com: Component, value: any, self: any)
                 data.event?.(self)
                 self[`onClick_${sx}`]?.(btn)
             }
-            com_btn['btnCall'] = btnCall
-            com_btn.node.on(Button.EventType.CLICK, com_btn['btnCall']);
+            com_btn[touch_click] = btnCall
+            com_btn.node.on(Button.EventType.CLICK, com_btn[touch_click]);
+
+            //touch
+            if (data.touchStart) {
+                const touch_start = 'CALL_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]);
+            }
+            if (data.touchMove) {
+                const touch_start = 'CALL_TOUCH_MOVE'
+                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]);
+            }
+            if (data.touchEnd) {
+                const touch_start = 'CALL_TOUCH_END'
+                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]);
+            }
+            if (data.touchCancel) {
+                const touch_start = 'CALL_TOUCH_CANCEL'
+                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) {

package/package.json

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