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

package/lib/index.umd.js

@@ -2220,7 +2220,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.14.0-beta.20";
+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.20"}`;
+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
@@ -3129,7 +3129,7 @@ function createHandleUpdateRowId($xeTable) {
   return {
     rowKey,
     handleUpdateRowId(row) {
-      return updateRId(row, rowKey);
+      return row ? updateRId(row, rowKey) : null;
     }
   };
 }
@@ -3140,7 +3140,7 @@ function createHandleGetRowId($xeTable) {
   return {
     rowKey,
     handleGetRowId(row) {
-      return getRId(row, rowKey);
+      return row ? getRId(row, rowKey) : null;
     }
   };
 }
@@ -4111,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 {
@@ -4150,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];
@@ -4383,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,
@@ -4410,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);
@@ -4422,7 +4427,7 @@ const Cell = {
         });
       }
       if (treeConfig) {
-        indeterminate = !!treeIndeterminateMaps[rowid];
+        indeterminate = !!treeIndeterminateRowMaps[rowid];
       }
     }
     const checkboxParams = {
@@ -4468,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,
@@ -4496,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);
@@ -4508,7 +4517,7 @@ const Cell = {
         });
       }
       if (treeConfig) {
-        isIndeterminate = !!treeIndeterminateMaps[rowid];
+        isIndeterminate = !!treeIndeterminateRowMaps[rowid];
       }
     }
     const checkboxParams = {
@@ -4555,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,
@@ -5523,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) {
@@ -5579,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) {
@@ -5622,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) {
@@ -6095,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;
@@ -6126,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);
       }
@@ -6232,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();
@@ -6251,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;
@@ -6277,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);
@@ -6286,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 {
@@ -6371,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;
@@ -6387,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) {
@@ -6426,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];
     }
@@ -6481,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];
     }
@@ -6718,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);
@@ -7457,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 {
@@ -7628,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);
@@ -7640,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);
@@ -7665,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;
@@ -7695,7 +7936,8 @@ function updateRowExpandStyle($xeTable) {
   const {
     expandColumn,
     scrollYLoad,
-    rowExpandedMaps
+    scrollYTop,
+    isScrollYBig
   } = reactData;
   const expandOpts = $xeTable.computeExpandOpts;
   const rowOpts = $xeTable.computeRowOpts;
@@ -7707,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;
@@ -7752,6 +7988,9 @@ function updateRowExpandStyle($xeTable) {
       });
       if (isUpdateHeight) {
         reactData.rowExpandHeightFlag++;
+        $xeTable.$nextTick(() => {
+          updateRowOffsetTop($xeTable);
+        });
       }
     }
   }
