vxe-table 3.15.30 → 3.15.32

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/table/module/validator/mixin.js

@@ -1,6 +1,6 @@
 import XEUtils from 'xe-utils';
 import { VxeUI } from '../../../ui';
-import { getFuncText } from '../../../ui/src/utils';
+import { eqEmptyValue, getFuncText } from '../../../ui/src/utils';
 import { scrollToView } from '../../../ui/src/dom';
 import { handleFieldOrColumn, getRowid } from '../../src/util';
 import { warnLog, errLog } from '../../../ui/src/log';
@@ -119,7 +119,7 @@ function validRuleValue(rule, val, required) {
 }
 function checkRuleStatus(rule, val) {
     const { required } = rule;
-    const isEmptyVal = XEUtils.eqNull(val);
+    const isEmptyVal = XEUtils.isArray(val) ? !val.length : eqEmptyValue(val);
     if (required) {
         if (isEmptyVal) {
             return false;

package/es/table/src/methods.js

@@ -3365,7 +3365,9 @@ function updateColumnOffsetLeft($xeTable) {
         const column = visibleColumn[cIndex];
         const colid = column.id;
         const colRest = fullColumnIdData[colid];
-        colRest.oLeft = offsetLeft;
+        if (colRest) {
+            colRest.oLeft = offsetLeft;
+        }
         offsetLeft += column.renderWidth;
     }
 }

package/es/table/src/util.js

@@ -75,7 +75,7 @@ export function restoreScrollLocation($xeTable, scrollLeft, scrollTop) {
         // 还原滚动状态
         return $xeTable.scrollTo(scrollLeft, scrollTop);
     }
-    return $xeTable.$nextTick();
+    return $xeTable.clearScroll();
 }
 export function toTreePathSeq(path) {
     return path.map((num, i) => i % 2 === 0 ? (Number(num) + 1) : '.').join('');

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.32";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({
@@ -201,13 +201,13 @@ VxeUI.setConfig({
             isReplace: true
         },
         virtualXConfig: {
-            enabled: false,
+            // enabled: false,
             gt: 24,
             preSize: 0,
             oSize: 0
         },
         virtualYConfig: {
-            enabled: false,
+            // enabled: false,
             gt: 100,
             preSize: 1,
             oSize: 0

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.32"}`;
 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.32";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2203,13 +2203,13 @@ core_.VxeUI.setConfig({
       isReplace: true
     },
     virtualXConfig: {
-      enabled: false,
+      // enabled: false,
       gt: 24,
       preSize: 0,
       oSize: 0
     },
     virtualYConfig: {
-      enabled: false,
+      // enabled: false,
       gt: 100,
       preSize: 1,
       oSize: 0
@@ -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.32"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -2900,7 +2900,7 @@ function restoreScrollLocation($xeTable, scrollLeft, scrollTop) {
     // 还原滚动状态
     return $xeTable.scrollTo(scrollLeft, scrollTop);
   }
-  return $xeTable.$nextTick();
+  return $xeTable.clearScroll();
 }
 function toTreePathSeq(path) {
   return path.map((num, i) => i % 2 === 0 ? Number(num) + 1 : '.').join('');
@@ -9051,7 +9051,9 @@ function updateColumnOffsetLeft($xeTable) {
     const column = visibleColumn[cIndex];
     const colid = column.id;
     const colRest = fullColumnIdData[colid];
-    colRest.oLeft = offsetLeft;
+    if (colRest) {
+      colRest.oLeft = offsetLeft;
+    }
     offsetLeft += column.renderWidth;
   }
 }
@@ -23551,7 +23553,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 +24868,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
         }) => {
@@ -26090,7 +26099,7 @@ function checkRuleStatus(rule, val) {
   const {
     required
   } = rule;
-  const isEmptyVal = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(val);
+  const isEmptyVal = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(val) ? !val.length : eqEmptyValue(val);
   if (required) {
     if (isEmptyVal) {
       return false;