vxe-table 4.13.23 → 4.13.25

package/es/table/src/util.js

@@ -439,7 +439,7 @@ export function rowToVisible($xeTable, row) {
     const internalData = $xeTable.internalData;
     const { computeLeftFixedWidth, computeRightFixedWidth, computeRowOpts, computeCellOpts, computeDefaultRowHeight } = $xeTable.getComputeMaps();
     const { showOverflow } = tableProps;
-    const { scrollYLoad } = reactData;
+    const { scrollYLoad, scrollYTop } = reactData;
     const { elemStore, afterFullData, fullAllDataRowIdData, isResizeCellHeight } = internalData;
     const rowOpts = computeRowOpts.value;
     const cellOpts = computeCellOpts.value;
@@ -453,8 +453,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) {
@@ -496,7 +495,7 @@ export function colToVisible($xeTable, column, row) {
     const reactData = $xeTable.reactData;
     const internalData = $xeTable.internalData;
     const { computeLeftFixedWidth, computeRightFixedWidth } = $xeTable.getComputeMaps();
-    const { scrollXLoad } = reactData;
+    const { scrollXLoad, scrollXLeft } = reactData;
     const { elemStore, visibleColumn } = internalData;
     const leftFixedWidth = computeLeftFixedWidth.value;
     const rightFixedWidth = computeRightFixedWidth.value;
@@ -516,8 +515,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 = "4.13.23";
+export const version = "4.13.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${"4.13.23"}`;
+const version = `table v${"4.13.25"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);

package/lib/index.umd.js

@@ -3138,7 +3138,7 @@ function eqEmptyValue(cellValue) {
 ;// ./packages/ui/index.ts
 
 
-const version = "4.13.23";
+const version = "4.13.25";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -3599,7 +3599,7 @@ var esnext_iterator_some = __webpack_require__(7550);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"4.13.23"}`;
+const log_version = `table v${"4.13.25"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// ./packages/table/src/columnInfo.ts
@@ -4498,7 +4498,8 @@ function rowToVisible($xeTable, row) {
     showOverflow
   } = tableProps;
   const {
-    scrollYLoad
+    scrollYLoad,
+    scrollYTop
   } = reactData;
   const {
     elemStore,
@@ -4518,8 +4519,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) {
@@ -4563,7 +4563,8 @@ function colToVisible($xeTable, column, row) {
     computeRightFixedWidth
   } = $xeTable.getComputeMaps();
   const {
-    scrollXLoad
+    scrollXLoad,
+    scrollXLeft
   } = reactData;
   const {
     elemStore,
@@ -4587,8 +4588,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) {
@@ -11346,7 +11346,7 @@ rows.forEach(row=>{const rowid=handleGetRowId(row);if(isForce||!checkMethod||che
              * 处理合并
              */handleUpdateBodyMerge(){const{mergeBodyList}=internalData;internalData.mergeBodyCellMaps=buildMergeData(mergeBodyList);reactData.mergeBodyFlag++;},handleUpdateFooterMerge(){const{mergeFooterList}=internalData;internalData.mergeFooterCellMaps=buildMergeData(mergeFooterList);reactData.mergeFootFlag++;},triggerHeaderTitleEvent(evnt,iconParams,params){const tipContent=iconParams.content||iconParams.message;if(tipContent){const{tooltipStore}=reactData;const{column}=params;const content=getFuncText(tipContent);handleTargetEnterEvent(true);tooltipStore.row=null;tooltipStore.column=column;tooltipStore.visible=true;tooltipStore.currOpts=iconParams;(0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)(()=>{const $tooltip=refTooltip.value;if($tooltip&&$tooltip.open){$tooltip.open(evnt.currentTarget,content);}});}},/**
              * 触发表头 tooltip 事件
-             */triggerHeaderTooltipEvent(evnt,params){const{tooltipStore}=reactData;const{column}=params;handleTargetEnterEvent(true);const titleElem=evnt.currentTarget;if(!titleElem){return;}const cellEl=titleElem.parentElement;if(!cellEl){return;}const thEl=cellEl.parentElement;if(!thEl){return;}if(tooltipStore.column!==column||!tooltipStore.visible){handleTooltip(evnt,thEl,thEl.querySelector('.vxe-cell--wrapper'),thEl.querySelector('.vxe-cell--title')||cellEl,params);}},/**
+             */triggerHeaderTooltipEvent(evnt,params){const{tooltipStore}=reactData;const{column}=params;handleTargetEnterEvent(true);const titleElem=evnt.currentTarget;if(!titleElem){return;}const cWrapperEl=titleElem.parentElement;if(!cWrapperEl){return;}const cellEl=cWrapperEl.parentElement;if(!cellEl){return;}const thEl=cellEl.parentElement;if(!thEl){return;}if(tooltipStore.column!==column||!tooltipStore.visible){const ctEl=thEl.querySelector('.vxe-cell--title');handleTooltip(evnt,thEl,(hasClass(thEl,'col--ellipsis')?ctEl:cWrapperEl)||cWrapperEl,ctEl||cellEl,params);}},/**
              * 触发单元格 tooltip 事件
              */triggerBodyTooltipEvent(evnt,params){const{editConfig}=props;const{editStore}=reactData;const{tooltipStore}=reactData;const editOpts=computeEditOpts.value;const{actived}=editStore;const{row,column}=params;const tdEl=evnt.currentTarget;handleTargetEnterEvent(tooltipStore.column!==column||tooltipStore.row!==row);// 单元格处于编辑状态时不触发提示框
 if(column.editRender&&isEnableConf(editConfig)){// 如果是行编辑模式