@@ -8177,13 +8416,11 @@ const Methods = {
     const {
       treeConfig
     } = props;
-    const {
-      treeExpandedMaps
-    } = reactData;
     const {
       fullAllDataRowIdData,
       tableFullData,
-      tableFullTreeData
+      tableFullTreeData,
+      treeExpandedMaps
     } = internalData;
     const treeOpts = $xeTable.computeTreeOpts;
     const childrenField = treeOpts.children || treeOpts.childrenField;
@@ -8195,9 +8432,6 @@ const Methods = {
       ...fullAllDataRowIdData
     }; // 存在已删除数据
     const fullDataRowIdMaps = {};
-    const treeTempExpandedMaps = {
-      ...treeExpandedMaps
-    };
     const {
       handleUpdateRowId
     } = createHandleUpdateRowId($xeTable);
@@ -8236,13 +8470,12 @@ const Methods = {
       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) {
-          const treeExpRest = treeTempExpandedMaps[rowid];
           if (row[hasChildField] && row[childrenField] === undefined) {
             row[childrenField] = null;
           }
-          if (treeExpRest) {
+          if (treeExpandedMaps[rowid]) {
             if (!row[childrenField] || !row[childrenField].length) {
-              delete treeTempExpandedMaps[rowid];
+              delete treeExpandedMaps[rowid];
             }
           }
         }
@@ -8257,7 +8490,7 @@ const Methods = {
     }
     internalData.fullDataRowIdData = fullDataRowIdMaps;
     internalData.fullAllDataRowIdData = fullAllDataRowIdMaps;
-    reactData.treeExpandedMaps = treeTempExpandedMaps;
+    reactData.treeExpandedFlag++;
   },
   cacheSourceMap(fullData) {
     const $xeTable = this;
@@ -8406,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) {
@@ -8460,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) {
@@ -8488,56 +8673,23 @@ 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;
-  },
-  // 在 v3 中废弃
-  _getColumnIndex(column) {
-    if (true) {
-      warnLog('vxe.error.delFunc', ['_getColumnIndex', 'getVTColumnIndex']);
-    }
-    return this.getVTColumnIndex(column);
-  },
+  getVTColumnIndex: createGetColumnCacheProp('_index'),
   /**
    * 根据 column 获取渲染中的虚拟索引
    * @param {ColumnInfo} column 列配置
    */
-  getVMColumnIndex(column) {
-    const {
-      fullColumnIdData
-    } = this;
-    if (column) {
-      const rest = fullColumnIdData[column.id];
-      if (rest) {
-        return rest.$index;
-      }
+  getVMColumnIndex: createGetColumnCacheProp('$index'),
+  // 在 v3 中废弃
+  _getColumnIndex(column) {
+    if (true) {
+      warnLog('vxe.error.delFunc', ['_getColumnIndex', 'getVTColumnIndex']);
     }
-    return -1;
+    return this.getVTColumnIndex(column);
   },
   // 在 v3 中废弃
   $getColumnIndex(column) {
@@ -8665,6 +8817,9 @@ const Methods = {
     const {
       transform
     } = treeOpts;
+    const {
+      handleGetRowId
+    } = createHandleGetRowId($xeTable);
     if (!keepSource) {
       if (true) {
         errLog('vxe.error.reqProp', ['keep-source']);
@@ -8682,7 +8837,7 @@ const Methods = {
     let reDelFlag = false;
     if (targetRows.length) {
       targetRows.forEach(item => {
-        const rowid = getRowid($xeTable, item);
+        const rowid = handleGetRowId(item);
         const rowRest = fullAllDataRowIdData[rowid];
         if (rowRest) {
           const row = rowRest.row;
@@ -9104,21 +9259,18 @@ const Methods = {
   getCheckboxRecords(isFull) {
     const $xeTable = this;
     const props = $xeTable;
-    const reactData = $xeTable;
     const internalData = $xeTable;
     const {
       treeConfig
     } = props;
-    const {
-      selectCheckboxMaps
-    } = reactData;
     const {
       tableFullData,
       afterFullData,
       afterTreeFullData,
       tableFullTreeData,
       fullDataRowIdData,
-      afterFullRowMaps
+      afterFullRowMaps,
+      selectCheckboxMaps
     } = internalData;
     const treeOpts = $xeTable.computeTreeOpts;
     const checkboxOpts = $xeTable.computeCheckboxOpts;
@@ -9560,6 +9712,7 @@ const Methods = {
    * 默认执行一次，除非被重置
    */
   handleLoadDefaults() {
+    const $xeTable = this;
     if (this.checkboxConfig) {
       this.handleDefaultSelectionChecked();
     }
@@ -9570,7 +9723,7 @@ const Methods = {
       this.handleDefaultRowExpand();
     }
     if (this.treeConfig) {
-      this.handleDefaultTreeExpand();
+      handleDefaultTreeExpand($xeTable);
     }
     if (this.mergeCells) {
       this.handleDefaultMergeCells();
@@ -10484,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;
@@ -10518,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;
@@ -11480,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]) {
@@ -11565,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
@@ -11575,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 {
@@ -11598,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);
   },
   /**
    * 切换选中
@@ -11624,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,
@@ -11665,20 +11834,19 @@ 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;
     }
     // 树结构
@@ -11690,10 +11858,10 @@ const Methods = {
           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);
@@ -11701,7 +11869,7 @@ const Methods = {
       }, {
         children: transform ? mapChildrenField : childrenField
       });
-      reactData.selectCheckboxMaps = selectRowMaps;
+      reactData.updateCheckboxFlag++;
       return;
     }
     // 列表
@@ -11711,18 +11879,18 @@ const Methods = {
         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;
   },
   /**
    * 即将移除
@@ -11736,10 +11904,10 @@ const Methods = {
   },
   handleToggleCheckRowEvent(evnt, params) {
     const $xeTable = this;
-    const reactData = $xeTable;
+    const internalData = $xeTable;
     const {
       selectCheckboxMaps
-    } = reactData;
+    } = internalData;
     const checkboxOpts = $xeTable.computeCheckboxOpts;
     const {
       checkField,
@@ -11755,17 +11923,18 @@ 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) {
       $xeTable.triggerCheckRowEvent(evnt, params, checked);
     } else {
-      $xeTable.handleBatchSelectRows(params, checked);
+      $xeTable.handleBatchSelectRows([row], checked);
       $xeTable.checkSelectionStatus();
     }
   },
   triggerCheckRowEvent(evnt, params, checked) {
     const $xeTable = this;
+    const props = $xeTable;
     const internalData = $xeTable;
     const {
       row
@@ -11782,7 +11951,7 @@ const Methods = {
       return;
     }
     evnt.stopPropagation();
-    if (checkboxOpts.isShiftKey && evnt.shiftKey && !this.treeConfig) {
+    if (checkboxOpts.isShiftKey && evnt.shiftKey && !props.treeConfig) {
       const checkboxRecords = $xeTable.getCheckboxRecords();
       if (checkboxRecords.length) {
         const firstRow = checkboxRecords[0];
@@ -11791,7 +11960,9 @@ const Methods = {
         if (_rowIndex !== _firstRowIndex) {
           $xeTable.setAllCheckboxRow(false);
           const rangeRows = _rowIndex < _firstRowIndex ? afterFullData.slice(_rowIndex, _firstRowIndex + 1) : afterFullData.slice(_firstRowIndex, _rowIndex + 1);
-          handleCheckedCheckboxRow($xeTable, rangeRows, true, false);
+          $xeTable.$nextTick(() => {
+            handleCheckedCheckboxRow($xeTable, rangeRows, true, false);
+          });
           $xeTable.dispatchEvent('checkbox-range-select', Object.assign({
             rangeRecords: rangeRows
           }, params), evnt);
@@ -11802,7 +11973,7 @@ const Methods = {
     if (!checkMethod || checkMethod({
       row
     })) {
-      $xeTable.handleBatchSelectRows(params, checked);
+      $xeTable.handleBatchSelectRows([row], checked);
       $xeTable.checkSelectionStatus();
       $xeTable.dispatchEvent('checkbox-change', Object.assign({
         records: () => $xeTable.getCheckboxRecords(),
@@ -11817,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;
@@ -11847,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,
@@ -11895,29 +12065,29 @@ const Methods = {
         let vLen = 0; // 有效行
         childList.forEach(checkMethod ? item => {
           const childRowid = handleGetRowId(item);
-          const isSelect = checkField ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(item, checkField) : selectRowMaps[childRowid];
+          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 = handleGetRowId(item);
-          const isSelect = checkField ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(item, checkField) : selectRowMaps[childRowid];
+          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++;
@@ -11929,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;
@@ -11962,20 +12131,18 @@ const Methods = {
       treeConfig
     } = props;
     const {
+      afterFullData,
+      afterTreeFullData,
+      checkboxReserveRowMap,
       selectCheckboxMaps,
-      treeIndeterminateMaps
-    } = reactData;
+      treeIndeterminateRowMaps
+    } = internalData;
     const checkboxOpts = $xeTable.computeCheckboxOpts;
     const {
       checkField,
       checkMethod,
       showReserveStatus
     } = checkboxOpts;
-    const {
-      afterFullData,
-      afterTreeFullData,
-      checkboxReserveRowMap
-    } = internalData;
     const {
       handleGetRowId
     } = createHandleGetRowId($xeTable);
@@ -11991,14 +12158,14 @@ const Methods = {
       })) {
         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++;
         }
       }
@@ -12007,7 +12174,7 @@ const Methods = {
       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++;
@@ -12071,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) => {
@@ -12171,17 +12346,23 @@ const Methods = {
    * 清空行为不管是否被禁用还是保留记录，都将彻底清空选中状态
    */
   clearCheckboxRow() {
+    const $xeTable = this;
+    const props = $xeTable;
+    const reactData = $xeTable;
+    const internalData = $xeTable;
     const {
-      tableFullData,
-      treeConfig,
-      treeOpts,
-      checkboxOpts
-    } = this;
+      treeConfig
+    } = props;
+    const {
+      tableFullData
+    } = internalData;
+    const treeOpts = $xeTable.computeTreeOpts;
+    const childrenField = treeOpts.children || treeOpts.childrenField;
+    const checkboxOpts = $xeTable.computeCheckboxOpts;
     const {
       checkField,
       reserve
     } = checkboxOpts;
-    const childrenField = treeOpts.children || treeOpts.childrenField;
     // indeterminateField 仅支持读取
     const indeterminateField = checkboxOpts.indeterminateField || checkboxOpts.halfField;
     if (checkField) {
@@ -12202,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();
   },
   /**
@@ -12941,6 +13123,8 @@ const Methods = {
     } = props;
     const rowDragOpts = $xeTable.computeRowDragOpts;
     const {
+      afterFullData,
+      tableFullData,
       fullAllDataRowIdData
     } = internalData;
     const {
@@ -12958,10 +13142,6 @@ const Methods = {
       parentField
     } = treeOpts;
     const childrenField = treeOpts.children || treeOpts.childrenField;
-    const {
-      afterFullData,
-      tableFullData
-    } = internalData;
     const dEndMethod = dragEndMethod || (dragConfig ? dragConfig.dragEndMethod : null);
     const dragOffsetIndex = prevDragPos === 'bottom' ? 1 : 0;
     const errRest = {
@@ -13627,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) {
@@ -13684,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) => {
@@ -13701,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;
@@ -13940,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 {
@@ -13954,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();
   },
   /**
@@ -13964,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) {
@@ -13988,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;
@@ -14004,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);
     }
   },
@@ -14049,86 +14247,31 @@ const Methods = {
         }
       });
       this.setRowExpand(defExpandeds, true);
-    }
-  },
-  /**
-   * 设置所有行的展开与否
-   * @param {Boolean} expanded 是否展开
-   */
-  setAllRowExpand(expanded) {
-    const {
-      treeConfig,
-      treeOpts,
-      tableFullData,
-      tableFullTreeData
-    } = this;
-    const childrenField = treeOpts.children || treeOpts.childrenField;
-    let expandedRows = [];
-    if (treeConfig) {
-      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(tableFullTreeData, row => {
-        expandedRows.push(row);
-      }, {
-        children: childrenField
-      });
-    } else {
-      expandedRows = tableFullData;
-    }
-    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();
-      }
-    });
+    }
+  },
+  /**
+   * 设置所有行的展开与否
+   * @param {Boolean} expanded 是否展开
+   */
+  setAllRowExpand(expanded) {
+    const {
+      treeConfig,
+      treeOpts,
+      tableFullData,
+      tableFullTreeData
+    } = this;
+    const childrenField = treeOpts.children || treeOpts.childrenField;
+    let expandedRows = [];
+    if (treeConfig) {
+      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(tableFullTreeData, row => {
+        expandedRows.push(row);
+      }, {
+        children: childrenField
+      });
+    } else {
+      expandedRows = tableFullData;
+    }
+    return this.setRowExpand(expandedRows, expanded);
   },
   /**
    * 设置展开行，二个参数设置这一行展开与否
@@ -14139,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,
@@ -14164,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,
@@ -14178,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];
           }
         });
       }
@@ -14201,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);
@@ -14214,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) {
@@ -14242,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));
     }
@@ -14262,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);
       }
@@ -14271,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);
       }
@@ -14308,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];
       }
@@ -14327,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];
           }
         }
       });
@@ -14337,7 +14494,8 @@ const Methods = {
         rowRest.treeLoaded = false;
       });
     }
-    reactData.treeExpandedMaps = {};
+    internalData.treeExpandedMaps = {};
+    reactData.treeExpandedFlag++;
     if (transform) {
       handleVirtualTreeToList($xeTable);
       return $xeTable.handleTableData();
@@ -14350,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
@@ -14403,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,
@@ -14422,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 是否展开
@@ -14559,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,
@@ -14596,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;
               }
             }
           }
@@ -14623,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();
     });
   },
   /**
@@ -14691,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();
       }
     });
   },
@@ -14732,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];
-      }
-    }
-  },
   /**
    * 获取表格的滚动状态
    */
@@ -15409,15 +15466,15 @@ const Methods = {
     const {
       isAllOverflow,
       scrollYLoad,
-      expandColumn,
-      rowExpandedMaps
+      expandColumn
     } = reactData;
     const {
       scrollYStore,
       elemStore,
       isResizeCellHeight,
       afterFullData,
-      fullAllDataRowIdData
+      fullAllDataRowIdData,
+      rowExpandedMaps
     } = internalData;
     const {
       startIndex
@@ -15774,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);
@@ -15940,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;
@@ -15965,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;
@@ -16267,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,
@@ -16377,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;
@@ -16405,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;
@@ -16428,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;
@@ -16455,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 = [];
@@ -16466,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)) {
@@ -16482,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);
@@ -21741,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;
@@ -21758,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;
@@ -21779,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) {
@@ -21852,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);
@@ -24965,11 +25030,11 @@ function validErrorRuleValue(rule, val) {
         treeConfig
       } = props;
       const {
-        editStore,
-        pendingRowMaps
+        editStore
       } = reactData;
       const {
-        afterFullData
+        afterFullData,
+        pendingRowMaps
       } = internalData;
       const {
         removeMaps
@@ -25916,6 +25981,9 @@ function renderRowExpandedVNs(h, $xeTable) {
     ref: 'refRowExpandYSpaceElem'
   })];
   if (expandColumn) {
+    const {
+      handleGetRowId
+    } = createHandleGetRowId($xeTable);
     tableRowExpandedList.forEach(row => {
       const expandOpts = $xeTable.computeExpandOpts;
       const {
@@ -25931,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;
@@ -26155,8 +26223,6 @@ function renderBody(h, $xeTable) {
       isAllSelected: false,
       // 复选框属性，有选中且非全选状态
       isIndeterminate: false,
-      // 复选框属性，已选中的行集合
-      selectCheckboxMaps: {},
       // 当前行
       currentRow: null,
       // 单选框属性，选中列
@@ -26170,16 +26236,6 @@ function renderBody(h, $xeTable) {
       hasFixedColumn: false,
       // 树节点列信息
       treeNodeColumn: null,
-      // 已展开的行集合
-      rowExpandedMaps: {},
-      // 懒加载中的展开行的集合
-      rowExpandLazyLoadedMaps: {},
-      // 已展开树节点集合
-      treeExpandedMaps: {},
-      // 懒加载中的树节点的集合
-      treeExpandLazyLoadedMaps: {},
-      // 树节点不确定状态的集合
-      treeIndeterminateMaps: {},
       // 合并单元格的对象集
       mergeList: [],
       // 合并表尾数据的对象集
@@ -26196,8 +26252,6 @@ function renderBody(h, $xeTable) {
       upDataFlag: 0,
       // 刷新列标识，当列的特定属性被改变时，触发表格刷新列
       reColumnFlag: 0,
-      // 已标记的对象集
-      pendingRowMaps: {},
       // 自定义列相关的信息
       customStore: {
         btnEl: null,
@@ -26332,6 +26386,10 @@ function renderBody(h, $xeTable) {
         isHeader: false,
         isFooter: false
       },
+      rowExpandedFlag: 1,
+      treeExpandedFlag: 1,
+      updateCheckboxFlag: 1,
+      pendingRowFlag: 1,
       rowHeightStore: {
         default: 48,
         medium: 44,
@@ -26478,17 +26536,29 @@ function renderBody(h, $xeTable) {
     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;
@@ -26777,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]) {
@@ -27056,13 +27133,15 @@ function renderBody(h, $xeTable) {
       lastScrollTop: 0,
       // 单选框属性，已选中保留的行
       radioReserveRow: null,
-      // 复选框属性，已选中保留的行
+      // 复选框属性，已选中保留的行集合
       checkboxReserveRowMap: {},
-      // 行数据，已展开保留的行
+      // 行数据，已展开保留的行集合
       rowExpandedReserveRowMap: {},
-      // 树结构数据，已展开保留的行
+      // 树结构数据，已展开保留的行集合
       treeExpandedReserveRowMap: {},
-      // 完整数据、条件处理后
+      // 树结构数据，不确定状态的集合
+      treeIndeterminateRowMaps: {},
+      // 列表完整数据、条件处理后
       tableFullData: [],
       afterFullData: [],
       // 列表条件处理后数据集合
@@ -27080,6 +27159,18 @@ function renderBody(h, $xeTable) {
       fullColumnMap: new Map(),
       fullColumnIdData: {},
       fullColumnFieldData: {},
+      // 已展开的行集合
+      rowExpandedMaps: {},
+      // 懒加载中的展开行的集合
+      rowExpandLazyLoadedMaps: {},
+      // 已展开树节点集合
+      treeExpandedMaps: {},
+      // 懒加载中的树节点的集合
+      treeExpandLazyLoadedMaps: {},
+      // 复选框属性，已选中的行集合
+      selectCheckboxMaps: {},
+      // 已标记的对象集
+      pendingRowMaps: {},
       swYSize: 0,
       swYInterval: 0,
       swYTotal: 0