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

package/dist/all.esm.js

@@ -44,7 +44,7 @@ function eqEmptyValue(cellValue) {
     return cellValue === '' || XEUtils.eqNull(cellValue);
 }
 
-const version = "4.21.0-beta.1";
+const version = "4.21.0-beta.2";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({
@@ -766,7 +766,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.2"}`;
 function createComponentLog(name) {
     const uiVersion = VxeUI.uiVersion ? `ui v${VxeUI.uiVersion}` : '';
     const ganttVersion = VxeUI.ganttVersion ? `gantt v${VxeUI.ganttVersion}` : '';
@@ -12066,7 +12066,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 +12183,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 +12205,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 +12264,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 +12284,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 +12328,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 +20076,9 @@ var VxeTableComponent = defineVxeComponent({
                 xRest = $xeTable.updateScrollXData();
             }
             if (isRollY && scrollYLoad) {
+                if (autoWidthColumnList.length) {
+                    calcCellWidth();
+                }
                 yRest = $xeTable.updateScrollYData().then(() => {
                     if (autoWidthColumnList.length) {
                         calcCellWidth();
@@ -32722,6 +32801,8 @@ var zhCN = {
             noTree: '树结构不支持 "{0}"',
             noGroup: '数据分组后不支持 "{0}"',
             notProp: '不支持的参数 "{0}"',
+            returnErr: '参数 "{0}" 的返回值期望是 "{1}" 实际是 "{2}"',
+            notSupportReturn: '当返回值为 "{0}" 时的参数应该使用用 "{1}" 而不是 "{2}"',
             checkProp: '当数据量过大时可能会导致复选框卡顿，建议设置参数 "{0}" 提升渲染速度',
             coverProp: '"{0}" 的参数 "{1}" 重复定义，这可能会出现错误',
             uniField: '字段名 "{0}" 重复定义，这可能会出现错误',