vxe-table 3.14.4 → 3.15.0-beta.0

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.15.0-beta.0";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2412,7 +2412,7 @@ core_.VxeUI.setConfig({
     },
     virtualXConfig: {
       enabled: true,
-      gt: 60,
+      gt: 28,
       preSize: 0,
       oSize: 1
     },
@@ -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.15.0-beta.0"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -3424,30 +3424,6 @@ function calcTreeLine(params, prevRow) {
   }
   return cellHeight * expandSize - (prevRow ? 1 : 12 - getOffsetSize($table));
 }
-function mergeBodyMethod(mergeList, _rowIndex, _columnIndex) {
-  for (let mIndex = 0; mIndex < mergeList.length; mIndex++) {
-    const {
-      row: mergeRowIndex,
-      col: mergeColIndex,
-      rowspan: mergeRowspan,
-      colspan: mergeColspan
-    } = mergeList[mIndex];
-    if (mergeColIndex > -1 && mergeRowIndex > -1 && mergeRowspan && mergeColspan) {
-      if (mergeRowIndex === _rowIndex && mergeColIndex === _columnIndex) {
-        return {
-          rowspan: mergeRowspan,
-          colspan: mergeColspan
-        };
-      }
-      if (_rowIndex >= mergeRowIndex && _rowIndex < mergeRowIndex + mergeRowspan && _columnIndex >= mergeColIndex && _columnIndex < mergeColIndex + mergeColspan) {
-        return {
-          rowspan: 0,
-          colspan: 0
-        };
-      }
-    }
-  }
-}
 function getCellValue(row, column) {
   return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, column.field);
 }
@@ -5451,39 +5427,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) {
@@ -6678,20 +6648,48 @@ function calculateMergerOffsetIndex(list, offsetItem, type) {
     }
   }
 }
