vxe-table 3.7.0-beta.9 → 3.7.1

package/lib/table/src/methods.js

@@ -77,12 +77,16 @@ function getCustomStorageMap(key) {
     _v: version
   };
 }
-function getRecoverRow(_vm, list) {
-  var fullAllDataRowMap = _vm.fullAllDataRowMap;
-  return list.filter(function (row) {
-    return fullAllDataRowMap.has(row);
+var getRecoverRowMaps = function getRecoverRowMaps(_vm, keyMaps) {
+  var fullAllDataRowIdData = _vm.fullAllDataRowIdData;
+  var restKeys = {};
+  _xeUtils["default"].each(keyMaps, function (row, rowid) {
+    if (fullAllDataRowIdData[rowid]) {
+      restKeys[rowid] = row;
+    }
   });
-}
+  return restKeys;
+};
 function handleReserveRow(_vm, reserveRowMap) {
   var fullDataRowIdData = _vm.fullDataRowIdData;
   var reserveList = [];
@@ -434,6 +438,7 @@ var Methods = {
       oldScrollYLoad = this.scrollYLoad,
       sXOpts = this.sXOpts,
       sYOpts = this.sYOpts;
+    var childrenField = treeOpts.children || treeOpts.childrenField;
     var treeData = [];
     var fullData = datas ? datas.slice(0) : [];
     if (treeConfig) {
@@ -446,25 +451,25 @@ var Methods = {
           if (!treeOpts.parentField) {
             (0, _log.errLog)('vxe.error.reqProp', ['table.tree-config.parentField']);
           }
-          if (!(treeOpts.childrenField || treeOpts.children)) {
+          if (!childrenField) {
             (0, _log.errLog)('vxe.error.reqProp', ['tree-config.childrenField']);
           }
           if (!treeOpts.mapChildrenField) {
             (0, _log.errLog)('vxe.error.reqProp', ['tree-config.mapChildrenField']);
           }
-          if ((treeOpts.treeOpts || treeOpts.children) === treeOpts.mapChildrenField) {
+          if (childrenField === treeOpts.mapChildrenField) {
             (0, _log.errLog)('vxe.error.errConflicts', ['tree-config.childrenField', 'tree-config.mapChildrenField']);
           }
           fullData.forEach(function (row) {
-            if (row[treeOpts.childrenField || treeOpts.children] && row[treeOpts.childrenField || treeOpts.children].length) {
-              (0, _log.warnLog)('vxe.error.errConflicts', ['tree-config.transform', "row.".concat(treeOpts.childrenField || treeOpts.children)]);
+            if (row[childrenField] && row[childrenField].length) {
+              (0, _log.warnLog)('vxe.error.errConflicts', ['tree-config.transform', "row.".concat(childrenField)]);
             }
           });
         }
         treeData = _xeUtils["default"].toArrayTree(fullData, {
           key: treeOpts.rowField,
           parentKey: treeOpts.parentField,
-          children: treeOpts.childrenField || treeOpts.children,
+          children: childrenField,
           mapChildren: treeOpts.mapChildrenField
         });
         fullData = treeData.slice(0);
@@ -691,6 +696,8 @@ var Methods = {
       tableFullTreeData = this.tableFullTreeData;
     var fullDataRowIdData = this.fullDataRowIdData,
       fullAllDataRowIdData = this.fullAllDataRowIdData;
+    var childrenField = treeOpts.children || treeOpts.childrenField;
+    var hasChildField = treeOpts.hasChild || treeOpts.hasChildField;
     var rowkey = (0, _util.getRowkey)(this);
     var isLazy = treeConfig && treeOpts.lazy;
     var handleCache = function handleCache(row, index, items, path, parent, nodes) {
@@ -701,8 +708,8 @@ var Methods = {
         rowid = getRowUniqueId();
         _xeUtils["default"].set(row, rowkey, rowid);
       }
-      if (isLazy && row[treeOpts.hasChildField || treeOpts.hasChild] && _xeUtils["default"].isUndefined(row[treeOpts.childrenField || treeOpts.children])) {
-        row[treeOpts.childrenField || treeOpts.children] = null;
+      if (isLazy && row[hasChildField] && _xeUtils["default"].isUndefined(row[childrenField])) {
+        row[childrenField] = null;
       }
       var rest = {
         row: row,
@@ -729,7 +736,9 @@ var Methods = {
     fullAllDataRowIdData = this.fullAllDataRowIdData = {};
     fullAllDataRowMap.clear();
     if (treeConfig) {
-      _xeUtils["default"].eachTree(tableFullTreeData, handleCache, treeOpts);
+      _xeUtils["default"].eachTree(tableFullTreeData, handleCache, {
+        children: childrenField
+      });
     } else {
       tableFullData.forEach(handleCache);
     }
@@ -755,7 +764,10 @@ var Methods = {
     };
     // 源数据缓存
     if (treeConfig && !treeOpts.transform) {
-      _xeUtils["default"].eachTree(sourceData, handleSourceRow, treeOpts);
+      var childrenField = treeOpts.children || treeOpts.childrenField;
+      _xeUtils["default"].eachTree(sourceData, handleSourceRow, {
+        children: treeOpts.transform ? treeOpts.mapChildrenField : childrenField
+      });
     } else {
       sourceData.forEach(handleSourceRow);
     }
@@ -769,11 +781,11 @@ var Methods = {
       fullDataRowIdData = this.fullDataRowIdData,
       fullDataRowMap = this.fullDataRowMap,
       fullAllDataRowMap = this.fullAllDataRowMap,
-      fullAllDataRowIdData = this.fullAllDataRowIdData;
+      fullAllDataRowIdData = this.fullAllDataRowIdData,
+      sourceDataRowIdData = this.sourceDataRowIdData;
     var transform = treeOpts.transform,
-      childrenField = treeOpts.childrenField,
-      children = treeOpts.children,
       mapChildrenField = treeOpts.mapChildrenField;
+    var childrenField = treeOpts.children || treeOpts.childrenField;
     var rest = fullAllDataRowIdData[(0, _util.getRowid)(this, row)];
     var parentLevel = rest ? rest.level : 0;
     return this.createData(childRecords).then(function (rows) {
@@ -781,10 +793,16 @@ var Methods = {
         var rowid = (0, _util.getRowid)(_this12, row);
         var matchObj = _xeUtils["default"].findTree(tableSourceData, function (item) {
           return rowid === (0, _util.getRowid)(_this12, item);
-        }, treeOpts);
+        }, {
+          children: childrenField
+        });
         if (matchObj) {
-          matchObj.item[childrenField || children] = _xeUtils["default"].clone(rows, true);
+          matchObj.item[childrenField] = _xeUtils["default"].clone(rows, true);
         }
+        rows.forEach(function (childRow) {
+          var rowid = (0, _util.getRowid)(_this12, childRow);
+          sourceDataRowIdData[rowid] = _xeUtils["default"].clone(childRow, true);
+        });
       }
       _xeUtils["default"].eachTree(rows, function (childRow, index, items, path, parent, nodes) {
         var rowid = (0, _util.getRowid)(_this12, childRow);
@@ -803,8 +821,10 @@ var Methods = {
         fullDataRowMap.set(childRow, rest);
         fullAllDataRowIdData[rowid] = rest;
         fullAllDataRowMap.set(childRow, rest);
-      }, treeOpts);
-      row[childrenField || children] = rows;
+      }, {
+        children: childrenField
+      });
+      row[childrenField] = rows;
       if (transform) {
         row[mapChildrenField] = rows;
       }
@@ -1091,6 +1111,7 @@ var Methods = {
       treeConfig = this.treeConfig,
       treeOpts = this.treeOpts,
       expandOpts = this.expandOpts;
+    var childrenField = treeOpts.children || treeOpts.childrenField;
     var rowkey = (0, _util.getRowkey)(this);
     if (!_xeUtils["default"].isArray(records)) {
       records = [records || {}];
@@ -1120,8 +1141,8 @@ var Methods = {
           _xeUtils["default"].set(record, key, null);
         }
       });
-      if (treeConfig && treeOpts.lazy && _xeUtils["default"].isUndefined(record[treeOpts.childrenField || treeOpts.children])) {
-        record[treeOpts.childrenField || treeOpts.children] = null;
+      if (treeConfig && treeOpts.lazy && _xeUtils["default"].isUndefined(record[childrenField])) {
+        record[childrenField] = null;
       }
       // 必须有行数据的唯一主键，可以自行设置；也可以默认生成一个随机数
       if ((0, _utils.eqEmptyValue)(_xeUtils["default"].get(record, rowkey))) {
@@ -1331,19 +1352,18 @@ var Methods = {
    * 用于多选行，获取已选中的数据
    */
   getCheckboxRecords: function getCheckboxRecords(isFull) {
-    var _this17 = this;
     var tableFullData = this.tableFullData,
       afterFullData = this.afterFullData,
       treeConfig = this.treeConfig,
       treeOpts = this.treeOpts,
       checkboxOpts = this.checkboxOpts,
       tableFullTreeData = this.tableFullTreeData,
-      afterTreeFullData = this.afterTreeFullData;
+      afterTreeFullData = this.afterTreeFullData,
+      afterFullRowMaps = this.afterFullRowMaps;
     var transform = treeOpts.transform,
-      childrenField = treeOpts.childrenField,
-      children = treeOpts.children,
       mapChildrenField = treeOpts.mapChildrenField;
     var checkField = checkboxOpts.checkField;
+    var childrenField = treeOpts.children || treeOpts.childrenField;
     var currTableData = isFull ? transform ? tableFullTreeData : tableFullData : transform ? afterTreeFullData : afterFullData;
     var rowList = [];
     if (checkField) {
@@ -1351,7 +1371,7 @@ var Methods = {
         rowList = _xeUtils["default"].filterTree(currTableData, function (row) {
           return _xeUtils["default"].get(row, checkField);
         }, {
-          children: transform ? mapChildrenField : childrenField || children
+          children: transform ? mapChildrenField : childrenField
         });
       } else {
         rowList = currTableData.filter(function (row) {
@@ -1359,18 +1379,13 @@ var Methods = {
         });
       }
     } else {
-      var selectCheckboxRows = this.selectCheckboxRows;
-      if (treeConfig) {
-        rowList = _xeUtils["default"].filterTree(currTableData, function (row) {
-          return _this17.findRowIndexOf(selectCheckboxRows, row) > -1;
-        }, {
-          children: transform ? mapChildrenField : childrenField || children
-        });
-      } else {
-        rowList = currTableData.filter(function (row) {
-          return _this17.findRowIndexOf(selectCheckboxRows, row) > -1;
-        });
-      }
+      var selectCheckboxMaps = this.selectCheckboxMaps,
+        fullDataRowIdData = this.fullDataRowIdData;
+      _xeUtils["default"].each(selectCheckboxMaps, function (row, rowid) {
+        if (isFull ? fullDataRowIdData[rowid] : afterFullRowMaps[rowid]) {
+          rowList.push(row);
+        }
+      });
     }
     return rowList;
   },
@@ -1379,17 +1394,20 @@ var Methods = {
    * @returns
    */
   handleVirtualTreeToList: function handleVirtualTreeToList() {
+    var _this17 = this;
     var treeOpts = this.treeOpts,
       treeConfig = this.treeConfig,
-      treeExpandeds = this.treeExpandeds,
+      treeExpandedMaps = this.treeExpandedMaps,
       afterTreeFullData = this.afterTreeFullData,
       afterFullData = this.afterFullData;
     if (treeConfig && treeOpts.transform) {
       var fullData = [];
-      var expandMaps = new Map();
+      var expandMaps = {};
       _xeUtils["default"].eachTree(afterTreeFullData, function (row, index, items, path, parent) {
-        if (!parent || expandMaps.has(parent) && treeExpandeds.indexOf(parent) > -1) {
-          expandMaps.set(row, 1);
+        var rowid = (0, _util.getRowid)(_this17, row);
+        var parentRowid = (0, _util.getRowid)(_this17, parent);
+        if (!parent || expandMaps[parentRowid] && treeExpandedMaps[parentRowid]) {
+          expandMaps[rowid] = 1;
           fullData.push(row);
         }
       }, {
@@ -1618,6 +1636,8 @@ var Methods = {
       fullAllDataRowIdData = this.fullAllDataRowIdData,
       afterTreeFullData = this.afterTreeFullData,
       treeOpts = this.treeOpts;
+    var childrenField = treeOpts.children || treeOpts.childrenField;
+    var fullMaps = {};
     if (treeConfig) {
       _xeUtils["default"].eachTree(afterTreeFullData, function (row, index, items, path) {
         var rowid = (0, _util.getRowid)(_this19, row);
@@ -1643,8 +1663,9 @@ var Methods = {
           fullAllDataRowIdData[rowid] = rest;
           fullDataRowIdData[rowid] = rest;
         }
+        fullMaps[rowid] = row;
       }, {
-        children: treeOpts.transform ? treeOpts.mapChildrenField : treeOpts.childrenField || treeOpts.children
+        children: treeOpts.transform ? treeOpts.mapChildrenField : childrenField
       });
     } else {
       afterFullData.forEach(function (row, index) {
@@ -1669,8 +1690,10 @@ var Methods = {
           fullAllDataRowIdData[rowid] = rest;
           fullDataRowIdData[rowid] = rest;
         }
+        fullMaps[rowid] = row;
       });
     }
+    this.afterFullRowMaps = fullMaps;
   },
   /**
    * 只对 tree-config 有效，获取行的父级
@@ -1809,7 +1832,7 @@ var Methods = {
    */
   showColumn: function showColumn(fieldOrColumn) {
     var column = (0, _util.handleFieldOrColumn)(this, fieldOrColumn);
-    if (column && column.visible) {
+    if (column && !column.visible) {
       column.visible = true;
       return this.handleCustom();
     }
@@ -2972,6 +2995,7 @@ var Methods = {
         var operArrow = isLeftArrow || isUpArrow || isRightArrow || isDwArrow;
         var operCtxMenu = isCtxMenu && ctxMenuStore.visible && (isEnter || isSpacebar || operArrow);
         var isEditStatus = (0, _utils.isEnableConf)(editConfig) && actived.column && actived.row;
+        var childrenField = treeOpts.children || treeOpts.childrenField;
         var params;
         if (filterStore.visible) {
           if (isEsc) {
@@ -3046,7 +3070,7 @@ var Methods = {
               }
             } else if (treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow) {
               // 如果是树形表格当前行回车移动到子节点
-              var childrens = currentRow[treeOpts.children];
+              var childrens = currentRow[childrenField];
               if (childrens && childrens.length) {
                 evnt.preventDefault();
                 var targetRow = childrens[0];
@@ -3116,7 +3140,9 @@ var Methods = {
               // 如果树形表格回退键关闭当前行返回父节点
               var _XEUtils$findTree = _xeUtils["default"].findTree(_this29.afterFullData, function (item) {
                   return item === currentRow;
-                }, treeOpts),
+                }, {
+                  children: childrenField
+                }),
                 parentRow = _XEUtils$findTree.parent;
               if (parentRow) {
                 evnt.preventDefault();
@@ -3422,15 +3448,24 @@ var Methods = {
    * 获取复选框半选状态的行数据
    */
   getCheckboxIndeterminateRecords: function getCheckboxIndeterminateRecords(isFull) {
-    var _this31 = this;
     var treeConfig = this.treeConfig,
-      treeIndeterminates = this.treeIndeterminates,
+      treeIndeterminateMaps = this.treeIndeterminateMaps,
       fullDataRowIdData = this.fullDataRowIdData;
     if (treeConfig) {
-      return isFull ? treeIndeterminates.slice(0) : treeIndeterminates.filter(function (row) {
-        var rowid = (0, _util.getRowid)(_this31, row);
-        return fullDataRowIdData[rowid];
+      var fullRest = [];
+      var defRest = [];
+      _xeUtils["default"].each(treeIndeterminateMaps, function (item, rowid) {
+        if (item) {
+          fullRest.push(item);
+          if (fullDataRowIdData[rowid]) {
+            defRest.push(item);
+          }
+        }
       });
+      if (isFull) {
+        return fullRest;
+      }
+      return defRest;
     }
     return [];
   },
@@ -3455,12 +3490,12 @@ var Methods = {
     }
   },
   handleCheckedCheckboxRow: function handleCheckedCheckboxRow(rows, value, isForce) {
-    var _this32 = this;
+    var _this31 = this;
     if (rows && !_xeUtils["default"].isArray(rows)) {
       rows = [rows];
     }
     rows.forEach(function (row) {
-      return _this32.handleSelectRow({
+      return _this31.handleSelectRow({
         row: row
       }, !!value, isForce);
     });
@@ -3475,78 +3510,108 @@ var Methods = {
     return this.handleCheckedCheckboxRow(rows, value, true);
   },
   isCheckedByCheckboxRow: function isCheckedByCheckboxRow(row) {
-    var selectCheckboxRows = this.selectCheckboxRows;
+    var selectCheckboxMaps = this.selectCheckboxMaps;
     var checkField = this.checkboxOpts.checkField;
     if (checkField) {
       return _xeUtils["default"].get(row, checkField);
     }
-    return this.findRowIndexOf(selectCheckboxRows, row) > -1;
+    return !!selectCheckboxMaps[(0, _util.getRowid)(this, row)];
   },
   isIndeterminateByCheckboxRow: function isIndeterminateByCheckboxRow(row) {
-    var treeIndeterminates = this.treeIndeterminates;
-    return this.findRowIndexOf(treeIndeterminates, row) > -1 && !this.isCheckedByCheckboxRow(row);
+    var treeIndeterminateMaps = this.treeIndeterminateMaps;
+    return !!treeIndeterminateMaps[(0, _util.getRowid)(this, row)] && !this.isCheckedByCheckboxRow(row);
   },
   /**
    * 多选，行选中事件
    * value 选中true 不选false 半选-1
    */
   handleSelectRow: function handleSelectRow(_ref6, value, isForce) {
-    var _this33 = this;
+    var _this32 = this;
     var row = _ref6.row;
-    var selectCheckboxRows = this.selectCheckboxRows,
+    var selectCheckboxMaps = this.selectCheckboxMaps,
       afterFullData = this.afterFullData,
       treeConfig = this.treeConfig,
       treeOpts = this.treeOpts,
-      treeIndeterminates = this.treeIndeterminates,
+      treeIndeterminateMaps = this.treeIndeterminateMaps,
       checkboxOpts = this.checkboxOpts;
     var checkField = checkboxOpts.checkField,
       checkStrictly = checkboxOpts.checkStrictly,
       checkMethod = checkboxOpts.checkMethod;
+    var selectRowMaps = _objectSpread({}, selectCheckboxMaps);
+    var childrenField = treeOpts.children || treeOpts.childrenField;
+    var indeterminateField = checkboxOpts.indeterminateField || checkboxOpts.halfField;
+    var rowid = (0, _util.getRowid)(this, row);
     if (checkField) {
       if (treeConfig && !checkStrictly) {
         if (value === -1) {
-          if (this.findRowIndexOf(treeIndeterminates, row) === -1) {
-            treeIndeterminates.push(row);
+          if (!treeIndeterminateMaps[rowid]) {
+            if (indeterminateField) {
+              _xeUtils["default"].set(row, indeterminateField, true);
+            }
+            treeIndeterminateMaps[rowid] = row;
           }
           _xeUtils["default"].set(row, checkField, false);
         } else {
           // 更新子节点状态
           _xeUtils["default"].eachTree([row], function (item) {
-            if (_this33.eqRow(item, row) || isForce || !checkMethod || checkMethod({
+            if (_this32.eqRow(item, row) || isForce || !checkMethod || checkMethod({
               row: item
             })) {
               _xeUtils["default"].set(item, checkField, value);
-              _xeUtils["default"].remove(treeIndeterminates, function (half) {
-                return _this33.eqRow(half, item);
-              });
-              _this33.handleCheckboxReserveRow(row, value);
+              if (indeterminateField) {
+                _xeUtils["default"].set(row, indeterminateField, false);
+              }
+              delete treeIndeterminateMaps[(0, _util.getRowid)(_this32, item)];
+              _this32.handleCheckboxReserveRow(row, value);
             }
-          }, treeOpts);
+          }, {
+            children: childrenField
+          });
         }
         // 如果存在父节点，更新父节点状态
         var matchObj = _xeUtils["default"].findTree(afterFullData, function (item) {
-          return _this33.eqRow(item, row);
-        }, treeOpts);
+          return _this32.eqRow(item, row);
+        }, {
+          children: childrenField
+        });
         if (matchObj && matchObj.parent) {
           var parentStatus;
-          var vItems = !isForce && checkMethod ? matchObj.items.filter(function (item) {
-            return checkMethod({
-              row: item
+          var vItems = [];
+          var vItemMaps = {};
+          if (!isForce && checkMethod) {
+            matchObj.items.forEach(function (item) {
+              if (checkMethod({
+                row: item
+              })) {
+                var itemRid = (0, _util.getRowid)(_this32, item);
+                vItemMaps[itemRid] = item;
+                vItems.push(item);
+              }
             });
-          }) : matchObj.items;
+          } else {
+            matchObj.items.forEach(function (item) {
+              var itemRid = (0, _util.getRowid)(_this32, item);
+              vItemMaps[itemRid] = item;
+              vItems.push(item);
+            });
+          }
           var indeterminatesItem = _xeUtils["default"].find(matchObj.items, function (item) {
-            return _this33.findRowIndexOf(treeIndeterminates, item) > -1;
+            return !!treeIndeterminateMaps[(0, _util.getRowid)(_this32, item)];
           });
           if (indeterminatesItem) {
             parentStatus = -1;
           } else {
-            var selectItems = matchObj.items.filter(function (item) {
-              return _xeUtils["default"].get(item, checkField);
+            var selectItems = [];
+            matchObj.items.forEach(function (item) {
+              if (_xeUtils["default"].get(item, checkField)) {
+                selectItems.push(item);
+              }
             });
             parentStatus = selectItems.filter(function (item) {
-              return _this33.findRowIndexOf(vItems, item) > -1;
+              return vItemMaps[(0, _util.getRowid)(_this32, item)];
             }).length === vItems.length ? true : selectItems.length || value === -1 ? -1 : false;
           }
+          this.selectCheckboxMaps = selectRowMaps;
           return this.handleSelectRow({
             row: matchObj.parent
           }, parentStatus, isForce);
@@ -3562,56 +3627,84 @@ var Methods = {
     } else {
       if (treeConfig && !checkStrictly) {
         if (value === -1) {
-          if (this.findRowIndexOf(treeIndeterminates, row) === -1) {
-            treeIndeterminates.push(row);
+          if (!treeIndeterminateMaps[rowid]) {
+            if (indeterminateField) {
+              _xeUtils["default"].set(row, indeterminateField, true);
+            }
+            treeIndeterminateMaps[rowid] = row;
+          }
+          if (selectRowMaps[rowid]) {
+            delete selectRowMaps[rowid];
           }
-          _xeUtils["default"].remove(selectCheckboxRows, function (item) {
-            return _this33.eqRow(item, row);
-          });
         } else {
           // 更新子节点状态
           _xeUtils["default"].eachTree([row], function (item) {
-            if (_this33.eqRow(item, row) || isForce || !checkMethod || checkMethod({
+            var itemRid = (0, _util.getRowid)(_this32, item);
+            if (_this32.eqRow(item, row) || isForce || !checkMethod || checkMethod({
               row: item
             })) {
               if (value) {
-                selectCheckboxRows.push(item);
+                selectRowMaps[itemRid] = item;
               } else {
-                _xeUtils["default"].remove(selectCheckboxRows, function (select) {
-                  return _this33.eqRow(select, item);
-                });
+                if (selectRowMaps[itemRid]) {
+                  delete selectRowMaps[itemRid];
+                }
               }
-              _xeUtils["default"].remove(treeIndeterminates, function (half) {
-                return _this33.eqRow(half, item);
-              });
-              _this33.handleCheckboxReserveRow(row, value);
+              if (indeterminateField) {
+                _xeUtils["default"].set(row, indeterminateField, false);
+              }
+              delete treeIndeterminateMaps[(0, _util.getRowid)(_this32, item)];
+              _this32.handleCheckboxReserveRow(row, value);
             }
-          }, treeOpts);
+          }, {
+            children: childrenField
+          });
         }
         // 如果存在父节点，更新父节点状态
         var _matchObj = _xeUtils["default"].findTree(afterFullData, function (item) {
-          return _this33.eqRow(item, row);
-        }, treeOpts);
+          return _this32.eqRow(item, row);
+        }, {
+          children: childrenField
+        });
         if (_matchObj && _matchObj.parent) {
           var _parentStatus;
-          var _vItems = !isForce && checkMethod ? _matchObj.items.filter(function (item) {
-            return checkMethod({
-              row: item
+          var _vItems = [];
+          var _vItemMaps = {};
+          if (!isForce && checkMethod) {
+            _matchObj.items.forEach(function (item) {
+              if (checkMethod({
+                row: item
+              })) {
+                var itemRid = (0, _util.getRowid)(_this32, item);
+                _vItemMaps[itemRid] = item;
+                _vItems.push(item);
+              }
+            });
+          } else {
+            _matchObj.items.forEach(function (item) {
+              var itemRid = (0, _util.getRowid)(_this32, item);
+              _vItemMaps[itemRid] = item;
+              _vItems.push(item);
             });
-          }) : _matchObj.items;
+          }
           var _indeterminatesItem = _xeUtils["default"].find(_matchObj.items, function (item) {
-            return _this33.findRowIndexOf(treeIndeterminates, item) > -1;
+            return !!treeIndeterminateMaps[(0, _util.getRowid)(_this32, item)];
           });
           if (_indeterminatesItem) {
             _parentStatus = -1;
           } else {
-            var _selectItems = _matchObj.items.filter(function (item) {
-              return _this33.findRowIndexOf(selectCheckboxRows, item) > -1;
+            var _selectItems = [];
+            _matchObj.items.forEach(function (item) {
+              var itemRid = (0, _util.getRowid)(_this32, item);
+              if (selectRowMaps[itemRid]) {
+                _selectItems.push(item);
+              }
             });
             _parentStatus = _selectItems.filter(function (item) {
-              return _this33.findRowIndexOf(_vItems, item) > -1;
+              return _vItemMaps[(0, _util.getRowid)(_this32, item)];
             }).length === _vItems.length ? true : _selectItems.length || value === -1 ? -1 : false;
           }
+          this.selectCheckboxMaps = selectRowMaps;
           return this.handleSelectRow({
             row: _matchObj.parent
           }, _parentStatus, isForce);
@@ -3621,26 +3714,32 @@ var Methods = {
           row: row
         })) {
           if (value) {
-            if (this.findRowIndexOf(selectCheckboxRows, row) === -1) {
-              selectCheckboxRows.push(row);
+            if (!selectRowMaps[rowid]) {
+              selectRowMaps[rowid] = row;
             }
           } else {
-            _xeUtils["default"].remove(selectCheckboxRows, function (item) {
-              return _this33.eqRow(item, row);
-            });
+            if (selectRowMaps[rowid]) {
+              delete selectRowMaps[rowid];
+            }
           }
           this.handleCheckboxReserveRow(row, value);
         }
       }
     }
+    this.selectCheckboxMaps = selectRowMaps;
     this.checkSelectionStatus();
   },
   handleToggleCheckRowEvent: function handleToggleCheckRowEvent(evnt, params) {
-    var selectCheckboxRows = this.selectCheckboxRows,
+    var selectCheckboxMaps = this.selectCheckboxMaps,
       checkboxOpts = this.checkboxOpts;
     var checkField = checkboxOpts.checkField;
     var row = params.row;
-    var value = checkField ? !_xeUtils["default"].get(row, checkField) : this.findRowIndexOf(selectCheckboxRows, row) === -1;
+    var value = false;
+    if (checkField) {
+      value = !_xeUtils["default"].get(row, checkField);
+    } else {
+      value = !selectCheckboxMaps[(0, _util.getRowid)(this, row)];
+    }
     if (evnt) {
       this.triggerCheckRowEvent(evnt, params, value);
     } else {
@@ -3648,9 +3747,29 @@ var Methods = {
     }
   },
   triggerCheckRowEvent: function triggerCheckRowEvent(evnt, params, value) {
-    var checkMethod = this.checkboxOpts.checkMethod;
+    var checkboxOpts = this.checkboxOpts,
+      afterFullData = this.afterFullData;
+    var checkMethod = checkboxOpts.checkMethod;
+    var row = params.row;
+    if (checkboxOpts.isShiftKey && evnt.shiftKey && !this.treeConfig) {
+      var checkboxRecords = this.getCheckboxRecords();
+      if (checkboxRecords.length) {
+        var firstRow = checkboxRecords[0];
+        var _rowIndex = this.getVTRowIndex(row);
+        var _firstRowIndex = this.getVTRowIndex(firstRow);
+        if (_rowIndex !== _firstRowIndex) {
+          this.setAllCheckboxRow(false);
+          var rangeRows = _rowIndex < _firstRowIndex ? afterFullData.slice(_rowIndex, _firstRowIndex + 1) : afterFullData.slice(_firstRowIndex, _rowIndex + 1);
+          this.handleCheckedCheckboxRow(rangeRows, true, false);
+          this.emitEvent('checkbox-range-select', Object.assign({
+            rangeRecords: rangeRows
+          }, params), evnt);
+          return;
+        }
+      }
+    }
     if (!checkMethod || checkMethod({
-      row: params.row
+      row: row
     })) {
       this.handleSelectRow(params, value);
       this.emitEvent('checkbox-change', Object.assign({
@@ -3665,31 +3784,42 @@ var Methods = {
    * 多选，切换某一行的选中状态
    */
   toggleCheckboxRow: function toggleCheckboxRow(row) {
-    var selectCheckboxRows = this.selectCheckboxRows,
+    var selectCheckboxMaps = this.selectCheckboxMaps,
       checkboxOpts = this.checkboxOpts;
     var checkField = checkboxOpts.checkField;
-    var value = checkField ? !_xeUtils["default"].get(row, checkField) : this.findRowIndexOf(selectCheckboxRows, row) === -1;
+    var value = checkField ? !_xeUtils["default"].get(row, checkField) : !selectCheckboxMaps[(0, _util.getRowid)(this, row)];
     this.handleSelectRow({
       row: row
     }, value, true);
     return this.$nextTick();
   },
   handleCheckedAllCheckboxRow: function handleCheckedAllCheckboxRow(value, isForce) {
-    var _this34 = this;
+    var _this33 = this;
     var afterFullData = this.afterFullData,
       treeConfig = this.treeConfig,
       treeOpts = this.treeOpts,
-      selectCheckboxRows = this.selectCheckboxRows,
+      selectCheckboxMaps = this.selectCheckboxMaps,
       checkboxReserveRowMap = this.checkboxReserveRowMap,
-      checkboxOpts = this.checkboxOpts;
+      checkboxOpts = this.checkboxOpts,
+      afterFullRowMaps = this.afterFullRowMaps;
     var checkField = checkboxOpts.checkField,
       reserve = checkboxOpts.reserve,
       checkStrictly = checkboxOpts.checkStrictly,
       checkMethod = checkboxOpts.checkMethod;
-    var selectRows = [];
-    var beforeSelection = treeConfig ? [] : selectCheckboxRows.filter(function (row) {
-      return _this34.findRowIndexOf(afterFullData, row) === -1;
-    });
+    var indeterminateField = checkboxOpts.indeterminateField || checkboxOpts.halfField;
+    var childrenField = treeOpts.children || treeOpts.childrenField;
+    var selectRowMaps = {};
+
+    // 疑惑！
+    if (!treeConfig) {
+      _xeUtils["default"].each(selectCheckboxMaps, function (row, rowid) {
+        if (!afterFullRowMaps[rowid]) {
+          selectRowMaps[rowid] = row;
+        }
+      });
+    }
+    // 疑惑！
+
     if (checkStrictly) {
       this.isAllSelected = value;
     } else {
@@ -3703,15 +3833,20 @@ var Methods = {
             row: row
           })) {
             if (value) {
-              selectRows.push(row);
+              selectRowMaps[(0, _util.getRowid)(_this33, row)] = row;
             }
             _xeUtils["default"].set(row, checkField, value);
           }
+          if (treeConfig && indeterminateField) {
+            _xeUtils["default"].set(row, indeterminateField, false);
+          }
         };
         // 如果存在选中方法
         // 如果方法成立，则更新值，否则忽略该数据
         if (treeConfig) {
-          _xeUtils["default"].eachTree(afterFullData, checkValFn, treeOpts);
+          _xeUtils["default"].eachTree(afterFullData, checkValFn, {
+            children: childrenField
+          });
         } else {
           afterFullData.forEach(checkValFn);
         }
@@ -3730,9 +3865,11 @@ var Methods = {
               if (isForce || !checkMethod || checkMethod({
                 row: row
               })) {
-                selectRows.push(row);
+                selectRowMaps[(0, _util.getRowid)(_this33, row)] = row;
               }
-            }, treeOpts);
+            }, {
+              children: childrenField
+            });
           } else {
             /**
              * 如果是树取消
@@ -3740,12 +3877,15 @@ var Methods = {
              */
             if (!isForce && checkMethod) {
               _xeUtils["default"].eachTree(afterFullData, function (row) {
+                var rowid = (0, _util.getRowid)(_this33, row);
                 if (checkMethod({
                   row: row
-                }) ? 0 : _this34.findRowIndexOf(selectCheckboxRows, row) > -1) {
-                  selectRows.push(row);
+                }) ? 0 : selectCheckboxMaps[rowid]) {
+                  selectRowMaps[rowid] = row;
                 }
-              }, treeOpts);
+              }, {
+                children: childrenField
+              });
             }
           }
         } else {
@@ -3756,13 +3896,18 @@ var Methods = {
              * 如果不存在选中方法，则添加所有数据到临时集合中
              */
             if (!isForce && checkMethod) {
-              selectRows = afterFullData.filter(function (row) {
-                return _this34.findRowIndexOf(selectCheckboxRows, row) > -1 || checkMethod({
+              afterFullData.forEach(function (row) {
+                var rowid = (0, _util.getRowid)(_this33, row);
+                if (selectCheckboxMaps[rowid] || checkMethod({
                   row: row
-                });
+                })) {
+                  selectRowMaps[rowid] = row;
+                }
               });
             } else {
-              selectRows = afterFullData.slice(0);
+              afterFullData.forEach(function (row) {
+                selectRowMaps[(0, _util.getRowid)(_this33, row)] = row;
+              });
             }
           } else {
             /**
@@ -3771,10 +3916,13 @@ var Methods = {
              * 如果不存在选中方法，无需处理，临时集合默认为空
              */
             if (!isForce && checkMethod) {
-              selectRows = afterFullData.filter(function (row) {
-                return checkMethod({
+              afterFullData.forEach(function (row) {
+                var rowid = (0, _util.getRowid)(_this33, row);
+                if (checkMethod({
                   row: row
-                }) ? 0 : _this34.findRowIndexOf(selectCheckboxRows, row) > -1;
+                }) ? 0 : selectCheckboxMaps[rowid]) {
+                  selectRowMaps[rowid] = row;
+                }
               });
             }
           }
@@ -3782,18 +3930,19 @@ var Methods = {
       }
       if (reserve) {
         if (value) {
-          selectRows.forEach(function (row) {
-            checkboxReserveRowMap[(0, _util.getRowid)(_this34, row)] = row;
+          _xeUtils["default"].each(selectRowMaps, function (row, rowid) {
+            checkboxReserveRowMap[rowid] = row;
           });
         } else {
           afterFullData.forEach(function (row) {
-            return _this34.handleCheckboxReserveRow(row, false);
+            return _this33.handleCheckboxReserveRow(row, false);
           });
         }
       }
-      this.selectCheckboxRows = checkField ? [] : beforeSelection.concat(selectRows);
+      this.selectCheckboxMaps = checkField ? {} : selectRowMaps;
     }
-    this.treeIndeterminates = [];
+    this.treeIndeterminateMaps = {};
+    this.treeIndeterminateRowMaps = {};
     this.checkSelectionStatus();
     return this.$nextTick();
   },
@@ -3805,16 +3954,16 @@ var Methods = {
     return this.handleCheckedAllCheckboxRow(value, true);
   },
   checkSelectionStatus: function checkSelectionStatus() {
-    var _this35 = this;
+    var _this34 = this;
     var afterFullData = this.afterFullData,
-      selectCheckboxRows = this.selectCheckboxRows,
-      treeIndeterminates = this.treeIndeterminates,
+      selectCheckboxMaps = this.selectCheckboxMaps,
+      treeIndeterminateMaps = this.treeIndeterminateMaps,
       checkboxOpts = this.checkboxOpts,
       treeConfig = this.treeConfig;
     var checkField = checkboxOpts.checkField,
-      halfField = checkboxOpts.halfField,
       checkStrictly = checkboxOpts.checkStrictly,
       checkMethod = checkboxOpts.checkMethod;
+    var indeterminateField = checkboxOpts.indeterminateField || checkboxOpts.halfField;
     if (!checkStrictly) {
       var disableRows = [];
       var checkRows = [];
@@ -3839,19 +3988,19 @@ var Methods = {
         });
         isAllSelected = isAllResolve && afterFullData.length !== disableRows.length;
         if (treeConfig) {
-          if (halfField) {
+          if (indeterminateField) {
             isIndeterminate = !isAllSelected && afterFullData.some(function (row) {
-              return _xeUtils["default"].get(row, checkField) || _xeUtils["default"].get(row, halfField) || _this35.findRowIndexOf(treeIndeterminates, row) > -1;
+              return _xeUtils["default"].get(row, checkField) || _xeUtils["default"].get(row, indeterminateField) || !!treeIndeterminateMaps[(0, _util.getRowid)(_this34, row)];
             });
           } else {
             isIndeterminate = !isAllSelected && afterFullData.some(function (row) {
-              return _xeUtils["default"].get(row, checkField) || _this35.findRowIndexOf(treeIndeterminates, row) > -1;
+              return _xeUtils["default"].get(row, checkField) || !!treeIndeterminateMaps[(0, _util.getRowid)(_this34, row)];
             });
           }
         } else {
-          if (halfField) {
+          if (indeterminateField) {
             isIndeterminate = !isAllSelected && afterFullData.some(function (row) {
-              return _xeUtils["default"].get(row, checkField) || _xeUtils["default"].get(row, halfField);
+              return _xeUtils["default"].get(row, checkField) || _xeUtils["default"].get(row, indeterminateField);
             });
           } else {
             isIndeterminate = !isAllSelected && afterFullData.some(function (row) {
@@ -3867,22 +4016,23 @@ var Methods = {
             disableRows.push(row);
             return true;
           }
-          if (_this35.findRowIndexOf(selectCheckboxRows, row) > -1) {
+          if (selectCheckboxMaps[(0, _util.getRowid)(_this34, row)]) {
             checkRows.push(row);
             return true;
           }
           return false;
         } : function (row) {
-          return _this35.findRowIndexOf(selectCheckboxRows, row) > -1;
+          return selectCheckboxMaps[(0, _util.getRowid)(_this34, row)];
         });
         isAllSelected = isAllResolve && afterFullData.length !== disableRows.length;
         if (treeConfig) {
           isIndeterminate = !isAllSelected && afterFullData.some(function (row) {
-            return _this35.findRowIndexOf(treeIndeterminates, row) > -1 || _this35.findRowIndexOf(selectCheckboxRows, row) > -1;
+            var itemRid = (0, _util.getRowid)(_this34, row);
+            return treeIndeterminateMaps[itemRid] || selectCheckboxMaps[itemRid];
           });
         } else {
           isIndeterminate = !isAllSelected && afterFullData.some(function (row) {
-            return _this35.findRowIndexOf(selectCheckboxRows, row) > -1;
+            return selectCheckboxMaps[(0, _util.getRowid)(_this34, row)];
           });
         }
       }
@@ -3898,17 +4048,17 @@ var Methods = {
       fullDataRowIdData = this.fullDataRowIdData,
       fullAllDataRowMap = this.fullAllDataRowMap,
       currentRow = this.currentRow,
-      selectRow = this.selectRow,
+      selectRadioRow = this.selectRadioRow,
       radioReserveRow = this.radioReserveRow,
       radioOpts = this.radioOpts,
       checkboxOpts = this.checkboxOpts,
-      selectCheckboxRows = this.selectCheckboxRows,
-      rowExpandeds = this.rowExpandeds,
-      treeExpandeds = this.treeExpandeds,
+      selectCheckboxMaps = this.selectCheckboxMaps,
+      rowExpandedMaps = this.rowExpandedMaps,
+      treeExpandedMaps = this.treeExpandedMaps,
       expandOpts = this.expandOpts;
     // 单选框
-    if (selectRow && !fullAllDataRowMap.has(selectRow)) {
-      this.selectRow = null; // 刷新单选行状态
+    if (selectRadioRow && !fullAllDataRowMap.has(selectRadioRow)) {
+      this.selectRadioRow = null; // 刷新单选行状态
     }
     // 还原保留选中状态
     if (radioOpts.reserve && radioReserveRow) {
@@ -3918,7 +4068,7 @@ var Methods = {
       }
     }
     // 复选框
-    this.selectCheckboxRows = getRecoverRow(this, selectCheckboxRows); // 刷新多选行状态
+    this.selectCheckboxMaps = getRecoverRowMaps(this, selectCheckboxMaps); // 刷新多选行状态
     // 还原保留选中状态
     if (checkboxOpts.reserve) {
       this.handleCheckedCheckboxRow(handleReserveRow(this, this.checkboxReserveRowMap), true, true);
@@ -3927,13 +4077,13 @@ var Methods = {
       this.currentRow = null; // 刷新当前行状态
     }
     // 行展开
-    this.rowExpandeds = expandColumn ? getRecoverRow(this, rowExpandeds) : []; // 刷新行展开状态
+    this.rowExpandedMaps = expandColumn ? getRecoverRowMaps(this, rowExpandedMaps) : []; // 刷新行展开状态
     // 还原保留状态
     if (expandColumn && expandOpts.reserve) {
       this.setRowExpand(handleReserveRow(this, this.rowExpandedReserveRowMap), true);
     }
     // 树展开
-    this.treeExpandeds = treeConfig ? getRecoverRow(this, treeExpandeds) : []; // 刷新树展开状态
+    this.treeExpandedMaps = treeConfig ? getRecoverRowMaps(this, treeExpandedMaps) : []; // 刷新树展开状态
     if (treeConfig && treeOpts.reserve) {
       this.setTreeExpand(handleReserveRow(this, this.treeExpandedReserveRowMap), true);
     }
@@ -3948,6 +4098,7 @@ var Methods = {
       afterFullData = this.afterFullData,
       treeConfig = this.treeConfig,
       treeOpts = this.treeOpts;
+    var childrenField = treeOpts.children || treeOpts.childrenField;
     if (radioOpts.reserve && radioReserveRow) {
       var rowid = (0, _util.getRowid)(this, radioReserveRow);
       if (isFull) {
@@ -3959,7 +4110,9 @@ var Methods = {
         if (treeConfig) {
           var matchObj = _xeUtils["default"].findTree(afterFullData, function (row) {
             return rowid === _xeUtils["default"].get(row, rowkey);
-          }, treeOpts);
+          }, {
+            children: childrenField
+          });
           if (matchObj) {
             return radioReserveRow;
           }
@@ -3988,23 +4141,26 @@ var Methods = {
    * 获取复选框保留选中的行
    */
   getCheckboxReserveRecords: function getCheckboxReserveRecords(isFull) {
-    var _this36 = this;
+    var _this35 = this;
     var fullDataRowIdData = this.fullDataRowIdData,
       afterFullData = this.afterFullData,
       checkboxReserveRowMap = this.checkboxReserveRowMap,
       checkboxOpts = this.checkboxOpts,
       treeConfig = this.treeConfig,
       treeOpts = this.treeOpts;
+    var childrenField = treeOpts.children || treeOpts.childrenField;
     var reserveSelection = [];
     if (checkboxOpts.reserve) {
       var afterFullIdMaps = {};
       if (treeConfig) {
         _xeUtils["default"].eachTree(afterFullData, function (row) {
-          afterFullIdMaps[(0, _util.getRowid)(_this36, row)] = 1;
-        }, treeOpts);
+          afterFullIdMaps[(0, _util.getRowid)(_this35, row)] = 1;
+        }, {
+          children: childrenField
+        });
       } else {
         afterFullData.forEach(function (row) {
-          afterFullIdMaps[(0, _util.getRowid)(_this36, row)] = 1;
+          afterFullIdMaps[(0, _util.getRowid)(_this35, row)] = 1;
         });
       }
       _xeUtils["default"].each(checkboxReserveRowMap, function (oldRow, oldRowid) {
@@ -4063,33 +4219,39 @@ var Methods = {
    * 清空行为不管是否被禁用还是保留记录，都将彻底清空选中状态
    */
   clearCheckboxRow: function clearCheckboxRow() {
-    var _this37 = this;
+    var _this36 = this;
     var tableFullData = this.tableFullData,
       treeConfig = this.treeConfig,
       treeOpts = this.treeOpts,
       checkboxOpts = this.checkboxOpts;
     var checkField = checkboxOpts.checkField,
       reserve = checkboxOpts.reserve;
+    var childrenField = treeOpts.children || treeOpts.childrenField;
+    var indeterminateField = checkboxOpts.indeterminateField || checkboxOpts.halfField;
     if (checkField) {
+      var handleClearChecked = function handleClearChecked(item) {
+        if (treeConfig && indeterminateField) {
+          _xeUtils["default"].set(item, indeterminateField, false);
+        }
+        _xeUtils["default"].set(item, checkField, false);
+      };
       if (treeConfig) {
-        _xeUtils["default"].eachTree(tableFullData, function (item) {
-          return _xeUtils["default"].set(item, checkField, false);
-        }, treeOpts);
-      } else {
-        tableFullData.forEach(function (item) {
-          return _xeUtils["default"].set(item, checkField, false);
+        _xeUtils["default"].eachTree(tableFullData, handleClearChecked, {
+          children: childrenField
         });
+      } else {
+        tableFullData.forEach(handleClearChecked);
       }
     }
     if (reserve) {
       tableFullData.forEach(function (row) {
-        return _this37.handleCheckboxReserveRow(row, false);
+        return _this36.handleCheckboxReserveRow(row, false);
       });
     }
     this.isAllSelected = false;
     this.isIndeterminate = false;
-    this.selectCheckboxRows = [];
-    this.treeIndeterminates = [];
+    this.selectCheckboxMaps = {};
+    this.treeIndeterminateMaps = {};
     return this.$nextTick();
   },
   /**
@@ -4114,7 +4276,7 @@ var Methods = {
    * 单选，行选中事件
    */
   triggerRadioRowEvent: function triggerRadioRowEvent(evnt, params) {
-    var oldValue = this.selectRow,
+    var oldValue = this.selectRadioRow,
       radioOpts = this.radioOpts;
     var row = params.row;
     var newValue = row;
@@ -4167,7 +4329,7 @@ var Methods = {
     return this.$nextTick();
   },
   isCheckedByRadioRow: function isCheckedByRadioRow(row) {
-    return this.selectRow === row;
+    return this.selectRadioRow === row;
   },
   handleCheckedRadioRow: function handleCheckedRadioRow(row, isForce) {
     var radioOpts = this.radioOpts;
@@ -4175,7 +4337,7 @@ var Methods = {
     if (row && (isForce || !checkMethod || checkMethod({
       row: row
     }))) {
-      this.selectRow = row;
+      this.selectRadioRow = row;
       this.handleRadioReserveRow(row);
     }
     return this.$nextTick();
@@ -4205,7 +4367,7 @@ var Methods = {
    * 用于单选行，手动清空用户的选择
    */
   clearRadioRow: function clearRadioRow() {
-    this.selectRow = null;
+    this.selectRadioRow = null;
     return this.$nextTick();
   },
   /**
@@ -4218,30 +4380,18 @@ var Methods = {
    * 用于单选行，获取当已选中的数据
    */
   getRadioRecord: function getRadioRecord(isFull) {
-    var treeConfig = this.treeConfig,
-      treeOpts = this.treeOpts,
-      selectRow = this.selectRow,
+    var selectRadioRow = this.selectRadioRow,
       fullDataRowIdData = this.fullDataRowIdData,
-      afterFullData = this.afterFullData;
-    if (selectRow) {
-      var rowid = (0, _util.getRowid)(this, selectRow);
+      afterFullRowMaps = this.afterFullRowMaps;
+    if (selectRadioRow) {
+      var rowid = (0, _util.getRowid)(this, selectRadioRow);
       if (isFull) {
         if (!fullDataRowIdData[rowid]) {
-          return selectRow;
+          return selectRadioRow;
         }
       } else {
-        if (treeConfig) {
-          var rowkey = (0, _util.getRowkey)(this);
-          var matchObj = _xeUtils["default"].findTree(afterFullData, function (row) {
-            return rowid === _xeUtils["default"].get(row, rowkey);
-          }, treeOpts);
-          if (matchObj) {
-            return selectRow;
-          }
-        } else {
-          if (afterFullData.indexOf(selectRow) > -1) {
-            return selectRow;
-          }
+        if (afterFullRowMaps[rowid]) {
+          return selectRadioRow;
         }
       }
     }
@@ -4335,12 +4485,12 @@ var Methods = {
    * 如果存在规则，则校验
    */
   handleChangeCell: function handleChangeCell(evnt, params) {
-    var _this38 = this;
+    var _this37 = this;
     this.checkValidate('blur')["catch"](function (e) {
       return e;
     }).then(function () {
-      _this38.handleActived(params, evnt).then(function () {
-        return _this38.checkValidate('change');
+      _this37.handleActived(params, evnt).then(function () {
+        return _this37.checkValidate('change');
       })["catch"](function (e) {
         return e;
       });
@@ -4434,7 +4584,7 @@ var Methods = {
    * 如果是双击模式，则激活为编辑状态
    */
   triggerCellDblclickEvent: function triggerCellDblclickEvent(evnt, params) {
-    var _this39 = this;
+    var _this38 = this;
     var editStore = this.editStore,
       editConfig = this.editConfig,
       editOpts = this.editOpts;
@@ -4447,15 +4597,15 @@ var Methods = {
           this.checkValidate('blur')["catch"](function (e) {
             return e;
           }).then(function () {
-            _this39.handleActived(params, evnt).then(function () {
-              return _this39.checkValidate('change');
+            _this38.handleActived(params, evnt).then(function () {
+              return _this38.checkValidate('change');
             })["catch"](function (e) {
               return e;
             });
           });
         } else if (editOpts.mode === 'cell') {
           this.handleActived(params, evnt).then(function () {
-            return _this39.checkValidate('change');
+            return _this38.checkValidate('change');
           })["catch"](function (e) {
             return e;
           });
@@ -4465,7 +4615,7 @@ var Methods = {
     this.emitEvent('cell-dblclick', params, evnt);
   },
   handleDefaultSort: function handleDefaultSort() {
-    var _this40 = this;
+    var _this39 = this;
     var sortConfig = this.sortConfig,
       sortOpts = this.sortOpts;
     var defaultSort = sortOpts.defaultSort;
@@ -4478,7 +4628,7 @@ var Methods = {
           var field = item.field,
             order = item.order;
           if (field && order) {
-            var column = _this40.getColumnByField(field);
+            var column = _this39.getColumnByField(field);
             if (column && column.sortable) {
               column.order = order;
               column.sortTime = Date.now() + index;
@@ -4525,7 +4675,7 @@ var Methods = {
     }
   },
   sort: function sort(sortConfs, sortOrder) {
-    var _this41 = this;
+    var _this40 = this;
     var sortOpts = this.sortOpts;
     var multiple = sortOpts.multiple,
       remote = sortOpts.remote,
@@ -4551,14 +4701,14 @@ var Methods = {
           order = confs.order;
         var column = field;
         if (_xeUtils["default"].isString(field)) {
-          column = _this41.getColumnByField(field);
+          column = _this40.getColumnByField(field);
         }
         if (column && (column.sortable || column.remoteSort)) {
           if (!firstSortColumn) {
             firstSortColumn = column;
           }
           if (orders.indexOf(order) === -1) {
-            order = getNextSortOrder(_this41, column);
+            order = getNextSortOrder(_this40, column);
           }
           if (column.order !== order) {
             column.order = order;
@@ -4571,8 +4721,8 @@ var Methods = {
         this.handleTableData(true);
       }
       return this.$nextTick().then(function () {
-        _this41.updateCellAreas();
-        return _this41.updateStyle();
+        _this40.updateCellAreas();
+        return _this40.updateStyle();
       });
     }
     return this.$nextTick();
@@ -4687,17 +4837,19 @@ var Methods = {
     return rest && rest.expandLoaded;
   },
   clearRowExpandLoaded: function clearRowExpandLoaded(row) {
-    var _this42 = this;
     var expandOpts = this.expandOpts,
-      expandLazyLoadeds = this.expandLazyLoadeds,
+      rowExpandLazyLoadedMaps = this.rowExpandLazyLoadedMaps,
       fullAllDataRowMap = this.fullAllDataRowMap;
     var lazy = expandOpts.lazy;
+    var rowid = (0, _util.getRowid)(this, row);
     var rest = fullAllDataRowMap.get(row);
     if (lazy && rest) {
       rest.expandLoaded = false;
-      _xeUtils["default"].remove(expandLazyLoadeds, function (item) {
-        return _this42.eqRow(item, row);
-      });
+      var rowTempExpandLazyLoadedMaps = _objectSpread({}, rowExpandLazyLoadedMaps);
+      if (rowTempExpandLazyLoadedMaps[rowid]) {
+        delete rowTempExpandLazyLoadedMaps[rowid];
+      }
+      this.rowExpandLazyLoadedMaps = rowTempExpandLazyLoadedMaps;
     }
     return this.$nextTick();
   },
@@ -4706,13 +4858,14 @@ var Methods = {
    * @param {Row} row 行对象
    */
   reloadRowExpand: function reloadRowExpand(row) {
-    var _this43 = this;
+    var _this41 = this;
     var expandOpts = this.expandOpts,
-      expandLazyLoadeds = this.expandLazyLoadeds;
+      rowExpandLazyLoadedMaps = this.rowExpandLazyLoadedMaps;
     var lazy = expandOpts.lazy;
-    if (lazy && this.findRowIndexOf(expandLazyLoadeds, row) === -1) {
+    var rowid = (0, _util.getRowid)(this, row);
+    if (lazy && !rowExpandLazyLoadedMaps[rowid]) {
       this.clearRowExpandLoaded(row).then(function () {
-        return _this43.handleAsyncRowExpand(row);
+        return _this41.handleAsyncRowExpand(row);
       });
     }
     return this.$nextTick();
@@ -4729,11 +4882,12 @@ var Methods = {
    */
   triggerRowExpandEvent: function triggerRowExpandEvent(evnt, params) {
     var expandOpts = this.expandOpts,
-      expandLazyLoadeds = this.expandLazyLoadeds,
+      rowExpandLazyLoadedMaps = this.rowExpandLazyLoadedMaps,
       column = this.expandColumn;
     var row = params.row;
     var lazy = expandOpts.lazy;
-    if (!lazy || this.findRowIndexOf(expandLazyLoadeds, row) === -1) {
+    var rowid = (0, _util.getRowid)(this, row);
+    if (!lazy || !rowExpandLazyLoadedMaps[rowid]) {
       var expanded = !this.isExpandByRow(row);
       var columnIndex = this.getColumnIndex(column);
       var $columnIndex = this.getVMColumnIndex(column);
@@ -4784,37 +4938,57 @@ var Methods = {
       treeOpts = this.treeOpts,
       tableFullData = this.tableFullData,
       tableFullTreeData = this.tableFullTreeData;
+    var childrenField = treeOpts.children || treeOpts.childrenField;
     var expandedRows = [];
     if (treeConfig) {
       _xeUtils["default"].eachTree(tableFullTreeData, function (row) {
         expandedRows.push(row);
-      }, treeOpts);
+      }, {
+        children: childrenField
+      });
     } else {
       expandedRows = tableFullData;
     }
     return this.setRowExpand(expandedRows, expanded);
   },
   handleAsyncRowExpand: function handleAsyncRowExpand(row) {
-    var _this44 = this;
-    var rest = this.fullAllDataRowMap.get(row);
+    var _this42 = this;
+    var fullAllDataRowMap = this.fullAllDataRowMap,
+      expandOpts = this.expandOpts;
+    var rest = fullAllDataRowMap.get(row);
     return new Promise(function (resolve) {
-      _this44.expandLazyLoadeds.push(row);
-      _this44.expandOpts.loadMethod({
-        $table: _this44,
-        row: row,
-        rowIndex: _this44.getRowIndex(row),
-        $rowIndex: _this44.getVMRowIndex(row)
-      }).then(function () {
-        rest.expandLoaded = true;
-        _this44.rowExpandeds.push(row);
-      })["catch"](function () {
-        rest.expandLoaded = false;
-      })["finally"](function () {
-        _xeUtils["default"].remove(_this44.expandLazyLoadeds, function (item) {
-          return _this44.eqRow(item, row);
+      var loadMethod = expandOpts.loadMethod;
+      if (loadMethod) {
+        var rowExpandLazyLoadedMaps = _this42.rowExpandLazyLoadedMaps;
+        var rowTempExpandLazyLoadedMaps = _objectSpread({}, rowExpandLazyLoadedMaps);
+        var rowid = (0, _util.getRowid)(_this42, row);
+        rowTempExpandLazyLoadedMaps[rowid] = row;
+        _this42.rowExpandLazyLoadedMaps = rowTempExpandLazyLoadedMaps;
+        loadMethod({
+          $table: _this42,
+          row: row,
+          rowIndex: _this42.getRowIndex(row),
+          $rowIndex: _this42.getVMRowIndex(row)
+        }).then(function () {
+          rest.expandLoaded = true;
+          var rowExpandedMaps = _this42.rowExpandedMaps;
+          var rowTempExpandedMaps = _objectSpread({}, rowExpandedMaps);
+          rowTempExpandedMaps[rowid] = row;
+          _this42.rowExpandedMaps = rowTempExpandedMaps;
+        })["catch"](function () {
+          rest.expandLoaded = false;
+        })["finally"](function () {
+          var rowExpandLazyLoadedMaps = _this42.rowExpandLazyLoadedMaps;
+          var rowTempExpandLazyLoadedMaps = _objectSpread({}, rowExpandLazyLoadedMaps);
+          if (rowTempExpandLazyLoadedMaps[rowid]) {
+            delete rowTempExpandLazyLoadedMaps[rowid];
+          }
+          _this42.rowExpandLazyLoadedMaps = rowTempExpandLazyLoadedMaps;
+          resolve(_this42.$nextTick().then(_this42.recalculate));
         });
-        resolve(_this44.$nextTick().then(_this44.recalculate));
-      });
+      } else {
+        resolve();
+      }
     });
   },
   /**
@@ -4825,12 +4999,13 @@ var Methods = {
    * @param {Boolean} expanded 是否展开
    */
   setRowExpand: function setRowExpand(rows, expanded) {
-    var _this45 = this;
-    var fullAllDataRowMap = this.fullAllDataRowMap,
-      expandLazyLoadeds = this.expandLazyLoadeds,
+    var _this43 = this;
+    var rowExpandedMaps = this.rowExpandedMaps,
+      fullAllDataRowIdData = this.fullAllDataRowIdData,
+      rowExpandLazyLoadedMaps = this.rowExpandLazyLoadedMaps,
       expandOpts = this.expandOpts,
       column = this.expandColumn;
-    var rowExpandeds = this.rowExpandeds;
+    var rExpandedMaps = _objectSpread({}, rowExpandedMaps);
     var reserve = expandOpts.reserve,
       lazy = expandOpts.lazy,
       accordion = expandOpts.accordion,
@@ -4844,7 +5019,7 @@ var Methods = {
       }
       if (accordion) {
         // 只能同时展开一个
-        rowExpandeds = [];
+        rExpandedMaps = {};
         rows = rows.slice(rows.length - 1, rows.length);
       }
       var validRows = toggleMethod ? rows.filter(function (row) {
@@ -4854,34 +5029,38 @@ var Methods = {
           columnIndex: columnIndex,
           $columnIndex: $columnIndex,
           row: row,
-          rowIndex: _this45.getRowIndex(row),
-          $rowIndex: _this45.getVMRowIndex(row)
+          rowIndex: _this43.getRowIndex(row),
+          $rowIndex: _this43.getVMRowIndex(row)
         });
       }) : rows;
       if (expanded) {
         validRows.forEach(function (row) {
-          if (_this45.findRowIndexOf(rowExpandeds, row) === -1) {
-            var rest = fullAllDataRowMap.get(row);
-            var isLoad = lazy && !rest.expandLoaded && _this45.findRowIndexOf(expandLazyLoadeds, row) === -1;
+          var rowid = (0, _util.getRowid)(_this43, row);
+          if (!rExpandedMaps[rowid]) {
+            var rest = fullAllDataRowIdData[rowid];
+            var isLoad = lazy && !rest.expandLoaded && !rowExpandLazyLoadedMaps[rowid];
             if (isLoad) {
-              lazyRests.push(_this45.handleAsyncRowExpand(row));
+              lazyRests.push(_this43.handleAsyncRowExpand(row));
             } else {
-              rowExpandeds.push(row);
+              rExpandedMaps[rowid] = row;
             }
           }
         });
       } else {
-        _xeUtils["default"].remove(rowExpandeds, function (row) {
-          return _this45.findRowIndexOf(validRows, row) > -1;
+        validRows.forEach(function (item) {
+          var rowid = (0, _util.getRowid)(_this43, item);
+          if (rExpandedMaps[rowid]) {
+            delete rExpandedMaps[rowid];
+          }
         });
       }
       if (reserve) {
         validRows.forEach(function (row) {
-          return _this45.handleRowExpandReserve(row, expanded);
+          return _this43.handleRowExpandReserve(row, expanded);
         });
       }
     }
-    this.rowExpandeds = rowExpandeds;
+    this.rowExpandedMaps = rExpandedMaps;
     return Promise.all(lazyRests).then(this.recalculate);
   },
   /**
@@ -4889,28 +5068,28 @@ var Methods = {
    * @param {Row} row 行对象
    */
   isExpandByRow: function isExpandByRow(row) {
-    var rowExpandeds = this.rowExpandeds;
-    return this.findRowIndexOf(rowExpandeds, row) > -1;
+    var rowExpandedMaps = this.rowExpandedMaps;
+    var rowid = (0, _util.getRowid)(this, row);
+    return !!rowExpandedMaps[rowid];
   },
   /**
    * 手动清空展开行状态，数据会恢复成未展开的状态
    */
   clearRowExpand: function clearRowExpand() {
-    var _this46 = this;
+    var _this44 = this;
     var expandOpts = this.expandOpts,
-      rowExpandeds = this.rowExpandeds,
       tableFullData = this.tableFullData;
     var reserve = expandOpts.reserve;
-    var isExists = rowExpandeds.length;
-    this.rowExpandeds = [];
+    var expList = this.getRowExpandRecords();
+    this.rowExpandedMaps = {};
     if (reserve) {
       tableFullData.forEach(function (row) {
-        return _this46.handleRowExpandReserve(row, false);
+        return _this44.handleRowExpandReserve(row, false);
       });
     }
     return this.$nextTick().then(function () {
-      if (isExists) {
-        _this46.recalculate();
+      if (expList.length) {
+        _this44.recalculate();
       }
     });
   },
@@ -4931,13 +5110,25 @@ var Methods = {
     }
   },
   getRowExpandRecords: function getRowExpandRecords() {
-    return this.rowExpandeds.slice(0);
+    var rest = [];
+    _xeUtils["default"].each(this.rowExpandedMaps, function (item) {
+      if (item) {
+        rest.push(item);
+      }
+    });
+    return rest;
   },
   getTreeExpandRecords: function getTreeExpandRecords() {
-    return this.treeExpandeds.slice(0);
+    var rest = [];
+    _xeUtils["default"].each(this.treeExpandedMaps, function (item) {
+      if (item) {
+        rest.push(item);
+      }
+    });
+    return rest;
   },
   /**
-   * 获取数表格状态
+   * 获取树表格状态
    */
   getTreeStatus: function getTreeStatus() {
     if (this.treeConfig) {
@@ -4958,16 +5149,17 @@ var Methods = {
   },
   clearTreeExpandLoaded: function clearTreeExpandLoaded(row) {
     var treeOpts = this.treeOpts,
-      treeExpandeds = this.treeExpandeds,
+      treeExpandedMaps = this.treeExpandedMaps,
       fullAllDataRowMap = this.fullAllDataRowMap;
     var transform = treeOpts.transform,
       lazy = treeOpts.lazy;
+    var rowid = (0, _util.getRowid)(this, row);
     var rest = fullAllDataRowMap.get(row);
     if (lazy && rest) {
       rest.treeLoaded = false;
-      _xeUtils["default"].remove(treeExpandeds, function (item) {
-        return row === item;
-      });
+      if (treeExpandedMaps[rowid]) {
+        delete treeExpandedMaps[rowid];
+      }
     }
     if (transform) {
       this.handleVirtualTreeToList();
@@ -4980,23 +5172,23 @@ var Methods = {
    * @param {Row} row 行对象
    */
   reloadTreeExpand: function reloadTreeExpand(row) {
-    var _this47 = this;
+    var _this45 = this;
     var treeOpts = this.treeOpts,
-      treeLazyLoadeds = this.treeLazyLoadeds;
+      treeExpandLazyLoadedMaps = this.treeExpandLazyLoadedMaps;
     var transform = treeOpts.transform,
-      lazy = treeOpts.lazy,
-      hasChildField = treeOpts.hasChildField,
-      hasChild = treeOpts.hasChild;
-    if (lazy && row[hasChildField || hasChild] && treeLazyLoadeds.indexOf(row) === -1) {
+      lazy = treeOpts.lazy;
+    var hasChildField = treeOpts.hasChild || treeOpts.hasChildField;
+    var rowid = (0, _util.getRowid)(this, row);
+    if (lazy && row[hasChildField] && !treeExpandLazyLoadedMaps[rowid]) {
       this.clearTreeExpandLoaded(row).then(function () {
-        return _this47.handleAsyncTreeExpandChilds(row);
+        return _this45.handleAsyncTreeExpandChilds(row);
       }).then(function () {
         if (transform) {
-          _this47.handleVirtualTreeToList();
-          return _this47.handleTableData();
+          _this45.handleVirtualTreeToList();
+          return _this45.handleTableData();
         }
       }).then(function () {
-        return _this47.recalculate();
+        return _this45.recalculate();
       });
     }
     return this.$nextTick();
@@ -5013,11 +5205,12 @@ var Methods = {
    */
   triggerTreeExpandEvent: function triggerTreeExpandEvent(evnt, params) {
     var treeOpts = this.treeOpts,
-      treeLazyLoadeds = this.treeLazyLoadeds;
+      treeExpandLazyLoadedMaps = this.treeExpandLazyLoadedMaps;
     var row = params.row,
       column = params.column;
     var lazy = treeOpts.lazy;
-    if (!lazy || treeLazyLoadeds.indexOf(row) === -1) {
+    var rowid = (0, _util.getRowid)(this, row);
+    if (!lazy || !treeExpandLazyLoadedMaps[rowid]) {
       var expanded = !this.isTreeExpandByRow(row);
       var columnIndex = this.getColumnIndex(column);
       var $columnIndex = this.getVMColumnIndex(column);
@@ -5047,6 +5240,7 @@ var Methods = {
     if (treeConfig) {
       var expandAll = treeOpts.expandAll,
         expandRowKeys = treeOpts.expandRowKeys;
+      var childrenField = treeOpts.children || treeOpts.childrenField;
       if (expandAll) {
         this.setAllTreeExpand(true);
       } else if (expandRowKeys) {
@@ -5055,7 +5249,9 @@ var Methods = {
         expandRowKeys.forEach(function (rowid) {
           var matchObj = _xeUtils["default"].findTree(tableFullData, function (item) {
             return rowid === _xeUtils["default"].get(item, rowkey);
-          }, treeOpts);
+          }, {
+            children: childrenField
+          });
           if (matchObj) {
             defExpandeds.push(matchObj.item);
           }
@@ -5065,59 +5261,67 @@ var Methods = {
     }
   },
   handleAsyncTreeExpandChilds: function handleAsyncTreeExpandChilds(row) {
-    var _this48 = this;
-    var fullAllDataRowMap = this.fullAllDataRowMap,
-      treeExpandeds = this.treeExpandeds,
-      treeOpts = this.treeOpts,
-      treeLazyLoadeds = this.treeLazyLoadeds,
+    var _this46 = this;
+    var treeOpts = this.treeOpts,
       checkboxOpts = this.checkboxOpts;
     var transform = treeOpts.transform,
       loadMethod = treeOpts.loadMethod;
     var checkStrictly = checkboxOpts.checkStrictly;
-    var rest = fullAllDataRowMap.get(row);
     return new Promise(function (resolve) {
-      treeLazyLoadeds.push(row);
-      loadMethod({
-        $table: _this48,
-        row: row
-      }).then(function (childRecords) {
-        // 响应成功后则展开行，并将子节点挂载到该节点下
-        rest.treeLoaded = true;
-        _xeUtils["default"].remove(treeLazyLoadeds, function (item) {
-          return item === row;
-        });
-        if (!_xeUtils["default"].isArray(childRecords)) {
-          childRecords = [];
-        }
-        if (childRecords) {
-          return _this48.loadTreeChildren(row, childRecords).then(function (childRows) {
-            if (childRows.length && treeExpandeds.indexOf(row) === -1) {
-              treeExpandeds.push(row);
-            }
-            // 如果当前节点已选中，则展开后子节点也被选中
-            if (!checkStrictly && _this48.isCheckedByCheckboxRow(row)) {
-              _this48.handleCheckedCheckboxRow(childRows, true, true);
-            }
-            return _this48.$nextTick().then(function () {
-              if (transform) {
-                return _this48.handleTableData();
+      if (loadMethod) {
+        var fullAllDataRowMap = _this46.fullAllDataRowMap,
+          treeExpandLazyLoadedMaps = _this46.treeExpandLazyLoadedMaps;
+        var rowid = (0, _util.getRowid)(_this46, row);
+        var rest = fullAllDataRowMap.get(row);
+        treeExpandLazyLoadedMaps[rowid] = row;
+        loadMethod({
+          $table: _this46,
+          row: row
+        }).then(function (childRecords) {
+          // 响应成功后则展开行，并将子节点挂载到该节点下
+          rest.treeLoaded = true;
+          if (treeExpandLazyLoadedMaps[rowid]) {
+            treeExpandLazyLoadedMaps[rowid] = null;
+          }
+          if (!_xeUtils["default"].isArray(childRecords)) {
+            childRecords = [];
+          }
+          if (childRecords) {
+            return _this46.loadTreeChildren(row, childRecords).then(function (childRows) {
+              var treeExpandedMaps = _this46.treeExpandedMaps;
+              var treeTempExpandedMaps = _objectSpread({}, treeExpandedMaps);
+              if (childRows.length && !treeTempExpandedMaps[rowid]) {
+                treeTempExpandedMaps[rowid] = row;
+                _this46.treeExpandedMaps = treeTempExpandedMaps;
               }
+              // 如果当前节点已选中，则展开后子节点也被选中
+              if (!checkStrictly && _this46.isCheckedByCheckboxRow(row)) {
+                _this46.handleCheckedCheckboxRow(childRows, true, true);
+              }
+              return _this46.$nextTick().then(function () {
+                if (transform) {
+                  return _this46.handleTableData();
+                }
+              });
             });
+          }
+        })["catch"](function () {
+          // 如果响应异常，则不展开，再次点击后将重新触发懒加载
+          rest.treeLoaded = false;
+          var treeExpandLazyLoadedMaps = _this46.treeExpandLazyLoadedMaps;
+          if (treeExpandLazyLoadedMaps[rowid]) {
+            treeExpandLazyLoadedMaps[rowid] = null;
+          }
+        })["finally"](function () {
+          _this46.$nextTick().then(function () {
+            return _this46.recalculate();
+          }).then(function () {
+            return resolve();
           });
-        }
-      })["catch"](function () {
-        // 如果响应异常，则不展开，再次点击后将重新触发懒加载
-        rest.treeLoaded = false;
-        _xeUtils["default"].remove(treeLazyLoadeds, function (item) {
-          return item === row;
         });
-      })["finally"](function () {
-        _this48.$nextTick().then(function () {
-          return _this48.recalculate();
-        }).then(function () {
-          return resolve();
-        });
-      });
+      } else {
+        resolve();
+      }
     });
   },
   /**
@@ -5127,16 +5331,17 @@ var Methods = {
   setAllTreeExpand: function setAllTreeExpand(expanded) {
     var tableFullData = this.tableFullData,
       treeOpts = this.treeOpts;
-    var lazy = treeOpts.lazy,
-      childrenField = treeOpts.childrenField,
-      children = treeOpts.children;
+    var lazy = treeOpts.lazy;
+    var childrenField = treeOpts.children || treeOpts.childrenField;
     var expandeds = [];
     _xeUtils["default"].eachTree(tableFullData, function (row) {
-      var rowChildren = row[childrenField || children];
+      var rowChildren = row[childrenField];
       if (lazy || rowChildren && rowChildren.length) {
         expandeds.push(row);
       }
-    }, treeOpts);
+    }, {
+      children: childrenField
+    });
     return this.setTreeExpand(expandeds, expanded);
   },
   /**
@@ -5146,21 +5351,20 @@ var Methods = {
    * @returns
    */
   handleBaseTreeExpand: function handleBaseTreeExpand(rows, expanded) {
-    var _this49 = this;
+    var _this47 = this;
     var fullAllDataRowMap = this.fullAllDataRowMap,
       tableFullData = this.tableFullData,
-      treeExpandeds = this.treeExpandeds,
+      treeExpandedMaps = this.treeExpandedMaps,
       treeOpts = this.treeOpts,
-      treeLazyLoadeds = this.treeLazyLoadeds,
+      treeExpandLazyLoadedMaps = this.treeExpandLazyLoadedMaps,
       treeNodeColumn = this.treeNodeColumn;
     var reserve = treeOpts.reserve,
       lazy = treeOpts.lazy,
-      hasChildField = treeOpts.hasChildField,
-      hasChild = treeOpts.hasChild,
-      childrenField = treeOpts.childrenField,
-      children = treeOpts.children,
       accordion = treeOpts.accordion,
       toggleMethod = treeOpts.toggleMethod;
+    var treeTempExpandedMaps = _objectSpread({}, treeExpandedMaps);
+    var childrenField = treeOpts.children || treeOpts.childrenField;
+    var hasChildField = treeOpts.hasChild || treeOpts.hasChildField;
     var result = [];
     var columnIndex = this.getColumnIndex(treeNodeColumn);
     var $columnIndex = this.getVMColumnIndex(treeNodeColumn);
@@ -5178,38 +5382,48 @@ var Methods = {
       // 同一级只能展开一个
       var matchObj = _xeUtils["default"].findTree(tableFullData, function (item) {
         return item === validRows[0];
-      }, treeOpts);
+      }, {
+        children: childrenField
+      });
       if (matchObj) {
-        _xeUtils["default"].remove(treeExpandeds, function (item) {
-          return matchObj.items.indexOf(item) > -1;
+        matchObj.items.forEach(function (item) {
+          var rowid = (0, _util.getRowid)(_this47, item);
+          if (treeTempExpandedMaps[rowid]) {
+            delete treeTempExpandedMaps[rowid];
+          }
         });
       }
     }
     if (expanded) {
       validRows.forEach(function (row) {
-        if (treeExpandeds.indexOf(row) === -1) {
+        var rowid = (0, _util.getRowid)(_this47, row);
+        if (!treeTempExpandedMaps[rowid]) {
           var rest = fullAllDataRowMap.get(row);
-          var isLoad = lazy && row[hasChildField || hasChild] && !rest.treeLoaded && treeLazyLoadeds.indexOf(row) === -1;
+          var isLoad = lazy && row[hasChildField] && !rest.treeLoaded && !treeExpandLazyLoadedMaps[rowid];
           // 是否使用懒加载
           if (isLoad) {
-            result.push(_this49.handleAsyncTreeExpandChilds(row));
+            result.push(_this47.handleAsyncTreeExpandChilds(row));
           } else {
-            if (row[childrenField || children] && row[childrenField || children].length) {
-              treeExpandeds.push(row);
+            if (row[childrenField] && row[childrenField].length) {
+              treeTempExpandedMaps[rowid] = row;
             }
           }
         }
       });
     } else {
-      _xeUtils["default"].remove(treeExpandeds, function (row) {
-        return validRows.indexOf(row) > -1;
+      validRows.forEach(function (item) {
+        var rowid = (0, _util.getRowid)(_this47, item);
+        if (treeTempExpandedMaps[rowid]) {
+          delete treeTempExpandedMaps[rowid];
+        }
       });
     }
     if (reserve) {
       validRows.forEach(function (row) {
-        return _this49.handleTreeExpandReserve(row, expanded);
+        return _this47.handleTreeExpandReserve(row, expanded);
       });
     }
+    this.treeExpandedMaps = treeTempExpandedMaps;
     return Promise.all(result).then(this.recalculate);
   },
   /**
@@ -5219,12 +5433,12 @@ var Methods = {
    * @returns
    */
   handleVirtualTreeExpand: function handleVirtualTreeExpand(rows, expanded) {
-    var _this50 = this;
+    var _this48 = this;
     return this.handleBaseTreeExpand(rows, expanded).then(function () {
-      _this50.handleVirtualTreeToList();
-      return _this50.handleTableData();
+      _this48.handleVirtualTreeToList();
+      return _this48.handleTableData();
     }).then(function () {
-      return _this50.recalculate();
+      return _this48.recalculate();
     });
   },
   /**
@@ -5257,33 +5471,36 @@ var Methods = {
    * @param {Row} row 行对象
    */
   isTreeExpandByRow: function isTreeExpandByRow(row) {
-    return this.treeExpandeds.indexOf(row) > -1;
+    var treeExpandedMaps = this.treeExpandedMaps;
+    return !!treeExpandedMaps[(0, _util.getRowid)(this, row)];
   },
   /**
    * 手动清空树形节点的展开状态，数据会恢复成未展开的状态
    */
   clearTreeExpand: function clearTreeExpand() {
-    var _this51 = this;
+    var _this49 = this;
     var treeOpts = this.treeOpts,
-      treeExpandeds = this.treeExpandeds,
       tableFullData = this.tableFullData;
     var transform = treeOpts.transform,
       reserve = treeOpts.reserve;
-    var isExists = treeExpandeds.length;
-    this.treeExpandeds = [];
+    var childrenField = treeOpts.children || treeOpts.childrenField;
+    var expList = this.getTreeExpandRecords();
+    this.treeExpandedMaps = {};
     if (reserve) {
       _xeUtils["default"].eachTree(tableFullData, function (row) {
-        return _this51.handleTreeExpandReserve(row, false);
-      }, treeOpts);
+        return _this49.handleTreeExpandReserve(row, false);
+      }, {
+        children: childrenField
+      });
     }
     return this.handleTableData().then(function () {
       if (transform) {
-        _this51.handleVirtualTreeToList();
-        return _this51.handleTableData();
+        _this49.handleVirtualTreeToList();
+        return _this49.handleTableData();
       }
     }).then(function () {
-      if (isExists) {
-        _this51.recalculate();
+      if (expList.length) {
+        _this49.recalculate();
       }
     });
   },
@@ -5402,28 +5619,28 @@ var Methods = {
   },
   // 计算可视渲染相关数据
   computeScrollLoad: function computeScrollLoad() {
-    var _this52 = this;
+    var _this50 = this;
     return this.$nextTick().then(function () {
-      var sYOpts = _this52.sYOpts,
-        sXOpts = _this52.sXOpts,
-        scrollXLoad = _this52.scrollXLoad,
-        scrollYLoad = _this52.scrollYLoad,
-        scrollXStore = _this52.scrollXStore,
-        scrollYStore = _this52.scrollYStore;
+      var sYOpts = _this50.sYOpts,
+        sXOpts = _this50.sXOpts,
+        scrollXLoad = _this50.scrollXLoad,
+        scrollYLoad = _this50.scrollYLoad,
+        scrollXStore = _this50.scrollXStore,
+        scrollYStore = _this50.scrollYStore;
       // 计算 X 逻辑
       if (scrollXLoad) {
-        var _computeVirtualX3 = computeVirtualX(_this52),
+        var _computeVirtualX3 = computeVirtualX(_this50),
           visibleXSize = _computeVirtualX3.visibleSize;
         var offsetXSize = sXOpts.oSize ? _xeUtils["default"].toNumber(sXOpts.oSize) : _dom.browse.msie ? 10 : _dom.browse.edge ? 5 : 0;
         scrollXStore.offsetSize = offsetXSize;
         scrollXStore.visibleSize = visibleXSize;
         scrollXStore.endIndex = Math.max(scrollXStore.startIndex + scrollXStore.visibleSize + offsetXSize, scrollXStore.endIndex);
-        _this52.updateScrollXData();
+        _this50.updateScrollXData();
       } else {
-        _this52.updateScrollXSpace();
+        _this50.updateScrollXSpace();
       }
       // 计算 Y 逻辑
-      var _computeVirtualY = computeVirtualY(_this52),
+      var _computeVirtualY = computeVirtualY(_this50),
         rowHeight = _computeVirtualY.rowHeight,
         visibleYSize = _computeVirtualY.visibleSize;
       scrollYStore.rowHeight = rowHeight;
@@ -5432,12 +5649,12 @@ var Methods = {
         scrollYStore.offsetSize = offsetYSize;
         scrollYStore.visibleSize = visibleYSize;
         scrollYStore.endIndex = Math.max(scrollYStore.startIndex + visibleYSize + offsetYSize, scrollYStore.endIndex);
-        _this52.updateScrollYData();
+        _this50.updateScrollYData();
       } else {
-        _this52.updateScrollYSpace();
+        _this50.updateScrollYSpace();
       }
-      _this52.rowHeight = rowHeight;
-      _this52.$nextTick(_this52.updateStyle);
+      _this50.rowHeight = rowHeight;
+      _this50.$nextTick(_this50.updateStyle);
     });
   },
   handleTableColumn: function handleTableColumn() {
@@ -5447,11 +5664,11 @@ var Methods = {
     this.tableColumn = scrollXLoad ? visibleColumn.slice(scrollXStore.startIndex, scrollXStore.endIndex) : visibleColumn.slice(0);
   },
   updateScrollXData: function updateScrollXData() {
-    var _this53 = this;
+    var _this51 = this;
     // this.tableColumn = []
     this.$nextTick(function () {
-      _this53.handleTableColumn();
-      _this53.updateScrollXSpace();
+      _this51.handleTableColumn();
+      _this51.updateScrollXSpace();
     });
   },
   // 更新横向 X 可视渲染上下剩余空间大小
@@ -5502,11 +5719,11 @@ var Methods = {
     }
   },
   updateScrollYData: function updateScrollYData() {
-    var _this54 = this;
+    var _this52 = this;
     // this.tableData = []
     this.$nextTick(function () {
-      _this54.handleTableData();
-      _this54.updateScrollYSpace();
+      _this52.handleTableData();
+      _this52.updateScrollYSpace();
     });
   },
   // 更新纵向 Y 可视渲染上下剩余空间大小
@@ -5547,7 +5764,7 @@ var Methods = {
    * @param {Number} scrollTop 上距离
    */
   scrollTo: function scrollTo(scrollLeft, scrollTop) {
-    var _this55 = this;
+    var _this53 = this;
     var $refs = this.$refs;
     var tableBody = $refs.tableBody,
       rightBody = $refs.rightBody,
@@ -5564,7 +5781,7 @@ var Methods = {
     if (this.scrollXLoad || this.scrollYLoad) {
       return new Promise(function (resolve) {
         return setTimeout(function () {
-          return resolve(_this55.$nextTick());
+          return resolve(_this53.$nextTick());
         }, 50);
       });
     }
@@ -5606,26 +5823,29 @@ var Methods = {
    * @param {Row} row 行对象
    */
   scrollToTreeRow: function scrollToTreeRow(row) {
-    var _this56 = this;
+    var _this54 = this;
     var tableFullData = this.tableFullData,
       treeConfig = this.treeConfig,
       treeOpts = this.treeOpts;
+    var childrenField = treeOpts.children || treeOpts.childrenField;
     var rests = [];
     if (treeConfig) {
       var matchObj = _xeUtils["default"].findTree(tableFullData, function (item) {
         return item === row;
-      }, treeOpts);
+      }, {
+        children: childrenField
+      });
       if (matchObj) {
         var nodes = matchObj.nodes;
         nodes.forEach(function (row, index) {
-          if (index < nodes.length - 1 && !_this56.isTreeExpandByRow(row)) {
-            rests.push(_this56.setTreeExpand(row, true));
+          if (index < nodes.length - 1 && !_this54.isTreeExpandByRow(row)) {
+            rests.push(_this54.setTreeExpand(row, true));
           }
         });
       }
     }
     return Promise.all(rests).then(function () {
-      return (0, _util.rowToVisible)(_this56, row);
+      return (0, _util.rowToVisible)(_this54, row);
     });
   },
   /**
@@ -5680,30 +5900,30 @@ var Methods = {
    * 如果单元格配置了校验规则，则会进行校验
    */
   updateStatus: function updateStatus(slotParams, cellValue) {
-    var _this57 = this;
+    var _this55 = this;
     var customVal = !_xeUtils["default"].isUndefined(cellValue);
     return this.$nextTick().then(function () {
-      var $refs = _this57.$refs,
-        editRules = _this57.editRules,
-        validStore = _this57.validStore;
+      var $refs = _this55.$refs,
+        editRules = _this55.editRules,
+        validStore = _this55.validStore;
       if (slotParams && $refs.tableBody && editRules) {
         var row = slotParams.row,
           column = slotParams.column;
         var type = 'change';
-        if (_this57.hasCellRules(type, row, column)) {
-          var cell = _this57.getCell(row, column);
+        if (_this55.hasCellRules(type, row, column)) {
+          var cell = _this55.getCell(row, column);
           if (cell) {
-            return _this57.validCellRules(type, row, column, cellValue).then(function () {
+            return _this55.validCellRules(type, row, column, cellValue).then(function () {
               if (customVal && validStore.visible) {
                 setCellValue(row, column, cellValue);
               }
-              _this57.clearValidate();
+              _this55.clearValidate();
             })["catch"](function (_ref8) {
               var rule = _ref8.rule;
               if (customVal) {
                 setCellValue(row, column, cellValue);
               }
-              _this57.showValidTooltip({
+              _this55.showValidTooltip({
                 rule: rule,
                 row: row,
                 column: column,
@@ -5723,13 +5943,13 @@ var Methods = {
    * @param {TableMergeConfig[]} merges { row: Row|number, column: ColumnInfo|number, rowspan: number, colspan: number }
    */
   setMergeCells: function setMergeCells(merges) {
-    var _this58 = this;
+    var _this56 = this;
     if (this.spanMethod) {
       (0, _log.errLog)('vxe.error.errConflicts', ['merge-cells', 'span-method']);
     }
     setMerges(this, merges, this.mergeList, this.afterFullData);
     return this.$nextTick().then(function () {
-      return _this58.updateCellAreas();
+      return _this56.updateCellAreas();
     });
   },
   /**
@@ -5737,13 +5957,13 @@ var Methods = {
    * @param {TableMergeConfig[]} merges 多个或数组 [{row:Row|number, col:ColumnInfo|number}]
    */
   removeMergeCells: function removeMergeCells(merges) {
-    var _this59 = this;
+    var _this57 = this;
     if (this.spanMethod) {
       (0, _log.errLog)('vxe.error.errConflicts', ['merge-cells', 'span-method']);
     }
     var rest = removeMerges(this, merges, this.mergeList, this.afterFullData);
     return this.$nextTick().then(function () {
-      _this59.updateCellAreas();
+      _this57.updateCellAreas();
       return rest;
     });
   },
@@ -5764,23 +5984,23 @@ var Methods = {
     this.setMergeFooterItems(this.mergeFooterItems);
   },
   setMergeFooterItems: function setMergeFooterItems(merges) {
-    var _this60 = this;
+    var _this58 = this;
     if (this.footerSpanMethod) {
       (0, _log.errLog)('vxe.error.errConflicts', ['merge-footer-items', 'footer-span-method']);
     }
     setMerges(this, merges, this.mergeFooterList, null);
     return this.$nextTick().then(function () {
-      return _this60.updateCellAreas();
+      return _this58.updateCellAreas();
     });
   },
   removeMergeFooterItems: function removeMergeFooterItems(merges) {
-    var _this61 = this;
+    var _this59 = this;
     if (this.footerSpanMethod) {
       (0, _log.errLog)('vxe.error.errConflicts', ['merge-footer-items', 'footer-span-method']);
     }
     var rest = removeMerges(this, merges, this.mergeFooterList, null);
     return this.$nextTick().then(function () {
-      _this61.updateCellAreas();
+      _this59.updateCellAreas();
       return rest;
     });
   },
@@ -5897,9 +6117,9 @@ var Methods = {
     return cellLabel;
   },
   findRowIndexOf: function findRowIndexOf(list, row) {
-    var _this62 = this;
+    var _this60 = this;
     return row ? _xeUtils["default"].findIndexOf(list, function (item) {
-      return _this62.eqRow(item, row);
+      return _this60.eqRow(item, row);
     }) : -1;
   },
   eqRow: function eqRow(row1, row2) {
@@ -5920,7 +6140,7 @@ var Methods = {
 };
 
 // Module methods
-var funcs = 'setFilter,openFilter,clearFilter,getCheckedFilters,closeMenu,setActiveCellArea,getActiveCellArea,getCellAreas,clearCellAreas,copyCellArea,cutCellArea,pasteCellArea,getCopyCellArea,getCopyCellAreas,clearCopyCellArea,setCellAreas,openFind,openReplace,closeFNR,getSelectedCell,clearSelected,insert,insertAt,remove,removeCheckboxRow,removeRadioRow,removeCurrentRow,getRecordset,getInsertRecords,getRemoveRecords,getUpdateRecords,clearEdit,clearActived,getEditRecord,getActiveRecord,isEditByRow,isActiveByRow,setEditRow,setActiveRow,setEditCell,setActiveCell,setSelectCell,clearValidate,fullValidate,validate,openExport,openPrint,exportData,openImport,importData,saveFile,readFile,importByFile,print'.split(',');
+var funcs = 'setFilter,openFilter,clearFilter,getCheckedFilters,closeMenu,setActiveCellArea,getActiveCellArea,getCellAreas,clearCellAreas,copyCellArea,cutCellArea,pasteCellArea,getCopyCellArea,getCopyCellAreas,clearCopyCellArea,setCellAreas,openFind,openReplace,closeFNR,getSelectedCell,clearSelected,insert,insertAt,insertNextAt,remove,removeCheckboxRow,removeRadioRow,removeCurrentRow,getRecordset,getInsertRecords,getRemoveRecords,getUpdateRecords,clearEdit,clearActived,getEditRecord,getActiveRecord,isEditByRow,isActiveByRow,setEditRow,setActiveRow,setEditCell,setActiveCell,setSelectCell,clearValidate,fullValidate,validate,openExport,openPrint,exportData,openImport,importData,saveFile,readFile,importByFile,print'.split(',');
 funcs.forEach(function (name) {
   Methods[name] = function () {
     if (process.env.NODE_ENV === 'development') {