vxe-table 4.7.23 → 4.7.24

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

@@ -1240,7 +1240,11 @@ hooks.add('tableExportModule', {
                 const { treeConfig, importConfig } = props;
                 const { initStore, importStore, importParams } = reactData;
                 const importOpts = computeImportOpts.value;
-                const defOpts = Object.assign({ mode: 'insert', message: true, types: XEUtils.keys(importOpts._typeMaps) }, options, importOpts);
+                const defOpts = Object.assign({
+                    mode: 'insert',
+                    message: true,
+                    types: XEUtils.keys(importOpts._typeMaps)
+                }, importOpts, options);
                 const { types } = defOpts;
                 const isTree = !!treeConfig;
                 if (isTree) {
@@ -1280,21 +1284,29 @@ hooks.add('tableExportModule', {
             },
             openExport(options) {
                 const exportOpts = computeExportOpts.value;
+                const defOpts = Object.assign({
+                    mode: 'insert',
+                    message: true,
+                    types: XEUtils.keys(exportOpts._typeMaps)
+                }, exportOpts, options);
                 if (process.env.NODE_ENV === 'development') {
                     if (!props.exportConfig) {
                         errLog('vxe.error.reqProp', ['export-config']);
                     }
                 }
-                handleExportAndPrint(Object.assign({}, exportOpts, options));
+                handleExportAndPrint(defOpts);
             },
             openPrint(options) {
                 const printOpts = computePrintOpts.value;
+                const defOpts = Object.assign({
+                    message: true
+                }, printOpts, options);
                 if (process.env.NODE_ENV === 'development') {
                     if (!props.printConfig) {
                         errLog('vxe.error.reqProp', ['print-config']);
                     }
                 }
-                handleExportAndPrint(Object.assign({}, printOpts, options), true);
+                handleExportAndPrint(defOpts, true);
             }
         };
         return exportMethods;

package/es/table/src/body.js

@@ -743,7 +743,7 @@ export default defineComponent({
             }
             else {
                 const compConf = emptyOpts.name ? renderer.get(emptyOpts.name) : null;
-                const rtEmptyView = compConf ? compConf.renderTableEmptyView || compConf.renderEmpty : null;
+                const rtEmptyView = compConf ? (compConf.renderTableEmpty || compConf.renderTableEmptyView || compConf.renderEmpty) : null;
                 if (rtEmptyView) {
                     emptyContent = getSlotVNs(rtEmptyView(emptyOpts, { $table: $xeTable }));
                 }

package/es/table/src/table.js

@@ -6379,7 +6379,7 @@ export default defineComponent({
             }
             else {
                 const compConf = emptyOpts.name ? renderer.get(emptyOpts.name) : null;
-                const rtEmptyView = compConf ? compConf.renderTableEmptyView || compConf.renderEmpty : null;
+                const rtEmptyView = compConf ? (compConf.renderTableEmpty || compConf.renderTableEmptyView || compConf.renderEmpty) : null;
                 if (rtEmptyView) {
                     return getSlotVNs(rtEmptyView(emptyOpts, params));
                 }

package/es/ui/index.js

@@ -1,8 +1,8 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "4.7.23";
+export const version = "4.7.24";
 VxeUI.version = version;
-VxeUI.tableVersion = "4.7.23";
+VxeUI.tableVersion = "4.7.24";
 VxeUI.setConfig({
     emptyCell: '　',
     table: {

package/es/ui/src/log.js

@@ -1,5 +1,5 @@
 import { VxeUI } from '@vxe-ui/core';
 const { log } = VxeUI;
-const version = `table v${"4.7.23"}`;
+const version = `table v${"4.7.24"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);

package/lib/index.umd.js

@@ -1951,9 +1951,9 @@ function eqEmptyValue(cellValue) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "4.7.22";
+const version = "4.7.24";
 core_.VxeUI.version = version;
-core_.VxeUI.tableVersion = "4.7.22";
+core_.VxeUI.tableVersion = "4.7.24";
 core_.VxeUI.setConfig({
   emptyCell: '　',
   table: {
@@ -2258,7 +2258,7 @@ var es_array_push = __webpack_require__(4114);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"4.7.22"}`;
+const log_version = `table v${"4.7.24"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -5364,7 +5364,7 @@ const lineOffsetSizes = {
         });
       } else {
         const compConf = emptyOpts.name ? body_renderer.get(emptyOpts.name) : null;
-        const rtEmptyView = compConf ? compConf.renderTableEmptyView || compConf.renderEmpty : null;
+        const rtEmptyView = compConf ? compConf.renderTableEmpty || compConf.renderTableEmptyView || compConf.renderEmpty : null;
         if (rtEmptyView) {
           emptyContent = getSlotVNs(rtEmptyView(emptyOpts, {
             $table: $xeTable
@@ -15479,7 +15479,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         return slots.empty(params);
       } else {
         const compConf = emptyOpts.name ? table_renderer.get(emptyOpts.name) : null;
-        const rtEmptyView = compConf ? compConf.renderTableEmptyView || compConf.renderEmpty : null;
+        const rtEmptyView = compConf ? compConf.renderTableEmpty || compConf.renderTableEmptyView || compConf.renderEmpty : null;
         if (rtEmptyView) {
           return getSlotVNs(rtEmptyView(emptyOpts, params));
         }
@@ -19440,7 +19440,7 @@ export_hook_hooks.add('tableExportModule', {
           mode: 'insert',
           message: true,
           types: external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().keys(importOpts._typeMaps)
-        }, options, importOpts);
+        }, importOpts, options);
         const {
           types
         } = defOpts;
@@ -19485,21 +19485,29 @@ export_hook_hooks.add('tableExportModule', {
       },
       openExport(options) {
         const exportOpts = computeExportOpts.value;
+        const defOpts = Object.assign({
+          mode: 'insert',
+          message: true,
+          types: external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().keys(exportOpts._typeMaps)
+        }, exportOpts, options);
         if (true) {
           if (!props.exportConfig) {
             errLog('vxe.error.reqProp', ['export-config']);
           }
         }
-        handleExportAndPrint(Object.assign({}, exportOpts, options));
+        handleExportAndPrint(defOpts);
       },
       openPrint(options) {
         const printOpts = computePrintOpts.value;
+        const defOpts = Object.assign({
+          message: true
+        }, printOpts, options);
         if (true) {
           if (!props.printConfig) {
             errLog('vxe.error.reqProp', ['print-config']);
           }
         }
-        handleExportAndPrint(Object.assign({}, printOpts, options), true);
+        handleExportAndPrint(defOpts, true);
       }
     };
     return exportMethods;