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

package/bin/jsview-vue.mjs

@@ -1,4 +1,4 @@
-import { ref, computed, toRaw, reactive, nextTick, onMounted, onUpdated, onBeforeUnmount, onBeforeUpdate, openBlock, createElementBlock, renderSlot, shallowRef, resolveComponent, normalizeStyle, createElementVNode, unref, createVNode, withCtx, Fragment, renderList, createCommentVNode, inject, provide, onUnmounted, onActivated, onDeactivated, createBlock, defineAsyncComponent, normalizeProps, guardReactiveProps, watchEffect, mergeProps, toDisplayString, watch, shallowReactive, withDirectives, vShow } from 'vue';
+import { ref, computed, toRaw, reactive, nextTick, onMounted, onUpdated, onBeforeUnmount, onBeforeUpdate, openBlock, createElementBlock, renderSlot, shallowRef, resolveComponent, normalizeStyle, createElementVNode, unref, mergeProps, toHandlers, createVNode, withCtx, Fragment, renderList, createCommentVNode, inject, provide, onUnmounted, onActivated, onDeactivated, createBlock, defineAsyncComponent, normalizeProps, guardReactiveProps, watchEffect, toDisplayString, watch, shallowReactive, withDirectives, vShow } from 'vue';
 import { Forge as Forge$1, ForgeExtension } from '@shijiu/jsview/dom/jsv-forge-define';
 import { createWebHashHistory, createMemoryHistory } from 'vue-router';
 import { Forge as Forge$2 } from '@shijiu/jsview/dom/jsv-forge-define.mjs';
