@shijiu/jsview-vue 2.1.476-test.0 → 2.1.482-test.0

package/bin/jsview-vue.mjs

@@ -2367,7 +2367,7 @@ class RenderItem {
     }
   }
   onTap = computed(() => {
-    return this.enableTap ? { click: this.onClick.bind(this) } : {};
+    return this.enableTap ? this.onClick.bind(this) : null;
   });
   onClick() {
     if (this.mounted.value) {
@@ -2658,6 +2658,14 @@ class ConditionPackBuilder {
     }
     return this._BuildPack(ConditionSetBuilder.OnNextTick(tickGap, this._CommonInfo));
   }
+  /** 指定的swapcount前才能执行 */
+  onSwapCount() {
+    if (!this._CheckCommonInfo()) {
+      return null;
+    }
+    this._CommonInfoValid = false;
+    return this._BuildPack(ConditionSetBuilder.onSwapCount(0, this._CommonInfo));
+  }
   onDragStart() {
     if (!this._CheckCommonInfo()) {
       return null;
@@ -2714,6 +2722,13 @@ class ConditionPackBuilder {
     this._CommonInfoValid = false;
     return this._BuildPack(ConditionSetBuilder.OnFlingCancel(this._CommonInfo, this._ContorlSlefNexus.token));
   }
+  touchCount(count) {
+    if (!this._CheckCommonInfo()) {
+      return null;
+    }
+    this._CommonInfoValid = false;
+    return this._BuildPack(ConditionSetBuilder.TouchCount(this._CommonInfo, count));
+  }
   _CheckCommonInfo() {
     if (!this._CommonInfoValid) {
       console.error("Error: must call from new conditoin()");
@@ -3200,7 +3215,7 @@ class CallbackManager {
       }
     }
   }
-  invokeCallback(id, actorState) {
+  invokeCallback(id, actorState, customDataStr, nexusCustomDataStr) {
     let callbackObj = this._CallbackMap.get(id);
     if (callbackObj) {
       if (callbackObj.once) {
@@ -3209,7 +3224,7 @@ class CallbackManager {
         callbackObj.times++;
       }
       try {
-        callbackObj.funcRef?.(actorState);
+        callbackObj.funcRef?.(actorState, customDataStr, nexusCustomDataStr);
       } catch (e) {
         console.error("Error: callback error", e);
       }
@@ -3256,6 +3271,9 @@ class ActorControl {
     this._SharedQuickActionPackBuilder = new ActorPackBuilder(this._Callbacks, this._SelfNexusRecv);
     this._StatePackBuilder = new StatePackBuilder();
   }
+  // debugGetAnimId() {
+  //   return this._BindAnim?.AnimNativeId;
+  // }
   bindForgeView(bindView, instantActive) {
     this._BindView = bindView;
     if (instantActive) {
@@ -3346,7 +3364,7 @@ class ActorControl {
         if (renderBreakId != 0) {
           FinishRenderBreak(renderBreakId);
         }
-        this._Callbacks.invokeCallback(echoRet["eTkn"], retJsonObject);
+        this._Callbacks.invokeCallback(echoRet["eTkn"], retJsonObject, echoRet["cds"], echoRet["ncds"]);
       }
     }
   }
@@ -3729,10 +3747,7 @@ const setup = (props, itemRender, locateDiv, renderData, slideDiv, slideDivLeft,
       updateHandler = pageUpdater.update(
         metroTemplate,
         visibleInfo.startWithPadding - props.keepTraceRange * pageRange,
-        Math.min(
-          visibleInfo.startMax + visibleInfo.range + visibleInfo.padding.end - 1,
-          visibleInfo.endWithPadding + props.keepTraceRange * pageRange
-        ),
+        visibleInfo.endWithPadding + props.keepTraceRange * pageRange,
         focusId,
         mergeTmp,
         permanentItemList
@@ -3979,6 +3994,7 @@ const setup = (props, itemRender, locateDiv, renderData, slideDiv, slideDivLeft,
     if (id == focusId) {
       return;
     }
+    tryCancelDelayLoad();
     templateItemAdder.tryAddItemById(id);
     let next_focus_item = getItemById(id);
     if (next_focus_item) {
@@ -4059,6 +4075,7 @@ const setup = (props, itemRender, locateDiv, renderData, slideDiv, slideDivLeft,
     enterFocusRect = rect;
   };
   const slideTo = (position, doAnim) => {
+    tryCancelDelayLoad();
     templateItemAdder.tryAddItemByPosition(position);
     if (typeof position !== "undefined" && position != null) {
       let animObj = null;
@@ -4093,6 +4110,7 @@ const setup = (props, itemRender, locateDiv, renderData, slideDiv, slideDivLeft,
     }
   };
   const slideToDiv = (div, doAnim) => {
+    tryCancelDelayLoad();
     if (div) {
       const item_layout = div.jsvGetRelativePosition(toRaw(locateDiv.value));
       const direction = 1;
@@ -4187,10 +4205,7 @@ const setup = (props, itemRender, locateDiv, renderData, slideDiv, slideDivLeft,
     const updater = pageUpdater.update(
       metroTemplate,
       visibleInfo.startWithPadding - props.keepTraceRange * pageRange,
-      Math.min(
-        visibleInfo.startMax + visibleInfo.range + visibleInfo.padding.end - 1,
-        visibleInfo.endWithPadding + props.keepTraceRange * pageRange
-      ),
+      visibleInfo.endWithPadding + props.keepTraceRange * pageRange,
       focusId,
       false,
       permanentItemList
@@ -4212,6 +4227,7 @@ const setup = (props, itemRender, locateDiv, renderData, slideDiv, slideDivLeft,
     };
   };
   const moveFocus = (direction) => {
+    tryCancelDelayLoad();
     if (direction == "left" || direction == 37 || direction == EdgeDirection.left) {
       _moveToNext(-1, 0);
     } else if (direction == "right" || direction == 39 || direction == EdgeDirection.right) {
@@ -4247,19 +4263,19 @@ const setup = (props, itemRender, locateDiv, renderData, slideDiv, slideDivLeft,
     unlockSlide,
     lock,
     unlock,
+    refreshData,
+    moveFocus,
     slideTo,
+    slideToItem,
+    slideToDiv,
     setFocusId,
     setFocusByUid,
-    getFocusBlockRef,
     setEnterFocusId,
     setEnterFocusRect,
-    slideToItem,
-    slideToDiv,
-    refreshData,
+    setZIndex,
+    getFocusBlockRef,
     getVisibleItems,
-    moveFocus,
     getCustomerDataSize,
-    setZIndex,
     getCurrentFocusIndex,
     getCurMode,
     getTemplatePosition
@@ -4408,6 +4424,7 @@ const setup = (props, itemRender, locateDiv, renderData, slideDiv, slideDivLeft,
     if (onKeyDownLock) {
       return true;
     }
+    tryCancelDelayLoad();
     if (mode.getMode() == TOUCH_MODE) {
       if (mode.duringTouch()) {
         return true;
@@ -4681,8 +4698,8 @@ const setup = (props, itemRender, locateDiv, renderData, slideDiv, slideDivLeft,
         } else {
           const updater = pageUpdater.update(
             metroTemplate,
-            cur_visible_start2,
-            cur_visible_start2 + visibleInfo.range + visibleInfo.padding.end - 1,
+            visibleInfo.startWithPadding - props.keepTraceRange * pageRange,
+            visibleInfo.endWithPadding + props.keepTraceRange * pageRange,
             next_focus_item.id,
             false,
             permanentItemList
@@ -4922,6 +4939,7 @@ const setup = (props, itemRender, locateDiv, renderData, slideDiv, slideDivLeft,
   const touchLoadItemRect = visibleInfo.range;
   const reachAnchorGroup = 2;
   const wallConditionGroup = 1;
+  const touchCountGroup = 3;
   let divPos = -1;
   let frameCount = -1;
   const getVisibleStart = (moveInfo) => {
@@ -4934,7 +4952,7 @@ const setup = (props, itemRender, locateDiv, renderData, slideDiv, slideDivLeft,
       return -(divPos + Math.round(moveInfo.xPos));
     }
   };
-  const mergeTouchSlideToSlideDiv = () => {
+  const mergeTouchSlideToSlideDiv = (touchCount) => {
     if (vertical) {
       slideDivTop.value = -visibleInfo.start;
     } else {
@@ -4945,10 +4963,17 @@ const setup = (props, itemRender, locateDiv, renderData, slideDiv, slideDivLeft,
       actorController.state().removeConditionByGroup(wallConditionGroup),
       actorController.condition(wallConditionGroup, true).boxPosition(walls.left, walls.top, walls.right, walls.bottom).then([actorController.state().setHitWallOverflow()]),
       //TODO 通过prop设置哪个方向overflow
-      actorController.action().teleportTo(0, 0)
+      actorController.condition(touchCountGroup, false).touchCount(touchCount).then([
+        actorController.action().teleportTo(0, 0)
+      ])
+    ]);
+    actorController.run([
+      actorController.condition().onNextTick().then([
+        actorController.state().removeConditionByGroup(touchCountGroup)
+      ])
     ]);
   };
-  const onTouchDown = (data) => {
+  const onTouchDown = (data, customData, nexusCustomData) => {
     mode.touchStart();
     mode.flingEnd();
     const t = 100;
@@ -4966,8 +4991,8 @@ const setup = (props, itemRender, locateDiv, renderData, slideDiv, slideDivLeft,
     templateItemAdder.tryAddItemByPosition(visibleInfo.end + visibleInfo.range);
     const updater = pageUpdater.update(
       metroTemplate,
-      visibleInfo.startWithPadding - visibleInfo.range,
-      visibleInfo.endWithPadding + visibleInfo.range,
+      visibleInfo.startWithPadding - props.keepTraceRange * pageRange,
+      visibleInfo.endWithPadding + props.keepTraceRange * pageRange,
       0,
       false,
       permanentItemList
@@ -4998,32 +5023,48 @@ const setup = (props, itemRender, locateDiv, renderData, slideDiv, slideDivLeft,
       mode.touchEnd();
     }
   };
-  const onDragStart = (data) => {
+  const onDragStart = (data, customData, nexusCustomData) => {
     mode.dragStart();
     visibleInfo.start = getVisibleStart(data);
   };
-  const onDragEnd = (data) => {
+  const onDragEnd = (data, customData, nexusCustomData) => {
     visibleInfo.start = getVisibleStart(data);
     actorController.run([
       actorController.state().removeConditionByGroup(reachAnchorGroup)
     ]);
-    mergeTouchSlideToSlideDiv();
+    let touchCount = -1;
+    if (nexusCustomData) {
+      try {
+        touchCount = JSON.parse(nexusCustomData).tc;
+      } catch (e) {
+        touchCount = -1;
+      }
+    }
+    mergeTouchSlideToSlideDiv(touchCount);
     updateRenderItems(false, false);
     mode.touchEnd();
   };
-  const onFlingStart = (data) => {
+  const onFlingStart = (data, customData, nexusCustomData) => {
     mode.flingStart();
     visibleInfo.start = getVisibleStart(data);
     updateRenderItems(true, true);
   };
-  const onFlingProgress = (data) => {
+  const onFlingProgress = (data, customData, nexusCustomData) => {
     visibleInfo.start = getVisibleStart(data);
     updateRenderItems(true, true);
   };
-  const onFlingEnd = (data) => {
+  const onFlingEnd = (data, customData, nexusCustomData) => {
     visibleInfo.start = getVisibleStart(data);
     if (mode.duringFling()) {
-      mergeTouchSlideToSlideDiv();
+      let touchCount = -1;
+      if (nexusCustomData) {
+        try {
+          touchCount = JSON.parse(nexusCustomData).tc;
+        } catch (e) {
+          touchCount = -1;
+        }
+      }
+      mergeTouchSlideToSlideDiv(touchCount);
       updateRenderItems(false, false);
       mode.flingEnd();
       mode.touchEnd();
@@ -5050,8 +5091,8 @@ const setup = (props, itemRender, locateDiv, renderData, slideDiv, slideDivLeft,
     templateItemAdder.tryAddItemByPosition(visibleInfo.start + visibleInfo.range);
     const updater = pageUpdater.update(
       metroTemplate,
-      expand ? visibleInfo.start - visibleInfo.range : visibleInfo.startWithPadding,
-      expand ? visibleInfo.start + 2 * visibleInfo.range : visibleInfo.endWithPadding,
+      visibleInfo.startWithPadding - props.keepTraceRange * pageRange,
+      visibleInfo.endWithPadding + props.keepTraceRange * pageRange,
       0,
       true,
       permanentItemList
@@ -5089,7 +5130,7 @@ const setup = (props, itemRender, locateDiv, renderData, slideDiv, slideDivLeft,
       //TODO 通过prop设置哪个方向overflow
     ]);
   };
-  pageUpdater = new PageUpdater(_updatePage);
+  pageUpdater = new PageUpdater(_updatePage, props.name);
   visibleInfo.range = vertical ? widgetRectInfo.contentHeight : widgetRectInfo.contentWidth;
   visibleInfo.padding = vertical ? { start: widgetRectInfo.padding.top, end: widgetRectInfo.padding.bottom } : { start: widgetRectInfo.padding.left, end: widgetRectInfo.padding.right };
   if (props.provideData) {
@@ -5134,6 +5175,20 @@ const setup = (props, itemRender, locateDiv, renderData, slideDiv, slideDivLeft,
     permanentItemList
   );
   initUpdater.apply();
+  const delayLoadHandler = setTimeout(() => {
+    const updateHandler = pageUpdater.update(
+      metroTemplate,
+      visibleInfo.startWithPadding - props.keepTraceRange * pageRange,
+      visibleInfo.endWithPadding + props.keepTraceRange * pageRange,
+      focusId,
+      false,
+      permanentItemList
+    );
+    updateHandler.apply();
+  }, 200);
+  const tryCancelDelayLoad = () => {
+    clearTimeout(delayLoadHandler);
+  };
   onMounted(() => {
     _changeFocusId(focusId, false);
     mounted = true;
@@ -5155,6 +5210,7 @@ const setup = (props, itemRender, locateDiv, renderData, slideDiv, slideDivLeft,
   onUpdated(() => {
   });
   onBeforeUnmount(() => {
+    tryCancelDelayLoad();
     mounted = false;
   });
   return {
@@ -5554,7 +5610,7 @@ const _sfc_main$G = {
     },
     keepTraceRange: {
       type: Number,
-      default: 0
+      default: 3
     },
     onScroll: {
       type: Function
@@ -5689,6 +5745,7 @@ const _sfc_main$G = {
                         key: pageUpdateToken.value + "_" + item.index,
                         ref_for: true,
                         ref: item.divRef,
+                        "data-jsv-vw-test-rect": "1",
                         style: normalizeStyle({
                           left: item.templateInfo.left,
                           top: item.templateInfo.top,
@@ -5866,7 +5923,7 @@ const _sfc_main$F = {
     },
     keepTraceRange: {
       type: Number,
-      default: 0
+      default: 3
     },
     onScroll: {
       type: Function
@@ -6000,6 +6057,7 @@ const _sfc_main$F = {
                         key: pageUpdateToken.value + "_" + item.index,
                         ref_for: true,
                         ref: item.divRef,
+                        "data-jsv-vw-test-rect": "1",
                         style: normalizeStyle({
                           left: item.templateInfo.left,
                           top: item.templateInfo.top,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shijiu/jsview-vue",
-  "version": "2.1.476-test.0",
+  "version": "2.1.482-test.0",
   "license": "MIT",
   "repository": "system/jsview-framework",
   "author": "mengxk",

package/utils/JsViewEngineWidget/MetroWidget/ListWidget.vue

@@ -123,7 +123,7 @@ const props = defineProps({
   },
   keepTraceRange: {
     type: Number,
-    default: 0,
+    default: 3,
   },
   onScroll: {
     type: Function,
@@ -255,6 +255,7 @@ defineExpose(exportObject);
                 v-for="(item, index) in renderData"
                 :key="pageUpdateToken + '_' + item.index"
                 :ref="item.divRef"
+                data-jsv-vw-test-rect="1"
                 :style="{
                   left: item.templateInfo.left,
                   top: item.templateInfo.top,

package/utils/JsViewEngineWidget/MetroWidget/MetroWidget.vue

@@ -358,7 +358,7 @@ const props = defineProps({
   },
   keepTraceRange: {
     type: Number,
-    default: 0,
+    default: 3,
   },
   onScroll: {
     type: Function,
@@ -490,6 +490,7 @@ defineExpose(exportObject);
                 v-for="(item, index) in renderData"
                 :key="pageUpdateToken + '_' + item.index"
                 :ref="item.divRef"
+                data-jsv-vw-test-rect="1"
                 :style="{
                   left: item.templateInfo.left,
                   top: item.templateInfo.top,

package/utils/JsViewEngineWidget/MetroWidget/MetroWidgetSetup.js

@@ -201,6 +201,7 @@ export const setup = (
 
     let existOnFocusChange = false;
     let targetVisibleStart = visibleInfo.start;
+
     //先遍历寻找slide task, 确认目标位置. 有多个slide task时取最后一个
     taskList.forEach(i => {
       if (i.type == TaskType.SLIDE) {
@@ -314,13 +315,7 @@ export const setup = (
       updateHandler = pageUpdater.update(
         metroTemplate,
         visibleInfo.startWithPadding - props.keepTraceRange * pageRange,
-        Math.min(
-          visibleInfo.startMax +
-          visibleInfo.range +
-          visibleInfo.padding.end -
-          1,
-          visibleInfo.endWithPadding + props.keepTraceRange * pageRange
-        ),
+        visibleInfo.endWithPadding + props.keepTraceRange * pageRange,
         focusId,
         mergeTmp,
         permanentItemList
@@ -591,6 +586,8 @@ export const setup = (
     if (id == focusId) {
       return;
     }
+    //有外部触发的滚动时, 取消load
+    tryCancelDelayLoad();
     templateItemAdder.tryAddItemById(id);
     let next_focus_item = getItemById(id);
     if (next_focus_item) {
@@ -679,6 +676,8 @@ export const setup = (
   };
 
   const slideTo = (position, doAnim) => {
+    //有外部触发的滚动时, 取消load
+    tryCancelDelayLoad();
     templateItemAdder.tryAddItemByPosition(position);
     if (
       typeof position !== "undefined" &&
@@ -720,6 +719,8 @@ export const setup = (
   };
 
   const slideToDiv = (div, doAnim) => {
+    //有外部触发的滚动时, 取消load
+    tryCancelDelayLoad();
     if (div) {
       const item_layout = div.jsvGetRelativePosition(toRaw(locateDiv.value));
       const direction = 1;
@@ -822,10 +823,7 @@ export const setup = (
     const updater = pageUpdater.update(
       metroTemplate,
       visibleInfo.startWithPadding - props.keepTraceRange * pageRange,
-      Math.min(
-        visibleInfo.startMax + visibleInfo.range + visibleInfo.padding.end - 1,
-        visibleInfo.endWithPadding + props.keepTraceRange * pageRange
-      ),
+      visibleInfo.endWithPadding + props.keepTraceRange * pageRange,
       focusId,
       false,
       permanentItemList
@@ -849,6 +847,8 @@ export const setup = (
   };
 
   const moveFocus = (direction) => {
+    //有外部触发的滚动时, 取消load
+    tryCancelDelayLoad();
     if (direction == "left" || direction == 37 || direction == EdgeDirection.left) {
       _moveToNext(-1, 0);
     } else if (direction == "right" || direction == 39 || direction == EdgeDirection.right) {
@@ -891,19 +891,19 @@ export const setup = (
     unlockSlide,
     lock,
     unlock,
+    refreshData,
+    moveFocus,
     slideTo,
+    slideToItem,
+    slideToDiv,
     setFocusId,
     setFocusByUid,
-    getFocusBlockRef,
     setEnterFocusId,
     setEnterFocusRect,
-    slideToItem,
-    slideToDiv,
-    refreshData,
+    setZIndex,
+    getFocusBlockRef,
     getVisibleItems,
-    moveFocus,
     getCustomerDataSize,
-    setZIndex,
     getCurrentFocusIndex,
     getCurMode,
     getTemplatePosition,
@@ -1108,6 +1108,7 @@ export const setup = (
     if (onKeyDownLock) {
       return true;
     }
+    tryCancelDelayLoad();
     if (mode.getMode() == TOUCH_MODE) {
       if (mode.duringTouch()) {
         //touch过程中的按键不处理
@@ -1414,8 +1415,8 @@ export const setup = (
         } else {
           const updater = pageUpdater.update(
             metroTemplate,
-            cur_visible_start,
-            cur_visible_start + visibleInfo.range + visibleInfo.padding.end - 1,
+            visibleInfo.startWithPadding - props.keepTraceRange * pageRange,
+            visibleInfo.endWithPadding + props.keepTraceRange * pageRange,
             next_focus_item.id,
             false,
             permanentItemList
@@ -1731,6 +1732,7 @@ export const setup = (
   const touchLoadItemRect = visibleInfo.range;
   const reachAnchorGroup = 2;
   const wallConditionGroup = 1;
+  const touchCountGroup = 3;
 
   let divPos = -1;
   let frameCount = -1;
@@ -1745,7 +1747,8 @@ export const setup = (
     }
   }
 
-  const mergeTouchSlideToSlideDiv = () => {
+  const mergeTouchSlideToSlideDiv = (touchCount) => {
+    // console.log("touchtest", props.name, `touchToDiv div: ${slideDivTop.value}, visibleStart:${visibleInfo.start} swapCount: ${Forge.sFrameCount.count}`)
     if (vertical) {
       slideDivTop.value = -visibleInfo.start;
     } else {
@@ -1760,14 +1763,27 @@ export const setup = (
         .boxPosition(walls.left, walls.top, walls.right, walls.bottom)
         .then([actorController.state().setHitWallOverflow()]), //TODO 通过prop设置哪个方向overflow
       actorController
-        .action()
-        .teleportTo(0, 0)]);
+        .condition(touchCountGroup, false)
+        .touchCount(touchCount)
+        .then([
+          actorController
+            .action()
+            .teleportTo(0, 0)
+        ])
+    ]);
+    //下一帧删除touchCount
+    actorController.run([
+      actorController.condition().onNextTick().then([
+        actorController.state().removeConditionByGroup(touchCountGroup),
+      ])
+    ])
   }
 
-  const onTouchDown = (data) => {
+  const onTouchDown = (data, customData, nexusCustomData) => {
     mode.touchStart();
     mode.flingEnd();
-
+    // console.log("touchtest", `${props.name} animId:${debugAnimId} viewId:${debugViewId}`,
+    //  "onTouchDown", data, customData, nexusCustomData)
     const t = 100;
     const offsetThreshold = {
       left: vertical ? undefined : t,
@@ -1789,13 +1805,12 @@ export const setup = (
     //blur item
     onItemBlur(getItemById(focusId));
 
-    // visibleInfo.start = getVisibleStart(data);
     templateItemAdder.tryAddItemByPosition(visibleInfo.end + visibleInfo.range);
 
     const updater = pageUpdater.update(
       metroTemplate,
-      visibleInfo.startWithPadding - visibleInfo.range,
-      visibleInfo.endWithPadding + visibleInfo.range,
+      visibleInfo.startWithPadding - props.keepTraceRange * pageRange,
+      visibleInfo.endWithPadding + props.keepTraceRange * pageRange,
       0,
       false,
       permanentItemList
@@ -1832,37 +1847,56 @@ export const setup = (
     }
   }
 
-  const onDragStart = (data) => {
+  const onDragStart = (data, customData, nexusCustomData) => {
     mode.dragStart()
     visibleInfo.start = getVisibleStart(data);
   }
 
-  const onDragEnd = (data) => {
+  const onDragEnd = (data, customData, nexusCustomData) => {
     visibleInfo.start = getVisibleStart(data);
+    // console.log("touchtest", props.name + " animId:" + debugAnimId,
+    //  `onDragEnd ${visibleInfo.start}`)
     actorController.run([
       actorController.state().removeConditionByGroup(reachAnchorGroup),
     ]);
-    mergeTouchSlideToSlideDiv();
+    let touchCount = -1;
+    if (nexusCustomData) {
+      try {
+        touchCount = JSON.parse(nexusCustomData).tc;
+      } catch (e) {
+        touchCount = -1;
+      }
+    }
+    mergeTouchSlideToSlideDiv(touchCount);
     updateRenderItems(false, false);
     mode.touchEnd()
   }
 
-  const onFlingStart = (data) => {
+  const onFlingStart = (data, customData, nexusCustomData) => {
     mode.flingStart();
     visibleInfo.start = getVisibleStart(data);
     updateRenderItems(true, true);
   }
 
-  const onFlingProgress = (data) => {
+  const onFlingProgress = (data, customData, nexusCustomData) => {
     visibleInfo.start = getVisibleStart(data);
     updateRenderItems(true, true);
   }
 
-  const onFlingEnd = (data) => {
+  const onFlingEnd = (data, customData, nexusCustomData) => {
     visibleInfo.start = getVisibleStart(data);
+    // console.log("touchtest", props.name, `onFlingEnd ${visibleInfo.start}`, data, customData, nexusCustomData)
     //记录拖拽的距离
     if (mode.duringFling()) {
-      mergeTouchSlideToSlideDiv();
+      let touchCount = -1;
+      if (nexusCustomData) {
+        try {
+          touchCount = JSON.parse(nexusCustomData).tc;
+        } catch (e) {
+          touchCount = -1;
+        }
+      }
+      mergeTouchSlideToSlideDiv(touchCount);
       updateRenderItems(false, false);
       mode.flingEnd();
       mode.touchEnd();
@@ -1891,8 +1925,8 @@ export const setup = (
     templateItemAdder.tryAddItemByPosition(visibleInfo.start + visibleInfo.range);
     const updater = pageUpdater.update(
       metroTemplate,
-      expand ? visibleInfo.start - visibleInfo.range : visibleInfo.startWithPadding,
-      expand ? visibleInfo.start + 2 * visibleInfo.range : visibleInfo.endWithPadding,
+      visibleInfo.startWithPadding - props.keepTraceRange * pageRange,
+      visibleInfo.endWithPadding + props.keepTraceRange * pageRange,
       0,
       true,
       permanentItemList
@@ -1914,12 +1948,17 @@ export const setup = (
     }
   }
 
+  //TODO debug
+  // let debugAnimId = -1;
+  // let debugViewId = -1
   const initTouch = () => {
     actorController = new ActorControl();
     const divView = touchDiv.value.jsvGetProxyView();
     actorController.bindForgeView(divView, true);
     divView.DragEnables?.(4 | 0x08 | 0x10); // 只激活drag
-
+    // debugAnimId = actorController.debugGetAnimId();
+    // debugViewId = divView.ViewId;
+    // console.log("touchtest", props.name, `animId:${debugAnimId} viewId:${debugViewId}`);
     const walls = getTouchWall();
     //注册回调
     actorController.run([
@@ -1960,7 +1999,7 @@ export const setup = (
   }
 
   //init
-  pageUpdater = new PageUpdater(_updatePage);
+  pageUpdater = new PageUpdater(_updatePage, props.name);
   visibleInfo.range = vertical
     ? widgetRectInfo.contentHeight
     : widgetRectInfo.contentWidth;
@@ -2005,6 +2044,7 @@ export const setup = (
   focusId = init_focus_id;
   visibleInfo.start = cur_visible_start;
 
+  //保证创建速度, 你描画一屏
   const initUpdater = pageUpdater.update(
     metroTemplate,
     visibleInfo.startWithPadding,
@@ -2014,6 +2054,21 @@ export const setup = (
     permanentItemList
   );
   initUpdater.apply();
+  //延时加载剩余屏
+  const delayLoadHandler = setTimeout(() => {
+    const updateHandler = pageUpdater.update(
+      metroTemplate,
+      visibleInfo.startWithPadding - props.keepTraceRange * pageRange,
+      visibleInfo.endWithPadding + props.keepTraceRange * pageRange,
+      focusId,
+      false,
+      permanentItemList
+    );
+    updateHandler.apply();
+  }, 200);
+  const tryCancelDelayLoad = () => {
+    clearTimeout(delayLoadHandler);
+  }
 
   onMounted(() => {
     _changeFocusId(focusId, false);
@@ -2038,6 +2093,7 @@ export const setup = (
   onUpdated(() => { });
 
   onBeforeUnmount(() => {
+    tryCancelDelayLoad();
     mounted = false;
   });
 

package/utils/JsViewEngineWidget/MetroWidget/RenderItem.ts

@@ -115,7 +115,7 @@ export class RenderItem {
   }
 
   public readonly onTap = computed(() => {
-    return this.enableTap ? { click: this.onClick.bind(this) } : {};
+    return this.enableTap ? this.onClick.bind(this) : null;
   })
 
   public onClick(): boolean {

package/utils/JsViewVueWidget/JsvFreeMoveActor/ActorControl.ts

@@ -33,6 +33,10 @@ class ActorControl {
     this._StatePackBuilder = new StatePackBuilder();
   }
 
+  // debugGetAnimId() {
+  //   return this._BindAnim?.AnimNativeId;
+  // }
+
   bindForgeView(bindView: any, instantActive: boolean) {
     this._BindView = bindView;
 
@@ -138,8 +142,8 @@ class ActorControl {
 
   _OnEchoEvent(retJson: string) {
     // 遇到layout后仍然会因为新broadcast有动作时，一帧中可能会有多次回调
-    let retJsonObject: Object = JSON.parse(retJson);
-    let echoRetList = retJsonObject["retList"];
+    let retJsonObject: any = JSON.parse(retJson);
+    let echoRetList: Array<any> = retJsonObject["retList"];
     if (echoRetList) {
       for (let echoRet of echoRetList) {
         let renderBreakId = echoRet["rbTkn"];
@@ -147,7 +151,7 @@ class ActorControl {
           // 标识此RenderBreak完成
           FinishRenderBreak(renderBreakId);
         }
-        this._Callbacks.invokeCallback(echoRet["eTkn"], retJsonObject);
+        this._Callbacks.invokeCallback(echoRet["eTkn"], retJsonObject, echoRet["cds"], echoRet["ncds"]);
       }
     }
   }

package/utils/JsViewVueWidget/JsvFreeMoveActor/CallbackManager.ts

@@ -49,7 +49,9 @@ class CallbackManager {
     }
   }
 
-  public invokeCallback(id: string, actorState: Object) {
+  public invokeCallback(id: string, actorState: Object, 
+    customDataStr: string | null | undefined, 
+    nexusCustomDataStr:string | null | undefined) {
     let callbackObj = this._CallbackMap.get(id);
     if (callbackObj) {
       if (callbackObj.once) {
@@ -58,7 +60,7 @@ class CallbackManager {
         callbackObj.times++;
       }
       try {
-        callbackObj.funcRef?.(actorState);
+        callbackObj.funcRef?.(actorState, customDataStr, nexusCustomDataStr);
       } catch (e) {
         // 规避 callback 执行出错导致流程执行不下去
         console.error("Error: callback error", e);

package/utils/JsViewVueWidget/JsvFreeMoveActor/SetCondition.ts

@@ -194,6 +194,16 @@ class ConditionPackBuilder {
     return this._BuildPack(ConditionSetBuilder.OnNextTick(tickGap, this._CommonInfo));
   }
 
+  /** 指定的swapcount前才能执行 */
+  onSwapCount() {
+    // CommonInfo 只能使用一次，规避多次使用问题
+    if (!this._CheckCommonInfo()) {
+      return null;
+    }
+    this._CommonInfoValid = false;
+    return this._BuildPack(ConditionSetBuilder.onSwapCount(0, this._CommonInfo));
+  }
+
   onDragStart() {
     if (!this._CheckCommonInfo()) {
       return null;
@@ -259,6 +269,14 @@ class ConditionPackBuilder {
     return this._BuildPack(ConditionSetBuilder.OnFlingCancel(this._CommonInfo, this._ContorlSlefNexus.token));
   }
 
+  touchCount(count: number) {
+    if (!this._CheckCommonInfo()) {
+      return null;
+    }
+    this._CommonInfoValid = false;
+    return this._BuildPack(ConditionSetBuilder.TouchCount(this._CommonInfo, count));
+  }
+
   _CheckCommonInfo(): boolean {
     if (!this._CommonInfoValid) {
       console.error("Error: must call from new conditoin()");