vxe-table 4.12.4 → 4.13.0-beta.0

package/lib/table/src/table.js

@@ -108,10 +108,6 @@ var _default = exports.default = (0, _vue.defineComponent)({
       // 树节点列信息
       treeNodeColumn: null,
       hasFixedColumn: false,
-      // 合并单元格的对象集
-      mergeList: [],
-      // 合并表尾数据的对象集
-      mergeFooterList: [],
       // 刷新列标识，当列筛选被改变时，触发表格刷新数据
       upDataFlag: 0,
       // 刷新列标识，当列的特定属性被改变时，触发表格刷新列
@@ -255,6 +251,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
         original: false,
         message: true,
         isHeader: false,
+        isTitle: false,
         isFooter: false
       },
       rowExpandedFlag: 1,
@@ -263,6 +260,8 @@ var _default = exports.default = (0, _vue.defineComponent)({
       pendingRowFlag: 1,
       insertRowFlag: 1,
       removeRowFlag: 1,
+      mergeBodyFlag: 1,
+      mergeFootFlag: 1,
       rowHeightStore: {
         default: 48,
         medium: 44,
@@ -355,13 +354,26 @@ var _default = exports.default = (0, _vue.defineComponent)({
       tableFullColumn: [],
       // 渲染所有列
       visibleColumn: [],
-      // 总的缓存数据集
+      // 全量数据集（包括当前和已删除）
       fullAllDataRowIdData: {},
+      // 数据集（仅当前）
+      fullDataRowIdData: {},
+      // 数据集（仅可视）
+      visibleDataRowIdData: {},
       // 渲染中缓存数据
       sourceDataRowIdData: {},
-      fullDataRowIdData: {},
       fullColumnIdData: {},
       fullColumnFieldData: {},
+      // 合并单元格的数据
+      mergeBodyList: [],
+      mergeBodyMaps: {},
+      // 合并表尾的数据
+      mergeFooterList: [],
+      mergeFooterMaps: {},
+      // 已合并单元格数据集合
+      mergeBodyCellMaps: {},
+      // 已合并表尾数据集合
+      mergeFooterCellMaps: {},
       // 已展开的行集合
       rowExpandedMaps: {},
       // 懒加载中的展开行的集合
@@ -693,25 +705,28 @@ var _default = exports.default = (0, _vue.defineComponent)({
       return Object.assign({}, getConfig().table.customConfig, props.customConfig);
     });
     const computeTableRowExpandedList = (0, _vue.computed)(() => {
+      const {
+        treeConfig
+      } = props;
       const {
         rowExpandedFlag,
-        tableData,
         expandColumn
       } = reactData;
       const {
+        visibleDataRowIdData,
         rowExpandedMaps
       } = internalData;
+      const treeOpts = computeTreeOpts.value;
       const {
-        handleGetRowId
-      } = (0, _util.createHandleGetRowId)($xeTable);
+        transform
+      } = treeOpts;
       const expandList = [];
       if (expandColumn && rowExpandedFlag) {
-        const rowKeys = {};
-        tableData.forEach(row => {
-          rowKeys[handleGetRowId(row)] = true;
-        });
+        if (treeConfig && !transform) {
+          return _xeUtils.default.values(rowExpandedMaps);
+        }
         _xeUtils.default.each(rowExpandedMaps, (row, rowid) => {
-          if (rowKeys[rowid]) {
+          if (visibleDataRowIdData[rowid]) {
             expandList.push(row);
           }
         });
@@ -1152,55 +1167,157 @@ var _default = exports.default = (0, _vue.defineComponent)({
         }
       }
     };
-    const setMerges = (merges, mList, rowList) => {
+    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 = merges => {
+      const {
+        fullAllDataRowIdData,
+        fullColumnIdData,
+        visibleColumn,
+        afterFullData,
+        mergeBodyList,
+        mergeBodyMaps
+      } = internalData;
+      if (merges) {
+        const {
+          handleGetRowId
+        } = (0, _util.createHandleGetRowId)($xeTable);
+        if (!_xeUtils.default.isArray(merges)) {
+          merges = [merges];
+        }
+        merges.forEach(item => {
+          let {
+            row: margeRow,
+            col: margeCol,
+            rowspan,
+            colspan
+          } = item;
+          let mergeRowIndex = -1;
+          let mergeColumnIndex = -1;
+          if (_xeUtils.default.isNumber(margeRow)) {
+            mergeRowIndex = margeRow;
+          } else {
+            const rowid = margeRow ? handleGetRowId(margeRow) : null;
+            const rowRest = rowid ? fullAllDataRowIdData[rowid] : null;
+            if (rowRest) {
+              mergeRowIndex = rowRest._index;
+            }
+          }
+          if (_xeUtils.default.isNumber(margeCol)) {
+            mergeColumnIndex = margeCol;
+          } else {
+            const colid = margeCol ? margeCol.id : null;
+            const colRest = colid ? fullColumnIdData[colid] : null;
+            if (colRest) {
+              mergeColumnIndex = colRest._index;
+            }
+          }
+          if (mergeRowIndex > -1 && mergeColumnIndex > -1 && (rowspan || colspan)) {
+            rowspan = _xeUtils.default.toNumber(rowspan) || 1;
+            colspan = _xeUtils.default.toNumber(colspan) || 1;
+            if (rowspan > 1 || colspan > 1) {
+              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 {
+                mergeItem = {
+                  row: mergeRowIndex,
+                  col: mergeColumnIndex,
+                  rowspan,
+                  colspan,
+                  _row: row,
+                  _col: column,
+                  _rowspan: rowspan,
+                  _colspan: colspan
+                };
+                mergeBodyMaps[`${mergeRowIndex}:${mergeColumnIndex}`] = mergeItem;
+                mergeBodyList.push(mergeItem);
+              }
+            }
+          }
+        });
+      }
+    };
+    const handleFooterMerge = merges => {
+      const {
+        footerTableData
+      } = reactData;
+      const {
+        mergeFooterList,
+        mergeFooterMaps
+      } = internalData;
       if (merges) {
-        // const { treeConfig } = props
         const {
           visibleColumn
         } = internalData;
         if (!_xeUtils.default.isArray(merges)) {
           merges = [merges];
         }
-        // if (treeConfig && merges.length) {
-        //   errLog('vxe.error.noTree', ['merge-cells | merge-footer-items'])
-        // }
         merges.forEach(item => {
           let {
-            row,
-            col,
+            row: margeRow,
+            col: margeCol,
             rowspan,
             colspan
           } = item;
-          if (rowList && _xeUtils.default.isNumber(row)) {
-            row = rowList[row];
+          const mergeRowIndex = _xeUtils.default.isNumber(margeRow) ? margeRow : -1;
+          let mergeColumnIndex = -1;
+          if (_xeUtils.default.isNumber(margeCol)) {
+            mergeColumnIndex = margeCol;
           }
-          if (_xeUtils.default.isNumber(col)) {
-            col = visibleColumn[col];
-          }
-          if ((rowList ? row : _xeUtils.default.isNumber(row)) && col && (rowspan || colspan)) {
+          if (mergeRowIndex > -1 && mergeColumnIndex > -1 && (rowspan || colspan)) {
             rowspan = _xeUtils.default.toNumber(rowspan) || 1;
             colspan = _xeUtils.default.toNumber(colspan) || 1;
             if (rowspan > 1 || colspan > 1) {
-              const mcIndex = _xeUtils.default.findIndexOf(mList, item => (item._row === row || (0, _util.getRowid)($xeTable, item._row) === (0, _util.getRowid)($xeTable, row)) && (item._col.id === col || item._col.id === col.id));
-              const mergeItem = mList[mcIndex];
+              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 {
-                const mergeRowIndex = rowList ? $xeTable.findRowIndexOf(rowList, row) : row;
-                const mergeColIndex = tableMethods.getVTColumnIndex(col);
-                mList.push({
+                mergeItem = {
                   row: mergeRowIndex,
-                  col: mergeColIndex,
+                  col: mergeColumnIndex,
                   rowspan,
                   colspan,
                   _row: row,
-                  _col: col,
+                  _col: column,
                   _rowspan: rowspan,
                   _colspan: colspan
-                });
+                };
+                mergeFooterMaps[`${mergeRowIndex}:${mergeColumnIndex}`] = mergeItem;
+                mergeFooterList.push(mergeItem);
               }
             }
           }
@@ -1368,6 +1485,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
       const expandOpts = computeExpandOpts.value;
       const columnOpts = computeColumnOpts.value;
       const columnDragOpts = computeColumnDragOpts.value;
+      const virtualYOpts = computeVirtualYOpts.value;
       const {
         isCrossDrag,
         isSelfToChildDrag
@@ -1421,39 +1539,33 @@ var _default = exports.default = (0, _vue.defineComponent)({
           htmlColumn = column;
         }
         if (treeNode) {
-          if (process.env.NODE_ENV === 'development') {
-            if (treeNodeColumn) {
-              (0, _log.warnLog)('vxe.error.colRepet', ['tree-node', treeNode]);
-            }
+          if (treeNodeColumn) {
+            (0, _log.warnLog)('vxe.error.colRepet', ['tree-node', treeNode]);
           }
           if (!treeNodeColumn) {
             treeNodeColumn = column;
           }
         } else if (type === 'expand') {
-          if (process.env.NODE_ENV === 'development') {
-            if (expandColumn) {
-              (0, _log.warnLog)('vxe.error.colRepet', ['type', type]);
-            }
+          if (expandColumn) {
+            (0, _log.warnLog)('vxe.error.colRepet', ['type', type]);
           }
           if (!expandColumn) {
             expandColumn = column;
           }
         }
-        if (process.env.NODE_ENV === 'development') {
-          if (type === 'checkbox') {
-            if (checkboxColumn) {
-              (0, _log.warnLog)('vxe.error.colRepet', ['type', type]);
-            }
-            if (!checkboxColumn) {
-              checkboxColumn = column;
-            }
-          } else if (type === 'radio') {
-            if (radioColumn) {
-              (0, _log.warnLog)('vxe.error.colRepet', ['type', type]);
-            }
-            if (!radioColumn) {
-              radioColumn = column;
-            }
+        if (type === 'checkbox') {
+          if (checkboxColumn) {
+            (0, _log.warnLog)('vxe.error.colRepet', ['type', type]);
+          }
+          if (!checkboxColumn) {
+            checkboxColumn = column;
+          }
+        } else if (type === 'radio') {
+          if (radioColumn) {
+            (0, _log.warnLog)('vxe.error.colRepet', ['type', type]);
+          }
+          if (!radioColumn) {
+            radioColumn = column;
           }
         }
         if (isAllOverflow && column.showOverflow === false) {
@@ -1472,6 +1584,9 @@ var _default = exports.default = (0, _vue.defineComponent)({
       } else {
         tableFullColumn.forEach(handleFunc);
       }
+      if (expandColumn && expandOpts.mode !== 'fixed' && virtualYOpts.enabled) {
+        (0, _log.warnLog)('vxe.error.notConflictProp', ['column.type="expand', 'virtual-y-config.enabled=false']);
+      }
       if (expandColumn && expandOpts.mode !== 'fixed' && mouseOpts.area) {
         (0, _log.errLog)('vxe.error.errConflicts', ['mouse-config.area', 'column.type=expand']);
       }
@@ -3084,6 +3199,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
         lastScrollTop
       } = internalData;
       const treeOpts = computeTreeOpts.value;
+      const expandOpts = computeExpandOpts.value;
       const {
         transform
       } = treeOpts;
@@ -3142,7 +3258,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
       internalData.tableFullData = fullData;
       internalData.tableFullTreeData = treeData;
       // 缓存数据
-      $xeTable.cacheRowMap(true);
+      $xeTable.cacheRowMap(isReset);
       // 原始数据
       internalData.tableSynchData = datas;
       if (isReset) {
@@ -3160,6 +3276,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
       $xeTable.clearMergeFooterItems();
       $xeTable.handleTableData(true);
       $xeTable.updateFooter();
+      $xeTable.handleUpdateBodyMerge();
       return (0, _vue.nextTick)().then(() => {
         updateHeight();
         updateStyle();
@@ -3171,6 +3288,9 @@ var _default = exports.default = (0, _vue.defineComponent)({
           scrollYStore.endIndex = scrollYStore.visibleSize;
         }
         if (sYLoad) {
+          if (reactData.expandColumn && expandOpts.mode !== 'fixed') {
+            (0, _log.errLog)('vxe.error.notConflictProp', ['column.type="expand', 'expand-config.mode="fixed"']);
+          }
           // if (showOverflow) {
           //   if (!rowOpts.height) {
           //     const errColumn = internalData.tableFullColumn.find(column => column.showOverflow === false)
@@ -3271,11 +3391,11 @@ var _default = exports.default = (0, _vue.defineComponent)({
     };
     const loadScrollXData = () => {
       const {
-        mergeList,
-        mergeFooterList,
         isScrollXBig
       } = reactData;
       const {
+        mergeBodyList,
+        mergeFooterList,
         scrollXStore
       } = internalData;
       const {
@@ -3294,7 +3414,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
       };
       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
@@ -3645,11 +3765,11 @@ var _default = exports.default = (0, _vue.defineComponent)({
      */
     const loadScrollYData = () => {
       const {
-        mergeList,
         isAllOverflow,
         isScrollYBig
       } = reactData;
       const {
+        mergeBodyList,
         scrollYStore
       } = internalData;
       const {
@@ -3669,7 +3789,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
       };
       scrollYStore.visibleStartIndex = toVisibleIndex - 1;
       scrollYStore.visibleEndIndex = toVisibleIndex + visibleSize + 1;
-      calculateMergerOffsetIndex(mergeList, offsetItem, 'row');
+      calculateMergerOffsetIndex(mergeBodyList, offsetItem, 'row');
       const {
         startIndex: offsetStartIndex,
         endIndex: offsetEndIndex
@@ -4011,7 +4131,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
        * 对于某些特殊的场景，比如深层树节点元素发生变动时可能会用到
        */
       syncData() {
-        (0, _log.warnLog)('vxe.error.delFunc', ['syncData', 'getData']);
+        (0, _log.errLog)('vxe.error.delFunc', ['syncData', 'getData']);
         return (0, _vue.nextTick)().then(() => {
           reactData.tableData = [];
           emit('update:data', internalData.tableFullData);
@@ -4780,6 +4900,9 @@ var _default = exports.default = (0, _vue.defineComponent)({
         const {
           treeConfig
         } = props;
+        const {
+          updateCheckboxFlag
+        } = reactData;
         const {
           tableFullData,
           afterFullData,
@@ -4800,28 +4923,30 @@ var _default = exports.default = (0, _vue.defineComponent)({
         } = checkboxOpts;
         const childrenField = treeOpts.children || treeOpts.childrenField;
         let rowList = [];
-        if (checkField) {
-          if (treeConfig) {
-            const currTableData = isFull ? transform ? tableFullTreeData : tableFullData : transform ? afterTreeFullData : afterFullData;
-            rowList = _xeUtils.default.filterTree(currTableData, row => _xeUtils.default.get(row, checkField), {
-              children: transform ? mapChildrenField : childrenField
-            });
-          } else {
-            const currTableData = isFull ? tableFullData : afterFullData;
-            rowList = currTableData.filter(row => _xeUtils.default.get(row, checkField));
-          }
-        } else {
-          _xeUtils.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 = _xeUtils.default.filterTree(currTableData, row => _xeUtils.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 => _xeUtils.default.get(row, checkField));
             }
-          });
+          } else {
+            _xeUtils.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;
       },
@@ -6650,6 +6775,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
           }) : [];
         }
         reactData.footerTableData = footData;
+        $xeTable.handleUpdateFooterMerge();
         return (0, _vue.nextTick)();
       },
       /**
@@ -6675,9 +6801,10 @@ var _default = exports.default = (0, _vue.defineComponent)({
         if (props.spanMethod) {
           (0, _log.errLog)('vxe.error.errConflicts', ['merge-cells', 'span-method']);
         }
-        setMerges(merges, reactData.mergeList, internalData.afterFullData);
+        handleBodyMerge(merges);
+        $xeTable.handleUpdateBodyMerge();
         return (0, _vue.nextTick)().then(() => {
-          tableMethods.updateCellAreas();
+          $xeTable.updateCellAreas();
           return updateStyle();
         });
       },
@@ -6689,9 +6816,9 @@ var _default = exports.default = (0, _vue.defineComponent)({
         if (props.spanMethod) {
           (0, _log.errLog)('vxe.error.errConflicts', ['merge-cells', 'span-method']);
         }
-        const rest = removeMerges(merges, reactData.mergeList, internalData.afterFullData);
+        const rest = removeMerges(merges, internalData.mergeBodyList, internalData.afterFullData);
         return (0, _vue.nextTick)().then(() => {
-          tableMethods.updateCellAreas();
+          $xeTable.updateCellAreas();
           updateStyle();
           return rest;
         });
@@ -6700,13 +6827,15 @@ var _default = exports.default = (0, _vue.defineComponent)({
        * 获取所有被合并的单元格
        */
       getMergeCells() {
-        return reactData.mergeList.slice(0);
+        return internalData.mergeBodyList.slice(0);
       },
       /**
        * 清除所有单元格合并
        */
       clearMergeCells() {
-        reactData.mergeList = [];
+        internalData.mergeBodyList = [];
+        internalData.mergeBodyMaps = {};
+        internalData.mergeBodyCellMaps = {};
         return (0, _vue.nextTick)().then(() => {
           return updateStyle();
         });
@@ -6715,7 +6844,8 @@ var _default = exports.default = (0, _vue.defineComponent)({
         if (props.footerSpanMethod) {
           (0, _log.errLog)('vxe.error.errConflicts', ['merge-footer-items', 'footer-span-method']);
         }
-        setMerges(merges, reactData.mergeFooterList);
+        handleFooterMerge(merges);
+        $xeTable.handleUpdateFooterMerge();
         return (0, _vue.nextTick)().then(() => {
           tableMethods.updateCellAreas();
           return updateStyle();
@@ -6725,7 +6855,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
         if (props.footerSpanMethod) {
           (0, _log.errLog)('vxe.error.errConflicts', ['merge-footer-items', 'footer-span-method']);
         }
-        const rest = removeMerges(merges, reactData.mergeFooterList);
+        const rest = removeMerges(merges, internalData.mergeFooterList);
         return (0, _vue.nextTick)().then(() => {
           tableMethods.updateCellAreas();
           updateStyle();
@@ -6736,13 +6866,15 @@ var _default = exports.default = (0, _vue.defineComponent)({
        * 获取所有被合并的表尾
        */
       getMergeFooterItems() {
-        return reactData.mergeFooterList.slice(0);
+        return internalData.mergeFooterList.slice(0);
       },
       /**
        * 清除所有表尾合并
        */
       clearMergeFooterItems() {
-        reactData.mergeFooterList = [];
+        internalData.mergeFooterList = [];
+        internalData.mergeFooterMaps = {};
+        internalData.mergeFooterCellMaps = {};
         return (0, _vue.nextTick)().then(() => {
           return updateStyle();
         });
@@ -7879,20 +8011,23 @@ var _default = exports.default = (0, _vue.defineComponent)({
           fullList = handleVirtualTreeToList();
         }
         const tableData = scrollYLoad ? fullList.slice(scrollYStore.startIndex, scrollYStore.endIndex) : fullList.slice(0);
+        const visibleDataRowIdMaps = {};
         tableData.forEach((row, $index) => {
           const rowid = (0, _util.getRowid)($xeTable, row);
           const rest = fullDataRowIdData[rowid];
           if (rest) {
             rest.$index = $index;
           }
+          visibleDataRowIdMaps[rowid] = row;
         });
         reactData.tableData = tableData;
+        internalData.visibleDataRowIdData = visibleDataRowIdMaps;
         return (0, _vue.nextTick)();
       },
       /**
        * 更新数据行的 Map
        */
-      cacheRowMap() {
+      cacheRowMap(isReset) {
         const {
           treeConfig
         } = props;
@@ -7908,7 +8043,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
         const {
           lazy
         } = treeOpts;
-        const fullAllDataRowIdMaps = Object.assign({}, fullAllDataRowIdData); // 存在已删除数据
+        const fullAllDataRowIdMaps = isReset ? {} : Object.assign({}, fullAllDataRowIdData); // 存在已删除数据
         const fullDataRowIdMaps = {};
         const {
           handleUpdateRowId
@@ -8817,6 +8952,23 @@ var _default = exports.default = (0, _vue.defineComponent)({
       }, checked, isForce) {
         $xeTable.handleBatchSelectRows([row], checked, isForce);
       },
+      /**
+       * 处理合并
+       */
+      handleUpdateBodyMerge() {
+        const {
+          mergeBodyList
+        } = internalData;
+        internalData.mergeBodyCellMaps = buildMergeData(mergeBodyList);
+        reactData.mergeBodyFlag++;
+      },
+      handleUpdateFooterMerge() {
+        const {
+          mergeFooterList
+        } = internalData;
+        internalData.mergeFooterCellMaps = buildMergeData(mergeFooterList);
+        reactData.mergeFootFlag++;
+      },
       triggerHeaderTitleEvent(evnt, iconParams, params) {
         const tipContent = iconParams.content || iconParams.message;
         if (tipContent) {
@@ -11231,20 +11383,22 @@ var _default = exports.default = (0, _vue.defineComponent)({
           } = 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`;
@@ -11827,6 +11981,8 @@ var _default = exports.default = (0, _vue.defineComponent)({
       if (columnOpts.drag || rowOpts.drag || customOpts.allowSort) {
         (0, _dom.initTpImg)();
       }
+      ;
+      window.aa = $xeTable;
       (0, _vue.nextTick)(() => {
         const {
           data,
@@ -11855,6 +12011,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
         const currentColumnOpts = computeCurrentColumnOpts.value;
         const virtualXOpts = computeVirtualXOpts.value;
         const virtualYOpts = computeVirtualYOpts.value;
+        const keyboardOpts = computeKeyboardOpts.value;
         if (props.rowId) {
           (0, _log.warnLog)('vxe.error.delProp', ['row-id', 'row-config.keyField']);
         }
@@ -11894,6 +12051,12 @@ var _default = exports.default = (0, _vue.defineComponent)({
         if (props.highlightHoverColumn) {
           (0, _log.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.default.includeArrays(_xeUtils.default.keys(importOpts._typeMaps), importOpts.types)) {
           (0, _log.warnLog)('vxe.error.errProp', [`export-config.types=${importOpts.types.join(',')}`, importOpts.types.filter(type => _xeUtils.default.includes(_xeUtils.default.keys(importOpts._typeMaps), type)).join(',') || _xeUtils.default.keys(importOpts._typeMaps).join(',')]);
@@ -11954,10 +12117,10 @@ var _default = exports.default = (0, _vue.defineComponent)({
         if (checkboxOpts.halfField) {
           (0, _log.warnLog)('vxe.error.delProp', ['checkbox-config.halfField', 'checkbox-config.indeterminateField']);
         }
-        if ((rowOpts.isCurrent || highlightCurrentRow) && !_xeUtils.default.isBoolean(currentRowOpts.isFollowSelected)) {
+        if ((rowOpts.isCurrent || highlightCurrentRow) && props.keyboardConfig && keyboardOpts.isArrow && !_xeUtils.default.isBoolean(currentRowOpts.isFollowSelected)) {
           (0, _log.warnLog)('vxe.error.notConflictProp', ['row-config.isCurrent', 'current-row-config.isFollowSelected']);
         }
-        if ((columnOpts.isCurrent || highlightCurrentColumn) && !_xeUtils.default.isBoolean(currentColumnOpts.isFollowSelected)) {
+        if ((columnOpts.isCurrent || highlightCurrentColumn) && props.keyboardConfig && keyboardOpts.isArrow && !_xeUtils.default.isBoolean(currentColumnOpts.isFollowSelected)) {
           (0, _log.warnLog)('vxe.error.notConflictProp', ['column-config.isCurrent', 'current-column-config.isFollowSelected']);
         }
         // 如果不支持虚拟滚动