vxe-table 3.23.0-beta.1 → 3.23.0-beta.2

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

@@ -1586,7 +1586,16 @@ export default {
             }
             if (!handleOptions.print) {
                 if (beforeExportMethod) {
-                    beforeExportMethod({ options: handleOptions, $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt });
+                    const beRest = beforeExportMethod({ options: handleOptions, $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt });
+                    if (XEUtils.isBoolean(beRest)) {
+                        if (!beRest) {
+                            const params = { status: false };
+                            return Promise.reject(params);
+                        }
+                    }
+                    else {
+                        warnLog('vxe.error.returnErr', ['beforeExportMethod', 'boolean', beRest]);
+                    }
                 }
             }
             if (!handleOptions.data) {
@@ -1694,13 +1703,22 @@ export default {
             const opts = Object.assign({}, options);
             const { beforeImportMethod } = opts;
             if (beforeImportMethod) {
-                beforeImportMethod({ options: opts, $table: $xeTable });
+                const biRest = beforeImportMethod({ options: opts, $table: $xeTable });
+                if (XEUtils.isBoolean(biRest)) {
+                    if (!biRest) {
+                        const params = { status: false };
+                        return Promise.reject(params);
+                    }
+                }
+                else {
+                    warnLog('vxe.error.returnErr', ['beforeImportMethod', 'boolean', biRest]);
+                }
             }
             return handleFileImport($xeTable, file, opts);
         },
         _importData(options) {
             const $xeTable = this;
-            const { importOpts } = this;
+            const importOpts = $xeTable.computeImportOpts;
             const opts = Object.assign({
                 types: XEUtils.keys(importOpts._typeMaps)
                 // beforeImportMethod: null,
@@ -1708,7 +1726,16 @@ export default {
             }, importOpts, options);
             const { beforeImportMethod, afterImportMethod } = opts;
             if (beforeImportMethod) {
-                beforeImportMethod({ options: opts, $table: this });
+                const biRest = beforeImportMethod({ options: opts, $table: $xeTable });
+                if (XEUtils.isBoolean(biRest)) {
+                    if (!biRest) {
+                        const params = { status: false };
+                        return Promise.reject(params);
+                    }
+                }
+                else {
+                    warnLog('vxe.error.returnErr', ['beforeImportMethod', 'boolean', biRest]);
+                }
             }
             return VxeUI.readFile(opts).catch(e => {
                 if (afterImportMethod) {
@@ -1759,6 +1786,7 @@ export default {
                 printTitle = document.title || '';
             }
             const beforePrintMethod = opts.beforePrintMethod;
+            const printMethod = opts.printMethod;
             const tableHtml = opts.html || opts.content;
             return new Promise((resolve, reject) => {
                 if (VxeUI.print) {
@@ -1778,6 +1806,30 @@ export default {
                                         $gantt: $xeGantt
                                     });
                                 }
+                                : undefined,
+                            beforePrintMethod: beforePrintMethod
+                                ? ({ html }) => {
+                                    return beforePrintMethod({
+                                        html,
+                                        content: html,
+                                        options: opts,
+                                        $table: $xeTable,
+                                        $grid: $xeGrid,
+                                        $gantt: $xeGantt
+                                    });
+                                }
+                                : undefined,
+                            printMethod: printMethod
+                                ? ({ html }) => {
+                                    return printMethod({
+                                        html,
+                                        content: html,
+                                        options: opts,
+                                        $table: $xeTable,
+                                        $grid: $xeGrid,
+                                        $gantt: $xeGantt
+                                    });
+                                }
                                 : undefined
                         }));
                     }
@@ -1798,6 +1850,30 @@ export default {
                                             $gantt: $xeGantt
                                         });
                                     }
+                                    : undefined,
+                                beforePrintMethod: beforePrintMethod
+                                    ? ({ html }) => {
+                                        return beforePrintMethod({
+                                            html,
+                                            content: html,
+                                            options: opts,
+                                            $table: $xeTable,
+                                            $grid: $xeGrid,
+                                            $gantt: $xeGantt
+                                        });
+                                    }
+                                    : undefined,
+                                printMethod: printMethod
+                                    ? ({ html }) => {
+                                        return printMethod({
+                                            html,
+                                            content: html,
+                                            options: opts,
+                                            $table: $xeTable,
+                                            $grid: $xeGrid,
+                                            $gantt: $xeGantt
+                                        });
+                                    }
                                     : undefined
                             });
                         }));

