vxe-table 3.14.4 → 3.14.5

package/es/table/module/export/export-panel.js

@@ -326,27 +326,27 @@ export default {
                                                             }),
                                                             h('vxe-checkbox', {
                                                                 props: {
-                                                                    value: defaultOptions.isFooter,
-                                                                    disabled: !storeData.hasFooter,
-                                                                    title: getI18n('vxe.export.expFooterTitle'),
-                                                                    content: getI18n('vxe.export.expOptFooter')
+                                                                    value: isHeader ? defaultOptions.isTitle : false,
+                                                                    disabled: !isHeader,
+                                                                    title: getI18n('vxe.export.expTitleTitle'),
+                                                                    content: getI18n('vxe.export.expOptTitle')
                                                                 },
                                                                 on: {
                                                                     input(value) {
-                                                                        defaultOptions.isFooter = value;
+                                                                        defaultOptions.isTitle = value;
                                                                     }
                                                                 }
                                                             }),
                                                             h('vxe-checkbox', {
                                                                 props: {
-                                                                    value: hasEmptyData ? false : defaultOptions.original,
-                                                                    disabled: hasEmptyData,
-                                                                    title: getI18n('vxe.export.expOriginalTitle'),
-                                                                    content: getI18n('vxe.export.expOptOriginal')
+                                                                    value: isHeader && hasColgroup && supportMerge ? defaultOptions.isColgroup : false,
+                                                                    disabled: !isHeader || !hasColgroup || !supportMerge,
+                                                                    title: getI18n('vxe.export.expColgroupTitle'),
+                                                                    content: getI18n('vxe.export.expOptColgroup')
                                                                 },
                                                                 on: {
                                                                     input(value) {
-                                                                        defaultOptions.original = value;
+                                                                        defaultOptions.isColgroup = value;
                                                                     }
                                                                 }
                                                             })
@@ -356,16 +356,14 @@ export default {
                                                         }, [
                                                             h('vxe-checkbox', {
                                                                 props: {
-                                                                    // value: supportGroup || (isHeader && hasColgroup && supportMerge) ? defaultOptions.isColgroup : false,
-                                                                    // disabled: !supportGroup && (!isHeader || !hasColgroup || !supportMerge),
-                                                                    value: isHeader && hasColgroup && supportMerge ? defaultOptions.isColgroup : false,
-                                                                    disabled: !isHeader || !hasColgroup || !supportMerge,
-                                                                    title: getI18n('vxe.export.expColgroupTitle'),
-                                                                    content: getI18n('vxe.export.expOptColgroup')
+                                                                    value: hasEmptyData ? false : defaultOptions.original,
+                                                                    disabled: hasEmptyData,
+                                                                    title: getI18n('vxe.export.expOriginalTitle'),
+                                                                    content: getI18n('vxe.export.expOptOriginal')
                                                                 },
                                                                 on: {
                                                                     input(value) {
-                                                                        defaultOptions.isColgroup = value;
+                                                                        defaultOptions.original = value;
                                                                     }
                                                                 }
                                                             }),
@@ -410,6 +408,23 @@ export default {
                                                                     }
                                                                 }
                                                             })
+                                                        ]),
+                                                        h('div', {
+                                                            class: 'vxe-table-export--panel-option-row'
+                                                        }, [
+                                                            h('vxe-checkbox', {
+                                                                props: {
+                                                                    value: defaultOptions.isFooter,
+                                                                    disabled: !storeData.hasFooter,
+                                                                    title: getI18n('vxe.export.expFooterTitle'),
+                                                                    content: getI18n('vxe.export.expOptFooter')
+                                                                },
+                                                                on: {
+                                                                    input(value) {
+                                                                        defaultOptions.isFooter = value;
+                                                                    }
+                                                                }
+                                                            })
                                                         ])
                                                     ])
                                             ])

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

