vxe-table 3.25.0-beta.2 → 3.25.0-beta.3

package/es/table/module/custom/panel.js

@@ -424,8 +424,8 @@ export default {
             const { prevDragCol, prevDragGroupField, prevDragAggFnColid, prevDragPos, prevDragToChild } = customPanelInternalData;
             const dragOffsetIndex = prevDragPos === 'bottom' ? 1 : 0;
             if (prevDragGroupField || prevDragAggFnColid) {
-                if ($xeTable.handlePivotTableAggregatePanelDragendEvent) {
-                    $xeTable.handlePivotTableAggregatePanelDragendEvent(evnt);
+                if ($xeTable.handlePivotTableAggPanelDragendEvent) {
+                    $xeTable.handlePivotTableAggPanelDragendEvent(evnt);
                 }
             }
             else if (prevDragCol && dragCol) {

package/es/table/module/filter/mixin.js

@@ -63,6 +63,7 @@ function updatePopupStyle($xeTable) {
         if (transfer) {
             const ppObj = updatePanelPlacement(currEl, filterWrapperElem, {
                 defaultPlacement: 'bottom',
+                appendTo: '',
                 isMinWidth: false,
                 teleportTo: transfer
             });

package/es/table/src/methods.js

@@ -6,11 +6,11 @@ import Cell from './cell';
 import { getRowUniqueId, createRowId, clearTableAllStatus, getColumnList, toFilters, getRowkey, getRowid, rowToVisible, colToVisible, getCellValue, setCellValue, handleRowidOrRow, handleFieldOrColumn, toTreePathSeq, restoreScrollLocation, getRootColumn, getColReMinWidth, getColReMaxWidth, createHandleUpdateRowId, createHandleGetRowId, getRefElem, getCellRestHeight, getLastChildColumn, getRowMaxHeight, handleCustomStoreConfig, encodeRowid } from './util';
 import { getSlotVNs } from '../../ui/src/vn';
 import { moveRowAnimateToTb, clearRowAnimate, moveColAnimateToLr, clearColAnimate } from '../../ui/src/anime';
-import { getThumbOffsetSize, getThumbSize, getScrollFromClick, getScrollFromDrag } from './scrollbar';
 import { createComponentLog } from '../../ui/src/log';
 import { getCrossTableDragRowInfo } from './store';
 const { warnLog, errLog } = createComponentLog('table');
-const { getConfig, getI18n, renderer, formats, interceptor, createEvent, globalEvents, GLOBAL_EVENT_KEYS } = VxeUI;
+const { getConfig, getI18n, renderer, scrollbarUtils, formats, interceptor, createEvent, globalEvents, GLOBAL_EVENT_KEYS } = VxeUI;
+const { getThumbOffsetSize, getThumbSize, getScrollFromClick, getScrollFromDrag } = scrollbarUtils || {};
 const supportMaxRow = 5e6;
 const customStorageKey = 'VXE_CUSTOM_STORE';
 const maxYHeight = 5e6;

package/es/table/src/table.js

@@ -992,7 +992,8 @@ export default {
         computeTooltipOpts() {
             const $xeTable = this;
             const props = $xeTable;
-            return Object.assign({}, getConfig().tooltip, getConfig().table.tooltipConfig, props.tooltipConfig);
+            const { useScrollbar } = props;
+            return Object.assign({ useScrollbar }, getConfig().tooltip, getConfig().table.tooltipConfig, props.tooltipConfig);
         },
         tipConfig() {
             return Object.assign({}, this.tooltipOpts);
@@ -2589,7 +2590,8 @@ export default {
                         ref: 'refCommTooltip',
                         props: {
                             isArrow: false,
-                            enterable: false
+                            enterable: false,
+                            useScrollbar
                         }
                     })
                     : renderEmptyElement($xeTable),
@@ -2616,7 +2618,8 @@ export default {
                             maxHeight: tableTipConfig.maxHeight,
                             placement: tableTipConfig.placement,
                             defaultPlacement: tableTipConfig.defaultPlacement,
-                            popupClassName: tableTipConfig.popupClassName
+                            popupClassName: tableTipConfig.popupClassName,
+                            useScrollbar: tableTipConfig.useScrollbar
                         },
                         scopedSlots: currTooltipSlot
                             ? {
@@ -2659,7 +2662,8 @@ export default {
                             theme: validTipConfig.theme,
                             enterable: validTipConfig.enterable,
                             enterDelay: validTipConfig.enterDelay,
-                            leaveDelay: validTipConfig.leaveDelay
+                            leaveDelay: validTipConfig.leaveDelay,
+                            useScrollbar
                         }
                     })
                     : renderEmptyElement($xeTable)

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "3.25.0-beta.2";
+export const version = "3.25.0-beta.3";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({

package/es/ui/src/dom.js

@@ -231,7 +231,8 @@ export function wheelScrollTopTo(diffNum, cb) {
  * 通用定位计算
  */
 export function updatePanelPlacement(targetElem, panelElem, options) {
-    const { defaultTop, defaultLeft, placement, defaultPlacement, teleportTo, marginSize, isMinWidth } = Object.assign({
+    const { defaultTop, defaultLeft, placement, defaultPlacement, appendTo, teleportTo, marginSize, isMinWidth } = Object.assign({
+        appendTo: '',
         teleportTo: false,
         marginSize: 18,
         isMinWidth: true
@@ -245,7 +246,7 @@ export function updatePanelPlacement(targetElem, panelElem, options) {
     const stys = {};
     if (panelElem && targetElem) {
         const bodyEl = document.body;
-        const parentWrapperEl = getPopupWrapperElement(panelElem);
+        const parentWrapperEl = getPopupWrapperElement(teleportTo ? getPopupAppendElement(appendTo) : panelElem);
         if (parentWrapperEl) {
             const targetWidth = targetElem.offsetWidth;
             const targetHeight = targetElem.offsetHeight;
@@ -256,14 +257,16 @@ export function updatePanelPlacement(targetElem, panelElem, options) {
             const targetRect = targetElem.getBoundingClientRect();
             const visibleHeight = bodyEl.clientHeight;
             const visibleWidth = bodyEl.clientWidth;
-            const offsetLeft = parentWrapperRect.left;
-            const offsetTop = parentWrapperRect.top;
+            const parentWrapperScrollLeft = parentWrapperEl.scrollLeft;
+            const parentWrapperScrollTop = parentWrapperEl.scrollTop;
+            const parentWrapperOffsetLeft = parentWrapperRect.left;
+            const parentWrapperOffsetTop = parentWrapperRect.top;
             const targetLeft = targetRect.left;
             const targetTop = targetRect.top;
             minWidth = targetElem.offsetWidth;
             if (teleportTo) {
-                left = defaultLeft || (targetLeft - (panelWidth - targetWidth) / 2);
-                top = defaultTop || (targetTop + targetHeight);
+                left = (defaultLeft || (targetLeft - (panelWidth - targetWidth) / 2)) - parentWrapperScrollLeft;
+                top = (defaultTop || (targetTop + targetHeight)) - parentWrapperScrollTop;
                 if (placement === 'top') {
                     panelPlacement = 'top';
                     top = targetTop - panelHeight;
@@ -307,8 +310,8 @@ export function updatePanelPlacement(targetElem, panelElem, options) {
                     left = marginSize;
                 }
                 // 偏移
-                top -= offsetTop;
-                left -= offsetLeft;
+                top -= parentWrapperOffsetTop;
+                left -= parentWrapperOffsetLeft;
             }
             else {
                 if (placement === 'top') {

package/es/ui/src/log.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 const { log } = VxeUI;
-const tableVersion = `table v${"3.25.0-beta.2"}`;
+const tableVersion = `table v${"3.25.0-beta.3"}`;
 export function createComponentLog(name) {
     const uiVersion = VxeUI.uiVersion ? `ui v${VxeUI.uiVersion}` : '';
     const ganttVersion = VxeUI.ganttVersion ? `gantt v${VxeUI.ganttVersion}` : '';

package/lib/index.umd.js

@@ -3323,7 +3323,7 @@ function getDefaultConfig(val1, def1) {
 /* unused harmony import specifier */ var VxeUI;
 
 
-const version = "3.25.0-beta.2";
+const version = "3.25.0-beta.3";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -3865,7 +3865,6 @@ var es_iterator_reduce = __webpack_require__(8237);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.iterator.some.js
 var es_iterator_some = __webpack_require__(3579);
 ;// ./packages/ui/src/dom.ts
-/* unused harmony import specifier */ var XEUtils;
 
 
 const reClsMap = {};
@@ -4124,10 +4123,12 @@ function updatePanelPlacement(targetElem, panelElem, options) {
     defaultLeft,
     placement,
     defaultPlacement,
+    appendTo,
     teleportTo,
     marginSize,
     isMinWidth
   } = Object.assign({
+    appendTo: '',
     teleportTo: false,
     marginSize: 18,
     isMinWidth: true
@@ -4141,7 +4142,7 @@ function updatePanelPlacement(targetElem, panelElem, options) {
   const stys = {};
   if (panelElem && targetElem) {
     const bodyEl = document.body;
-    const parentWrapperEl = getPopupWrapperElement(panelElem);
+    const parentWrapperEl = getPopupWrapperElement(teleportTo ? getPopupAppendElement(appendTo) : panelElem);
     if (parentWrapperEl) {
       const targetWidth = targetElem.offsetWidth;
       const targetHeight = targetElem.offsetHeight;
@@ -4152,14 +4153,16 @@ function updatePanelPlacement(targetElem, panelElem, options) {
       const targetRect = targetElem.getBoundingClientRect();
       const visibleHeight = bodyEl.clientHeight;
       const visibleWidth = bodyEl.clientWidth;
-      const offsetLeft = parentWrapperRect.left;
-      const offsetTop = parentWrapperRect.top;
+      const parentWrapperScrollLeft = parentWrapperEl.scrollLeft;
+      const parentWrapperScrollTop = parentWrapperEl.scrollTop;
+      const parentWrapperOffsetLeft = parentWrapperRect.left;
+      const parentWrapperOffsetTop = parentWrapperRect.top;
       const targetLeft = targetRect.left;
       const targetTop = targetRect.top;
       minWidth = targetElem.offsetWidth;
       if (teleportTo) {
-        left = defaultLeft || targetLeft - (panelWidth - targetWidth) / 2;
-        top = defaultTop || targetTop + targetHeight;
+        left = (defaultLeft || targetLeft - (panelWidth - targetWidth) / 2) - parentWrapperScrollLeft;
+        top = (defaultTop || targetTop + targetHeight) - parentWrapperScrollTop;
         if (placement === 'top') {
           panelPlacement = 'top';
           top = targetTop - panelHeight;
@@ -4201,8 +4204,8 @@ function updatePanelPlacement(targetElem, panelElem, options) {
           left = marginSize;
         }
         // 偏移
-        top -= offsetTop;
-        left -= offsetLeft;
+        top -= parentWrapperOffsetTop;
+        left -= parentWrapperOffsetLeft;
       } else {
         if (placement === 'top') {
           panelPlacement = 'top';
@@ -4268,12 +4271,12 @@ function getPopupWrapperElement(panelElem) {
   return (parentEl === bodyEl ? document.documentElement : parentEl) || null;
 }
 function getPopupContainer(appendTo) {
-  const selectElem = appendTo && XEUtils.isFunction(appendTo) ? appendTo({}) : appendTo;
+  const selectElem = appendTo && external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(appendTo) ? appendTo({}) : appendTo;
   return selectElem || 'body';
 }
 function getPopupAppendElement(appendTo) {
   const selectElem = getPopupContainer(appendTo);
-  if (XEUtils.isString(selectElem)) {
+  if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(selectElem)) {
     return document.querySelector(selectElem) || document.body;
   }
   return selectElem;
@@ -4283,7 +4286,7 @@ function getPopupAppendElement(appendTo) {
 const {
   log: log_log
 } = core_.VxeUI;
-const tableVersion = `table v${"3.25.0-beta.2"}`;
+const tableVersion = `table v${"3.25.0-beta.3"}`;
 function createComponentLog(name) {
   const uiVersion = core_.VxeUI.uiVersion ? `ui v${core_.VxeUI.uiVersion}` : '';
   const ganttVersion = core_.VxeUI.ganttVersion ? `gantt v${core_.VxeUI.ganttVersion}` : '';
@@ -8054,61 +8057,6 @@ function clearColAnimate(elem, clss) {
     }
   }, 500);
 }
-;// ./packages/table/src/scrollbar.ts
-/**
- * 计算滚动条滑块的长度
- */
-function getThumbSize(viewportSize, contentSize, trackSize) {
-  if (contentSize <= viewportSize) {
-    return 0;
-  }
-  const ratio = viewportSize / contentSize;
-  const ideal = trackSize * ratio;
-  return Math.max(20, Math.min(ideal, trackSize));
-}
-/**
- * 计算滚动条滑块的偏移位置
- */
-function getThumbOffsetSize(offsetSize, viewportSize, contentSize, trackSize, thumbSize) {
-  const maxScroll = contentSize - viewportSize;
-  if (maxScroll <= 0) {
-    return 0;
-  }
-  const maxThumbOffset = trackSize - thumbSize;
-  if (maxThumbOffset <= 0) {
-    return 0;
-  }
-  const clamped = Math.min(Math.max(offsetSize, 0), maxScroll);
-  const ratio = clamped / maxScroll;
-  return ratio * maxThumbOffset;
-}
-/**
- * 根据点击轨道的位置，计算滑块的偏移位置
- */
-function getScrollFromClick(clickPosition, viewportSize, contentSize, trackSize, thumbSize) {
-  const maxThumbOffset = trackSize - thumbSize;
-  const maxScroll = contentSize - viewportSize;
-  if (maxScroll <= 0 || maxThumbOffset <= 0) {
-    return 0;
-  }
-  let thumbOffset = clickPosition - thumbSize / 2;
-  thumbOffset = Math.min(Math.max(thumbOffset, 0), maxThumbOffset);
-  const scrollOffset = thumbOffset / maxThumbOffset * maxScroll;
-  return scrollOffset;
-}
-/**
- * 拖拽 thumb 时，根据鼠标位置计算滑块的偏移位置
- */
-function getScrollFromDrag(pointerPosition, dragOffset, viewportSize, contentSize, trackSize, thumbSize) {
-  const maxScroll = contentSize - viewportSize;
-  const maxThumbOffset = trackSize - thumbSize;
-  if (maxScroll <= 0 || maxThumbOffset <= 0) {
-    return 0;
-  }
-  let thumbOffset = pointerPosition - dragOffset;
-  thumbOffset = Math.min(Math.max(thumbOffset, 0), maxThumbOffset);
-  return thumbOffset / maxThumbOffset * maxScroll;
-}
 ;// ./packages/table/src/store.ts
 // 跨表拖拽
 const crossTableDragRowGlobal = {
@@ -8119,7 +8067,7 @@ function getCrossTableDragRowInfo($xeTable) {
   return crossTableDragRowInfo;
 }
 ;// ./packages/table/src/methods.ts
-const{warnLog: methods_warnLog,errLog: methods_errLog}=createComponentLog('table');const{getConfig: methods_getConfig,getI18n: methods_getI18n,renderer: methods_renderer,formats: methods_formats,interceptor: methods_interceptor,createEvent,globalEvents: methods_globalEvents,GLOBAL_EVENT_KEYS}=core_.VxeUI;const supportMaxRow=5e6;const customStorageKey='VXE_CUSTOM_STORE';const maxYHeight=5e6;const maxXWidth=5e6;const sourceType='table';let crossTableDragRowObj=null;function eqCellValue(newRow,oldRow,field){const val1=external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(newRow,field);const val2=external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(oldRow,field);let result=false;if(eqEmptyValue(val1)&&eqEmptyValue(val2)){result=true;}else if(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(val1)||external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(val1)){result=''+val1===''+val2;}else{result=external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isEqual(val1,val2);}return{newValue:val1,oldValue:val2,result};}function getNextSortOrder($xeTable,column){const sortOpts=$xeTable.computeSortOpts;const{orders=[]}=sortOpts;const currOrder=column.order||null;const oIndex=orders.indexOf(currOrder)+1;return orders[oIndex<orders.length?oIndex:0];}const getCustomStorageMap=id=>{const version=methods_getConfig().version;const rest=external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toStringJSON(localStorage.getItem(customStorageKey)||'');const maps=rest&&rest._v===version?rest:{_v:version};return(id?maps[id]:maps)||{};};const setCustomStorageMap=(id,data)=>{const version=methods_getConfig().version;const maps=getCustomStorageMap();maps[id]=data||undefined;maps._v=version;localStorage.setItem(customStorageKey,external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toJSONString(maps));};const getRecoverRowMaps=($xeTable,keyMaps)=>{const internalData=$xeTable;const{fullAllDataRowIdData}=internalData;const restKeys={};external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(keyMaps,(row,rowid)=>{if(fullAllDataRowIdData[rowid]){restKeys[rowid]=row;}});return restKeys;};function handleReserveRow($xeTable,reserveRowMap){const internalData=$xeTable;const{fullDataRowIdData}=internalData;const reserveList=[];external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(reserveRowMap,(item,rowid)=>{if(fullDataRowIdData[rowid]&&reserveList.indexOf(fullDataRowIdData[rowid].row)===-1){reserveList.push(fullDataRowIdData[rowid].row);}});return reserveList;}function handleVirtualXVisible($xeTable){const reactData=$xeTable;const internalData=$xeTable;const{isScrollXBig,scrollXWidth}=reactData;const{elemStore,visibleColumn,fullColumnIdData}=internalData;const leftFixedWidth=$xeTable.computeLeftFixedWidth;const rightFixedWidth=$xeTable.computeRightFixedWidth;const bodyScrollElem=getRefElem(elemStore['main-body-scroll']);if(bodyScrollElem){const clientWidth=bodyScrollElem.clientWidth;let scrollLeft=bodyScrollElem.scrollLeft;if(isScrollXBig){scrollLeft=Math.ceil((scrollXWidth-clientWidth)*Math.min(1,scrollLeft/(maxXWidth-clientWidth)));}const startLeft=scrollLeft+leftFixedWidth;const endLeft=scrollLeft+clientWidth-rightFixedWidth;let leftIndex=0;let rightIndex=visibleColumn.length;while(leftIndex<rightIndex){const cIndex=Math.floor((leftIndex+rightIndex)/2);const column=visibleColumn[cIndex];const colid=column.id;const colRest=fullColumnIdData[colid]||{};if(colRest.oLeft<=startLeft){leftIndex=cIndex+1;}else{rightIndex=cIndex;}}let visibleSize=0;const toVisibleIndex=leftIndex===visibleColumn.length?leftIndex:Math.max(0,leftIndex<visibleColumn.length?leftIndex-2:0);for(let cIndex=toVisibleIndex,cLen=visibleColumn.length;cIndex<cLen;cIndex++){const column=visibleColumn[cIndex];const colid=column.id;const colRest=fullColumnIdData[colid]||{};visibleSize++;if(colRest.oLeft>endLeft||visibleSize>=60){break;}}return{toVisibleIndex:Math.max(0,toVisibleIndex),visibleSize:Math.max(6,visibleSize)};}return{toVisibleIndex:0,visibleSize:6};}function handleCustomRestore($xeTable,storeData){const props=$xeTable;const reactData=$xeTable;const internalData=$xeTable;const $xeGrid=$xeTable.$xeGrid;const $xeGantt=$xeTable.$xeGantt;const $xeGGWrapper=$xeGrid||$xeGantt;const{aggregateConfig,rowGroupConfig}=props;const{collectColumn}=internalData;const{isCustomAlign,isCustomHeaderAlign,isCustomFooterAlign,isCustomResizable,isCustomVisible,isCustomFixed,isCustomSort,isCustomAggGroup,isCustomAggFunc,isCustomPager}=handleCustomStoreConfig($xeTable);let{alignData,headerAlignData,footerAlignData,resizableData,sortData,visibleData,fixedData,aggGroupData,aggFuncData,pagerData}=storeData;// 处理还原
+const{warnLog: methods_warnLog,errLog: methods_errLog}=createComponentLog('table');const{getConfig: methods_getConfig,getI18n: methods_getI18n,renderer: methods_renderer,scrollbarUtils,formats: methods_formats,interceptor: methods_interceptor,createEvent,globalEvents: methods_globalEvents,GLOBAL_EVENT_KEYS}=core_.VxeUI;const{getThumbOffsetSize,getThumbSize,getScrollFromClick,getScrollFromDrag}=scrollbarUtils||{};const supportMaxRow=5e6;const customStorageKey='VXE_CUSTOM_STORE';const maxYHeight=5e6;const maxXWidth=5e6;const sourceType='table';let crossTableDragRowObj=null;function eqCellValue(newRow,oldRow,field){const val1=external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(newRow,field);const val2=external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(oldRow,field);let result=false;if(eqEmptyValue(val1)&&eqEmptyValue(val2)){result=true;}else if(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(val1)||external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(val1)){result=''+val1===''+val2;}else{result=external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isEqual(val1,val2);}return{newValue:val1,oldValue:val2,result};}function getNextSortOrder($xeTable,column){const sortOpts=$xeTable.computeSortOpts;const{orders=[]}=sortOpts;const currOrder=column.order||null;const oIndex=orders.indexOf(currOrder)+1;return orders[oIndex<orders.length?oIndex:0];}const getCustomStorageMap=id=>{const version=methods_getConfig().version;const rest=external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toStringJSON(localStorage.getItem(customStorageKey)||'');const maps=rest&&rest._v===version?rest:{_v:version};return(id?maps[id]:maps)||{};};const setCustomStorageMap=(id,data)=>{const version=methods_getConfig().version;const maps=getCustomStorageMap();maps[id]=data||undefined;maps._v=version;localStorage.setItem(customStorageKey,external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toJSONString(maps));};const getRecoverRowMaps=($xeTable,keyMaps)=>{const internalData=$xeTable;const{fullAllDataRowIdData}=internalData;const restKeys={};external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(keyMaps,(row,rowid)=>{if(fullAllDataRowIdData[rowid]){restKeys[rowid]=row;}});return restKeys;};function handleReserveRow($xeTable,reserveRowMap){const internalData=$xeTable;const{fullDataRowIdData}=internalData;const reserveList=[];external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(reserveRowMap,(item,rowid)=>{if(fullDataRowIdData[rowid]&&reserveList.indexOf(fullDataRowIdData[rowid].row)===-1){reserveList.push(fullDataRowIdData[rowid].row);}});return reserveList;}function handleVirtualXVisible($xeTable){const reactData=$xeTable;const internalData=$xeTable;const{isScrollXBig,scrollXWidth}=reactData;const{elemStore,visibleColumn,fullColumnIdData}=internalData;const leftFixedWidth=$xeTable.computeLeftFixedWidth;const rightFixedWidth=$xeTable.computeRightFixedWidth;const bodyScrollElem=getRefElem(elemStore['main-body-scroll']);if(bodyScrollElem){const clientWidth=bodyScrollElem.clientWidth;let scrollLeft=bodyScrollElem.scrollLeft;if(isScrollXBig){scrollLeft=Math.ceil((scrollXWidth-clientWidth)*Math.min(1,scrollLeft/(maxXWidth-clientWidth)));}const startLeft=scrollLeft+leftFixedWidth;const endLeft=scrollLeft+clientWidth-rightFixedWidth;let leftIndex=0;let rightIndex=visibleColumn.length;while(leftIndex<rightIndex){const cIndex=Math.floor((leftIndex+rightIndex)/2);const column=visibleColumn[cIndex];const colid=column.id;const colRest=fullColumnIdData[colid]||{};if(colRest.oLeft<=startLeft){leftIndex=cIndex+1;}else{rightIndex=cIndex;}}let visibleSize=0;const toVisibleIndex=leftIndex===visibleColumn.length?leftIndex:Math.max(0,leftIndex<visibleColumn.length?leftIndex-2:0);for(let cIndex=toVisibleIndex,cLen=visibleColumn.length;cIndex<cLen;cIndex++){const column=visibleColumn[cIndex];const colid=column.id;const colRest=fullColumnIdData[colid]||{};visibleSize++;if(colRest.oLeft>endLeft||visibleSize>=60){break;}}return{toVisibleIndex:Math.max(0,toVisibleIndex),visibleSize:Math.max(6,visibleSize)};}return{toVisibleIndex:0,visibleSize:6};}function handleCustomRestore($xeTable,storeData){const props=$xeTable;const reactData=$xeTable;const internalData=$xeTable;const $xeGrid=$xeTable.$xeGrid;const $xeGantt=$xeTable.$xeGantt;const $xeGGWrapper=$xeGrid||$xeGantt;const{aggregateConfig,rowGroupConfig}=props;const{collectColumn}=internalData;const{isCustomAlign,isCustomHeaderAlign,isCustomFooterAlign,isCustomResizable,isCustomVisible,isCustomFixed,isCustomSort,isCustomAggGroup,isCustomAggFunc,isCustomPager}=handleCustomStoreConfig($xeTable);let{alignData,headerAlignData,footerAlignData,resizableData,sortData,visibleData,fixedData,aggGroupData,aggFuncData,pagerData}=storeData;// 处理还原
 if(isCustomAlign&&alignData||isCustomHeaderAlign&&headerAlignData||isCustomFooterAlign&&footerAlignData||isCustomResizable&&resizableData||isCustomSort&&sortData||isCustomVisible&&visibleData||isCustomFixed&&fixedData||isCustomAggGroup&&aggGroupData||isCustomAggFunc&&aggFuncData||isCustomPager&&pagerData&&$xeGGWrapper){const sortColMaps={};if(isCustomSort&&sortData){// 转换兼容老版本数据，即将废弃兼容
 if(!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(sortData)){const sortRests=[];external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(sortData,(index,colKey)=>{sortRests.push({key:colKey,index});});sortData=external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().orderBy(sortRests,{field:'index',order:'asc'}).map(item=>({k:item.key}));}let colNum=1;external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(sortData,(sObj,index,sOjs,path,pSObj)=>{sortColMaps[sObj.k]={key:sObj.k,sNum:colNum++,pKey:pSObj?pSObj.k:null};},{children:'c'});}const colKeyMaps={};const allCols=[];const aggGroupConfs=[];external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(collectColumn,(column,index,items,path,parentColumn)=>{const colKey=column.getKey();// 支持一级
 if(!parentColumn){if(isCustomFixed&&fixedData&&fixedData[colKey]!==undefined){column.fixed=fixedData[colKey];}}if(isCustomResizable&&resizableData&&external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(resizableData[colKey])){column.resizeWidth=resizableData[colKey];}if(isCustomVisible&&visibleData&&external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(visibleData[colKey])){column.visible=visibleData[colKey];}if(isCustomAggFunc&&aggFuncData&&(aggregateConfig||rowGroupConfig)&&aggFuncData[colKey]){column.aggFunc=aggFuncData[colKey];}if(isCustomAggGroup&&aggGroupData&&aggGroupData[colKey]){aggGroupConfs.push({field:column.field});}colKeyMaps[colKey]=column;allCols.push(column);});if((aggregateConfig||rowGroupConfig)&&aggGroupConfs.length){const groupRest=handleGroupData($xeTable,internalData.tableFullData,aggGroupConfs);internalData.tableFullTreeData=[];internalData.tableFullGroupData=groupRest.treeData;reactData.isRowGroupStatus=true;reactData.rowGroupList=aggGroupConfs;$xeTable.cacheRowMap(false);}// 如果自定义了顺序
@@ -11676,8 +11624,8 @@ function panel_hideDropTip($xeTableCustomPanel) {
       } = customPanelInternalData;
       const dragOffsetIndex = prevDragPos === 'bottom' ? 1 : 0;
       if (prevDragGroupField || prevDragAggFnColid) {
-        if ($xeTable.handlePivotTableAggregatePanelDragendEvent) {
-          $xeTable.handlePivotTableAggregatePanelDragendEvent(evnt);
+        if ($xeTable.handlePivotTableAggPanelDragendEvent) {
+          $xeTable.handlePivotTableAggPanelDragendEvent(evnt);
         }
       } else if (prevDragCol && dragCol) {
         // 判断是否有拖动
@@ -14535,6 +14483,7 @@ function updatePopupStyle($xeTable) {
     if (transfer) {
       const ppObj = updatePanelPlacement(currEl, filterWrapperElem, {
         defaultPlacement: 'bottom',
+        appendTo: '',
         isMinWidth: false,
         teleportTo: transfer
       });
@@ -22294,7 +22243,12 @@ function renderVirtualBody(h, $xeTable) {
     computeTooltipOpts() {
       const $xeTable = this;
       const props = $xeTable;
-      return Object.assign({}, table_getConfig().tooltip, table_getConfig().table.tooltipConfig, props.tooltipConfig);
+      const {
+        useScrollbar
+      } = props;
+      return Object.assign({
+        useScrollbar
+      }, table_getConfig().tooltip, table_getConfig().table.tooltipConfig, props.tooltipConfig);
     },
     tipConfig() {
       return {
@@ -24033,7 +23987,8 @@ function renderVirtualBody(h, $xeTable) {
       ref: 'refCommTooltip',
       props: {
         isArrow: false,
-        enterable: false
+        enterable: false,
+        useScrollbar
       }
     }) : table_renderEmptyElement($xeTable),
     /**
@@ -24058,7 +24013,8 @@ function renderVirtualBody(h, $xeTable) {
         maxHeight: tableTipConfig.maxHeight,
         placement: tableTipConfig.placement,
         defaultPlacement: tableTipConfig.defaultPlacement,
-        popupClassName: tableTipConfig.popupClassName
+        popupClassName: tableTipConfig.popupClassName,
+        useScrollbar: tableTipConfig.useScrollbar
       },
       scopedSlots: currTooltipSlot ? {
         content: () => {
@@ -24122,7 +24078,8 @@ function renderVirtualBody(h, $xeTable) {
         theme: validTipConfig.theme,
         enterable: validTipConfig.enterable,
         enterDelay: validTipConfig.enterDelay,
-        leaveDelay: validTipConfig.leaveDelay
+        leaveDelay: validTipConfig.leaveDelay,
+        useScrollbar
       }
     }) : table_renderEmptyElement($xeTable)])]);
   },