vxe-table 3.10.14 → 3.10.15

package/lib/ui/src/log.js

@@ -8,6 +8,6 @@ var _core = require("@vxe-ui/core");
 const {
   log
 } = _core.VxeUI;
-const version = `table v${"3.10.14"}`;
+const version = `table v${"3.10.15"}`;
 const warnLog = exports.warnLog = log.create('warn', version);
 const errLog = exports.errLog = log.create('error', version);

package/lib/ui/src/log.min.js

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),exports.warnLog=exports.errLog=void 0;var _core=require("@vxe-ui/core");let log=_core.VxeUI.log,version="table v3.10.14",warnLog=exports.warnLog=log.create("warn",version),errLog=exports.errLog=log.create("error",version);
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.warnLog=exports.errLog=void 0;var _core=require("@vxe-ui/core");let log=_core.VxeUI.log,version="table v3.10.15",warnLog=exports.warnLog=log.create("warn",version),errLog=exports.errLog=log.create("error",version);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vxe-table",
-  "version": "3.10.14",
+  "version": "3.10.15",
   "description": "一个基于 vue 的 PC 端表格组件，支持增删改查、虚拟树、列拖拽，懒加载、快捷菜单、数据校验、树形结构、打印、导入导出、自定义模板、渲染器、JSON 配置式...",
   "scripts": {
     "update": "npm install --legacy-peer-deps",

package/packages/table/module/keyboard/mixin.ts

@@ -23,25 +23,42 @@ function getTargetOffset (target: any, container: any) {
   return { offsetTop, offsetLeft }
 }
 
-function getCheckboxRangeRows (_vm: any, params: any, targetTrElem: any, moveRange: any) {
+function getCheckboxRangeRows ($xeTable: any, evnt: MouseEvent, params: any, targetTrElem: HTMLElement, trRect: DOMRect, offsetClientTop: number, moveRange: number) {
+  const reactData = $xeTable
+  const internalData = $xeTable
+
   let countHeight = 0
-  let rangeRows = []
+  let rangeRows: any[] = []
+  let moveSize = 0
   const isDown = moveRange > 0
-  const moveSize = moveRange > 0 ? moveRange : (Math.abs(moveRange) + targetTrElem.offsetHeight)
-  const { afterFullData, scrollYStore, scrollYLoad } = _vm
+  const { scrollYLoad } = 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`] as HTMLElement
+      }
     }
   }
   return rangeRows
@@ -228,6 +245,8 @@ export default {
         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: any = null
         let isMouseScrollDown: any = false
         let mouseScrollSpaceSize = 1
@@ -269,7 +288,7 @@ export default {
           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