vxe-table 3.10.9 → 3.10.11

package/es/table/src/methods.js

@@ -5687,24 +5687,15 @@ 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;
@@ -5713,18 +5704,53 @@ 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,
             scrollLeft,
@@ -5734,7 +5760,20 @@ const Methods = {
             scrollWidth, isX: isRollX, isY: isRollY, isTop,
             isBottom,
             isLeft,
-            isRight }, params);
+            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);
     },
     /**
@@ -5763,8 +5802,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();
         setScrollLeft(bodyElem, scrollLeft);
         setScrollLeft(headerElem, scrollLeft);
         setScrollLeft(footerElem, scrollLeft);
@@ -5775,8 +5812,6 @@ const Methods = {
         const { scrollTop, scrollLeft } = 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, {
@@ -5795,8 +5830,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();
         setScrollTop(bodyElem, scrollTop);
         setScrollTop(leftElem, scrollTop);
         setScrollTop(rightElem, scrollTop);
@@ -5807,8 +5840,6 @@ const Methods = {
         const { scrollTop, scrollLeft } = 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, {

package/es/table/src/table.js

@@ -373,12 +373,30 @@ export default {
         computeSXOpts() {
             return Object.assign({}, getConfig().table.scrollX, this.scrollX);
         },
+        computeScrollXThreshold() {
+            const $xeTable = this;
+            const sXOpts = $xeTable.computeSXOpts;
+            const { threshold } = sXOpts;
+            if (threshold) {
+                return XEUtils.toNumber(threshold);
+            }
+            return 0;
+        },
         sYOpts() {
             return this.computeSYOpts;
         },
         computeSYOpts() {
             return Object.assign({}, getConfig().table.scrollY, this.scrollY);
         },
+        computeScrollYThreshold() {
+            const $xeTable = this;
+            const sYOpts = $xeTable.computeSYOpts;
+            const { threshold } = sYOpts;
+            if (threshold) {
+                return XEUtils.toNumber(threshold);
+            }
+            return 0;
+        },
         rowHeightMaps() {
             return {
                 default: 48,

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "3.10.9";
+export const version = "3.10.11";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({

package/es/ui/src/log.js

@@ -1,5 +1,5 @@
 import { VxeUI } from '@vxe-ui/core';
 const { log } = VxeUI;
-const version = `table v${"3.10.9"}`;
+const version = `table v${"3.10.11"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);

package/lib/index.umd.js

@@ -2220,7 +2220,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.10.9";
+const version = "3.10.11";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2769,7 +2769,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.10.9"}`;
+const log_version = `table v${"3.10.11"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -11557,26 +11557,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;
@@ -11585,17 +11579,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 = {
       scrollTop,
@@ -11610,8 +11637,21 @@ const Methods = {
       isBottom,
       isLeft,
       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);
   },
   /**
@@ -11648,8 +11688,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();
     setScrollLeft(bodyElem, scrollLeft);
     setScrollLeft(headerElem, scrollLeft);
     setScrollLeft(footerElem, scrollLeft);
@@ -11663,8 +11701,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, {
@@ -11686,8 +11722,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();
     setScrollTop(bodyElem, scrollTop);
     setScrollTop(leftElem, scrollTop);
     setScrollTop(rightElem, scrollTop);
@@ -11701,8 +11735,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, {
@@ -13118,8 +13150,6 @@ function renderRows(h, _vm, $xeTable, fixedType, tableData, tableColumn) {
       if (yHandleEl) {
         yHandleEl.scrollTop = scrollTop;
       } else if (isRollY) {
-        $xeTable.lastScrollTop = scrollTop;
-        $xeTable.lastScrollLeft = scrollLeft;
         if (leftElem && fixedType === 'left') {
           setScrollTop(bodyElem, scrollTop);
           setScrollTop(rightElem, scrollTop);
@@ -13138,8 +13168,6 @@ function renderRows(h, _vm, $xeTable, fixedType, tableData, tableColumn) {
       if (xHandleEl) {
         xHandleEl.scrollLeft = scrollLeft;
       } else if (isRollX) {
-        $xeTable.lastScrollTop = scrollTop;
-        $xeTable.lastScrollLeft = scrollLeft;
         setScrollLeft(headerElem, scrollLeft);
         setScrollLeft(footerElem, scrollLeft);
         $xeTable.handleScrollEvent(evnt, isRollY, isRollX, scrollTop, scrollLeft, {
@@ -13994,8 +14022,6 @@ function mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex) {
         const isRollX = true;
         const isRollY = false;
         const scrollTop = bodyElem.scrollTop;
-        $xeTable.lastScrollLeft = scrollLeft;
-        $xeTable.lastScrollTime = Date.now();
         setScrollLeft(headerElem, scrollLeft);
         setScrollLeft(bodyElem, scrollLeft);
         $xeTable.handleScrollEvent(evnt, isRollY, isRollX, scrollTop, scrollLeft, {
@@ -21452,12 +21478,34 @@ function handleUupdateResize(_vm) {
     computeSXOpts() {
       return Object.assign({}, table_getConfig().table.scrollX, this.scrollX);
     },
+    computeScrollXThreshold() {
+      const $xeTable = this;
+      const sXOpts = $xeTable.computeSXOpts;
+      const {
+        threshold
+      } = sXOpts;
+      if (threshold) {
+        return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(threshold);
+      }
+      return 0;
+    },
     sYOpts() {
       return this.computeSYOpts;
     },
     computeSYOpts() {
       return Object.assign({}, table_getConfig().table.scrollY, this.scrollY);
     },
+    computeScrollYThreshold() {
+      const $xeTable = this;
+      const sYOpts = $xeTable.computeSYOpts;
+      const {
+        threshold
+      } = sYOpts;
+      if (threshold) {
+        return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(threshold);
+      }
+      return 0;
+    },
     rowHeightMaps() {
       return {
         default: 48,
@@ -26270,6 +26318,7 @@ const Toolbar = VxeToolbar;
         area: {
           mergeErr: '无法对合并单元格进行该操作',
           multiErr: '无法对多重选择区域进行该操作',
+          selectErr: '无法操作指定区域的单元格',
           extendErr: '如果延伸的区域包含被合并的单元格，所有合并的单元格需大小相同',
           pasteMultiErr: '无法粘贴，需要相同大小的复制的区域和粘贴的区域才能执行此操作',
           cpInvalidErr: '该操作无法进行，您选择的区域中存在被禁止的列（{0}）'