vxe-table 3.14.0-beta.2 → 3.14.0-beta.21

package/lib/index.umd.js

@@ -4,9 +4,9 @@
 	else if(typeof define === 'function' && define.amd)
 		define([, "@vxe-ui/core", "xe-utils"], factory);
 	else if(typeof exports === 'object')
-		exports["VXETable"] = factory(require("vue"), require("@vxe-ui/core"), require("xe-utils"));
+		exports["VxeUITable"] = factory(require("vue"), require("@vxe-ui/core"), require("xe-utils"));
 	else
-		root["VXETable"] = factory(root["Vue"], root["VxeUI"], root["XEUtils"]);
+		root["VxeUITable"] = factory(root["Vue"], root["VxeUI"], root["XEUtils"]);
 })((typeof self !== 'undefined' ? self : this), function(__WEBPACK_EXTERNAL_MODULE__9274__, __WEBPACK_EXTERNAL_MODULE__4345__, __WEBPACK_EXTERNAL_MODULE__8871__) {
 return /******/ (function() { // webpackBootstrap
 /******/ 	"use strict";
@@ -2220,7 +2220,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.14.0-beta.2";
+const version = "3.14.0-beta.21";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2843,7 +2843,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.14.0-beta.2"}`;
+const log_version = `table v${"3.14.0-beta.21"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -3026,6 +3026,7 @@ class ColumnInfo {
 
 
 
+
 const getAllConvertColumns = (columns, parentColumn) => {
   const result = [];
   columns.forEach(column => {
@@ -3111,13 +3112,63 @@ function getRowUniqueId() {
   return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().uniqueId('row_');
 }
 // 行主键 key
-function getRowkey($xetable) {
-  return $xetable.rowOpts.keyField || $xetable.rowId || '_X_ROW_KEY';
+function getRowkey($xeTable) {
+  const props = $xeTable;
+  const rowOpts = $xeTable.computeRowOpts;
+  return `${props.rowId || rowOpts.keyField || '_X_ROW_KEY'}`;
 }
 // 行主键 value
-function getRowid($xetable, row) {
-  const rowid = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, getRowkey($xetable));
-  return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(rowid) ? '' : encodeURIComponent(rowid);
+function getRowid($xeTable, row) {
+  const rowid = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, getRowkey($xeTable));
+  return encodeRowid(rowid);
+}
+function createHandleUpdateRowId($xeTable) {
+  const rowKey = getRowkey($xeTable);
+  const isDeepKey = rowKey.indexOf('.') > -1;
+  const updateRId = isDeepKey ? updateDeepRowKey : updateFastRowKey;
+  return {
+    rowKey,
+    handleUpdateRowId(row) {
+      return row ? updateRId(row, rowKey) : null;
+    }
+  };
+}
+function createHandleGetRowId($xeTable) {
+  const rowKey = getRowkey($xeTable);
+  const isDeepKey = rowKey.indexOf('.') > -1;
+  const getRId = isDeepKey ? getDeepRowIdByKey : getFastRowIdByKey;
+  return {
+    rowKey,
+    handleGetRowId(row) {
+      return row ? getRId(row, rowKey) : null;
+    }
+  };
+}
+// 编码行主键
+function encodeRowid(rowVal) {
+  return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(rowVal) ? '' : encodeURIComponent(rowVal);
+}
+function getDeepRowIdByKey(row, rowKey) {
+  return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, rowKey);
+}
+function updateDeepRowKey(row, rowKey) {
+  let rowid = getDeepRowIdByKey(row, rowKey);
+  if (eqEmptyValue(rowid)) {
+    rowid = getRowUniqueId();
+    external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(row, rowKey, rowid);
+  }
+  return rowid;
+}
+function getFastRowIdByKey(row, rowKey) {
+  return row[rowKey];
+}
+function updateFastRowKey(row, rowKey) {
+  let rowid = getFastRowIdByKey(row, rowKey);
+  if (eqEmptyValue(rowid)) {
+    rowid = getRowUniqueId();
+    row[rowKey] = rowid;
+  }
+  return rowid;
 }
 function getPaddingLeftRightSize(elem) {
   if (elem) {
@@ -3143,12 +3194,19 @@ function getCellHeight(height) {
   }
   return height || 0;
 }
-function handleFieldOrColumn(_vm, fieldOrColumn) {
+function handleFieldOrColumn($xeTable, fieldOrColumn) {
   if (fieldOrColumn) {
-    return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(fieldOrColumn) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(fieldOrColumn) ? _vm.getColumnByField(`${fieldOrColumn}`) : fieldOrColumn;
+    return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(fieldOrColumn) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(fieldOrColumn) ? $xeTable.getColumnByField(`${fieldOrColumn}`) : fieldOrColumn;
   }
   return null;
 }
+const handleRowidOrRow = ($xeTable, rowidOrRow) => {
+  if (rowidOrRow) {
+    const rowid = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(rowidOrRow) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(rowidOrRow) ? rowidOrRow : getRowid($xeTable, rowidOrRow);
+    return $xeTable.getRowById(rowid);
+  }
+  return null;
+};
 // 组装列配置
 function assembleColumn(_vm) {
   const {
@@ -4053,11 +4111,12 @@ const Cell = {
     const tableReactData = $table;
     const tableInternalData = $table;
     const {
-      treeExpandedMaps,
-      treeExpandLazyLoadedMaps
+      treeExpandedFlag
     } = tableReactData;
     const {
-      fullAllDataRowIdData
+      fullAllDataRowIdData,
+      treeExpandedMaps,
+      treeExpandLazyLoadedMaps
     } = tableInternalData;
     const treeOpts = $table.computeTreeOpts;
     const {
@@ -4092,7 +4151,7 @@ const Cell = {
     }
     if (!isHidden) {
       const rowid = getRowid($table, row);
-      isActive = !!treeExpandedMaps[rowid];
+      isActive = !!treeExpandedFlag && !!treeExpandedMaps[rowid];
       if (lazy) {
         const rest = fullAllDataRowIdData[rowid];
         isLazyLoading = !!treeExpandLazyLoadedMaps[rowid];
@@ -4272,7 +4331,12 @@ const Cell = {
     const headerSlot = slots ? slots.header : null;
     const titleSlot = slots ? slots.title : null;
     const checkboxOpts = $table.computeCheckboxOpts;
-    const headerTitle = column.getTitle();
+    const {
+      checkStrictly,
+      showHeader,
+      headerTitle
+    } = checkboxOpts;
+    const colTitle = column.getTitle();
     const ons = {};
     if (!isHidden) {
       ons.click = evnt => {
@@ -4290,10 +4354,10 @@ const Cell = {
     if (headerSlot) {
       return renderHeaderCellBaseVNs(h, params, renderTitleContent(h, checkboxParams, $table.callSlot(headerSlot, checkboxParams, h)));
     }
-    if (checkboxOpts.checkStrictly ? !checkboxOpts.showHeader : checkboxOpts.showHeader === false) {
+    if (checkStrictly ? !showHeader : showHeader === false) {
       return renderHeaderCellBaseVNs(h, params, renderTitleContent(h, checkboxParams, [h('span', {
         class: 'vxe-checkbox--label'
-      }, titleSlot ? $table.callSlot(titleSlot, checkboxParams, h) : headerTitle)]));
+      }, titleSlot ? $table.callSlot(titleSlot, checkboxParams, h) : colTitle)]));
     }
     return renderHeaderCellBaseVNs(h, params, renderTitleContent(h, checkboxParams, [h('span', {
       class: ['vxe-cell--checkbox', {
@@ -4302,14 +4366,14 @@ const Cell = {
         'is--indeterminate': isAllCheckboxIndeterminate
       }],
       attrs: {
-        title: cell_getI18n('vxe.table.allTitle')
+        title: external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(headerTitle) ? cell_getI18n('vxe.table.allTitle') : `${headerTitle || ''}`
       },
       on: ons
     }, [h('span', {
       class: ['vxe-checkbox--icon', isAllCheckboxIndeterminate ? cell_getIcon().TABLE_CHECKBOX_INDETERMINATE : isAllCheckboxSelected ? cell_getIcon().TABLE_CHECKBOX_CHECKED : cell_getIcon().TABLE_CHECKBOX_UNCHECKED]
-    })].concat(titleSlot || headerTitle ? [h('span', {
+    })].concat(titleSlot || colTitle ? [h('span', {
       class: 'vxe-checkbox--label'
-    }, titleSlot ? $table.callSlot(titleSlot, checkboxParams, h) : headerTitle)] : []))]));
+    }, titleSlot ? $table.callSlot(titleSlot, checkboxParams, h) : colTitle)] : []))]));
   },
   renderCheckboxCell(h, params) {
     const {
@@ -4320,13 +4384,17 @@ const Cell = {
     } = params;
     const tableProps = $table;
     const tableReactData = $table;
+    const tableInternalData = $table;
     const {
       treeConfig
     } = tableProps;
     const {
-      selectCheckboxMaps,
-      treeIndeterminateMaps
+      updateCheckboxFlag
     } = tableReactData;
+    const {
+      selectCheckboxMaps,
+      treeIndeterminateRowMaps
+    } = tableInternalData;
     const checkboxOpts = $table.computeCheckboxOpts;
     const {
       labelField,
@@ -4347,7 +4415,7 @@ const Cell = {
     const ons = {};
     if (!isHidden) {
       const rowid = getRowid($table, row);
-      isChecked = !!selectCheckboxMaps[rowid];
+      isChecked = !!updateCheckboxFlag && !!selectCheckboxMaps[rowid];
       ons.click = evnt => {
         if (!isDisabled && isVisible) {
           $table.triggerCheckRowEvent(evnt, params, !isChecked);
@@ -4359,7 +4427,7 @@ const Cell = {
         });
       }
       if (treeConfig) {
-        indeterminate = !!treeIndeterminateMaps[rowid];
+        indeterminate = !!treeIndeterminateRowMaps[rowid];
       }
     }
     const checkboxParams = {
@@ -4405,12 +4473,16 @@ const Cell = {
     } = params;
     const tableProps = $table;
     const tableReactData = $table;
+    const tableInternalData = $table;
     const {
       treeConfig
     } = tableProps;
     const {
-      treeIndeterminateMaps
+      updateCheckboxFlag
     } = tableReactData;
+    const {
+      treeIndeterminateRowMaps
+    } = tableInternalData;
     const checkboxOpts = $table.computeCheckboxOpts;
     const {
       labelField,
@@ -4433,7 +4505,7 @@ const Cell = {
     const ons = {};
     if (!isHidden) {
       const rowid = getRowid($table, row);
-      isChecked = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, checkField);
+      isChecked = !!updateCheckboxFlag && external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, checkField);
       ons.click = evnt => {
         if (!isDisabled && isVisible) {
           $table.triggerCheckRowEvent(evnt, params, !isChecked);
@@ -4445,7 +4517,7 @@ const Cell = {
         });
       }
       if (treeConfig) {
-        isIndeterminate = !!treeIndeterminateMaps[rowid];
+        isIndeterminate = !!treeIndeterminateRowMaps[rowid];
       }
     }
     const checkboxParams = {
@@ -4492,11 +4564,11 @@ const Cell = {
       row,
       column
     } = params;
-    const tableReactData = $table;
+    const tableInternalData = $table;
     const {
       rowExpandedMaps,
       rowExpandLazyLoadedMaps
-    } = tableReactData;
+    } = tableInternalData;
     const expandOpts = $table.computeExpandOpts;
     const {
       lazy,
@@ -4608,6 +4680,8 @@ const Cell = {
     const {
       showIcon,
       allowBtn,
+      ascTitle,
+      descTitle,
       iconLayout,
       iconAsc,
       iconDesc,
@@ -4621,7 +4695,7 @@ const Cell = {
           'sort--active': column.order === 'asc'
         }],
         attrs: {
-          title: cell_getI18n('vxe.table.sortAsc')
+          title: external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(ascTitle) ? cell_getI18n('vxe.table.sortAsc') : `${ascTitle || ''}`
         },
         on: allowBtn ? {
           click(evnt) {
@@ -4634,7 +4708,7 @@ const Cell = {
           'sort--active': column.order === 'desc'
         }],
         attrs: {
-          title: cell_getI18n('vxe.table.sortDesc')
+          title: external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(descTitle) ? cell_getI18n('vxe.table.sortDesc') : `${descTitle || ''}`
         },
         on: allowBtn ? {
           click(evnt) {
@@ -5085,6 +5159,7 @@ const {
   interceptor: methods_interceptor,
   createEvent
 } = core_.VxeUI;
+const supportMaxRow = 5e6;
 const customStorageKey = 'VXE_CUSTOM_STORE';
 const maxYHeight = 5e6;
 const maxXWidth = 5e6;
@@ -5351,7 +5426,7 @@ function cacheColumnMap($xeTable) {
       fullColumnFieldData[field] = rest;
     } else {
       if (storage && !type || columnOpts.drag && (isCrossDrag || isSelfToChildDrag)) {
-        errLog('vxe.error.reqProp', [`${column.getTitle() || type || ''} -> column.field`]);
+        errLog('vxe.error.reqProp', [`${column.getTitle() || type || ''} -> column.field=?`]);
       }
     }
     if (!hasFixed && fixed) {
@@ -5457,9 +5532,12 @@ function updateAfterListIndex($xeTable) {
     fullDataRowIdData,
     fullAllDataRowIdData
   } = internalData;
+  const {
+    handleGetRowId
+  } = createHandleGetRowId($xeTable);
   const fullMaps = {};
   afterFullData.forEach((row, index) => {
-    const rowid = getRowid($xeTable, row);
+    const rowid = handleGetRowId(row);
     const rowRest = fullAllDataRowIdData[rowid];
     const seq = index + 1;
     if (rowRest) {
@@ -5513,8 +5591,11 @@ function updateAfterDataIndex($xeTable) {
   const childrenField = treeOpts.children || treeOpts.childrenField;
   const fullMaps = {};
   if (treeConfig) {
+    const {
+      handleGetRowId
+    } = createHandleGetRowId($xeTable);
     external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(afterTreeFullData, (row, index, items, path) => {
-      const rowid = 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) {
@@ -5556,25 +5637,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
+    } = createHandleGetRowId($xeTable);
     const fullData = [];
     const expandMaps = {};
     external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(internalData.afterTreeFullData, (row, index, items, path, parentRow) => {
-      const rowid = getRowid($xeTable, row);
-      const parentRowid = getRowid($xeTable, parentRow);
+      const rowid = handleGetRowId(row);
+      const parentRowid = handleGetRowId(parentRow);
       if (!parentRow || expandMaps[parentRowid] && treeExpandedMaps[parentRowid]) {
         const rowRest = fullAllDataRowIdData[rowid];
         if (rowRest) {
@@ -5963,6 +6044,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;
@@ -6014,12 +6110,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;
@@ -6029,6 +6123,10 @@ function handleCheckedAllCheckboxRow($xeTable, checked, isForce) {
     reserve,
     checkMethod
   } = checkboxOpts;
+  const {
+    handleGetRowId
+  } = createHandleGetRowId($xeTable);
+  // indeterminateField 仅支持读取
   const indeterminateField = checkboxOpts.indeterminateField || checkboxOpts.halfField;
   const selectRowMaps = {};
   /**
@@ -6041,7 +6139,7 @@ function handleCheckedAllCheckboxRow($xeTable, checked, isForce) {
         row
       })) {
         if (checked) {
-          selectRowMaps[getRowid($xeTable, row)] = row;
+          selectRowMaps[handleGetRowId(row)] = row;
         }
         external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(row, checkField, checked);
       }
@@ -6073,7 +6171,8 @@ function handleCheckedAllCheckboxRow($xeTable, checked, isForce) {
           if (isForce || !checkMethod || checkMethod({
             row
           })) {
-            selectRowMaps[getRowid($xeTable, row)] = row;
+            const rowid = handleGetRowId(row);
+            selectRowMaps[rowid] = row;
           }
         }, {
           children: childrenField
@@ -6085,7 +6184,7 @@ function handleCheckedAllCheckboxRow($xeTable, checked, isForce) {
            */
         if (!isForce && checkMethod) {
           external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(afterFullData, row => {
-            const rowid = getRowid($xeTable, row);
+            const rowid = handleGetRowId(row);
             if (checkMethod({
               row
             }) ? 0 : selectCheckboxMaps[rowid]) {
@@ -6105,7 +6204,7 @@ function handleCheckedAllCheckboxRow($xeTable, checked, isForce) {
            */
         if (!isForce && checkMethod) {
           afterFullData.forEach(row => {
-            const rowid = getRowid($xeTable, row);
+            const rowid = handleGetRowId(row);
             if (selectCheckboxMaps[rowid] || checkMethod({
               row
             })) {
@@ -6114,7 +6213,8 @@ function handleCheckedAllCheckboxRow($xeTable, checked, isForce) {
           });
         } else {
           afterFullData.forEach(row => {
-            selectRowMaps[getRowid($xeTable, row)] = row;
+            const rowid = handleGetRowId(row);
+            selectRowMaps[rowid] = row;
           });
         }
       } else {
@@ -6125,7 +6225,7 @@ function handleCheckedAllCheckboxRow($xeTable, checked, isForce) {
            */
         if (!isForce && checkMethod) {
           afterFullData.forEach(row => {
-            const rowid = getRowid($xeTable, row);
+            const rowid = handleGetRowId(row);
             if (checkMethod({
               row
             }) ? 0 : selectCheckboxMaps[rowid]) {
@@ -6145,10 +6245,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();
@@ -6164,15 +6264,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;
@@ -6190,7 +6290,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);
@@ -6199,17 +6300,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 = getRowkey($xeTable);
+      expandRowKeys.forEach(rowid => {
+        const matchObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findTree(tableFullData, item => rowid === external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_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 = 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 (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_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 = 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 = 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 {
@@ -6284,12 +6562,15 @@ function handleVirtualYVisible($xeTable) {
       toVisibleIndex = Math.floor(startTop / defaultRowHeight) - 1;
       visibleSize = Math.ceil(clientHeight / defaultRowHeight) + 1;
     } else {
+      const {
+        handleGetRowId
+      } = 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 = getRowid($xeTable, row);
+        const rowid = handleGetRowId(row);
         const rowRest = fullAllDataRowIdData[rowid] || {};
         if (rowRest.oTop <= startTop) {
           leftIndex = rIndex + 1;
@@ -6300,7 +6581,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 = getRowid($xeTable, row);
+        const rowid = handleGetRowId(row);
         const rowRest = fullAllDataRowIdData[rowid] || {};
         visibleSize++;
         if (rowRest.oTop > endTop || visibleSize >= 100) {
@@ -6339,12 +6620,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 (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(merges)) {
       merges = [merges];
     }
@@ -6394,13 +6679,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 (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(merges)) {
       merges = [merges];
     }
@@ -6631,8 +6920,11 @@ const calcCellHeight = $xeTable => {
   const defaultRowHeight = $xeTable.computeDefaultRowHeight;
   const el = $xeTable.$refs.refElem;
   if (!isAllOverflow && scrollYLoad && el) {
+    const {
+      handleGetRowId
+    } = createHandleGetRowId($xeTable);
     tableData.forEach(row => {
-      const rowid = getRowid($xeTable, row);
+      const rowid = handleGetRowId(row);
       const rowRest = fullAllDataRowIdData[rowid];
       if (rowRest) {
         const height = calcCellAutoHeight(rowRest, el);
@@ -7370,6 +7662,39 @@ function loadScrollYData($xeTable) {
     }
   }
 }
+const createGetRowCacheProp = prop => {
+  return function (row) {
+    const $xeTable = this;
+    const internalData = $xeTable;
+    const {
+      fullAllDataRowIdData
+    } = internalData;
+    if (row) {
+      const rowid = 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 {
@@ -7541,7 +7866,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);
@@ -7553,7 +7878,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);
@@ -7578,21 +7903,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
+  } = createHandleGetRowId($xeTable);
   let offsetTop = 0;
   for (let rIndex = 0, rLen = afterFullData.length; rIndex < rLen; rIndex++) {
     const row = afterFullData[rIndex];
-    const rowid = getRowid($xeTable, row);
+    const rowid = handleGetRowId(row);
     const rowRest = fullAllDataRowIdData[rowid] || {};
     rowRest.oTop = offsetTop;
     offsetTop += rowRest.resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight;
@@ -7608,7 +7936,8 @@ function updateRowExpandStyle($xeTable) {
   const {
     expandColumn,
     scrollYLoad,
-    rowExpandedMaps
+    scrollYTop,
+    isScrollYBig
   } = reactData;
   const expandOpts = $xeTable.computeExpandOpts;
   const rowOpts = $xeTable.computeRowOpts;
@@ -7620,41 +7949,35 @@ function updateRowExpandStyle($xeTable) {
   if (expandColumn && mode === 'fixed') {
     const {
       elemStore,
-      afterFullData,
       fullAllDataRowIdData
     } = internalData;
     const rowExpandEl = $xeTable.$refs.refRowExpandElem;
     const bodyScrollElem = 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 = 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;
-          }
-        }
-      }
       external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_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 = 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 = toCssUnit(trEl.offsetTop + trEl.offsetHeight);
+              offsetTop = trEl.offsetTop + trEl.offsetHeight;
             }
           }
+          if (isScrollYBig) {
+            offsetTop += scrollYTop;
+          }
+          expandEl.style.top = toCssUnit(offsetTop);
           if (!isUpdateHeight) {
             if (rowRest.expandHeight !== expandHeight) {
               isUpdateHeight = true;
@@ -7665,6 +7988,9 @@ function updateRowExpandStyle($xeTable) {
       });
       if (isUpdateHeight) {
         reactData.rowExpandHeightFlag++;
+        $xeTable.$nextTick(() => {
+          updateRowOffsetTop($xeTable);
+        });
       }
     }
   }
@@ -7695,6 +8021,10 @@ const Methods = {
     }
     return [];
   },
+  getEl() {
+    const $xeTable = this;
+    return $xeTable.$refs.refElem;
+  },
   /**
    * 获取父容器元素
    */
@@ -7709,14 +8039,27 @@ const Methods = {
    * 获取父容器的高度
    */
   getParentHeight() {
+    const $xeTable = this;
+    const $xeGrid = $xeTable.$xeGrid;
+    const props = $xeTable;
     const {
-      $el,
-      $xegrid,
       height
-    } = this;
-    const parentElem = $el.parentNode;
-    const parentPaddingSize = height === '100%' || height === 'auto' ? getPaddingTopBottomSize(parentElem) : 0;
-    return Math.floor($xegrid ? $xegrid.getParentHeight() : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(getComputedStyle(parentElem).height) - parentPaddingSize);
+    } = props;
+    const el = $xeTable.$refs.refElem;
+    if (el) {
+      const parentElem = el.parentNode;
+      const parentPaddingSize = height === '100%' || height === 'auto' ? getPaddingTopBottomSize(parentElem) : 0;
+      let parentWrapperHeight = 0;
+      if (parentElem) {
+        if ($xeGrid && hasClass(parentElem, 'vxe-grid--table-wrapper')) {
+          parentWrapperHeight = $xeGrid.getParentHeight();
+        } else {
+          parentWrapperHeight = parentElem.clientHeight;
+        }
+      }
+      return Math.floor(parentWrapperHeight - parentPaddingSize);
+    }
+    return 0;
   },
   /**
    * 获取需要排除的高度
@@ -7826,6 +8169,9 @@ const Methods = {
     const childrenField = treeOpts.children || treeOpts.childrenField;
     let treeData = [];
     let fullData = datas ? datas.slice(0) : [];
+    if (fullData.length > supportMaxRow) {
+      errLog('vxe.error.errMaxRow', [supportMaxRow]);
+    }
     if (treeConfig) {
       // 树结构自动转换
       if (treeOpts.transform) {
@@ -7919,7 +8265,7 @@ const Methods = {
         //   warnLog('vxe.error.reqProp', ['table.show-overflow'])
         // }
         if (this.spanMethod) {
-          warnLog('vxe.error.scrollErrProp', ['table.span-method']);
+          errLog('vxe.error.scrollErrProp', ['table.span-method']);
         }
       }
       handleReserveStatus($xeTable);
@@ -8070,45 +8416,27 @@ 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;
     const hasChildField = treeOpts.hasChild || treeOpts.hasChildField;
-    const rowkey = getRowkey($xeTable);
+    const {
+      lazy
+    } = treeOpts;
     const fullAllDataRowIdMaps = {
       ...fullAllDataRowIdData
     }; // 存在已删除数据
     const fullDataRowIdMaps = {};
-    const treeTempExpandedMaps = {
-      ...treeExpandedMaps
-    };
-    const handleRow = (row, index, items, path, parentRow, nodes) => {
-      let rowid = getRowid($xeTable, row);
-      const seq = treeConfig && path ? toTreePathSeq(path) : index + 1;
-      const level = nodes ? nodes.length - 1 : 0;
-      if (eqEmptyValue(rowid)) {
-        rowid = getRowUniqueId();
-        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(row, rowkey, rowid);
-      }
-      if (treeConfig && treeOpts.lazy) {
-        const treeExpRest = treeExpandedMaps[rowid];
-        if (row[hasChildField] && external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(row[childrenField])) {
-          row[childrenField] = null;
-        }
-        if (treeExpRest) {
-          if (!row[childrenField] || !row[childrenField].length) {
-            delete treeTempExpandedMaps[rowid];
-          }
-        }
-      }
-      let rowRest = fullAllDataRowIdData[rowid];
+    const {
+      handleUpdateRowId
+    } = createHandleUpdateRowId($xeTable);
+    const handleRowCache = (row, index, items, currIndex, parentRow, rowid, level, seq) => {
+      let rowRest = fullAllDataRowIdMaps[rowid];
       if (!rowRest) {
         rowRest = {
           row,
@@ -8133,40 +8461,53 @@ const Methods = {
       rowRest.items = items;
       rowRest.parent = parentRow;
       rowRest.level = level;
-      rowRest.index = treeConfig && parentRow ? -1 : index;
+      rowRest.index = currIndex;
+      rowRest.treeIndex = index;
       fullDataRowIdMaps[rowid] = rowRest;
       fullAllDataRowIdMaps[rowid] = rowRest;
     };
     if (treeConfig) {
-      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(tableFullTreeData, handleRow, {
+      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(tableFullTreeData, (row, index, items, path, parentRow, nodes) => {
+        const rowid = handleUpdateRowId(row);
+        if (treeConfig && lazy) {
+          if (row[hasChildField] && row[childrenField] === undefined) {
+            row[childrenField] = null;
+          }
+          if (treeExpandedMaps[rowid]) {
+            if (!row[childrenField] || !row[childrenField].length) {
+              delete treeExpandedMaps[rowid];
+            }
+          }
+        }
+        handleRowCache(row, index, items, parentRow ? -1 : index, parentRow, rowid, nodes.length - 1, toTreePathSeq(path));
+      }, {
         children: childrenField
       });
     } else {
-      tableFullData.forEach(handleRow);
+      tableFullData.forEach((row, index, items) => {
+        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 = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(fullData, true);
-    const rowkey = getRowkey(this);
-    sourceDataRowIdData = this.sourceDataRowIdData = {};
+    const {
+      handleUpdateRowId
+    } = createHandleUpdateRowId($xeTable);
+    const sourceRowIdData = {};
     const handleSourceRow = row => {
-      let rowid = getRowid(this, row);
-      if (eqEmptyValue(rowid)) {
-        rowid = getRowUniqueId();
-        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(row, rowkey, rowid);
-      }
-      sourceDataRowIdData[rowid] = {
-        row,
-        rowid
-      };
+      const rowid = handleUpdateRowId(row);
+      sourceRowIdData[rowid] = row;
     };
     // 源数据缓存
     if (treeConfig) {
@@ -8177,7 +8518,8 @@ const Methods = {
     } else {
       sourceData.forEach(handleSourceRow);
     }
-    this.tableSourceData = sourceData;
+    internalData.sourceDataRowIdData = sourceRowIdData;
+    internalData.tableSourceData = sourceData;
   },
   getParams() {
     return this.params;
@@ -8297,53 +8639,22 @@ const Methods = {
    * 根据 row 获取序号
    * @param {Row} row 行对象
    */
-  getRowSeq(row) {
-    const {
-      fullAllDataRowIdData
-    } = this;
-    if (row) {
-      const rowid = 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 = 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 = getRowid(this, row);
-      const rest = fullAllDataRowIdData[rowid];
-      if (rest) {
-        return rest._index;
-      }
-    }
-    return -1;
-  },
+  getVTRowIndex: createGetRowCacheProp('_index'),
+  /**
+   * 根据 row 获取渲染中的虚拟索引
+   * @param {Row} row 行对象
+   */
+  getVMRowIndex: createGetRowCacheProp('$index'),
   // 在 v3 中废弃
   _getRowIndex(row) {
     if (true) {
@@ -8351,23 +8662,6 @@ const Methods = {
     }
     return this.getVTRowIndex(row);
   },
-  /**
-   * 根据 row 获取渲染中的虚拟索引
-   * @param {Row} row 行对象
-   */
-  getVMRowIndex(row) {
-    const {
-      fullAllDataRowIdData
-    } = this;
-    if (row) {
-      const rowid = getRowid(this, row);
-      const rest = fullAllDataRowIdData[rowid];
-      if (rest) {
-        return rest.$index;
-      }
-    }
-    return -1;
-  },
   // 在 v3 中废弃
   $getRowIndex(row) {
     if (true) {
@@ -8379,34 +8673,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 (true) {
@@ -8414,22 +8691,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 (true) {
@@ -8538,20 +8799,30 @@ const Methods = {
       keepSource,
       treeConfig
     } = props;
+    const {
+      editStore
+    } = reactData;
     const {
       fullAllDataRowIdData,
+      fullDataRowIdData,
       tableSourceData,
       sourceDataRowIdData,
       tableFullData,
       afterFullData
     } = internalData;
+    const removeTempMaps = {
+      ...editStore.removeMaps
+    };
     const treeOpts = $xeTable.computeTreeOpts;
     const {
       transform
     } = treeOpts;
+    const {
+      handleGetRowId
+    } = createHandleGetRowId($xeTable);
     if (!keepSource) {
       if (true) {
-        warnLog('vxe.error.reqProp', ['keep-source']);
+        errLog('vxe.error.reqProp', ['keep-source']);
       }
       return $xeTable.$nextTick();
     }
@@ -8565,22 +8836,23 @@ const Methods = {
     }
     let reDelFlag = false;
     if (targetRows.length) {
-      targetRows.forEach(row => {
-        if (!$xeTable.isInsertByRow(row)) {
-          const rowid = getRowid($xeTable, row);
-          const oRow = sourceDataRowIdData[rowid];
-          if (oRow && row) {
-            if (field) {
-              external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(row, field, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(oRow, field), true));
-            } else {
-              external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().destructuring(row, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(oRow, true));
-            }
-            if ($xeTable.isRemoveByRow(row)) {
-              const rowRest = fullAllDataRowIdData[rowid];
-              if (rowRest) {
-                const reRow = rowRest.row;
-                tableFullData.unshift(reRow);
-                afterFullData.unshift(reRow);
+      targetRows.forEach(item => {
+        const rowid = handleGetRowId(item);
+        const rowRest = fullAllDataRowIdData[rowid];
+        if (rowRest) {
+          const row = rowRest.row;
+          if (!$xeTable.isInsertByRow(row)) {
+            const oRow = sourceDataRowIdData[rowid];
+            if (oRow && row) {
+              if (field) {
+                external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(row, field, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(oRow, field), true));
+              } else {
+                external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().destructuring(row, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(oRow, true));
+              }
+              if (!fullDataRowIdData[rowid] && $xeTable.isRemoveByRow(row)) {
+                delete removeTempMaps[rowid];
+                tableFullData.unshift(row);
+                afterFullData.unshift(row);
                 reDelFlag = true;
               }
             }
@@ -8590,6 +8862,7 @@ const Methods = {
     }
     if (rows) {
       if (reDelFlag) {
+        editStore.removeMaps = removeTempMaps;
         $xeTable.updateFooter();
         $xeTable.cacheRowMap(false);
         $xeTable.handleTableData(treeConfig && transform);
@@ -8769,25 +9042,31 @@ const Methods = {
   },
   /**
    * 检查行或列数据是否发生改变
-   * @param {Row} row 行对象
+   * @param {Row} rowOrId 行对象
    * @param {String} field 字段名
    */
-  isUpdateByRow(row, field) {
+  isUpdateByRow(rowOrId, field) {
+    const $xeTable = this;
+    const props = $xeTable;
+    const internalData = $xeTable;
+    const {
+      keepSource
+    } = props;
     const {
       tableFullColumn,
-      keepSource,
-      sourceDataRowIdData,
-      fullDataRowIdData
-    } = this;
+      fullDataRowIdData,
+      sourceDataRowIdData
+    } = internalData;
     if (keepSource) {
-      const rowid = getRowid(this, row);
+      const rowid = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(rowOrId) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(rowOrId) ? rowOrId : getRowid($xeTable, rowOrId);
+      const rowRest = fullDataRowIdData[rowid];
       // 新增的数据不需要检测
-      if (!fullDataRowIdData[rowid]) {
+      if (!rowRest) {
         return false;
       }
-      const oldRest = sourceDataRowIdData[rowid];
-      if (oldRest) {
-        const oRow = oldRest.row;
+      const row = rowRest.row;
+      const oRow = sourceDataRowIdData[rowid];
+      if (oRow) {
         if (arguments.length > 1) {
           return !eqCellValue(oRow, row, field);
         }
@@ -8849,6 +9128,113 @@ const Methods = {
       tableColumn: this.tableColumn.slice(0)
     };
   },
+  /**
+   * 移动列到指定列的位置
+   * @param fieldOrColumn
+   * @param targetFieldOrColumn
+   * @param options
+   */
+  moveColumnTo(fieldOrColumn, targetFieldOrColumn, options) {
+    const $xeTable = this;
+    const internalData = $xeTable;
+    const {
+      fullColumnIdData,
+      visibleColumn
+    } = internalData;
+    const {
+      dragToChild,
+      dragPos,
+      isCrossDrag
+    } = Object.assign({}, options);
+    const dragCol = handleFieldOrColumn($xeTable, fieldOrColumn);
+    let prevDragCol = null;
+    const colRest = dragCol ? fullColumnIdData[dragCol.id] : null;
+    let defPos = 'left';
+    if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(targetFieldOrColumn)) {
+      if (colRest && targetFieldOrColumn) {
+        let currList = colRest.items;
+        let offsetIndex = colRest._index + targetFieldOrColumn;
+        if (isCrossDrag) {
+          currList = visibleColumn;
+          offsetIndex = colRest._index + targetFieldOrColumn;
+        }
+        if (offsetIndex > 0 && offsetIndex < currList.length - 1) {
+          prevDragCol = currList[offsetIndex];
+        }
+        if (targetFieldOrColumn > 0) {
+          defPos = 'right';
+        }
+      }
+    } else {
+      prevDragCol = handleFieldOrColumn($xeTable, targetFieldOrColumn);
+      const targetColRest = prevDragCol ? fullColumnIdData[prevDragCol.id] : null;
+      if (colRest && targetColRest) {
+        if (targetColRest._index > colRest._index) {
+          defPos = 'right';
+        }
+      }
+    }
+    return $xeTable.handleColDragSwapEvent(null, true, dragCol, prevDragCol, dragPos || defPos, dragToChild === true);
+  },
+  /**
+   * 移动行到指定行的位置
+   * @param rowidOrRow
+   * @param targetRowidOrRow
+   * @param options
+   */
+  moveRowTo(rowidOrRow, targetRowidOrRow, options) {
+    const $xeTable = this;
+    const props = $xeTable;
+    const internalData = $xeTable;
+    const {
+      treeConfig
+    } = props;
+    const {
+      fullAllDataRowIdData,
+      afterFullData
+    } = internalData;
+    const {
+      dragToChild,
+      dragPos,
+      isCrossDrag
+    } = Object.assign({}, options);
+    const treeOpts = $xeTable.computeTreeOpts;
+    const dragRow = handleRowidOrRow($xeTable, rowidOrRow);
+    let prevDragRow = null;
+    let defPos = 'top';
+    const rowRest = dragRow ? fullAllDataRowIdData[getRowid($xeTable, dragRow)] : null;
+    if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(targetRowidOrRow)) {
+      if (rowRest && targetRowidOrRow) {
+        let currList = afterFullData;
+        let offsetIndex = rowRest._index + targetRowidOrRow;
+        if (treeConfig) {
+          currList = rowRest.items;
+          if (treeOpts.transform) {
+            offsetIndex = rowRest.treeIndex + targetRowidOrRow;
+            if (isCrossDrag) {
+              currList = afterFullData;
+              offsetIndex = rowRest._index + targetRowidOrRow;
+            }
+          }
+        }
+        if (offsetIndex >= 0 && offsetIndex <= currList.length - 1) {
+          prevDragRow = currList[offsetIndex];
+        }
+        if (targetRowidOrRow > 0) {
+          defPos = 'bottom';
+        }
+      }
+    } else {
+      prevDragRow = handleRowidOrRow($xeTable, targetRowidOrRow);
+      const targetRowRest = prevDragRow ? fullAllDataRowIdData[getRowid($xeTable, prevDragRow)] : null;
+      if (rowRest && targetRowRest) {
+        if (targetRowRest._index > rowRest._index) {
+          defPos = 'bottom';
+        }
+      }
+    }
+    return $xeTable.handleRowDragSwapEvent(null, true, dragRow, prevDragRow, dragPos || defPos, dragToChild === true);
+  },
   /**
    * 获取表格的全量列
    */
@@ -8871,16 +9257,23 @@ const Methods = {
    * 用于多选行，获取已选中的数据
    */
   getCheckboxRecords(isFull) {
+    const $xeTable = this;
+    const props = $xeTable;
+    const internalData = $xeTable;
+    const {
+      treeConfig
+    } = props;
     const {
       tableFullData,
       afterFullData,
-      treeConfig,
-      treeOpts,
-      checkboxOpts,
-      tableFullTreeData,
       afterTreeFullData,
-      afterFullRowMaps
-    } = this;
+      tableFullTreeData,
+      fullDataRowIdData,
+      afterFullRowMaps,
+      selectCheckboxMaps
+    } = internalData;
+    const treeOpts = $xeTable.computeTreeOpts;
+    const checkboxOpts = $xeTable.computeCheckboxOpts;
     const {
       transform,
       mapChildrenField
@@ -8889,21 +9282,18 @@ const Methods = {
       checkField
     } = checkboxOpts;
     const childrenField = treeOpts.children || treeOpts.childrenField;
-    const currTableData = isFull ? transform ? tableFullTreeData : tableFullData : transform ? afterTreeFullData : afterFullData;
     let rowList = [];
     if (checkField) {
       if (treeConfig) {
+        const currTableData = isFull ? transform ? tableFullTreeData : tableFullData : transform ? afterTreeFullData : afterFullData;
         rowList = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().filterTree(currTableData, row => external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, checkField), {
           children: transform ? mapChildrenField : childrenField
         });
       } else {
+        const currTableData = isFull ? tableFullData : afterFullData;
         rowList = currTableData.filter(row => external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, checkField));
       }
     } else {
-      const {
-        selectCheckboxMaps,
-        fullDataRowIdData
-      } = this;
       external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(selectCheckboxMaps, (row, rowid) => {
         if (isFull) {
           if (fullDataRowIdData[rowid]) {
@@ -9322,6 +9712,7 @@ const Methods = {
    * 默认执行一次，除非被重置
    */
   handleLoadDefaults() {
+    const $xeTable = this;
     if (this.checkboxConfig) {
       this.handleDefaultSelectionChecked();
     }
@@ -9332,7 +9723,7 @@ const Methods = {
       this.handleDefaultRowExpand();
     }
     if (this.treeConfig) {
-      this.handleDefaultTreeExpand();
+      handleDefaultTreeExpand($xeTable);
     }
     if (this.mergeCells) {
       this.handleDefaultMergeCells();
@@ -9617,14 +10008,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 = {};
@@ -9641,48 +10044,38 @@ const Methods = {
     }
     let hasResizable = 0;
     let hasSort = 0;
-    let hasFixedt = 0;
+    let hasFixed = 0;
     let hasVisible = 0;
     external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(collectColumn, (column, index, items, path, parentColumn) => {
+      const colKey = column.getKey();
+      if (!colKey) {
+        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;
         }
       }
     });
@@ -9692,7 +10085,7 @@ const Methods = {
     if (hasSort) {
       storeData.sortData = sortData;
     }
-    if (hasFixedt) {
+    if (hasFixed) {
       storeData.fixedData = fixedData;
     }
     if (hasVisible) {
@@ -10244,12 +10637,15 @@ const Methods = {
       fullAllDataRowIdData,
       afterFullData
     } = internalData;
+    const {
+      handleGetRowId
+    } = createHandleGetRowId($xeTable);
     const rowOpts = $xeTable.computeRowOpts;
     const cellOpts = $xeTable.computeCellOpts;
     const defaultRowHeight = $xeTable.computeDefaultRowHeight;
     const rest = {};
     afterFullData.forEach(row => {
-      const rowid = getRowid($xeTable, row);
+      const rowid = handleGetRowId(row);
       const rowRest = fullAllDataRowIdData[rowid];
       if (rowRest) {
         const resizeHeight = rowRest.resizeHeight;
@@ -10278,8 +10674,11 @@ const Methods = {
       rHeight = Math.floor(rHeight * bodyHeight);
     }
     if (rHeight) {
+      const {
+        handleGetRowId
+      } = createHandleGetRowId($xeTable);
       rows.forEach(row => {
-        const rowid = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(row) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(row) ? row : getRowid($xeTable, row);
+        const rowid = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(row) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(row) ? row : handleGetRowId(row);
         const rowRest = fullAllDataRowIdData[rowid];
         if (rowRest) {
           rowRest.resizeHeight = rHeight;
@@ -10437,13 +10836,26 @@ 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: this.$xegrid,
+        $table: this,
+        $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();
       }
@@ -10679,10 +11091,12 @@ const Methods = {
           treeConfig,
           treeOpts,
           highlightCurrentRow,
+          highlightCurrentColumn,
           currentRow,
           bodyCtxMenu,
           rowOpts
         } = this;
+        const columnOpts = $xeTable.computeColumnOpts;
         const {
           selected,
           actived
@@ -10838,10 +11252,15 @@ 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.moveSelected(selected.args, isLeftArrow, isUpArrow, isRightArrow, isDwArrow, evnt);
+            }
+            // 当前行按键上下移动
+            if ((isUpArrow || isDwArrow) && (rowOpts.isCurrent || highlightCurrentRow)) {
+              $xeTable.moveCurrentRow(isUpArrow, isDwArrow, evnt);
+            }
+            // 当前行按键左右移动
+            if ((isLeftArrow || isRightArrow) && (columnOpts.isCurrent || highlightCurrentColumn)) {
+              $xeTable.moveCurrentColumn(isLeftArrow, isRightArrow, evnt);
             }
           }
         } else if (isTab && keyboardConfig && keyboardOpts.isTab) {
@@ -11220,15 +11639,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 = [];
-      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(treeIndeterminateMaps, (item, rowid) => {
+      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(treeIndeterminateRowMaps, (item, rowid) => {
         if (item) {
           fullRest.push(item);
           if (fullDataRowIdData[rowid]) {
@@ -11305,9 +11729,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
@@ -11315,17 +11743,18 @@ const Methods = {
     if (checkField) {
       return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, checkField);
     }
-    return !!selectCheckboxMaps[getRowid($xeTable, row)];
+    return !!updateCheckboxFlag && !!selectCheckboxMaps[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 {
@@ -11338,23 +11767,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[getRowid($xeTable, row)] && !$xeTable.isCheckedByCheckboxRow(row);
+      treeIndeterminateRowMaps
+    } = internalData;
+    return !!treeIndeterminateRowMaps[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);
   },
   /**
    * 切换选中
@@ -11364,13 +11793,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,
@@ -11383,6 +11812,10 @@ const Methods = {
       checkStrictly,
       checkMethod
     } = checkboxOpts;
+    const {
+      handleGetRowId
+    } = createHandleGetRowId($xeTable);
+    // indeterminateField 仅支持读取
     const indeterminateField = checkboxOpts.indeterminateField || checkboxOpts.halfField;
     if (checkField) {
       // 树结构
@@ -11401,35 +11834,34 @@ const Methods = {
         }, {
           children: transform ? mapChildrenField : childrenField
         });
-        reactData.selectCheckboxMaps = selectRowMaps;
+        reactData.updateCheckboxFlag++;
         return;
-      } else {
-        // 列表
-        rows.forEach(row => {
-          if (isForce || !checkMethod || checkMethod({
-            row
-          })) {
-            external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(row, checkField, checked);
-            handleCheckboxReserveRow($xeTable, row, checked);
-          }
-        });
       }
-      reactData.selectCheckboxMaps = selectRowMaps;
+      // 列表
+      rows.forEach(row => {
+        if (isForce || !checkMethod || checkMethod({
+          row
+        })) {
+          external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(row, checkField, checked);
+          handleCheckboxReserveRow($xeTable, row, checked);
+        }
+      });
+      reactData.updateCheckboxFlag++;
       return;
     }
     // 树结构
     if (treeConfig && !checkStrictly) {
       // 更新子节点状态
       external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(rows, row => {
-        const rowid = 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);
@@ -11437,28 +11869,28 @@ const Methods = {
       }, {
         children: transform ? mapChildrenField : childrenField
       });
-      reactData.selectCheckboxMaps = selectRowMaps;
+      reactData.updateCheckboxFlag++;
       return;
     }
     // 列表
     rows.forEach(row => {
-      const rowid = 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;
   },
   /**
    * 即将移除
@@ -11471,10 +11903,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
@@ -11489,43 +11923,47 @@ const Methods = {
     if (checkField) {
       checked = !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, checkField);
     } else {
-      checked = !selectCheckboxMaps[getRowid(this, row)];
+      checked = !selectCheckboxMaps[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;
@@ -11535,12 +11973,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);
     }
@@ -11550,10 +11988,11 @@ const Methods = {
    */
   toggleCheckboxRow(row) {
     const $xeTable = this;
+    const internalData = $xeTable;
     const {
-      selectCheckboxMaps,
-      checkboxOpts
-    } = this;
+      selectCheckboxMaps
+    } = internalData;
+    const checkboxOpts = $xeTable.computeCheckboxOpts;
     const {
       checkField
     } = checkboxOpts;
@@ -11580,10 +12019,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,
@@ -11604,10 +12041,13 @@ const Methods = {
     }
     // 树结构
     if (treeConfig) {
+      const {
+        handleGetRowId
+      } = createHandleGetRowId($xeTable);
       const childRowMaps = {};
       const childRowList = [];
       external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(afterTreeFullData, row => {
-        const rowid = getRowid($xeTable, row);
+        const rowid = handleGetRowId(row);
         const childList = row[transform ? mapChildrenField : childrenField];
         if (childList && childList.length && !childRowMaps[rowid]) {
           childRowMaps[rowid] = 1;
@@ -11624,30 +12064,30 @@ const Methods = {
         let hLen = 0; // 半选
         let vLen = 0; // 有效行
         childList.forEach(checkMethod ? item => {
-          const childRowid = getRowid($xeTable, item);
-          const isSelect = checkField ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(item, checkField) : selectRowMaps[childRowid];
+          const childRowid = handleGetRowId(item);
+          const isSelect = checkField ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_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 = getRowid($xeTable, item);
-          const isSelect = checkField ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(item, checkField) : selectRowMaps[childRowid];
+          const childRowid = handleGetRowId(item);
+          const isSelect = checkField ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(item, checkField) : selectCheckboxMaps[childRowid];
           if (isSelect) {
             sLen++;
-          } else if (halfRowMaps[childRowid]) {
+          } else if (treeIndeterminateRowMaps[childRowid]) {
             hLen++;
           }
           vLen++;
@@ -11659,29 +12099,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;
@@ -11692,9 +12131,12 @@ const Methods = {
       treeConfig
     } = props;
     const {
+      afterFullData,
+      afterTreeFullData,
+      checkboxReserveRowMap,
       selectCheckboxMaps,
-      treeIndeterminateMaps
-    } = reactData;
+      treeIndeterminateRowMaps
+    } = internalData;
     const checkboxOpts = $xeTable.computeCheckboxOpts;
     const {
       checkField,
@@ -11702,39 +12144,37 @@ const Methods = {
       showReserveStatus
     } = checkboxOpts;
     const {
-      afterFullData,
-      afterTreeFullData,
-      checkboxReserveRowMap
-    } = internalData;
+      handleGetRowId
+    } = createHandleGetRowId($xeTable);
     let sLen = 0; // 已选
     let hLen = 0; // 半选
     let vLen = 0; // 有效行
     const rootList = treeConfig ? afterTreeFullData : afterFullData;
     rootList.forEach(checkMethod ? row => {
-      const childRowid = getRowid($xeTable, row);
+      const childRowid = handleGetRowId(row);
       const selected = checkField ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_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 = getRowid($xeTable, row);
+      const childRowid = handleGetRowId(row);
       const selected = checkField ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, checkField) : selectCheckboxMaps[childRowid];
       if (selected) {
         sLen++;
-      } else if (treeIndeterminateMaps[childRowid]) {
+      } else if (treeIndeterminateRowMaps[childRowid]) {
         hLen++;
       }
       vLen++;
@@ -11798,27 +12238,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
+      } = createHandleGetRowId($xeTable);
       const afterFullIdMaps = {};
       if (treeConfig) {
         external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(afterFullData, row => {
-          afterFullIdMaps[getRowid(this, row)] = 1;
+          afterFullIdMaps[handleGetRowId(row)] = 1;
         }, {
           children: childrenField
         });
       } else {
         afterFullData.forEach(row => {
-          afterFullIdMaps[getRowid(this, row)] = 1;
+          afterFullIdMaps[handleGetRowId(row)] = 1;
         });
       }
       external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(checkboxReserveRowMap, (oldRow, oldRowid) => {
@@ -11860,9 +12308,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);
     }
@@ -11898,17 +12346,24 @@ 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) {
       const handleClearChecked = item => {
@@ -11928,10 +12383,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();
   },
   /**
@@ -12184,12 +12640,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;
@@ -12206,7 +12664,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();
@@ -12224,13 +12682,25 @@ const Methods = {
    * @param {ColumnInfo} fieldOrColumn 列配置
    */
   setCurrentColumn(fieldOrColumn) {
-    const column = 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 = 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();
+      }
+    });
   },
   /**
    * 用于当前列，手动清空当前高亮的状态
@@ -12239,21 +12709,6 @@ const Methods = {
     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);
-    });
-  },
   /**
    * 列点击事件
    * 如果是单击模式，则激活为编辑状态
@@ -12265,6 +12720,7 @@ const Methods = {
     const reactData = $xeTable;
     const {
       highlightCurrentRow,
+      highlightCurrentColumn,
       editConfig
     } = props;
     const {
@@ -12281,6 +12737,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
@@ -12311,11 +12769,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);
       }
     }
     // 如果点击了树节点
@@ -12324,16 +12782,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);
         }
       }
       // 如果设置了单元格选中功能，则不会使用点击事件去处理（只能支持双击模式）
@@ -12345,14 +12809,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);
             }
           }
         }
@@ -12372,7 +12836,7 @@ const Methods = {
         }
       }
     }
-    this.emitEvent('cell-click', params, evnt);
+    $xeTable.dispatchEvent('cell-click', params, evnt);
   },
   /**
    * 列双击点击事件
@@ -12403,11 +12867,11 @@ const Methods = {
     if (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);
         }
       }
     }
@@ -12659,6 +13123,8 @@ const Methods = {
     } = props;
     const rowDragOpts = $xeTable.computeRowDragOpts;
     const {
+      afterFullData,
+      tableFullData,
       fullAllDataRowIdData
     } = internalData;
     const {
@@ -12676,12 +13142,11 @@ 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 = {
+      status: false
+    };
     if (prevDragRow && dragRow) {
       // 判断是否有拖动
       if (prevDragRow !== dragRow) {
@@ -12696,7 +13161,7 @@ const Methods = {
         const isDragToChildFlag = isSelfToChildDrag && dragToChildMethod ? dragToChildMethod(dragParams) : prevDragToChild;
         return Promise.resolve(dEndMethod ? dEndMethod(dragParams) : true).then(status => {
           if (!status) {
-            return;
+            return errRest;
           }
           let oafIndex = -1;
           let nafIndex = -1;
@@ -12727,11 +13192,11 @@ const Methods = {
                   if (isPeerDrag && !isCrossDrag) {
                     if (oldRest.row[parentField] !== newRest.row[parentField]) {
                       // 非同级
-                      return;
+                      return errRest;
                     }
                   } else {
                     if (!isCrossDrag) {
-                      return;
+                      return errRest;
                     }
                     if (oldAllMaps[newRowid]) {
                       isSelfToChildStatus = true;
@@ -12742,19 +13207,19 @@ const Methods = {
                             content: methods_getI18n('vxe.error.treeDragChild')
                           });
                         }
-                        return;
+                        return errRest;
                       }
                     }
                   }
                 } else if (oldLevel) {
                   // 子到根
                   if (!isCrossDrag) {
-                    return;
+                    return errRest;
                   }
                 } else if (newLevel) {
                   // 根到子
                   if (!isCrossDrag) {
-                    return;
+                    return errRest;
                   }
                   if (oldAllMaps[newRowid]) {
                     isSelfToChildStatus = true;
@@ -12765,7 +13230,7 @@ const Methods = {
                           content: methods_getI18n('vxe.error.treeDragChild')
                         });
                       }
-                      return;
+                      return errRest;
                     }
                   }
                 } else {
@@ -12823,26 +13288,34 @@ const Methods = {
           if (reactData.scrollYLoad) {
             $xeTable.updateScrollYSpace();
           }
-          $xeTable.$nextTick().then(() => {
+          if (evnt) {
+            $xeTable.dispatchEvent('row-dragend', {
+              oldRow: dragRow,
+              newRow: prevDragRow,
+              dragRow,
+              dragPos: prevDragPos,
+              dragToChild: isDragToChildFlag,
+              offsetIndex: dragOffsetIndex,
+              _index: {
+                newIndex: nafIndex,
+                oldIndex: oafIndex
+              }
+            }, evnt);
+          }
+          return $xeTable.$nextTick().then(() => {
             $xeTable.updateCellAreas();
             $xeTable.recalculate();
+          }).then(() => {
+            return {
+              status: true
+            };
           });
-          $xeTable.dispatchEvent('row-dragend', {
-            oldRow: dragRow,
-            newRow: prevDragRow,
-            dragRow,
-            dragPos: prevDragPos,
-            dragToChild: isDragToChildFlag,
-            offsetIndex: dragOffsetIndex,
-            _index: {
-              newIndex: nafIndex,
-              oldIndex: oafIndex
-            }
-          }, evnt);
-        }).catch(() => {});
+        }).catch(() => {
+          return errRest;
+        });
       }
     }
-    return Promise.resolve();
+    return Promise.resolve(errRest);
   },
   handleRowDragDragendEvent(evnt) {
     const $xeTable = this;
@@ -13028,6 +13501,9 @@ const Methods = {
       collectColumn
     } = internalData;
     const dragOffsetIndex = prevDragPos === 'right' ? 1 : 0;
+    const errRest = {
+      status: false
+    };
     if (prevDragCol && dragCol) {
       // 判断是否有拖动
       if (prevDragCol !== dragCol) {
@@ -13044,7 +13520,7 @@ const Methods = {
         const isDragToChildFlag = isSelfToChildDrag && dragToChildMethod ? dragToChildMethod(dragParams) : prevDragToChild;
         return Promise.resolve(dragEndMethod ? dragEndMethod(dragParams) : true).then(status => {
           if (!status) {
-            return;
+            return errRest;
           }
           let oafIndex = -1;
           let nafIndex = -1;
@@ -13058,11 +13534,11 @@ const Methods = {
             if (isPeerDrag && !isCrossDrag) {
               if (dragColumn.parentId !== newColumn.parentId) {
                 // 非同级
-                return;
+                return errRest;
               }
             } else {
               if (!isCrossDrag) {
-                return;
+                return errRest;
               }
               if (oldAllMaps[newColumn.id]) {
                 isSelfToChildStatus = true;
@@ -13073,19 +13549,19 @@ const Methods = {
                       content: methods_getI18n('vxe.error.treeDragChild')
                     });
                   }
-                  return;
+                  return errRest;
                 }
               }
             }
           } else if (dragColumn.parentId) {
             // 子到根
             if (!isCrossDrag) {
-              return;
+              return errRest;
             }
           } else if (newColumn.parentId) {
             // 根到子
             if (!isCrossDrag) {
-              return;
+              return errRest;
             }
             if (oldAllMaps[newColumn.id]) {
               isSelfToChildStatus = true;
@@ -13096,7 +13572,7 @@ const Methods = {
                     content: methods_getI18n('vxe.error.treeDragChild')
                   });
                 }
-                return;
+                return errRest;
               }
             }
           } else {
@@ -13165,25 +13641,32 @@ const Methods = {
               $xeTable.clearCopyCellArea();
             }
           }
-          $xeTable.dispatchEvent('column-dragend', {
-            oldColumn: dragColumn,
-            newColumn,
-            dragColumn,
-            dragPos: prevDragPos,
-            dragToChild: isDragToChildFlag,
-            offsetIndex: dragOffsetIndex,
-            _index: {
-              newIndex: nafIndex,
-              oldIndex: oafIndex
-            }
-          }, evnt);
+          if (evnt) {
+            $xeTable.dispatchEvent('column-dragend', {
+              oldColumn: dragColumn,
+              newColumn,
+              dragColumn,
+              dragPos: prevDragPos,
+              dragToChild: isDragToChildFlag,
+              offsetIndex: dragOffsetIndex,
+              _index: {
+                newIndex: nafIndex,
+                oldIndex: oafIndex
+              }
+            }, evnt);
+          }
           if (isSyncColumn) {
             $xeTable.handleColDragSwapColumn();
           }
-        }).catch(() => {});
+          return {
+            status: true
+          };
+        }).catch(() => {
+          return errRest;
+        });
       }
     }
-    return Promise.resolve();
+    return Promise.resolve(errRest);
   },
   handleHeaderCellDragDragendEvent(evnt) {
     const $xeTable = this;
@@ -13324,46 +13807,58 @@ const Methods = {
   setPendingRow(rows, status) {
     const $xeTable = this;
     const reactData = $xeTable;
-    const pendingMaps = Object.assign({}, reactData.pendingRowMaps);
+    const internalData = $xeTable;
+    const {
+      handleGetRowId
+    } = createHandleGetRowId($xeTable);
+    const {
+      pendingRowMaps
+    } = internalData;
     if (rows && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(rows)) {
       rows = [rows];
     }
     if (status) {
       rows.forEach(row => {
-        const rowid = 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 = 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
+    } = createHandleGetRowId($xeTable);
+    const {
+      pendingRowMaps
+    } = internalData;
     if (rows && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(rows)) {
       rows = [rows];
     }
     rows.forEach(row => {
-      const rowid = 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) {
@@ -13381,13 +13876,10 @@ const Methods = {
   },
   getPendingRecords() {
     const $xeTable = this;
-    const reactData = $xeTable;
     const internalData = $xeTable;
     const {
+      fullAllDataRowIdData,
       pendingRowMaps
-    } = reactData;
-    const {
-      fullAllDataRowIdData
     } = internalData;
     const insertRecords = [];
     external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(pendingRowMaps, (row, rowid) => {
@@ -13398,8 +13890,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;
@@ -13580,9 +14076,11 @@ const Methods = {
    * @param {Event} evnt 事件
    */
   closeFilter() {
+    const $xeTable = this;
+    const reactData = $xeTable;
     const {
       filterStore
-    } = this;
+    } = reactData;
     const {
       column,
       visible
@@ -13594,15 +14092,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();
   },
   /**
    * 判断指定列是否为筛选状态，如果为空则判断所有列
@@ -13635,11 +14133,9 @@ const Methods = {
     const $xeTable = this;
     const reactData = $xeTable;
     const internalData = $xeTable;
-    const rExpandLazyLoadedMaps = {
-      ...reactData.rowExpandLazyLoadedMaps
-    };
     const {
-      fullAllDataRowIdData
+      fullAllDataRowIdData,
+      rowExpandLazyLoadedMaps
     } = internalData;
     const expandOpts = $xeTable.computeExpandOpts;
     const {
@@ -13649,9 +14145,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();
   },
   /**
@@ -13659,18 +14155,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 = 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 (true) {
@@ -13683,11 +14181,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;
@@ -13699,20 +14202,20 @@ const Methods = {
       return;
     }
     evnt.stopPropagation();
-    const rowid = getRowid(this, row);
+    const rowid = 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);
     }
   },
@@ -13770,61 +14273,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 = {
-          ...reactData.rowExpandLazyLoadedMaps
-        };
-        const rowid = 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 = {
-            ...reactData.rowExpandedMaps
-          };
-          if (rowRest) {
-            rowRest.expandLoaded = true;
-          }
-          rExpandedMaps[rowid] = row;
-          reactData.rowExpandedMaps = rExpandedMaps;
-        }).catch(() => {
-          if (rowRest) {
-            rowRest.expandLoaded = false;
-          }
-        }).finally(() => {
-          const rExpandLazyLoadedMaps = {
-            ...reactData.rowExpandLazyLoadedMaps
-          };
-          if (rExpandLazyLoadedMaps[rowid]) {
-            delete rExpandLazyLoadedMaps[rowid];
-          }
-          reactData.rowExpandLazyLoadedMaps = rExpandLazyLoadedMaps;
-          $xeTable.$nextTick().then(() => $xeTable.recalculate()).then(() => $xeTable.updateCellAreas()).then(() => resolve());
-        });
-      } else {
-        resolve();
-      }
-    });
-  },
   /**
    * 设置展开行，二个参数设置这一行展开与否
    * 支持单行
@@ -13834,16 +14282,20 @@ const Methods = {
    */
   setRowExpand(rows, expanded) {
     const $xeTable = this;
+    const reactData = $xeTable;
+    const internalData = $xeTable;
     const {
-      rowExpandedMaps,
-      fullAllDataRowIdData,
-      rowExpandLazyLoadedMaps,
-      expandOpts,
       expandColumn
-    } = this;
-    let rExpandedMaps = {
-      ...rowExpandedMaps
-    };
+    } = reactData;
+    let {
+      fullAllDataRowIdData,
+      rowExpandedMaps,
+      rowExpandLazyLoadedMaps
+    } = internalData;
+    const {
+      handleGetRowId
+    } = createHandleGetRowId($xeTable);
+    const expandOpts = $xeTable.computeExpandOpts;
     const {
       reserve,
       lazy,
@@ -13859,10 +14311,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,
@@ -13873,22 +14327,22 @@ const Methods = {
       })) : rows;
       if (expanded) {
         validRows.forEach(row => {
-          const rowid = 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 = getRowid(this, item);
-          if (rExpandedMaps[rowid]) {
-            delete rExpandedMaps[rowid];
+          const rowid = handleGetRowId(item);
+          if (rowExpandedMaps[rowid]) {
+            delete rowExpandedMaps[rowid];
           }
         });
       }
@@ -13896,7 +14350,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);
@@ -13909,11 +14363,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 = getRowid(this, row);
-    return !!rowExpandedMaps[rowid];
+    return !!rowExpandedFlag && !!rowExpandedMaps[rowid];
   },
   isExpandByRow(row) {
     if (true) {
@@ -13937,7 +14397,8 @@ const Methods = {
       reserve
     } = expandOpts;
     const expList = $xeTable.getRowExpandRecords();
-    reactData.rowExpandedMaps = {};
+    internalData.rowExpandedMaps = {};
+    reactData.rowExpandedFlag++;
     if (reserve) {
       tableFullData.forEach(row => handleRowExpandReserve($xeTable, row, false));
     }
@@ -13957,8 +14418,10 @@ const Methods = {
     return this.$nextTick();
   },
   getRowExpandRecords() {
+    const $xeTable = this;
+    const internalData = $xeTable;
     const rest = [];
-    external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(this.rowExpandedMaps, item => {
+    external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(internalData.rowExpandedMaps, item => {
       if (item) {
         rest.push(item);
       }
@@ -13966,8 +14429,10 @@ const Methods = {
     return rest;
   },
   getTreeExpandRecords() {
+    const $xeTable = this;
+    const internalData = $xeTable;
     const rest = [];
-    external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(this.treeExpandedMaps, item => {
+    external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(internalData.treeExpandedMaps, item => {
       if (item) {
         rest.push(item);
       }
@@ -14003,17 +14468,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 = {
-        ...reactData.treeExpandedMaps
-      };
       if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(rows)) {
         rows = [rows];
       }
@@ -14022,8 +14484,8 @@ const Methods = {
         const rowRest = fullAllDataRowIdData[rowid];
         if (rowRest) {
           rowRest.treeLoaded = false;
-          if (tExpandedMaps[rowid]) {
-            delete tExpandedMaps[rowid];
+          if (treeExpandedMaps[rowid]) {
+            delete treeExpandedMaps[rowid];
           }
         }
       });
@@ -14032,7 +14494,8 @@ const Methods = {
         rowRest.treeLoaded = false;
       });
     }
-    reactData.treeExpandedMaps = {};
+    internalData.treeExpandedMaps = {};
+    reactData.treeExpandedFlag++;
     if (transform) {
       handleVirtualTreeToList($xeTable);
       return $xeTable.handleTableData();
@@ -14045,45 +14508,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 = getRowid(this, row);
+    const rowid = 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 (true) {
       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
@@ -14098,11 +14565,11 @@ const Methods = {
     evnt.stopPropagation();
     const rowid = 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,
@@ -14117,112 +14584,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 = getRowkey(this);
-        expandRowKeys.forEach(rowid => {
-          const matchObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findTree(tableFullData, item => rowid === external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_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 = 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 (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_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 是否展开
@@ -14254,29 +14615,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 = {
-      ...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
+    } = createHandleGetRowId($xeTable);
     let validRows = toggleMethod ? rows.filter(row => toggleMethod({
+      $table: $xeTable,
       expanded,
       column: treeNodeColumn,
       columnIndex,
@@ -14291,26 +14658,26 @@ const Methods = {
       });
       if (matchObj) {
         matchObj.items.forEach(item => {
-          const rowid = 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 = 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;
               }
             }
           }
@@ -14318,18 +14685,18 @@ const Methods = {
       });
     } else {
       validRows.forEach(item => {
-        const rowid = 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();
     });
   },
   /**
@@ -14386,40 +14753,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[getRowid(this, row)];
+    } = internalData;
+    return !!treeExpandedFlag && !!treeExpandedMaps[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) {
-      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(tableFullData, row => this.handleTreeExpandReserve(row, false), {
+      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_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();
       }
     });
   },
@@ -14427,20 +14803,6 @@ const Methods = {
     this.treeExpandedReserveRowMap = {};
     return this.$nextTick();
   },
-  handleTreeExpandReserve(row, expanded) {
-    const {
-      treeExpandedReserveRowMap,
-      treeOpts
-    } = this;
-    if (treeOpts.reserve) {
-      const rowid = getRowid(this, row);
-      if (expanded) {
-        treeExpandedReserveRowMap[rowid] = row;
-      } else if (treeExpandedReserveRowMap[rowid]) {
-        delete treeExpandedReserveRowMap[rowid];
-      }
-    }
-  },
   /**
    * 获取表格的滚动状态
    */
@@ -14807,11 +15169,12 @@ const Methods = {
     } = tableProps;
     const {
       scrollXLoad,
-      scrollYLoad
+      scrollYLoad,
+      expandColumn
     } = reactData;
     const leftFixedWidth = $xeTable.computeLeftFixedWidth;
     const rightFixedWidth = $xeTable.computeRightFixedWidth;
-    if (!(scrollYLoad || leftFixedWidth || rightFixedWidth)) {
+    if (!(scrollYLoad || leftFixedWidth || rightFixedWidth || expandColumn)) {
       return;
     }
     const {
@@ -15103,15 +15466,15 @@ const Methods = {
     const {
       isAllOverflow,
       scrollYLoad,
-      expandColumn,
-      rowExpandedMaps
+      expandColumn
     } = reactData;
     const {
       scrollYStore,
       elemStore,
       isResizeCellHeight,
       afterFullData,
-      fullAllDataRowIdData
+      fullAllDataRowIdData,
+      rowExpandedMaps
     } = internalData;
     const {
       startIndex
@@ -15468,7 +15831,7 @@ const Methods = {
     if (this.footerSpanMethod) {
       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);
@@ -15634,7 +15997,7 @@ const isVMScrollProcess = $xeTable => {
   } = tableReactData;
   return !!(isDragResize || lastScrollTime && Date.now() < lastScrollTime + delayHover);
 };
-function renderLine(h, _vm, params, cellHeight) {
+function renderLine(h, _vm, rowid, params, cellHeight) {
   const $xeTable = _vm.$parent;
   const tableProps = $xeTable;
   const tableInternalData = $xeTable;
@@ -15659,7 +16022,6 @@ function renderLine(h, _vm, params, cellHeight) {
   if (slots && slots.line) {
     return $xeTable.callSlot(slots.line, params, h);
   }
-  const rowid = getRowid($xeTable, row);
   const rest = fullAllDataRowIdData[rowid];
   let rLevel = 0;
   let prevRow = null;
@@ -15881,6 +16243,7 @@ function renderTdColumn(h, _vm, seq, rowid, fixedType, isOptimizeMode, rowLevel,
   tdOns.dblclick = evnt => {
     $xeTable.triggerCellDblclickEvent(evnt, cellParams);
   };
+  let isMergeCell = false;
   // 合并行或列
   if (mergeList.length) {
     const spanRest = mergeBodyMethod(mergeList, _rowIndex, _columnIndex);
@@ -15893,9 +16256,11 @@ function renderTdColumn(h, _vm, seq, rowid, fixedType, isOptimizeMode, rowLevel,
         return null;
       }
       if (rowspan > 1) {
+        isMergeCell = true;
         tdAttrs.rowspan = rowspan;
       }
       if (colspan > 1) {
+        isMergeCell = true;
         tdAttrs.colspan = colspan;
       }
     }
@@ -15930,11 +16295,13 @@ function renderTdColumn(h, _vm, seq, rowid, fixedType, isOptimizeMode, rowLevel,
   const isLastColumn = $columnIndex === columns.length - 1;
   const isAutoCellWidth = !column.resizeWidth && (column.minWidth === 'auto' || column.width === 'auto');
   let isVNPreEmptyStatus = false;
-  if (!dragRow || getRowid($xeTable, dragRow) !== rowid) {
-    if (scrollYLoad && (_rowIndex < scrollYStore.visibleStartIndex - scrollYStore.preloadSize || _rowIndex > scrollYStore.visibleEndIndex + scrollYStore.preloadSize)) {
-      isVNPreEmptyStatus = true;
-    } else if (scrollXLoad && !column.fixed && (_columnIndex < scrollXStore.visibleStartIndex - scrollXStore.preloadSize || _columnIndex > scrollXStore.visibleEndIndex + scrollXStore.preloadSize)) {
-      isVNPreEmptyStatus = true;
+  if (!isMergeCell) {
+    if (!dragRow || getRowid($xeTable, dragRow) !== rowid) {
+      if (scrollYLoad && (_rowIndex < scrollYStore.visibleStartIndex - scrollYStore.preloadSize || _rowIndex > scrollYStore.visibleEndIndex + scrollYStore.preloadSize)) {
+        isVNPreEmptyStatus = true;
+      } else if (scrollXLoad && !column.fixed && (_columnIndex < scrollXStore.visibleStartIndex - scrollXStore.preloadSize || _columnIndex > scrollXStore.visibleEndIndex + scrollXStore.preloadSize)) {
+        isVNPreEmptyStatus = true;
+      }
     }
   }
   const tcStyle = {};
@@ -15956,7 +16323,7 @@ function renderTdColumn(h, _vm, seq, rowid, fixedType, isOptimizeMode, rowLevel,
     }));
   } else {
     // 渲染单元格
-    tdVNs.push(...renderLine(h, _vm, cellParams, cellHeight), h('div', {
+    tdVNs.push(...renderLine(h, _vm, rowid, cellParams, cellHeight), h('div', {
       key: 'tc',
       class: ['vxe-cell', {
         'c--title': showTitle,
@@ -16066,20 +16433,23 @@ function renderRows(h, _vm, fixedType, isOptimizeMode, tableData, tableColumn) {
   } = tableProps;
   const {
     hasFixedColumn,
-    treeExpandedMaps,
+    treeExpandedFlag,
     isColLoading,
     scrollXLoad,
     scrollYLoad,
     isAllOverflow,
-    rowExpandedMaps,
+    rowExpandedFlag,
     expandColumn,
     selectRadioRow,
-    pendingRowMaps,
+    pendingRowFlag,
     isDragColMove,
     rowExpandHeightFlag
   } = tableReactData;
   const {
-    fullAllDataRowIdData
+    fullAllDataRowIdData,
+    treeExpandedMaps,
+    pendingRowMaps,
+    rowExpandedMaps
   } = tableInternalData;
   const checkboxOpts = $xeTable.computeCheckboxOpts;
   const radioOpts = $xeTable.computeRadioOpts;
@@ -16094,6 +16464,9 @@ function renderRows(h, _vm, fixedType, isOptimizeMode, tableData, tableColumn) {
   } = treeOpts;
   const childrenField = treeOpts.children || treeOpts.childrenField;
   const rows = [];
+  const {
+    handleGetRowId
+  } = createHandleGetRowId($xeTable);
   tableData.forEach((row, $rowIndex) => {
     const trOn = {};
     let rowIndex = $rowIndex;
@@ -16117,7 +16490,7 @@ function renderRows(h, _vm, fixedType, isOptimizeMode, tableData, tableColumn) {
         $xeTable.clearHoverRow();
       };
     }
-    const rowid = getRowid($xeTable, row);
+    const rowid = handleGetRowId(row);
     const rowRest = fullAllDataRowIdData[rowid];
     let rowLevel = 0;
     let seq = -1;
@@ -16144,7 +16517,7 @@ function renderRows(h, _vm, fixedType, isOptimizeMode, tableData, tableColumn) {
       _rowIndex
     };
     // 行是否被展开
-    const isExpandRow = expandColumn && !!rowExpandedMaps[rowid];
+    const isExpandRow = expandColumn && !!rowExpandedFlag && !!rowExpandedMaps[rowid];
     // 树节点是否被展开
     let isExpandTree = false;
     let rowChildren = [];
@@ -16155,7 +16528,7 @@ function renderRows(h, _vm, fixedType, isOptimizeMode, tableData, tableColumn) {
     }
     if (treeConfig && !scrollYLoad && !transform) {
       rowChildren = row[childrenField];
-      isExpandTree = rowChildren && rowChildren.length && !!treeExpandedMaps[rowid];
+      isExpandTree = !!treeExpandedFlag && rowChildren && rowChildren.length > 0 && !!treeExpandedMaps[rowid];
     }
     // 拖拽行事件
     if (rowOpts.drag && (!treeConfig || transform)) {
@@ -16171,7 +16544,7 @@ function renderRows(h, _vm, fixedType, isOptimizeMode, tableData, tableColumn) {
       'row--new': isNewRow && (editOpts.showStatus || editOpts.showInsertStatus),
       'row--radio': radioOpts.highlight && selectRadioRow === row,
       'row--checked': checkboxOpts.highlight && $xeTable.isCheckedByCheckboxRow(row),
-      'row--pending': !!pendingRowMaps[rowid]
+      'row--pending': !!pendingRowFlag && !!pendingRowMaps[rowid]
     }, rowClassName ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(rowClassName) ? rowClassName(params) : rowClassName : ''];
     const tdVNs = tableColumn.map((column, $columnIndex) => {
       return renderTdColumn(h, _vm, seq, rowid, fixedType, isOptimizeMode, rowLevel, row, rowIndex, $rowIndex, _rowIndex, column, $columnIndex, tableColumn, tableData);
@@ -16380,7 +16753,7 @@ function renderRows(h, _vm, fixedType, isOptimizeMode, tableData, tableColumn) {
         isOptimizeMode = true;
       }
     }
-    if (fixedType || !overflowX) {
+    if (!isColLoading && (fixedType || !overflowX)) {
       renderColumnList = visibleColumn;
     }
     if (fixedType) {
@@ -16867,6 +17240,7 @@ function renderHeads(h, _vm, isGroup, isOptimizeMode, headerGroups) {
     } = tableProps;
     const {
       isGroup,
+      isColLoading,
       overflowX,
       scrollXLoad,
       scrollYLoad,
@@ -16891,7 +17265,7 @@ function renderHeads(h, _vm, isGroup, isOptimizeMode, headerGroups) {
           isOptimizeMode = true;
         }
       }
-      if (fixedType || !overflowX) {
+      if (!isColLoading && (fixedType || !overflowX)) {
         renderColumnList = visibleColumn;
       }
       if (fixedType) {
@@ -17150,6 +17524,7 @@ function footer_renderRows(h, _vm, tableColumn, footerTableData, row, $rowIndex,
         cell: evnt.currentTarget
       }, cellParams), evnt);
     };
+    let isMergeCell = false;
     // 合并行或列
     if (mergeFooterList.length) {
       const spanRest = mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex);
@@ -17162,9 +17537,11 @@ function footer_renderRows(h, _vm, tableColumn, footerTableData, row, $rowIndex,
           return null;
         }
         if (rowspan > 1) {
+          isMergeCell = true;
           attrs.rowspan = rowspan;
         }
         if (colspan > 1) {
+          isMergeCell = true;
           attrs.colspan = colspan;
         }
       }
@@ -17187,8 +17564,10 @@ function footer_renderRows(h, _vm, tableColumn, footerTableData, row, $rowIndex,
     const isLastColumn = $columnIndex === tableColumn.length - 1;
     const isAutoCellWidth = !column.resizeWidth && (column.minWidth === 'auto' || column.width === 'auto');
     let isVNPreEmptyStatus = false;
-    if (scrollXLoad && !column.fixed && (_columnIndex < scrollXStore.visibleStartIndex - scrollXStore.preloadSize || _columnIndex > scrollXStore.visibleEndIndex + scrollXStore.preloadSize)) {
-      isVNPreEmptyStatus = true;
+    if (!isMergeCell) {
+      if (scrollXLoad && !column.fixed && (_columnIndex < scrollXStore.visibleStartIndex - scrollXStore.preloadSize || _columnIndex > scrollXStore.visibleEndIndex + scrollXStore.preloadSize)) {
+        isVNPreEmptyStatus = true;
+      }
     }
     const tcStyle = {};
     if (hasEllipsis) {
@@ -17367,6 +17746,7 @@ function footer_renderHeads(h, _vm, renderColumnList) {
     } = tableInternalData;
     const {
       isGroup,
+      isColLoading,
       overflowX,
       scrollXLoad,
       scrollYLoad,
@@ -17382,7 +17762,7 @@ function footer_renderHeads(h, _vm, renderColumnList) {
         isOptimizeMode = true;
       }
     }
-    if (fixedType || !overflowX) {
+    if (!isColLoading && (fixedType || !overflowX)) {
       renderColumnList = visibleColumn;
     }
     if (fixedType) {
@@ -17649,6 +18029,8 @@ const {
   resizeConfig: Object,
   // 列配置信息
   columnConfig: Object,
+  // 当前列配置信息
+  currentColumnConfig: Object,
   // 单元格配置信息
   cellConfig: Object,
   // 表头单元格配置信息
@@ -17657,6 +18039,8 @@ const {
   footerCellConfig: Object,
   // 行配置信息
   rowConfig: Object,
+  // 当前行配置信息
+  currentRowConfig: Object,
   // 已废弃，被 rowDragConfig 替换
   dragConfig: Object,
   // 行拖拽排序配置项
@@ -18997,11 +19381,17 @@ const {
       const rtFilter = compConf ? compConf.renderTableFilter || compConf.renderFilter : null;
       if (filterSlot) {
         return [h('div', {
-          class: 'vxe-table--filter-template'
+          class: 'vxe-table--filter-template',
+          style: maxHeight ? {
+            maxHeight: `${maxHeight}px`
+          } : {}
         }, $xeTable.callSlot(filterSlot, params, h))];
       } else if (rtFilter) {
         return [h('div', {
-          class: 'vxe-table--filter-template'
+          class: 'vxe-table--filter-template',
+          style: maxHeight ? {
+            maxHeight: `${maxHeight}px`
+          } : {}
         }, getSlotVNs(rtFilter.call($xeTable, h, filterRender, params)))];
       }
       const isAllChecked = multiple ? filterStore.isAllSelected : !filterStore.options.some(item => item._checked);
@@ -21413,13 +21803,14 @@ function handleEditCell($xeTable, row, fieldOrColumn, isPos) {
       } = props;
       const {
         mergeList,
-        editStore,
-        selectCheckboxMaps
+        editStore
       } = reactData;
       const {
         tableFullTreeData,
+        selectCheckboxMaps,
         afterFullData,
-        tableFullData
+        tableFullData,
+        pendingRowMaps
       } = internalData;
       const checkboxOpts = $xeTable.computeCheckboxOpts;
       const treeOpts = $xeTable.computeTreeOpts;
@@ -21430,9 +21821,9 @@ function handleEditCell($xeTable, row, fieldOrColumn, isPos) {
       const childrenField = treeOpts.children || treeOpts.childrenField;
       const {
         actived,
-        removeMaps,
-        insertMaps
+        removeMaps
       } = editStore;
+      const insertDataRowMaps = Object.assign({}, editStore.insertMaps);
       const {
         checkField
       } = checkboxOpts;
@@ -21451,16 +21842,13 @@ function handleEditCell($xeTable, row, fieldOrColumn, isPos) {
       });
       // 如果绑定了多选属性，则更新状态
       if (!checkField) {
-        const selectRowMaps = {
-          ...selectCheckboxMaps
-        };
         rows.forEach(row => {
           const rowid = getRowid(this, row);
-          if (selectRowMaps[rowid]) {
-            delete selectRowMaps[rowid];
+          if (selectCheckboxMaps[rowid]) {
+            delete selectCheckboxMaps[rowid];
           }
         });
-        this.selectCheckboxMaps = selectRowMaps;
+        reactData.updateCheckboxFlag++;
       }
       // 从数据源中移除
       if (tableFullData === rows) {
@@ -21524,10 +21912,15 @@ function handleEditCell($xeTable, row, fieldOrColumn, isPos) {
       // 从新增中移除已删除的数据
       rows.forEach(row => {
         const rowid = getRowid($xeTable, row);
-        if (insertMaps[rowid]) {
-          delete insertMaps[rowid];
+        if (insertDataRowMaps[rowid]) {
+          delete insertDataRowMaps[rowid];
+        }
+        if (pendingRowMaps[rowid]) {
+          delete pendingRowMaps[rowid];
         }
       });
+      editStore.insertMaps = insertDataRowMaps;
+      reactData.pendingRowFlag++;
       $xeTable.updateFooter();
       $xeTable.cacheRowMap(false);
       $xeTable.handleTableData(treeConfig && transform);
@@ -24021,18 +24414,27 @@ function getCheckboxRangeRows($xeTable, evnt, params, targetTrElem, trRect, offs
   methods: {
     // 处理 Tab 键移动
     moveTabSelected(args, isLeft, evnt) {
+      const $xeTable = this;
+      const props = $xeTable;
+      const internalData = $xeTable;
+      const {
+        editConfig
+      } = props;
       const {
         afterFullData,
-        visibleColumn,
-        editConfig,
-        editOpts
-      } = this;
+        visibleColumn
+      } = internalData;
+      const editOpts = $xeTable.computeEditOpts;
+      const rowOpts = $xeTable.computeRowOpts;
+      const currentRowOpts = $xeTable.computeCurrentRowOpts;
+      const columnOpts = $xeTable.computeColumnOpts;
+      const currentColumnOpts = $xeTable.computeCurrentColumnOpts;
       let targetRow;
       let targetRowIndex;
       let targetColumnIndex;
       const params = Object.assign({}, args);
-      const _rowIndex = this.getVTRowIndex(params.row);
-      const _columnIndex = this.getVTColumnIndex(params.column);
+      const _rowIndex = $xeTable.getVTRowIndex(params.row);
+      const _columnIndex = $xeTable.getVTColumnIndex(params.column);
       evnt.preventDefault();
       if (isLeft) {
         // 向左
@@ -24068,31 +24470,48 @@ function getCheckboxRangeRows($xeTable, evnt, params, targetTrElem, trRect, offs
         }
         params.columnIndex = targetColumnIndex;
         params.column = targetColumn;
-        params.cell = this.getCellElement(params.row, params.column);
+        params.cell = $xeTable.getCellElement(params.row, params.column);
+        if (rowOpts.isCurrent && currentRowOpts.isFollowSelected) {
+          $xeTable.triggerCurrentRowEvent(evnt, params);
+        }
+        if (columnOpts.isCurrent && currentColumnOpts.isFollowSelected) {
+          $xeTable.triggerCurrentColumnEvent(evnt, params);
+        }
         if (editConfig) {
           if (editOpts.trigger === 'click' || editOpts.trigger === 'dblclick') {
             if (editOpts.mode === 'row') {
-              this.handleEdit(params, evnt);
+              $xeTable.handleEdit(params, evnt);
             } else {
-              this.scrollToRow(params.row, params.column).then(() => this.handleSelected(params, evnt));
+              $xeTable.scrollToRow(params.row, params.column).then(() => {
+                $xeTable.handleSelected(params, evnt);
+              });
             }
           }
         } else {
-          this.scrollToRow(params.row, params.column).then(() => this.handleSelected(params, evnt));
+          $xeTable.scrollToRow(params.row, params.column).then(() => {
+            $xeTable.handleSelected(params, evnt);
+          });
         }
       }
     },
     // 处理当前行方向键移动
     moveCurrentRow(isUpArrow, isDwArrow, evnt) {
+      const $xeTable = this;
+      const props = $xeTable;
+      const reactData = $xeTable;
+      const internalData = $xeTable;
+      const {
+        treeConfig
+      } = props;
+      const {
+        currentRow
+      } = reactData;
       const {
-        currentRow,
-        treeConfig,
-        treeOpts,
         afterFullData
-      } = this;
+      } = internalData;
+      const treeOpts = $xeTable.computeTreeOpts;
       const childrenField = treeOpts.children || treeOpts.childrenField;
       let targetRow;
-      evnt.preventDefault();
       if (currentRow) {
         if (treeConfig) {
           const {
@@ -24107,7 +24526,7 @@ function getCheckboxRangeRows($xeTable, evnt, params, targetTrElem, trRect, offs
             targetRow = items[index + 1];
           }
         } else {
-          const _rowIndex = this.getVTRowIndex(currentRow);
+          const _rowIndex = $xeTable.getVTRowIndex(currentRow);
           if (isUpArrow && _rowIndex > 0) {
             targetRow = afterFullData[_rowIndex - 1];
           } else if (isDwArrow && _rowIndex < afterFullData.length - 1) {
@@ -24118,22 +24537,60 @@ function getCheckboxRangeRows($xeTable, evnt, params, targetTrElem, trRect, offs
         targetRow = afterFullData[0];
       }
       if (targetRow) {
+        evnt.preventDefault();
         const params = {
-          $table: this,
-          row: targetRow
+          $table: $xeTable,
+          row: targetRow,
+          rowIndex: $xeTable.getRowIndex(targetRow),
+          $rowIndex: $xeTable.getVMRowIndex(targetRow)
+        };
+        $xeTable.scrollToRow(targetRow).then(() => $xeTable.triggerCurrentRowEvent(evnt, params));
+      }
+    },
+    // 处理当前列方向键移动
+    moveCurrentColumn(isLeftArrow, isRightArrow, evnt) {
+      const $xeTable = this;
+      const reactData = $xeTable;
+      const internalData = $xeTable;
+      const {
+        currentColumn
+      } = reactData;
+      const {
+        visibleColumn
+      } = internalData;
+      let targetCol = null;
+      if (currentColumn) {
+        const _columnIndex = $xeTable.getVTColumnIndex(currentColumn);
+        if (isLeftArrow && _columnIndex > 0) {
+          targetCol = visibleColumn[_columnIndex - 1];
+        } else if (isRightArrow && _columnIndex < visibleColumn.length - 1) {
+          targetCol = visibleColumn[_columnIndex + 1];
+        }
+      } else {
+        targetCol = visibleColumn[0];
+      }
+      if (targetCol) {
+        evnt.preventDefault();
+        const params = {
+          $table: $xeTable,
+          column: targetCol,
+          columnIndex: $xeTable.getColumnIndex(targetCol),
+          $columnIndex: $xeTable.getVMColumnIndex(targetCol)
         };
-        this.scrollToRow(targetRow).then(() => this.triggerCurrentRowEvent(evnt, params));
+        $xeTable.scrollToColumn(targetCol).then(() => $xeTable.triggerCurrentColumnEvent(evnt, params));
       }
     },
     // 处理可编辑方向键移动
     moveSelected(args, isLeftArrow, isUpArrow, isRightArrow, isDwArrow, evnt) {
+      const $xeTable = this;
+      const internalData = $xeTable;
       const {
         afterFullData,
         visibleColumn
-      } = this;
+      } = internalData;
       const params = Object.assign({}, args);
-      const _rowIndex = this.getVTRowIndex(params.row);
-      const _columnIndex = this.getVTColumnIndex(params.column);
+      const _rowIndex = $xeTable.getVTRowIndex(params.row);
+      const _columnIndex = $xeTable.getVTColumnIndex(params.column);
       evnt.preventDefault();
       if (isUpArrow && _rowIndex > 0) {
         // 移动到上一行
@@ -24152,9 +24609,9 @@ function getCheckboxRangeRows($xeTable, evnt, params, targetTrElem, trRect, offs
         params.columnIndex = _columnIndex + 1;
         params.column = visibleColumn[params.columnIndex];
       }
-      this.scrollToRow(params.row, params.column).then(() => {
-        params.cell = this.getCellElement(params.row, params.column);
-        this.handleSelected(params, evnt);
+      $xeTable.scrollToRow(params.row, params.column).then(() => {
+        params.cell = $xeTable.getCellElement(params.row, params.column);
+        $xeTable.handleSelected(params, evnt);
       });
     },
     handleCellMousedownEvent(evnt, params) {
@@ -24573,11 +25030,11 @@ function validErrorRuleValue(rule, val) {
         treeConfig
       } = props;
       const {
-        editStore,
-        pendingRowMaps
+        editStore
       } = reactData;
       const {
-        afterFullData
+        afterFullData,
+        pendingRowMaps
       } = internalData;
       const {
         removeMaps
@@ -25524,6 +25981,9 @@ function renderRowExpandedVNs(h, $xeTable) {
     ref: 'refRowExpandYSpaceElem'
   })];
   if (expandColumn) {
+    const {
+      handleGetRowId
+    } = createHandleGetRowId($xeTable);
     tableRowExpandedList.forEach(row => {
       const expandOpts = $xeTable.computeExpandOpts;
       const {
@@ -25539,7 +25999,7 @@ function renderRowExpandedVNs(h, $xeTable) {
         seqMode
       } = treeOpts;
       const cellStyle = {};
-      const rowid = getRowid($xeTable, row);
+      const rowid = handleGetRowId(row);
       const rest = fullAllDataRowIdData[rowid];
       let rowLevel = 0;
       let seq = -1;
@@ -25763,8 +26223,6 @@ function renderBody(h, $xeTable) {
       isAllSelected: false,
       // 复选框属性，有选中且非全选状态
       isIndeterminate: false,
-      // 复选框属性，已选中的行集合
-      selectCheckboxMaps: {},
       // 当前行
       currentRow: null,
       // 单选框属性，选中列
@@ -25778,16 +26236,6 @@ function renderBody(h, $xeTable) {
       hasFixedColumn: false,
       // 树节点列信息
       treeNodeColumn: null,
-      // 已展开的行集合
-      rowExpandedMaps: {},
-      // 懒加载中的展开行的集合
-      rowExpandLazyLoadedMaps: {},
-      // 已展开树节点集合
-      treeExpandedMaps: {},
-      // 懒加载中的树节点的集合
-      treeExpandLazyLoadedMaps: {},
-      // 树节点不确定状态的集合
-      treeIndeterminateMaps: {},
       // 合并单元格的对象集
       mergeList: [],
       // 合并表尾数据的对象集
@@ -25804,8 +26252,6 @@ function renderBody(h, $xeTable) {
       upDataFlag: 0,
       // 刷新列标识，当列的特定属性被改变时，触发表格刷新列
       reColumnFlag: 0,
-      // 已标记的对象集
-      pendingRowMaps: {},
       // 自定义列相关的信息
       customStore: {
         btnEl: null,
@@ -25940,6 +26386,10 @@ function renderBody(h, $xeTable) {
         isHeader: false,
         isFooter: false
       },
+      rowExpandedFlag: 1,
+      treeExpandedFlag: 1,
+      updateCheckboxFlag: 1,
+      pendingRowFlag: 1,
       rowHeightStore: {
         default: 48,
         medium: 44,
@@ -26074,28 +26524,54 @@ function renderBody(h, $xeTable) {
       return this.computeColumnOpts;
     },
     computeColumnOpts() {
-      return Object.assign({}, table_getConfig().table.columnConfig, this.columnConfig);
+      const $xeTable = this;
+      const props = $xeTable;
+      return Object.assign({}, table_getConfig().table.columnConfig, props.columnConfig);
+    },
+    computeCurrentColumnOpts() {
+      const $xeTable = this;
+      const props = $xeTable;
+      return Object.assign({}, table_getConfig().table.currentColumnConfig, props.currentColumnConfig);
     },
     computeCellOpts() {
       const $xeTable = this;
       const props = $xeTable;
-      return Object.assign({}, table_getConfig().table.cellConfig, props.cellConfig);
+      const cellOpts = Object.assign({}, table_getConfig().table.cellConfig, props.cellConfig);
+      if (cellOpts.height) {
+        cellOpts.height = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(cellOpts.height);
+      }
+      return cellOpts;
     },
     computeHeaderCellOpts() {
       const $xeTable = this;
       const props = $xeTable;
-      return Object.assign({}, table_getConfig().table.headerCellConfig, props.headerCellConfig);
+      const headerCellOpts = Object.assign({}, table_getConfig().table.headerCellConfig, props.headerCellConfig);
+      if (headerCellOpts.height) {
+        headerCellOpts.height = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(headerCellOpts.height);
+      }
+      return headerCellOpts;
     },
     computeFooterCellOpts() {
       const $xeTable = this;
       const props = $xeTable;
-      return Object.assign({}, table_getConfig().table.footerCellConfig, props.footerCellConfig);
+      const footerCellOpts = Object.assign({}, table_getConfig().table.footerCellConfig, props.footerCellConfig);
+      if (footerCellOpts.height) {
+        footerCellOpts.height = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(footerCellOpts.height);
+      }
+      return footerCellOpts;
     },
     rowOpts() {
       return this.computeRowOpts;
     },
     computeRowOpts() {
-      return Object.assign({}, table_getConfig().table.rowConfig, this.rowConfig);
+      const $xeTable = this;
+      const props = $xeTable;
+      return Object.assign({}, table_getConfig().table.rowConfig, props.rowConfig);
+    },
+    computeCurrentRowOpts() {
+      const $xeTable = this;
+      const props = $xeTable;
+      return Object.assign({}, table_getConfig().table.currentRowConfig, props.currentRowConfig);
     },
     computeRowDragOpts() {
       return Object.assign({}, table_getConfig().table.rowDragConfig, this.rowDragConfig);
@@ -26119,27 +26595,35 @@ function renderBody(h, $xeTable) {
       return this.computeSeqOpts;
     },
     computeSeqOpts() {
+      const $xeTable = this;
+      const props = $xeTable;
       return Object.assign({
         startIndex: 0
-      }, table_getConfig().table.seqConfig, this.seqConfig);
+      }, table_getConfig().table.seqConfig, props.seqConfig);
     },
     radioOpts() {
       return this.computeRadioOpts;
     },
     computeRadioOpts() {
-      return Object.assign({}, table_getConfig().table.radioConfig, this.radioConfig);
+      const $xeTable = this;
+      const props = $xeTable;
+      return Object.assign({}, table_getConfig().table.radioConfig, props.radioConfig);
     },
     checkboxOpts() {
       return this.computeCheckboxOpts;
     },
     computeCheckboxOpts() {
-      return Object.assign({}, table_getConfig().table.checkboxConfig, this.checkboxConfig);
+      const $xeTable = this;
+      const props = $xeTable;
+      return Object.assign({}, table_getConfig().table.checkboxConfig, props.checkboxConfig);
     },
     tooltipOpts() {
       return this.computeTooltipOpts;
     },
     computeTooltipOpts() {
-      return Object.assign({}, table_getConfig().tooltip, table_getConfig().table.tooltipConfig, this.tooltipConfig);
+      const $xeTable = this;
+      const props = $xeTable;
+      return Object.assign({}, table_getConfig().tooltip, table_getConfig().table.tooltipConfig, props.tooltipConfig);
     },
     tipConfig() {
       return {
@@ -26363,16 +26847,23 @@ function renderBody(h, $xeTable) {
     computeTableRowExpandedList() {
       const $xeTable = this;
       const reactData = $xeTable;
+      const internalData = $xeTable;
       const {
-        rowExpandedMaps,
+        rowExpandedFlag,
         tableData,
         expandColumn
       } = reactData;
+      const {
+        rowExpandedMaps
+      } = internalData;
+      const {
+        handleGetRowId
+      } = createHandleGetRowId($xeTable);
       const expandList = [];
-      if (expandColumn) {
+      if (expandColumn && rowExpandedFlag) {
         const rowKeys = {};
         tableData.forEach(row => {
-          rowKeys[getRowid($xeTable, row)] = true;
+          rowKeys[handleGetRowId(row)] = true;
         });
         external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(rowExpandedMaps, (row, rowid) => {
           if (rowKeys[rowid]) {
@@ -26642,13 +27133,15 @@ function renderBody(h, $xeTable) {
       lastScrollTop: 0,
       // 单选框属性，已选中保留的行
       radioReserveRow: null,
-      // 复选框属性，已选中保留的行
+      // 复选框属性，已选中保留的行集合
       checkboxReserveRowMap: {},
-      // 行数据，已展开保留的行
+      // 行数据，已展开保留的行集合
       rowExpandedReserveRowMap: {},
-      // 树结构数据，已展开保留的行
+      // 树结构数据，已展开保留的行集合
       treeExpandedReserveRowMap: {},
-      // 完整数据、条件处理后
+      // 树结构数据，不确定状态的集合
+      treeIndeterminateRowMaps: {},
+      // 列表完整数据、条件处理后
       tableFullData: [],
       afterFullData: [],
       // 列表条件处理后数据集合
@@ -26666,6 +27159,18 @@ function renderBody(h, $xeTable) {
       fullColumnMap: new Map(),
       fullColumnIdData: {},
       fullColumnFieldData: {},
+      // 已展开的行集合
+      rowExpandedMaps: {},
+      // 懒加载中的展开行的集合
+      rowExpandLazyLoadedMaps: {},
+      // 已展开树节点集合
+      treeExpandedMaps: {},
+      // 懒加载中的树节点的集合
+      treeExpandLazyLoadedMaps: {},
+      // 复选框属性，已选中的行集合
+      selectCheckboxMaps: {},
+      // 已标记的对象集
+      pendingRowMaps: {},
       swYSize: 0,
       swYInterval: 0,
       swYTotal: 0
@@ -28123,6 +28628,24 @@ function getFuncSlot($xeGrid, optSlots, slotKey) {
   }
   return null;
 }
+const getConfigSlot = ($xeGrid, slotConfigs) => {
+  const slots = $xeGrid.$scopedSlots;
+  const slotConf = {};
+  external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().objectMap(slotConfigs, (slotFunc, slotKey) => {
+    if (slotFunc) {
+      if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(slotFunc)) {
+        if (slots[slotFunc]) {
+          slotConf[slotKey] = slots[slotFunc];
+        } else {
+          errLog('vxe.error.notSlot', [slotFunc]);
+        }
+      } else {
+        slotConf[slotKey] = slotFunc;
+      }
+    }
+  });
+  return slotConf;
+};
 function getToolbarSlots(_vm) {
   const {
     $scopedSlots,
@@ -28152,26 +28675,6 @@ function getToolbarSlots(_vm) {
   }
   return slots;
 }
-function getPagerSlots(_vm) {
-  const {
-    pagerOpts
-  } = _vm;
-  const pagerOptSlots = pagerOpts.slots;
-  const slots = {};
-  let leftSlot;
-  let rightSlot;
-  if (pagerOptSlots) {
-    leftSlot = getFuncSlot(_vm, pagerOptSlots, 'left');
-    rightSlot = getFuncSlot(_vm, pagerOptSlots, 'right');
-    if (leftSlot) {
-      slots.left = leftSlot;
-    }
-    if (rightSlot) {
-      slots.right = rightSlot;
-    }
-  }
-  return slots;
-}
 function getTableOns(_vm) {
   const {
     $listeners,
@@ -28194,6 +28697,30 @@ function getTableOns(_vm) {
   }
   return ons;
 }
+function pageChangeEvent($xeGrid, params) {
+  const props = $xeGrid;
+  const reactData = $xeGrid;
+  const {
+    proxyConfig
+  } = props;
+  const {
+    tablePage
+  } = reactData;
+  const {
+    $event,
+    currentPage,
+    pageSize
+  } = params;
+  const proxyOpts = $xeGrid.computeProxyOpts;
+  tablePage.currentPage = currentPage;
+  tablePage.pageSize = pageSize;
+  $xeGrid.dispatchEvent('page-change', params, $event);
+  if (proxyConfig && isEnableConf(proxyOpts)) {
+    $xeGrid.commitProxy('query').then(rest => {
+      $xeGrid.dispatchEvent('proxy-query', rest, $event);
+    });
+  }
+}
 /**
  * 渲染表单
  */
@@ -28331,32 +28858,34 @@ function renderBottom(h, _vm) {
 function renderPager(h, $xeGrid) {
   const VxeUIPagerComponent = core_.VxeUI.getComponent('VxePager');
   const props = $xeGrid;
+  const slots = $xeGrid.$scopedSlots;
+  const reactData = $xeGrid;
   const {
-    pagerConfig,
-    proxyConfig
+    proxyConfig,
+    pagerConfig
   } = props;
-  const {
-    $scopedSlots,
-    tablePage
-  } = $xeGrid;
-  const pagerSlot = $scopedSlots.pager;
-  const hasPager = !!(pagerSlot || isEnableConf(pagerConfig));
-  if (hasPager) {
+  const proxyOpts = $xeGrid.computeProxyOpts;
+  const pagerOpts = $xeGrid.computePagerOpts;
+  const pagerSlot = slots.pager;
+  if (pagerConfig && isEnableConf(pagerOpts) || slots.pager) {
     return h('div', {
-      key: 'pager',
       ref: 'refPagerWrapper',
+      key: 'pager',
       class: 'vxe-grid--pager-wrapper'
     }, pagerSlot ? pagerSlot.call($xeGrid, {
       $grid: $xeGrid
-    }, h) : [VxeUIPagerComponent ? h(VxeUIPagerComponent, {
+    }) : [VxeUIPagerComponent ? h(VxeUIPagerComponent, {
+      ref: 'refPager',
       props: {
-        ...$xeGrid.pagerOpts,
-        ...(proxyConfig ? tablePage : {})
+        ...pagerOpts,
+        ...(proxyConfig && isEnableConf(proxyOpts) ? reactData.tablePage : {})
       },
       on: {
-        'page-change': $xeGrid.pageChangeEvent
+        'page-change'(params) {
+          pageChangeEvent($xeGrid, params);
+        }
       },
-      scopedSlots: getPagerSlots($xeGrid)
+      scopedSlots: getConfigSlot($xeGrid, pagerOpts.slots)
     }) : grid_renderEmptyElement($xeGrid)]);
   }
   return grid_renderEmptyElement($xeGrid);
@@ -28708,6 +29237,10 @@ Object.keys(table.methods).forEach(name => {
       }
       return [];
     },
+    getEl() {
+      const $xeGrid = this;
+      return $xeGrid.$refs.refElem;
+    },
     /**
      * 获取需要排除的高度
      */
@@ -28718,20 +29251,25 @@ Object.keys(table.methods).forEach(name => {
         isZMax
       } = reactData;
       const el = $xeGrid.$refs.refElem;
-      const formWrapper = $xeGrid.$refs.refFormWrapper;
-      const toolbarWrapper = $xeGrid.$refs.refToolbarWrapper;
-      const topWrapper = $xeGrid.$refs.refTopWrapper;
-      const bottomWrapper = $xeGrid.$refs.refBottomWrapper;
-      const pagerWrapper = $xeGrid.$refs.refPagerWrapper;
-      const parentPaddingSize = isZMax ? 0 : getPaddingTopBottomSize(el.parentNode);
-      return parentPaddingSize + getPaddingTopBottomSize(el) + getOffsetHeight(formWrapper) + getOffsetHeight(toolbarWrapper) + getOffsetHeight(topWrapper) + getOffsetHeight(bottomWrapper) + getOffsetHeight(pagerWrapper);
+      if (el) {
+        const formWrapper = $xeGrid.$refs.refFormWrapper;
+        const toolbarWrapper = $xeGrid.$refs.refToolbarWrapper;
+        const topWrapper = $xeGrid.$refs.refTopWrapper;
+        const bottomWrapper = $xeGrid.$refs.refBottomWrapper;
+        const pagerWrapper = $xeGrid.$refs.refPagerWrapper;
+        const parentEl = el.parentElement;
+        const parentPaddingSize = isZMax ? 0 : parentEl ? getPaddingTopBottomSize(parentEl) : 0;
+        return parentPaddingSize + getPaddingTopBottomSize(el) + getOffsetHeight(formWrapper) + getOffsetHeight(toolbarWrapper) + getOffsetHeight(topWrapper) + getOffsetHeight(bottomWrapper) + getOffsetHeight(pagerWrapper);
+      }
+      return 0;
     },
     getParentHeight() {
       const $xeGrid = this;
       const reactData = $xeGrid;
       const el = $xeGrid.$refs.refElem;
       if (el) {
-        return (reactData.isZMax ? getDomNode().visibleHeight : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(getComputedStyle(el.parentNode).height)) - $xeGrid.getExcludeHeight();
+        const parentEl = el.parentElement;
+        return (reactData.isZMax ? getDomNode().visibleHeight : parentEl ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(getComputedStyle(parentEl).height) : 0) - $xeGrid.getExcludeHeight();
       }
       return 0;
     },
@@ -28824,6 +29362,8 @@ Object.keys(table.methods).forEach(name => {
      * @param {String/Object} code 字符串或对象
      */
     commitProxy(proxyTarget, ...args) {
+      const $xeGrid = this;
+      const reactData = $xeGrid;
       const {
         $refs,
         toolbar,
@@ -28906,6 +29446,9 @@ Object.keys(table.methods).forEach(name => {
             if (ajaxMethods) {
               const isInited = code === '_init';
               const isReload = code === 'reload';
+              if (!isInited && reactData.tableLoading) {
+                return $xeGrid.$nextTick();
+              }
               let sortList = [];
               let filterList = [];
               let pageParams = {};
@@ -29381,30 +29924,6 @@ Object.keys(table.methods).forEach(name => {
         }
       }
     },
-    pageChangeEvent(params) {
-      const {
-        proxyConfig,
-        tablePage
-      } = this;
-      const {
-        currentPage,
-        pageSize
-      } = params;
-      tablePage.currentPage = currentPage;
-      tablePage.pageSize = pageSize;
-      this.$emit('page-change', Object.assign({
-        $grid: this
-      }, params));
-      if (proxyConfig) {
-        this.commitProxy('query').then(rest => {
-          this.$emit('proxy-query', {
-            ...rest,
-            $grid: this,
-            $event: params.$event
-          });
-        });
-      }
-    },
     sortChangeEvent(params) {
       const {
         $table,
@@ -29454,9 +29973,14 @@ Object.keys(table.methods).forEach(name => {
       }, params));
     },
     submitEvent(params) {
+      const $xeGrid = this;
+      const reactData = $xeGrid;
       const {
         proxyConfig
       } = this;
+      if (reactData.tableLoading) {
+        return;
+      }
       if (proxyConfig) {
         this.commitProxy('reload').then(rest => {
           this.$emit('proxy-query', {
@@ -29613,7 +30137,8 @@ var external_commonjs_vue_commonjs2_vue_root_Vue_default = /*#__PURE__*/__webpac
 const {
   getConfig: render_getConfig,
   renderer: render_renderer,
-  getI18n: render_getI18n
+  getI18n: render_getI18n,
+  getComponent
 } = core_.VxeUI;
 const componentDefaultModelProp = 'value';
 const defaultCompProps = {};
@@ -29651,7 +30176,7 @@ function getOldComponent({
 function getDefaultComponent({
   name
 }) {
-  return name;
+  return getComponent(name) || name;
 }
 function handleConfirmFilter(params, checked, option) {
   const {
@@ -30294,6 +30819,69 @@ function handleExportTreeSelectMethod(params) {
   } = params;
   return options.original ? getCellValue(row, column) : getTreeSelectCellValue(column.editRender || column.cellRender, params);
 }
+function handleNumberCell(h, renderOpts, params) {
+  const {
+    props = {},
+    showNegativeStatus
+  } = renderOpts;
+  const {
+    row,
+    column
+  } = params;
+  const {
+    type
+  } = props;
+  let cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, column.field);
+  let isNegative = false;
+  if (!isEmptyValue(cellValue)) {
+    const numberInputConfig = render_getConfig().numberInput || {};
+    if (type === 'float') {
+      const autoFill = handleDefaultValue(props.autoFill, numberInputConfig.autoFill, true);
+      const digits = handleDefaultValue(props.digits, numberInputConfig.digits, 1);
+      cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toFixed(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().floor(cellValue, digits), digits);
+      if (!autoFill) {
+        cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(cellValue);
+      }
+      if (showNegativeStatus) {
+        if (cellValue < 0) {
+          isNegative = true;
+        }
+      }
+    } else if (type === 'amount') {
+      const autoFill = handleDefaultValue(props.autoFill, numberInputConfig.autoFill, true);
+      const digits = handleDefaultValue(props.digits, numberInputConfig.digits, 2);
+      const showCurrency = handleDefaultValue(props.showCurrency, numberInputConfig.showCurrency, false);
+      cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(cellValue);
+      if (showNegativeStatus) {
+        if (cellValue < 0) {
+          isNegative = true;
+        }
+      }
+      cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().commafy(cellValue, {
+        digits
+      });
+      if (!autoFill) {
+        const [iStr, dStr] = cellValue.split('.');
+        if (dStr) {
+          const dRest = dStr.replace(/0+$/, '');
+          cellValue = dRest ? [iStr, '.', dRest].join('') : iStr;
+        }
+      }
+      if (showCurrency) {
+        cellValue = `${props.currencySymbol || numberInputConfig.currencySymbol || render_getI18n('vxe.numberInput.currencySymbol') || ''}${cellValue}`;
+      }
+    } else {
+      if (showNegativeStatus) {
+        if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(cellValue) < 0) {
+          isNegative = true;
+        }
+      }
+    }
+  }
+  return getCellLabelVNs(h, renderOpts, params, cellValue, isNegative ? {
+    class: 'is--negative'
+  } : {});
+}
 /**
  * 表格 - 渲染器
  */
@@ -30365,72 +30953,22 @@ render_renderer.mixin({
     renderTableFilter: defaultFilterRender,
     tableFilterDefaultMethod: handleInputFilterMethod
   },
-  VxeNumberInput: {
-    tableAutoFocus: 'input',
-    renderTableEdit: defaultEditRender,
-    renderTableCell(h, renderOpts, params) {
-      const {
-        props = {},
-        showNegativeStatus
-      } = renderOpts;
+  FormatNumberInput: {
+    renderTableDefault: handleNumberCell,
+    tableFilterDefaultMethod: handleInputFilterMethod,
+    tableExportMethod(params) {
       const {
         row,
         column
       } = params;
-      const {
-        type
-      } = props;
-      let cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, column.field);
-      let isNegative = false;
-      if (!isEmptyValue(cellValue)) {
-        const numberInputConfig = render_getConfig().numberInput || {};
-        if (type === 'float') {
-          const autoFill = handleDefaultValue(props.autoFill, numberInputConfig.autoFill, true);
-          const digits = handleDefaultValue(props.digits, numberInputConfig.digits, 1);
-          cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toFixed(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().floor(cellValue, digits), digits);
-          if (!autoFill) {
-            cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(cellValue);
-          }
-          if (showNegativeStatus) {
-            if (cellValue < 0) {
-              isNegative = true;
-            }
-          }
-        } else if (type === 'amount') {
-          const autoFill = handleDefaultValue(props.autoFill, numberInputConfig.autoFill, true);
-          const digits = handleDefaultValue(props.digits, numberInputConfig.digits, 2);
-          const showCurrency = handleDefaultValue(props.showCurrency, numberInputConfig.showCurrency, false);
-          cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(cellValue);
-          if (showNegativeStatus) {
-            if (cellValue < 0) {
-              isNegative = true;
-            }
-          }
-          cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().commafy(cellValue, {
-            digits
-          });
-          if (!autoFill) {
-            const [iStr, dStr] = cellValue.split('.');
-            if (dStr) {
-              const dRest = dStr.replace(/0+$/, '');
-              cellValue = dRest ? [iStr, '.', dRest].join('') : iStr;
-            }
-          }
-          if (showCurrency) {
-            cellValue = `${props.currencySymbol || numberInputConfig.currencySymbol || render_getI18n('vxe.numberInput.currencySymbol') || ''}${cellValue}`;
-          }
-        } else {
-          if (showNegativeStatus) {
-            if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(cellValue) < 0) {
-              isNegative = true;
-            }
-          }
-        }
-      }
-      return getCellLabelVNs(h, renderOpts, params, cellValue, isNegative ? {
-        class: 'is--negative'
-      } : {});
-    },
+      const cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, column.field);
+      return cellValue;
+    }
+  },
+  VxeNumberInput: {
+    tableAutoFocus: 'input',
+    renderTableEdit: defaultEditRender,
+    renderTableCell: handleNumberCell,
     renderTableFooter(h, renderOpts, params) {
       const {
         props = {}
@@ -30567,11 +31105,22 @@ render_renderer.mixin({
     tableFilterDefaultMethod: handleFilterMethod,
     tableExportMethod: handleExportSelectMethod
   },
+  /**
+   * 已废弃，被 FormatSelect 替换
+   * @deprecated
+   */
   formatOption: {
     renderTableDefault(h, renderOpts, params) {
       return getCellLabelVNs(h, renderOpts, params, getSelectCellValue(renderOpts, params));
     }
   },
+  FormatSelect: {
+    renderTableDefault(h, renderOpts, params) {
+      return getCellLabelVNs(h, renderOpts, params, getSelectCellValue(renderOpts, params));
+    },
+    tableFilterDefaultMethod: handleFilterMethod,
+    tableExportMethod: handleExportSelectMethod
+  },
   VxeTreeSelect: {
     tableAutoFocus: 'input',
     renderTableEdit: defaultTableOrTreeSelectEditRender,
@@ -30588,11 +31137,21 @@ render_renderer.mixin({
     },
     tableExportMethod: handleExportTreeSelectMethod
   },
+  /**
+   * 已废弃，被 FormatTreeSelect 替换
+   * @deprecated
+   */
   formatTree: {
     renderTableDefault(h, renderOpts, params) {
       return getCellLabelVNs(h, renderOpts, params, getTreeSelectCellValue(renderOpts, params));
     }
   },
+  FormatTreeSelect: {
+    renderTableDefault(h, renderOpts, params) {
+      return getCellLabelVNs(h, renderOpts, params, getTreeSelectCellValue(renderOpts, params));
+    },
+    tableExportMethod: handleExportTreeSelectMethod
+  },
   VxeColorPicker: {
     tableAutoFocus: 'input',
     renderTableEdit(h, renderOpts, params) {
@@ -30935,7 +31494,8 @@ const Toolbar = VxeToolbar;
       treeNotImp: '树表格不支持导入',
       treeCrossDrag: '只能拖拽第一层级',
       treeDragChild: '父级不能拖拽到自己的子级中',
-      reqPlugin: '扩展插件未安装 "{1}" https://vxeui.com/other{0}/#/{1}/install'
+      reqPlugin: '扩展插件未安装 "{1}" https://vxeui.com/other{0}/#/{1}/install',
+      errMaxRow: '超过支持的最大数据量 {0} 行，这可能会导致出现错误'
     },
     table: {
       emptyText: '暂无数据',
@@ -31121,6 +31681,9 @@ const Toolbar = VxeToolbar;
       fixedRight: '冻结在右侧',
       cancelFixed: '取消冻结列'
     },
+    datePicker: {
+      yearTitle: '{0} 年'
+    },
     input: {
       date: {
         m1: '01 月',
@@ -31451,6 +32014,7 @@ const Toolbar = VxeToolbar;
       },
       filterCombination: {
         menus: {
+          sort: '排序',
           clearSort: '清除排序',
           sortAsc: '升序',
           sortDesc: '降序',
@@ -31555,6 +32119,7 @@ const Toolbar = VxeToolbar;
       },
       combination: {
         menus: {
+          sort: '排序',
           clearSort: '清除排序',
           sortAsc: '升序',
           sortDesc: '降序',
@@ -31613,8 +32178,8 @@ core_.VxeUI.setTheme('light');
 
 if (typeof window !== 'undefined' && window.Vue) {
   if (window.VXETable) {
-    if (!window.VxeUITable) {
-      window.VxeUITable = components_namespaceObject;
+    if (!window.VXETable) {
+      window.VXETable = components_namespaceObject;
     }
   }
   window.Vue.use(components_namespaceObject);