-function setMerges($xeTable, merges, mList, rowList) {
-  // const props = $xeTable
+function buildMergeData(mergeConfigs) {
+  const mergeMaps = {};
+  if (mergeConfigs && mergeConfigs.length) {
+    for (let mIndex = 0; mIndex < mergeConfigs.length; mIndex++) {
+      const {
+        row: _rowIndex,
+        col: _columnIndex,
+        rowspan: mergeRowspan,
+        colspan: mergeColspan
+      } = mergeConfigs[mIndex];
+      for (let i = 0; i < mergeRowspan; i++) {
+        for (let j = 0; j < mergeColspan; j++) {
+          mergeMaps[`${_rowIndex + i}:${_columnIndex + j}`] = !i && !j ? {
+            rowspan: mergeRowspan,
+            colspan: mergeColspan
+          } : {
+            rowspan: 0,
+            colspan: 0
+          };
+        }
+      }
+    }
+  }
+  return mergeMaps;
+}
+const handleBodyMerge = ($xeTable, merges) => {
   const internalData = $xeTable;
+  const {
+    fullAllDataRowIdData,
+    fullColumnIdData,
+    visibleColumn,
+    afterFullData,
+    mergeBodyList,
+    mergeBodyMaps
+  } = internalData;
   if (merges) {
-    // const { treeConfig } = props
     const {
-      visibleColumn
-    } = internalData;
+      handleGetRowId
+    } = createHandleGetRowId($xeTable);
     if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(merges)) {
       merges = [merges];
     }
-    // if (treeConfig && merges.length) {
-    //   errLog('vxe.error.noTree', ['merge-cells | merge-footer-items'])
-    // }
     merges.forEach(item => {
       let {
         row,
@@ -6699,42 +6697,117 @@ function setMerges($xeTable, merges, mList, rowList) {
         rowspan,
         colspan
       } = item;
-      if (rowList && external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(row)) {
-        row = rowList[row];
+      let mergeRowIndex = -1;
+      let mergeColumnIndex = -1;
+      if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(row)) {
+        mergeRowIndex = row;
+      } else {
+        const rowid = row ? handleGetRowId(row) : null;
+        const rowRest = rowid ? fullAllDataRowIdData[rowid] : null;
+        if (rowRest) {
+          mergeRowIndex = rowRest._index;
+        }
       }
       if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(col)) {
-        col = visibleColumn[col];
+        mergeColumnIndex = col;
+      } else {
+        const colid = col ? col.id : null;
+        const colRest = colid ? fullColumnIdData[colid] : null;
+        if (colRest) {
+          mergeColumnIndex = colRest._index;
+        }
       }
-      if ((rowList ? row : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(row)) && col && (rowspan || colspan)) {
+      if (mergeRowIndex > -1 && mergeColumnIndex > -1 && (rowspan || colspan)) {
         rowspan = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(rowspan) || 1;
         colspan = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(colspan) || 1;
         if (rowspan > 1 || colspan > 1) {
-          const mcIndex = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findIndexOf(mList, item => item._row === row && item._col === col);
-          const mergeItem = mList[mcIndex];
+          const row = afterFullData[mergeRowIndex];
+          const column = visibleColumn[mergeColumnIndex];
+          let mergeItem = mergeBodyMaps[`${mergeRowIndex}:${mergeColumnIndex}`];
           if (mergeItem) {
             mergeItem.rowspan = rowspan;
             mergeItem.colspan = colspan;
             mergeItem._rowspan = rowspan;
             mergeItem._colspan = colspan;
           } else {
-            const mergeRowIndex = rowList ? rowList.indexOf(row) : row;
-            const mergeColIndex = visibleColumn.indexOf(col);
-            mList.push({
+            mergeItem = {
               row: mergeRowIndex,
-              col: mergeColIndex,
+              col: mergeColumnIndex,
               rowspan,
               colspan,
               _row: row,
-              _col: col,
+              _col: column,
               _rowspan: rowspan,
               _colspan: colspan
-            });
+            };
+            mergeBodyMaps[`${mergeRowIndex}:${mergeColumnIndex}`] = mergeItem;
+            mergeBodyList.push(mergeItem);
           }
         }
       }
     });
   }
-}
+};
+const handleFooterMerge = ($xeTable, merges) => {
+  const reactData = $xeTable;
+  const internalData = $xeTable;
+  const {
+    footerTableData
+  } = reactData;
+  const {
+    mergeFooterList,
+    mergeFooterMaps
+  } = internalData;
+  if (merges) {
+    const {
+      visibleColumn
+    } = internalData;
+    if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(merges)) {
+      merges = [merges];
+    }
+    merges.forEach(item => {
+      let {
+        row: margeRow,
+        col: margeCol,
+        rowspan,
+        colspan
+      } = item;
+      const mergeRowIndex = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(margeRow) ? margeRow : -1;
+      let mergeColumnIndex = -1;
+      if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(margeCol)) {
+        mergeColumnIndex = margeCol;
+      }
+      if (mergeRowIndex > -1 && mergeColumnIndex > -1 && (rowspan || colspan)) {
+        rowspan = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(rowspan) || 1;
+        colspan = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(colspan) || 1;
+        if (rowspan > 1 || colspan > 1) {
+          const row = footerTableData[mergeRowIndex];
+          const column = visibleColumn[mergeColumnIndex];
+          let mergeItem = mergeFooterMaps[`${mergeRowIndex}:${mergeColumnIndex}`];
+          if (mergeItem) {
+            mergeItem.rowspan = rowspan;
+            mergeItem.colspan = colspan;
+            mergeItem._rowspan = rowspan;
+            mergeItem._colspan = colspan;
+          } else {
+            mergeItem = {
+              row: mergeRowIndex,
+              col: mergeColumnIndex,
+              rowspan,
+              colspan,
+              _row: row,
+              _col: column,
+              _rowspan: rowspan,
+              _colspan: colspan
+            };
+            mergeFooterMaps[`${mergeRowIndex}:${mergeColumnIndex}`] = mergeItem;
+            mergeFooterList.push(mergeItem);
+          }
+        }
+      }
+    });
+  }
+};
 function removeMerges($xeTable, merges, mList, rowList) {
   // const props = $xeTable
   const internalData = $xeTable;
@@ -7469,11 +7542,11 @@ function loadScrollXData($xeTable) {
   const reactData = $xeTable;
   const internalData = $xeTable;
   const {
-    mergeList,
-    mergeFooterList,
     isScrollXBig
   } = reactData;
   const {
+    mergeBodyList,
+    mergeFooterList,
     scrollXStore
   } = internalData;
   const {
@@ -7492,7 +7565,7 @@ function loadScrollXData($xeTable) {
   };
   scrollXStore.visibleStartIndex = toVisibleIndex - 1;
   scrollXStore.visibleEndIndex = toVisibleIndex + visibleSize + 1;
-  calculateMergerOffsetIndex(mergeList.concat(mergeFooterList), offsetItem, 'col');
+  calculateMergerOffsetIndex(mergeBodyList.concat(mergeFooterList), offsetItem, 'col');
   const {
     startIndex: offsetStartIndex,
     endIndex: offsetEndIndex
@@ -7717,11 +7790,11 @@ function loadScrollYData($xeTable) {
   const reactData = $xeTable;
   const internalData = $xeTable;
   const {
-    mergeList,
     isAllOverflow,
     isScrollYBig
   } = reactData;
   const {
+    mergeBodyList,
     scrollYStore
   } = internalData;
   const {
@@ -7741,7 +7814,7 @@ function loadScrollYData($xeTable) {
   };
   scrollYStore.visibleStartIndex = toVisibleIndex - 1;
   scrollYStore.visibleEndIndex = toVisibleIndex + visibleSize + 1;
-  calculateMergerOffsetIndex(mergeList, offsetItem, 'row');
+  calculateMergerOffsetIndex(mergeBodyList, offsetItem, 'row');
   const {
     startIndex: offsetStartIndex,
     endIndex: offsetEndIndex
@@ -8175,7 +8248,7 @@ const Methods = {
    * 对于某些特殊的场景，比如深层树节点元素发生变动时可能会用到
    */
   syncData() {
-    warnLog('vxe.error.delFunc', ['syncData', 'getData']);
+    errLog('vxe.error.delFunc', ['syncData', 'getData']);
     return this.$nextTick().then(() => {
       this.tableData = [];
       return this.$nextTick().then(() => this.loadTableData(this.tableFullData, true));
@@ -8186,38 +8259,43 @@ const Methods = {
    * 对于手动更改了排序、筛选...等条件后需要重新处理数据时可能会用到
    */
   updateData() {
+    const $xeTable = this;
+    const reactData = $xeTable;
     const {
       scrollXLoad,
       scrollYLoad
-    } = this;
-    return this.handleTableData(true).then(() => {
-      this.updateFooter();
+    } = reactData;
+    return $xeTable.handleTableData(true).then(() => {
+      $xeTable.updateFooter();
       if (scrollXLoad || scrollYLoad) {
         if (scrollXLoad) {
-          this.updateScrollXSpace();
+          $xeTable.updateScrollXSpace();
         }
         if (scrollYLoad) {
-          this.updateScrollYSpace();
+          $xeTable.updateScrollYSpace();
         }
-        return this.refreshScroll();
+        return $xeTable.refreshScroll();
       }
     }).then(() => {
-      this.updateCellAreas();
-      return this.recalculate(true);
+      $xeTable.updateCellAreas();
+      return $xeTable.recalculate(true);
     }).then(() => {
       // 存在滚动行为未结束情况
-      setTimeout(() => this.recalculate(), 50);
+      setTimeout(() => $xeTable.recalculate(), 50);
     });
   },
   handleTableData(force) {
     const $xeTable = this;
+    const reactData = $xeTable;
+    const internalData = $xeTable;
+    const {
+      scrollYLoad
+    } = reactData;
     const {
-      scrollYLoad,
       scrollYStore,
-      fullDataRowIdData,
-      afterFullData
-    } = this;
-    let fullList = afterFullData;
+      fullDataRowIdData
+    } = internalData;
+    let fullList = internalData.afterFullData;
     // 是否进行数据处理
     if (force) {
       // 更新数据，处理筛选和排序
@@ -8226,14 +8304,17 @@ const Methods = {
       fullList = handleVirtualTreeToList($xeTable);
     }
     const tableData = scrollYLoad ? fullList.slice(scrollYStore.startIndex, scrollYStore.endIndex) : fullList.slice(0);
+    const visibleDataRowIdMaps = {};
     tableData.forEach((row, $index) => {
       const rowid = getRowid(this, row);
       const rest = fullDataRowIdData[rowid];
       if (rest) {
         rest.$index = $index;
       }
+      visibleDataRowIdMaps[rowid] = row;
     });
     this.tableData = tableData;
+    internalData.visibleDataRowIdData = visibleDataRowIdMaps;
     return this.$nextTick();
   },
   /**
@@ -8259,6 +8340,7 @@ const Methods = {
       lastScrollTop
     } = internalData;
     const treeOpts = $xeTable.computeTreeOpts;
+    const expandOpts = $xeTable.computeExpandOpts;
     const {
       transform
     } = treeOpts;
@@ -8317,7 +8399,7 @@ const Methods = {
     internalData.tableFullData = fullData;
     internalData.tableFullTreeData = treeData;
     // 缓存数据
-    $xeTable.cacheRowMap(true);
+    $xeTable.cacheRowMap(isReset);
     // 原始数据
     internalData.tableSynchData = datas;
     if (isReset) {
@@ -8335,6 +8417,7 @@ const Methods = {
     $xeTable.clearMergeFooterItems();
     $xeTable.handleTableData(true);
     $xeTable.updateFooter();
+    $xeTable.handleUpdateBodyMerge();
     return $xeTable.$nextTick().then(() => {
       updateHeight($xeTable);
       updateStyle($xeTable);
@@ -8346,6 +8429,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)
@@ -8508,7 +8594,7 @@ const Methods = {
   /**
    * 更新数据行的 Map
    */
-  cacheRowMap() {
+  cacheRowMap(isReset) {
     const $xeTable = this;
     const props = $xeTable;
     const reactData = $xeTable;
@@ -8528,7 +8614,7 @@ const Methods = {
     const {
       lazy
     } = treeOpts;
-    const fullAllDataRowIdMaps = {
+    const fullAllDataRowIdMaps = isReset ? {} : {
       ...fullAllDataRowIdData
     }; // 存在已删除数据
     const fullDataRowIdMaps = {};
@@ -9384,10 +9470,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 +9498,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;
   },
@@ -11538,6 +11630,29 @@ const Methods = {
     this.updateCellAreas();
     this.recalculate(true);
   },
+  /**
+   * 处理合并
+   */
+  handleUpdateBodyMerge() {
+    const $xeTable = this;
+    const reactData = $xeTable;
+    const internalData = $xeTable;
+    const {
+      mergeBodyList
+    } = internalData;
+    internalData.mergeBodyCellMaps = buildMergeData(mergeBodyList);
+    reactData.mergeBodyFlag++;
+  },
+  handleUpdateFooterMerge() {
+    const $xeTable = this;
+    const reactData = $xeTable;
+    const internalData = $xeTable;
+    const {
+      mergeFooterList
+    } = internalData;
+    internalData.mergeFooterCellMaps = buildMergeData(mergeFooterList);
+    reactData.mergeFootFlag++;
+  },
   handleTargetLeaveEvent() {
     const $xeTable = this;
     const internalData = $xeTable;
@@ -15727,26 +15842,33 @@ const Methods = {
    */
   updateFooter() {
     const $xeTable = this;
+    const props = $xeTable;
+    const reactData = $xeTable;
+    const internalData = $xeTable;
     const $xeGrid = $xeTable.$xeGrid;
     const {
       showFooter,
-      visibleColumn,
       footerData,
       footerMethod
-    } = this;
+    } = props;
+    const {
+      visibleColumn,
+      afterFullData
+    } = internalData;
     let footData = [];
     if (showFooter && footerData && footerData.length) {
       footData = footerData.slice(0);
     } else if (showFooter && footerMethod) {
       footData = visibleColumn.length ? footerMethod({
         columns: visibleColumn,
-        data: this.afterFullData,
+        data: afterFullData,
         $table: $xeTable,
         $grid: $xeGrid
       }) : [];
     }
-    this.footerTableData = footData;
-    return this.$nextTick();
+    reactData.footerTableData = footData;
+    $xeTable.handleUpdateFooterMerge();
+    return $xeTable.$nextTick();
   },
   /**
    * 更新列状态 updateStatus({ row, column }, cellValue)
@@ -15771,12 +15893,14 @@ const Methods = {
    */
   setMergeCells(merges) {
     const $xeTable = this;
-    if (this.spanMethod) {
+    const props = $xeTable;
+    if (props.spanMethod) {
       errLog('vxe.error.errConflicts', ['merge-cells', 'span-method']);
     }
-    setMerges(this, merges, this.mergeList, this.afterFullData);
-    return this.$nextTick().then(() => {
-      this.updateCellAreas();
+    handleBodyMerge($xeTable, merges);
+    $xeTable.handleUpdateBodyMerge();
+    return $xeTable.$nextTick().then(() => {
+      $xeTable.updateCellAreas();
       return updateStyle($xeTable);
     });
   },
@@ -15786,12 +15910,14 @@ const Methods = {
    */
   removeMergeCells(merges) {
     const $xeTable = this;
-    if (this.spanMethod) {
+    const props = $xeTable;
+    const internalData = $xeTable;
+    if (props.spanMethod) {
       errLog('vxe.error.errConflicts', ['merge-cells', 'span-method']);
     }
-    const rest = removeMerges(this, merges, this.mergeList, this.afterFullData);
-    return this.$nextTick().then(() => {
-      this.updateCellAreas();
+    const rest = removeMerges($xeTable, merges, internalData.mergeBodyList, internalData.afterFullData);
+    return $xeTable.$nextTick().then(() => {
+      $xeTable.updateCellAreas();
       updateStyle($xeTable);
       return rest;
     });
@@ -15800,37 +15926,46 @@ const Methods = {
    * 获取所有被合并的单元格
    */
   getMergeCells() {
-    return this.mergeList.slice(0);
+    const $xeTable = this;
+    const internalData = $xeTable;
+    return internalData.mergeBodyList.slice(0);
   },
   /**
    * 清除所有单元格合并
    */
   clearMergeCells() {
     const $xeTable = this;
-    this.mergeList = [];
-    return this.$nextTick().then(() => {
+    const internalData = $xeTable;
+    internalData.mergeBodyList = [];
+    internalData.mergeBodyMaps = {};
+    internalData.mergeBodyCellMaps = {};
+    return $xeTable.$nextTick().then(() => {
       return updateStyle($xeTable);
     });
   },
   setMergeFooterItems(merges) {
     const $xeTable = this;
-    if (this.footerSpanMethod) {
+    const props = $xeTable;
+    if (props.footerSpanMethod) {
       errLog('vxe.error.errConflicts', ['merge-footer-items', 'footer-span-method']);
     }
-    setMerges(this, merges, this.mergeFooterList);
-    return this.$nextTick().then(() => {
-      this.updateCellAreas();
+    handleFooterMerge($xeTable, merges);
+    $xeTable.handleUpdateFooterMerge();
+    return $xeTable.$nextTick().then(() => {
+      $xeTable.updateCellAreas();
       return updateStyle($xeTable);
     });
   },
   removeMergeFooterItems(merges) {
     const $xeTable = this;
-    if (this.footerSpanMethod) {
+    const props = $xeTable;
+    const internalData = $xeTable;
+    if (props.footerSpanMethod) {
       errLog('vxe.error.errConflicts', ['merge-footer-items', 'footer-span-method']);
     }
-    const rest = removeMerges(this, merges, this.mergeFooterList, null);
-    return this.$nextTick().then(() => {
-      this.updateCellAreas();
+    const rest = removeMerges($xeTable, merges, internalData.mergeFooterList);
+    return $xeTable.$nextTick().then(() => {
+      $xeTable.updateCellAreas();
       updateStyle($xeTable);
       return rest;
     });
@@ -15839,15 +15974,20 @@ const Methods = {
    * 获取所有被合并的表尾
    */
   getMergeFooterItems() {
-    return this.mergeFooterList.slice(0);
+    const $xeTable = this;
+    const internalData = $xeTable;
+    return internalData.mergeFooterList.slice(0);
   },
   /**
    * 清除所有表尾合并
    */
   clearMergeFooterItems() {
     const $xeTable = this;
-    this.mergeFooterList = [];
-    return this.$nextTick().then(() => {
+    const internalData = $xeTable;
+    internalData.mergeFooterList = [];
+    internalData.mergeFooterMaps = {};
+    internalData.mergeFooterCellMaps = {};
+    return $xeTable.$nextTick().then(() => {
       return updateStyle($xeTable);
     });
   },
@@ -16011,14 +16151,13 @@ function renderLine(h, _vm, rowid, params, cellHeight) {
   if (slots && slots.line) {
     return $xeTable.callSlot(slots.line, params, h);
   }
-  const rest = fullAllDataRowIdData[rowid];
+  const rowRest = fullAllDataRowIdData[rowid];
   let rLevel = 0;
   let prevRow = null;
-  if (rest) {
-    rLevel = rest.level;
-    prevRow = rest.items[rest.treeIndex - 1];
+  if (rowRest) {
+    rLevel = rowRest.level;
+    prevRow = rowRest.items[rowRest.treeIndex - 1];
   }
-  const isFirstRow = $xeTable.eqRow(afterFullData[0], row);
   if (treeConfig && treeNode && (treeOpts.showLine || treeOpts.line)) {
     return [h('div', {
       key: 'tl',
@@ -16026,7 +16165,7 @@ function renderLine(h, _vm, rowid, params, cellHeight) {
     }, [h('div', {
       class: 'vxe-tree--line',
       style: {
-        height: `${isFirstRow ? 1 : calcTreeLine(params, prevRow)}px`,
+        height: `${$xeTable.eqRow(afterFullData[0], row) ? 1 : calcTreeLine(params, prevRow)}px`,
         bottom: `-${Math.floor(cellHeight / 2)}px`,
         left: `${rLevel * treeOpts.indent + (rLevel ? 2 - getOffsetSize($xeTable) : 0) + 16}px`
       }
@@ -16043,11 +16182,6 @@ function renderTdColumn(h, _vm, seq, rowid, fixedType, isOptimizeMode, rowLevel,
   const tableReactData = $xeTable;
   const tableInternalData = $xeTable;
   const $xeGrid = $xeTable.$xeGrid;
-  const {
-    fullAllDataRowIdData,
-    fullColumnIdData,
-    visibleColumn
-  } = tableInternalData;
   const {
     columnKey,
     resizable: allResizable,
@@ -16071,16 +16205,21 @@ function renderTdColumn(h, _vm, seq, rowid, fixedType, isOptimizeMode, rowLevel,
     currentColumn,
     scrollXLoad,
     scrollYLoad,
+    mergeBodyFlag,
     calcCellHeightFlag,
     resizeHeightFlag,
     resizeWidthFlag,
-    mergeList,
     editStore,
     isAllOverflow,
     validErrorMaps
   } = tableReactData;
   const {
+    fullAllDataRowIdData,
+    fullColumnIdData,
+    mergeBodyCellMaps,
+    visibleColumn,
     afterFullData,
+    mergeBodyList,
     scrollXStore,
     scrollYStore
   } = tableInternalData;
@@ -16240,8 +16379,8 @@ function renderTdColumn(h, _vm, seq, rowid, fixedType, isOptimizeMode, rowLevel,
   };
   let isMergeCell = false;
   // 合并行或列
-  if (mergeList.length) {
-    const spanRest = mergeBodyMethod(mergeList, _rowIndex, _columnIndex);
+  if (mergeBodyFlag && mergeBodyList.length) {
+    const spanRest = mergeBodyCellMaps[`${_rowIndex}:${_columnIndex}`];
     if (spanRest) {
       const {
         rowspan,
@@ -16276,7 +16415,7 @@ function renderTdColumn(h, _vm, seq, rowid, fixedType, isOptimizeMode, rowLevel,
     }
   }
   // 如果被合并不可隐藏
-  if (fixedHiddenColumn && mergeList) {
+  if (fixedHiddenColumn && isMergeCell) {
     if (tdAttrs.colspan > 1 || tdAttrs.rowspan > 1) {
       fixedHiddenColumn = false;
     }
@@ -17400,30 +17539,6 @@ const {
   renderer: footer_renderer,
   renderEmptyElement: footer_renderEmptyElement
 } = core_.VxeUI;
-function mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex) {
-  for (let mIndex = 0; mIndex < mergeFooterList.length; mIndex++) {
-    const {
-      row: mergeRowIndex,
-      col: mergeColIndex,
-      rowspan: mergeRowspan,
-      colspan: mergeColspan
-    } = mergeFooterList[mIndex];
-    if (mergeColIndex > -1 && mergeRowIndex > -1 && mergeRowspan && mergeColspan) {
-      if (mergeRowIndex === _rowIndex && mergeColIndex === _columnIndex) {
-        return {
-          rowspan: mergeRowspan,
-          colspan: mergeColspan
-        };
-      }
-      if (_rowIndex >= mergeRowIndex && _rowIndex < mergeRowIndex + mergeRowspan && _columnIndex >= mergeColIndex && _columnIndex < mergeColIndex + mergeColspan) {
-        return {
-          rowspan: 0,
-          colspan: 0
-        };
-      }
-    }
-  }
-}
 function footer_renderRows(h, _vm, tableColumn, footerTableData, row, $rowIndex, _rowIndex) {
   const props = _vm;
   const $xeTable = _vm.$parent;
@@ -17449,11 +17564,12 @@ function footer_renderRows(h, _vm, tableColumn, footerTableData, row, $rowIndex,
     scrollXLoad,
     scrollYLoad,
     overflowX,
-    currentColumn,
-    mergeFooterList
+    currentColumn
   } = tableReactData;
   const {
     fullColumnIdData,
+    mergeFooterList,
+    mergeFooterCellMaps,
     scrollXStore
   } = tableInternalData;
   const tooltipOpts = $xeTable.computeTooltipOpts;
@@ -17547,7 +17663,7 @@ function footer_renderRows(h, _vm, tableColumn, footerTableData, row, $rowIndex,
     let isMergeCell = false;
     // 合并行或列
     if (mergeFooterList.length) {
-      const spanRest = mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex);
+      const spanRest = mergeFooterCellMaps[`${_rowIndex}:${_columnIndex}`];
       if (spanRest) {
         const {
           rowspan,
@@ -20078,42 +20194,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 +20266,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)]);
@@ -21304,12 +21432,10 @@ function handleInsertRowAt($xeTable, records, targetRow, isInsertNextRow) {
   const {
     treeConfig
   } = props;
-  const {
-    mergeList
-  } = reactData;
   const {
     tableFullTreeData,
     afterFullData,
+    mergeBodyList,
     tableFullData,
     fullDataRowIdData,
     fullAllDataRowIdData,
@@ -21358,7 +21484,7 @@ function handleInsertRowAt($xeTable, records, targetRow, isInsertNextRow) {
         tableFullData.unshift(item);
       });
       // 刷新单元格合并
-      mergeList.forEach(mergeItem => {
+      mergeBodyList.forEach(mergeItem => {
         const {
           row: mergeRowIndex
         } = mergeItem;
@@ -21397,7 +21523,7 @@ function handleInsertRowAt($xeTable, records, targetRow, isInsertNextRow) {
           tableFullData.push(item);
         });
         // 刷新单元格合并
-        mergeList.forEach(mergeItem => {
+        mergeBodyList.forEach(mergeItem => {
           const {
             row: mergeRowIndex,
             rowspan: mergeRowspan
@@ -21504,7 +21630,7 @@ function handleInsertRowAt($xeTable, records, targetRow, isInsertNextRow) {
           tableFullData.push(...newRecords);
         }
         // 刷新单元格合并
-        mergeList.forEach(mergeItem => {
+        mergeBodyList.forEach(mergeItem => {
           const {
             row: mergeRowIndex,
             rowspan: mergeRowspan
@@ -21530,6 +21656,7 @@ function handleInsertRowAt($xeTable, records, targetRow, isInsertNextRow) {
     $xeTable.updateAfterDataIndex();
   }
   $xeTable.updateFooter();
+  $xeTable.handleUpdateBodyMerge();
   $xeTable.checkSelectionStatus();
   if (reactData.scrollYLoad) {
     $xeTable.updateScrollYSpace();
@@ -21821,13 +21948,13 @@ function handleEditCell($xeTable, row, fieldOrColumn, isPos) {
         treeConfig
       } = props;
       const {
-        mergeList,
         editStore
       } = reactData;
       const {
         tableFullTreeData,
         selectCheckboxMaps,
         afterFullData,
+        mergeBodyList,
         tableFullData,
         pendingRowMaps,
         insertRowMaps,
@@ -21908,7 +22035,7 @@ function handleEditCell($xeTable, row, fieldOrColumn, isPos) {
             const afIndex = this.findRowIndexOf(afterFullData, row);
             if (afIndex > -1) {
               // 刷新单元格合并
-              mergeList.forEach(mergeItem => {
+              mergeBodyList.forEach(mergeItem => {
                 const {
                   row: mergeRowIndex,
                   rowspan: mergeRowspan
@@ -21941,9 +22068,10 @@ function handleEditCell($xeTable, row, fieldOrColumn, isPos) {
       reactData.removeRowFlag++;
       reactData.insertRowFlag++;
       reactData.pendingRowFlag++;
-      $xeTable.updateFooter();
       $xeTable.cacheRowMap(false);
       $xeTable.handleTableData(treeConfig && transform);
+      $xeTable.updateFooter();
+      $xeTable.handleUpdateBodyMerge();
       if (!(treeConfig && transform)) {
         $xeTable.updateAfterDataIndex();
       }
@@ -22670,7 +22798,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;
@@ -22801,6 +22929,7 @@ function hasEllipsis($xeTable, column, property, allColumnOverflow) {
 function toHtml($xeTable, opts, columns, datas) {
   const props = $xeTable;
   const reactData = $xeTable;
+  const internalData = $xeTable;
   const {
     id,
     border,
@@ -22813,9 +22942,11 @@ function toHtml($xeTable, opts, columns, datas) {
   } = props;
   const {
     isAllSelected,
-    isIndeterminate,
-    mergeList
+    isIndeterminate
   } = reactData;
+  const {
+    mergeBodyCellMaps
+  } = internalData;
   const treeOpts = $xeTable.computeTreeOpts;
   const {
     print: isPrint,
@@ -22908,15 +23039,16 @@ function toHtml($xeTable, opts, columns, datas) {
     } else {
       datas.forEach(item => {
         tables.push('<tr>' + columns.map(column => {
+          const colid = column.id;
           const cellAlign = column.align || allAlign;
           const classNames = hasEllipsis($xeTable, column, 'showOverflow', allColumnOverflow) ? ['col--ellipsis'] : [];
-          const cellValue = item[column.id];
+          const cellValue = item[colid];
           let rowSpan = 1;
           let colSpan = 1;
-          if (isMerge && mergeList.length) {
+          if (isMerge) {
             const _rowIndex = $xeTable.getVTRowIndex(item._row);
             const _columnIndex = $xeTable.getVTColumnIndex(column);
-            const spanRest = mergeBodyMethod(mergeList, _rowIndex, _columnIndex);
+            const spanRest = mergeBodyCellMaps[`${_rowIndex}:${_columnIndex}`];
             if (spanRest) {
               const {
                 rowspan,
@@ -23616,15 +23748,15 @@ function handleExportAndPrint($xeTable, options, isPrint) {
   } = props;
   const {
     initStore,
-    mergeList,
-    mergeFooterList,
     isGroup,
     footerTableData,
     exportStore,
     exportParams
   } = reactData;
   const {
-    collectColumn
+    collectColumn,
+    mergeBodyList,
+    mergeFooterList
   } = internalData;
   const exportOpts = $xeTable.computeExportOpts;
   const hasTree = treeConfig;
@@ -23632,10 +23764,11 @@ function handleExportAndPrint($xeTable, options, isPrint) {
   const selectRecords = $xeTable.getCheckboxRecords();
   const proxyOpts = $xeGrid ? $xeGrid.computeProxyOpts : {};
   const hasFooter = !!footerTableData.length;
-  const hasMerge = !!(mergeList.length || mergeFooterList.length);
+  const hasMerge = !!(mergeBodyList.length || mergeFooterList.length);
   const defOpts = Object.assign({
     message: true,
     isHeader: showHeader,
+    isTitle: showHeader,
     isFooter: showFooter,
     isColgroup: isGroup,
     isMerge: hasMerge,
@@ -23812,22 +23945,23 @@ const convertToRows = originColumns => {
         showFooter
       } = props;
       const {
-        mergeList,
         mergeFooterList,
         isGroup
       } = reactData;
       const {
         tableFullColumn,
         afterFullData,
+        mergeBodyList,
         collectColumn
       } = internalData;
       const exportOpts = $xeTable.computeExportOpts;
       const treeOpts = $xeTable.computeTreeOpts;
       const proxyOpts = $xeGrid ? $xeGrid.computeProxyOpts : {};
-      const hasMerge = !!(mergeList.length || mergeFooterList.length);
+      const hasMerge = !!(mergeBodyList.length || mergeFooterList.length);
       const opts = Object.assign({
         message: true,
         isHeader: showHeader,
+        isTitle: showHeader,
         isFooter: showFooter,
         isColgroup: isGroup,
         isMerge: hasMerge,
@@ -26079,20 +26213,22 @@ function renderRowExpandedVNs(h, $xeTable) {
       } = treeOpts;
       const cellStyle = {};
       const rowid = handleGetRowId(row);
-      const rest = fullAllDataRowIdData[rowid];
+      const rowRest = fullAllDataRowIdData[rowid];
       let rowLevel = 0;
       let seq = -1;
-      let _rowIndex = 0;
-      const rowIndex = $xeTable.getRowIndex(row);
-      const $rowIndex = $xeTable.getVMRowIndex(row);
-      if (rest) {
-        rowLevel = rest.level;
+      let _rowIndex = -1;
+      let rowIndex = -1;
+      let $rowIndex = -1;
+      if (rowRest) {
+        rowLevel = rowRest.level;
         if (treeConfig && transform && seqMode === 'increasing') {
-          seq = rest._index + 1;
+          seq = rowRest._index + 1;
         } else {
-          seq = rest.seq;
+          seq = rowRest.seq;
         }
-        _rowIndex = rest._index;
+        rowIndex = rowRest.index;
+        $rowIndex = rowRest.$index;
+        _rowIndex = rowRest._index;
       }
       if (expandHeight) {
         cellStyle.height = `${expandHeight}px`;
@@ -26311,10 +26447,6 @@ function renderBody(h, $xeTable) {
       hasFixedColumn: false,
       // 树节点列信息
       treeNodeColumn: null,
-      // 合并单元格的对象集
-      mergeList: [],
-      // 合并表尾数据的对象集
-      mergeFooterList: [],
       // 初始化标识
       initStore: {
         filter: false,
@@ -26457,12 +26589,17 @@ function renderBody(h, $xeTable) {
         original: false,
         message: true,
         isHeader: false,
+        isTitle: false,
         isFooter: false
       },
       rowExpandedFlag: 1,
       treeExpandedFlag: 1,
       updateCheckboxFlag: 1,
       pendingRowFlag: 1,
+      insertRowFlag: 1,
+      removeRowFlag: 1,
+      mergeBodyFlag: 1,
+      mergeFootFlag: 1,
       rowHeightStore: {
         default: 48,
         medium: 44,
@@ -26920,27 +27057,31 @@ function renderBody(h, $xeTable) {
     },
     computeTableRowExpandedList() {
       const $xeTable = this;
+      const props = $xeTable;
       const reactData = $xeTable;
       const internalData = $xeTable;
+      const {
+        treeConfig
+      } = props;
       const {
         rowExpandedFlag,
-        tableData,
         expandColumn
       } = reactData;
       const {
+        visibleDataRowIdData,
         rowExpandedMaps
       } = internalData;
+      const treeOpts = $xeTable.computeTreeOpts;
       const {
-        handleGetRowId
-      } = createHandleGetRowId($xeTable);
+        transform
+      } = treeOpts;
       const expandList = [];
       if (expandColumn && rowExpandedFlag) {
-        const rowKeys = {};
-        tableData.forEach(row => {
-          rowKeys[handleGetRowId(row)] = true;
-        });
+        if (treeConfig && !transform) {
+          return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().values(rowExpandedMaps);
+        }
         external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(rowExpandedMaps, (row, rowid) => {
-          if (rowKeys[rowid]) {
+          if (visibleDataRowIdData[rowid]) {
             expandList.push(row);
           }
         });
@@ -27232,13 +27373,26 @@ function renderBody(h, $xeTable) {
       tableFullColumn: [],
       // 渲染所有列
       visibleColumn: [],
-      // 总的缓存数据集
+      // 全量数据集（包括当前和已删除）
       fullAllDataRowIdData: {},
+      // 数据集（仅当前）
+      fullDataRowIdData: {},
+      // 数据集（仅可视）
+      visibleDataRowIdData: {},
       // 渲染中缓存数据
       sourceDataRowIdData: {},
-      fullDataRowIdData: {},
       fullColumnIdData: {},
       fullColumnFieldData: {},
+      // 合并单元格的数据
+      mergeBodyList: [],
+      mergeBodyMaps: {},
+      // 合并表尾的数据
+      mergeFooterList: [],
+      mergeFooterMaps: {},
+      // 已合并单元格数据集合
+      mergeBodyCellMaps: {},
+      // 已合并表尾数据集合
+      mergeFooterCellMaps: {},
       // 已展开的行集合
       rowExpandedMaps: {},
       // 懒加载中的展开行的集合
@@ -27287,6 +27441,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 +27484,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 +27581,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 +31907,12 @@ const Toolbar = VxeToolbar;
       expOptFooter: '表尾',
       expFooterTitle: '是否需要表尾',
       expOptColgroup: '分组表头',
+      expOptTitle: '列标题',
+      expTitleTitle: '是否为列标题，否则显示为列的字段名',
       expColgroupTitle: '如果存在，则支持带有分组结构的表头',
       expOptMerge: '合并',
       expMergeTitle: '如果存在，则支持带有合并结构的单元格',
-      expOptAllExpand: '展开层级',
+      expOptAllExpand: '展开树',
       expAllExpandTitle: '如果存在，则支持将带有层级结构的数据全部展开',
       expOptUseStyle: '样式',
       expUseStyleTitle: '如果存在，则支持带样式的单元格',