vxe-table 4.13.30 → 4.13.31

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

@@ -11,7 +11,7 @@ let htmlCellElem;
 const csvBOM = '\ufeff';
 const enterSymbol = '\r\n';
 function defaultFilterExportColumn(column) {
-    return !!column.field || ['seq', 'checkbox', 'radio'].indexOf(column.type || '') > -1;
+    return !!column.field || ['seq', 'checkbox', 'radio'].indexOf(column.type || '') === -1;
 }
 const getConvertColumns = (columns) => {
     const result = [];
@@ -1118,9 +1118,14 @@ hooks.add('tableExportModule', {
                 if (!mode) {
                     mode = selectRecords.length ? 'selected' : 'current';
                 }
-                const customCols = columns && columns.length
-                    ? columns
-                    : XEUtils.searchTree(collectColumn, column => {
+                let isCustomCol = false;
+                let customCols = [];
+                if (columns && columns.length) {
+                    isCustomCol = true;
+                    customCols = columns;
+                }
+                else {
+                    customCols = XEUtils.searchTree(collectColumn, column => {
                         const isColGroup = column.children && column.children.length > 0;
                         let isChecked = false;
                         if (columns && columns.length) {
@@ -1134,9 +1139,10 @@ hooks.add('tableExportModule', {
                         }
                         return isChecked;
                     }, { children: 'children', mapChildren: 'childNodes', original: true });
+                }
                 const handleOptions = Object.assign({}, opts, { filename: '', sheetName: '' });
                 // 如果设置源数据，则默认导出设置了字段的列
-                if (!customCols && !columnFilterMethod) {
+                if (!isCustomCol && !columnFilterMethod) {
                     columnFilterMethod = ({ column }) => {
                         if (excludeFields) {
                             if (XEUtils.includes(excludeFields, column.field)) {

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "4.13.30";
+export const version = "4.13.31";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({

package/es/ui/src/log.js

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

package/lib/index.umd.js

@@ -3138,7 +3138,7 @@ function eqEmptyValue(cellValue) {
 ;// ./packages/ui/index.ts
 
 
-const version = "4.13.30";
+const version = "4.13.31";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -3599,7 +3599,7 @@ var esnext_iterator_some = __webpack_require__(7550);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"4.13.30"}`;
+const log_version = `table v${"4.13.31"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// ./packages/table/src/columnInfo.ts
@@ -15916,7 +15916,7 @@ let htmlCellElem;
 const csvBOM = '\ufeff';
 const enterSymbol = '\r\n';
 function defaultFilterExportColumn(column) {
-  return !!column.field || ['seq', 'checkbox', 'radio'].indexOf(column.type || '') > -1;
+  return !!column.field || ['seq', 'checkbox', 'radio'].indexOf(column.type || '') === -1;
 }
 const getConvertColumns = columns => {
   const result = [];
@@ -17245,28 +17245,35 @@ export_hook_hooks.add('tableExportModule', {
         if (!mode) {
           mode = selectRecords.length ? 'selected' : 'current';
         }
-        const customCols = columns && columns.length ? columns : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().searchTree(collectColumn, column => {
-          const isColGroup = column.children && column.children.length > 0;
-          let isChecked = false;
-          if (columns && columns.length) {
-            isChecked = handleFilterColumns(opts, column, columns);
-          } else if (excludeFields || includeFields) {
-            isChecked = handleFilterFields(opts, column, includeFields, excludeFields);
-          } else {
-            isChecked = column.visible && (isColGroup || defaultFilterExportColumn(column));
-          }
-          return isChecked;
-        }, {
-          children: 'children',
-          mapChildren: 'childNodes',
-          original: true
-        });
+        let isCustomCol = false;
+        let customCols = [];
+        if (columns && columns.length) {
+          isCustomCol = true;
+          customCols = columns;
+        } else {
+          customCols = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().searchTree(collectColumn, column => {
+            const isColGroup = column.children && column.children.length > 0;
+            let isChecked = false;
+            if (columns && columns.length) {
+              isChecked = handleFilterColumns(opts, column, columns);
+            } else if (excludeFields || includeFields) {
+              isChecked = handleFilterFields(opts, column, includeFields, excludeFields);
+            } else {
+              isChecked = column.visible && (isColGroup || defaultFilterExportColumn(column));
+            }
+            return isChecked;
+          }, {
+            children: 'children',
+            mapChildren: 'childNodes',
+            original: true
+          });
+        }
         const handleOptions = Object.assign({}, opts, {
           filename: '',
           sheetName: ''
         });
         // 如果设置源数据，则默认导出设置了字段的列
-        if (!customCols && !columnFilterMethod) {
+        if (!isCustomCol && !columnFilterMethod) {
           columnFilterMethod = ({
             column
           }) => {