vxe-table 3.10.9 → 3.10.10

package/lib/table/src/methods.js

@@ -6785,26 +6785,20 @@ const Methods = {
   handleScrollEvent(evnt, isRollY, isRollX, scrollTop, scrollLeft, params) {
     const $xeTable = this;
     const props = $xeTable;
+    const reactData = $xeTable;
+    const internalData = $xeTable;
     const {
       highlightHoverRow
     } = props;
+    const {
+      lastScrollLeft,
+      lastScrollTop
+    } = internalData;
     const tableBody = $xeTable.$refs.tableBody;
     const bodyElem = tableBody ? tableBody.$el : null;
     const rowOpts = $xeTable.computeRowOpts;
     const validTip = $xeTable.$refs.validTip;
     const tooltip = $xeTable.$refs.tooltip;
-    if (rowOpts.isHover || highlightHoverRow) {
-      $xeTable.clearHoverRow();
-    }
-    if (validTip && validTip.visible) {
-      validTip.close();
-    }
-    if (tooltip && tooltip.visible) {
-      tooltip.close();
-    }
-    if (isRollX) {
-      $xeTable.checkScrolling();
-    }
     const bodyHeight = bodyElem ? bodyElem.clientHeight : 0;
     const bodyWidth = bodyElem ? bodyElem.clientWidth : 0;
     const scrollHeight = bodyElem ? bodyElem.scrollHeight : 0;
@@ -6813,17 +6807,50 @@ const Methods = {
     let isBottom = false;
     let isLeft = false;
     let isRight = false;
+    let direction = '';
+    let isTopBoundary = false;
+    let isBottomBoundary = false;
+    let isLeftBoundary = false;
+    let isRightBoundary = false;
     if (isRollX) {
+      const xThreshold = $xeTable.computeScrollXThreshold;
       isLeft = scrollLeft <= 0;
-      if (!isTop) {
+      if (!isLeft) {
         isRight = scrollLeft + bodyWidth >= scrollWidth;
       }
+      if (scrollLeft > lastScrollLeft) {
+        direction = 'right';
+        if (scrollLeft + bodyWidth >= scrollWidth - xThreshold) {
+          isRightBoundary = true;
+        }
+      } else {
+        direction = 'left';
+        if (scrollLeft <= xThreshold) {
+          isLeftBoundary = true;
+        }
+      }
       $xeTable.checkScrolling();
+      internalData.lastScrollLeft = scrollLeft;
+      reactData.lastScrollTime = Date.now();
     } else {
+      const yThreshold = $xeTable.computeScrollYThreshold;
       isTop = scrollTop <= 0;
       if (!isTop) {
         isBottom = scrollTop + bodyHeight >= scrollHeight;
       }
+      if (scrollTop > lastScrollTop) {
+        direction = 'bottom';
+        if (scrollTop + bodyHeight >= scrollHeight - yThreshold) {
+          isBottomBoundary = true;
+        }
+      } else {
+        direction = 'top';
+        if (scrollTop <= yThreshold) {
+          isTopBoundary = true;
+        }
+      }
+      internalData.lastScrollTop = scrollTop;
+      reactData.lastScrollTime = Date.now();
     }
     const evntParams = Object.assign({
       scrollTop,
@@ -6837,8 +6864,21 @@ const Methods = {
       isTop,
       isBottom,
       isLeft,
-      isRight
+      isRight,
+      direction
     }, params);
+    if (rowOpts.isHover || highlightHoverRow) {
+      $xeTable.clearHoverRow();
+    }
+    if (validTip && validTip.visible) {
+      validTip.close();
+    }
+    if (tooltip && tooltip.visible) {
+      tooltip.close();
+    }
+    if (isBottomBoundary || isTopBoundary || isRightBoundary || isLeftBoundary) {
+      $xeTable.dispatchEvent('scroll-boundary', evntParams, evnt);
+    }
     $xeTable.dispatchEvent('scroll', evntParams, evnt);
   },
   /**
@@ -6875,8 +6915,6 @@ const Methods = {
     const bodyElem = tableBody.$el;
     const headerElem = tableHeader ? tableHeader.$el : null;
     const footerElem = tableFooter ? tableFooter.$el : null;
-    $xeTable.lastScrollLeft = scrollLeft;
-    $xeTable.lastScrollTime = Date.now();
     (0, _dom.setScrollLeft)(bodyElem, scrollLeft);
     (0, _dom.setScrollLeft)(headerElem, scrollLeft);
     (0, _dom.setScrollLeft)(footerElem, scrollLeft);
@@ -6890,8 +6928,6 @@ const Methods = {
     } = wrapperEl;
     const isRollX = true;
     const isRollY = false;
-    $xeTable.lastScrollLeft = scrollLeft;
-    $xeTable.lastScrollTime = Date.now();
     $xeTable.handleSyncScrollX(scrollLeft);
     $xeTable.triggerScrollXEvent(evnt);
     $xeTable.handleScrollEvent(evnt, isRollY, isRollX, scrollTop, scrollLeft, {
@@ -6913,8 +6949,6 @@ const Methods = {
     const bodyElem = tableBody.$el;
     const leftElem = leftBody ? leftBody.$el : null;
     const rightElem = rightBody ? rightBody.$el : null;
-    $xeTable.lastScrollTop = scrollTop;
-    $xeTable.lastScrollTime = Date.now();
     (0, _dom.setScrollTop)(bodyElem, scrollTop);
     (0, _dom.setScrollTop)(leftElem, scrollTop);
     (0, _dom.setScrollTop)(rightElem, scrollTop);
@@ -6928,8 +6962,6 @@ const Methods = {
     } = wrapperEl;
     const isRollX = false;
     const isRollY = true;
-    $xeTable.lastScrollTop = scrollTop;
-    $xeTable.lastScrollTime = Date.now();
     $xeTable.handleSyncScrollY(scrollTop);
     $xeTable.triggerScrollYEvent(evnt);
     $xeTable.handleScrollEvent(evnt, isRollY, isRollX, scrollTop, scrollLeft, {