@cc-component/cc-ex-component 1.5.7 → 1.5.9

package/assets/core/ReferenceComponent.ts

@@ -83,6 +83,7 @@ export class ReferenceComponent extends Component {
     comList = ["EditBox", "Toggle", "ToggleContainer", "Slider", "Button", "ProgressBar", "YXCollectionView", "TableView"]
     comList2 = ["YXCollectionView", "TableView"]
     comList_base = ["EditBox", "Toggle", "ToggleContainer", "Slider", "Button", "ProgressBar"]
+    comListAll = ["EditBox", "Toggle", "ToggleContainer", "Slider", "Button", "ProgressBar", "ScrollView", "PageView", "Animation", 'Sprite', 'Label', 'RichText', 'ParticleSystem2D', 'Skeleton']
 
     /** 生成代码基础窗口名称 */
     public baseWindowName = "BaseWindow"
@@ -146,7 +147,10 @@ export class ReferenceComponent extends Component {
             let refData = new CollectorNodeData();
             let name = node.name.replace(this._tag, "").trim();
             refData.key = name;
+
             refData.com = (node.getComponent(`cc.${nodeType}`) ?? (node.getComponent(`${nodeType}`) ?? node)) as any;
+            // console.log('2--', refData.com.name)
+
             this.nodes.push(refData);
         }
     }
@@ -161,7 +165,12 @@ export class ReferenceComponent extends Component {
         while (checkArr.length > 0) {
             let v = checkArr.shift();
             let rc = v.getComponent(ReferenceComponent);
-            if (rc && rc != this) continue;
+
+            if (rc && rc != this) {
+                // arr.push(v);
+                //   console.log("[MLogger]", v.name, "被引用");
+                continue;
+            }
             arr.push(...v.children.filter(v => {
                 const ok = this.isNodeValid(v)
                 return ok
@@ -257,7 +266,7 @@ export class ReferenceComponent extends Component {
 
 
             let bind = `${bind_pix}("${name}"${this.comList2.includes(type) ? event : ""})`
-            if (this.skipList.includes(type)) {
+            if (this.skipList.includes(type) || !this.comListAll.includes(type)) {
                 bind = `${bind_pix}()`
             }
 
@@ -303,7 +312,7 @@ export class ReferenceComponent extends Component {
             let key = data.key;
             let name = key[0].toLowerCase() + key.substring(1);
             const type = this.getPropertyType(data.com)
-            if (!this.skipList.includes(type)) {
+            if ((this.comListAll.includes(type) && !this.skipList.includes(type))) {
                 //@ts-ignore
                 let line = `    ${name}: ${this.getDataTypeByComponentType(type)};`//`private get ${name}() { return this.rc.get("${key}", ${this.getPropertyType(data.node)}); }`;
                 sx += line + "" + (index < this.nodes.length - 1 ? "\n" : "");
@@ -390,10 +399,14 @@ export class ${className}Window extends ViewModel(${this.baseWindowName}) {${sx.
     private getPropertyType(node: Node) {
         if (!EDITOR_NOT_IN_PREVIEW) return;
         if (!node) { return "Node" }
-
         //自定义脚本
-        let comp = node.getComponent('MComponent');
-        if (comp) return js.getClassName(comp);
+        let comp = node.getComponent('BaseReference');
+        if (comp) {
+            //  const com = node.getComponentsInChildren("BaseReference").pop()
+            return js.getClassName(comp);
+        }
+
+
         //自定义组件
         if (node.getComponent("Switch")) return "Switch";
         if (node.getComponent("MSlider")) return "MSlider";
@@ -419,8 +432,8 @@ export class ${className}Window extends ViewModel(${this.baseWindowName}) {${sx.
         if (node.getComponent("cc.RichText")) return "RichText";
         if (node.getComponent("cc.ParticleSystem2D")) return "ParticleSystem2D";
         if (node.getComponent("sp.Skeleton")) return "sp.Skeleton";
-
-        return "Node";
+        const com = node.getComponentsInChildren(Component).pop()
+        return js.getClassName(com).replace('cc.', '');
     }
 
     getDataTypeByComponentType(compType: string) {

package/assets/core/ViewModel.ts

@@ -666,7 +666,7 @@ function updateStatus(data: IBindingData, com: Component, value: any, self: any)
                     // const width = 100
                     // const height = 163
                     // layout.itemSize = math.size(width, height)
-                    table_collection.layout = data.layout(self)
+                    table_collection.layout = data.layout?.call(self)
                     // 注册列表内需要使用的 cell 节点类型
                     // 这个演示是通过编辑器绑定的，可以查看场景内 list 节点里的 register cells 配置
                     // this.table_collection.register('cell', () => instantiate('your cell prefab'))
@@ -696,8 +696,11 @@ function updateStatus(data: IBindingData, com: Component, value: any, self: any)
                 table_collection.reloadData()
             }
             break;
+        case 'cc.Node':
+            break;
         default: {
-            if (com) console.error(`请检查类型: ${data.type}`);
+            // if (com) console.error(`请检查类型: ${data.type}`);
+            break
         }
     }
 

package/assets/interface/Interface.ts

@@ -40,6 +40,7 @@ declare global {
             path: string,
             bundle: string,
             name?: string,/**窗口名称 */
+            name_ui?: string,/**窗口名称 */
             index?: number,
             is_load_sub?: boolean,
             /**是否记录-不记录可重复打开窗口 */

package/package.json

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