@cc-component/cc-ex-component 1.5.6 → 1.5.8

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"
@@ -257,7 +258,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 +304,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" : "");
@@ -419,8 +420,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

@@ -217,6 +217,7 @@ export function ViewModel<T extends new (...args: any[]) => Component>(Base: T)
             is_load_sub?: boolean;
             /**是否记录-不记录可重复打开窗口 */
             is_record?: boolean;
+            name_ui: string;
         };
         // 创建响应式数据
         _makeReactive<T extends object>(obj: T, pathPrefix: string): T {
@@ -295,7 +296,7 @@ export function ViewModel<T extends new (...args: any[]) => Component>(Base: T)
 
 
         managerData() {
-            ExComponentModule.EmitUIWindow(this.config)
+            ExComponentModule.EmitUIWindow(this.config, this.viewModel)
         }
 
 
@@ -697,7 +698,8 @@ function updateStatus(data: IBindingData, com: Component, value: any, self: any)
             }
             break;
         default: {
-            if (com) console.error(`请检查类型: ${data.type}`);
+            //  if (com) console.error(`请检查类型: ${data.type}`);
+            break
         }
     }
 

package/assets/interface/ExComponentModule.ts

@@ -15,7 +15,7 @@ export class ExComponentModule {
     param: { click: (comp: Button) => void }
     paramSprite: { loadSprite: (param: { bundle: string, path: string }) => Promise<SpriteFrame>, getSprite: (param: { bundle: string, path: string }) => SpriteFrame }
     paramSpine: { loadSpine: (param: { bundle: string, path: string }) => Promise<sp.SkeletonData>, getSpine: (param: { bundle: string, path: string }) => sp.SkeletonData }
-    paramUIWindow: { onLoad: (config: any) => void }
+    paramUIWindow: { onLoad: (config: any, viewModel: any) => void }
 
     ResetBaseWindow: string = "BaseWindow";
     static Init() {
@@ -31,7 +31,7 @@ export class ExComponentModule {
         if (!isGet) ExComponentModule.Ins.ResetBaseWindow = name
         return ExComponentModule.Ins.ResetBaseWindow
     }
-    static OnVMManager(param: { onLoad: (config: any) => void }) {
+    static OnVMManager(param: { onLoad: (config: any, viewModel: any) => void }) {
         ExComponentModule.Ins.paramUIWindow = param
     }
 
@@ -61,8 +61,8 @@ export class ExComponentModule {
         return ExComponentModule.Ins.paramSpine?.getSpine?.(param)
     }
 
-    static EmitUIWindow(this: any, param: any) {
-        return ExComponentModule.Ins.paramUIWindow?.onLoad?.call(this, param)
+    static EmitUIWindow(param: any, viewModel: any) {
+        return ExComponentModule.Ins.paramUIWindow?.onLoad?.(param, viewModel)
     }
 }
 window.ExComponentModule = ExComponentModule;

package/assets/interface/Interface.ts

@@ -25,7 +25,7 @@ declare global {
                 is_load_sub?: boolean,
                 /**是否记录-不记录可重复打开窗口 */
                 is_record?: boolean,
-            }) => void
+            }, viewModel: any) => void
         });
         /**组件：内部使用方法 */
         function Emit(btn: Button);
@@ -34,16 +34,17 @@ declare global {
         function EmitGetSprite(param: any): SpriteFrame;
         function EmitLoadSpine(param: any): Promise<sp.SkeletonData>;
         function EmitGetSpine(param: any): sp.SkeletonData;
-        function EmitUIWindow(this: any, param: {
+        function EmitUIWindow(param: {
             module: string,
             layer: string,
             path: string,
             bundle: string,
             name?: string,/**窗口名称 */
+            name_ui?: string,/**窗口名称 */
             index?: number,
             is_load_sub?: boolean,
             /**是否记录-不记录可重复打开窗口 */
             is_record?: boolean,
-        });
+        }, viewModel: any);
     }
 }

package/package.json

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