vxe-table 3.14.0-beta.8 → 3.14.0

package/lib/table/src/methods.js

@@ -21,6 +21,7 @@ const {
   interceptor,
   createEvent
 } = _ui.VxeUI;
+const supportMaxRow = 5e6;
 const customStorageKey = 'VXE_CUSTOM_STORE';
 const maxYHeight = 5e6;
 const maxXWidth = 5e6;
@@ -287,7 +288,7 @@ function cacheColumnMap($xeTable) {
       fullColumnFieldData[field] = rest;
     } else {
       if (storage && !type || columnOpts.drag && (isCrossDrag || isSelfToChildDrag)) {
-        (0, _log.errLog)('vxe.error.reqProp', [`${column.getTitle() || type || ''} -> column.field`]);
+        (0, _log.errLog)('vxe.error.reqProp', [`${column.getTitle() || type || ''} -> column.field=?`]);
       }
     }
     if (!hasFixed && fixed) {
@@ -393,9 +394,12 @@ function updateAfterListIndex($xeTable) {
     fullDataRowIdData,
     fullAllDataRowIdData
   } = internalData;
+  const {
+    handleGetRowId
+  } = (0, _util.createHandleGetRowId)($xeTable);
   const fullMaps = {};
   afterFullData.forEach((row, index) => {
-    const rowid = (0, _util.getRowid)($xeTable, row);
+    const rowid = handleGetRowId(row);
     const rowRest = fullAllDataRowIdData[rowid];
     const seq = index + 1;
     if (rowRest) {
@@ -449,8 +453,11 @@ function updateAfterDataIndex($xeTable) {
   const childrenField = treeOpts.children || treeOpts.childrenField;
   const fullMaps = {};
   if (treeConfig) {
+    const {
+      handleGetRowId
+    } = (0, _util.createHandleGetRowId)($xeTable);
     _xeUtils.default.eachTree(afterTreeFullData, (row, index, items, path) => {
-      const rowid = (0, _util.getRowid)($xeTable, row);
+      const rowid = handleGetRowId(row);
       const rowRest = fullAllDataRowIdData[rowid];
       const seq = path.map((num, i) => i % 2 === 0 ? Number(num) + 1 : '.').join('');
       if (rowRest) {
@@ -492,25 +499,25 @@ function updateAfterDataIndex($xeTable) {
  */
 function handleVirtualTreeToList($xeTable) {
   const props = $xeTable;
-  const reactData = $xeTable;
   const internalData = $xeTable;
   const {
     treeConfig
   } = props;
   const {
+    fullAllDataRowIdData,
     treeExpandedMaps
-  } = reactData;
-  const {
-    fullAllDataRowIdData
   } = internalData;
   const treeOpts = $xeTable.computeTreeOpts;
   const childrenField = treeOpts.children || treeOpts.childrenField;
   if (treeConfig && treeOpts.transform) {
+    const {
+      handleGetRowId
+    } = (0, _util.createHandleGetRowId)($xeTable);
     const fullData = [];
     const expandMaps = {};
     _xeUtils.default.eachTree(internalData.afterTreeFullData, (row, index, items, path, parentRow) => {
-      const rowid = (0, _util.getRowid)($xeTable, row);
-      const parentRowid = (0, _util.getRowid)($xeTable, parentRow);
+      const rowid = handleGetRowId(row);
+      const parentRowid = handleGetRowId(parentRow);
       if (!parentRow || expandMaps[parentRowid] && treeExpandedMaps[parentRowid]) {
         const rowRest = fullAllDataRowIdData[rowid];
         if (rowRest) {
@@ -558,7 +565,6 @@ function updateStyle($xeTable) {
   } = reactData;
   const {
     visibleColumn,
-    fullColumnIdData,
     tableHeight,
     headerHeight,
     footerHeight,
@@ -575,7 +581,6 @@ function updateStyle($xeTable) {
   const osbWidth = overflowY ? scrollbarWidth : 0;
   const osbHeight = overflowX ? scrollbarHeight : 0;
   const emptyPlaceholderElem = $xeTable.$refs.refEmptyPlaceholder;
-  const cellOffsetWidth = $xeTable.computeCellOffsetWidth;
   const mouseOpts = $xeTable.computeMouseOpts;
   const expandOpts = $xeTable.computeExpandOpts;
   const bodyWrapperElem = (0, _util.getRefElem)(elemStore['main-body-wrapper']);
@@ -837,58 +842,6 @@ function updateStyle($xeTable) {
           tableElem.style.width = tWidth ? `${tWidth}px` : '';
         }
       }
-      const colgroupElem = (0, _util.getRefElem)(elemStore[`${name}-${layout}-colgroup`]);
-      if (colgroupElem) {
-        _xeUtils.default.arrayEach(colgroupElem.children, colElem => {
-          const colid = colElem.getAttribute('name');
-          if (fullColumnIdData[colid]) {
-            const colRest = fullColumnIdData[colid];
-            const column = colRest.column;
-            const {
-              showHeaderOverflow,
-              showFooterOverflow,
-              showOverflow
-            } = column;
-            let cellOverflow;
-            colElem.style.width = `${column.renderWidth}px`;
-            if (layout === 'header') {
-              cellOverflow = _xeUtils.default.isUndefined(showHeaderOverflow) || _xeUtils.default.isNull(showHeaderOverflow) ? allColumnHeaderOverflow : showHeaderOverflow;
-            } else if (layout === 'footer') {
-              cellOverflow = _xeUtils.default.isUndefined(showFooterOverflow) || _xeUtils.default.isNull(showFooterOverflow) ? allColumnFooterOverflow : showFooterOverflow;
-            } else {
-              cellOverflow = _xeUtils.default.isUndefined(showOverflow) || _xeUtils.default.isNull(showOverflow) ? isAllOverflow : showOverflow;
-            }
-            const showEllipsis = cellOverflow === 'ellipsis';
-            const showTitle = cellOverflow === 'title';
-            const showTooltip = cellOverflow === true || cellOverflow === 'tooltip';
-            let hasEllipsis = showTitle || showTooltip || showEllipsis;
-            const listElem = (0, _util.getRefElem)(elemStore[`${name}-${layout}-list`]);
-            // 纵向虚拟滚动不支持动态行高
-            if (scrollYLoad && !hasEllipsis) {
-              hasEllipsis = true;
-            }
-            if (listElem) {
-              _xeUtils.default.arrayEach(listElem.querySelectorAll(`.${column.id}`), elem => {
-                const colspan = parseInt(elem.getAttribute('colspan') || 1);
-                const cellElem = elem.querySelector('.vxe-cell');
-                let colWidth = column.renderWidth;
-                if (cellElem) {
-                  if (colspan > 1) {
-                    const columnIndex = $xeTable.getColumnIndex(column);
-                    for (let index = 1; index < colspan; index++) {
-                      const nextColumn = $xeTable.getColumns(columnIndex + index);
-                      if (nextColumn) {
-                        colWidth += nextColumn.renderWidth;
-                      }
-                    }
-                  }
-                  cellElem.style.width = hasEllipsis ? `${colWidth - cellOffsetWidth * colspan}px` : '';
-                }
-              });
-            }
-          }
-        });
-      }
     });
   });
   if (currentRow) {
@@ -899,6 +852,21 @@ function updateStyle($xeTable) {
   }
   return $xeTable.$nextTick();
 }
+function checkValidate($xeTable, type) {
+  if ($xeTable.triggerValidate) {
+    return $xeTable.triggerValidate(type);
+  }
+  return $xeTable.$nextTick();
+}
+/**
+ * 当单元格发生改变时
+ * 如果存在规则，则校验
+ */
+function handleChangeCell($xeTable, evnt, params) {
+  checkValidate($xeTable, 'blur').catch(e => e).then(() => {
+    $xeTable.handleEdit(params, evnt).then(() => checkValidate($xeTable, 'change')).catch(e => e);
+  });
+}
 function handleRadioReserveRow($xeTable, row) {
   const internalData = $xeTable;
   const radioOpts = $xeTable.computeRadioOpts;
@@ -950,12 +918,10 @@ function handleCheckedAllCheckboxRow($xeTable, checked, isForce) {
   const {
     treeConfig
   } = props;
-  const {
-    selectCheckboxMaps
-  } = reactData;
   const {
     afterFullData,
-    checkboxReserveRowMap
+    checkboxReserveRowMap,
+    selectCheckboxMaps
   } = internalData;
   const treeOpts = $xeTable.computeTreeOpts;
   const childrenField = treeOpts.children || treeOpts.childrenField;
@@ -965,6 +931,9 @@ function handleCheckedAllCheckboxRow($xeTable, checked, isForce) {
     reserve,
     checkMethod
   } = checkboxOpts;
+  const {
+    handleGetRowId
+  } = (0, _util.createHandleGetRowId)($xeTable);
   // indeterminateField 仅支持读取
   const indeterminateField = checkboxOpts.indeterminateField || checkboxOpts.halfField;
   const selectRowMaps = {};
@@ -978,7 +947,7 @@ function handleCheckedAllCheckboxRow($xeTable, checked, isForce) {
         row
       })) {
         if (checked) {
-          selectRowMaps[(0, _util.getRowid)($xeTable, row)] = row;
+          selectRowMaps[handleGetRowId(row)] = row;
         }
         _xeUtils.default.set(row, checkField, checked);
       }
@@ -1010,7 +979,8 @@ function handleCheckedAllCheckboxRow($xeTable, checked, isForce) {
           if (isForce || !checkMethod || checkMethod({
             row
           })) {
-            selectRowMaps[(0, _util.getRowid)($xeTable, row)] = row;
+            const rowid = handleGetRowId(row);
+            selectRowMaps[rowid] = row;
           }
         }, {
           children: childrenField
@@ -1022,7 +992,7 @@ function handleCheckedAllCheckboxRow($xeTable, checked, isForce) {
            */
         if (!isForce && checkMethod) {
           _xeUtils.default.eachTree(afterFullData, row => {
-            const rowid = (0, _util.getRowid)($xeTable, row);
+            const rowid = handleGetRowId(row);
             if (checkMethod({
               row
             }) ? 0 : selectCheckboxMaps[rowid]) {
@@ -1042,7 +1012,7 @@ function handleCheckedAllCheckboxRow($xeTable, checked, isForce) {
            */
         if (!isForce && checkMethod) {
           afterFullData.forEach(row => {
-            const rowid = (0, _util.getRowid)($xeTable, row);
+            const rowid = handleGetRowId(row);
             if (selectCheckboxMaps[rowid] || checkMethod({
               row
             })) {
@@ -1051,7 +1021,8 @@ function handleCheckedAllCheckboxRow($xeTable, checked, isForce) {
           });
         } else {
           afterFullData.forEach(row => {
-            selectRowMaps[(0, _util.getRowid)($xeTable, row)] = row;
+            const rowid = handleGetRowId(row);
+            selectRowMaps[rowid] = row;
           });
         }
       } else {
@@ -1062,7 +1033,7 @@ function handleCheckedAllCheckboxRow($xeTable, checked, isForce) {
            */
         if (!isForce && checkMethod) {
           afterFullData.forEach(row => {
-            const rowid = (0, _util.getRowid)($xeTable, row);
+            const rowid = handleGetRowId(row);
             if (checkMethod({
               row
             }) ? 0 : selectCheckboxMaps[rowid]) {
@@ -1082,10 +1053,10 @@ function handleCheckedAllCheckboxRow($xeTable, checked, isForce) {
       afterFullData.forEach(row => handleCheckboxReserveRow($xeTable, row, false));
     }
   }
-  reactData.selectCheckboxMaps = checkField ? {} : selectRowMaps;
+  reactData.updateCheckboxFlag++;
+  internalData.selectCheckboxMaps = checkField ? {} : selectRowMaps;
   reactData.isAllSelected = checked;
   reactData.isIndeterminate = false;
-  reactData.treeIndeterminateMaps = {};
   internalData.treeIndeterminateRowMaps = {};
   $xeTable.checkSelectionStatus();
   return $xeTable.$nextTick();
@@ -1101,15 +1072,15 @@ function handleReserveStatus($xeTable) {
   const {
     expandColumn,
     currentRow,
-    selectCheckboxMaps,
-    selectRadioRow,
-    rowExpandedMaps,
-    treeExpandedMaps
+    selectRadioRow
   } = reactData;
   const {
     fullDataRowIdData,
     fullAllDataRowIdData,
-    radioReserveRow
+    radioReserveRow,
+    selectCheckboxMaps,
+    treeExpandedMaps,
+    rowExpandedMaps
   } = internalData;
   const expandOpts = $xeTable.computeExpandOpts;
   const treeOpts = $xeTable.computeTreeOpts;
@@ -1127,7 +1098,8 @@ function handleReserveStatus($xeTable) {
     }
   }
   // 复选框
-  reactData.selectCheckboxMaps = getRecoverRowMaps($xeTable, selectCheckboxMaps); // 刷新多选行状态
+  internalData.selectCheckboxMaps = getRecoverRowMaps($xeTable, selectCheckboxMaps); // 刷新多选行状态
+  reactData.updateCheckboxFlag++;
   // 还原保留选中状态
   if (checkboxOpts.reserve) {
     handleCheckedCheckboxRow($xeTable, handleReserveRow($xeTable, internalData.checkboxReserveRowMap), true, true);
@@ -1136,17 +1108,194 @@ function handleReserveStatus($xeTable) {
     reactData.currentRow = null; // 刷新当前行状态
   }
   // 行展开
-  reactData.rowExpandedMaps = expandColumn ? getRecoverRowMaps($xeTable, rowExpandedMaps) : {}; // 刷新行展开状态
+  internalData.rowExpandedMaps = expandColumn ? getRecoverRowMaps($xeTable, rowExpandedMaps) : {}; // 刷新行展开状态
+  reactData.rowExpandedFlag++;
   // 还原保留状态
   if (expandColumn && expandOpts.reserve) {
     $xeTable.setRowExpand(handleReserveRow($xeTable, internalData.rowExpandedReserveRowMap), true);
   }
   // 树展开
-  reactData.treeExpandedMaps = treeConfig ? getRecoverRowMaps($xeTable, treeExpandedMaps) : {}; // 刷新树展开状态
+  internalData.treeExpandedMaps = treeConfig ? getRecoverRowMaps($xeTable, treeExpandedMaps) : {}; // 刷新树展开状态
+  reactData.treeExpandedFlag++;
   if (treeConfig && treeOpts.reserve) {
     $xeTable.setTreeExpand(handleReserveRow($xeTable, internalData.treeExpandedReserveRowMap), true);
   }
 }
+/**
+ * 处理默认展开树节点
+ */
+const handleDefaultTreeExpand = $xeTable => {
+  const props = $xeTable;
+  const internalData = $xeTable;
+  const {
+    treeConfig
+  } = props;
+  if (treeConfig) {
+    const {
+      tableFullData
+    } = internalData;
+    const treeOpts = $xeTable.computeTreeOpts;
+    const {
+      expandAll,
+      expandRowKeys
+    } = treeOpts;
+    const childrenField = treeOpts.children || treeOpts.childrenField;
+    if (expandAll) {
+      $xeTable.setAllTreeExpand(true);
+    } else if (expandRowKeys) {
+      const defExpandeds = [];
+      const rowkey = (0, _util.getRowkey)($xeTable);
+      expandRowKeys.forEach(rowid => {
+        const matchObj = _xeUtils.default.findTree(tableFullData, item => rowid === _xeUtils.default.get(item, rowkey), {
+          children: childrenField
+        });
+        if (matchObj) {
+          defExpandeds.push(matchObj.item);
+        }
+      });
+      $xeTable.setTreeExpand(defExpandeds, true);
+    }
+  }
+};
+const handleAsyncTreeExpandChilds = ($xeTable, row) => {
+  const reactData = $xeTable;
+  const internalData = $xeTable;
+  const treeOpts = $xeTable.computeTreeOpts;
+  const checkboxOpts = $xeTable.computeCheckboxOpts;
+  const {
+    transform,
+    loadMethod
+  } = treeOpts;
+  const {
+    checkStrictly
+  } = checkboxOpts;
+  return new Promise(resolve => {
+    if (loadMethod) {
+      const {
+        fullAllDataRowIdData,
+        treeExpandLazyLoadedMaps
+      } = internalData;
+      const rowid = (0, _util.getRowid)($xeTable, row);
+      const rowRest = fullAllDataRowIdData[rowid];
+      treeExpandLazyLoadedMaps[rowid] = row;
+      Promise.resolve(loadMethod({
+        $table: $xeTable,
+        row
+      })).then(childRecords => {
+        if (rowRest) {
+          rowRest.treeLoaded = true;
+        }
+        if (treeExpandLazyLoadedMaps[rowid]) {
+          delete treeExpandLazyLoadedMaps[rowid];
+        }
+        if (!_xeUtils.default.isArray(childRecords)) {
+          childRecords = [];
+        }
+        if (childRecords) {
+          return $xeTable.loadTreeChildren(row, childRecords).then(childRows => {
+            const {
+              treeExpandedMaps
+            } = internalData;
+            if (childRows.length && !treeExpandedMaps[rowid]) {
+              treeExpandedMaps[rowid] = row;
+            }
+            reactData.treeExpandedFlag++;
+            // 如果当前节点已选中，则展开后子节点也被选中
+            if (!checkStrictly && $xeTable.isCheckedByCheckboxRow(row)) {
+              handleCheckedCheckboxRow($xeTable, childRows, true);
+            }
+            return $xeTable.$nextTick().then(() => {
+              if (transform) {
+                $xeTable.handleTableData();
+                updateAfterDataIndex($xeTable);
+                return $xeTable.$nextTick();
+              }
+            });
+          });
+        }
+      }).catch(() => {
+        const {
+          treeExpandLazyLoadedMaps
+        } = internalData;
+        if (rowRest) {
+          rowRest.treeLoaded = false;
+        }
+        if (treeExpandLazyLoadedMaps[rowid]) {
+          delete treeExpandLazyLoadedMaps[rowid];
+        }
+      }).finally(() => {
+        reactData.treeExpandedFlag++;
+        $xeTable.$nextTick().then(() => $xeTable.recalculate()).then(() => resolve());
+      });
+    } else {
+      resolve();
+    }
+  });
+};
+const handleTreeExpandReserve = ($xeTable, row, expanded) => {
+  const internalData = $xeTable;
+  const {
+    treeExpandedReserveRowMap
+  } = internalData;
+  const treeOpts = $xeTable.computeTreeOpts;
+  if (treeOpts.reserve) {
+    const rowid = (0, _util.getRowid)($xeTable, row);
+    if (expanded) {
+      treeExpandedReserveRowMap[rowid] = row;
+    } else if (treeExpandedReserveRowMap[rowid]) {
+      delete treeExpandedReserveRowMap[rowid];
+    }
+  }
+};
+const handleAsyncRowExpand = ($xeTable, row) => {
+  const reactData = $xeTable;
+  const internalData = $xeTable;
+  return new Promise(resolve => {
+    const expandOpts = $xeTable.computeExpandOpts;
+    const {
+      loadMethod
+    } = expandOpts;
+    if (loadMethod) {
+      const {
+        fullAllDataRowIdData,
+        rowExpandLazyLoadedMaps
+      } = internalData;
+      const rowid = (0, _util.getRowid)($xeTable, row);
+      const rowRest = fullAllDataRowIdData[rowid];
+      rowExpandLazyLoadedMaps[rowid] = row;
+      loadMethod({
+        $table: $xeTable,
+        row,
+        rowIndex: $xeTable.getRowIndex(row),
+        $rowIndex: $xeTable.getVMRowIndex(row)
+      }).then(() => {
+        const {
+          rowExpandedMaps
+        } = internalData;
+        if (rowRest) {
+          rowRest.expandLoaded = true;
+        }
+        rowExpandedMaps[rowid] = row;
+        reactData.rowExpandedFlag++;
+      }).catch(() => {
+        if (rowRest) {
+          rowRest.expandLoaded = false;
+        }
+      }).finally(() => {
+        const {
+          rowExpandLazyLoadedMaps
+        } = internalData;
+        if (rowExpandLazyLoadedMaps[rowid]) {
+          delete rowExpandLazyLoadedMaps[rowid];
+        }
+        reactData.rowExpandedFlag++;
+        $xeTable.$nextTick().then(() => $xeTable.recalculate()).then(() => $xeTable.updateCellAreas()).then(() => resolve());
+      });
+    } else {
+      resolve();
+    }
+  });
+};
 function calcVarRowHeightConfig($xeTable, sizeKey, sizeEl) {
   const reactData = $xeTable;
   const {
@@ -1221,12 +1370,15 @@ function handleVirtualYVisible($xeTable) {
       toVisibleIndex = Math.floor(startTop / defaultRowHeight) - 1;
       visibleSize = Math.ceil(clientHeight / defaultRowHeight) + 1;
     } else {
+      const {
+        handleGetRowId
+      } = (0, _util.createHandleGetRowId)($xeTable);
       let leftIndex = 0;
       let rightIndex = afterFullData.length;
       while (leftIndex < rightIndex) {
         const rIndex = Math.floor((leftIndex + rightIndex) / 2);
         const row = afterFullData[rIndex];
-        const rowid = (0, _util.getRowid)($xeTable, row);
+        const rowid = handleGetRowId(row);
         const rowRest = fullAllDataRowIdData[rowid] || {};
         if (rowRest.oTop <= startTop) {
           leftIndex = rIndex + 1;
@@ -1237,7 +1389,7 @@ function handleVirtualYVisible($xeTable) {
       toVisibleIndex = Math.max(0, leftIndex < afterFullData.length ? leftIndex - 2 : 0);
       for (let rIndex = toVisibleIndex, rLen = afterFullData.length; rIndex < rLen; rIndex++) {
         const row = afterFullData[rIndex];
-        const rowid = (0, _util.getRowid)($xeTable, row);
+        const rowid = handleGetRowId(row);
         const rowRest = fullAllDataRowIdData[rowid] || {};
         visibleSize++;
         if (rowRest.oTop > endTop || visibleSize >= 100) {
@@ -1276,12 +1428,16 @@ function calculateMergerOffsetIndex(list, offsetItem, type) {
     }
   }
 }
-function setMerges(_vm, merges, mList, rowList) {
+function setMerges($xeTable, merges, mList, rowList) {
+  const props = $xeTable;
+  const internalData = $xeTable;
   if (merges) {
     const {
-      treeConfig,
+      treeConfig
+    } = props;
+    const {
       visibleColumn
-    } = _vm;
+    } = internalData;
     if (!_xeUtils.default.isArray(merges)) {
       merges = [merges];
     }
@@ -1331,13 +1487,17 @@ function setMerges(_vm, merges, mList, rowList) {
     });
   }
 }
-function removeMerges(_vm, merges, mList, rowList) {
+function removeMerges($xeTable, merges, mList, rowList) {
+  const props = $xeTable;
+  const internalData = $xeTable;
   const rest = [];
   if (merges) {
     const {
-      treeConfig,
+      treeConfig
+    } = props;
+    const {
       visibleColumn
-    } = _vm;
+    } = internalData;
     if (!_xeUtils.default.isArray(merges)) {
       merges = [merges];
     }
@@ -1534,6 +1694,7 @@ function autoCellWidth($xeTable) {
   internalData.headerHeight = headerHeight;
   internalData.footerHeight = footerHeight;
   reactData.overflowX = overflowX;
+  reactData.resizeWidthFlag++;
   updateColumnOffsetLeft($xeTable);
   updateHeight($xeTable);
   reactData.parentHeight = Math.max(internalData.headerHeight + footerHeight + 20, $xeTable.getParentHeight());
@@ -1568,8 +1729,11 @@ const calcCellHeight = $xeTable => {
   const defaultRowHeight = $xeTable.computeDefaultRowHeight;
   const el = $xeTable.$refs.refElem;
   if (!isAllOverflow && scrollYLoad && el) {
+    const {
+      handleGetRowId
+    } = (0, _util.createHandleGetRowId)($xeTable);
     tableData.forEach(row => {
-      const rowid = (0, _util.getRowid)($xeTable, row);
+      const rowid = handleGetRowId(row);
       const rowRest = fullAllDataRowIdData[rowid];
       if (rowRest) {
         const height = calcCellAutoHeight(rowRest, el);
@@ -1826,9 +1990,10 @@ function hideDropTip($xeTable) {
  * @param {Event} evnt 事件
  * @param {Row} row 行对象
  */
-function handleTooltip($xeTable, evnt, tdEl, overflowElem, tipElem, params) {
+function handleTooltip($xeTable, evnt, tdEl, overflowElem, params) {
   const reactData = $xeTable;
-  if (!overflowElem) {
+  const tipOverEl = overflowElem || tdEl;
+  if (!tipOverEl) {
     return $xeTable.$nextTick();
   }
   params.cell = tdEl;
@@ -1846,9 +2011,8 @@ function handleTooltip($xeTable, evnt, tdEl, overflowElem, tipElem, params) {
   } = tooltipOpts;
   const customContent = contentMethod ? contentMethod(params) : null;
   const useCustom = contentMethod && !_xeUtils.default.eqNull(customContent);
-  const content = useCustom ? customContent : _xeUtils.default.toString(column.type === 'html' ? overflowElem.innerText : overflowElem.textContent).trim();
-  const isCellOverflow = overflowElem.scrollWidth > overflowElem.clientWidth;
-  if (content && (showAll || useCustom || isCellOverflow)) {
+  const content = useCustom ? customContent : _xeUtils.default.toString(column.type === 'html' ? tipOverEl.innerText : tipOverEl.textContent).trim();
+  if (content && (showAll || useCustom || tipOverEl.scrollWidth > tipOverEl.clientWidth)) {
     Object.assign(tooltipStore, {
       row,
       column,
@@ -1858,7 +2022,7 @@ function handleTooltip($xeTable, evnt, tdEl, overflowElem, tipElem, params) {
     $xeTable.$nextTick(() => {
       const $tooltip = $xeTable.$refs.refTooltip;
       if ($tooltip && $tooltip.open) {
-        $tooltip.open(isCellOverflow ? overflowElem : tipElem || overflowElem, (0, _utils.formatText)(content));
+        $tooltip.open(tipOverEl, (0, _utils.formatText)(content));
       }
     });
   }
@@ -2069,10 +2233,8 @@ function parseColumns($xeTable, isReset) {
   const props = $xeTable;
   const reactData = $xeTable;
   const internalData = $xeTable;
-  const {
-    showOverflow
-  } = props;
-  const rowOpts = $xeTable.computeRowOpts;
+  // const { showOverflow } = props
+  // const rowOpts = $xeTable.computeRowOpts
   const leftList = [];
   const centerList = [];
   const rightList = [];
@@ -2149,28 +2311,28 @@ function parseColumns($xeTable, isReset) {
     rightList
   });
   if (scrollXLoad) {
-    if (showOverflow) {
-      if (!rowOpts.height) {
-        const errColumn = internalData.tableFullColumn.find(column => column.showOverflow === false);
-        if (errColumn) {
-          (0, _log.errLog)('vxe.error.errProp', [`column[field="${errColumn.field}"].show-overflow=false`, 'show-overflow=true']);
-        }
-      }
-    }
-    if (process.env.NODE_ENV === 'development') {
-      // if (props.showHeader && !props.showHeaderOverflow) {
-      //   warnLog('vxe.error.reqProp', ['show-header-overflow'])
-      // }
-      // if (props.showFooter && !props.showFooterOverflow) {
-      //   warnLog('vxe.error.reqProp', ['show-footer-overflow'])
-      // }
-      if (props.spanMethod) {
-        (0, _log.warnLog)('vxe.error.scrollErrProp', ['span-method']);
-      }
-      if (props.footerSpanMethod) {
-        (0, _log.warnLog)('vxe.error.scrollErrProp', ['footer-span-method']);
-      }
-    }
+    // if (showOverflow) {
+    //   if (!rowOpts.height) {
+    //     const errColumn = internalData.tableFullColumn.find(column => column.showOverflow === false)
+    //     if (errColumn) {
+    //       errLog('vxe.error.errProp', [`column[field="${errColumn.field}"].show-overflow=false`, 'show-overflow=true'])
+    //     }
+    //   }
+    // }
+    // if (process.env.NODE_ENV === 'development') {
+    // if (props.showHeader && !props.showHeaderOverflow) {
+    //   warnLog('vxe.error.reqProp', ['show-header-overflow'])
+    // }
+    // if (props.showFooter && !props.showFooterOverflow) {
+    //   warnLog('vxe.error.reqProp', ['show-footer-overflow'])
+    // }
+    if (props.spanMethod) {
+      (0, _log.warnLog)('vxe.error.scrollErrProp', ['span-method']);
+    }
+    if (props.footerSpanMethod) {
+      (0, _log.warnLog)('vxe.error.scrollErrProp', ['footer-span-method']);
+    }
+    // }
     if (isReset) {
       const {
         visibleSize
@@ -2307,6 +2469,39 @@ function loadScrollYData($xeTable) {
     }
   }
 }
+const createGetRowCacheProp = prop => {
+  return function (row) {
+    const $xeTable = this;
+    const internalData = $xeTable;
+    const {
+      fullAllDataRowIdData
+    } = internalData;
+    if (row) {
+      const rowid = (0, _util.getRowid)($xeTable, row);
+      const rowRest = fullAllDataRowIdData[rowid];
+      if (rowRest) {
+        return rowRest[prop];
+      }
+    }
+    return -1;
+  };
+};
+const createGetColumnCacheProp = prop => {
+  return function (column) {
+    const $xeTable = this;
+    const internalData = $xeTable;
+    const {
+      fullColumnIdData
+    } = internalData;
+    if (column) {
+      const colRest = fullColumnIdData[column.id];
+      if (colRest) {
+        return colRest[prop];
+      }
+    }
+    return -1;
+  };
+};
 function lazyScrollXData($xeTable) {
   const internalData = $xeTable;
   const {
@@ -2478,7 +2673,7 @@ function calcCellWidth($xeTable) {
 }
 function handleUpdateColResize($xeTable, evnt, params) {
   $xeTable.analyColumnWidth();
-  $xeTable.recalculate(true).then(() => {
+  $xeTable.recalculate().then(() => {
     $xeTable.saveCustomStore('update:width');
     $xeTable.updateCellAreas();
     $xeTable.dispatchEvent('column-resizable-change', params, evnt);
@@ -2490,7 +2685,7 @@ function handleUpdateColResize($xeTable, evnt, params) {
 function handleUpdateRowResize($xeTable, evnt, params) {
   const reactData = $xeTable;
   reactData.resizeHeightFlag++;
-  $xeTable.recalculate(true).then(() => {
+  $xeTable.recalculate().then(() => {
     $xeTable.updateCellAreas();
     $xeTable.dispatchEvent('row-resizable-change', params, evnt);
     setTimeout(() => $xeTable.recalculate(true), 300);
@@ -2515,21 +2710,24 @@ function updateRowOffsetTop($xeTable) {
   const reactData = $xeTable;
   const internalData = $xeTable;
   const {
-    expandColumn,
-    rowExpandedMaps
+    expandColumn
   } = reactData;
   const {
     afterFullData,
-    fullAllDataRowIdData
+    fullAllDataRowIdData,
+    rowExpandedMaps
   } = internalData;
   const expandOpts = $xeTable.computeExpandOpts;
   const rowOpts = $xeTable.computeRowOpts;
   const cellOpts = $xeTable.computeCellOpts;
   const defaultRowHeight = $xeTable.computeDefaultRowHeight;
+  const {
+    handleGetRowId
+  } = (0, _util.createHandleGetRowId)($xeTable);
   let offsetTop = 0;
   for (let rIndex = 0, rLen = afterFullData.length; rIndex < rLen; rIndex++) {
     const row = afterFullData[rIndex];
-    const rowid = (0, _util.getRowid)($xeTable, row);
+    const rowid = handleGetRowId(row);
     const rowRest = fullAllDataRowIdData[rowid] || {};
     rowRest.oTop = offsetTop;
     offsetTop += rowRest.resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight;
@@ -2545,7 +2743,8 @@ function updateRowExpandStyle($xeTable) {
   const {
     expandColumn,
     scrollYLoad,
-    rowExpandedMaps
+    scrollYTop,
+    isScrollYBig
   } = reactData;
   const expandOpts = $xeTable.computeExpandOpts;
   const rowOpts = $xeTable.computeRowOpts;
@@ -2557,41 +2756,35 @@ function updateRowExpandStyle($xeTable) {
   if (expandColumn && mode === 'fixed') {
     const {
       elemStore,
-      afterFullData,
       fullAllDataRowIdData
     } = internalData;
     const rowExpandEl = $xeTable.$refs.refRowExpandElem;
     const bodyScrollElem = (0, _util.getRefElem)(elemStore['main-body-scroll']);
     if (rowExpandEl && bodyScrollElem) {
       let isUpdateHeight = false;
-      if (scrollYLoad) {
-        let offsetTop = 0;
-        for (let rIndex = 0, rLen = afterFullData.length; rIndex < rLen; rIndex++) {
-          const row = afterFullData[rIndex];
-          const rowid = (0, _util.getRowid)($xeTable, row);
-          const rowRest = fullAllDataRowIdData[rowid] || {};
-          rowRest.oTop = offsetTop;
-          offsetTop += rowRest.resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight;
-          // 是否展开行
-          if (expandColumn && rowExpandedMaps[rowid]) {
-            offsetTop += rowRest.expandHeight || expandOpts.height || 0;
-          }
-        }
-      }
       _xeUtils.default.arrayEach(rowExpandEl.children, reEl => {
         const expandEl = reEl;
         const rowid = expandEl.getAttribute('rowid') || '';
         const rowRest = fullAllDataRowIdData[rowid];
         if (rowRest) {
           const expandHeight = expandEl.offsetHeight + 1;
+          const trEl = bodyScrollElem.querySelector(`.vxe-body--row[rowid="${rowid}"]`);
+          let offsetTop = 0;
           if (scrollYLoad) {
-            expandEl.style.top = (0, _dom.toCssUnit)(rowRest.oTop + (rowRest.resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight));
+            if (isScrollYBig && trEl) {
+              offsetTop = trEl.offsetTop + trEl.offsetHeight;
+            } else {
+              offsetTop = rowRest.oTop + (rowRest.resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight);
+            }
           } else {
-            const trEl = bodyScrollElem.querySelector(`.vxe-body--row[rowid="${rowid}"]`);
             if (trEl) {
-              expandEl.style.top = (0, _dom.toCssUnit)(trEl.offsetTop + trEl.offsetHeight);
+              offsetTop = trEl.offsetTop + trEl.offsetHeight;
             }
           }
+          if (isScrollYBig) {
+            offsetTop += scrollYTop;
+          }
+          expandEl.style.top = (0, _dom.toCssUnit)(offsetTop);
           if (!isUpdateHeight) {
             if (rowRest.expandHeight !== expandHeight) {
               isUpdateHeight = true;
@@ -2602,6 +2795,9 @@ function updateRowExpandStyle($xeTable) {
       });
       if (isUpdateHeight) {
         reactData.rowExpandHeightFlag++;
+        $xeTable.$nextTick(() => {
+          updateRowOffsetTop($xeTable);
+        });
       }
     }
   }
@@ -2619,12 +2815,11 @@ function handleRowExpandScroll($xeTable) {
 }
 const Methods = {
   callSlot(slotFunc, params, h, vNodes) {
+    const $xeTable = this;
+    const $xeGrid = $xeTable.$xeGrid;
     if (slotFunc) {
-      const {
-        $xegrid
-      } = this;
-      if ($xegrid) {
-        return $xegrid.callSlot(slotFunc, params, h, vNodes);
+      if ($xeGrid) {
+        return $xeGrid.callSlot(slotFunc, params, h, vNodes);
       }
       if (_xeUtils.default.isFunction(slotFunc)) {
         return (0, _vn.getSlotVNs)(slotFunc.call(this, params, h, vNodes));
@@ -2640,11 +2835,12 @@ const Methods = {
    * 获取父容器元素
    */
   getParentElem() {
+    const $xeTable = this;
+    const $xeGrid = $xeTable.$xeGrid;
     const {
-      $el,
-      $xegrid
+      $el
     } = this;
-    return $xegrid ? $xegrid.$el.parentNode : $el.parentNode;
+    return $xeGrid ? $xeGrid.$el.parentNode : $el.parentNode;
   },
   /**
    * 获取父容器的高度
@@ -2678,10 +2874,9 @@ const Methods = {
    * 如果存在表尾合计滚动条，则需要排除滚动条高度
    */
   getExcludeHeight() {
-    const {
-      $xegrid
-    } = this;
-    return $xegrid ? $xegrid.getExcludeHeight() : 0;
+    const $xeTable = this;
+    const $xeGrid = $xeTable.$xeGrid;
+    return $xeGrid ? $xeGrid.getExcludeHeight() : 0;
   },
   /**
    * 重置表格的一切数据状态
@@ -2780,6 +2975,9 @@ const Methods = {
     const childrenField = treeOpts.children || treeOpts.childrenField;
     let treeData = [];
     let fullData = datas ? datas.slice(0) : [];
+    if (fullData.length > supportMaxRow) {
+      (0, _log.errLog)('vxe.error.errMaxRow', [supportMaxRow]);
+    }
     if (treeConfig) {
       // 树结构自动转换
       if (treeOpts.transform) {
@@ -3022,13 +3220,11 @@ const Methods = {
     const {
       treeConfig
     } = props;
-    const {
-      treeExpandedMaps
-    } = reactData;
     const {
       fullAllDataRowIdData,
       tableFullData,
-      tableFullTreeData
+      tableFullTreeData,
+      treeExpandedMaps
     } = internalData;
     const treeOpts = $xeTable.computeTreeOpts;
     const childrenField = treeOpts.children || treeOpts.childrenField;
@@ -3036,12 +3232,11 @@ const Methods = {
     const {
       lazy
     } = treeOpts;
-    const rowkey = (0, _util.getRowkey)($xeTable);
-    const isDeepKey = rowkey.indexOf('.') > -1;
     const fullAllDataRowIdMaps = Object.assign({}, fullAllDataRowIdData); // 存在已删除数据
     const fullDataRowIdMaps = {};
-    const treeTempExpandedMaps = Object.assign({}, treeExpandedMaps);
-    const handleRowId = isDeepKey ? _util.updateDeepRowKey : _util.updateFastRowKey;
+    const {
+      handleUpdateRowId
+    } = (0, _util.createHandleUpdateRowId)($xeTable);
     const handleRowCache = (row, index, items, currIndex, parentRow, rowid, level, seq) => {
       let rowRest = fullAllDataRowIdMaps[rowid];
       if (!rowRest) {
@@ -3061,8 +3256,6 @@ const Methods = {
           oTop: 0,
           expandHeight: 0
         };
-        fullDataRowIdMaps[rowid] = rowRest;
-        fullAllDataRowIdMaps[rowid] = rowRest;
       }
       rowRest.treeLoaded = false;
       rowRest.expandLoaded = false;
@@ -3072,18 +3265,19 @@ const Methods = {
       rowRest.level = level;
       rowRest.index = currIndex;
       rowRest.treeIndex = index;
+      fullDataRowIdMaps[rowid] = rowRest;
+      fullAllDataRowIdMaps[rowid] = rowRest;
     };
     if (treeConfig) {
       _xeUtils.default.eachTree(tableFullTreeData, (row, index, items, path, parentRow, nodes) => {
-        const rowid = handleRowId(row, rowkey);
+        const rowid = handleUpdateRowId(row);
         if (treeConfig && lazy) {
-          const treeExpRest = treeTempExpandedMaps[rowid];
           if (row[hasChildField] && row[childrenField] === undefined) {
             row[childrenField] = null;
           }
-          if (treeExpRest) {
+          if (treeExpandedMaps[rowid]) {
             if (!row[childrenField] || !row[childrenField].length) {
-              delete treeTempExpandedMaps[rowid];
+              delete treeExpandedMaps[rowid];
             }
           }
         }
@@ -3093,32 +3287,29 @@ const Methods = {
       });
     } else {
       tableFullData.forEach((row, index, items) => {
-        handleRowCache(row, index, items, index, null, handleRowId(row, rowkey), 0, index + 1);
+        handleRowCache(row, index, items, index, null, handleUpdateRowId(row), 0, index + 1);
       });
     }
     internalData.fullDataRowIdData = fullDataRowIdMaps;
     internalData.fullAllDataRowIdData = fullAllDataRowIdMaps;
-    reactData.treeExpandedMaps = treeTempExpandedMaps;
+    reactData.treeExpandedFlag++;
   },
   cacheSourceMap(fullData) {
-    let {
-      treeConfig,
-      treeOpts,
-      sourceDataRowIdData
-    } = this;
+    const $xeTable = this;
+    const props = $xeTable;
+    const internalData = $xeTable;
+    const {
+      treeConfig
+    } = props;
+    const treeOpts = $xeTable.computeTreeOpts;
     const sourceData = _xeUtils.default.clone(fullData, true);
-    const rowkey = (0, _util.getRowkey)(this);
-    sourceDataRowIdData = this.sourceDataRowIdData = {};
+    const {
+      handleUpdateRowId
+    } = (0, _util.createHandleUpdateRowId)($xeTable);
+    const sourceRowIdData = {};
     const handleSourceRow = row => {
-      let rowid = (0, _util.getRowid)(this, row);
-      if ((0, _utils.eqEmptyValue)(rowid)) {
-        rowid = (0, _util.getRowUniqueId)();
-        _xeUtils.default.set(row, rowkey, rowid);
-      }
-      sourceDataRowIdData[rowid] = {
-        row,
-        rowid
-      };
+      const rowid = handleUpdateRowId(row);
+      sourceRowIdData[rowid] = row;
     };
     // 源数据缓存
     if (treeConfig) {
@@ -3129,7 +3320,8 @@ const Methods = {
     } else {
       sourceData.forEach(handleSourceRow);
     }
-    this.tableSourceData = sourceData;
+    internalData.sourceDataRowIdData = sourceRowIdData;
+    internalData.tableSourceData = sourceData;
   },
   getParams() {
     return this.params;
@@ -3249,76 +3441,28 @@ const Methods = {
    * 根据 row 获取序号
    * @param {Row} row 行对象
    */
-  getRowSeq(row) {
-    const {
-      fullAllDataRowIdData
-    } = this;
-    if (row) {
-      const rowid = (0, _util.getRowid)(this, row);
-      const rest = fullAllDataRowIdData[rowid];
-      if (rest) {
-        return rest.seq;
-      }
-    }
-    return -1;
-  },
+  getRowSeq: createGetRowCacheProp('seq'),
   /**
    * 根据 row 获取相对于 data 中的索引
    * @param {Row} row 行对象
    */
-  getRowIndex(row) {
-    const {
-      fullAllDataRowIdData
-    } = this;
-    if (row) {
-      const rowid = (0, _util.getRowid)(this, row);
-      const rest = fullAllDataRowIdData[rowid];
-      if (rest) {
-        return rest.index;
-      }
-    }
-    return -1;
-  },
+  getRowIndex: createGetRowCacheProp('index'),
   /**
    * 根据 row 获取相对于当前数据中的索引
    * @param {Row} row 行对象
    */
-  getVTRowIndex(row) {
-    const {
-      fullAllDataRowIdData
-    } = this;
-    if (row) {
-      const rowid = (0, _util.getRowid)(this, row);
-      const rest = fullAllDataRowIdData[rowid];
-      if (rest) {
-        return rest._index;
-      }
-    }
-    return -1;
-  },
-  // 在 v3 中废弃
-  _getRowIndex(row) {
-    if (process.env.NODE_ENV === 'development') {
-      (0, _log.warnLog)('vxe.error.delFunc', ['_getRowIndex', 'getVTRowIndex']);
-    }
-    return this.getVTRowIndex(row);
-  },
+  getVTRowIndex: createGetRowCacheProp('_index'),
   /**
-   * 根据 row 获取渲染中的虚拟索引
-   * @param {Row} row 行对象
-   */
-  getVMRowIndex(row) {
-    const {
-      fullAllDataRowIdData
-    } = this;
-    if (row) {
-      const rowid = (0, _util.getRowid)(this, row);
-      const rest = fullAllDataRowIdData[rowid];
-      if (rest) {
-        return rest.$index;
-      }
+   * 根据 row 获取渲染中的虚拟索引
+   * @param {Row} row 行对象
+   */
+  getVMRowIndex: createGetRowCacheProp('$index'),
+  // 在 v3 中废弃
+  _getRowIndex(row) {
+    if (process.env.NODE_ENV === 'development') {
+      (0, _log.warnLog)('vxe.error.delFunc', ['_getRowIndex', 'getVTRowIndex']);
     }
-    return -1;
+    return this.getVTRowIndex(row);
   },
   // 在 v3 中废弃
   $getRowIndex(row) {
@@ -3331,34 +3475,17 @@ const Methods = {
    * 根据 column 获取相对于 columns 中的索引
    * @param {ColumnInfo} column 列配置
    */
-  getColumnIndex(column) {
-    const {
-      fullColumnIdData
-    } = this;
-    if (column) {
-      const rest = fullColumnIdData[column.id];
-      if (rest) {
-        return rest.index;
-      }
-    }
-    return -1;
-  },
+  getColumnIndex: createGetColumnCacheProp('index'),
   /**
    * 根据 column 获取相对于当前表格列中的索引
    * @param {ColumnInfo} column 列配置
    */
-  getVTColumnIndex(column) {
-    const {
-      fullColumnIdData
-    } = this;
-    if (column) {
-      const rest = fullColumnIdData[column.id];
-      if (rest) {
-        return rest._index;
-      }
-    }
-    return -1;
-  },
+  getVTColumnIndex: createGetColumnCacheProp('_index'),
+  /**
+   * 根据 column 获取渲染中的虚拟索引
+   * @param {ColumnInfo} column 列配置
+   */
+  getVMColumnIndex: createGetColumnCacheProp('$index'),
   // 在 v3 中废弃
   _getColumnIndex(column) {
     if (process.env.NODE_ENV === 'development') {
@@ -3366,22 +3493,6 @@ const Methods = {
     }
     return this.getVTColumnIndex(column);
   },
-  /**
-   * 根据 column 获取渲染中的虚拟索引
-   * @param {ColumnInfo} column 列配置
-   */
-  getVMColumnIndex(column) {
-    const {
-      fullColumnIdData
-    } = this;
-    if (column) {
-      const rest = fullColumnIdData[column.id];
-      if (rest) {
-        return rest.$index;
-      }
-    }
-    return -1;
-  },
   // 在 v3 中废弃
   $getColumnIndex(column) {
     if (process.env.NODE_ENV === 'development') {
@@ -3490,6 +3601,9 @@ const Methods = {
       keepSource,
       treeConfig
     } = props;
+    const {
+      editStore
+    } = reactData;
     const {
       fullAllDataRowIdData,
       fullDataRowIdData,
@@ -3498,10 +3612,14 @@ const Methods = {
       tableFullData,
       afterFullData
     } = internalData;
+    const removeTempMaps = Object.assign({}, editStore.removeMaps);
     const treeOpts = $xeTable.computeTreeOpts;
     const {
       transform
     } = treeOpts;
+    const {
+      handleGetRowId
+    } = (0, _util.createHandleGetRowId)($xeTable);
     if (!keepSource) {
       if (process.env.NODE_ENV === 'development') {
         (0, _log.errLog)('vxe.error.reqProp', ['keep-source']);
@@ -3519,7 +3637,7 @@ const Methods = {
     let reDelFlag = false;
     if (targetRows.length) {
       targetRows.forEach(item => {
-        const rowid = (0, _util.getRowid)($xeTable, item);
+        const rowid = handleGetRowId(item);
         const rowRest = fullAllDataRowIdData[rowid];
         if (rowRest) {
           const row = rowRest.row;
@@ -3532,6 +3650,7 @@ const Methods = {
                 _xeUtils.default.destructuring(row, _xeUtils.default.clone(oRow, true));
               }
               if (!fullDataRowIdData[rowid] && $xeTable.isRemoveByRow(row)) {
+                delete removeTempMaps[rowid];
                 tableFullData.unshift(row);
                 afterFullData.unshift(row);
                 reDelFlag = true;
@@ -3543,6 +3662,7 @@ const Methods = {
     }
     if (rows) {
       if (reDelFlag) {
+        editStore.removeMaps = removeTempMaps;
         $xeTable.updateFooter();
         $xeTable.cacheRowMap(false);
         $xeTable.handleTableData(treeConfig && transform);
@@ -3939,21 +4059,18 @@ const Methods = {
   getCheckboxRecords(isFull) {
     const $xeTable = this;
     const props = $xeTable;
-    const reactData = $xeTable;
     const internalData = $xeTable;
     const {
       treeConfig
     } = props;
-    const {
-      selectCheckboxMaps
-    } = reactData;
     const {
       tableFullData,
       afterFullData,
       afterTreeFullData,
       tableFullTreeData,
       fullDataRowIdData,
-      afterFullRowMaps
+      afterFullRowMaps,
+      selectCheckboxMaps
     } = internalData;
     const treeOpts = $xeTable.computeTreeOpts;
     const checkboxOpts = $xeTable.computeCheckboxOpts;
@@ -4018,6 +4135,7 @@ const Methods = {
       mapChildrenField
     } = treeOpts;
     const {
+      isEvery,
       remote: allRemoteFilter,
       filterMethod: allFilterMethod
     } = filterOpts;
@@ -4130,7 +4248,7 @@ const Methods = {
           // 筛选虚拟树
           tableTree = _xeUtils.default.searchTree(tableFullTreeData, handleFilter, {
             original: true,
-            isEvery: true,
+            isEvery,
             children: mapChildrenField,
             mapChildren: childrenField
           });
@@ -4144,7 +4262,7 @@ const Methods = {
           // 还原虚拟树
           tableTree = _xeUtils.default.searchTree(tableFullTreeData, () => true, {
             original: true,
-            isEvery: true,
+            isEvery,
             children: mapChildrenField,
             mapChildren: childrenField
           });
@@ -4221,7 +4339,7 @@ const Methods = {
         // 还原虚拟树
         tableTree = _xeUtils.default.searchTree(tableFullTreeData, () => true, {
           original: true,
-          isEvery: true,
+          isEvery,
           children: treeOpts.mapChildrenField,
           mapChildren: childrenField
         });
@@ -4395,6 +4513,7 @@ const Methods = {
    * 默认执行一次，除非被重置
    */
   handleLoadDefaults() {
+    const $xeTable = this;
     if (this.checkboxConfig) {
       this.handleDefaultSelectionChecked();
     }
@@ -4405,7 +4524,7 @@ const Methods = {
       this.handleDefaultRowExpand();
     }
     if (this.treeConfig) {
-      this.handleDefaultTreeExpand();
+      handleDefaultTreeExpand($xeTable);
     }
     if (this.mergeCells) {
       this.handleDefaultMergeCells();
@@ -4603,9 +4722,9 @@ const Methods = {
     return this.refreshColumn(true);
   },
   handleCustomRestore(storeData) {
-    const $xetable = this;
-    const reactData = $xetable;
-    const internalData = $xetable;
+    const $xeTable = this;
+    const reactData = $xeTable;
+    const internalData = $xeTable;
     let {
       collectColumn
     } = internalData;
@@ -4690,14 +4809,26 @@ const Methods = {
     }
   },
   getCustomStoreData() {
+    const $xeTable = this;
+    const props = $xeTable;
+    const internalData = $xeTable;
+    const {
+      id
+    } = props;
+    const customOpts = $xeTable.computeCustomOpts;
     const {
-      id,
-      customOpts,
       collectColumn
-    } = this;
+    } = internalData;
     const {
+      storage,
       checkMethod
     } = customOpts;
+    const isAllCustom = storage === true;
+    const storageOpts = isAllCustom ? {} : Object.assign({}, storage || {});
+    const isCustomResizable = isAllCustom || storageOpts.resizable;
+    const isCustomVisible = isAllCustom || storageOpts.visible;
+    const isCustomFixed = isAllCustom || storageOpts.fixed;
+    const isCustomSort = isAllCustom || storageOpts.sort;
     const resizableData = {};
     const sortData = {};
     const visibleData = {};
@@ -4714,48 +4845,38 @@ const Methods = {
     }
     let hasResizable = 0;
     let hasSort = 0;
-    let hasFixedt = 0;
+    let hasFixed = 0;
     let hasVisible = 0;
     _xeUtils.default.eachTree(collectColumn, (column, index, items, path, parentColumn) => {
+      const colKey = column.getKey();
+      if (!colKey) {
+        (0, _log.errLog)('vxe.error.reqProp', [`${column.getTitle() || column.type || ''} -> column.field=?`]);
+        return;
+      }
       // 只支持一级
       if (!parentColumn) {
-        collectColumn.forEach(column => {
-          const colKey = column.getKey();
-          if (colKey) {
-            hasSort = 1;
-            sortData[colKey] = column.renderSortNumber;
-          }
-        });
-        if (column.fixed !== column.defaultFixed) {
-          const colKey = column.getKey();
-          if (colKey) {
-            hasFixedt = 1;
-            fixedData[colKey] = column.fixed;
-          }
+        if (isCustomSort) {
+          hasSort = 1;
+          sortData[colKey] = column.renderSortNumber;
         }
-      }
-      if (column.resizeWidth) {
-        const colKey = column.getKey();
-        if (colKey) {
-          hasResizable = 1;
-          resizableData[colKey] = column.renderWidth;
+        if (isCustomFixed && column.fixed !== column.defaultFixed) {
+          hasFixed = 1;
+          fixedData[colKey] = column.fixed;
         }
       }
-      if (!checkMethod || checkMethod({
+      if (isCustomResizable && column.resizeWidth) {
+        hasResizable = 1;
+        resizableData[colKey] = column.renderWidth;
+      }
+      if (isCustomVisible && (!checkMethod || checkMethod({
         column
-      })) {
+      }))) {
         if (!column.visible && column.defaultVisible) {
-          const colKey = column.getKey();
-          if (colKey) {
-            hasVisible = 1;
-            visibleData[colKey] = false;
-          }
+          hasVisible = 1;
+          visibleData[colKey] = false;
         } else if (column.visible && !column.defaultVisible) {
-          const colKey = column.getKey();
-          if (colKey) {
-            hasVisible = 1;
-            visibleData[colKey] = true;
-          }
+          hasVisible = 1;
+          visibleData[colKey] = true;
         }
       }
     });
@@ -4765,7 +4886,7 @@ const Methods = {
     if (hasSort) {
       storeData.sortData = sortData;
     }
-    if (hasFixedt) {
+    if (hasFixed) {
       storeData.fixedData = fixedData;
     }
     if (hasVisible) {
@@ -5313,12 +5434,15 @@ const Methods = {
       fullAllDataRowIdData,
       afterFullData
     } = internalData;
+    const {
+      handleGetRowId
+    } = (0, _util.createHandleGetRowId)($xeTable);
     const rowOpts = $xeTable.computeRowOpts;
     const cellOpts = $xeTable.computeCellOpts;
     const defaultRowHeight = $xeTable.computeDefaultRowHeight;
     const rest = {};
     afterFullData.forEach(row => {
-      const rowid = (0, _util.getRowid)($xeTable, row);
+      const rowid = handleGetRowId(row);
       const rowRest = fullAllDataRowIdData[rowid];
       if (rowRest) {
         const resizeHeight = rowRest.resizeHeight;
@@ -5347,8 +5471,11 @@ const Methods = {
       rHeight = Math.floor(rHeight * bodyHeight);
     }
     if (rHeight) {
+      const {
+        handleGetRowId
+      } = (0, _util.createHandleGetRowId)($xeTable);
       rows.forEach(row => {
-        const rowid = _xeUtils.default.isString(row) || _xeUtils.default.isNumber(row) ? row : (0, _util.getRowid)($xeTable, row);
+        const rowid = _xeUtils.default.isString(row) || _xeUtils.default.isNumber(row) ? row : handleGetRowId(row);
         const rowRest = fullAllDataRowIdData[rowid];
         if (rowRest) {
           rowRest.resizeHeight = rHeight;
@@ -5496,6 +5623,8 @@ const Methods = {
     }
   },
   preventEvent(evnt, type, args, next, end) {
+    const $xeTable = this;
+    const $xeGrid = $xeTable.$xeGrid;
     let evntList = interceptor.get(type);
     // 兼容老版本
     if (!evntList.length && type === 'event.clearEdit') {
@@ -5507,12 +5636,25 @@ const Methods = {
       }
     }
     // 兼容老版本
-    let rest;
-    if (!evntList.some(func => func(Object.assign({
-      $grid: this.$xegrid,
-      $table: this,
-      $event: evnt
-    }, args)) === false)) {
+    let rest = null;
+    let isStop = false;
+    for (let i = 0; i < evntList.length; i++) {
+      const func = evntList[i];
+      const fnRest = func(Object.assign({
+        $grid: $xeGrid,
+        $table: $xeTable,
+        $event: evnt
+      }, args));
+      if (fnRest === false) {
+        isStop = true;
+        break;
+      } else if (fnRest && fnRest.status === false) {
+        rest = fnRest.result;
+        isStop = true;
+        break;
+      }
+    }
+    if (!isStop) {
       if (next) {
         rest = next();
       }
@@ -5526,10 +5668,11 @@ const Methods = {
    * 全局按下事件处理
    */
   handleGlobalMousedownEvent(evnt) {
+    const $xeTable = this;
+    const $xeGrid = $xeTable.$xeGrid;
     const {
       $el,
       $refs,
-      $xegrid,
       $toolbar,
       mouseConfig,
       editStore,
@@ -5629,7 +5772,7 @@ const Methods = {
         }
       }
     } else if (mouseConfig) {
-      if (!(0, _dom.getEventTargetNode)(evnt, $el).flag && !($xegrid && (0, _dom.getEventTargetNode)(evnt, $xegrid.$el).flag) && !(tableMenu && (0, _dom.getEventTargetNode)(evnt, tableMenu.$el).flag) && !($toolbar && (0, _dom.getEventTargetNode)(evnt, $toolbar.$el).flag)) {
+      if (!(0, _dom.getEventTargetNode)(evnt, $el).flag && !($xeGrid && (0, _dom.getEventTargetNode)(evnt, $xeGrid.$el).flag) && !(tableMenu && (0, _dom.getEventTargetNode)(evnt, tableMenu.$el).flag) && !($toolbar && (0, _dom.getEventTargetNode)(evnt, $toolbar.$el).flag)) {
         if (this.clearSelected) {
           this.clearSelected();
         }
@@ -5653,7 +5796,7 @@ const Methods = {
     if (ctxMenuStore.visible && tableMenu && !(0, _dom.getEventTargetNode)(evnt, tableMenu.$el).flag) {
       this.closeMenu();
     }
-    const isActivated = (0, _dom.getEventTargetNode)(evnt, ($xegrid || this).$el).flag;
+    const isActivated = (0, _dom.getEventTargetNode)(evnt, ($xeGrid || this).$el).flag;
     // 如果存在校验，点击了表格之外则清除
     if (!isActivated && editRules && validOpts.autoClear) {
       this.validErrorMaps = {};
@@ -5728,6 +5871,7 @@ const Methods = {
   handleGlobalKeydownEvent(evnt) {
     const $xeTable = this;
     const internalData = $xeTable;
+    const $xeGrid = $xeTable.$xeGrid;
     // 该行为只对当前激活的表格有效
     if (this.isActivated) {
       this.preventEvent(evnt, 'event.keydown', null, () => {
@@ -5845,7 +5989,7 @@ const Methods = {
                 if (keyboardOpts.enterToTab) {
                   this.moveTabSelected(activeParams, hasShiftKey, evnt);
                 } else {
-                  this.moveSelected(activeParams, isLeftArrow, true, isRightArrow, false, evnt);
+                  this.moveEnterSelected(activeParams, isLeftArrow, true, isRightArrow, false, evnt);
                 }
               } else {
                 if (keyboardOpts.enterToTab) {
@@ -5881,7 +6025,7 @@ const Methods = {
                         return;
                       }
                     }
-                    this.moveSelected(activeParams, isLeftArrow, false, isRightArrow, true, evnt);
+                    this.moveEnterSelected(activeParams, isLeftArrow, false, isRightArrow, true, evnt);
                     if (enterMethod) {
                       enterMethod(etrParams);
                     }
@@ -5906,10 +6050,7 @@ const Methods = {
           if (!isEditStatus) {
             // 如果按下了方向键
             if (selected.row && selected.column) {
-              this.moveSelected(selected.args, isLeftArrow, isUpArrow, isRightArrow, isDwArrow, evnt);
-            } else if ((isUpArrow || isDwArrow) && (rowOpts.isCurrent || highlightCurrentRow)) {
-              // 当前行按键上下移动
-              this.moveCurrentRow(isUpArrow, isDwArrow, evnt);
+              $xeTable.moveArrowSelected(selected.args, isLeftArrow, isUpArrow, isRightArrow, isDwArrow, evnt);
             }
           }
         } else if (isTab && keyboardConfig && keyboardOpts.isTab) {
@@ -5931,7 +6072,7 @@ const Methods = {
               column: selected.column,
               columnIndex: this.getColumnIndex(selected.column),
               $table: this,
-              $grid: this.$xegrid
+              $grid: $xeGrid
             };
             // 是否被禁用
             if (!beforeEditMethod || beforeEditMethod(params)) {
@@ -5959,7 +6100,7 @@ const Methods = {
                 column: selected.column,
                 columnIndex: this.getColumnIndex(selected.column),
                 $table: this,
-                $grid: this.$xegrid
+                $grid: $xeGrid
               };
               // 是否被禁用
               if (!beforeEditMethod || beforeEditMethod(params)) {
@@ -5990,7 +6131,7 @@ const Methods = {
               rowIndex: this.getRowIndex(parentRow),
               $rowIndex: this.getVMRowIndex(parentRow),
               $table: this,
-              $grid: this.$xegrid
+              $grid: $xeGrid
             };
             this.setTreeExpand(parentRow, false).then(() => this.scrollToRow(parentRow)).then(() => this.triggerCurrentRowEvent(evnt, params));
           }
@@ -6011,7 +6152,7 @@ const Methods = {
               column: selected.column,
               columnIndex: this.getColumnIndex(selected.column),
               $table: this,
-              $grid: this.$xegrid
+              $grid: $xeGrid
             };
             if (!beforeEditMethod || beforeEditMethod(params)) {
               if (editMethod) {
@@ -6168,7 +6309,7 @@ const Methods = {
       return;
     }
     if (tooltipStore.column !== column || !tooltipStore.visible) {
-      handleTooltip($xeTable, evnt, thEl, cellEl, null, params);
+      handleTooltip($xeTable, evnt, thEl, thEl.querySelector('.vxe-cell--title') || cellEl, params);
     }
   },
   /**
@@ -6209,7 +6350,7 @@ const Methods = {
       }
     }
     if (tooltipStore.column !== column || tooltipStore.row !== row || !tooltipStore.visible) {
-      handleTooltip($xeTable, evnt, tdEl, tdEl.querySelector('.vxe-cell--wrapper'), null, params);
+      handleTooltip($xeTable, evnt, tdEl, tdEl.querySelector('.vxe-cell--label') || tdEl.querySelector('.vxe-cell--wrapper'), params);
     }
   },
   /**
@@ -6224,10 +6365,10 @@ const Methods = {
     const {
       tooltipStore
     } = reactData;
-    const cell = evnt.currentTarget;
+    const tdEl = evnt.currentTarget;
     handleTargetEnterEvent($xeTable, tooltipStore.column !== column || !!tooltipStore.row);
     if (tooltipStore.column !== column || !tooltipStore.visible) {
-      handleTooltip($xeTable, evnt, cell, cell.querySelector('.vxe-cell--wrapper') || cell.children[0], null, params);
+      handleTooltip($xeTable, evnt, tdEl, tdEl.querySelector('.vxe-cell--label') || tdEl.querySelector('.vxe-cell--wrapper'), params);
     }
   },
   openTooltip(target, content) {
@@ -6288,15 +6429,20 @@ const Methods = {
    * 获取复选框半选状态的行数据
    */
   getCheckboxIndeterminateRecords(isFull) {
+    const $xeTable = this;
+    const props = $xeTable;
+    const internalData = $xeTable;
     const {
-      treeConfig,
-      treeIndeterminateMaps,
-      fullDataRowIdData
-    } = this;
+      treeConfig
+    } = props;
+    const {
+      fullDataRowIdData,
+      treeIndeterminateRowMaps
+    } = internalData;
     if (treeConfig) {
       const fullRest = [];
       const defRest = [];
-      _xeUtils.default.each(treeIndeterminateMaps, (item, rowid) => {
+      _xeUtils.default.each(treeIndeterminateRowMaps, (item, rowid) => {
         if (item) {
           fullRest.push(item);
           if (fullDataRowIdData[rowid]) {
@@ -6373,9 +6519,13 @@ const Methods = {
   isCheckedByCheckboxRow(row) {
     const $xeTable = this;
     const reactData = $xeTable;
+    const internalData = $xeTable;
     const {
-      selectCheckboxMaps
+      updateCheckboxFlag
     } = reactData;
+    const {
+      selectCheckboxMaps
+    } = internalData;
     const checkboxOpts = $xeTable.computeCheckboxOpts;
     const {
       checkField
@@ -6383,17 +6533,18 @@ const Methods = {
     if (checkField) {
       return _xeUtils.default.get(row, checkField);
     }
-    return !!selectCheckboxMaps[(0, _util.getRowid)($xeTable, row)];
+    return !!updateCheckboxFlag && !!selectCheckboxMaps[(0, _util.getRowid)($xeTable, row)];
   },
   isCheckedByCheckboxRowKey(rowid) {
     const $xeTable = this;
     const reactData = $xeTable;
     const internalData = $xeTable;
     const {
-      selectCheckboxMaps
+      updateCheckboxFlag
     } = reactData;
     const {
-      fullAllDataRowIdData
+      fullAllDataRowIdData,
+      selectCheckboxMaps
     } = internalData;
     const checkboxOpts = $xeTable.computeCheckboxOpts;
     const {
@@ -6406,23 +6557,23 @@ const Methods = {
       }
       return false;
     }
-    return !!selectCheckboxMaps[rowid];
+    return !!updateCheckboxFlag && !!selectCheckboxMaps[rowid];
   },
   isIndeterminateByCheckboxRow(row) {
     const $xeTable = this;
-    const reactData = $xeTable;
+    const internalData = $xeTable;
     const {
-      treeIndeterminateMaps
-    } = reactData;
-    return !!treeIndeterminateMaps[(0, _util.getRowid)($xeTable, row)] && !$xeTable.isCheckedByCheckboxRow(row);
+      treeIndeterminateRowMaps
+    } = internalData;
+    return !!treeIndeterminateRowMaps[(0, _util.getRowid)($xeTable, row)] && !$xeTable.isCheckedByCheckboxRow(row);
   },
   isIndeterminateByCheckboxRowKey(rowid) {
     const $xeTable = this;
-    const reactData = $xeTable;
+    const internalData = $xeTable;
     const {
-      treeIndeterminateMaps
-    } = reactData;
-    return !!treeIndeterminateMaps[rowid] && !$xeTable.isCheckedByCheckboxRowKey(rowid);
+      treeIndeterminateRowMaps
+    } = internalData;
+    return !!treeIndeterminateRowMaps[rowid] && !$xeTable.isCheckedByCheckboxRowKey(rowid);
   },
   /**
    * 切换选中
@@ -6432,13 +6583,13 @@ const Methods = {
     const $xeTable = this;
     const props = $xeTable;
     const reactData = $xeTable;
+    const internalData = $xeTable;
     const {
       treeConfig
     } = props;
     const {
       selectCheckboxMaps
-    } = reactData;
-    const selectRowMaps = Object.assign({}, selectCheckboxMaps);
+    } = internalData;
     const treeOpts = $xeTable.computeTreeOpts;
     const {
       transform,
@@ -6451,6 +6602,9 @@ const Methods = {
       checkStrictly,
       checkMethod
     } = checkboxOpts;
+    const {
+      handleGetRowId
+    } = (0, _util.createHandleGetRowId)($xeTable);
     // indeterminateField 仅支持读取
     const indeterminateField = checkboxOpts.indeterminateField || checkboxOpts.halfField;
     if (checkField) {
@@ -6470,35 +6624,34 @@ const Methods = {
         }, {
           children: transform ? mapChildrenField : childrenField
         });
-        reactData.selectCheckboxMaps = selectRowMaps;
+        reactData.updateCheckboxFlag++;
         return;
-      } else {
-        // 列表
-        rows.forEach(row => {
-          if (isForce || !checkMethod || checkMethod({
-            row
-          })) {
-            _xeUtils.default.set(row, checkField, checked);
-            handleCheckboxReserveRow($xeTable, row, checked);
-          }
-        });
       }
-      reactData.selectCheckboxMaps = selectRowMaps;
+      // 列表
+      rows.forEach(row => {
+        if (isForce || !checkMethod || checkMethod({
+          row
+        })) {
+          _xeUtils.default.set(row, checkField, checked);
+          handleCheckboxReserveRow($xeTable, row, checked);
+        }
+      });
+      reactData.updateCheckboxFlag++;
       return;
     }
     // 树结构
     if (treeConfig && !checkStrictly) {
       // 更新子节点状态
       _xeUtils.default.eachTree(rows, row => {
-        const rowid = (0, _util.getRowid)($xeTable, row);
+        const rowid = handleGetRowId(row);
         if (isForce || !checkMethod || checkMethod({
           row
         })) {
           if (checked) {
-            selectRowMaps[rowid] = row;
+            selectCheckboxMaps[rowid] = row;
           } else {
-            if (selectRowMaps[rowid]) {
-              delete selectRowMaps[rowid];
+            if (selectCheckboxMaps[rowid]) {
+              delete selectCheckboxMaps[rowid];
             }
           }
           handleCheckboxReserveRow($xeTable, row, checked);
@@ -6506,28 +6659,28 @@ const Methods = {
       }, {
         children: transform ? mapChildrenField : childrenField
       });
-      reactData.selectCheckboxMaps = selectRowMaps;
+      reactData.updateCheckboxFlag++;
       return;
     }
     // 列表
     rows.forEach(row => {
-      const rowid = (0, _util.getRowid)($xeTable, row);
+      const rowid = handleGetRowId(row);
       if (isForce || !checkMethod || checkMethod({
         row
       })) {
         if (checked) {
-          if (!selectRowMaps[rowid]) {
-            selectRowMaps[rowid] = row;
+          if (!selectCheckboxMaps[rowid]) {
+            selectCheckboxMaps[rowid] = row;
           }
         } else {
-          if (selectRowMaps[rowid]) {
-            delete selectRowMaps[rowid];
+          if (selectCheckboxMaps[rowid]) {
+            delete selectCheckboxMaps[rowid];
           }
         }
         handleCheckboxReserveRow($xeTable, row, checked);
+        reactData.updateCheckboxFlag++;
       }
     });
-    reactData.selectCheckboxMaps = selectRowMaps;
   },
   /**
    * 即将移除
@@ -6540,10 +6693,12 @@ const Methods = {
     $xeTable.handleBatchSelectRows([row], checked, isForce);
   },
   handleToggleCheckRowEvent(evnt, params) {
+    const $xeTable = this;
+    const internalData = $xeTable;
     const {
-      selectCheckboxMaps,
-      checkboxOpts
-    } = this;
+      selectCheckboxMaps
+    } = internalData;
+    const checkboxOpts = $xeTable.computeCheckboxOpts;
     const {
       checkField,
       trigger
@@ -6558,43 +6713,47 @@ const Methods = {
     if (checkField) {
       checked = !_xeUtils.default.get(row, checkField);
     } else {
-      checked = !selectCheckboxMaps[(0, _util.getRowid)(this, row)];
+      checked = !selectCheckboxMaps[(0, _util.getRowid)($xeTable, row)];
     }
     if (evnt) {
-      this.triggerCheckRowEvent(evnt, params, checked);
+      $xeTable.triggerCheckRowEvent(evnt, params, checked);
     } else {
-      this.handleSelectRow(params, checked);
-      this.checkSelectionStatus();
+      $xeTable.handleBatchSelectRows([row], checked);
+      $xeTable.checkSelectionStatus();
     }
   },
   triggerCheckRowEvent(evnt, params, checked) {
     const $xeTable = this;
+    const props = $xeTable;
+    const internalData = $xeTable;
+    const {
+      row
+    } = params;
     const {
-      checkboxOpts,
       afterFullData
-    } = this;
+    } = internalData;
+    const checkboxOpts = $xeTable.computeCheckboxOpts;
     const {
       checkMethod,
       trigger
     } = checkboxOpts;
-    const {
-      row
-    } = params;
     if (trigger === 'manual') {
       return;
     }
     evnt.stopPropagation();
-    if (checkboxOpts.isShiftKey && evnt.shiftKey && !this.treeConfig) {
-      const checkboxRecords = this.getCheckboxRecords();
+    if (checkboxOpts.isShiftKey && evnt.shiftKey && !props.treeConfig) {
+      const checkboxRecords = $xeTable.getCheckboxRecords();
       if (checkboxRecords.length) {
         const firstRow = checkboxRecords[0];
-        const _rowIndex = this.getVTRowIndex(row);
-        const _firstRowIndex = this.getVTRowIndex(firstRow);
+        const _rowIndex = $xeTable.getVTRowIndex(row);
+        const _firstRowIndex = $xeTable.getVTRowIndex(firstRow);
         if (_rowIndex !== _firstRowIndex) {
-          this.setAllCheckboxRow(false);
+          $xeTable.setAllCheckboxRow(false);
           const rangeRows = _rowIndex < _firstRowIndex ? afterFullData.slice(_rowIndex, _firstRowIndex + 1) : afterFullData.slice(_firstRowIndex, _rowIndex + 1);
-          handleCheckedCheckboxRow($xeTable, rangeRows, true, false);
-          this.emitEvent('checkbox-range-select', Object.assign({
+          $xeTable.$nextTick(() => {
+            handleCheckedCheckboxRow($xeTable, rangeRows, true, false);
+          });
+          $xeTable.dispatchEvent('checkbox-range-select', Object.assign({
             rangeRecords: rangeRows
           }, params), evnt);
           return;
@@ -6604,12 +6763,12 @@ const Methods = {
     if (!checkMethod || checkMethod({
       row
     })) {
-      this.handleSelectRow(params, checked);
-      this.checkSelectionStatus();
-      this.emitEvent('checkbox-change', Object.assign({
-        records: this.getCheckboxRecords(),
-        reserves: this.getCheckboxReserveRecords(),
-        indeterminates: this.getCheckboxIndeterminateRecords(),
+      $xeTable.handleBatchSelectRows([row], checked);
+      $xeTable.checkSelectionStatus();
+      $xeTable.dispatchEvent('checkbox-change', Object.assign({
+        records: () => $xeTable.getCheckboxRecords(),
+        reserves: () => $xeTable.getCheckboxReserveRecords(),
+        indeterminates: () => $xeTable.getCheckboxIndeterminateRecords(),
         checked
       }, params), evnt);
     }
@@ -6619,10 +6778,11 @@ const Methods = {
    */
   toggleCheckboxRow(row) {
     const $xeTable = this;
+    const internalData = $xeTable;
     const {
-      selectCheckboxMaps,
-      checkboxOpts
-    } = this;
+      selectCheckboxMaps
+    } = internalData;
+    const checkboxOpts = $xeTable.computeCheckboxOpts;
     const {
       checkField
     } = checkboxOpts;
@@ -6649,10 +6809,8 @@ const Methods = {
     } = props;
     const {
       selectCheckboxMaps,
-      treeIndeterminateMaps
-    } = reactData;
-    const selectRowMaps = Object.assign({}, selectCheckboxMaps);
-    const halfRowMaps = Object.assign({}, treeIndeterminateMaps);
+      treeIndeterminateRowMaps
+    } = internalData;
     const treeOpts = $xeTable.computeTreeOpts;
     const {
       transform,
@@ -6673,10 +6831,13 @@ const Methods = {
     }
     // 树结构
     if (treeConfig) {
+      const {
+        handleGetRowId
+      } = (0, _util.createHandleGetRowId)($xeTable);
       const childRowMaps = {};
       const childRowList = [];
       _xeUtils.default.eachTree(afterTreeFullData, row => {
-        const rowid = (0, _util.getRowid)($xeTable, row);
+        const rowid = handleGetRowId(row);
         const childList = row[transform ? mapChildrenField : childrenField];
         if (childList && childList.length && !childRowMaps[rowid]) {
           childRowMaps[rowid] = 1;
@@ -6693,30 +6854,30 @@ const Methods = {
         let hLen = 0; // 半选
         let vLen = 0; // 有效行
         childList.forEach(checkMethod ? item => {
-          const childRowid = (0, _util.getRowid)($xeTable, item);
-          const isSelect = checkField ? _xeUtils.default.get(item, checkField) : selectRowMaps[childRowid];
+          const childRowid = handleGetRowId(item);
+          const isSelect = checkField ? _xeUtils.default.get(item, checkField) : selectCheckboxMaps[childRowid];
           if (checkMethod({
             row: item
           })) {
             if (isSelect) {
               sLen++;
-            } else if (halfRowMaps[childRowid]) {
+            } else if (treeIndeterminateRowMaps[childRowid]) {
               hLen++;
             }
             vLen++;
           } else {
             if (isSelect) {
               sLen++;
-            } else if (halfRowMaps[childRowid]) {
+            } else if (treeIndeterminateRowMaps[childRowid]) {
               hLen++;
             }
           }
         } : item => {
-          const childRowid = (0, _util.getRowid)($xeTable, item);
-          const isSelect = checkField ? _xeUtils.default.get(item, checkField) : selectRowMaps[childRowid];
+          const childRowid = handleGetRowId(item);
+          const isSelect = checkField ? _xeUtils.default.get(item, checkField) : selectCheckboxMaps[childRowid];
           if (isSelect) {
             sLen++;
-          } else if (halfRowMaps[childRowid]) {
+          } else if (treeIndeterminateRowMaps[childRowid]) {
             hLen++;
           }
           vLen++;
@@ -6728,29 +6889,28 @@ const Methods = {
         }
         if (isSelected) {
           if (!checkField) {
-            selectRowMaps[rowid] = row;
+            selectCheckboxMaps[rowid] = row;
           }
-          if (halfRowMaps[rowid]) {
-            delete halfRowMaps[rowid];
+          if (treeIndeterminateRowMaps[rowid]) {
+            delete treeIndeterminateRowMaps[rowid];
           }
         } else {
           if (!checkField) {
-            if (selectRowMaps[rowid]) {
-              delete selectRowMaps[rowid];
+            if (selectCheckboxMaps[rowid]) {
+              delete selectCheckboxMaps[rowid];
             }
           }
           if (halfSelect) {
-            halfRowMaps[rowid] = row;
+            treeIndeterminateRowMaps[rowid] = row;
           } else {
-            if (halfRowMaps[rowid]) {
-              delete halfRowMaps[rowid];
+            if (treeIndeterminateRowMaps[rowid]) {
+              delete treeIndeterminateRowMaps[rowid];
             }
           }
         }
       });
     }
-    reactData.selectCheckboxMaps = selectRowMaps;
-    reactData.treeIndeterminateMaps = halfRowMaps;
+    reactData.updateCheckboxFlag++;
   },
   updateAllCheckboxStatus() {
     const $xeTable = this;
@@ -6761,9 +6921,12 @@ const Methods = {
       treeConfig
     } = props;
     const {
+      afterFullData,
+      afterTreeFullData,
+      checkboxReserveRowMap,
       selectCheckboxMaps,
-      treeIndeterminateMaps
-    } = reactData;
+      treeIndeterminateRowMaps
+    } = internalData;
     const checkboxOpts = $xeTable.computeCheckboxOpts;
     const {
       checkField,
@@ -6771,39 +6934,37 @@ const Methods = {
       showReserveStatus
     } = checkboxOpts;
     const {
-      afterFullData,
-      afterTreeFullData,
-      checkboxReserveRowMap
-    } = internalData;
+      handleGetRowId
+    } = (0, _util.createHandleGetRowId)($xeTable);
     let sLen = 0; // 已选
     let hLen = 0; // 半选
     let vLen = 0; // 有效行
     const rootList = treeConfig ? afterTreeFullData : afterFullData;
     rootList.forEach(checkMethod ? row => {
-      const childRowid = (0, _util.getRowid)($xeTable, row);
+      const childRowid = handleGetRowId(row);
       const selected = checkField ? _xeUtils.default.get(row, checkField) : selectCheckboxMaps[childRowid];
       if (checkMethod({
         row
       })) {
         if (selected) {
           sLen++;
-        } else if (treeIndeterminateMaps[childRowid]) {
+        } else if (treeIndeterminateRowMaps[childRowid]) {
           hLen++;
         }
         vLen++;
       } else {
         if (selected) {
           sLen++;
-        } else if (treeIndeterminateMaps[childRowid]) {
+        } else if (treeIndeterminateRowMaps[childRowid]) {
           hLen++;
         }
       }
     } : row => {
-      const childRowid = (0, _util.getRowid)($xeTable, row);
+      const childRowid = handleGetRowId(row);
       const selected = checkField ? _xeUtils.default.get(row, checkField) : selectCheckboxMaps[childRowid];
       if (selected) {
         sLen++;
-      } else if (treeIndeterminateMaps[childRowid]) {
+      } else if (treeIndeterminateRowMaps[childRowid]) {
         hLen++;
       }
       vLen++;
@@ -6867,27 +7028,35 @@ const Methods = {
    * 获取复选框保留选中的行
    */
   getCheckboxReserveRecords(isFull) {
+    const $xeTable = this;
+    const props = $xeTable;
+    const internalData = $xeTable;
+    const {
+      treeConfig
+    } = props;
     const {
-      fullDataRowIdData,
       afterFullData,
-      checkboxReserveRowMap,
-      checkboxOpts,
-      treeConfig,
-      treeOpts
-    } = this;
+      fullDataRowIdData,
+      checkboxReserveRowMap
+    } = internalData;
+    const checkboxOpts = $xeTable.computeCheckboxOpts;
+    const treeOpts = $xeTable.computeTreeOpts;
     const childrenField = treeOpts.children || treeOpts.childrenField;
     const reserveSelection = [];
     if (checkboxOpts.reserve) {
+      const {
+        handleGetRowId
+      } = (0, _util.createHandleGetRowId)($xeTable);
       const afterFullIdMaps = {};
       if (treeConfig) {
         _xeUtils.default.eachTree(afterFullData, row => {
-          afterFullIdMaps[(0, _util.getRowid)(this, row)] = 1;
+          afterFullIdMaps[handleGetRowId(row)] = 1;
         }, {
           children: childrenField
         });
       } else {
         afterFullData.forEach(row => {
-          afterFullIdMaps[(0, _util.getRowid)(this, row)] = 1;
+          afterFullIdMaps[handleGetRowId(row)] = 1;
         });
       }
       _xeUtils.default.each(checkboxReserveRowMap, (oldRow, oldRowid) => {
@@ -6929,9 +7098,9 @@ const Methods = {
     handleCheckedAllCheckboxRow($xeTable, value);
     if (evnt) {
       $xeTable.dispatchEvent('checkbox-all', {
-        records: $xeTable.getCheckboxRecords(),
-        reserves: $xeTable.getCheckboxReserveRecords(),
-        indeterminates: $xeTable.getCheckboxIndeterminateRecords(),
+        records: () => $xeTable.getCheckboxRecords(),
+        reserves: () => $xeTable.getCheckboxReserveRecords(),
+        indeterminates: () => $xeTable.getCheckboxIndeterminateRecords(),
         checked: value
       }, evnt);
     }
@@ -6967,17 +7136,23 @@ const Methods = {
    * 清空行为不管是否被禁用还是保留记录，都将彻底清空选中状态
    */
   clearCheckboxRow() {
+    const $xeTable = this;
+    const props = $xeTable;
+    const reactData = $xeTable;
+    const internalData = $xeTable;
     const {
-      tableFullData,
-      treeConfig,
-      treeOpts,
-      checkboxOpts
-    } = this;
+      treeConfig
+    } = props;
+    const {
+      tableFullData
+    } = internalData;
+    const treeOpts = $xeTable.computeTreeOpts;
+    const childrenField = treeOpts.children || treeOpts.childrenField;
+    const checkboxOpts = $xeTable.computeCheckboxOpts;
     const {
       checkField,
       reserve
     } = checkboxOpts;
-    const childrenField = treeOpts.children || treeOpts.childrenField;
     // indeterminateField 仅支持读取
     const indeterminateField = checkboxOpts.indeterminateField || checkboxOpts.halfField;
     if (checkField) {
@@ -6998,10 +7173,11 @@ const Methods = {
     if (reserve) {
       tableFullData.forEach(row => this.handleCheckboxReserveRow(row, false));
     }
-    this.isAllSelected = false;
-    this.isIndeterminate = false;
-    this.selectCheckboxMaps = {};
-    this.treeIndeterminateMaps = {};
+    reactData.isAllSelected = false;
+    reactData.isIndeterminate = false;
+    internalData.selectCheckboxMaps = {};
+    internalData.treeIndeterminateRowMaps = {};
+    reactData.updateCheckboxFlag++;
     return this.$nextTick();
   },
   /**
@@ -7252,12 +7428,14 @@ const Methods = {
   },
   triggerHeaderCellClickEvent(evnt, params) {
     const $xeTable = this;
+    const props = $xeTable;
     const internalData = $xeTable;
     const {
       _lastResizeTime
     } = internalData;
     const sortOpts = $xeTable.computeSortOpts;
     const columnOpts = $xeTable.computeColumnOpts;
+    const currentColumnOpts = $xeTable.computeCurrentColumnOpts;
     const {
       column
     } = params;
@@ -7274,7 +7452,7 @@ const Methods = {
       triggerFilter,
       cell
     }, params), evnt);
-    if (columnOpts.isCurrent || $xeTable.highlightCurrentColumn) {
+    if ((columnOpts.isCurrent || props.highlightCurrentColumn) && (!currentColumnOpts.trigger || ['header', 'default'].includes(currentColumnOpts.trigger))) {
       $xeTable.triggerCurrentColumnEvent(evnt, params);
     }
     return $xeTable.$nextTick();
@@ -7292,35 +7470,32 @@ const Methods = {
    * @param {ColumnInfo} fieldOrColumn 列配置
    */
   setCurrentColumn(fieldOrColumn) {
-    const column = (0, _util.handleFieldOrColumn)(this, fieldOrColumn);
+    const $xeTable = this;
+    const props = $xeTable;
+    const reactData = $xeTable;
+    const {
+      mouseConfig
+    } = props;
+    const mouseOpts = $xeTable.computeMouseOpts;
+    const isMouseSelected = mouseConfig && mouseOpts.selected;
+    const column = (0, _util.handleFieldOrColumn)($xeTable, fieldOrColumn);
     if (column) {
-      // this.clearCurrentRow()
-      this.clearCurrentColumn();
-      this.currentColumn = column;
+      $xeTable.clearCurrentColumn();
+      reactData.currentColumn = column;
     }
-    return this.$nextTick();
+    return $xeTable.$nextTick().then(() => {
+      // 更新状选中态
+      if (isMouseSelected) {
+        $xeTable.addCellSelectedClass();
+      }
+    });
   },
   /**
    * 用于当前列，手动清空当前高亮的状态
    */
-  clearCurrentColumn() {
-    this.currentColumn = null;
-    return this.$nextTick();
-  },
-  checkValidate(type) {
-    if (this.triggerValidate) {
-      return this.triggerValidate(type);
-    }
-    return this.$nextTick();
-  },
-  /**
-   * 当单元格发生改变时
-   * 如果存在规则，则校验
-   */
-  handleChangeCell(evnt, params) {
-    this.checkValidate('blur').catch(e => e).then(() => {
-      this.handleEdit(params, evnt).then(() => this.checkValidate('change')).catch(e => e);
-    });
+  clearCurrentColumn() {
+    this.currentColumn = null;
+    return this.$nextTick();
   },
   /**
    * 列点击事件
@@ -7333,6 +7508,7 @@ const Methods = {
     const reactData = $xeTable;
     const {
       highlightCurrentRow,
+      highlightCurrentColumn,
       editConfig
     } = props;
     const {
@@ -7349,6 +7525,8 @@ const Methods = {
     const checkboxOpts = $xeTable.computeCheckboxOpts;
     const keyboardOpts = $xeTable.computeKeyboardOpts;
     const rowOpts = $xeTable.computeRowOpts;
+    const columnOpts = $xeTable.computeColumnOpts;
+    const currentColumnOpts = $xeTable.computeCurrentColumnOpts;
     const {
       actived,
       focused
@@ -7379,11 +7557,11 @@ const Methods = {
     if (!triggerCheckbox && !triggerRadio) {
       // 如果是展开行
       if (!triggerExpandNode && (expandOpts.trigger === 'row' || isExpandType && expandOpts.trigger === 'cell')) {
-        this.triggerRowExpandEvent(evnt, params);
+        $xeTable.triggerRowExpandEvent(evnt, params);
       }
       // 如果是树形表格
       if (treeOpts.trigger === 'row' || treeNode && treeOpts.trigger === 'cell') {
-        this.triggerTreeExpandEvent(evnt, params);
+        $xeTable.triggerTreeExpandEvent(evnt, params);
       }
     }
     // 如果点击了树节点
@@ -7392,16 +7570,22 @@ const Methods = {
         // 如果是高亮行
         if (rowOpts.isCurrent || highlightCurrentRow) {
           if (!triggerCheckbox && !triggerRadio) {
-            this.triggerCurrentRowEvent(evnt, params);
+            $xeTable.triggerCurrentRowEvent(evnt, params);
+          }
+        }
+        // 如果是当前列
+        if ((columnOpts.isCurrent || highlightCurrentColumn) && (!currentColumnOpts.trigger || ['cell', 'default'].includes(currentColumnOpts.trigger))) {
+          if (!triggerCheckbox && !triggerRadio) {
+            $xeTable.triggerCurrentColumnEvent(evnt, params);
           }
         }
         // 如果是单选框
         if (!triggerRadio && (radioOpts.trigger === 'row' || isRadioType && radioOpts.trigger === 'cell')) {
-          this.triggerRadioRowEvent(evnt, params);
+          $xeTable.triggerRadioRowEvent(evnt, params);
         }
         // 如果是复选框
         if (!triggerCheckbox && (checkboxOpts.trigger === 'row' || isCheckboxType && checkboxOpts.trigger === 'cell')) {
-          this.handleToggleCheckRowEvent(evnt, params);
+          $xeTable.handleToggleCheckRowEvent(evnt, params);
         }
       }
       // 如果设置了单元格选中功能，则不会使用点击事件去处理（只能支持双击模式）
@@ -7413,14 +7597,14 @@ const Methods = {
         }
         if (editOpts.trigger === 'manual') {
           if (actived.args && actived.row === row && column !== actived.column) {
-            this.handleChangeCell(evnt, params);
+            handleChangeCell($xeTable, evnt, params);
           }
         } else if (!actived.args || row !== actived.row || column !== actived.column) {
           if (editOpts.trigger === 'click') {
-            this.handleChangeCell(evnt, params);
+            handleChangeCell($xeTable, evnt, params);
           } else if (editOpts.trigger === 'dblclick') {
             if (editOpts.mode === 'row' && actived.row === row) {
-              this.handleChangeCell(evnt, params);
+              handleChangeCell($xeTable, evnt, params);
             }
           }
         }
@@ -7440,7 +7624,7 @@ const Methods = {
         }
       }
     }
-    this.emitEvent('cell-click', params, evnt);
+    $xeTable.dispatchEvent('cell-click', params, evnt);
   },
   /**
    * 列双击点击事件
@@ -7471,11 +7655,11 @@ const Methods = {
     if ((0, _utils.isEnableConf)(editConfig) && editOpts.trigger === 'dblclick') {
       if (!actived.args || evnt.currentTarget !== actived.args.cell) {
         if (editOpts.mode === 'row') {
-          this.checkValidate('blur').catch(e => e).then(() => {
-            this.handleEdit(params, evnt).then(() => this.checkValidate('change')).catch(e => e);
+          checkValidate($xeTable, 'blur').catch(e => e).then(() => {
+            this.handleEdit(params, evnt).then(() => checkValidate($xeTable, 'change')).catch(e => e);
           });
         } else if (editOpts.mode === 'cell') {
-          this.handleEdit(params, evnt).then(() => this.checkValidate('change')).catch(e => e);
+          this.handleEdit(params, evnt).then(() => checkValidate($xeTable, 'change')).catch(e => e);
         }
       }
     }
@@ -7727,6 +7911,8 @@ const Methods = {
     } = props;
     const rowDragOpts = $xeTable.computeRowDragOpts;
     const {
+      afterFullData,
+      tableFullData,
       fullAllDataRowIdData
     } = internalData;
     const {
@@ -7744,10 +7930,6 @@ const Methods = {
       parentField
     } = treeOpts;
     const childrenField = treeOpts.children || treeOpts.childrenField;
-    const {
-      afterFullData,
-      tableFullData
-    } = internalData;
     const dEndMethod = dragEndMethod || (dragConfig ? dragConfig.dragEndMethod : null);
     const dragOffsetIndex = prevDragPos === 'bottom' ? 1 : 0;
     const errRest = {
@@ -8415,46 +8597,58 @@ const Methods = {
   setPendingRow(rows, status) {
     const $xeTable = this;
     const reactData = $xeTable;
-    const pendingMaps = Object.assign({}, reactData.pendingRowMaps);
+    const internalData = $xeTable;
+    const {
+      handleGetRowId
+    } = (0, _util.createHandleGetRowId)($xeTable);
+    const {
+      pendingRowMaps
+    } = internalData;
     if (rows && !_xeUtils.default.isArray(rows)) {
       rows = [rows];
     }
     if (status) {
       rows.forEach(row => {
-        const rowid = (0, _util.getRowid)($xeTable, row);
-        if (rowid && !pendingMaps[rowid]) {
-          pendingMaps[rowid] = row;
+        const rowid = handleGetRowId(row);
+        if (rowid && !pendingRowMaps[rowid]) {
+          pendingRowMaps[rowid] = row;
         }
       });
     } else {
       rows.forEach(row => {
-        const rowid = (0, _util.getRowid)($xeTable, row);
-        if (rowid && pendingMaps[rowid]) {
-          delete pendingMaps[rowid];
+        const rowid = handleGetRowId(row);
+        if (rowid && pendingRowMaps[rowid]) {
+          delete pendingRowMaps[rowid];
         }
       });
     }
-    reactData.pendingRowMaps = pendingMaps;
+    reactData.pendingRowFlag++;
     return $xeTable.$nextTick();
   },
   togglePendingRow(rows) {
     const $xeTable = this;
     const reactData = $xeTable;
-    const pendingMaps = Object.assign({}, reactData.pendingRowMaps);
+    const internalData = $xeTable;
+    const {
+      handleGetRowId
+    } = (0, _util.createHandleGetRowId)($xeTable);
+    const {
+      pendingRowMaps
+    } = internalData;
     if (rows && !_xeUtils.default.isArray(rows)) {
       rows = [rows];
     }
     rows.forEach(row => {
-      const rowid = (0, _util.getRowid)($xeTable, row);
+      const rowid = handleGetRowId(row);
       if (rowid) {
-        if (pendingMaps[rowid]) {
-          delete pendingMaps[rowid];
+        if (pendingRowMaps[rowid]) {
+          delete pendingRowMaps[rowid];
         } else {
-          pendingMaps[rowid] = row;
+          pendingRowMaps[rowid] = row;
         }
       }
     });
-    reactData.pendingRowMaps = pendingMaps;
+    reactData.pendingRowFlag++;
     return $xeTable.$nextTick();
   },
   hasPendingByRow(row) {
@@ -8472,13 +8666,10 @@ const Methods = {
   },
   getPendingRecords() {
     const $xeTable = this;
-    const reactData = $xeTable;
     const internalData = $xeTable;
     const {
+      fullAllDataRowIdData,
       pendingRowMaps
-    } = reactData;
-    const {
-      fullAllDataRowIdData
     } = internalData;
     const insertRecords = [];
     _xeUtils.default.each(pendingRowMaps, (row, rowid) => {
@@ -8489,8 +8680,12 @@ const Methods = {
     return insertRecords;
   },
   clearPendingRow() {
-    this.pendingRowMaps = {};
-    return this.$nextTick();
+    const $xeTable = this;
+    const reactData = $xeTable;
+    const internalData = $xeTable;
+    internalData.pendingRowMaps = {};
+    reactData.pendingRowFlag++;
+    return $xeTable.$nextTick();
   },
   sort(sortConfs, sortOrder) {
     const $xeTable = this;
@@ -8671,9 +8866,11 @@ const Methods = {
    * @param {Event} evnt 事件
    */
   closeFilter() {
+    const $xeTable = this;
+    const reactData = $xeTable;
     const {
       filterStore
-    } = this;
+    } = reactData;
     const {
       column,
       visible
@@ -8685,15 +8882,15 @@ const Methods = {
       visible: false
     });
     if (visible) {
-      this.emitEvent('filter-visible', {
+      $xeTable.dispatchEvent('filter-visible', {
         column,
         field: column.field,
         property: column.field,
-        filterList: this.getCheckedFilters(),
+        filterList: () => $xeTable.getCheckedFilters(),
         visible: false
       }, null);
     }
-    return this.$nextTick();
+    return $xeTable.$nextTick();
   },
   /**
    * 判断指定列是否为筛选状态，如果为空则判断所有列
@@ -8726,9 +8923,9 @@ const Methods = {
     const $xeTable = this;
     const reactData = $xeTable;
     const internalData = $xeTable;
-    const rExpandLazyLoadedMaps = Object.assign({}, reactData.rowExpandLazyLoadedMaps);
     const {
-      fullAllDataRowIdData
+      fullAllDataRowIdData,
+      rowExpandLazyLoadedMaps
     } = internalData;
     const expandOpts = $xeTable.computeExpandOpts;
     const {
@@ -8738,9 +8935,9 @@ const Methods = {
     const rowRest = fullAllDataRowIdData[rowid];
     if (lazy && rowRest) {
       rowRest.expandLoaded = false;
-      delete rExpandLazyLoadedMaps[rowid];
+      delete rowExpandLazyLoadedMaps[rowid];
     }
-    reactData.rowExpandLazyLoadedMaps = rExpandLazyLoadedMaps;
+    reactData.rowExpandedFlag++;
     return $xeTable.$nextTick();
   },
   /**
@@ -8748,18 +8945,20 @@ const Methods = {
    * @param {Row} row 行对象
    */
   reloadRowExpand(row) {
+    const $xeTable = this;
+    const internalData = $xeTable;
     const {
-      expandOpts,
       rowExpandLazyLoadedMaps
-    } = this;
+    } = internalData;
+    const expandOpts = $xeTable.computeExpandOpts;
     const {
       lazy
     } = expandOpts;
     const rowid = (0, _util.getRowid)(this, row);
     if (lazy && !rowExpandLazyLoadedMaps[rowid]) {
-      this.clearRowExpandLoaded(row).then(() => this.handleAsyncRowExpand(row));
+      $xeTable.clearRowExpandLoaded(row).then(() => handleAsyncRowExpand($xeTable, row));
     }
-    return this.$nextTick();
+    return $xeTable.$nextTick();
   },
   reloadExpandContent(row) {
     if (process.env.NODE_ENV === 'development') {
@@ -8772,11 +8971,16 @@ const Methods = {
    * 展开行事件
    */
   triggerRowExpandEvent(evnt, params) {
+    const $xeTable = this;
+    const reactData = $xeTable;
+    const internalData = $xeTable;
     const {
-      expandOpts,
-      rowExpandLazyLoadedMaps,
       expandColumn: column
-    } = this;
+    } = reactData;
+    const {
+      rowExpandLazyLoadedMaps
+    } = internalData;
+    const expandOpts = $xeTable.computeExpandOpts;
     const {
       row
     } = params;
@@ -8788,20 +8992,20 @@ const Methods = {
       return;
     }
     evnt.stopPropagation();
-    const rowid = (0, _util.getRowid)(this, row);
+    const rowid = (0, _util.getRowid)($xeTable, row);
     if (!lazy || !rowExpandLazyLoadedMaps[rowid]) {
-      const expanded = !this.isRowExpandByRow(row);
-      const columnIndex = this.getColumnIndex(column);
-      const $columnIndex = this.getVMColumnIndex(column);
-      this.setRowExpand(row, expanded);
-      this.emitEvent('toggle-row-expand', {
+      const expanded = !$xeTable.isRowExpandByRow(row);
+      const columnIndex = $xeTable.getColumnIndex(column);
+      const $columnIndex = $xeTable.getVMColumnIndex(column);
+      $xeTable.setRowExpand(row, expanded);
+      $xeTable.dispatchEvent('toggle-row-expand', {
         expanded,
         column,
         columnIndex,
         $columnIndex,
         row,
-        rowIndex: this.getRowIndex(row),
-        $rowIndex: this.getVMRowIndex(row)
+        rowIndex: $xeTable.getRowIndex(row),
+        $rowIndex: $xeTable.getVMRowIndex(row)
       }, evnt);
     }
   },
@@ -8859,55 +9063,6 @@ const Methods = {
     }
     return this.setRowExpand(expandedRows, expanded);
   },
-  handleAsyncRowExpand(row) {
-    const $xeTable = this;
-    const reactData = $xeTable;
-    const internalData = $xeTable;
-    return new Promise(resolve => {
-      const {
-        expandOpts
-      } = this;
-      const {
-        loadMethod
-      } = expandOpts;
-      if (loadMethod) {
-        const {
-          fullAllDataRowIdData
-        } = internalData;
-        const rExpandLazyLoadedMaps = Object.assign({}, reactData.rowExpandLazyLoadedMaps);
-        const rowid = (0, _util.getRowid)($xeTable, row);
-        const rowRest = fullAllDataRowIdData[rowid];
-        rExpandLazyLoadedMaps[rowid] = row;
-        reactData.rowExpandLazyLoadedMaps = rExpandLazyLoadedMaps;
-        loadMethod({
-          $table: $xeTable,
-          row,
-          rowIndex: $xeTable.getRowIndex(row),
-          $rowIndex: $xeTable.getVMRowIndex(row)
-        }).then(() => {
-          const rExpandedMaps = Object.assign({}, reactData.rowExpandedMaps);
-          if (rowRest) {
-            rowRest.expandLoaded = true;
-          }
-          rExpandedMaps[rowid] = row;
-          reactData.rowExpandedMaps = rExpandedMaps;
-        }).catch(() => {
-          if (rowRest) {
-            rowRest.expandLoaded = false;
-          }
-        }).finally(() => {
-          const rExpandLazyLoadedMaps = Object.assign({}, reactData.rowExpandLazyLoadedMaps);
-          if (rExpandLazyLoadedMaps[rowid]) {
-            delete rExpandLazyLoadedMaps[rowid];
-          }
-          reactData.rowExpandLazyLoadedMaps = rExpandLazyLoadedMaps;
-          $xeTable.$nextTick().then(() => $xeTable.recalculate()).then(() => $xeTable.updateCellAreas()).then(() => resolve());
-        });
-      } else {
-        resolve();
-      }
-    });
-  },
   /**
    * 设置展开行，二个参数设置这一行展开与否
    * 支持单行
@@ -8917,14 +9072,20 @@ const Methods = {
    */
   setRowExpand(rows, expanded) {
     const $xeTable = this;
+    const reactData = $xeTable;
+    const internalData = $xeTable;
     const {
-      rowExpandedMaps,
-      fullAllDataRowIdData,
-      rowExpandLazyLoadedMaps,
-      expandOpts,
       expandColumn
-    } = this;
-    let rExpandedMaps = Object.assign({}, rowExpandedMaps);
+    } = reactData;
+    let {
+      fullAllDataRowIdData,
+      rowExpandedMaps,
+      rowExpandLazyLoadedMaps
+    } = internalData;
+    const {
+      handleGetRowId
+    } = (0, _util.createHandleGetRowId)($xeTable);
+    const expandOpts = $xeTable.computeExpandOpts;
     const {
       reserve,
       lazy,
@@ -8940,10 +9101,12 @@ const Methods = {
       }
       if (accordion) {
         // 只能同时展开一个
-        rExpandedMaps = {};
+        rowExpandedMaps = {};
+        internalData.rowExpandedMaps = rowExpandedMaps;
         rows = rows.slice(rows.length - 1, rows.length);
       }
       const validRows = toggleMethod ? rows.filter(row => toggleMethod({
+        $table: $xeTable,
         expanded,
         column: expandColumn,
         columnIndex,
@@ -8954,22 +9117,22 @@ const Methods = {
       })) : rows;
       if (expanded) {
         validRows.forEach(row => {
-          const rowid = (0, _util.getRowid)(this, row);
-          if (!rExpandedMaps[rowid]) {
+          const rowid = handleGetRowId(row);
+          if (!rowExpandedMaps[rowid]) {
             const rowRest = fullAllDataRowIdData[rowid];
             const isLoad = lazy && !rowRest.expandLoaded && !rowExpandLazyLoadedMaps[rowid];
             if (isLoad) {
-              lazyRests.push(this.handleAsyncRowExpand(row));
+              lazyRests.push(handleAsyncRowExpand($xeTable, row));
             } else {
-              rExpandedMaps[rowid] = row;
+              rowExpandedMaps[rowid] = row;
             }
           }
         });
       } else {
         validRows.forEach(item => {
-          const rowid = (0, _util.getRowid)(this, item);
-          if (rExpandedMaps[rowid]) {
-            delete rExpandedMaps[rowid];
+          const rowid = handleGetRowId(item);
+          if (rowExpandedMaps[rowid]) {
+            delete rowExpandedMaps[rowid];
           }
         });
       }
@@ -8977,7 +9140,7 @@ const Methods = {
         validRows.forEach(row => handleRowExpandReserve($xeTable, row, expanded));
       }
     }
-    this.rowExpandedMaps = rExpandedMaps;
+    reactData.rowExpandedFlag++;
     return Promise.all(lazyRests).then(() => $xeTable.$nextTick()).then(() => $xeTable.recalculate(true)).then(() => {
       updateRowOffsetTop($xeTable);
       updateRowExpandStyle($xeTable);
@@ -8990,11 +9153,17 @@ const Methods = {
    * @param {Row} row 行对象
    */
   isRowExpandByRow(row) {
+    const $xeTable = this;
+    const reactData = $xeTable;
+    const internalData = $xeTable;
+    const {
+      rowExpandedFlag
+    } = reactData;
     const {
       rowExpandedMaps
-    } = this;
+    } = internalData;
     const rowid = (0, _util.getRowid)(this, row);
-    return !!rowExpandedMaps[rowid];
+    return !!rowExpandedFlag && !!rowExpandedMaps[rowid];
   },
   isExpandByRow(row) {
     if (process.env.NODE_ENV === 'development') {
@@ -9018,7 +9187,8 @@ const Methods = {
       reserve
     } = expandOpts;
     const expList = $xeTable.getRowExpandRecords();
-    reactData.rowExpandedMaps = {};
+    internalData.rowExpandedMaps = {};
+    reactData.rowExpandedFlag++;
     if (reserve) {
       tableFullData.forEach(row => handleRowExpandReserve($xeTable, row, false));
     }
@@ -9038,8 +9208,10 @@ const Methods = {
     return this.$nextTick();
   },
   getRowExpandRecords() {
+    const $xeTable = this;
+    const internalData = $xeTable;
     const rest = [];
-    _xeUtils.default.each(this.rowExpandedMaps, item => {
+    _xeUtils.default.each(internalData.rowExpandedMaps, item => {
       if (item) {
         rest.push(item);
       }
@@ -9047,8 +9219,10 @@ const Methods = {
     return rest;
   },
   getTreeExpandRecords() {
+    const $xeTable = this;
+    const internalData = $xeTable;
     const rest = [];
-    _xeUtils.default.each(this.treeExpandedMaps, item => {
+    _xeUtils.default.each(internalData.treeExpandedMaps, item => {
       if (item) {
         rest.push(item);
       }
@@ -9084,15 +9258,14 @@ const Methods = {
     const reactData = $xeTable;
     const internalData = $xeTable;
     const {
-      fullAllDataRowIdData
+      fullAllDataRowIdData,
+      treeExpandedMaps
     } = internalData;
     const treeOpts = $xeTable.computeTreeOpts;
     const {
       transform
     } = treeOpts;
-    let tExpandedMaps = {};
     if (rows) {
-      tExpandedMaps = Object.assign({}, reactData.treeExpandedMaps);
       if (!_xeUtils.default.isArray(rows)) {
         rows = [rows];
       }
@@ -9101,8 +9274,8 @@ const Methods = {
         const rowRest = fullAllDataRowIdData[rowid];
         if (rowRest) {
           rowRest.treeLoaded = false;
-          if (tExpandedMaps[rowid]) {
-            delete tExpandedMaps[rowid];
+          if (treeExpandedMaps[rowid]) {
+            delete treeExpandedMaps[rowid];
           }
         }
       });
@@ -9111,7 +9284,8 @@ const Methods = {
         rowRest.treeLoaded = false;
       });
     }
-    reactData.treeExpandedMaps = {};
+    internalData.treeExpandedMaps = {};
+    reactData.treeExpandedFlag++;
     if (transform) {
       handleVirtualTreeToList($xeTable);
       return $xeTable.handleTableData();
@@ -9124,45 +9298,49 @@ const Methods = {
    */
   reloadTreeExpand(row) {
     const $xeTable = this;
+    const internalData = $xeTable;
     const {
-      treeOpts,
       treeExpandLazyLoadedMaps
-    } = this;
+    } = internalData;
+    const treeOpts = $xeTable.computeTreeOpts;
     const {
       transform,
       lazy
     } = treeOpts;
     const hasChildField = treeOpts.hasChild || treeOpts.hasChildField;
-    const rowid = (0, _util.getRowid)(this, row);
+    const rowid = (0, _util.getRowid)($xeTable, row);
     if (lazy && row[hasChildField] && !treeExpandLazyLoadedMaps[rowid]) {
-      return this.clearTreeExpandLoaded(row).then(() => {
-        return this.handleAsyncTreeExpandChilds(row);
+      return $xeTable.clearTreeExpandLoaded(row).then(() => {
+        return handleAsyncTreeExpandChilds($xeTable, row);
       }).then(() => {
         if (transform) {
           handleVirtualTreeToList($xeTable);
-          return this.handleTableData();
+          return $xeTable.handleTableData();
         }
       }).then(() => {
-        return this.recalculate();
+        return $xeTable.recalculate();
       });
     }
-    return this.$nextTick();
+    return $xeTable.$nextTick();
   },
   reloadTreeChilds(row) {
+    const $xeTable = this;
     if (process.env.NODE_ENV === 'development') {
       (0, _log.warnLog)('vxe.error.delFunc', ['reloadTreeChilds', 'reloadTreeExpand']);
     }
     // 即将废弃
-    return this.reloadTreeExpand(row);
+    return $xeTable.reloadTreeExpand(row);
   },
   /**
    * 展开树节点事件
    */
   triggerTreeExpandEvent(evnt, params) {
+    const $xeTable = this;
+    const internalData = $xeTable;
     const {
-      treeOpts,
       treeExpandLazyLoadedMaps
-    } = this;
+    } = internalData;
+    const treeOpts = $xeTable.computeTreeOpts;
     const {
       row,
       column
@@ -9177,11 +9355,11 @@ const Methods = {
     evnt.stopPropagation();
     const rowid = (0, _util.getRowid)(this, row);
     if (!lazy || !treeExpandLazyLoadedMaps[rowid]) {
-      const expanded = !this.isTreeExpandByRow(row);
-      const columnIndex = this.getColumnIndex(column);
-      const $columnIndex = this.getVMColumnIndex(column);
-      this.setTreeExpand(row, expanded);
-      this.emitEvent('toggle-tree-expand', {
+      const expanded = !$xeTable.isTreeExpandByRow(row);
+      const columnIndex = $xeTable.getColumnIndex(column);
+      const $columnIndex = $xeTable.getVMColumnIndex(column);
+      $xeTable.setTreeExpand(row, expanded);
+      $xeTable.dispatchEvent('toggle-tree-expand', {
         expanded,
         column,
         columnIndex,
@@ -9196,112 +9374,6 @@ const Methods = {
   toggleTreeExpand(row) {
     return this.setTreeExpand(row, !this.isTreeExpandByRow(row));
   },
-  /**
-   * 处理默认展开树节点
-   */
-  handleDefaultTreeExpand() {
-    const {
-      treeConfig,
-      treeOpts,
-      tableFullData
-    } = this;
-    if (treeConfig) {
-      const {
-        expandAll,
-        expandRowKeys
-      } = treeOpts;
-      const childrenField = treeOpts.children || treeOpts.childrenField;
-      if (expandAll) {
-        this.setAllTreeExpand(true);
-      } else if (expandRowKeys) {
-        const defExpandeds = [];
-        const rowkey = (0, _util.getRowkey)(this);
-        expandRowKeys.forEach(rowid => {
-          const matchObj = _xeUtils.default.findTree(tableFullData, item => rowid === _xeUtils.default.get(item, rowkey), {
-            children: childrenField
-          });
-          if (matchObj) {
-            defExpandeds.push(matchObj.item);
-          }
-        });
-        this.setTreeExpand(defExpandeds, true);
-      }
-    }
-  },
-  handleAsyncTreeExpandChilds(row) {
-    const $xeTable = this;
-    const {
-      treeOpts,
-      checkboxOpts
-    } = this;
-    const {
-      transform,
-      loadMethod
-    } = treeOpts;
-    const {
-      checkStrictly
-    } = checkboxOpts;
-    return new Promise(resolve => {
-      if (loadMethod) {
-        const {
-          treeExpandLazyLoadedMaps,
-          fullAllDataRowIdData
-        } = this;
-        const rowid = (0, _util.getRowid)($xeTable, row);
-        const rowRest = fullAllDataRowIdData[rowid];
-        treeExpandLazyLoadedMaps[rowid] = row;
-        Promise.resolve(loadMethod({
-          $table: $xeTable,
-          row
-        })).then(childRecords => {
-          if (rowRest) {
-            rowRest.treeLoaded = true;
-          }
-          if (treeExpandLazyLoadedMaps[rowid]) {
-            delete treeExpandLazyLoadedMaps[rowid];
-          }
-          if (!_xeUtils.default.isArray(childRecords)) {
-            childRecords = [];
-          }
-          if (childRecords) {
-            return this.loadTreeChildren(row, childRecords).then(childRows => {
-              const {
-                treeExpandedMaps
-              } = this;
-              if (childRows.length && !treeExpandedMaps[rowid]) {
-                treeExpandedMaps[rowid] = row;
-              }
-              // 如果当前节点已选中，则展开后子节点也被选中
-              if (!checkStrictly && this.isCheckedByCheckboxRow(row)) {
-                handleCheckedCheckboxRow($xeTable, childRows, true);
-              }
-              return this.$nextTick().then(() => {
-                if (transform) {
-                  this.handleTableData();
-                  updateAfterDataIndex($xeTable);
-                  return this.$nextTick();
-                }
-              });
-            });
-          }
-        }).catch(() => {
-          const {
-            treeExpandLazyLoadedMaps
-          } = this;
-          if (rowRest) {
-            rowRest.treeLoaded = false;
-          }
-          if (treeExpandLazyLoadedMaps[rowid]) {
-            delete treeExpandLazyLoadedMaps[rowid];
-          }
-        }).finally(() => {
-          this.$nextTick().then(() => this.recalculate()).then(() => resolve());
-        });
-      } else {
-        resolve();
-      }
-    });
-  },
   /**
    * 设置所有树节点的展开与否
    * @param {Boolean} expanded 是否展开
@@ -9333,27 +9405,35 @@ const Methods = {
    * @returns
    */
   handleBaseTreeExpand(rows, expanded) {
+    const $xeTable = this;
+    const reactData = $xeTable;
+    const internalData = $xeTable;
+    const {
+      treeNodeColumn
+    } = reactData;
     const {
       fullAllDataRowIdData,
       tableFullData,
       treeExpandedMaps,
-      treeOpts,
-      treeExpandLazyLoadedMaps,
-      treeNodeColumn
-    } = this;
+      treeExpandLazyLoadedMaps
+    } = internalData;
+    const treeOpts = $xeTable.computeTreeOpts;
     const {
       reserve,
       lazy,
       accordion,
       toggleMethod
     } = treeOpts;
-    const treeTempExpandedMaps = Object.assign({}, treeExpandedMaps);
     const childrenField = treeOpts.children || treeOpts.childrenField;
     const hasChildField = treeOpts.hasChild || treeOpts.hasChildField;
     const result = [];
-    const columnIndex = this.getColumnIndex(treeNodeColumn);
-    const $columnIndex = this.getVMColumnIndex(treeNodeColumn);
+    const columnIndex = $xeTable.getColumnIndex(treeNodeColumn);
+    const $columnIndex = $xeTable.getVMColumnIndex(treeNodeColumn);
+    const {
+      handleGetRowId
+    } = (0, _util.createHandleGetRowId)($xeTable);
     let validRows = toggleMethod ? rows.filter(row => toggleMethod({
+      $table: $xeTable,
       expanded,
       column: treeNodeColumn,
       columnIndex,
@@ -9368,26 +9448,26 @@ const Methods = {
       });
       if (matchObj) {
         matchObj.items.forEach(item => {
-          const rowid = (0, _util.getRowid)(this, item);
-          if (treeTempExpandedMaps[rowid]) {
-            delete treeTempExpandedMaps[rowid];
+          const rowid = handleGetRowId(item);
+          if (treeExpandedMaps[rowid]) {
+            delete treeExpandedMaps[rowid];
           }
         });
       }
     }
     if (expanded) {
       validRows.forEach(row => {
-        const rowid = (0, _util.getRowid)(this, row);
-        if (!treeTempExpandedMaps[rowid]) {
+        const rowid = handleGetRowId(row);
+        if (!treeExpandedMaps[rowid]) {
           const rowRest = fullAllDataRowIdData[rowid];
           if (rowRest) {
             const isLoad = lazy && row[hasChildField] && !rowRest.treeLoaded && !treeExpandLazyLoadedMaps[rowid];
             // 是否使用懒加载
             if (isLoad) {
-              result.push(this.handleAsyncTreeExpandChilds(row));
+              result.push(handleAsyncTreeExpandChilds($xeTable, row));
             } else {
               if (row[childrenField] && row[childrenField].length) {
-                treeTempExpandedMaps[rowid] = row;
+                treeExpandedMaps[rowid] = row;
               }
             }
           }
@@ -9395,18 +9475,18 @@ const Methods = {
       });
     } else {
       validRows.forEach(item => {
-        const rowid = (0, _util.getRowid)(this, item);
-        if (treeTempExpandedMaps[rowid]) {
-          delete treeTempExpandedMaps[rowid];
+        const rowid = handleGetRowId(item);
+        if (treeExpandedMaps[rowid]) {
+          delete treeExpandedMaps[rowid];
         }
       });
     }
     if (reserve) {
-      validRows.forEach(row => this.handleTreeExpandReserve(row, expanded));
+      validRows.forEach(row => handleTreeExpandReserve($xeTable, row, expanded));
     }
-    this.treeExpandedMaps = treeTempExpandedMaps;
+    reactData.treeExpandedFlag++;
     return Promise.all(result).then(() => {
-      return this.recalculate();
+      return $xeTable.recalculate();
     });
   },
   /**
@@ -9463,40 +9543,49 @@ const Methods = {
    * @param {Row} row 行对象
    */
   isTreeExpandByRow(row) {
+    const $xeTable = this;
+    const reactData = $xeTable;
+    const internalData = $xeTable;
+    const {
+      treeExpandedFlag
+    } = reactData;
     const {
       treeExpandedMaps
-    } = this;
-    return !!treeExpandedMaps[(0, _util.getRowid)(this, row)];
+    } = internalData;
+    return !!treeExpandedFlag && !!treeExpandedMaps[(0, _util.getRowid)($xeTable, row)];
   },
   /**
    * 手动清空树形节点的展开状态，数据会恢复成未展开的状态
    */
   clearTreeExpand() {
     const $xeTable = this;
+    const reactData = $xeTable;
+    const internalData = $xeTable;
     const {
-      treeOpts,
-      tableFullData
-    } = this;
+      tableFullTreeData
+    } = internalData;
+    const treeOpts = $xeTable.computeTreeOpts;
+    const childrenField = treeOpts.children || treeOpts.childrenField;
     const {
       transform,
       reserve
     } = treeOpts;
-    const childrenField = treeOpts.children || treeOpts.childrenField;
-    const expList = this.getTreeExpandRecords();
-    this.treeExpandedMaps = {};
+    const expList = $xeTable.getTreeExpandRecords();
+    internalData.treeExpandedMaps = {};
+    reactData.treeExpandedFlag++;
     if (reserve) {
-      _xeUtils.default.eachTree(tableFullData, row => this.handleTreeExpandReserve(row, false), {
+      _xeUtils.default.eachTree(tableFullTreeData, row => handleTreeExpandReserve($xeTable, row, false), {
         children: childrenField
       });
     }
-    return this.handleTableData().then(() => {
+    return $xeTable.handleTableData().then(() => {
       if (transform) {
         handleVirtualTreeToList($xeTable);
-        return this.handleTableData();
+        return $xeTable.handleTableData();
       }
     }).then(() => {
       if (expList.length) {
-        this.recalculate();
+        $xeTable.recalculate();
       }
     });
   },
@@ -9504,20 +9593,6 @@ const Methods = {
     this.treeExpandedReserveRowMap = {};
     return this.$nextTick();
   },
-  handleTreeExpandReserve(row, expanded) {
-    const {
-      treeExpandedReserveRowMap,
-      treeOpts
-    } = this;
-    if (treeOpts.reserve) {
-      const rowid = (0, _util.getRowid)(this, row);
-      if (expanded) {
-        treeExpandedReserveRowMap[rowid] = row;
-      } else if (treeExpandedReserveRowMap[rowid]) {
-        delete treeExpandedReserveRowMap[rowid];
-      }
-    }
-  },
   /**
    * 获取表格的滚动状态
    */
@@ -9883,11 +9958,12 @@ const Methods = {
     } = tableProps;
     const {
       scrollXLoad,
-      scrollYLoad
+      scrollYLoad,
+      expandColumn
     } = reactData;
     const leftFixedWidth = $xeTable.computeLeftFixedWidth;
     const rightFixedWidth = $xeTable.computeRightFixedWidth;
-    if (!(scrollYLoad || leftFixedWidth || rightFixedWidth)) {
+    if (!(leftFixedWidth || rightFixedWidth || expandColumn)) {
       return;
     }
     const {
@@ -10179,15 +10255,15 @@ const Methods = {
     const {
       isAllOverflow,
       scrollYLoad,
-      expandColumn,
-      rowExpandedMaps
+      expandColumn
     } = reactData;
     const {
       scrollYStore,
       elemStore,
       isResizeCellHeight,
       afterFullData,
-      fullAllDataRowIdData
+      fullAllDataRowIdData,
+      rowExpandedMaps
     } = internalData;
     const {
       startIndex
@@ -10449,6 +10525,8 @@ const Methods = {
    * 更新表尾合计
    */
   updateFooter() {
+    const $xeTable = this;
+    const $xeGrid = $xeTable.$xeGrid;
     const {
       showFooter,
       visibleColumn,
@@ -10462,8 +10540,8 @@ const Methods = {
       footData = visibleColumn.length ? footerMethod({
         columns: visibleColumn,
         data: this.afterFullData,
-        $table: this,
-        $grid: this.$xegrid
+        $table: $xeTable,
+        $grid: $xeGrid
       }) : [];
     }
     this.footerTableData = footData;
@@ -10544,7 +10622,7 @@ const Methods = {
     if (this.footerSpanMethod) {
       (0, _log.errLog)('vxe.error.errConflicts', ['merge-footer-items', 'footer-span-method']);
     }
-    setMerges(this, merges, this.mergeFooterList, null);
+    setMerges(this, merges, this.mergeFooterList);
     return this.$nextTick().then(() => {
       this.updateCellAreas();
       return updateStyle($xeTable);
@@ -10599,16 +10677,19 @@ const Methods = {
   },
   dispatchEvent(type, params, evnt) {
     const $xeTable = this;
+    const $xeGrid = $xeTable.$xeGrid;
     $xeTable.$emit(type, createEvent(evnt, {
       $table: $xeTable,
-      $grid: $xeTable.$xegrid
+      $grid: $xeGrid
     }, params));
   },
   // 已废弃，使用 dispatchEvent
   emitEvent(type, params, evnt) {
+    const $xeTable = this;
+    const $xeGrid = $xeTable.$xeGrid;
     this.$emit(type, Object.assign({
-      $table: this,
-      $grid: this.$xegrid,
+      $table: $xeTable,
+      $grid: $xeGrid,
       $event: evnt
     }, params));
   },