vxe-table 3.15.30 → 3.15.31

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

@@ -31,7 +31,7 @@ function getSeq($xeTable, cellValue, row, $rowIndex, column, $columnIndex) {
     return cellValue;
 }
 function defaultFilterExportColumn(column) {
-    return !!column.field || ['seq', 'checkbox', 'radio'].indexOf(column.type || '') > -1;
+    return !!column.field || ['seq', 'checkbox', 'radio'].indexOf(column.type || '') === -1;
 }
 function toTableBorder(border) {
     if (border === true) {
@@ -1138,9 +1138,14 @@ export default {
             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) {
@@ -1154,9 +1159,10 @@ export default {
                     }
                     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 = "3.15.30";
+export const version = "3.15.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${"3.15.30"}`;
+const version = `table v${"3.15.31"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);

package/lib/index.umd.js

@@ -2002,7 +2002,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.15.30";
+const version = "3.15.31";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2646,7 +2646,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.15.30"}`;
+const log_version = `table v${"3.15.31"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -23551,7 +23551,7 @@ function getSeq($xeTable, cellValue, row, $rowIndex, column, $columnIndex) {
   return cellValue;
 }
 function defaultFilterExportColumn(column) {
-  return !!column.field || ['seq', 'checkbox', 'radio'].indexOf(column.type || '') > -1;
+  return !!column.field || ['seq', 'checkbox', 'radio'].indexOf(column.type || '') === -1;
 }
 function toTableBorder(border) {
   if (border === true) {
@@ -24866,28 +24866,35 @@ const convertToRows = originColumns => {
       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
         }) => {