@cc-component/cc-ex-component 1.4.0 → 1.4.2

package/assets/core/BaseReference.ts

@@ -20,7 +20,7 @@ export class BaseReference extends Component {
     onLoadFinish() {
         if (this.vmParams) {
             this.viewModel?.refreshUI(this.vmParams)
-            // this.vmParams = null
+            this.vmParams = null
         }
     }
 
@@ -32,11 +32,9 @@ export class BaseReference extends Component {
 
     refreshUI(vmParams: any) {
         this.vmParams = vmParams;
-        if (this.vmParams) {
+        if (this.vmParams && this.viewModel) {
             this.viewModel?.refreshUI(this.vmParams)
-            ///  this.vmParams = null
         }
-
     }
     protected onDestroy(): void {
 

package/assets/core/BaseWindow.ts

@@ -1,22 +1,28 @@
 import { UIOpacity, tween, Vec3 } from 'cc';
 import { _decorator, Component, Node } from 'cc';
 import { BaseReference } from './BaseReference';
-import { Button } from 'cc';
 const { ccclass, property } = _decorator;
 
 @ccclass('BaseWindow')
 export class BaseWindow extends BaseReference {
     maskOpacity: UIOpacity;
     root: Node;
-    /**关闭事件-当系统级关闭所有打开的界面时。如果关闭界面时需要执行自己的业务逻辑,使用此属性
-     * eventName：关闭方法名称
-     * param：参数
-    */
-    closeEvent: { eventName: string, param?: any };
     /**参数*/
     param: any;
     /**关闭参数 */
     paramClose: { is_anim?: boolean, param?: any, finish?: Function };
+    /**ui配置 */
+    config: {
+        module: string;
+        layer: string;
+        path: string;
+        bundle: string;
+        name?: string;/**窗口名称 */
+        index?: number;
+        is_load_sub?: boolean;
+        /**是否记录-不记录可重复打开窗口 */
+        is_record?: boolean;
+    };
 
     protected onLoad(): void {
         this.maskOpacity = this.node.getChildByName('mask')?.getComponent(UIOpacity)
@@ -76,6 +82,12 @@ export class BaseWindow extends BaseReference {
             })
             .start();
     }
+
+    /**关闭事件-当系统级关闭所有打开的界面时。如果关闭界面时需要执行自己的业务逻辑,重写此方法
+   * eventName：关闭方法名称
+   * param：参数
+  */
+    closeEvent(): { eventName: string, param?: any } { return null }
 }
 
 

package/assets/core/ReferenceComponent.ts

@@ -205,7 +205,7 @@ export class ReferenceComponent extends Component {
         // const com = this.node.components.find(v => { return v.reference })
         // const match = com.name.match(/<([^>]+)>/);
         // const className = match && match[1] ? match[1] : "any"
-        const className = this.node.name
+        const className = this.node.name.replace('Window', '');
         let data = `${className}Data`
         let iinterface = `I${className}Data`
         //console.error("[MLogger Error]", className)
@@ -293,7 +293,7 @@ export class ReferenceComponent extends Component {
         let text = ""
         let sx_this = ''
         let sx = ''
-        const className = this.node.name
+        const className = this.node.name.replace('Window', '');
 
         let data = `${className}Data`
         let iinterface = `I${className}Data`
@@ -366,7 +366,7 @@ const { ccclass, property } = _decorator;
         let text = `${importStr}\n`
         text += this.genCodeVmData(false)
         const sx = this.genCodeBind(false, true)
-        const className = this.node.name
+        const className = this.node.name.replace('Window', '');
 
         let iinterface = `I${className}Data`
         const onload = `

package/assets/core/ViewModel.ts

@@ -57,10 +57,10 @@ interface ICollectViewEvents {
 }
 
 // 全局存储绑定关系: { className -> { uiProp: dataPath } }
-const bindingMap = new Map<string, Map<string, IBindingData>>();
+const bindingMap = new Map<any, Map<string, IBindingData>>();
 const baseData = 'viewModel'
 const skip = "$"
-export const refMap: Map<string, string[]> = new Map();
+export const refMap: Map<any, string[]> = new Map();
 
 // const comType = {
 //     "cc.Sprite": typeof Sprite,
@@ -82,13 +82,11 @@ export function BindViewModel<T extends new () => any>(constructor: T) {
          * 重载onload 注入更新
          */
         target.prototype.onLoad = function () {
-            onLoad.call(this);
-            const className = js.getClassName(target);
+            const className = target.prototype//js.getClassName(target);
             if (!bindingMap.has(className)) {
                 bindingMap.set(className, new Map());
             }
             this.className = className;
-            //console.log('onLoad我的', this.node.name)
             if (!this._bindings) this._bindings = [];
 
             const map = bindingMap.get(className)
@@ -109,13 +107,13 @@ export function BindViewModel<T extends new () => any>(constructor: T) {
                 const data = map.get(propertyKey)
                 updateStatus(data, com, value_data, this);
             }
-
             // 创建实例并转为响应式
             const vm_data = 'viewModel'
             const instance = new constructor();
             this[vm_data] = this._makeReactive(instance, vm_data);
-
             this.onLoadFinish();
+            onLoad.call(this);
+
         };
     };
 
@@ -130,7 +128,7 @@ export function BindViewModel<T extends new () => any>(constructor: T) {
 export function Bind<T extends Component>(path?: string, param?: IBindingDataEvents) {
     const dataPath = baseData + '.' + path;
     return function (target: any, propertyKey: string) {
-        const className = js.getClassName(target);
+        const className = target.constructor.prototype
         const data: IBindingData = {
             propertyKey: propertyKey,
             dataPath: dataPath, type: className, reset: param?.reset, event: param?.event,
@@ -152,7 +150,7 @@ export function Bind<T extends Component>(path?: string, param?: IBindingDataEve
 export function BindTable<T extends Component>(dataPath: string, param?: ITableViewEvents) {
     dataPath = baseData + '.' + dataPath;
     return function (target: any, propertyKey: string) {
-        const className = js.getClassName(target.constructor);
+        const className = target
         const data: IBindingData = {
             propertyKey: propertyKey,
 
@@ -171,8 +169,7 @@ export function BindTable<T extends Component>(dataPath: string, param?: ITableV
 export function BindCollect<T extends Component>(dataPath: string, param?: ICollectViewEvents) {
     dataPath = baseData + '.' + dataPath;
     return function (target: any, propertyKey: string) {
-        const className = js.getClassName(target.constructor);
-
+        const className = target
         const data: IBindingData = {
             propertyKey: propertyKey,
             dataPath: dataPath, type: null,
@@ -203,7 +200,20 @@ export function ViewModel<T extends new (...args: any[]) => Component>(Base: T)
         touch_slide = 'CALL_SLIDE_EVENT'
         touch_toggle = 'CALL_TOGGLE_EVENT'
         touch_editbox = 'CALL_EDITBOX_EVENT'
-        className: string = ''
+        className: any
+
+        /**ui配置 */
+        config: {
+            module: string;
+            layer: string;
+            path: string;
+            bundle: string;
+            name?: string;/**窗口名称 */
+            index?: number;
+            is_load_sub?: boolean;
+            /**是否记录-不记录可重复打开窗口 */
+            is_record?: boolean;
+        };
         // 创建响应式数据
         _makeReactive<T extends object>(obj: T, pathPrefix: string): T {
             const self = this as any;
@@ -251,7 +261,7 @@ export function ViewModel<T extends new (...args: any[]) => Component>(Base: T)
                 if (fullPath === dataPath) {
                     const com = this[uiProp]
                     if (com) {
-                        const classname = js.getClassName(this)
+                        const classname = this.constructor.prototype
                         const data = bindingMap.get(classname).get(uiProp)
                         const value = this._getNestedValue(this, data.dataPath);
                         updateStatus(data, com, value, this)
@@ -269,6 +279,13 @@ export function ViewModel<T extends new (...args: any[]) => Component>(Base: T)
 
         }
 
+        protected onLoad(): void {
+            super.onLoad()
+            const module = this.config.module;
+            const name = this.config.name.replace('Window', '');
+            const manager: any = (js.getClassByName(`${module}Manager`))
+            manager.Ins[`${name}Data`] = this.viewModel
+        }
         // 在 withDataBinding 返回的 class 中
         protected onDestroy(): void {
             this.unbindViewModel();
@@ -666,8 +683,7 @@ function updateStatus(data: IBindingData, com: Component, value: any, self: any)
 
 // 定义装饰器
 export function Ref(target: any, propertyKey: string) {
-    const className = js.getClassName(target)
-    if (!refMap.has(className)) { refMap.set(className, []) }
-    const refList = refMap.get(className)
+    if (!refMap.has(target)) { refMap.set(target, []) }
+    const refList = refMap.get(target)
     refList.push(propertyKey)
 }

package/package.json

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