@@ -209,7 +209,7 @@ function getBooleanValue(cellValue) {
 function getHeaderTitle($xeTable, opts, column) {
     const columnOpts = $xeTable.computeColumnOpts;
     const headExportMethod = column.headerExportMethod || columnOpts.headerExportMethod;
-    return headExportMethod ? headExportMethod({ column, options: opts, $table: $xeTable }) : ((opts.original ? column.field : column.getTitle()) || '');
+    return headExportMethod ? headExportMethod({ column, options: opts, $table: $xeTable }) : ((opts.isTitle ? column.getTitle() : column.field) || '');
 }
 function getFooterCellValue($xeTable, opts, row, column) {
     const columnOpts = $xeTable.computeColumnOpts;
@@ -1016,6 +1016,7 @@ function handleExportAndPrint($xeTable, options, isPrint) {
     const defOpts = Object.assign({
         message: true,
         isHeader: showHeader,
+        isTitle: showHeader,
         isFooter: showFooter,
         isColgroup: isGroup,
         isMerge: hasMerge,
@@ -1192,6 +1193,7 @@ export default {
             const opts = Object.assign({
                 message: true,
                 isHeader: showHeader,
+                isTitle: showHeader,
                 isFooter: showFooter,
                 isColgroup: isGroup,
                 isMerge: hasMerge,

package/es/table/src/methods.js

@@ -230,41 +230,35 @@ function cacheColumnMap($xeTable) {
             htmlColumn = column;
         }
         if (treeNode) {
-            if (process.env.NODE_ENV === 'development') {
-                if (treeNodeColumn) {
-                    warnLog('vxe.error.colRepet', ['tree-node', treeNode]);
-                }
+            if (treeNodeColumn) {
+                warnLog('vxe.error.colRepet', ['tree-node', treeNode]);
             }
             if (!treeNodeColumn) {
                 treeNodeColumn = column;
             }
         }
         else if (type === 'expand') {
-            if (process.env.NODE_ENV === 'development') {
-                if (expandColumn) {
-                    warnLog('vxe.error.colRepet', ['type', type]);
-                }
+            if (expandColumn) {
+                warnLog('vxe.error.colRepet', ['type', type]);
             }
             if (!expandColumn) {
                 expandColumn = column;
             }
         }
-        if (process.env.NODE_ENV === 'development') {
-            if (type === 'checkbox') {
-                if (checkboxColumn) {
-                    warnLog('vxe.error.colRepet', ['type', type]);
-                }
-                if (!checkboxColumn) {
-                    checkboxColumn = column;
-                }
+        if (type === 'checkbox') {
+            if (checkboxColumn) {
+                warnLog('vxe.error.colRepet', ['type', type]);
             }
-            else if (type === 'radio') {
-                if (radioColumn) {
-                    warnLog('vxe.error.colRepet', ['type', type]);
-                }
-                if (!radioColumn) {
-                    radioColumn = column;
-                }
+            if (!checkboxColumn) {
+                checkboxColumn = column;
+            }
+        }
+        else if (type === 'radio') {
+            if (radioColumn) {
+                warnLog('vxe.error.colRepet', ['type', type]);
+            }
+            if (!radioColumn) {
+                radioColumn = column;
             }
         }
         if (isAllOverflow && column.showOverflow === false) {
@@ -2656,6 +2650,7 @@ const Methods = {
         const { scrollYLoad: oldScrollYLoad } = reactData;
         const { scrollYStore, scrollXStore, lastScrollLeft, lastScrollTop } = internalData;
         const treeOpts = $xeTable.computeTreeOpts;
+        const expandOpts = $xeTable.computeExpandOpts;
         const { transform } = treeOpts;
         const childrenField = treeOpts.children || treeOpts.childrenField;
         let treeData = [];
@@ -2742,6 +2737,9 @@ const Methods = {
                 scrollYStore.endIndex = scrollYStore.visibleSize;
             }
             if (sYLoad) {
+                if (reactData.expandColumn && expandOpts.mode !== 'fixed') {
+                    errLog('vxe.error.notConflictProp', ['column.type="expand', 'expand-config.mode="fixed"']);
+                }
                 // if (showOverflow) {
                 //   if (!rowOpts.height) {
                 //     const errColumn = internalData.tableFullColumn.find((column: any) => column.showOverflow === false)
@@ -3652,8 +3650,10 @@ const Methods = {
     getCheckboxRecords(isFull) {
         const $xeTable = this;
         const props = $xeTable;
+        const reactData = $xeTable;
         const internalData = $xeTable;
         const { treeConfig } = props;
+        const { updateCheckboxFlag } = reactData;
         const { tableFullData, afterFullData, afterTreeFullData, tableFullTreeData, fullDataRowIdData, afterFullRowMaps, selectCheckboxMaps } = internalData;
         const treeOpts = $xeTable.computeTreeOpts;
         const checkboxOpts = $xeTable.computeCheckboxOpts;
@@ -3661,29 +3661,31 @@ const Methods = {
         const { checkField } = checkboxOpts;
         const childrenField = treeOpts.children || treeOpts.childrenField;
         let rowList = [];
-        if (checkField) {
-            if (treeConfig) {
-                const currTableData = isFull ? (transform ? tableFullTreeData : tableFullData) : (transform ? afterTreeFullData : afterFullData);
-                rowList = XEUtils.filterTree(currTableData, row => XEUtils.get(row, checkField), { children: transform ? mapChildrenField : childrenField });
+        if (updateCheckboxFlag) {
+            if (checkField) {
+                if (treeConfig) {
+                    const currTableData = isFull ? (transform ? tableFullTreeData : tableFullData) : (transform ? afterTreeFullData : afterFullData);
+                    rowList = XEUtils.filterTree(currTableData, row => XEUtils.get(row, checkField), { children: transform ? mapChildrenField : childrenField });
+                }
+                else {
+                    const currTableData = isFull ? tableFullData : afterFullData;
+                    rowList = currTableData.filter((row) => XEUtils.get(row, checkField));
+                }
             }
             else {
-                const currTableData = isFull ? tableFullData : afterFullData;
-                rowList = currTableData.filter((row) => XEUtils.get(row, checkField));
-            }
-        }
-        else {
-            XEUtils.each(selectCheckboxMaps, (row, rowid) => {
-                if (isFull) {
-                    if (fullDataRowIdData[rowid]) {
-                        rowList.push(fullDataRowIdData[rowid].row);
+                XEUtils.each(selectCheckboxMaps, (row, rowid) => {
+                    if (isFull) {
+                        if (fullDataRowIdData[rowid]) {
+                            rowList.push(fullDataRowIdData[rowid].row);
+                        }
                     }
-                }
-                else {
-                    if (afterFullRowMaps[rowid]) {
-                        rowList.push(afterFullRowMaps[rowid]);
+                    else {
+                        if (afterFullRowMaps[rowid]) {
+                            rowList.push(afterFullRowMaps[rowid]);
+                        }
                     }
-                }
-            });
+                });
+            }
         }
         return rowList;
     },

package/es/table/src/table.js

@@ -599,6 +599,7 @@ export default {
                 original: false,
                 message: true,
                 isHeader: false,
+                isTitle: false,
                 isFooter: false
             },
             rowExpandedFlag: 1,
@@ -1345,6 +1346,7 @@ export default {
         const currentColumnOpts = $xeTable.computeCurrentColumnOpts;
         const virtualXOpts = $xeTable.computeVirtualXOpts;
         const virtualYOpts = $xeTable.computeVirtualYOpts;
+        const keyboardOpts = $xeTable.computeKeyboardOpts;
         if (props.rowId) {
             warnLog('vxe.error.delProp', ['row-id', 'row-config.keyField']);
         }
@@ -1387,6 +1389,12 @@ export default {
         if (this.highlightHoverColumn) {
             warnLog('vxe.error.delProp', ['highlight-hover-column', 'column-config.isHover']);
         }
+        // if (props.scrollY) {
+        //   warnLog('vxe.error.delProp', ['scroll-y', 'virtual-y-config'])
+        // }
+        // if (props.scrollX) {
+        //   warnLog('vxe.error.delProp', ['scroll-x', 'virtual-x-config'])
+        // }
         // 检查导入导出类型，如果自定义导入导出方法，则不校验类型
         if (importConfig && importOpts.types && !importOpts.importMethod && !XEUtils.includeArrays(XEUtils.keys(importOpts._typeMaps), importOpts.types)) {
             warnLog('vxe.error.errProp', [`export-config.types=${importOpts.types.join(',')}`, importOpts.types.filter((type) => XEUtils.includes(XEUtils.keys(importOpts._typeMaps), type)).join(',') || XEUtils.keys(importOpts._typeMaps).join(',')]);
@@ -1478,10 +1486,10 @@ export default {
         if (props.emptyRender && !XEUtils.isObject(props.emptyRender)) {
             warnLog('vxe.error.errProp', [`table.empty-render=${props.emptyRender}`, 'table.empty-render={}']);
         }
-        if ((rowOpts.isCurrent || highlightCurrentRow) && !XEUtils.isBoolean(currentRowOpts.isFollowSelected)) {
+        if ((rowOpts.isCurrent || highlightCurrentRow) && props.keyboardConfig && keyboardOpts.isArrow && !XEUtils.isBoolean(currentRowOpts.isFollowSelected)) {
             warnLog('vxe.error.notConflictProp', ['row-config.isCurrent', 'current-row-config.isFollowSelected']);
         }
-        if ((columnOpts.isCurrent || highlightCurrentColumn) && !XEUtils.isBoolean(currentColumnOpts.isFollowSelected)) {
+        if ((columnOpts.isCurrent || highlightCurrentColumn) && props.keyboardConfig && keyboardOpts.isArrow && !XEUtils.isBoolean(currentColumnOpts.isFollowSelected)) {
             warnLog('vxe.error.notConflictProp', ['column-config.isCurrent', 'current-column-config.isFollowSelected']);
         }
         // 如果不支持虚拟滚动

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "3.14.4";
+export const version = "3.14.5";
 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.14.4"}`;
+const version = `table v${"3.14.5"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);

package/lib/index.umd.js

@@ -2220,7 +2220,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.14.4";
+const version = "3.14.5";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2843,7 +2843,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.14.4"}`;
+const log_version = `table v${"3.14.5"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -5451,39 +5451,33 @@ function cacheColumnMap($xeTable) {
       htmlColumn = column;
     }
     if (treeNode) {
-      if (true) {
-        if (treeNodeColumn) {
-          warnLog('vxe.error.colRepet', ['tree-node', treeNode]);
-        }
+      if (treeNodeColumn) {
+        warnLog('vxe.error.colRepet', ['tree-node', treeNode]);
       }
       if (!treeNodeColumn) {
         treeNodeColumn = column;
       }
     } else if (type === 'expand') {
-      if (true) {
-        if (expandColumn) {
-          warnLog('vxe.error.colRepet', ['type', type]);
-        }
+      if (expandColumn) {
+        warnLog('vxe.error.colRepet', ['type', type]);
       }
       if (!expandColumn) {
         expandColumn = column;
       }
     }
-    if (true) {
-      if (type === 'checkbox') {
-        if (checkboxColumn) {
-          warnLog('vxe.error.colRepet', ['type', type]);
-        }
-        if (!checkboxColumn) {
-          checkboxColumn = column;
-        }
-      } else if (type === 'radio') {
-        if (radioColumn) {
-          warnLog('vxe.error.colRepet', ['type', type]);
-        }
-        if (!radioColumn) {
-          radioColumn = column;
-        }
+    if (type === 'checkbox') {
+      if (checkboxColumn) {
+        warnLog('vxe.error.colRepet', ['type', type]);
+      }
+      if (!checkboxColumn) {
+        checkboxColumn = column;
+      }
+    } else if (type === 'radio') {
+      if (radioColumn) {
+        warnLog('vxe.error.colRepet', ['type', type]);
+      }
+      if (!radioColumn) {
+        radioColumn = column;
       }
     }
     if (isAllOverflow && column.showOverflow === false) {
@@ -8259,6 +8253,7 @@ const Methods = {
       lastScrollTop
     } = internalData;
     const treeOpts = $xeTable.computeTreeOpts;
+    const expandOpts = $xeTable.computeExpandOpts;
     const {
       transform
     } = treeOpts;
@@ -8346,6 +8341,9 @@ const Methods = {
         scrollYStore.endIndex = scrollYStore.visibleSize;
       }
       if (sYLoad) {
+        if (reactData.expandColumn && expandOpts.mode !== 'fixed') {
+          errLog('vxe.error.notConflictProp', ['column.type="expand', 'expand-config.mode="fixed"']);
+        }
         // if (showOverflow) {
         //   if (!rowOpts.height) {
         //     const errColumn = internalData.tableFullColumn.find((column: any) => column.showOverflow === false)
@@ -9384,10 +9382,14 @@ const Methods = {
   getCheckboxRecords(isFull) {
     const $xeTable = this;
     const props = $xeTable;
+    const reactData = $xeTable;
     const internalData = $xeTable;
     const {
       treeConfig
     } = props;
+    const {
+      updateCheckboxFlag
+    } = reactData;
     const {
       tableFullData,
       afterFullData,
@@ -9408,28 +9410,30 @@ const Methods = {
     } = checkboxOpts;
     const childrenField = treeOpts.children || treeOpts.childrenField;
     let rowList = [];
-    if (checkField) {
-      if (treeConfig) {
-        const currTableData = isFull ? transform ? tableFullTreeData : tableFullData : transform ? afterTreeFullData : afterFullData;
-        rowList = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().filterTree(currTableData, row => external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, checkField), {
-          children: transform ? mapChildrenField : childrenField
-        });
-      } else {
-        const currTableData = isFull ? tableFullData : afterFullData;
-        rowList = currTableData.filter(row => external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, checkField));
-      }
-    } else {
-      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(selectCheckboxMaps, (row, rowid) => {
-        if (isFull) {
-          if (fullDataRowIdData[rowid]) {
-            rowList.push(fullDataRowIdData[rowid].row);
-          }
+    if (updateCheckboxFlag) {
+      if (checkField) {
+        if (treeConfig) {
+          const currTableData = isFull ? transform ? tableFullTreeData : tableFullData : transform ? afterTreeFullData : afterFullData;
+          rowList = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().filterTree(currTableData, row => external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, checkField), {
+            children: transform ? mapChildrenField : childrenField
+          });
         } else {
-          if (afterFullRowMaps[rowid]) {
-            rowList.push(afterFullRowMaps[rowid]);
-          }
+          const currTableData = isFull ? tableFullData : afterFullData;
+          rowList = currTableData.filter(row => external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, checkField));
         }
-      });
+      } else {
+        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(selectCheckboxMaps, (row, rowid) => {
+          if (isFull) {
+            if (fullDataRowIdData[rowid]) {
+              rowList.push(fullDataRowIdData[rowid].row);
+            }
+          } else {
+            if (afterFullRowMaps[rowid]) {
+              rowList.push(afterFullRowMaps[rowid]);
+            }
+          }
+        });
+      }
     }
     return rowList;
   },
@@ -20078,42 +20082,40 @@ const {
             }
           }), h('vxe-checkbox', {
             props: {
-              value: defaultOptions.isFooter,
-              disabled: !storeData.hasFooter,
-              title: export_panel_getI18n('vxe.export.expFooterTitle'),
-              content: export_panel_getI18n('vxe.export.expOptFooter')
+              value: isHeader ? defaultOptions.isTitle : false,
+              disabled: !isHeader,
+              title: export_panel_getI18n('vxe.export.expTitleTitle'),
+              content: export_panel_getI18n('vxe.export.expOptTitle')
             },
             on: {
               input(value) {
-                defaultOptions.isFooter = value;
+                defaultOptions.isTitle = value;
               }
             }
           }), h('vxe-checkbox', {
             props: {
-              value: hasEmptyData ? false : defaultOptions.original,
-              disabled: hasEmptyData,
-              title: export_panel_getI18n('vxe.export.expOriginalTitle'),
-              content: export_panel_getI18n('vxe.export.expOptOriginal')
+              value: isHeader && hasColgroup && supportMerge ? defaultOptions.isColgroup : false,
+              disabled: !isHeader || !hasColgroup || !supportMerge,
+              title: export_panel_getI18n('vxe.export.expColgroupTitle'),
+              content: export_panel_getI18n('vxe.export.expOptColgroup')
             },
             on: {
               input(value) {
-                defaultOptions.original = value;
+                defaultOptions.isColgroup = value;
               }
             }
           })]), h('div', {
             class: 'vxe-table-export--panel-option-row'
           }, [h('vxe-checkbox', {
             props: {
-              // value: supportGroup || (isHeader && hasColgroup && supportMerge) ? defaultOptions.isColgroup : false,
-              // disabled: !supportGroup && (!isHeader || !hasColgroup || !supportMerge),
-              value: isHeader && hasColgroup && supportMerge ? defaultOptions.isColgroup : false,
-              disabled: !isHeader || !hasColgroup || !supportMerge,
-              title: export_panel_getI18n('vxe.export.expColgroupTitle'),
-              content: export_panel_getI18n('vxe.export.expOptColgroup')
+              value: hasEmptyData ? false : defaultOptions.original,
+              disabled: hasEmptyData,
+              title: export_panel_getI18n('vxe.export.expOriginalTitle'),
+              content: export_panel_getI18n('vxe.export.expOptOriginal')
             },
             on: {
               input(value) {
-                defaultOptions.isColgroup = value;
+                defaultOptions.original = value;
               }
             }
           }), h('vxe-checkbox', {
@@ -20152,6 +20154,20 @@ const {
                 defaultOptions.isAllExpand = value;
               }
             }
+          })]), h('div', {
+            class: 'vxe-table-export--panel-option-row'
+          }, [h('vxe-checkbox', {
+            props: {
+              value: defaultOptions.isFooter,
+              disabled: !storeData.hasFooter,
+              title: export_panel_getI18n('vxe.export.expFooterTitle'),
+              content: export_panel_getI18n('vxe.export.expOptFooter')
+            },
+            on: {
+              input(value) {
+                defaultOptions.isFooter = value;
+              }
+            }
           })])])])]])])]), bottomSlot ? h('div', {
             class: 'vxe-table-export--panel-bottom'
           }, $xeTable.callSlot(bottomSlot, params, h)) : export_panel_renderEmptyElement(this)]);
@@ -22670,7 +22686,7 @@ function getHeaderTitle($xeTable, opts, column) {
     column,
     options: opts,
     $table: $xeTable
-  }) : (opts.original ? column.field : column.getTitle()) || '';
+  }) : (opts.isTitle ? column.getTitle() : column.field) || '';
 }
 function getFooterCellValue($xeTable, opts, row, column) {
   const columnOpts = $xeTable.computeColumnOpts;
@@ -23636,6 +23652,7 @@ function handleExportAndPrint($xeTable, options, isPrint) {
   const defOpts = Object.assign({
     message: true,
     isHeader: showHeader,
+    isTitle: showHeader,
     isFooter: showFooter,
     isColgroup: isGroup,
     isMerge: hasMerge,
@@ -23828,6 +23845,7 @@ const convertToRows = originColumns => {
       const opts = Object.assign({
         message: true,
         isHeader: showHeader,
+        isTitle: showHeader,
         isFooter: showFooter,
         isColgroup: isGroup,
         isMerge: hasMerge,
@@ -26457,6 +26475,7 @@ function renderBody(h, $xeTable) {
         original: false,
         message: true,
         isHeader: false,
+        isTitle: false,
         isFooter: false
       },
       rowExpandedFlag: 1,
@@ -27287,6 +27306,7 @@ function renderBody(h, $xeTable) {
     const currentColumnOpts = $xeTable.computeCurrentColumnOpts;
     const virtualXOpts = $xeTable.computeVirtualXOpts;
     const virtualYOpts = $xeTable.computeVirtualYOpts;
+    const keyboardOpts = $xeTable.computeKeyboardOpts;
     if (props.rowId) {
       warnLog('vxe.error.delProp', ['row-id', 'row-config.keyField']);
     }
@@ -27329,6 +27349,12 @@ function renderBody(h, $xeTable) {
     if (this.highlightHoverColumn) {
       warnLog('vxe.error.delProp', ['highlight-hover-column', 'column-config.isHover']);
     }
+    // if (props.scrollY) {
+    //   warnLog('vxe.error.delProp', ['scroll-y', 'virtual-y-config'])
+    // }
+    // if (props.scrollX) {
+    //   warnLog('vxe.error.delProp', ['scroll-x', 'virtual-x-config'])
+    // }
     // 检查导入导出类型，如果自定义导入导出方法，则不校验类型
     if (importConfig && importOpts.types && !importOpts.importMethod && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().includeArrays(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().keys(importOpts._typeMaps), importOpts.types)) {
       warnLog('vxe.error.errProp', [`export-config.types=${importOpts.types.join(',')}`, importOpts.types.filter(type => external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().includes(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().keys(importOpts._typeMaps), type)).join(',') || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().keys(importOpts._typeMaps).join(',')]);
@@ -27420,10 +27446,10 @@ function renderBody(h, $xeTable) {
     if (props.emptyRender && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isObject(props.emptyRender)) {
       warnLog('vxe.error.errProp', [`table.empty-render=${props.emptyRender}`, 'table.empty-render={}']);
     }
-    if ((rowOpts.isCurrent || highlightCurrentRow) && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(currentRowOpts.isFollowSelected)) {
+    if ((rowOpts.isCurrent || highlightCurrentRow) && props.keyboardConfig && keyboardOpts.isArrow && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(currentRowOpts.isFollowSelected)) {
       warnLog('vxe.error.notConflictProp', ['row-config.isCurrent', 'current-row-config.isFollowSelected']);
     }
-    if ((columnOpts.isCurrent || highlightCurrentColumn) && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(currentColumnOpts.isFollowSelected)) {
+    if ((columnOpts.isCurrent || highlightCurrentColumn) && props.keyboardConfig && keyboardOpts.isArrow && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(currentColumnOpts.isFollowSelected)) {
       warnLog('vxe.error.notConflictProp', ['column-config.isCurrent', 'current-column-config.isFollowSelected']);
     }
     // 如果不支持虚拟滚动
@@ -31746,10 +31772,12 @@ const Toolbar = VxeToolbar;
       expOptFooter: '表尾',
       expFooterTitle: '是否需要表尾',
       expOptColgroup: '分组表头',
+      expOptTitle: '列标题',
+      expTitleTitle: '是否为列标题，否则显示为列的字段名',
       expColgroupTitle: '如果存在，则支持带有分组结构的表头',
       expOptMerge: '合并',
       expMergeTitle: '如果存在，则支持带有合并结构的单元格',
-      expOptAllExpand: '展开层级',
+      expOptAllExpand: '展开树',
       expAllExpandTitle: '如果存在，则支持将带有层级结构的数据全部展开',
       expOptUseStyle: '样式',
       expUseStyleTitle: '如果存在，则支持带样式的单元格',