vxe-table 4.21.0-beta.1 → 4.21.0-beta.3

package/dist/all.esm.js

@@ -43,8 +43,11 @@ function formatText(value, placeholder) {
 function eqEmptyValue(cellValue) {
     return cellValue === '' || XEUtils.eqNull(cellValue);
 }
+function getDefaultConfig(val1, def1) {
+    return XEUtils.eqNull(val1) ? def1 : val1;
+}
 
-const version = "4.21.0-beta.1";
+const version = "4.21.0-beta.3";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({
@@ -766,7 +769,7 @@ function wheelScrollTopTo(diffNum, cb) {
 }
 
 const { log } = VxeUI;
-const tableVersion = `table v${"4.21.0-beta.1"}`;
+const tableVersion = `table v${"4.21.0-beta.3"}`;
 function createComponentLog(name) {
     const uiVersion = VxeUI.uiVersion ? `ui v${VxeUI.uiVersion}` : '';
     const ganttVersion = VxeUI.ganttVersion ? `gantt v${VxeUI.ganttVersion}` : '';
@@ -7704,7 +7707,10 @@ var TableImportPanelComponent = defineVxeComponent({
             const { defaultOptions, storeData } = props;
             const selectName = computeSelectName.value;
             const hasFile = computeHasFile.value;
+            const importOpts = computeImportOpts.value;
             const parseTypeLabel = computeParseTypeLabel.value;
+            const modelOptions = importOpts.modelOptions || {};
+            const settingOptions = importOpts.settingOptions || {};
             const slots = defaultOptions.slots || {};
             const topSlot = slots.top;
             const bottomSlot = slots.bottom;
@@ -7714,18 +7720,20 @@ var TableImportPanelComponent = defineVxeComponent({
                 ? h(VxeUIModalComponent, {
                     id: 'VXE_IMPORT_MODAL',
                     modelValue: storeData.visible,
-                    title: getI18n$8('vxe.import.impTitle'),
+                    title: modelOptions.title || getI18n$8('vxe.import.impTitle'),
                     className: 'vxe-table-export-popup-wrapper',
-                    width: 540,
-                    minWidth: 360,
-                    minHeight: 240,
+                    width: modelOptions.width || 540,
+                    height: modelOptions.height,
+                    minWidth: modelOptions.minWidth || 360,
+                    minHeight: modelOptions.minHeight || 240,
                     mask: true,
                     lockView: true,
                     showFooter: true,
                     escClosable: true,
                     maskClosable: true,
-                    showMaximize: true,
-                    resize: true,
+                    showMinimize: modelOptions.showMinimize,
+                    showMaximize: getDefaultConfig(modelOptions.showMaximize, true),
+                    resize: getDefaultConfig(modelOptions.resize, true),
                     loading: reactData.loading,
                     'onUpdate:modelValue'(value) {
                         storeData.visible = value;
@@ -7785,20 +7793,22 @@ var TableImportPanelComponent = defineVxeComponent({
                                                 h('td', getI18n$8('vxe.import.impType')),
                                                 h('td', parseTypeLabel)
                                             ]),
-                                            h('tr', [
-                                                h('td', getI18n$8('vxe.import.impMode')),
-                                                h('td', [
-                                                    VxeUISelectComponent
-                                                        ? h(VxeUISelectComponent, {
-                                                            modelValue: defaultOptions.mode,
-                                                            options: storeData.modeList,
-                                                            'onUpdate:modelValue'(value) {
-                                                                defaultOptions.mode = value;
-                                                            }
-                                                        })
-                                                        : renderEmptyElement$4($xeTable)
+                                            settingOptions.showMode === false
+                                                ? renderEmptyElement$4($xeTable)
+                                                : h('tr', [
+                                                    h('td', getI18n$8('vxe.import.impMode')),
+                                                    h('td', [
+                                                        VxeUISelectComponent
+                                                            ? h(VxeUISelectComponent, {
+                                                                modelValue: defaultOptions.mode,
+                                                                options: storeData.modeList,
+                                                                'onUpdate:modelValue'(value) {
+                                                                    defaultOptions.mode = value;
+                                                                }
+                                                            })
+                                                            : renderEmptyElement$4($xeTable)
+                                                    ])
                                                 ])
-                                            ])
                                         ])
                                     ])
                                 ]),
@@ -8017,6 +8027,10 @@ var TableExportPanelComponent = defineVxeComponent({
             const { hasTree, hasRowGroup, hasMerge, isPrint, hasColgroup, columns } = storeData;
             const { isHeader } = defaultOptions;
             const colVNs = [];
+            const exportOpts = computeExportOpts.value;
+            const printOpts = computePrintOpts.value;
+            const modelOptions = (isPrint ? printOpts : exportOpts).modelOptions || {};
+            const settingOptions = (isPrint ? printOpts : exportOpts).settingOptions || {};
             const checkedAll = computeCheckedAll.value;
             const showSheet = computeShowSheet.value;
             const supportMerge = computeSupportMerge.value;
@@ -8069,18 +8083,20 @@ var TableExportPanelComponent = defineVxeComponent({
                 ? h(VxeUIModalComponent, {
                     id: 'VXE_EXPORT_MODAL',
                     modelValue: storeData.visible,
-                    title: getI18n$7(isPrint ? 'vxe.export.printTitle' : 'vxe.export.expTitle'),
+                    title: modelOptions.title || getI18n$7(isPrint ? 'vxe.export.printTitle' : 'vxe.export.expTitle'),
                     className: 'vxe-table-export-popup-wrapper',
-                    width: 660,
-                    minWidth: 500,
-                    minHeight: 400,
+                    width: modelOptions.width || 660,
+                    height: modelOptions.height,
+                    minWidth: modelOptions.minWidth || 500,
+                    minHeight: modelOptions.minHeight || 400,
                     mask: true,
                     lockView: true,
                     showFooter: true,
                     escClosable: true,
                     maskClosable: true,
-                    showMaximize: true,
-                    resize: true,
+                    showMinimize: modelOptions.showMinimize,
+                    showMaximize: getDefaultConfig(modelOptions.showMaximize, true),
+                    resize: getDefaultConfig(modelOptions.resize, true),
                     loading: reactData.loading,
                     'onUpdate:modelValue'(value) {
                         storeData.visible = value;
@@ -8118,7 +8134,7 @@ var TableExportPanelComponent = defineVxeComponent({
                                     }, [
                                         h('tbody', [
                                             [
-                                                isPrint
+                                                isPrint || settingOptions.showFileName === false
                                                     ? renderEmptyElement$3($xeTable)
                                                     : h('tr', [
                                                         h('td', getI18n$7('vxe.export.expName')),
@@ -8137,7 +8153,7 @@ var TableExportPanelComponent = defineVxeComponent({
                                                                 : renderEmptyElement$3($xeTable)
                                                         ])
                                                     ]),
-                                                isPrint
+                                                isPrint || settingOptions.showType === false
                                                     ? renderEmptyElement$3($xeTable)
                                                     : h('tr', [
                                                         h('td', getI18n$7('vxe.export.expType')),
@@ -8153,7 +8169,7 @@ var TableExportPanelComponent = defineVxeComponent({
                                                                 : renderEmptyElement$3($xeTable)
                                                         ])
                                                     ]),
-                                                isPrint || showSheet
+                                                (isPrint || showSheet) && settingOptions.showSheet !== false
                                                     ? h('tr', [
                                                         h('td', getI18n$7('vxe.export.expSheetName')),
                                                         h('td', [
@@ -8172,57 +8188,61 @@ var TableExportPanelComponent = defineVxeComponent({
                                                         ])
                                                     ])
                                                     : renderEmptyElement$3($xeTable),
-                                                h('tr', [
-                                                    h('td', getI18n$7('vxe.export.expMode')),
-                                                    h('td', [
-                                                        VxeUISelectComponent
-                                                            ? h(VxeUISelectComponent, {
-                                                                modelValue: defaultOptions.mode,
-                                                                options: storeData.modeList.map((item) => {
-                                                                    return {
-                                                                        value: item.value,
-                                                                        label: getI18n$7(item.label)
-                                                                    };
-                                                                }),
-                                                                'onUpdate:modelValue'(value) {
-                                                                    defaultOptions.mode = value;
-                                                                }
-                                                            })
-                                                            : renderEmptyElement$3($xeTable)
-                                                    ])
-                                                ]),
-                                                h('tr', [
-                                                    h('td', [getI18n$7('vxe.export.expColumn')]),
-                                                    h('td', [
-                                                        h('div', {
-                                                            class: 'vxe-table-export--panel-column'
-                                                        }, [
-                                                            h('ul', {
-                                                                class: 'vxe-table-export--panel-column-header'
+                                                settingOptions.showMode === false
+                                                    ? renderEmptyElement$3($xeTable)
+                                                    : h('tr', [
+                                                        h('td', getI18n$7('vxe.export.expMode')),
+                                                        h('td', [
+                                                            VxeUISelectComponent
+                                                                ? h(VxeUISelectComponent, {
+                                                                    modelValue: defaultOptions.mode,
+                                                                    options: storeData.modeList.map((item) => {
+                                                                        return {
+                                                                            value: item.value,
+                                                                            label: getI18n$7(item.label)
+                                                                        };
+                                                                    }),
+                                                                    'onUpdate:modelValue'(value) {
+                                                                        defaultOptions.mode = value;
+                                                                    }
+                                                                })
+                                                                : renderEmptyElement$3($xeTable)
+                                                        ])
+                                                    ]),
+                                                settingOptions.showColumn === false
+                                                    ? renderEmptyElement$3($xeTable)
+                                                    : h('tr', [
+                                                        h('td', [getI18n$7('vxe.export.expColumn')]),
+                                                        h('td', [
+                                                            h('div', {
+                                                                class: 'vxe-table-export--panel-column'
                                                             }, [
-                                                                h('li', {
-                                                                    class: ['vxe-table-export--panel-column-option', {
-                                                                            'is--checked': isAllChecked,
-                                                                            'is--indeterminate': isAllIndeterminate
-                                                                        }],
-                                                                    title: getI18n$7('vxe.table.allTitle'),
-                                                                    onClick: allColumnEvent
+                                                                h('ul', {
+                                                                    class: 'vxe-table-export--panel-column-header'
                                                                 }, [
-                                                                    h('span', {
-                                                                        class: ['vxe-checkbox--icon', isAllIndeterminate ? getIcon$3().TABLE_CHECKBOX_INDETERMINATE : (isAllChecked ? getIcon$3().TABLE_CHECKBOX_CHECKED : getIcon$3().TABLE_CHECKBOX_UNCHECKED)]
-                                                                    }),
-                                                                    h('span', {
-                                                                        class: 'vxe-checkbox--label'
-                                                                    }, getI18n$7('vxe.export.expCurrentColumn'))
-                                                                ])
-                                                            ]),
-                                                            h('ul', {
-                                                                class: 'vxe-table-export--panel-column-body'
-                                                            }, colVNs)
+                                                                    h('li', {
+                                                                        class: ['vxe-table-export--panel-column-option', {
+                                                                                'is--checked': isAllChecked,
+                                                                                'is--indeterminate': isAllIndeterminate
+                                                                            }],
+                                                                        title: getI18n$7('vxe.table.allTitle'),
+                                                                        onClick: allColumnEvent
+                                                                    }, [
+                                                                        h('span', {
+                                                                            class: ['vxe-checkbox--icon', isAllIndeterminate ? getIcon$3().TABLE_CHECKBOX_INDETERMINATE : (isAllChecked ? getIcon$3().TABLE_CHECKBOX_CHECKED : getIcon$3().TABLE_CHECKBOX_UNCHECKED)]
+                                                                        }),
+                                                                        h('span', {
+                                                                            class: 'vxe-checkbox--label'
+                                                                        }, getI18n$7('vxe.export.expCurrentColumn'))
+                                                                    ])
+                                                                ]),
+                                                                h('ul', {
+                                                                    class: 'vxe-table-export--panel-column-body'
+                                                                }, colVNs)
+                                                            ])
                                                         ])
-                                                    ])
-                                                ]),
-                                                isPrint
+                                                    ]),
+                                                isPrint && (settingOptions.showWidthMode !== false)
                                                     ? h('tr', [
                                                         h('td', getI18n$7('vxe.export.widthMode')),
                                                         h('td', [
@@ -8238,118 +8258,120 @@ var TableExportPanelComponent = defineVxeComponent({
                                                         ])
                                                     ])
                                                     : renderEmptyElement$3($xeTable),
-                                                h('tr', [
-                                                    h('td', getI18n$7('vxe.export.expOpts')),
-                                                    parameterSlot
-                                                        ? h('td', [
-                                                            h('div', {
-                                                                class: 'vxe-table-export--panel-option-row'
-                                                            }, $xeTable.callSlot(parameterSlot, params))
-                                                        ])
-                                                        : h('td', [
-                                                            h('div', {
-                                                                class: 'vxe-table-export--panel-option-row'
-                                                            }, VxeUICheckboxComponent
-                                                                ? [
-                                                                    h(VxeUICheckboxComponent, {
-                                                                        modelValue: hasEmptyData || isHeader,
-                                                                        disabled: hasEmptyData,
-                                                                        title: getI18n$7('vxe.export.expHeaderTitle'),
-                                                                        content: getI18n$7('vxe.export.expOptHeader'),
-                                                                        'onUpdate:modelValue'(value) {
-                                                                            defaultOptions.isHeader = value;
-                                                                        }
-                                                                    }),
-                                                                    h(VxeUICheckboxComponent, {
-                                                                        modelValue: defaultOptions.isFooter,
-                                                                        disabled: !storeData.hasFooter,
-                                                                        title: getI18n$7('vxe.export.expFooterTitle'),
-                                                                        content: getI18n$7('vxe.export.expOptFooter'),
-                                                                        'onUpdate:modelValue'(value) {
-                                                                            defaultOptions.isFooter = value;
-                                                                        }
-                                                                    }),
-                                                                    h(VxeUICheckboxComponent, {
-                                                                        modelValue: isHeader ? defaultOptions.isTitle : false,
-                                                                        disabled: !isHeader,
-                                                                        title: getI18n$7('vxe.export.expTitleTitle'),
-                                                                        content: getI18n$7('vxe.export.expOptTitle'),
-                                                                        'onUpdate:modelValue'(value) {
-                                                                            defaultOptions.isTitle = value;
-                                                                        }
-                                                                    }),
-                                                                    h(VxeUICheckboxComponent, {
-                                                                        modelValue: isHeader && hasColgroup && supportMerge ? defaultOptions.isColgroup : false,
-                                                                        title: getI18n$7('vxe.export.expColgroupTitle'),
-                                                                        disabled: !isHeader || !hasColgroup || !supportMerge,
-                                                                        content: getI18n$7('vxe.export.expOptColgroup'),
-                                                                        'onUpdate:modelValue'(value) {
-                                                                            defaultOptions.isColgroup = value;
-                                                                        }
-                                                                    })
-                                                                ]
-                                                                : []),
-                                                            h('div', {
-                                                                class: 'vxe-table-export--panel-option-row'
-                                                            }, VxeUICheckboxComponent
-                                                                ? [
-                                                                    h(VxeUICheckboxComponent, {
-                                                                        modelValue: hasEmptyData ? false : defaultOptions.original,
-                                                                        disabled: hasEmptyData,
-                                                                        title: getI18n$7('vxe.export.expOriginalTitle'),
-                                                                        content: getI18n$7('vxe.export.expOptOriginal'),
-                                                                        'onUpdate:modelValue'(value) {
-                                                                            defaultOptions.original = value;
-                                                                        }
-                                                                    }),
-                                                                    h(VxeUICheckboxComponent, {
-                                                                        modelValue: hasMerge && supportMerge && checkedAll ? defaultOptions.isMerge : false,
-                                                                        title: getI18n$7('vxe.export.expMergeTitle'),
-                                                                        disabled: hasEmptyData || !hasMerge || !supportMerge || !checkedAll,
-                                                                        content: getI18n$7('vxe.export.expOptMerge'),
-                                                                        'onUpdate:modelValue'(value) {
-                                                                            defaultOptions.isMerge = value;
-                                                                        }
-                                                                    }),
-                                                                    isPrint
-                                                                        ? renderEmptyElement$3($xeTable)
-                                                                        : h(VxeUICheckboxComponent, {
-                                                                            modelValue: supportStyle ? defaultOptions.useStyle : false,
-                                                                            disabled: !supportStyle,
-                                                                            title: getI18n$7('vxe.export.expUseStyleTitle'),
-                                                                            content: getI18n$7('vxe.export.expOptUseStyle'),
+                                                settingOptions.showParameter === false
+                                                    ? renderEmptyElement$3($xeTable)
+                                                    : h('tr', [
+                                                        h('td', getI18n$7('vxe.export.expOpts')),
+                                                        parameterSlot
+                                                            ? h('td', [
+                                                                h('div', {
+                                                                    class: 'vxe-table-export--panel-option-row'
+                                                                }, $xeTable.callSlot(parameterSlot, params))
+                                                            ])
+                                                            : h('td', [
+                                                                h('div', {
+                                                                    class: 'vxe-table-export--panel-option-row'
+                                                                }, VxeUICheckboxComponent
+                                                                    ? [
+                                                                        h(VxeUICheckboxComponent, {
+                                                                            modelValue: hasEmptyData || isHeader,
+                                                                            disabled: hasEmptyData,
+                                                                            title: getI18n$7('vxe.export.expHeaderTitle'),
+                                                                            content: getI18n$7('vxe.export.expOptHeader'),
+                                                                            'onUpdate:modelValue'(value) {
+                                                                                defaultOptions.isHeader = value;
+                                                                            }
+                                                                        }),
+                                                                        h(VxeUICheckboxComponent, {
+                                                                            modelValue: defaultOptions.isFooter,
+                                                                            disabled: !storeData.hasFooter,
+                                                                            title: getI18n$7('vxe.export.expFooterTitle'),
+                                                                            content: getI18n$7('vxe.export.expOptFooter'),
+                                                                            'onUpdate:modelValue'(value) {
+                                                                                defaultOptions.isFooter = value;
+                                                                            }
+                                                                        }),
+                                                                        h(VxeUICheckboxComponent, {
+                                                                            modelValue: isHeader ? defaultOptions.isTitle : false,
+                                                                            disabled: !isHeader,
+                                                                            title: getI18n$7('vxe.export.expTitleTitle'),
+                                                                            content: getI18n$7('vxe.export.expOptTitle'),
+                                                                            'onUpdate:modelValue'(value) {
+                                                                                defaultOptions.isTitle = value;
+                                                                            }
+                                                                        }),
+                                                                        h(VxeUICheckboxComponent, {
+                                                                            modelValue: isHeader && hasColgroup && supportMerge ? defaultOptions.isColgroup : false,
+                                                                            title: getI18n$7('vxe.export.expColgroupTitle'),
+                                                                            disabled: !isHeader || !hasColgroup || !supportMerge,
+                                                                            content: getI18n$7('vxe.export.expOptColgroup'),
                                                                             'onUpdate:modelValue'(value) {
-                                                                                defaultOptions.useStyle = value;
+                                                                                defaultOptions.isColgroup = value;
                                                                             }
                                                                         })
-                                                                ]
-                                                                : []),
-                                                            h('div', {
-                                                                class: 'vxe-table-export--panel-option-row'
-                                                            }, VxeUICheckboxComponent
-                                                                ? [
-                                                                    h(VxeUICheckboxComponent, {
-                                                                        modelValue: hasTree ? defaultOptions.isTreeAllExpanded : false,
-                                                                        disabled: hasEmptyData || !hasTree,
-                                                                        title: getI18n$7('vxe.export.expTreeAllExpandTitle'),
-                                                                        content: getI18n$7('vxe.export.expOptTreeAllExpand'),
-                                                                        'onUpdate:modelValue'(value) {
-                                                                            defaultOptions.isTreeAllExpanded = value;
-                                                                        }
-                                                                    }),
-                                                                    h(VxeUICheckboxComponent, {
-                                                                        modelValue: hasRowGroup ? defaultOptions.isRowGroupAllExpanded : false,
-                                                                        disabled: hasEmptyData || !hasRowGroup,
-                                                                        title: getI18n$7('vxe.export.expRowGroupAllExpandTitle'),
-                                                                        content: getI18n$7('vxe.export.expOptRowGroupAllExpand'),
-                                                                        'onUpdate:modelValue'(value) {
-                                                                            defaultOptions.isRowGroupAllExpanded = value;
-                                                                        }
-                                                                    })
-                                                                ]
-                                                                : [])
-                                                        ])
-                                                ])
+                                                                    ]
+                                                                    : []),
+                                                                h('div', {
+                                                                    class: 'vxe-table-export--panel-option-row'
+                                                                }, VxeUICheckboxComponent
+                                                                    ? [
+                                                                        h(VxeUICheckboxComponent, {
+                                                                            modelValue: hasEmptyData ? false : defaultOptions.original,
+                                                                            disabled: hasEmptyData,
+                                                                            title: getI18n$7('vxe.export.expOriginalTitle'),
+                                                                            content: getI18n$7('vxe.export.expOptOriginal'),
+                                                                            'onUpdate:modelValue'(value) {
+                                                                                defaultOptions.original = value;
+                                                                            }
+                                                                        }),
+                                                                        h(VxeUICheckboxComponent, {
+                                                                            modelValue: hasMerge && supportMerge && checkedAll ? defaultOptions.isMerge : false,
+                                                                            title: getI18n$7('vxe.export.expMergeTitle'),
+                                                                            disabled: hasEmptyData || !hasMerge || !supportMerge || !checkedAll,
+                                                                            content: getI18n$7('vxe.export.expOptMerge'),
+                                                                            'onUpdate:modelValue'(value) {
+                                                                                defaultOptions.isMerge = value;
+                                                                            }
+                                                                        }),
+                                                                        isPrint
+                                                                            ? renderEmptyElement$3($xeTable)
+                                                                            : h(VxeUICheckboxComponent, {
+                                                                                modelValue: supportStyle ? defaultOptions.useStyle : false,
+                                                                                disabled: !supportStyle,
+                                                                                title: getI18n$7('vxe.export.expUseStyleTitle'),
+                                                                                content: getI18n$7('vxe.export.expOptUseStyle'),
+                                                                                'onUpdate:modelValue'(value) {
+                                                                                    defaultOptions.useStyle = value;
+                                                                                }
+                                                                            })
+                                                                    ]
+                                                                    : []),
+                                                                h('div', {
+                                                                    class: 'vxe-table-export--panel-option-row'
+                                                                }, VxeUICheckboxComponent
+                                                                    ? [
+                                                                        h(VxeUICheckboxComponent, {
+                                                                            modelValue: hasTree ? defaultOptions.isTreeAllExpanded : false,
+                                                                            disabled: hasEmptyData || !hasTree,
+                                                                            title: getI18n$7('vxe.export.expTreeAllExpandTitle'),
+                                                                            content: getI18n$7('vxe.export.expOptTreeAllExpand'),
+                                                                            'onUpdate:modelValue'(value) {
+                                                                                defaultOptions.isTreeAllExpanded = value;
+                                                                            }
+                                                                        }),
+                                                                        h(VxeUICheckboxComponent, {
+                                                                            modelValue: hasRowGroup ? defaultOptions.isRowGroupAllExpanded : false,
+                                                                            disabled: hasEmptyData || !hasRowGroup,
+                                                                            title: getI18n$7('vxe.export.expRowGroupAllExpandTitle'),
+                                                                            content: getI18n$7('vxe.export.expOptRowGroupAllExpand'),
+                                                                            'onUpdate:modelValue'(value) {
+                                                                                defaultOptions.isRowGroupAllExpanded = value;
+                                                                            }
+                                                                        })
+                                                                    ]
+                                                                    : [])
+                                                            ])
+                                                    ])
                                             ]
                                         ])
                                     ])
@@ -12066,7 +12088,16 @@ hooks$4.add('tableExportModule', {
                 }
                 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$4('vxe.error.returnErr', ['beforeExportMethod', 'boolean', beRest]);
+                        }
                     }
                 }
                 if (!handleOptions.data) {
@@ -12174,7 +12205,16 @@ hooks$4.add('tableExportModule', {
                 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$4('vxe.error.returnErr', ['beforeImportMethod', 'boolean', biRest]);
+                    }
                 }
                 return handleFileImport(file, opts);
             },
@@ -12187,7 +12227,16 @@ hooks$4.add('tableExportModule', {
                 }, importOpts, options);
                 const { beforeImportMethod, afterImportMethod } = 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$4('vxe.error.returnErr', ['beforeImportMethod', 'boolean', biRest]);
+                    }
                 }
                 return VxeUI.readFile(opts).catch(e => {
                     if (afterImportMethod) {
@@ -12237,6 +12286,7 @@ hooks$4.add('tableExportModule', {
                     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) {
@@ -12256,6 +12306,30 @@ hooks$4.add('tableExportModule', {
                                             $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
                             }));
                         }
@@ -12276,6 +12350,30 @@ hooks$4.add('tableExportModule', {
                                                 $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
                                 });
                             }));
@@ -20000,6 +20098,9 @@ var VxeTableComponent = defineVxeComponent({
                 xRest = $xeTable.updateScrollXData();
             }
             if (isRollY && scrollYLoad) {
+                if (autoWidthColumnList.length) {
+                    calcCellWidth();
+                }
                 yRest = $xeTable.updateScrollYData().then(() => {
                     if (autoWidthColumnList.length) {
                         calcCellWidth();
@@ -32722,6 +32823,8 @@ var zhCN = {
             noTree: '树结构不支持 "{0}"',
             noGroup: '数据分组后不支持 "{0}"',
             notProp: '不支持的参数 "{0}"',
+            returnErr: '参数 "{0}" 的返回值期望是 "{1}" 实际是 "{2}"',
+            notSupportReturn: '当返回值为 "{0}" 时的参数应该使用用 "{1}" 而不是 "{2}"',
             checkProp: '当数据量过大时可能会导致复选框卡顿，建议设置参数 "{0}" 提升渲染速度',
             coverProp: '"{0}" 的参数 "{1}" 重复定义，这可能会出现错误',
             uniField: '字段名 "{0}" 重复定义，这可能会出现错误',