package/es/table/src/methods.js

@@ -4076,6 +4076,9 @@ function handleSyncScroll($xeTable, isRollX, isRollY) {
         xRest = $xeTable.updateScrollXData();
     }
     if (isRollY && scrollYLoad) {
+        if (autoWidthColumnList.length) {
+            calcCellWidth($xeTable);
+        }
         yRest = $xeTable.updateScrollYData().then(() => {
             if (autoWidthColumnList.length) {
                 calcCellWidth($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.23.0-beta.1";
+export const version = "3.23.0-beta.2";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({

package/es/ui/src/log.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 const { log } = VxeUI;
-const tableVersion = `table v${"3.23.0-beta.1"}`;
+const tableVersion = `table v${"3.23.0-beta.2"}`;
 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

@@ -3311,7 +3311,7 @@ function getClass(property, params) {
 /* unused harmony import specifier */ var VxeUI;
 
 
-const version = "3.23.0-beta.1";
+const version = "3.23.0-beta.2";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -4105,7 +4105,7 @@ function getPopupContainer(appendTo) {
 const {
   log: log_log
 } = core_.VxeUI;
-const tableVersion = `table v${"3.23.0-beta.1"}`;
+const tableVersion = `table v${"3.23.0-beta.2"}`;
 function createComponentLog(name) {
   const uiVersion = core_.VxeUI.uiVersion ? `ui v${core_.VxeUI.uiVersion}` : '';
   const ganttVersion = core_.VxeUI.ganttVersion ? `gantt v${core_.VxeUI.ganttVersion}` : '';
@@ -8034,7 +8034,7 @@ if(props.spanMethod){methods_warnLog('vxe.error.scrollErrProp',['span-method']);
 // 如果列被设置为固定，则清除合并状态
 if(visibleColumn.length!==internalData.visibleColumn.length||!internalData.visibleColumn.every((column,index)=>column===visibleColumn[index])){$xeTable.clearMergeCells();$xeTable.clearMergeFooterItems();}visibleColumn.forEach((column,index)=>{const colid=column.id;const colRest=fullColumnIdData[colid];if(colRest){colRest._index=index;}});handleTableColumn($xeTable);handleUpdateAggValues($xeTable);if(isReset){return $xeTable.updateFooter().then(()=>{return $xeTable.recalculate();}).then(()=>{$xeTable.updateCellAreas();return $xeTable.recalculate();});}return $xeTable.updateFooter();}function initColumnHierarchy($xeTable){const internalData=$xeTable;const{collectColumn}=internalData;const fullColIdData={};const fullColFieldData={};let sortIndex=1;external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(collectColumn,(column,index,items,path,parentColumn)=>{const{id:colid,field}=column;const parentId=parentColumn?parentColumn.id:null;const rest={$index:-1,_index:-1,column,colid,index,items,parent:parentColumn||null,width:0,oLeft:0};column.parentId=parentId;column.defaultParentId=parentId;column.sortNumber=sortIndex;column.renderSortNumber=sortIndex;sortIndex++;if(field){if(fullColFieldData[field]){methods_errLog('vxe.error.colRepet',['field',field]);}fullColFieldData[field]=rest;}fullColIdData[colid]=rest;});internalData.fullColumnIdData=fullColIdData;internalData.fullColumnFieldData=fullColFieldData;}function buildColumnInfo($xeTable){const props=$xeTable;const $xeToolbar=$xeTable.$refs.$xeToolbar;const reactData=$xeTable;const internalData=$xeTable;const{scrollXLoad,scrollYLoad,expandColumn}=reactData;const expandOpts=$xeTable.computeExpandOpts;cacheColumnMap($xeTable);parseColumns($xeTable,true).then(()=>{if(reactData.scrollXLoad){loadScrollXData($xeTable);}});$xeTable.clearHeaderFormatterCache();$xeTable.clearMergeCells();$xeTable.clearMergeFooterItems();$xeTable.handleTableData(true);$xeTable.handleAggregateSummaryData();if((scrollXLoad||scrollYLoad)&&expandColumn&&expandOpts.mode!=='fixed'){methods_warnLog('vxe.error.scrollErrProp',['column.type=expand']);}return $xeTable.$nextTick().then(()=>{if($xeToolbar){$xeToolbar.syncUpdate({collectColumn:internalData.collectColumn,$table:$xeTable});}if($xeTable.handleUpdateCustomColumn){$xeTable.handleUpdateCustomColumn();}const columnOpts=$xeTable.computeColumnOpts;if(props.showCustomHeader&&reactData.isGroup&&(columnOpts.resizable||props.resizable)){methods_warnLog('vxe.error.notConflictProp',['show-custom-header & colgroup','column-config.resizable=false']);}reactData.isColLoading=false;return handleLazyRecalculate($xeTable,false,true,true);});}function handleInitColumn($xeTable,collectColumn){const reactData=$xeTable;const internalData=$xeTable;internalData.collectColumn=collectColumn;const tFullColumn=getColumnList(collectColumn);internalData.tableFullColumn=tFullColumn;reactData.updateColFlag++;reactData.isColLoading=true;initColumnHierarchy($xeTable);return Promise.resolve(restoreCustomStorage($xeTable)).then(()=>{return buildColumnInfo($xeTable);});}/**
  * 纵向 Y 可视渲染处理
- */function loadScrollYData($xeTable){const reactData=$xeTable;const internalData=$xeTable;const{isAllOverflow,isScrollYBig}=reactData;const{mergeBodyList,mergeBodyRowMaps,scrollYStore}=internalData;const{preloadSize,startIndex,endIndex,offsetSize}=scrollYStore;const autoOffsetYSize=isAllOverflow?offsetSize:offsetSize+1;const{toVisibleIndex,visibleSize}=handleVirtualYVisible($xeTable);const offsetItem={startIndex:Math.max(0,isScrollYBig?toVisibleIndex-1:toVisibleIndex-1-offsetSize-preloadSize),endIndex:isScrollYBig?toVisibleIndex+visibleSize:toVisibleIndex+visibleSize+autoOffsetYSize+preloadSize};scrollYStore.visibleStartIndex=toVisibleIndex-1;scrollYStore.visibleEndIndex=toVisibleIndex+visibleSize+1;calculateMergerOffsetIndex(mergeBodyList,mergeBodyRowMaps,offsetItem,'row');const{startIndex:offsetStartIndex,endIndex:offsetEndIndex}=offsetItem;if(toVisibleIndex<=startIndex||toVisibleIndex>=endIndex-visibleSize-1){if(startIndex!==offsetStartIndex||endIndex!==offsetEndIndex){scrollYStore.startIndex=offsetStartIndex;scrollYStore.endIndex=offsetEndIndex;$xeTable.updateScrollYData();}}}const createGetRowCacheProp=prop=>{return function(row){const $xeTable=this;const internalData=$xeTable;const{fullAllDataRowIdData}=internalData;if(row){const rowid=getRowid($xeTable,row);const rowRest=fullAllDataRowIdData[rowid];if(rowRest){return rowRest[prop];}}return-1;};};const createGetColumnCacheProp=prop=>{return function(column){const $xeTable=this;const internalData=$xeTable;const{fullColumnIdData}=internalData;if(column){const colRest=fullColumnIdData[column.id];if(colRest){return colRest[prop];}}return-1;};};function lazyScrollXData($xeTable){const internalData=$xeTable;const{lxTimeout,lxRunTime,scrollXStore}=internalData;const{visibleSize}=scrollXStore;const fpsTime=visibleSize>26?26:visibleSize>16?14:6;if(lxTimeout){clearTimeout(lxTimeout);}if(!lxRunTime||lxRunTime+fpsTime<Date.now()){internalData.lxRunTime=Date.now();loadScrollXData($xeTable);}internalData.lxTimeout=setTimeout(()=>{internalData.lxTimeout=undefined;internalData.lxRunTime=undefined;loadScrollXData($xeTable);},fpsTime);}function lazyScrollYData($xeTable){const internalData=$xeTable;const{lyTimeout,lyRunTime,scrollYStore}=internalData;const{visibleSize}=scrollYStore;const fpsTime=visibleSize>30?32:visibleSize>20?18:8;if(lyTimeout){clearTimeout(lyTimeout);}if(!lyRunTime||lyRunTime+fpsTime<Date.now()){internalData.lyRunTime=Date.now();loadScrollYData($xeTable);}internalData.lyTimeout=setTimeout(()=>{internalData.lyTimeout=undefined;internalData.lyRunTime=undefined;loadScrollYData($xeTable);},fpsTime);}function handleSyncScroll($xeTable,isRollX,isRollY){const reactData=$xeTable;const internalData=$xeTable;const{scrollXLoad,scrollYLoad,isAllOverflow}=reactData;const autoWidthColumnList=$xeTable.computeAutoWidthColumnList;internalData.lcsRunTime=Date.now();internalData.lcsTimeout=undefined;internalData.intoRunScroll=false;internalData.inVirtualScroll=false;internalData.inWheelScroll=false;internalData.inHeaderScroll=false;internalData.inBodyScroll=false;internalData.inFooterScroll=false;reactData.lazScrollLoading=false;internalData.scrollRenderType='';let xRest=null;let yRest=null;if(!isAllOverflow){calcCellHeight($xeTable);updateRowOffsetTop($xeTable);}if(isRollX&&scrollXLoad){xRest=$xeTable.updateScrollXData();}if(isRollY&&scrollYLoad){yRest=$xeTable.updateScrollYData().then(()=>{if(autoWidthColumnList.length){calcCellWidth($xeTable);autoCellWidth($xeTable);}if(!isAllOverflow){calcCellHeight($xeTable);updateRowOffsetTop($xeTable);}return $xeTable.updateScrollYSpace();});}updateRowExpandStyle($xeTable);return Promise.all([xRest,yRest,scrollXLoad||scrollYLoad?$xeTable.updateCellAreas():null]);}function checkLastSyncScroll($xeTable,isRollX,isRollY){const reactData=$xeTable;const internalData=$xeTable;const{lcsTimeout}=internalData;reactData.lazScrollLoading=true;if(lcsTimeout){clearTimeout(lcsTimeout);}internalData.lcsTimeout=setTimeout(()=>{handleSyncScroll($xeTable,isRollX,isRollY).then(()=>{if(reactData.scrollXLoad||reactData.scrollYLoad){$xeTable.$nextTick(()=>{updateRowExpandStyle($xeTable);if(!internalData.lcsTimeout){handleSyncScroll($xeTable,isRollX,isRollY);}});}});},240);}const getWheelSpeed=lastScrollTime=>{let multiple=1;const currTime=Date.now();if(lastScrollTime+25>currTime){multiple=1.18;}else if(lastScrollTime+30>currTime){multiple=1.15;}else if(lastScrollTime+40>currTime){multiple=1.12;}else if(lastScrollTime+55>currTime){multiple=1.09;}else if(lastScrollTime+75>currTime){multiple=1.06;}else if(lastScrollTime+100>currTime){multiple=1.03;}return multiple;};const syncGanttScrollTop=($xeTable,scrollTop)=>{const internalData=$xeTable;const $xeGanttView=internalData.xeGanttView;if($xeGanttView){const ganttInternalData=$xeGanttView.internalData;const{elemStore:ganttElemStore}=ganttInternalData;const ganttBodyScrollElem=getRefElem(ganttElemStore['main-body-scroll']);if(ganttBodyScrollElem){ganttBodyScrollElem.scrollTop=scrollTop;}}};function updateHeight($xeTable){const reactData=$xeTable;const internalData=$xeTable;internalData.customHeight=calcTableHeight($xeTable,'height');internalData.customMinHeight=calcTableHeight($xeTable,'minHeight');internalData.customMaxHeight=calcTableHeight($xeTable,'maxHeight');// 如果启用虚拟滚动，纠正高度
+ */function loadScrollYData($xeTable){const reactData=$xeTable;const internalData=$xeTable;const{isAllOverflow,isScrollYBig}=reactData;const{mergeBodyList,mergeBodyRowMaps,scrollYStore}=internalData;const{preloadSize,startIndex,endIndex,offsetSize}=scrollYStore;const autoOffsetYSize=isAllOverflow?offsetSize:offsetSize+1;const{toVisibleIndex,visibleSize}=handleVirtualYVisible($xeTable);const offsetItem={startIndex:Math.max(0,isScrollYBig?toVisibleIndex-1:toVisibleIndex-1-offsetSize-preloadSize),endIndex:isScrollYBig?toVisibleIndex+visibleSize:toVisibleIndex+visibleSize+autoOffsetYSize+preloadSize};scrollYStore.visibleStartIndex=toVisibleIndex-1;scrollYStore.visibleEndIndex=toVisibleIndex+visibleSize+1;calculateMergerOffsetIndex(mergeBodyList,mergeBodyRowMaps,offsetItem,'row');const{startIndex:offsetStartIndex,endIndex:offsetEndIndex}=offsetItem;if(toVisibleIndex<=startIndex||toVisibleIndex>=endIndex-visibleSize-1){if(startIndex!==offsetStartIndex||endIndex!==offsetEndIndex){scrollYStore.startIndex=offsetStartIndex;scrollYStore.endIndex=offsetEndIndex;$xeTable.updateScrollYData();}}}const createGetRowCacheProp=prop=>{return function(row){const $xeTable=this;const internalData=$xeTable;const{fullAllDataRowIdData}=internalData;if(row){const rowid=getRowid($xeTable,row);const rowRest=fullAllDataRowIdData[rowid];if(rowRest){return rowRest[prop];}}return-1;};};const createGetColumnCacheProp=prop=>{return function(column){const $xeTable=this;const internalData=$xeTable;const{fullColumnIdData}=internalData;if(column){const colRest=fullColumnIdData[column.id];if(colRest){return colRest[prop];}}return-1;};};function lazyScrollXData($xeTable){const internalData=$xeTable;const{lxTimeout,lxRunTime,scrollXStore}=internalData;const{visibleSize}=scrollXStore;const fpsTime=visibleSize>26?26:visibleSize>16?14:6;if(lxTimeout){clearTimeout(lxTimeout);}if(!lxRunTime||lxRunTime+fpsTime<Date.now()){internalData.lxRunTime=Date.now();loadScrollXData($xeTable);}internalData.lxTimeout=setTimeout(()=>{internalData.lxTimeout=undefined;internalData.lxRunTime=undefined;loadScrollXData($xeTable);},fpsTime);}function lazyScrollYData($xeTable){const internalData=$xeTable;const{lyTimeout,lyRunTime,scrollYStore}=internalData;const{visibleSize}=scrollYStore;const fpsTime=visibleSize>30?32:visibleSize>20?18:8;if(lyTimeout){clearTimeout(lyTimeout);}if(!lyRunTime||lyRunTime+fpsTime<Date.now()){internalData.lyRunTime=Date.now();loadScrollYData($xeTable);}internalData.lyTimeout=setTimeout(()=>{internalData.lyTimeout=undefined;internalData.lyRunTime=undefined;loadScrollYData($xeTable);},fpsTime);}function handleSyncScroll($xeTable,isRollX,isRollY){const reactData=$xeTable;const internalData=$xeTable;const{scrollXLoad,scrollYLoad,isAllOverflow}=reactData;const autoWidthColumnList=$xeTable.computeAutoWidthColumnList;internalData.lcsRunTime=Date.now();internalData.lcsTimeout=undefined;internalData.intoRunScroll=false;internalData.inVirtualScroll=false;internalData.inWheelScroll=false;internalData.inHeaderScroll=false;internalData.inBodyScroll=false;internalData.inFooterScroll=false;reactData.lazScrollLoading=false;internalData.scrollRenderType='';let xRest=null;let yRest=null;if(!isAllOverflow){calcCellHeight($xeTable);updateRowOffsetTop($xeTable);}if(isRollX&&scrollXLoad){xRest=$xeTable.updateScrollXData();}if(isRollY&&scrollYLoad){if(autoWidthColumnList.length){calcCellWidth($xeTable);}yRest=$xeTable.updateScrollYData().then(()=>{if(autoWidthColumnList.length){calcCellWidth($xeTable);autoCellWidth($xeTable);}if(!isAllOverflow){calcCellHeight($xeTable);updateRowOffsetTop($xeTable);}return $xeTable.updateScrollYSpace();});}updateRowExpandStyle($xeTable);return Promise.all([xRest,yRest,scrollXLoad||scrollYLoad?$xeTable.updateCellAreas():null]);}function checkLastSyncScroll($xeTable,isRollX,isRollY){const reactData=$xeTable;const internalData=$xeTable;const{lcsTimeout}=internalData;reactData.lazScrollLoading=true;if(lcsTimeout){clearTimeout(lcsTimeout);}internalData.lcsTimeout=setTimeout(()=>{handleSyncScroll($xeTable,isRollX,isRollY).then(()=>{if(reactData.scrollXLoad||reactData.scrollYLoad){$xeTable.$nextTick(()=>{updateRowExpandStyle($xeTable);if(!internalData.lcsTimeout){handleSyncScroll($xeTable,isRollX,isRollY);}});}});},240);}const getWheelSpeed=lastScrollTime=>{let multiple=1;const currTime=Date.now();if(lastScrollTime+25>currTime){multiple=1.18;}else if(lastScrollTime+30>currTime){multiple=1.15;}else if(lastScrollTime+40>currTime){multiple=1.12;}else if(lastScrollTime+55>currTime){multiple=1.09;}else if(lastScrollTime+75>currTime){multiple=1.06;}else if(lastScrollTime+100>currTime){multiple=1.03;}return multiple;};const syncGanttScrollTop=($xeTable,scrollTop)=>{const internalData=$xeTable;const $xeGanttView=internalData.xeGanttView;if($xeGanttView){const ganttInternalData=$xeGanttView.internalData;const{elemStore:ganttElemStore}=ganttInternalData;const ganttBodyScrollElem=getRefElem(ganttElemStore['main-body-scroll']);if(ganttBodyScrollElem){ganttBodyScrollElem.scrollTop=scrollTop;}}};function updateHeight($xeTable){const reactData=$xeTable;const internalData=$xeTable;internalData.customHeight=calcTableHeight($xeTable,'height');internalData.customMinHeight=calcTableHeight($xeTable,'minHeight');internalData.customMaxHeight=calcTableHeight($xeTable,'maxHeight');// 如果启用虚拟滚动，纠正高度
 if(reactData.scrollYLoad&&!(internalData.customHeight||internalData.customMinHeight||internalData.customMaxHeight)){internalData.customHeight=300;}}/**
  * 计算自适应列宽
  */function calcColumnAutoWidth($xeTable,column,wrapperEl){const reactData=$xeTable;const{scrollYLoad}=reactData;const columnOpts=$xeTable.computeColumnOpts;const{autoOptions}=columnOpts;const{isCalcHeader,isCalcBody,isCalcFooter}=autoOptions||{};const querySelections=[];if(isCalcHeader){querySelections.push(`.vxe-header-cell--wrapper[colid="${column.id}"]`);}if(isCalcBody){querySelections.push(`.vxe-body-cell--wrapper[colid="${column.id}"]`);}if(isCalcFooter){querySelections.push(`.vxe-footer-cell--wrapper[colid="${column.id}"]`);}const cellElemList=querySelections.length?wrapperEl.querySelectorAll(querySelections.join(',')):[];let leftRightPadding=0;const firstCellEl=cellElemList[0];if(firstCellEl&&firstCellEl.parentElement){const cellStyle=getComputedStyle(firstCellEl.parentElement);leftRightPadding=Math.ceil(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(cellStyle.paddingLeft)+external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(cellStyle.paddingRight));}let colWidth=(scrollYLoad?column.renderAutoWidth:0)-leftRightPadding;for(let i=0;i<cellElemList.length;i++){const celEl=cellElemList[i];colWidth=Math.max(colWidth,celEl?Math.ceil(celEl.scrollWidth)+4:0);}return colWidth+leftRightPadding;}/**
@@ -18420,12 +18420,22 @@ const convertToRows = originColumns => {
       }
       if (!handleOptions.print) {
         if (beforeExportMethod) {
-          beforeExportMethod({
+          const beRest = beforeExportMethod({
             options: handleOptions,
             $table: $xeTable,
             $grid: $xeGrid,
             $gantt: $xeGantt
           });
+          if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(beRest)) {
+            if (!beRest) {
+              const params = {
+                status: false
+              };
+              return Promise.reject(params);
+            }
+          } else {
+            export_mixin_warnLog('vxe.error.returnErr', ['beforeExportMethod', 'boolean', beRest]);
+          }
         }
       }
       if (!handleOptions.data) {
@@ -18556,18 +18566,26 @@ const convertToRows = originColumns => {
         beforeImportMethod
       } = opts;
       if (beforeImportMethod) {
-        beforeImportMethod({
+        const biRest = beforeImportMethod({
           options: opts,
           $table: $xeTable
         });
+        if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(biRest)) {
+          if (!biRest) {
+            const params = {
+              status: false
+            };
+            return Promise.reject(params);
+          }
+        } else {
+          export_mixin_warnLog('vxe.error.returnErr', ['beforeImportMethod', 'boolean', biRest]);
+        }
       }
       return handleFileImport($xeTable, file, opts);
     },
     _importData(options) {
       const $xeTable = this;
-      const {
-        importOpts
-      } = this;
+      const importOpts = $xeTable.computeImportOpts;
       const opts = Object.assign({
         types: external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().keys(importOpts._typeMaps)
         // beforeImportMethod: null,
@@ -18578,10 +18596,20 @@ const convertToRows = originColumns => {
         afterImportMethod
       } = opts;
       if (beforeImportMethod) {
-        beforeImportMethod({
+        const biRest = beforeImportMethod({
           options: opts,
-          $table: this
+          $table: $xeTable
         });
+        if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(biRest)) {
+          if (!biRest) {
+            const params = {
+              status: false
+            };
+            return Promise.reject(params);
+          }
+        } else {
+          export_mixin_warnLog('vxe.error.returnErr', ['beforeImportMethod', 'boolean', biRest]);
+        }
       }
       return core_.VxeUI.readFile(opts).catch(e => {
         if (afterImportMethod) {
@@ -18639,6 +18667,7 @@ const convertToRows = originColumns => {
         printTitle = document.title || '';
       }
       const beforePrintMethod = opts.beforePrintMethod;
+      const printMethod = opts.printMethod;
       const tableHtml = opts.html || opts.content;
       return new Promise((resolve, reject) => {
         if (core_.VxeUI.print) {
@@ -18658,6 +18687,30 @@ const convertToRows = originColumns => {
                   $grid: $xeGrid,
                   $gantt: $xeGantt
                 });
+              } : undefined,
+              beforePrintMethod: beforePrintMethod ? ({
+                html
+              }) => {
+                return beforePrintMethod({
+                  html,
+                  content: html,
+                  options: opts,
+                  $table: $xeTable,
+                  $grid: $xeGrid,
+                  $gantt: $xeGantt
+                });
+              } : undefined,
+              printMethod: printMethod ? ({
+                html
+              }) => {
+                return printMethod({
+                  html,
+                  content: html,
+                  options: opts,
+                  $table: $xeTable,
+                  $grid: $xeGrid,
+                  $gantt: $xeGantt
+                });
               } : undefined
             }));
           } else {
@@ -18679,6 +18732,30 @@ const convertToRows = originColumns => {
                     $grid: $xeGrid,
                     $gantt: $xeGantt
                   });
+                } : undefined,
+                beforePrintMethod: beforePrintMethod ? ({
+                  html
+                }) => {
+                  return beforePrintMethod({
+                    html,
+                    content: html,
+                    options: opts,
+                    $table: $xeTable,
+                    $grid: $xeGrid,
+                    $gantt: $xeGantt
+                  });
+                } : undefined,
+                printMethod: printMethod ? ({
+                  html
+                }) => {
+                  return printMethod({
+                    html,
+                    content: html,
+                    options: opts,
+                    $table: $xeTable,
+                    $grid: $xeGrid,
+                    $gantt: $xeGantt
+                  });
                 } : undefined
               });
             }));
@@ -28693,6 +28770,8 @@ const Toolbar = VxeToolbar;
       noTree: '树结构不支持 "{0}"',
       noGroup: '数据分组后不支持 "{0}"',
       notProp: '不支持的参数 "{0}"',
+      returnErr: '参数 "{0}" 的返回值期望是 "{1}" 实际是 "{2}"',
+      notSupportReturn: '当返回值为 "{0}" 时的参数应该使用用 "{1}" 而不是 "{2}"',
       checkProp: '当数据量过大时可能会导致复选框卡顿，建议设置参数 "{0}" 提升渲染速度',
       coverProp: '"{0}" 的参数 "{1}" 重复定义，这可能会出现错误',
       uniField: '字段名 "{0}" 重复定义，这可能会出现错误',