@cc-component/cc-ex-component 1.9.5 → 1.9.7

package/assets/core/ViewModel.ts

@@ -124,7 +124,7 @@ export function BindViewModel<T extends new () => any>(constructor: T) {
 
             this.onLoadFinish();
             onLoad.call(this);
-
+            this.onLoadFinished();
         };
     };
 
@@ -241,6 +241,8 @@ export function ViewModel<T extends new (...args: any[]) => Component>(Base: T)
             /**是否记录-不记录可重复打开窗口 */
             is_record?: boolean;
         };
+        isOnLoad: boolean = false
+        funcMap: Map<string, any> = new Map()
         // 创建响应式数据
         _makeReactive<T extends object>(obj: T, pathPrefix: string): T {
             const self = this as any;
@@ -332,6 +334,7 @@ export function ViewModel<T extends new (...args: any[]) => Component>(Base: T)
 
         protected onLoad(): void {
             super.onLoad()
+            this.isOnLoad = true;
             this.bindFunc()
             this.onTouch()
             this.managerData()
@@ -343,6 +346,11 @@ export function ViewModel<T extends new (...args: any[]) => Component>(Base: T)
         }
 
 
+
+        onLoadFinished() {
+            this.refreshFuncName()
+        }
+
         managerData() {
             ExComponentModule.EmitUIWindow(this.config, this.viewModel)
         }
@@ -361,13 +369,17 @@ export function ViewModel<T extends new (...args: any[]) => Component>(Base: T)
 
         private refreshData(key: string, value: any) {
             const funcName = bindingMapFunc.get(this.className)?.get(key)
-            if (this[funcName]) {
+            if (this.isOnLoad) {
                 this[funcName]?.(value)
             } else {
-                //console.error('没有找到方法：', funcName, this.node.name)
+                this.funcMap.set(funcName, value)
             }
         }
 
+        private refreshFuncName() {
+            this.funcMap.forEach((value, key) => { this[key]?.(value) })
+        }
+
         resetButtonScale(btn: Button) {
             if (btn.transition === Button.Transition.SCALE && ExComponentModule.EmitAnim()) {
                 if (btn[this.touch_start_scale]) {

package/assets/lib/collectView/lib_collect/yx-collection-view.ts

@@ -1,3 +1,4 @@
+import { Vec2 } from 'cc';
 import { _decorator, Component, Enum, Event, EventMouse, EventTouch, instantiate, Mask, math, Node, NodeEventType, NodePool, Prefab, ScrollView, UIOpacity, UITransform } from 'cc';
 const { ccclass, property, executionOrder, disallowMultiple, help } = _decorator;
 
@@ -1432,7 +1433,13 @@ export class YXCollectionView extends Component {
     private onScrollBegan() {
     }
 
-    private onScrolling() {
+    private onScrolling(sv: ScrollView) {
+        let maxOffset = sv.getMaxScrollOffset()
+        let minOffset = Vec2.ZERO
+        let curOffset = sv.getScrollOffset()
+        if (math.Vec2.distance(maxOffset, curOffset) < 0.01 || math.Vec2.distance(minOffset, curOffset) < 0.01)
+            sv.stopAutoScroll()
+
         // 在滚动过程中仅仅是标记更新状态，具体更新业务统一到 update 里面处理，但是 layout 设置了实时更新的情况时例外  
         if (this.layout.shouldUpdateAttributesForBoundsChange()) {
             this.reloadVisibleElements()

package/package.json

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