vxe-table 4.8.13 → 4.8.15

package/lib/index.umd.js

@@ -1998,7 +1998,7 @@ function eqEmptyValue(cellValue) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "4.8.13";
+const version = "4.8.15";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2389,7 +2389,7 @@ var es_array_push = __webpack_require__(4114);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"4.8.13"}`;
+const log_version = `table v${"4.8.15"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -16483,7 +16483,6 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         let isBottomBoundary = false;
         let isLeftBoundary = false;
         let isRightBoundary = false;
-        console.log(222);
         if (isRollX) {
           const xThreshold = computeScrollXThreshold.value;
           isLeft = scrollLeft <= 0;
@@ -21275,11 +21274,11 @@ keyboard_hook_hooks.add('tableKeyboardModule', {
       computeMouseOpts,
       computeTreeOpts
     } = $xeTable.getComputeMaps();
-    function getCheckboxRangeRows(params, targetTrElem, moveRange) {
+    function getCheckboxRangeRows(evnt, params, targetTrElem, trRect, offsetClientTop, moveRange) {
       let countHeight = 0;
       let rangeRows = [];
+      let moveSize = 0;
       const isDown = moveRange > 0;
-      const moveSize = moveRange > 0 ? moveRange : Math.abs(moveRange) + targetTrElem.offsetHeight;
       const {
         scrollYLoad
       } = reactData;
@@ -21288,13 +21287,23 @@ keyboard_hook_hooks.add('tableKeyboardModule', {
         scrollYStore
       } = internalData;
       if (scrollYLoad) {
+        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) {
           const rowNodeRest = $xeTable.getRowNode(targetTrElem);
@@ -21327,7 +21336,7 @@ keyboard_hook_hooks.add('tableKeyboardModule', {
         const checkboxRangeElem = bodyWrapperElem.querySelector('.vxe-table--checkbox-range');
         const domMousemove = document.onmousemove;
         const domMouseup = document.onmouseup;
-        const trElem = cell.parentNode;
+        const trElem = cell.parentElement;
         const selectRecords = $xeTable.getCheckboxRecords();
         let lastRangeRows = [];
         const marginSize = 1;
@@ -21336,6 +21345,8 @@ keyboard_hook_hooks.add('tableKeyboardModule', {
         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;
@@ -21383,7 +21394,7 @@ keyboard_hook_hooks.add('tableKeyboardModule', {
           checkboxRangeElem.style.left = `${rangeLeft}px`;
           checkboxRangeElem.style.top = `${rangeTop}px`;
           checkboxRangeElem.style.display = 'block';
-          const rangeRows = getCheckboxRangeRows(params, trElem, offsetTop < marginSize ? -rangeHeight : rangeHeight);
+          const rangeRows = getCheckboxRangeRows(evnt, params, trElem, trRect, offsetClientTop, offsetTop < marginSize ? -rangeHeight : rangeHeight);
           // 至少滑动 10px 才能有效匹配
           if (rangeHeight > 10 && rangeRows.length !== lastRangeRows.length) {
             lastRangeRows = rangeRows;