vxe-table 3.23.1 → 3.23.3

package/lib/index.umd.js

@@ -3314,7 +3314,7 @@ function getDefaultConfig(val1, def1) {
 /* unused harmony import specifier */ var VxeUI;
 
 
-const version = "3.23.1";
+const version = "3.23.3";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -3877,7 +3877,7 @@ function getTpImg() {
   return tpImgEl;
 }
 function getPropClass(property, params) {
-  return property ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(property) ? property(params) : property : '';
+  return property ? (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(property) ? property(params) : property) || '' : '';
 }
 function getClsRE(cls) {
   if (!reClsMap[cls]) {
@@ -4112,7 +4112,7 @@ function getPopupAppendElement(appendTo) {
 const {
   log: log_log
 } = core_.VxeUI;
-const tableVersion = `table v${"3.23.1"}`;
+const tableVersion = `table v${"3.23.3"}`;
 function createComponentLog(name) {
   const uiVersion = core_.VxeUI.uiVersion ? `ui v${core_.VxeUI.uiVersion}` : '';
   const ganttVersion = core_.VxeUI.ganttVersion ? `gantt v${core_.VxeUI.ganttVersion}` : '';
@@ -4625,6 +4625,7 @@ function createReactData() {
     customColumnList: [],
     // 当前选中的筛选列
     filterStore: {
+      targetEl: null,
       isAllSelected: false,
       isIndeterminate: false,
       style: null,
@@ -7968,7 +7969,7 @@ remainList.forEach(column=>{const width=Math.max(meanWidth,minCellWidth);column.
  * 计算自适应行高
  */const calcCellAutoHeight=($xeTable,rowid,rowRest,wrapperEl)=>{const internalData=$xeTable;const{fullCellHeightMaps}=internalData;let chRest=fullCellHeightMaps[rowid];if(!chRest){chRest={};fullCellHeightMaps[rowid]=chRest;}const wrapperElemList=wrapperEl.querySelectorAll(`.vxe-cell--wrapper[rowid="${rowRest.rowid}"]`);let firstCellStyle=null;let topBottomPadding=0;let changeCH=false;for(let i=0;i<wrapperElemList.length;i++){const wrapperElem=wrapperElemList[i];const cellElem=wrapperElem.parentElement;const cellStyle=cellElem.style;const orHeight=cellStyle.height;const colid=wrapperElem.getAttribute('colid')||'';cellStyle.height='';if(!firstCellStyle){firstCellStyle=getComputedStyle(cellElem);topBottomPadding=firstCellStyle?Math.ceil(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(firstCellStyle.paddingTop)+external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(firstCellStyle.paddingBottom)):0;}const cellHeight=wrapperElem?wrapperElem.clientHeight:0;const colHeight=Math.ceil(cellHeight+topBottomPadding);if(chRest[colid]!==colHeight){changeCH=true;chRest[colid]=colHeight;}cellStyle.height=orHeight;}const cellMaxHeight=getRowMaxHeight(chRest,changeCH);return cellMaxHeight;};/**
  * 自适应行高
- */const calcCellHeight=$xeTable=>{const props=$xeTable;const reactData=$xeTable;const internalData=$xeTable;const{treeConfig}=props;const{tableData,isAllOverflow,scrollYLoad,scrollXLoad}=reactData;const{fullAllDataRowIdData}=internalData;const el=$xeTable.$refs.refElem;if(!el||!el.clientWidth){return;}const cellOpts=$xeTable.computeCellOpts;const treeOpts=$xeTable.computeTreeOpts;const defaultRowHeight=$xeTable.computeDefaultRowHeight;if(!isAllOverflow&&(scrollYLoad||scrollXLoad||cellOpts.maxHeight||treeConfig&&treeOpts.showLine)){const{handleGetRowId}=createHandleGetRowId($xeTable);el.setAttribute('data-calc-row','Y');tableData.forEach(row=>{const rowid=handleGetRowId(row);const rowRest=fullAllDataRowIdData[rowid];if(rowRest){const height=calcCellAutoHeight($xeTable,rowid,rowRest,el);rowRest.height=Math.max(defaultRowHeight,height);}el.removeAttribute('data-calc-row');});reactData.calcCellHeightFlag++;}};function getOrderField($xeTable,column){const reactData=$xeTable;const{isRowGroupStatus}=reactData;const{sortBy,sortType,aggFunc}=column;return isRowGroupStatus&&aggFunc?row=>{if(row.isAggregate){const aggData=row.aggData;const currAggData=aggData?aggData[column.field]:null;return currAggData?currAggData.value:null;}let cellValue;if(sortBy){cellValue=external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(sortBy)?sortBy({row,column}):external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row,sortBy);}else{cellValue=$xeTable.getCellLabel(row,column);}if(!sortType||sortType==='auto'){return eqEmptyValue(cellValue)||isNaN(cellValue)?cellValue:external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(cellValue);}else if(sortType==='number'){return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(cellValue);}else if(sortType==='string'){return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toValueString(cellValue);}return cellValue;}:row=>{let cellValue;if(sortBy){cellValue=external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(sortBy)?sortBy({row,column}):external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row,sortBy);}else{cellValue=$xeTable.getCellLabel(row,column);}if(!sortType||sortType==='auto'){return eqEmptyValue(cellValue)||isNaN(cellValue)?cellValue:external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(cellValue);}else if(sortType==='number'){return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(cellValue);}else if(sortType==='string'){return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toValueString(cellValue);}return cellValue;};}function handleTargetEnterEvent($xeTable,isClear){const internalData=$xeTable;const $tooltip=$xeTable.$refs.refTooltip;clearTimeout(internalData.tooltipTimeout);if(isClear){$xeTable.closeTooltip();}else{if($tooltip&&$tooltip.setActived){$tooltip.setActived(true);}}}function clearCrossTableDragStatus($xeTable){const crossTableDragRowInfo=getCrossTableDragRowInfo($xeTable);crossTableDragRowObj=null;crossTableDragRowInfo.row=null;}function clearDragStatus($xeTable){const reactData=$xeTable;const{dragRow,dragCol}=reactData;if(dragRow||dragCol){clearColDropOrigin($xeTable);clearRowDropOrigin($xeTable);hideDropTip($xeTable);clearCrossTableDragStatus($xeTable);reactData.dragRow=null;reactData.dragCol=null;}}function handleRowDragEndClearStatus($xeTable){clearRowDragData($xeTable);clearCrossTableDragStatus($xeTable);handleRecalculateStyle($xeTable,false,true,true);}function handleColDragEndClearStatus($xeTable){clearColDragData($xeTable);clearCrossTableDragStatus($xeTable);handleRecalculateStyle($xeTable,true,true,true);}function clearRowDropOrigin($xeTable){const el=$xeTable.$el;if(el){const clss='row--drag-origin';external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().arrayEach(el.querySelectorAll(`.${clss}`),elem=>{elem.draggable=false;removeClass(elem,clss);});}}function updateRowDropOrigin($xeTable,row){const el=$xeTable.$el;if(el){const clss='row--drag-origin';const rowid=getRowid($xeTable,row);external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().arrayEach(el.querySelectorAll(`[rowid="${rowid}"]`),elem=>{addClass(elem,clss);});}}function updateRowDropTipContent($xeTable,tdEl){const reactData=$xeTable;const props=$xeTable;const{dragConfig}=props;const{dragRow}=reactData;const rowDragOpts=$xeTable.computeRowDragOpts;const{tooltipMethod}=rowDragOpts;const rTooltipMethod=tooltipMethod||(dragConfig?dragConfig.rowTooltipMethod:null);let tipContent='';if(rTooltipMethod){const rtParams={$table:$xeTable,row:dragRow};tipContent=`${rTooltipMethod(rtParams)||''}`;}else{tipContent=methods_getI18n('vxe.table.dragTip',[tdEl.textContent||'']);}reactData.dragTipText=tipContent;}function updateColDropOrigin($xeTable,column){const el=$xeTable.$el;if(el){const colQuerys=[];external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree([column],item=>{colQuerys.push(`[colid="${item.id}"]`);});const clss='col--drag-origin';external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().arrayEach(el.querySelectorAll(colQuerys.join(',')),elem=>{addClass(elem,clss);});}}function clearColDropOrigin($xeTable){const el=$xeTable.$el;if(el){const clss='col--drag-origin';external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().arrayEach(el.querySelectorAll(`.${clss}`),elem=>{elem.draggable=false;removeClass(elem,clss);});}}function updateColDropTipContent($xeTable,tdEl){const reactData=$xeTable;const{dragCol}=reactData;const columnDragOpts=$xeTable.computeColumnDragOpts;const{tooltipMethod}=columnDragOpts;let tipContent='';if(tooltipMethod){const dtParams={$table:$xeTable,column:dragCol};tipContent=`${tooltipMethod(dtParams)||''}`;}else{tipContent=methods_getI18n('vxe.table.dragTip',[tdEl.textContent||'']);}reactData.dragTipText=tipContent;}function showDropTip($xeTable,evnt,trEl,thEl,showLine,dragPos){const $xeGantt=$xeTable.$xeGantt;const reactData=$xeTable;const internalData=$xeTable;let wrapperEl=$xeTable.$refs.refElem;if($xeGantt&&trEl){const ganttContainerElem=$xeGantt.$refs.refGanttContainerElem;if(ganttContainerElem){wrapperEl=ganttContainerElem;}}if(!wrapperEl){return;}const{overflowX,scrollbarWidth,overflowY,scrollbarHeight}=reactData;const{prevDragToChild}=internalData;const wrapperRect=wrapperEl.getBoundingClientRect();const osbWidth=overflowY?scrollbarWidth:0;const osbHeight=overflowX?scrollbarHeight:0;const tableWrapperWidth=wrapperEl.clientWidth;const tableWrapperHeight=wrapperEl.clientHeight;if(trEl){const rdLineEl=$xeTable.$refs.refDragRowLineElem;if(rdLineEl){if(showLine){const scrollbarYToLeft=$xeTable.computeScrollbarYToLeft;const trRect=trEl.getBoundingClientRect();let trHeight=trEl.clientHeight;const offsetTop=Math.max(1,trRect.y-wrapperRect.y);if(offsetTop+trHeight>tableWrapperHeight-osbHeight){trHeight=tableWrapperHeight-offsetTop-osbHeight;}rdLineEl.style.display='block';rdLineEl.style.left=`${scrollbarYToLeft?osbWidth:0}px`;rdLineEl.style.top=`${offsetTop}px`;rdLineEl.style.height=`${trHeight}px`;rdLineEl.style.width=`${tableWrapperWidth-osbWidth}px`;rdLineEl.setAttribute('drag-pos',dragPos);rdLineEl.setAttribute('drag-to-child',prevDragToChild?'y':'n');}else{rdLineEl.style.display='';}}}else if(thEl){const cdLineEl=$xeTable.$refs.refDragColLineElem;if(cdLineEl){if(showLine){const scrollbarXToTop=$xeTable.computeScrollbarXToTop;const leftContainerElem=$xeTable.$refs.refLeftContainer;const leftContainerWidth=leftContainerElem?leftContainerElem.clientWidth:0;const rightContainerElem=$xeTable.$refs.refRightContainer;const rightContainerWidth=rightContainerElem?rightContainerElem.clientWidth:0;const thRect=thEl.getBoundingClientRect();let thWidth=thEl.clientWidth;const offsetTop=Math.max(0,thRect.y-wrapperRect.y);const startX=leftContainerWidth;let offsetLeft=thRect.x-wrapperRect.x;if(offsetLeft<startX){thWidth-=startX-offsetLeft;offsetLeft=startX;}const endX=tableWrapperWidth-rightContainerWidth-(rightContainerWidth?0:osbWidth);if(offsetLeft+thWidth>endX){thWidth=endX-offsetLeft;}cdLineEl.style.display='block';cdLineEl.style.top=`${offsetTop}px`;cdLineEl.style.left=`${offsetLeft}px`;cdLineEl.style.width=`${thWidth}px`;if(prevDragToChild){cdLineEl.style.height=`${thRect.height}px`;}else{cdLineEl.style.height=`${tableWrapperHeight-offsetTop-(scrollbarXToTop?0:osbHeight)}px`;}cdLineEl.setAttribute('drag-pos',dragPos);cdLineEl.setAttribute('drag-to-child',prevDragToChild?'y':'n');}else{cdLineEl.style.display='';}}}const rdTipEl=$xeTable.$refs.refDragTipElem;if(rdTipEl){rdTipEl.style.display='block';rdTipEl.style.top=`${Math.min(wrapperEl.clientHeight-wrapperEl.scrollTop-rdTipEl.clientHeight,evnt.clientY-wrapperRect.y)}px`;rdTipEl.style.left=`${Math.min(wrapperEl.clientWidth-wrapperEl.scrollLeft-rdTipEl.clientWidth-16,evnt.clientX-wrapperRect.x)}px`;rdTipEl.setAttribute('drag-status',showLine?prevDragToChild?'sub':'normal':'disabled');}}function hideDropTip($xeTable){const rdTipEl=$xeTable.$refs.refDragTipElem;const rdLineEl=$xeTable.$refs.refDragRowLineElem;const cdLineEl=$xeTable.$refs.refDragColLineElem;if(rdTipEl){rdTipEl.style.display='';}if(rdLineEl){rdLineEl.style.display='';}if(cdLineEl){cdLineEl.style.display='';}}function clearRowDragData($xeTable){const $xeGantt=$xeTable.$xeGantt;const reactData=$xeTable;const internalData=$xeTable;let wrapperEl=$xeTable.$refs.refElem;const dtClss=['.vxe-body--row'];if($xeGantt){const ganttContainerElem=$xeGantt.$refs.refGanttContainerElem;if(ganttContainerElem){wrapperEl=ganttContainerElem;}dtClss.push('.vxe-gantt-view--body-row','.vxe-gantt-view--chart-row');}hideDropTip($xeTable);clearRowDropOrigin($xeTable);clearRowAnimate(wrapperEl,dtClss);internalData.prevDragToChild=false;reactData.dragRow=null;reactData.dragCol=null;}function clearColDragData($xeTable){const reactData=$xeTable;const internalData=$xeTable;const el=$xeTable.$refs.refElem;hideDropTip($xeTable);clearColDropOrigin($xeTable);clearColAnimate(el,['.vxe-table--column']);internalData.prevDragToChild=false;reactData.dragRow=null;reactData.dragCol=null;}/**
+ */const calcCellHeight=$xeTable=>{const props=$xeTable;const reactData=$xeTable;const internalData=$xeTable;const{treeConfig}=props;const{tableData,isAllOverflow,scrollYLoad,scrollXLoad}=reactData;const{fullAllDataRowIdData}=internalData;const el=$xeTable.$refs.refElem;if(!el||!el.clientWidth){return;}const treeOpts=$xeTable.computeTreeOpts;const defaultRowHeight=$xeTable.computeDefaultRowHeight;if(!isAllOverflow&&(scrollYLoad||scrollXLoad||treeConfig&&treeOpts.showLine)){const{handleGetRowId}=createHandleGetRowId($xeTable);el.setAttribute('data-calc-row','Y');tableData.forEach(row=>{const rowid=handleGetRowId(row);const rowRest=fullAllDataRowIdData[rowid];if(rowRest){const height=calcCellAutoHeight($xeTable,rowid,rowRest,el);rowRest.height=Math.max(defaultRowHeight,height);}el.removeAttribute('data-calc-row');});reactData.calcCellHeightFlag++;}};function getOrderField($xeTable,column){const reactData=$xeTable;const{isRowGroupStatus}=reactData;const{sortBy,sortType,aggFunc}=column;return isRowGroupStatus&&aggFunc?row=>{if(row.isAggregate){const aggData=row.aggData;const currAggData=aggData?aggData[column.field]:null;return currAggData?currAggData.value:null;}let cellValue;if(sortBy){cellValue=external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(sortBy)?sortBy({row,column}):external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row,sortBy);}else{cellValue=$xeTable.getCellLabel(row,column);}if(!sortType||sortType==='auto'){return eqEmptyValue(cellValue)||isNaN(cellValue)?cellValue:external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(cellValue);}else if(sortType==='number'){return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(cellValue);}else if(sortType==='string'){return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toValueString(cellValue);}return cellValue;}:row=>{let cellValue;if(sortBy){cellValue=external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(sortBy)?sortBy({row,column}):external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row,sortBy);}else{cellValue=$xeTable.getCellLabel(row,column);}if(!sortType||sortType==='auto'){return eqEmptyValue(cellValue)||isNaN(cellValue)?cellValue:external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(cellValue);}else if(sortType==='number'){return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(cellValue);}else if(sortType==='string'){return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toValueString(cellValue);}return cellValue;};}function handleTargetEnterEvent($xeTable,isClear){const internalData=$xeTable;const $tooltip=$xeTable.$refs.refTooltip;clearTimeout(internalData.tooltipTimeout);if(isClear){$xeTable.closeTooltip();}else{if($tooltip&&$tooltip.setActived){$tooltip.setActived(true);}}}function clearCrossTableDragStatus($xeTable){const crossTableDragRowInfo=getCrossTableDragRowInfo($xeTable);crossTableDragRowObj=null;crossTableDragRowInfo.row=null;}function clearDragStatus($xeTable){const reactData=$xeTable;const{dragRow,dragCol}=reactData;if(dragRow||dragCol){clearColDropOrigin($xeTable);clearRowDropOrigin($xeTable);hideDropTip($xeTable);clearCrossTableDragStatus($xeTable);reactData.dragRow=null;reactData.dragCol=null;}}function handleRowDragEndClearStatus($xeTable){clearRowDragData($xeTable);clearCrossTableDragStatus($xeTable);handleRecalculateStyle($xeTable,false,true,true);}function handleColDragEndClearStatus($xeTable){clearColDragData($xeTable);clearCrossTableDragStatus($xeTable);handleRecalculateStyle($xeTable,true,true,true);}function clearRowDropOrigin($xeTable){const el=$xeTable.$el;if(el){const clss='row--drag-origin';external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().arrayEach(el.querySelectorAll(`.${clss}`),elem=>{elem.draggable=false;removeClass(elem,clss);});}}function updateRowDropOrigin($xeTable,row){const el=$xeTable.$el;if(el){const clss='row--drag-origin';const rowid=getRowid($xeTable,row);external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().arrayEach(el.querySelectorAll(`[rowid="${rowid}"]`),elem=>{addClass(elem,clss);});}}function updateRowDropTipContent($xeTable,tdEl){const reactData=$xeTable;const props=$xeTable;const{dragConfig}=props;const{dragRow}=reactData;const rowDragOpts=$xeTable.computeRowDragOpts;const{tooltipMethod}=rowDragOpts;const rTooltipMethod=tooltipMethod||(dragConfig?dragConfig.rowTooltipMethod:null);let tipContent='';if(rTooltipMethod){const rtParams={$table:$xeTable,row:dragRow};tipContent=`${rTooltipMethod(rtParams)||''}`;}else{tipContent=methods_getI18n('vxe.table.dragTip',[tdEl.textContent||'']);}reactData.dragTipText=tipContent;}function updateColDropOrigin($xeTable,column){const el=$xeTable.$el;if(el){const colQuerys=[];external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree([column],item=>{colQuerys.push(`[colid="${item.id}"]`);});const clss='col--drag-origin';external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().arrayEach(el.querySelectorAll(colQuerys.join(',')),elem=>{addClass(elem,clss);});}}function clearColDropOrigin($xeTable){const el=$xeTable.$el;if(el){const clss='col--drag-origin';external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().arrayEach(el.querySelectorAll(`.${clss}`),elem=>{elem.draggable=false;removeClass(elem,clss);});}}function updateColDropTipContent($xeTable,tdEl){const reactData=$xeTable;const{dragCol}=reactData;const columnDragOpts=$xeTable.computeColumnDragOpts;const{tooltipMethod}=columnDragOpts;let tipContent='';if(tooltipMethod){const dtParams={$table:$xeTable,column:dragCol};tipContent=`${tooltipMethod(dtParams)||''}`;}else{tipContent=methods_getI18n('vxe.table.dragTip',[tdEl.textContent||'']);}reactData.dragTipText=tipContent;}function showDropTip($xeTable,evnt,trEl,thEl,showLine,dragPos){const $xeGantt=$xeTable.$xeGantt;const reactData=$xeTable;const internalData=$xeTable;let wrapperEl=$xeTable.$refs.refElem;if($xeGantt&&trEl){const ganttContainerElem=$xeGantt.$refs.refGanttContainerElem;if(ganttContainerElem){wrapperEl=ganttContainerElem;}}if(!wrapperEl){return;}const{overflowX,scrollbarWidth,overflowY,scrollbarHeight}=reactData;const{prevDragToChild}=internalData;const wrapperRect=wrapperEl.getBoundingClientRect();const osbWidth=overflowY?scrollbarWidth:0;const osbHeight=overflowX?scrollbarHeight:0;const tableWrapperWidth=wrapperEl.clientWidth;const tableWrapperHeight=wrapperEl.clientHeight;if(trEl){const rdLineEl=$xeTable.$refs.refDragRowLineElem;if(rdLineEl){if(showLine){const scrollbarYToLeft=$xeTable.computeScrollbarYToLeft;const trRect=trEl.getBoundingClientRect();let trHeight=trEl.clientHeight;const offsetTop=Math.max(1,trRect.y-wrapperRect.y);if(offsetTop+trHeight>tableWrapperHeight-osbHeight){trHeight=tableWrapperHeight-offsetTop-osbHeight;}rdLineEl.style.display='block';rdLineEl.style.left=`${scrollbarYToLeft?osbWidth:0}px`;rdLineEl.style.top=`${offsetTop}px`;rdLineEl.style.height=`${trHeight}px`;rdLineEl.style.width=`${tableWrapperWidth-osbWidth}px`;rdLineEl.setAttribute('drag-pos',dragPos);rdLineEl.setAttribute('drag-to-child',prevDragToChild?'y':'n');}else{rdLineEl.style.display='';}}}else if(thEl){const cdLineEl=$xeTable.$refs.refDragColLineElem;if(cdLineEl){if(showLine){const scrollbarXToTop=$xeTable.computeScrollbarXToTop;const leftContainerElem=$xeTable.$refs.refLeftContainer;const leftContainerWidth=leftContainerElem?leftContainerElem.clientWidth:0;const rightContainerElem=$xeTable.$refs.refRightContainer;const rightContainerWidth=rightContainerElem?rightContainerElem.clientWidth:0;const thRect=thEl.getBoundingClientRect();let thWidth=thEl.clientWidth;const offsetTop=Math.max(0,thRect.y-wrapperRect.y);const startX=leftContainerWidth;let offsetLeft=thRect.x-wrapperRect.x;if(offsetLeft<startX){thWidth-=startX-offsetLeft;offsetLeft=startX;}const endX=tableWrapperWidth-rightContainerWidth-(rightContainerWidth?0:osbWidth);if(offsetLeft+thWidth>endX){thWidth=endX-offsetLeft;}cdLineEl.style.display='block';cdLineEl.style.top=`${offsetTop}px`;cdLineEl.style.left=`${offsetLeft}px`;cdLineEl.style.width=`${thWidth}px`;if(prevDragToChild){cdLineEl.style.height=`${thRect.height}px`;}else{cdLineEl.style.height=`${tableWrapperHeight-offsetTop-(scrollbarXToTop?0:osbHeight)}px`;}cdLineEl.setAttribute('drag-pos',dragPos);cdLineEl.setAttribute('drag-to-child',prevDragToChild?'y':'n');}else{cdLineEl.style.display='';}}}const rdTipEl=$xeTable.$refs.refDragTipElem;if(rdTipEl){rdTipEl.style.display='block';rdTipEl.style.top=`${Math.min(wrapperEl.clientHeight-wrapperEl.scrollTop-rdTipEl.clientHeight,evnt.clientY-wrapperRect.y)}px`;rdTipEl.style.left=`${Math.min(wrapperEl.clientWidth-wrapperEl.scrollLeft-rdTipEl.clientWidth-16,evnt.clientX-wrapperRect.x)}px`;rdTipEl.setAttribute('drag-status',showLine?prevDragToChild?'sub':'normal':'disabled');}}function hideDropTip($xeTable){const rdTipEl=$xeTable.$refs.refDragTipElem;const rdLineEl=$xeTable.$refs.refDragRowLineElem;const cdLineEl=$xeTable.$refs.refDragColLineElem;if(rdTipEl){rdTipEl.style.display='';}if(rdLineEl){rdLineEl.style.display='';}if(cdLineEl){cdLineEl.style.display='';}}function clearRowDragData($xeTable){const $xeGantt=$xeTable.$xeGantt;const reactData=$xeTable;const internalData=$xeTable;let wrapperEl=$xeTable.$refs.refElem;const dtClss=['.vxe-body--row'];if($xeGantt){const ganttContainerElem=$xeGantt.$refs.refGanttContainerElem;if(ganttContainerElem){wrapperEl=ganttContainerElem;}dtClss.push('.vxe-gantt-view--body-row','.vxe-gantt-view--chart-row');}hideDropTip($xeTable);clearRowDropOrigin($xeTable);clearRowAnimate(wrapperEl,dtClss);internalData.prevDragToChild=false;reactData.dragRow=null;reactData.dragCol=null;}function clearColDragData($xeTable){const reactData=$xeTable;const internalData=$xeTable;const el=$xeTable.$refs.refElem;hideDropTip($xeTable);clearColDropOrigin($xeTable);clearColAnimate(el,['.vxe-table--column']);internalData.prevDragToChild=false;reactData.dragRow=null;reactData.dragCol=null;}/**
  * 处理显示 tooltip
  * @param {Event} evnt 事件
  * @param {Row} row 行对象
@@ -8334,11 +8335,11 @@ if(ctxMenuStore.visible&&tableMenu&&!getEventTargetNode(evnt,tableMenu.$el).flag
 if(!isActivated&&editRules&&validOpts.autoClear){reactData.validErrorMaps={};}// 最后激活的表格
 internalData.isActivated=isActivated;}},/**
      * 窗口失焦事件处理
-     */handleGlobalBlurEvent(){const $xeTable=this;$xeTable.closeFilter();$xeTable.closeMenu();},handleGlobalScrollEvent(evnt){const $xeTable=this;reUpdateCustomStyleEvent($xeTable,evnt);},/**
+     */handleGlobalBlurEvent(){const $xeTable=this;$xeTable.closeFilter();$xeTable.closeMenu();},handleGlobalScrollEvent(evnt){const $xeTable=this;const reactData=$xeTable;const{filterStore}=reactData;const filterOpts=$xeTable.computeFilterOpts;if(filterStore.visible&&filterOpts.transfer){$xeTable.handleFilterStyle();}reUpdateCustomStyleEvent($xeTable,evnt);},/**
      * 全局滚动事件
      */handleGlobalMousewheelEvent(){const $xeTable=this;$xeTable.closeTooltip();if($xeTable.closeMenu){$xeTable.closeMenu();}},/**
      * 表格键盘事件
-     */keydownEvent(evnt){const $xeTable=this;const{filterStore,ctxMenuStore,editStore,keyboardConfig,mouseConfig,mouseOpts,keyboardOpts}=this;const{actived}=editStore;const{keyCode}=evnt;const isEsc=keyCode===27;if(isEsc){this.preventEvent(evnt,'event.keydown',null,()=>{$xeTable.dispatchEvent('keydown-start',{},evnt);if(keyboardConfig&&mouseConfig&&mouseOpts.area&&$xeTable.handleKdClAreaEvent){$xeTable.handleKdClAreaEvent(evnt);}else if(actived.row||filterStore.visible||ctxMenuStore.visible){evnt.stopPropagation();// 如果按下了 Esc 键，关闭快捷菜单、筛选
+     */keydownEvent(evnt){const $xeTable=this;const props=$xeTable;const reactData=$xeTable;const{mouseConfig,keyboardConfig}=props;const{filterStore,ctxMenuStore,editStore}=reactData;const mouseOpts=$xeTable.computeMouseOpts;const keyboardOpts=$xeTable.computeKeyboardOpts;const{actived}=editStore;const isEsc=methods_globalEvents.hasKey(evnt,GLOBAL_EVENT_KEYS.ESCAPE);if(isEsc){this.preventEvent(evnt,'event.keydown',null,()=>{$xeTable.dispatchEvent('keydown-start',{},evnt);if(keyboardConfig&&mouseConfig&&mouseOpts.area&&$xeTable.handleKdClAreaEvent){$xeTable.handleKdClAreaEvent(evnt);}else if(actived.row||filterStore.visible||ctxMenuStore.visible){evnt.stopPropagation();// 如果按下了 Esc 键，关闭快捷菜单、筛选
 this.closeFilter();this.closeMenu();if(keyboardConfig&&keyboardOpts.isEsc){// 如果是激活编辑状态，则取消编辑
 if(actived.row){const params=actived.args;this.handleClearEdit(evnt);// 如果配置了选中功能，则为选中状态
 if(mouseConfig&&mouseOpts.selected){this.$nextTick(()=>this.handleSelected(params,evnt));}}}}$xeTable.dispatchEvent('keydown',{},evnt);$xeTable.dispatchEvent('keydown-end',{},evnt);});}},contextMenuEvent(evnt){const $xeTable=this;$xeTable.dispatchEvent('context-menu',{},evnt);},/**
@@ -8933,8 +8934,13 @@ function renderTdColumn(h, $xeTable, seq, rowid, fixedType, isOptimizeMode, rowL
   const isEdit = isEnableConf(editRender);
   const resizeHeight = resizeHeightFlag ? rowRest.resizeHeight : 0;
   let fixedHiddenColumn = overflowX && (fixedType ? column.fixed !== fixedType : !!column.fixed);
-  const isCellPadding = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(padding) ? allPadding === null ? cellOpts.padding : allPadding : padding;
-  const cellOverflow = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(showOverflow) ? allShowOverflow : showOverflow;
+  const cellPadding = getDefaultConfig(padding, allPadding === null ? cellOpts.padding : allPadding);
+  const isAllCellPadding = cellPadding === true;
+  const isCellPaddingTop = cellPadding ? isAllCellPadding || cellPadding.top !== false : false;
+  const isCellPaddingBottom = cellPadding ? isAllCellPadding || cellPadding.bottom !== false : false;
+  const isCellPaddingLeft = cellPadding ? isAllCellPadding || cellPadding.left !== false : false;
+  const isCellPaddingRight = cellPadding ? isAllCellPadding || cellPadding.right !== false : false;
+  const cellOverflow = getDefaultConfig(showOverflow, allShowOverflow);
   const showEllipsis = cellOverflow === 'ellipsis';
   const showTitle = cellOverflow === 'title';
   const showTooltip = cellOverflow === true ? tooltipOpts.mode === 'tooltip' : cellOverflow === 'tooltip';
@@ -9230,7 +9236,10 @@ function renderTdColumn(h, $xeTable, seq, rowid, fixedType, isOptimizeMode, rowL
       'col--max-height': maxHeight,
       'fixed--width': !isAutoCellWidth,
       'fixed--hidden': fixedHiddenColumn,
-      'is--padding': isCellPadding,
+      'is--pg-top': isCellPaddingTop,
+      'is--pg-bottom': isCellPaddingBottom,
+      'is--pg-left': isCellPaddingLeft,
+      'is--pg-right': isCellPaddingRight,
       'is--progress': fixedHiddenColumn && isAllOverflow || isVNPreEmptyStatus,
       'is--drag-cell': isRowDragCell && (isCrossDrag || isPeerDrag || !rowLevel),
       'is--drag-disabled': isDisabledDrag,
@@ -9840,8 +9849,13 @@ function header_renderRows(h, _vm, isGroup, isOptimizeMode, headerGroups, _rowIn
     const compConf = renderOpts ? header_renderer.get(renderOpts.name) : null;
     const isColGroup = column.children && column.children.length;
     const fixedHiddenColumn = overflowX && !isColGroup && (fixedType ? column.fixed !== fixedType : !!column.fixed);
-    const isPadding = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(headerCellOpts.padding) ? headerCellOpts.padding : cellOpts.padding;
-    const headOverflow = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(showHeaderOverflow) ? allColumnHeaderOverflow : showHeaderOverflow;
+    const cellPadding = getDefaultConfig(headerCellOpts.padding, cellOpts.padding);
+    const isAllCellPadding = cellPadding === true;
+    const isCellPaddingTop = cellPadding ? isAllCellPadding || cellPadding.top !== false : false;
+    const isCellPaddingBottom = cellPadding ? isAllCellPadding || cellPadding.bottom !== false : false;
+    const isCellPaddingLeft = cellPadding ? isAllCellPadding || cellPadding.left !== false : false;
+    const isCellPaddingRight = cellPadding ? isAllCellPadding || cellPadding.right !== false : false;
+    const headOverflow = getDefaultConfig(showHeaderOverflow, allColumnHeaderOverflow);
     const headAlign = headerAlign || (compConf ? compConf.tableHeaderCellAlign : '') || allHeaderAlign || align || (compConf ? compConf.tableCellAlign : '') || allAlign;
     const showEllipsis = headOverflow === 'ellipsis';
     const showTitle = headOverflow === 'title';
@@ -9961,7 +9975,10 @@ function header_renderRows(h, _vm, isGroup, isOptimizeMode, headerGroups, _rowIn
         'col--group': isColGroup,
         'col--ellipsis': hasEllipsis,
         'fixed--width': !isAutoCellWidth,
-        'is--padding': isPadding,
+        'is--pg-top': isCellPaddingTop,
+        'is--pg-bottom': isCellPaddingBottom,
+        'is--pg-left': isCellPaddingLeft,
+        'is--pg-right': isCellPaddingRight,
         'is--sortable': column.sortable,
         'col--filter': !!filters,
         'is--filter-active': hasFilter,
@@ -10484,8 +10501,13 @@ function footer_renderRows(h, _vm, isOptimizeMode, tableColumn, footerTableData,
     const compConf = renderOpts ? footer_renderer.get(renderOpts.name) : null;
     const showAllTip = footerTooltipOpts.showAll;
     const fixedHiddenColumn = overflowX && (fixedType ? column.fixed !== fixedType : !!column.fixed);
-    const isPadding = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(footerCellOpts.padding) ? footerCellOpts.padding : cellOpts.padding;
-    const footOverflow = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(showFooterOverflow) ? allColumnFooterOverflow : showFooterOverflow;
+    const cellPadding = getDefaultConfig(footerCellOpts.padding, cellOpts.padding);
+    const isAllCellPadding = cellPadding === true;
+    const isCellPaddingTop = cellPadding ? isAllCellPadding || cellPadding.top !== false : false;
+    const isCellPaddingBottom = cellPadding ? isAllCellPadding || cellPadding.bottom !== false : false;
+    const isCellPaddingLeft = cellPadding ? isAllCellPadding || cellPadding.left !== false : false;
+    const isCellPaddingRight = cellPadding ? isAllCellPadding || cellPadding.right !== false : false;
+    const footOverflow = getDefaultConfig(showFooterOverflow, allColumnFooterOverflow);
     const footAlign = footerAlign || (compConf ? compConf.tableFooterCellAlign : '') || allFooterAlign || align || (compConf ? compConf.tableCellAlign : '') || allAlign;
     const showEllipsis = (footOverflow === true ? footerTooltipOpts.mode : footOverflow) === 'ellipsis';
     const showTitle = (footOverflow === true ? footerTooltipOpts.mode : footOverflow) === 'title';
@@ -10598,7 +10620,10 @@ function footer_renderRows(h, _vm, isOptimizeMode, tableColumn, footerTableData,
         'col--last': isLastColumn,
         'fixed--width': !isAutoCellWidth,
         'fixed--hidden': fixedHiddenColumn,
-        'is--padding': isPadding,
+        'is--pg-top': isCellPaddingTop,
+        'is--pg-bottom': isCellPaddingBottom,
+        'is--pg-left': isCellPaddingLeft,
+        'is--pg-right': isCellPaddingRight,
         'col--ellipsis': hasEllipsis,
         'col--current': currentColumn === column
       }, getClass(footerClassName, cellParams), getClass(footerCellClassName, cellParams)],
@@ -13491,13 +13516,14 @@ const {
       } = storeData;
       const checkedAll = $xeExportPanel.computeCheckedAll;
       const supportMerge = $xeExportPanel.computeSupportMerge;
+      // 内部导出使用 _columns -> _children 为自定义子集
       const expColumns = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().searchTree(columns, column => column.checked, {
         children: 'children',
-        mapChildren: 'childNodes',
+        mapChildren: '_children',
         original: true
       });
       return Object.assign({}, defaultOptions, {
-        columns: expColumns,
+        _columns: expColumns,
         isMerge: hasMerge && supportMerge && checkedAll ? defaultOptions.isMerge : false
       });
     },
@@ -14112,6 +14138,109 @@ const {
   renderer: mixin_renderer
 } = core_.VxeUI;
 const mixin_sourceType = 'table';
+function updatePopupStyle($xeTable) {
+  const $xeGrid = $xeTable.$xeGrid;
+  const $xeGantt = $xeTable.$xeGantt;
+  const reactData = $xeTable;
+  const internalData = $xeTable;
+  const $xeGGWrapper = $xeGrid || $xeGantt;
+  const {
+    filterStore
+  } = reactData;
+  const {
+    elemStore
+  } = internalData;
+  const {
+    column,
+    targetEl
+  } = filterStore;
+  if (!column || !targetEl) {
+    return $xeTable.$nextTick();
+  }
+  const tableEl = $xeTable.$refs.refElem;
+  const {
+    scrollTop,
+    scrollLeft,
+    visibleHeight,
+    visibleWidth
+  } = getDomNode();
+  const filterOpts = $xeTable.computeFilterOpts;
+  const {
+    maxHeight: customMaxHeight,
+    transfer,
+    zIndex
+  } = filterOpts;
+  const currEl = targetEl;
+  const tableRect = tableEl.getBoundingClientRect();
+  const filterRender = column ? column.filterRender : null;
+  const compConf = filterRender && isEnableConf(filterRender) ? mixin_renderer.get(filterRender.name) : null;
+  const headerScrollElem = getRefElem(elemStore['main-header-scroll']);
+  if (!headerScrollElem) {
+    return $xeTable.$nextTick();
+  }
+  const tableFilter = $xeTable.$refs.refTableFilter;
+  const filterWrapperElem = tableFilter ? tableFilter.$el : null;
+  if (!filterWrapperElem) {
+    return $xeTable.$nextTick();
+  }
+  const btnRect = currEl.getBoundingClientRect();
+  const filterHeadElem = filterWrapperElem.querySelector('.vxe-table--filter-header');
+  const filterFootElem = filterWrapperElem.querySelector('.vxe-table--filter-footer');
+  const filterWidth = filterWrapperElem.offsetWidth;
+  const centerWidth = currEl ? filterWidth / 2 : (filterWidth - column.renderWidth) / 2;
+  let left = 0;
+  let top = 0;
+  let maxHeight = 0;
+  /**
+   * 是否显示筛选按钮图标
+   * 如果不存在图标，则相对单元格居中显示
+   */
+  if (transfer) {
+    left = btnRect.left - centerWidth + scrollLeft;
+    top = btnRect.top + currEl.clientHeight + scrollTop;
+    maxHeight = Math.min(Math.max(tableRect.height, Math.floor(visibleHeight / 2)), Math.max(80, visibleHeight - top - (filterHeadElem ? filterHeadElem.clientHeight : 0) - (filterFootElem ? filterFootElem.clientHeight : 0) - 28));
+    if (left < 16) {
+      left = 16;
+    } else if (left > visibleWidth - filterWidth - 16) {
+      left = visibleWidth - filterWidth - 16;
+    }
+  } else {
+    left = btnRect.left - tableRect.left - centerWidth;
+    top = btnRect.top - tableRect.top + currEl.clientHeight;
+    maxHeight = Math.max(40, tableEl.clientHeight - top - (filterHeadElem ? filterHeadElem.clientHeight : 0) - (filterFootElem ? filterFootElem.clientHeight : 0) - 14);
+    if (left < 1) {
+      left = 1;
+    } else if (left > tableEl.clientWidth - filterWidth - 1) {
+      left = tableEl.clientWidth - filterWidth - 1;
+    }
+    if ($xeGGWrapper) {
+      const wrapperEl = $xeGGWrapper.$refs.refElem;
+      if (wrapperEl) {
+        const wrapperRect = wrapperEl.getBoundingClientRect();
+        top += tableRect.top - wrapperRect.top;
+      }
+    }
+  }
+  const fStys = {
+    top: toCssUnit(top),
+    left: toCssUnit(left)
+  };
+  if (zIndex) {
+    fStys.zIndex = zIndex;
+  }
+  filterStore.style = fStys;
+  // 筛选面板是自适应表格高度
+  if (compConf ? !compConf.tableFilterAutoHeight : false) {
+    maxHeight = 0;
+  } else {
+    if (customMaxHeight) {
+      maxHeight = customMaxHeight > maxHeight ? maxHeight : customMaxHeight;
+    }
+  }
+  // 判断面板不能大于表格高度
+  filterStore.maxHeight = maxHeight;
+  return $xeTable.$nextTick();
+}
 /* harmony default export */ var mixin = ({
   methods: {
     /**
@@ -14209,105 +14338,24 @@ const mixin_sourceType = 'table';
     },
     handleOpenFilterColumn(evnt, btnEl, colEl, column, params) {
       const $xeTable = this;
-      const $xeGrid = $xeTable.$xeGrid;
-      const $xeGantt = $xeTable.$xeGantt;
       const reactData = $xeTable;
       const internalData = $xeTable;
-      const $xeGGWrapper = $xeGrid || $xeGantt;
       const {
         initStore,
         filterStore
       } = reactData;
-      const {
-        elemStore
-      } = internalData;
       if (filterStore.column === column && filterStore.visible) {
         filterStore.visible = false;
       } else {
-        const tableEl = $xeTable.$refs.refElem;
-        const {
-          scrollTop,
-          scrollLeft,
-          visibleHeight,
-          visibleWidth
-        } = getDomNode();
-        const filterOpts = $xeTable.computeFilterOpts;
-        const {
-          maxHeight: customMaxHeight,
-          transfer,
-          zIndex
-        } = filterOpts;
         const currEl = btnEl || colEl;
-        const tableRect = tableEl.getBoundingClientRect();
-        const filterRender = column ? column.filterRender : null;
-        const compConf = filterRender && isEnableConf(filterRender) ? mixin_renderer.get(filterRender.name) : null;
         $xeTable.handleFilterOptions(column);
         internalData._currFilterParams = params;
+        filterStore.targetEl = currEl;
         filterStore.style = null;
         filterStore.visible = true;
         initStore.filter = true;
         $xeTable.$nextTick(() => {
-          const headerScrollElem = getRefElem(elemStore['main-header-scroll']);
-          if (!headerScrollElem) {
-            return;
-          }
-          const tableFilter = $xeTable.$refs.refTableFilter;
-          const filterWrapperElem = tableFilter ? tableFilter.$el : null;
-          if (!filterWrapperElem) {
-            return;
-          }
-          const btnRect = currEl.getBoundingClientRect();
-          const filterHeadElem = filterWrapperElem.querySelector('.vxe-table--filter-header');
-          const filterFootElem = filterWrapperElem.querySelector('.vxe-table--filter-footer');
-          const filterWidth = filterWrapperElem.offsetWidth;
-          const centerWidth = filterWidth / 2;
-          let left = 0;
-          let top = 0;
-          let maxHeight = 0;
-          if (transfer) {
-            left = btnRect.left - centerWidth + scrollLeft;
-            top = btnRect.top + currEl.clientHeight + scrollTop;
-            maxHeight = Math.min(Math.max(tableRect.height, Math.floor(visibleHeight / 2)), Math.max(80, visibleHeight - top - (filterHeadElem ? filterHeadElem.clientHeight : 0) - (filterFootElem ? filterFootElem.clientHeight : 0) - 28));
-            if (left < 16) {
-              left = 16;
-            } else if (left > visibleWidth - filterWidth - 16) {
-              left = visibleWidth - filterWidth - 16;
-            }
-          } else {
-            left = btnRect.left - tableRect.left - centerWidth;
-            top = btnRect.top - tableRect.top + currEl.clientHeight;
-            maxHeight = Math.max(40, tableEl.clientHeight - top - (filterHeadElem ? filterHeadElem.clientHeight : 0) - (filterFootElem ? filterFootElem.clientHeight : 0) - 14);
-            if (left < 1) {
-              left = 1;
-            } else if (left > tableEl.clientWidth - filterWidth - 1) {
-              left = tableEl.clientWidth - filterWidth - 1;
-            }
-            if ($xeGGWrapper) {
-              const wrapperEl = $xeGGWrapper.$refs.refElem;
-              if (wrapperEl) {
-                const wrapperRect = wrapperEl.getBoundingClientRect();
-                top += tableRect.top - wrapperRect.top;
-              }
-            }
-          }
-          const fStys = {
-            top: toCssUnit(top),
-            left: toCssUnit(left)
-          };
-          if (zIndex) {
-            fStys.zIndex = zIndex;
-          }
-          filterStore.style = fStys;
-          // 筛选面板是自适应表格高度
-          if (compConf ? !compConf.tableFilterAutoHeight : false) {
-            maxHeight = 0;
-          } else {
-            if (customMaxHeight) {
-              maxHeight = customMaxHeight > maxHeight ? maxHeight : customMaxHeight;
-            }
-          }
-          // 判断面板不能大于表格高度
-          filterStore.maxHeight = maxHeight;
+          updatePopupStyle($xeTable);
         });
       }
       $xeTable.dispatchEvent('filter-visible', {
@@ -14634,6 +14682,17 @@ const mixin_sourceType = 'table';
         }
       }
     },
+    handleFilterStyle() {
+      const $xeTable = this;
+      const reactData = $xeTable;
+      const {
+        filterStore
+      } = reactData;
+      if (!filterStore.visible) {
+        return $xeTable.$nextTick();
+      }
+      return updatePopupStyle($xeTable);
+    },
     /**
      * 清空指定列的筛选条件
      * 如果为空则清空所有列的筛选条件
@@ -18015,7 +18074,7 @@ function handleExportAndPrint($xeTable, options, isPrint) {
   const exportOpts = $xeTable.computeExportOpts;
   const hasTree = !!treeConfig;
   const hasRowGroup = rowGroupList.length > 0;
-  const customOpts = $xeTable.computeCustomOpts;
+  const printOpts = $xeTable.computePrintOpts;
   const selectRecords = $xeTable.getCheckboxRecords();
   const proxyOpts = $xeGGWrapper ? $xeGGWrapper.computeProxyOpts : {};
   const hasFooter = !!footerTableData.length;
@@ -18036,9 +18095,9 @@ function handleExportAndPrint($xeTable, options, isPrint) {
     export_mixin_warnLog('vxe.error.delProp', ['isAllExpand', 'isTreeAllExpanded']);
     defOpts.isTreeAllExpanded = defOpts.isAllExpand;
   }
-  const types = defOpts.types || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().keys(exportOpts._typeMaps);
+  const types = isPrint ? [] : defOpts.types || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().keys(exportOpts._typeMaps);
   const modes = defOpts.modes || [];
-  const checkMethod = customOpts.checkMethod;
+  const checkMethod = (isPrint ? printOpts : exportOpts).checkMethod;
   const exportColumns = collectColumn.slice(0);
   const {
     columns,
@@ -18153,10 +18212,10 @@ function handleExportAndPrint($xeTable, options, isPrint) {
     }
   }
   if (!modeList.some(item => item.value === mode)) {
-    exportParams.mode = modeList[0].value;
+    exportParams.mode = modeList.length ? modeList[0].value : '';
   }
   if (!typeList.some(item => item.value === type)) {
-    exportParams.type = typeList[0].value;
+    exportParams.type = typeList.length ? typeList[0].value : '';
   }
   if (!exportParams.widthMode) {
     exportParams.widthMode = '';
@@ -18319,7 +18378,16 @@ const convertToRows = originColumns => {
       }
       let isCustomCol = false;
       let customCols = [];
-      if (columns) {
+      const _columns = opts._columns;
+      if (_columns) {
+        // 内部导出使用 _columns -> _children 为自定义子集
+        isCustomCol = true;
+        customCols = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().searchTree(_columns, () => true, {
+          children: '_children',
+          mapChildren: 'childNodes',
+          original: true
+        });
+      } else if (columns) {
         isCustomCol = true;
         customCols = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().searchTree(columns, () => true, {
           children: 'children',
@@ -20235,7 +20303,7 @@ function beginValidate($xeTable, rows, cols, cb, isFull) {
 
 
 const customColumnCssKeys = ['checkbox', 'sort', 'title', 'width', 'fixed', 'align', 'header-align', 'footer-align'];
-function updatePopupStyle($xeTable) {
+function mixin_updatePopupStyle($xeTable) {
   const $xeGrid = $xeTable.$xeGrid;
   const $xeGantt = $xeTable.$xeGantt;
   const $xeGGWrapper = $xeGrid || $xeGantt;
@@ -20396,8 +20464,8 @@ function emitCustomEvent($xeTable, type, evnt) {
       initStore.custom = true;
       $xeTable.handleUpdateCustomColumn();
       $xeTable.checkCustomStatus();
-      updatePopupStyle($xeTable);
-      return $xeTable.$nextTick().then(() => updatePopupStyle($xeTable));
+      mixin_updatePopupStyle($xeTable);
+      return $xeTable.$nextTick().then(() => mixin_updatePopupStyle($xeTable));
     },
     _closeCustom() {
       const $xeTable = this;
@@ -20836,7 +20904,15 @@ function emitCustomEvent($xeTable, type, evnt) {
     },
     handleCustomStyle() {
       const $xeTable = this;
-      return updatePopupStyle($xeTable);
+      const reactData = $xeTable.reactData;
+      const {
+        customStore
+      } = reactData;
+      if (!customStore.visible) {
+        return $xeTable.$nextTick();
+      }
+      reactData.isCustomDragStatus = false;
+      return mixin_updatePopupStyle($xeTable);
     }
   }
 });
@@ -22391,6 +22467,11 @@ function renderBody(h, $xeTable) {
       const scrollbarXOpts = $xeTable.computeScrollbarXOpts;
       const scrollbarYOpts = $xeTable.computeScrollbarYOpts;
       return `${scrollbarXOpts.visible}${scrollbarYOpts.visible}`;
+    },
+    computeCellConfHeitht() {
+      const $xeTable = this;
+      const cellOpts = $xeTable.computeCellOpts;
+      return cellOpts.height;
     }
   },
   watch: {
@@ -22481,6 +22562,9 @@ function renderBody(h, $xeTable) {
     computeScrollbarVisible() {
       this.reLayoutFlag++;
     },
+    computeCellConfHeitht() {
+      this.reLayoutFlag++;
+    },
     reLayoutFlag() {
       const $xeTable = this;
       $xeTable.$nextTick(() => $xeTable.recalculate(true));