vxe-table 3.10.14 → 3.10.15

package/lib/index.umd.js

@@ -2220,7 +2220,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.10.14";
+const version = "3.10.15";
 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.14"}`;
+const log_version = `table v${"3.10.15"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -19830,29 +19830,46 @@ function getTargetOffset(target, container) {
     offsetLeft
   };
 }
-function getCheckboxRangeRows(_vm, params, targetTrElem, moveRange) {
+function getCheckboxRangeRows($xeTable, evnt, params, targetTrElem, trRect, offsetClientTop, moveRange) {
+  const reactData = $xeTable;
+  const internalData = $xeTable;
   let countHeight = 0;
   let rangeRows = [];
+  let moveSize = 0;
   const isDown = moveRange > 0;
-  const moveSize = moveRange > 0 ? moveRange : Math.abs(moveRange) + targetTrElem.offsetHeight;
   const {
-    afterFullData,
-    scrollYStore,
     scrollYLoad
-  } = _vm;
+  } = reactData;
+  const {
+    afterFullData,
+    scrollYStore
+  } = internalData;
   if (scrollYLoad) {
-    const _rowIndex = _vm.getVTRowIndex(params.row);
+    if (isDown) {
+      moveSize = offsetClientTop + moveRange;
+    } else {
+      moveSize = trRect.height - offsetClientTop + Math.abs(moveRange);
+    }
+    const _rowIndex = $xeTable.getVTRowIndex(params.row);
     if (isDown) {
       rangeRows = afterFullData.slice(_rowIndex, _rowIndex + Math.ceil(moveSize / scrollYStore.rowHeight));
     } else {
-      rangeRows = afterFullData.slice(_rowIndex - Math.floor(moveSize / scrollYStore.rowHeight) + 1, _rowIndex + 1);
+      rangeRows = afterFullData.slice(_rowIndex - Math.floor(moveSize / scrollYStore.rowHeight), _rowIndex + 1);
     }
   } else {
+    if (isDown) {
+      moveSize = evnt.clientY - trRect.y;
+    } else {
+      moveSize = trRect.y - evnt.clientY + trRect.height;
+    }
     const siblingProp = isDown ? 'next' : 'previous';
     while (targetTrElem && countHeight < moveSize) {
-      rangeRows.push(_vm.getRowNode(targetTrElem).item);
-      countHeight += targetTrElem.offsetHeight;
-      targetTrElem = targetTrElem[`${siblingProp}ElementSibling`];
+      const rowNodeRest = $xeTable.getRowNode(targetTrElem);
+      if (rowNodeRest) {
+        rangeRows.push(rowNodeRest.item);
+        countHeight += targetTrElem.offsetHeight;
+        targetTrElem = targetTrElem[`${siblingProp}ElementSibling`];
+      }
     }
   }
   return rangeRows;
@@ -20077,6 +20094,8 @@ function getCheckboxRangeRows(_vm, params, targetTrElem, moveRange) {
         const startLeft = offsetRest.offsetLeft + evnt.offsetX;
         const startScrollTop = bodyWrapperElem.scrollTop;
         const rowHeight = trElem.offsetHeight;
+        const trRect = trElem.getBoundingClientRect();
+        const offsetClientTop = disY - trRect.y;
         let mouseScrollTimeout = null;
         let isMouseScrollDown = false;
         let mouseScrollSpaceSize = 1;
@@ -20124,7 +20143,7 @@ function getCheckboxRangeRows(_vm, params, targetTrElem, moveRange) {
           checkboxRangeElem.style.left = `${rangeLeft}px`;
           checkboxRangeElem.style.top = `${rangeTop}px`;
           checkboxRangeElem.style.display = 'block';
-          const rangeRows = getCheckboxRangeRows(this, params, trElem, offsetTop < marginSize ? -rangeHeight : rangeHeight);
+          const rangeRows = getCheckboxRangeRows(this, evnt, params, trElem, trRect, offsetClientTop, offsetTop < marginSize ? -rangeHeight : rangeHeight);
           // 至少滑动 10px 才能有效匹配
           if (rangeHeight > 10 && rangeRows.length !== lastRangeRows.length) {
             lastRangeRows = rangeRows;