@@ -132,6 +132,8 @@ class SeamlessSlide extends SlideSetting {
   constructor({
     startPercent = 0.2,
     endPercent = 0.8,
+    headRange = void 0,
+    tailRange = void 0,
     speed = defaultSpeed,
     duration = null,
     easing = defaultEasing,
@@ -141,6 +143,17 @@ class SeamlessSlide extends SlideSetting {
     super(SlideSetting.Type.SEAMLESS, speed, duration, easing, boundaryProtect);
     this.StartPercent = startPercent;
     this.EndPercent = endPercent;
+    if (typeof headRange !== "undefined") {
+      this.StartPercent = headRange;
+    }
+    if (typeof tailRange !== "undefined") {
+      this.EndPercent = tailRange;
+    }
+    if (this.StartPercent < 0 || this.StartPercent > 1 || this.EndPercent < 0 || this.EndPercent > 1) {
+      console.error(`SeamlessSlideSetting error: invalide value, startPercent(${this.StartPercent}) and endPercent(${this.EndPercent}) must between 0 and 1.`);
+      this.StartPercent = 0.2;
+      this.EndPercent = 0.8;
+    }
     this.FixFirstPage = fixFirstPage;
   }
 }
@@ -2417,7 +2430,10 @@ class RenderItem {
 class VisibleInfo {
   _start = 0;
   range = 0;
-  padding;
+  padding = {
+    start: 0,
+    end: 0
+  };
   _startMax = 0;
   set start(value) {
     this._start = value;
@@ -2722,6 +2738,13 @@ class ConditionPackBuilder {
     this._CommonInfoValid = false;
     return this._BuildPack(ConditionSetBuilder.OnFlingCancel(this._CommonInfo, this._ContorlSlefNexus.token));
   }
+  onFlingDrop() {
+    if (!this._CheckCommonInfo()) {
+      return null;
+    }
+    this._CommonInfoValid = false;
+    return this._BuildPack(ConditionSetBuilder.OnFlingDrop(this._CommonInfo, this._ContorlSlefNexus.token));
+  }
   touchCount(count) {
     if (!this._CheckCommonInfo()) {
       return null;
@@ -3564,6 +3587,16 @@ const setup = (props, itemRender, locateDiv, renderData, slideDiv, slideDivLeft,
     DRAG: 2,
     FLING: 3
   };
+  let innerKeepTraceRange = 0;
+  if (typeof props.keepTraceRange > 0) {
+    innerKeepTraceRange = props.keepTraceRange;
+  } else {
+    if (props.touchFlag > 0) {
+      innerKeepTraceRange = 3;
+    } else {
+      innerKeepTraceRange = 0;
+    }
+  }
   const modeForExport = ref(FOCUS_MODE);
   const mode = {
     _mode: FOCUS_MODE,
@@ -3627,6 +3660,7 @@ const setup = (props, itemRender, locateDiv, renderData, slideDiv, slideDivLeft,
   let visibleInfo = new VisibleInfo();
   let preSlideDirection = 0;
   let alreadyCallItemFocus = false;
+  let innerSlideSetting = props.slideSetting;
   const currentFocusIndex = ref(0);
   const DEFAULT_ANIMATION_DURATION = 200;
   const isItemVisible = (item) => {
@@ -3726,8 +3760,8 @@ const setup = (props, itemRender, locateDiv, renderData, slideDiv, slideDivLeft,
               easing: "",
               onStart: null,
               onEnd: null,
-              speed: props.slideSetting.Speed,
-              duration: props.slideSetting.Duration
+              speed: innerSlideSetting.Speed,
+              duration: innerSlideSetting.Duration
             };
           }
         }
@@ -3746,8 +3780,8 @@ const setup = (props, itemRender, locateDiv, renderData, slideDiv, slideDivLeft,
     taskManager.run(() => {
       updateHandler = pageUpdater.update(
         metroTemplate,
-        visibleInfo.startWithPadding - props.keepTraceRange * pageRange,
-        visibleInfo.endWithPadding + props.keepTraceRange * pageRange,
+        visibleInfo.startWithPadding - innerKeepTraceRange * pageRange,
+        visibleInfo.endWithPadding + innerKeepTraceRange * pageRange,
         focusId,
         mergeTmp,
         permanentItemList
@@ -3875,7 +3909,7 @@ const setup = (props, itemRender, locateDiv, renderData, slideDiv, slideDivLeft,
     );
   };
   const _slideTo = (target, animObj, updateParam = { mergeTmp: false }) => {
-    if (slideLock) {
+    if (slideLock || target == visibleInfo.start) {
       return;
     }
     ;
@@ -4081,10 +4115,10 @@ const setup = (props, itemRender, locateDiv, renderData, slideDiv, slideDivLeft,
       let animObj = null;
       if (doAnim) {
         animObj = {
-          easing: props.slideSetting.Easing,
+          easing: innerSlideSetting.Easing,
           onStart: null,
-          speed: props.slideSetting.Speed,
-          duration: props.slideSetting.Duration
+          speed: innerSlideSetting.Speed,
+          duration: innerSlideSetting.Duration
         };
       }
       _slideTo(position, animObj);
@@ -4130,8 +4164,8 @@ const setup = (props, itemRender, locateDiv, renderData, slideDiv, slideDivLeft,
         _slideTo(cur_slide, doAnim ? {
           easing: "",
           onStart: null,
-          speed: props.slideSetting.Speed,
-          duration: props.slideSetting.Duration,
+          speed: innerSlideSetting.Speed,
+          duration: innerSlideSetting.Duration,
           onEnd: null
         } : null);
       }
@@ -4204,8 +4238,8 @@ const setup = (props, itemRender, locateDiv, renderData, slideDiv, slideDivLeft,
     }
     const updater = pageUpdater.update(
       metroTemplate,
-      visibleInfo.startWithPadding - props.keepTraceRange * pageRange,
-      visibleInfo.endWithPadding + props.keepTraceRange * pageRange,
+      visibleInfo.startWithPadding - innerKeepTraceRange * pageRange,
+      visibleInfo.endWithPadding + innerKeepTraceRange * pageRange,
       focusId,
       false,
       permanentItemList
@@ -4213,6 +4247,7 @@ const setup = (props, itemRender, locateDiv, renderData, slideDiv, slideDivLeft,
     updater.apply();
     onItemFocus(getItemById(focusId), null);
     slideToItem(id2Index(focusId), false);
+    updateTouchBoxCondition();
   };
   const getVisibleItems = () => {
     const [visibleStart, visibleEnd] = metroTemplate.getVisibleItemList(
@@ -4258,6 +4293,13 @@ const setup = (props, itemRender, locateDiv, renderData, slideDiv, slideDivLeft,
   const unlockSlide = () => {
     slideLock = false;
   };
+  const setSlideSetting = (setting) => {
+    if (!setting) {
+      innerSlideSetting = props.slideSetting;
+    } else {
+      innerSlideSetting = setting;
+    }
+  };
   const exportObject = {
     lockSlide,
     unlockSlide,
@@ -4278,7 +4320,8 @@ const setup = (props, itemRender, locateDiv, renderData, slideDiv, slideDivLeft,
     getCustomerDataSize,
     getCurrentFocusIndex,
     getCurMode,
-    getTemplatePosition
+    getTemplatePosition,
+    setSlideSetting
   };
   const _calculateNearestItemByRect = (visibleSet, enter_rect_info) => {
     let edge_direction = enter_rect_info.direction;
@@ -4466,6 +4509,8 @@ const setup = (props, itemRender, locateDiv, renderData, slideDiv, slideDivLeft,
       metroTemplate.getTailItemIndex()
     )?.templateInfo;
     if (lastTemplateInfo) {
+      let preTouchW = touchDivSize.width;
+      let preTouchH = touchDivSize.height;
       if (vertical) {
         touchDivSize.width = props.width;
         touchDivSize.height = lastTemplateInfo.top + lastTemplateInfo.height - 1;
@@ -4473,7 +4518,9 @@ const setup = (props, itemRender, locateDiv, renderData, slideDiv, slideDivLeft,
         touchDivSize.width = lastTemplateInfo.left + lastTemplateInfo.width - 1;
         touchDivSize.height = props.height;
       }
-      resetDragRect(touchDivSize.width, touchDivSize.height);
+      if (preTouchW !== touchDivSize.width || preTouchH !== touchDivSize.height) {
+        updateTouchBoxCondition();
+      }
     }
   };
   const _onTemplateItemAdd = (customerData, templateItem, measuresObj) => {
@@ -4595,8 +4642,8 @@ const setup = (props, itemRender, locateDiv, renderData, slideDiv, slideDivLeft,
           {
             easing: "",
             onStart: null,
-            speed: props.slideSetting.Speed,
-            duration: props.slideSetting.Duration
+            speed: innerSlideSetting.Speed,
+            duration: innerSlideSetting.Duration
           },
           {
             mergeTmp: true
@@ -4685,27 +4732,31 @@ const setup = (props, itemRender, locateDiv, renderData, slideDiv, slideDivLeft,
       }
       onItemBlur(preFocusItem);
       onItemFocus(next_focus_item, preEdgeRect);
-      let cur_visible_start2 = _calculateVisibleStart(next_focus_item.templateInfo, vertical ? vertical_direction : horizontal_direction);
-      if (visibleInfo.start !== cur_visible_start2) {
-        if (next_focus_item.itemConfig.itemSlide == METRO_WIDGET.ITEM_SLIDE.ACT_ITEM_FOCUS) {
+      if (next_focus_item.itemConfig.itemSlide == METRO_WIDGET.ITEM_SLIDE.ACT_ITEM_FOCUS) {
+        let cur_visible_start2 = _calculateVisibleStart(
+          next_focus_item.templateInfo,
+          vertical ? vertical_direction : horizontal_direction,
+          preFocusItem.templateInfo
+        );
+        if (visibleInfo.start !== cur_visible_start2) {
           let animObj = {
             easing: "",
             onStart: null,
-            speed: props.slideSetting.Speed,
-            duration: props.slideSetting.Duration
+            speed: innerSlideSetting.Speed,
+            duration: innerSlideSetting.Duration
           };
           _slideTo(cur_visible_start2, animObj, { mergeTmp: false });
-        } else {
-          const updater = pageUpdater.update(
-            metroTemplate,
-            visibleInfo.startWithPadding - props.keepTraceRange * pageRange,
-            visibleInfo.endWithPadding + props.keepTraceRange * pageRange,
-            next_focus_item.id,
-            false,
-            permanentItemList
-          );
-          updater.applyTmp();
         }
+      } else {
+        const updater = pageUpdater.update(
+          metroTemplate,
+          visibleInfo.startWithPadding - innerKeepTraceRange * pageRange,
+          visibleInfo.endWithPadding + innerKeepTraceRange * pageRange,
+          next_focus_item.id,
+          false,
+          permanentItemList
+        );
+        updater.applyTmp();
       }
     } else {
       let x_off_set = vertical ? 0 : visibleInfo.start;
@@ -4753,32 +4804,44 @@ const setup = (props, itemRender, locateDiv, renderData, slideDiv, slideDivLeft,
   const normalizeVisibleStart = (origin, targetItem = null) => {
     let pos_key = vertical ? "top" : "left";
     let size_key = vertical ? "height" : "width";
-    let visible_start = origin;
-    if ((props.slideSetting.BoundaryProtect & SlideSetting.START_PROTECT) > 0) {
-      let boundary = 0;
-      const headTemplateInfo = getItemByIndex(0).templateInfo;
-      if (targetItem && (!headTemplateInfo.focusable || targetItem.index == headTemplateInfo.index) && targetItem[pos_key] + targetItem[size_key] <= visibleInfo.range) {
-        boundary = headTemplateInfo[size_key];
+    let visibleStart = origin;
+    if ((innerSlideSetting.BoundaryProtect & SlideSetting.START_PROTECT) > 0) {
+      if (visibleInfo.start >= 0) {
+        let boundary = 0;
+        const headTemplateInfo = getItemByIndex(0).templateInfo;
+        if (targetItem && (!headTemplateInfo.focusable || targetItem.index == headTemplateInfo.index) && targetItem[pos_key] + targetItem[size_key] <= visibleInfo.range) {
+          boundary = headTemplateInfo[size_key];
+        }
+        visibleStart = visibleStart < boundary ? 0 : visibleStart;
+      } else {
+        visibleStart = visibleStart < visibleInfo.start ? visibleInfo.start : visibleStart;
       }
-      visible_start = visible_start < boundary ? 0 : visible_start;
     }
-    if ((props.slideSetting.BoundaryProtect & SlideSetting.END_PROTECT) > 0) {
+    if ((innerSlideSetting.BoundaryProtect & SlideSetting.END_PROTECT) > 0) {
       let lastTemplateInfo = getItemByIndex(metroTemplate.getTailItemIndex()).templateInfo;
-      let last_visible_start = lastTemplateInfo[pos_key] + lastTemplateInfo[size_key] - visibleInfo.range;
-      last_visible_start = last_visible_start < 0 ? 0 : last_visible_start;
-      let boundary = last_visible_start;
-      if (targetItem && (!lastTemplateInfo.focusable || targetItem.index == lastTemplateInfo.index) && targetItem[pos_key] - last_visible_start >= 0) {
-        boundary = lastTemplateInfo[pos_key] - visibleInfo.range;
+      const lastEnd = lastTemplateInfo[pos_key] + lastTemplateInfo[size_key];
+      const lastVisibleStart = Math.max(lastEnd - visibleInfo.range, 0);
+      if (visibleInfo.end <= lastEnd) {
+        let boundary = lastVisibleStart;
+        if (targetItem && (!lastTemplateInfo.focusable || targetItem.index == lastTemplateInfo.index) && targetItem[pos_key] - lastVisibleStart >= 0) {
+          boundary = lastTemplateInfo[pos_key] - visibleInfo.range;
+        }
+        visibleStart = visibleStart > boundary ? lastVisibleStart : visibleStart;
+      } else {
+        visibleStart = visibleStart > visibleInfo.start ? visibleInfo.start : visibleStart;
       }
-      visible_start = visible_start > boundary ? last_visible_start : visible_start;
     }
-    return visible_start;
+    return visibleStart;
   };
-  const _calculateVisibleStart = (targetTemplateInfo, direction) => {
+  let preTemplateInfo = null;
+  const _calculateVisibleStart = (targetTemplateInfo, direction, preInfo = null) => {
     if (!targetTemplateInfo) {
       console.error("MetroWidget: _calculateVisibleStart target item is null");
       return 0;
     }
+    if (preInfo) {
+      preTemplateInfo = preInfo;
+    }
     preSlideDirection = direction;
     preAnchorItemIndex = targetTemplateInfo.index;
     let pos_key = vertical ? "top" : "left";
@@ -4786,9 +4849,9 @@ const setup = (props, itemRender, locateDiv, renderData, slideDiv, slideDivLeft,
     let center_key = vertical ? "centerYPos" : "centerXPos";
     let new_visible_start = visibleInfo.start;
     let needCalculate = true;
-    switch (props.slideSetting.Type) {
+    switch (innerSlideSetting.Type) {
       case SlideSetting.Type.FIX_POSITION:
-        if (props.slideSetting.FixFirstPage) {
+        if (innerSlideSetting.FixFirstPage) {
           if (targetTemplateInfo[pos_key] + targetTemplateInfo[size_key] - 1 < visibleInfo.range) {
             new_visible_start = 0;
             needCalculate = false;
@@ -4796,7 +4859,7 @@ const setup = (props, itemRender, locateDiv, renderData, slideDiv, slideDivLeft,
         }
         if (needCalculate) {
           new_visible_start = Math.ceil(
-            targetTemplateInfo[center_key] - visibleInfo.range * props.slideSetting.FixPercent
+            targetTemplateInfo[center_key] - visibleInfo.range * innerSlideSetting.FixPercent
           );
         }
         break;
@@ -4810,40 +4873,77 @@ const setup = (props, itemRender, locateDiv, renderData, slideDiv, slideDivLeft,
         }
         break;
       case SlideSetting.Type.SEAMLESS:
-        if (props.slideSetting.FixFirstPage) {
+        if (innerSlideSetting.FixFirstPage) {
           if (targetTemplateInfo[pos_key] + targetTemplateInfo[size_key] - 1 < visibleInfo.range) {
             new_visible_start = 0;
             needCalculate = false;
           }
         }
         if (needCalculate) {
-          if (targetTemplateInfo[size_key] >= visibleInfo.range * (props.slideSetting.EndPercent - props.slideSetting.StartPercent)) {
-            new_visible_start = targetTemplateInfo[center_key] - visibleInfo.range * 0.5;
+          const rect0Start = visibleInfo.start;
+          const rect0End = visibleInfo.start + visibleInfo.range * innerSlideSetting.StartPercent;
+          const rect1Start = visibleInfo.start + visibleInfo.range * innerSlideSetting.EndPercent;
+          const rect1End = visibleInfo.end;
+          const itemStart = targetTemplateInfo[pos_key];
+          const itemEnd = targetTemplateInfo[pos_key] + targetTemplateInfo[size_key] - 1;
+          let targetStart;
+          let targetEnd;
+          if (preTemplateInfo != null) {
+            targetStart = preTemplateInfo[pos_key];
+            targetEnd = preTemplateInfo[pos_key] + preTemplateInfo[size_key] - 1;
           } else {
-            if (direction > 0) {
-              if (targetTemplateInfo[pos_key] + targetTemplateInfo[size_key] > visibleInfo.start + visibleInfo.range * props.slideSetting.EndPercent) {
-                new_visible_start = targetTemplateInfo[pos_key] + targetTemplateInfo[size_key] - visibleInfo.range * props.slideSetting.EndPercent;
-              }
-            } else if (direction < 0) {
-              if (targetTemplateInfo[pos_key] < visibleInfo.start + visibleInfo.range * props.slideSetting.StartPercent) {
-                new_visible_start = targetTemplateInfo[pos_key] - visibleInfo.range * props.slideSetting.StartPercent;
+            targetStart = rect0End;
+            targetEnd = rect1Start;
+          }
+          let rect0Result = void 0;
+          let rect1Result = void 0;
+          if (itemStart < rect0End) {
+            if (targetStart < rect0Start) {
+              rect0Result = itemStart;
+            } else {
+              if (direction <= 0) {
+                let pre;
+                if (targetStart < rect0End) {
+                  pre = targetStart;
+                } else {
+                  pre = rect0End;
+                }
+                rect0Result = visibleInfo.start + (itemStart - pre);
               }
+            }
+          }
+          if (itemEnd > rect1Start) {
+            if (targetEnd > rect1End) {
+              rect1Result = itemEnd - visibleInfo.range;
             } else {
-              if (targetTemplateInfo[pos_key] < visibleInfo.start) {
-                new_visible_start = targetTemplateInfo[pos_key] - visibleInfo.range * props.slideSetting.StartPercent;
-              } else if (targetTemplateInfo[pos_key] + targetTemplateInfo[size_key] > visibleInfo.end) {
-                new_visible_start = targetTemplateInfo[pos_key] + targetTemplateInfo[size_key] - visibleInfo.range * props.slideSetting.EndPercent;
+              let pre;
+              if (targetEnd > rect1Start) {
+                pre = targetEnd;
+              } else {
+                pre = rect1Start;
+              }
+              if (direction >= 0) {
+                rect1Result = visibleInfo.start + (itemEnd - pre);
               }
             }
+          } else {
+          }
+          if (typeof rect0Result !== "undefined" && typeof rect1Result !== "undefined") {
+            new_visible_start = rect0Result;
+          } else if (typeof rect0Result !== "undefined") {
+            new_visible_start = rect0Result;
+          } else if (typeof rect1Result !== "undefined") {
+            new_visible_start = rect1Result;
           }
         }
         break;
       default:
         console.error(
           "MetroWidget: undefined slide type",
-          props.slideSetting.Type
+          innerSlideSetting.Type
         );
     }
+    preTemplateInfo = targetTemplateInfo;
     new_visible_start = normalizeVisibleStart(new_visible_start, targetTemplateInfo);
     return Math.round(new_visible_start);
   };
@@ -4952,6 +5052,17 @@ const setup = (props, itemRender, locateDiv, renderData, slideDiv, slideDivLeft,
       return -(divPos + Math.round(moveInfo.xPos));
     }
   };
+  const getTouchCount = (nexusCustomData) => {
+    let touchCount = -1;
+    if (nexusCustomData) {
+      try {
+        touchCount = JSON.parse(nexusCustomData).tc;
+      } catch (e) {
+        touchCount = -1;
+      }
+    }
+    return touchCount;
+  };
   const mergeTouchSlideToSlideDiv = (touchCount) => {
     if (vertical) {
       slideDivTop.value = -visibleInfo.start;
@@ -4974,6 +5085,12 @@ const setup = (props, itemRender, locateDiv, renderData, slideDiv, slideDivLeft,
     ]);
   };
   const onTouchDown = (data, customData, nexusCustomData) => {
+    touchRecorder.reset();
+    let touchCount = getTouchCount(nexusCustomData);
+    touchRecorder.setTouchCount(touchCount);
+    if (mode.getMode() == FOCUS_MODE) {
+      updateTouchBoxCondition();
+    }
     mode.touchStart();
     mode.flingEnd();
     const t = 100;
@@ -4991,8 +5108,8 @@ const setup = (props, itemRender, locateDiv, renderData, slideDiv, slideDivLeft,
     templateItemAdder.tryAddItemByPosition(visibleInfo.end + visibleInfo.range);
     const updater = pageUpdater.update(
       metroTemplate,
-      visibleInfo.startWithPadding - props.keepTraceRange * pageRange,
-      visibleInfo.endWithPadding + props.keepTraceRange * pageRange,
+      visibleInfo.startWithPadding - innerKeepTraceRange * pageRange,
+      visibleInfo.endWithPadding + innerKeepTraceRange * pageRange,
       0,
       false,
       permanentItemList
@@ -5021,9 +5138,17 @@ const setup = (props, itemRender, locateDiv, renderData, slideDiv, slideDivLeft,
     if (mode.getTouchState() == TouchState.TAP) {
       updateRenderItems(false, false);
       mode.touchEnd();
+    } else {
+      if (touchRecorder.moved && !mode.duringFling()) {
+        mergeTouchSlideToSlideDiv(touchRecorder.touchCount);
+        updateRenderItems(false, false);
+        mode.touchEnd();
+      }
     }
   };
+  const exportOnTouchRelease = props.touchFlag > 0 ? onTouchRelease : void 0;
   const onDragStart = (data, customData, nexusCustomData) => {
+    touchRecorder.move();
     mode.dragStart();
     visibleInfo.start = getVisibleStart(data);
   };
@@ -5032,19 +5157,9 @@ const setup = (props, itemRender, locateDiv, renderData, slideDiv, slideDivLeft,
     actorController.run([
       actorController.state().removeConditionByGroup(reachAnchorGroup)
     ]);
-    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, customData, nexusCustomData) => {
+    touchRecorder.move();
     mode.flingStart();
     visibleInfo.start = getVisibleStart(data);
     updateRenderItems(true, true);
@@ -5056,20 +5171,16 @@ const setup = (props, itemRender, locateDiv, renderData, slideDiv, slideDivLeft,
   const onFlingEnd = (data, customData, nexusCustomData) => {
     visibleInfo.start = getVisibleStart(data);
     if (mode.duringFling()) {
-      let touchCount = -1;
-      if (nexusCustomData) {
-        try {
-          touchCount = JSON.parse(nexusCustomData).tc;
-        } catch (e) {
-          touchCount = -1;
-        }
-      }
+      let touchCount = getTouchCount(nexusCustomData);
       mergeTouchSlideToSlideDiv(touchCount);
       updateRenderItems(false, false);
       mode.flingEnd();
       mode.touchEnd();
     }
   };
+  const onFlingDrop = (data, customData, nexusCustomData) => {
+    visibleInfo.start = getVisibleStart(data);
+  };
   const getTouchWall = () => {
     const boxSize = metroTemplate.getBoundingBoxSize();
     let wall = {
@@ -5081,9 +5192,15 @@ const setup = (props, itemRender, locateDiv, renderData, slideDiv, slideDivLeft,
     if (vertical) {
       wall.top = -boxSize.height + props.height - slideDivTop.value;
       wall.bottom = -slideDivTop.value;
+      if (wall.top > wall.bottom) {
+        wall.top = wall.bottom;
+      }
     } else {
       wall.left = -boxSize.width + props.width - slideDivLeft.value;
       wall.right = -slideDivLeft.value;
+      if (wall.left > wall.right) {
+        wall.left = wall.right;
+      }
     }
     return wall;
   };
@@ -5091,15 +5208,15 @@ const setup = (props, itemRender, locateDiv, renderData, slideDiv, slideDivLeft,
     templateItemAdder.tryAddItemByPosition(visibleInfo.start + visibleInfo.range);
     const updater = pageUpdater.update(
       metroTemplate,
-      visibleInfo.startWithPadding - props.keepTraceRange * pageRange,
-      visibleInfo.endWithPadding + props.keepTraceRange * pageRange,
+      visibleInfo.startWithPadding - innerKeepTraceRange * pageRange,
+      visibleInfo.endWithPadding + innerKeepTraceRange * pageRange,
       0,
       true,
       permanentItemList
     );
     applyTmp ? updater.applyTmp() : updater.apply();
   };
-  const resetDragRect = () => {
+  const updateTouchBoxCondition = () => {
     if (actorController != null) {
       const walls = getTouchWall();
       actorController.run([
@@ -5109,6 +5226,20 @@ const setup = (props, itemRender, locateDiv, renderData, slideDiv, slideDivLeft,
       ]);
     }
   };
+  const touchRecorder = {
+    moved: false,
+    touchCount: -1,
+    reset: function() {
+      this.moved = false;
+      this.touchCount = -1;
+    },
+    move: function() {
+      this.moved = true;
+    },
+    setTouchCount: function(count) {
+      this.touchCount = count;
+    }
+  };
   const initTouch = () => {
     actorController = new ActorControl();
     const divView = touchDiv.value.jsvGetProxyView();
@@ -5117,14 +5248,12 @@ const setup = (props, itemRender, locateDiv, renderData, slideDiv, slideDivLeft,
     const walls = getTouchWall();
     actorController.run([
       actorController.condition(void 0, true).onTouchDown().then([onTouchDown]),
-      // actorController
-      //   .condition(undefined, true)
-      //   .onDragStart()
-      //   .then([onDragStart]),
+      actorController.condition(void 0, true).onDragStart().then([onDragStart]),
       actorController.condition(void 0, true).onDragEnd().then([onDragEnd]),
       actorController.condition(void 0, true).onFlingStart().then([onFlingStart]),
       actorController.condition(void 0, true).onFlingProgress().then([onFlingProgress]),
       actorController.condition(void 0, true).onFlingEnd().then([onFlingEnd]),
+      actorController.condition(void 0, true).onFlingDrop().then([onFlingDrop]),
       actorController.condition(void 0, true).onTouchRelease().then([actorController.state().touchLockSwitch(false, vertical ? 1 : 2)]),
       actorController.condition(wallConditionGroup, true).boxPosition(walls.left, walls.top, walls.right, walls.bottom).then([actorController.state().setHitWallOverflow()])
       //TODO 通过prop设置哪个方向overflow
@@ -5160,7 +5289,7 @@ const setup = (props, itemRender, locateDiv, renderData, slideDiv, slideDivLeft,
     if (item) {
       init_focus_id = props.initFocusId;
       if (item.itemConfig.itemSlide == METRO_WIDGET.ITEM_SLIDE.ACT_ITEM_FOCUS) {
-        cur_visible_start = _calculateVisibleStart(item.templateInfo, 1);
+        cur_visible_start = _calculateVisibleStart(item.templateInfo, 0);
       }
     }
   }
@@ -5178,8 +5307,8 @@ const setup = (props, itemRender, locateDiv, renderData, slideDiv, slideDivLeft,
   const delayLoadHandler = setTimeout(() => {
     const updateHandler = pageUpdater.update(
       metroTemplate,
-      visibleInfo.startWithPadding - props.keepTraceRange * pageRange,
-      visibleInfo.endWithPadding + props.keepTraceRange * pageRange,
+      visibleInfo.startWithPadding - innerKeepTraceRange * pageRange,
+      visibleInfo.endWithPadding + innerKeepTraceRange * pageRange,
       focusId,
       false,
       permanentItemList
@@ -5223,7 +5352,7 @@ const setup = (props, itemRender, locateDiv, renderData, slideDiv, slideDivLeft,
     exportObject,
     setZIndex,
     onTouchDown,
-    onTouchRelease,
+    onTouchRelease: exportOnTouchRelease,
     currentFocusIndex,
     modeForExport
   };
@@ -5329,6 +5458,7 @@ const _sfc_main$H = {
                                           zIndex {int | object}: item的zIndex, 为object时可以分别设置{focus: 0, normal: 0}, 为number时则同时设置获焦和不获焦的zIndex,
                                           uid {string}: item的uid, 可以通过uid来设置焦点
                                           permanent {boolean}: 出去与是否保留
+                                          enableTap {boolean}: 是否接受触控tap
                                         }
  *
  *      onFocus {function} 控件获取焦点的回调
@@ -5339,6 +5469,10 @@ const _sfc_main$H = {
                                             "rect": 到达边缘时的区域{x: 0, y: 0, width: 0,height: 0}
                                           }
         onScroll {function} 滚动时的回调 (visibleStart, visibleRange, totalSize) => {}
+                                (TBD: 
+                                  当前版本暂时不支持触控过程的实时回调，
+                                  由于回调js会严重拖慢性能，所以也不会设计实时回调，
+                                  关于边缘的拖动进度展示，将来会有额外组件支撑)
                                 visibleStart: 可视区域的起点
                                 visibleRange: 可视区域大小(不含padding)
                                 totalSize: 所有item的总长
@@ -5348,6 +5482,7 @@ const _sfc_main$H = {
  *      flingPageWidth {}
  *      flingPageEdge {}
  *      disableClip {boolean} 取消显示范围的clipView
+ *      touchFlag {int} 触控的开关, 0:关闭, 1:打开. 打开后支持drag, fling; item的tap则由measuresObject的enableTap控制
  
  *    methods:
         getFocusBlockRef 获取此MetroWidget的 jsv-focus-block句柄，可以使用requestFocus完成获焦
@@ -5434,6 +5569,9 @@ const _sfc_main$H = {
           @description 锁定滚动
         unlockSlide
           @description 取消锁定
+        setSlideSetting
+          @description 设置slideSetting
+          @params { SlideSetting | null } setting 滚动设置, 为null时使用props.slideSetting
             
   slots:
     renderItem: 该slot用于描画每个单元格
@@ -5610,7 +5748,7 @@ const _sfc_main$G = {
     },
     keepTraceRange: {
       type: Number,
-      default: 3
+      default: -1
     },
     onScroll: {
       type: Function
@@ -5684,6 +5822,10 @@ const _sfc_main$G = {
       touchDivSize,
       "common"
     );
+    let touchDivVOn = {};
+    if (onTouchRelease) {
+      touchDivVOn["jsv-touchend"] = onTouchRelease;
+    }
     expose(exportObject);
     return (_ctx, _cache) => {
       const _component_jsv_focus_block = resolveComponent("jsv-focus-block");
@@ -5712,15 +5854,14 @@ const _sfc_main$G = {
               top: slideDivTop.value
             })
           }, [
-            createElementVNode("div", {
+            createElementVNode("div", mergeProps({
               ref_key: "touchDiv",
               ref: touchDiv,
-              style: normalizeStyle({
+              style: {
                 width: touchDivSize.width,
                 height: touchDivSize.height
-              }),
-              onJsvTouchend: _cache[0] || (_cache[0] = (...args) => unref(onTouchRelease) && unref(onTouchRelease)(...args))
-            }, [
+              }
+            }, toHandlers(unref(touchDivVOn), true)), [
               createElementVNode("div", null, [
                 renderSlot(_ctx.$slots, "background")
               ]),
@@ -5789,7 +5930,7 @@ const _sfc_main$G = {
                   _: 3
                 }, 8, ["name", "onAction"])
               ], 512)
-            ], 36),
+            ], 16),
             createElementVNode("div", null, [
               renderSlot(_ctx.$slots, "foreground")
             ])
@@ -5923,7 +6064,7 @@ const _sfc_main$F = {
     },
     keepTraceRange: {
       type: Number,
-      default: 3
+      default: -1
     },
     onScroll: {
       type: Function
@@ -5996,6 +6137,10 @@ const _sfc_main$F = {
       touchDivSize,
       "list"
     );
+    let touchDivVOn = {};
+    if (onTouchRelease) {
+      touchDivVOn["jsv-touchend"] = onTouchRelease;
+    }
     expose(exportObject);
     return (_ctx, _cache) => {
       const _component_jsv_focus_block = resolveComponent("jsv-focus-block");
@@ -6024,15 +6169,14 @@ const _sfc_main$F = {
               top: slideDivTop.value
             })
           }, [
-            createElementVNode("div", {
+            createElementVNode("div", mergeProps({
               ref_key: "touchDiv",
               ref: touchDiv,
-              style: normalizeStyle({
+              style: {
                 width: touchDivSize.width,
                 height: touchDivSize.height
-              }),
-              onJsvTouchend: _cache[0] || (_cache[0] = (...args) => unref(onTouchRelease) && unref(onTouchRelease)(...args))
-            }, [
+              }
+            }, toHandlers(unref(touchDivVOn), true)), [
               createElementVNode("div", null, [
                 renderSlot(_ctx.$slots, "background")
               ]),
@@ -6096,7 +6240,7 @@ const _sfc_main$F = {
                   _: 3
                 }, 8, ["name", "onAction"])
               ], 512)
-            ], 36),
+            ], 16),
             createElementVNode("div", null, [
               renderSlot(_ctx.$slots, "foreground")
             ])
@@ -8474,7 +8618,7 @@ function preDownloadSdk(core_version) {
   return direct_call("preDownloadSdk", core_version);
 }
 // 显示声明，可以提高执行速度和利用上编辑器的成员名提示功能
-const bridge = {
+const jJsvRuntimeBridge = {
   getMac,
   getWireMac,
   getWifiMac,
@@ -16644,6 +16788,16 @@ const _sfc_main$9 = {
           return "center";
       }
     });
+    const textWidth = computed(() => {
+      let w = props.style?.width;
+      if (typeof w == "undefined") {
+        w = 0;
+      }
+      return w;
+    });
+    const jsvTextLatexValue = computed(() => {
+      return props.enableLatex ? 1 : 0;
+    });
     return (_ctx, _cache) => {
       return openBlock(), createBlock(unref(_sfc_main$w), {
         style: normalizeStyle({
@@ -16655,8 +16809,8 @@ const _sfc_main$9 = {
         default: withCtx(() => [
           createElementVNode("div", {
             style: normalizeStyle({
-              width: props.style.width,
-              JsvTextLatex: __props.enableLatex ? 1 : 0,
+              width: unref(textWidth),
+              JsvTextLatex: unref(jsvTextLatexValue),
               JsvTextLineAlign: __props.lineAlign,
               JsvTextInnerDirection: __props.textDirection
             })
@@ -18618,13 +18772,14 @@ function swap(arr, i, j) {
 function defaultCompare(a, b) {
   return a < b ? -1 : a > b ? 1 : 0;
 }
-var RBush = function RBush2(maxEntries) {
+function RBush(maxEntries) {
   if (maxEntries === void 0)
     maxEntries = 9;
   this._maxEntries = Math.max(4, maxEntries);
   this._minEntries = Math.max(2, Math.ceil(this._maxEntries * 0.4));
   this.clear();
-};
+}
+;
 RBush.prototype.all = function all() {
   return this._all(this.data, []);
 };
@@ -19631,4 +19786,4 @@ const _sfc_main = {
 // utils/index.js;
 //
 
-export { BaseDispatcher, DECORATE_BORDER_RADIUS, DECORATE_NINEPATCH_ALPHA_MIX, DebugObjectRefer, DebugTools, DebugWrap81ErrorStack, DebugWrap81WarnStack, DefaultKeyCodeMap, EdgeDirection, FixPositionSlide, FocusMoveType, FreeMoveDef, FreeMoveFunc, HORIZONTAL, InputType, instance as JSBridge, JsvAccount, _sfc_main$z as JsvActorMove, JsvActorMoveControl, _JsvApic$1 as JsvApic, _JsvApic2$1 as JsvApic2, _sfc_main$C as JsvAudio, _sfc_main$3 as JsvConnectLine, _sfc_main$1 as JsvEnableRenderBreak, _sfc_main$x as JsvEnvBlocker, JsvFederationTools, _sfc_main$i as JsvFilterView, _sfc_main$w as JsvFlexDiv, _sfc_main$E as JsvFocusBlock, _sfc_main$y as JsvFreeMoveActor, JsvGrid, JsvTransparentDiv as JsvHole, JsvInput, _sfc_main$A as JsvLatex, JsvLine, _sfc_main$f as JsvMarquee, JsvMaskClipDiv, _sfc_main as JsvMindMap, JsvTransparentDiv as JsvNativeSharedDiv, _sfc_main$d as JsvNinePatch, JsvPerformance, _sfc_main$4 as JsvPieChart, _sfc_main$c as JsvPosterDiv, _sfc_main$b as JsvPosterImage, exportObj as JsvPreDownloader, JsvPreload, _sfc_main$2 as JsvProgressBar, _JsvQrcode$1 as JsvQrcode, _sfc_main$8 as JsvRadarChart, _sfc_main$7 as JsvRipple, JsvRippleShape, JsvScaleTextBox, _sfc_main$5 as JsvSector, JsvSoundPool, _JsvSpray$1 as JsvSpray, JsvSpriteAnim, _sfc_main$n as JsvSpriteLoader, JsvSpriteAnim as JsvSpriteStatic, JsvSpriteTools, JsvStyleClass, JsvStyleSheetsDeclarer, JsvSwiper, _sfc_main$k as JsvSwiper3D, _sfc_main$9 as JsvTextBox, JsvTextStyleClass, _JsvTextureAnim$1 as JsvTextureAnim, sJsvTextureConst as JsvTextureConst, sTextureStoreApi as JsvTextureStoreApi, JsvTransparentDiv, JsvVisibleSensor, LineType, _sfc_main$F as ListWidget, LoopType, METRO_WIDGET, METRO_WIDGET as METRO_WIDGET_CONST, _sfc_main$G as MetroWidget, PageType, RENDER_ITEM_BREAK_KEY, Dispatcher as SWidgetDispatcher, SeamlessSlide, _sfc_main$G as SimpleWidget, SlideSetting, SlideStyle, SpriteController, TexAlignAnchor, TextTools, TextureInstantType, VERTICAL, WholePageSlide, buildDownloadInfo, buildPreloadInfo, combinedStyles, createImpactAutoFroze, createImpactCallback, createImpactTracer, disableNativeViewListener, enableNativeViewListener, getCssStyleGroup, getKeyFramesGroup, getMeasureObj, getPositionRelativeToView, getTextWidth, globalLoadJsvAudioPlugin, globalLoadJsvLatexPlugin, bridge as jJsvRuntimeBridge, jsvCreateFocusManager, jsvCreateHashHistory, numberCheckSet, toHtmlBorderSet, toNinePatchForgeViewSet, updateImpactAutoFroze, urlCheckSet, useFocusHub };
+export { BaseDispatcher, DECORATE_BORDER_RADIUS, DECORATE_NINEPATCH_ALPHA_MIX, DebugObjectRefer, DebugTools, DebugWrap81ErrorStack, DebugWrap81WarnStack, DefaultKeyCodeMap, EdgeDirection, FixPositionSlide, FocusMoveType, FreeMoveDef, FreeMoveFunc, HORIZONTAL, InputType, instance as JSBridge, JsvAccount, _sfc_main$z as JsvActorMove, JsvActorMoveControl, _JsvApic$1 as JsvApic, _JsvApic2$1 as JsvApic2, _sfc_main$C as JsvAudio, _sfc_main$3 as JsvConnectLine, _sfc_main$1 as JsvEnableRenderBreak, _sfc_main$x as JsvEnvBlocker, JsvFederationTools, _sfc_main$i as JsvFilterView, _sfc_main$w as JsvFlexDiv, _sfc_main$E as JsvFocusBlock, _sfc_main$y as JsvFreeMoveActor, JsvGrid, JsvTransparentDiv as JsvHole, JsvInput, _sfc_main$A as JsvLatex, JsvLine, _sfc_main$f as JsvMarquee, JsvMaskClipDiv, _sfc_main as JsvMindMap, JsvTransparentDiv as JsvNativeSharedDiv, _sfc_main$d as JsvNinePatch, JsvPerformance, _sfc_main$4 as JsvPieChart, _sfc_main$c as JsvPosterDiv, _sfc_main$b as JsvPosterImage, exportObj as JsvPreDownloader, JsvPreload, _sfc_main$2 as JsvProgressBar, _JsvQrcode$1 as JsvQrcode, _sfc_main$8 as JsvRadarChart, _sfc_main$7 as JsvRipple, JsvRippleShape, JsvScaleTextBox, _sfc_main$5 as JsvSector, JsvSoundPool, _JsvSpray$1 as JsvSpray, JsvSpriteAnim, _sfc_main$n as JsvSpriteLoader, JsvSpriteAnim as JsvSpriteStatic, JsvSpriteTools, JsvStyleClass, JsvStyleSheetsDeclarer, JsvSwiper, _sfc_main$k as JsvSwiper3D, _sfc_main$9 as JsvTextBox, JsvTextStyleClass, _JsvTextureAnim$1 as JsvTextureAnim, sJsvTextureConst as JsvTextureConst, sTextureStoreApi as JsvTextureStoreApi, JsvTransparentDiv, JsvVisibleSensor, LineType, _sfc_main$F as ListWidget, LoopType, METRO_WIDGET, METRO_WIDGET as METRO_WIDGET_CONST, _sfc_main$G as MetroWidget, PageType, RENDER_ITEM_BREAK_KEY, Dispatcher as SWidgetDispatcher, SeamlessSlide, _sfc_main$G as SimpleWidget, SlideSetting, SlideStyle, SpriteController, TexAlignAnchor, TextTools, TextureInstantType, VERTICAL, WholePageSlide, buildDownloadInfo, buildPreloadInfo, combinedStyles, createImpactAutoFroze, createImpactCallback, createImpactTracer, disableNativeViewListener, enableNativeViewListener, getCssStyleGroup, getKeyFramesGroup, getMeasureObj, getPositionRelativeToView, getTextWidth, globalLoadJsvAudioPlugin, globalLoadJsvLatexPlugin, jJsvRuntimeBridge, jsvCreateFocusManager, jsvCreateHashHistory, numberCheckSet, toHtmlBorderSet, toNinePatchForgeViewSet, updateImpactAutoFroze, urlCheckSet, useFocusHub };