vxe-table 3.15.24 → 3.15.25

package/es/table/src/util.js

@@ -400,7 +400,7 @@ export function rowToVisible($xeTable, row) {
     const reactData = $xeTable;
     const internalData = $xeTable;
     const { showOverflow } = tableProps;
-    const { scrollYLoad } = reactData;
+    const { scrollYLoad, scrollYTop } = reactData;
     const { elemStore, afterFullData, fullAllDataRowIdData, isResizeCellHeight } = internalData;
     const rowOpts = $xeTable.computeRowOpts;
     const cellOpts = $xeTable.computeCellOpts;
@@ -414,8 +414,7 @@ export function rowToVisible($xeTable, row) {
         const bodyScrollTop = bodyScrollElem.scrollTop;
         const trElem = bodyScrollElem.querySelector(`[rowid="${rowid}"]`);
         if (trElem) {
-            const trOffsetParent = trElem.offsetParent;
-            const trOffsetTop = trElem.offsetTop + (trOffsetParent ? trOffsetParent.offsetTop : 0);
+            const trOffsetTop = trElem.offsetTop + (scrollYLoad ? scrollYTop : 0);
             const trHeight = trElem.clientHeight;
             // 检测行是否在可视区中
             if (trOffsetTop < bodyScrollTop || trOffsetTop > bodyScrollTop + bodyHeight) {
@@ -456,7 +455,7 @@ export function rowToVisible($xeTable, row) {
 export function colToVisible($xeTable, column, row) {
     const reactData = $xeTable;
     const internalData = $xeTable;
-    const { scrollXLoad } = reactData;
+    const { scrollXLoad, scrollXLeft } = reactData;
     const { elemStore, visibleColumn } = internalData;
     const leftFixedWidth = $xeTable.computeLeftFixedWidth;
     const rightFixedWidth = $xeTable.computeRightFixedWidth;
@@ -476,8 +475,7 @@ export function colToVisible($xeTable, column, row) {
             tdElem = bodyScrollElem.querySelector(`.${column.id}`);
         }
         if (tdElem) {
-            const tdOffsetParent = tdElem.offsetParent;
-            const tdOffsetLeft = tdElem.offsetLeft + (tdOffsetParent ? tdOffsetParent.offsetLeft : 0);
+            const tdOffsetLeft = tdElem.offsetLeft + (scrollXLoad ? scrollXLeft : 0);
             const cellWidth = tdElem.clientWidth;
             // 检测是否在可视区中
             if (tdOffsetLeft < (bodyScrollLeft + leftFixedWidth)) {

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "3.15.24";
+export const version = "3.15.25";
 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.15.24"}`;
+const version = `table v${"3.15.25"}`;
 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.15.24";
+const version = "3.15.25";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2864,7 +2864,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.15.24"}`;
+const log_version = `table v${"3.15.25"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -3496,7 +3496,8 @@ function rowToVisible($xeTable, row) {
     showOverflow
   } = tableProps;
   const {
-    scrollYLoad
+    scrollYLoad,
+    scrollYTop
   } = reactData;
   const {
     elemStore,
@@ -3516,8 +3517,7 @@ function rowToVisible($xeTable, row) {
     const bodyScrollTop = bodyScrollElem.scrollTop;
     const trElem = bodyScrollElem.querySelector(`[rowid="${rowid}"]`);
     if (trElem) {
-      const trOffsetParent = trElem.offsetParent;
-      const trOffsetTop = trElem.offsetTop + (trOffsetParent ? trOffsetParent.offsetTop : 0);
+      const trOffsetTop = trElem.offsetTop + (scrollYLoad ? scrollYTop : 0);
       const trHeight = trElem.clientHeight;
       // 检测行是否在可视区中
       if (trOffsetTop < bodyScrollTop || trOffsetTop > bodyScrollTop + bodyHeight) {
@@ -3557,7 +3557,8 @@ function colToVisible($xeTable, column, row) {
   const reactData = $xeTable;
   const internalData = $xeTable;
   const {
-    scrollXLoad
+    scrollXLoad,
+    scrollXLeft
   } = reactData;
   const {
     elemStore,
@@ -3581,8 +3582,7 @@ function colToVisible($xeTable, column, row) {
       tdElem = bodyScrollElem.querySelector(`.${column.id}`);
     }
     if (tdElem) {
-      const tdOffsetParent = tdElem.offsetParent;
-      const tdOffsetLeft = tdElem.offsetLeft + (tdOffsetParent ? tdOffsetParent.offsetLeft : 0);
+      const tdOffsetLeft = tdElem.offsetLeft + (scrollXLoad ? scrollXLeft : 0);
       const cellWidth = tdElem.clientWidth;
       // 检测是否在可视区中
       if (tdOffsetLeft < bodyScrollLeft + leftFixedWidth) {