vxe-table 3.7.0-beta.8 → 3.7.0

package/lib/index.umd.js

@@ -10526,6 +10526,7 @@ __webpack_require__.d(__webpack_exports__, {
   "config": () => (/* reexport */ config),
   "default": () => (/* binding */ entry_lib),
   "formats": () => (/* reexport */ formats),
+  "globalConfs": () => (/* reexport */ globalConfs),
   "install": () => (/* reexport */ install),
   "interceptor": () => (/* reexport */ interceptor),
   "menus": () => (/* reexport */ menus),
@@ -10583,6 +10584,7 @@ __webpack_require__.d(all_namespaceObject, {
   "commands": () => (commands),
   "config": () => (config),
   "formats": () => (formats),
+  "globalConfs": () => (globalConfs),
   "install": () => (install),
   "interceptor": () => (interceptor),
   "menus": () => (menus),
@@ -10740,9 +10742,9 @@ var iconPrefix = 'vxe-icon-';
     treeConfig: {
       rowField: 'id',
       parentField: 'parentId',
-      children: 'children',
-      hasChild: 'hasChild',
-      mapChildren: '_X_ROW_CHILD',
+      childrenField: 'children',
+      hasChildField: 'hasChild',
+      mapChildrenField: '_X_ROW_CHILD',
       indent: 20,
       showIcon: true
     },
@@ -10783,13 +10785,13 @@ var iconPrefix = 'vxe-icon-';
       isReplace: true
     },
     scrollX: {
-      enabled: true,
+      // enabled: false,
       gt: 60
       // oSize: 0
     },
 
     scrollY: {
-      enabled: true,
+      // enabled: false,
       gt: 100
       // oSize: 0
     }
@@ -11045,7 +11047,7 @@ var es_array_concat = __webpack_require__(2222);
 
 
 function getLog(message, params) {
-  return "[vxe-table v".concat("3.7.0-beta.8", "] ").concat(conf.i18n(message, params));
+  return "[vxe-table v".concat("3.7.0", "] ").concat(conf.i18n(message, params));
 }
 function outLog(type) {
   return function (message, params) {
@@ -11219,6 +11221,89 @@ var es_array_splice = __webpack_require__(561);
 var es_array_last_index_of = __webpack_require__(4986);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.parse-float.js
 var es_parse_float = __webpack_require__(4678);
+;// CONCATENATED MODULE: ./node_modules/dom-zindex/es/index.esm.js
+var storeEl = null;
+var storeId = 'z-index-manage';
+var storeMainKey = 'm';
+var storeSubKey = 's';
+var storeData = {
+    m: 1000,
+    s: 1000
+};
+function getDom() {
+    if (!storeEl) {
+        if (typeof document !== 'undefined') {
+            storeEl = document.getElementById(storeId);
+            if (!storeEl) {
+                storeEl = document.createElement('div');
+                storeEl.id = storeId;
+                storeEl.style.display = 'none';
+                document.body.appendChild(storeEl);
+                setCurrent(storeData.m);
+                setSubCurrent(storeData.s);
+            }
+        }
+    }
+    return storeEl;
+}
+function createSetHandle(key) {
+    return function (value) {
+        if (value) {
+            value = Number(value);
+            storeData[key] = value;
+            var doc = getDom();
+            if (doc) {
+                if (doc.dataset) {
+                    doc.dataset[key] = value + '';
+                }
+                else {
+                    doc.setAttribute('data-' + key, value + '');
+                }
+            }
+        }
+        return storeData[key];
+    };
+}
+var setCurrent = createSetHandle(storeMainKey);
+function createGetHandle(key) {
+    return function getCurrent() {
+        var zIndex;
+        var doc = getDom();
+        if (doc) {
+            zIndex = doc.dataset ? doc.dataset[key] : doc.getAttribute('data-' + key);
+        }
+        if (zIndex) {
+            return Number(zIndex);
+        }
+        return storeData[key];
+    };
+}
+var getCurrent = createGetHandle(storeMainKey);
+function getNext() {
+    return setCurrent(getCurrent() + 1);
+}
+var setSubCurrent = createSetHandle(storeSubKey);
+var _getSubCurrent = createGetHandle(storeSubKey);
+function getSubCurrent() {
+    return getCurrent() + _getSubCurrent();
+}
+function getSubNext() {
+    setSubCurrent(_getSubCurrent() + 1);
+    return getSubCurrent();
+}
+/**
+ * Web common z-index style management
+ */
+var DomZIndex = {
+    setCurrent: setCurrent,
+    getCurrent: getCurrent,
+    getNext: getNext,
+    setSubCurrent: setSubCurrent,
+    getSubCurrent: getSubCurrent,
+    getSubNext: getSubNext
+};
+/* harmony default export */ const index_esm = (DomZIndex);
+
 ;// CONCATENATED MODULE: ./packages/tools/utils.js
 
 
@@ -11233,8 +11318,7 @@ var es_parse_float = __webpack_require__(4678);
 
 
 
-var zindexIndex = 0;
-var lastZindex = 1;
+
 function isEnableConf(conf) {
   return conf && conf.enabled !== false;
 }
@@ -11259,11 +11343,10 @@ function getColumnList(columns) {
 }
 var UtilTools = {
   nextZIndex: function nextZIndex() {
-    lastZindex = conf.zIndex + zindexIndex++;
-    return lastZindex;
+    return index_esm.getNext();
   },
   getLastZIndex: function getLastZIndex() {
-    return lastZindex;
+    return index_esm.getCurrent();
   },
   getColumnList: getColumnList,
   getClass: function getClass(property, params) {
@@ -12097,7 +12180,9 @@ var VXECommandsStore = /*#__PURE__*/function () {
       var conf = this.store[name];
       // 兼容
       if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(render)) {
-        // warnLog('vxe.error.delProp', ['callback', 'commandMethod'])
+        // if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+        //   warnLog('vxe.error.delProp', ['commands -> callback', 'commandMethod'])
+        // }
         render = {
           commandMethod: render
         };
@@ -12155,7 +12240,9 @@ var VXEMenusStore = /*#__PURE__*/function () {
       var conf = this.store[name];
       // 兼容
       if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(render)) {
-        // warnLog('vxe.error.delProp', ['callback', 'menuMethod'])
+        // if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+        //   warnLog('vxe.error.delProp', ['menus -> callback', 'menuMethod'])
+        // }
         render = {
           menuMethod: render
         };
@@ -12213,9 +12300,11 @@ var VXEFormatsStore = /*#__PURE__*/function () {
       var conf = this.store[name];
       // 兼容
       if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(render)) {
-        // warnLog('vxe.error.delProp', ['callback', 'formatMethod'])
+        // if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+        //   warnLog('vxe.error.delProp', ['formats -> callback', 'cellFormatMethod'])
+        // }
         render = {
-          formatMethod: render
+          cellFormatMethod: render
         };
       }
 
@@ -12292,14 +12381,14 @@ var Store = /*#__PURE__*/function () {
 
 var validators = new store();
 if (false) {}
-;// CONCATENATED MODULE: ./packages/v-x-e-table/src/setup.js
+;// CONCATENATED MODULE: ./packages/v-x-e-table/src/config.js
 
 
 
 /**
  * 全局参数设置
  */
-function setup(options) {
+function config(options) {
   return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().merge(conf, options);
 }
 ;// CONCATENATED MODULE: ./packages/v-x-e-table/index.js
@@ -12390,8 +12479,8 @@ var VXETableConfig = /*#__PURE__*/function () {
     }
   }]);
   return VXETableConfig;
-}();
-var config = new VXETableConfig();
+}(); // 已废弃
+var globalConfs = new VXETableConfig();
 function t(key, args) {
   return conf.i18n(key, args);
 }
@@ -12399,19 +12488,20 @@ function _t(key, args) {
   return key ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toValueString(conf.translate ? conf.translate(key, args) : key) : '';
 }
 var v = 'v3';
+var setup = config;
 var VXETable = {
   v: v,
-  version: "3.7.0-beta.8",
+  version: "3.7.0",
   reg: reg,
   use: use,
   setup: setup,
+  config: config,
   interceptor: interceptor,
   renderer: renderer,
   commands: commands,
   formats: formats,
   menus: menus,
   validators: validators,
-  config: config,
   t: t,
   _t: _t
 };
@@ -13024,8 +13114,10 @@ function countTreeExpand(prevRow, params) {
     return count;
   }
   var $table = params.$table;
-  var rowChildren = prevRow[$table.treeOpts.children];
-  if ($table.isTreeExpandByRow(prevRow)) {
+  var treeOpts = $table.treeOpts;
+  var childrenField = treeOpts.children || treeOpts.childrenField;
+  var rowChildren = prevRow[childrenField];
+  if (rowChildren && $table.isTreeExpandByRow(prevRow)) {
     for (var index = 0; index < rowChildren.length; index++) {
       count += countTreeExpand(rowChildren[index], params);
     }
@@ -13192,13 +13284,12 @@ function getSlotVNs(vns) {
 
 
 
-
 
 
 var renderType = 'body';
 
 // 滚动、拖动过程中不需要触发
-function isOperateMouse($xetable) {
+function isVMScrollProcess($xetable) {
   return $xetable._isResize || $xetable.lastScrollTime && Date.now() < $xetable.lastScrollTime + $xetable.delayHover;
 }
 function renderLine(h, _vm, $xetable, params) {
@@ -13222,7 +13313,7 @@ function renderLine(h, _vm, $xetable, params) {
   if (slots && slots.line) {
     return $xetable.callSlot(slots.line, params, h);
   }
-  if (treeConfig && treeNode && treeOpts.line) {
+  if (treeConfig && treeNode && (treeOpts.showLine || treeOpts.line)) {
     return [h('div', {
       "class": 'vxe-tree--line-wrapper'
     }, [h('div', {
@@ -13337,7 +13428,7 @@ function renderColumn(h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, ro
   // hover 进入事件
   if (showTitle || showTooltip || showAllTip || bindMouseenter || tooltipConfig) {
     tdOns.mouseenter = function (evnt) {
-      if (isOperateMouse($xetable)) {
+      if (isVMScrollProcess($xetable)) {
         return;
       }
       if (showTitle) {
@@ -13356,7 +13447,7 @@ function renderColumn(h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, ro
   // hover 退出事件
   if (showTooltip || showAllTip || bindMouseleave || tooltipConfig) {
     tdOns.mouseleave = function (evnt) {
-      if (isOperateMouse($xetable)) {
+      if (isVMScrollProcess($xetable)) {
         return;
       }
       if (showTooltip || showAllTip) {
@@ -13490,15 +13581,16 @@ function renderRows(h, _vm, $xetable, fixedType, tableData, tableColumn) {
     treeOpts = $xetable.treeOpts,
     expandOpts = $xetable.expandOpts,
     editOpts = $xetable.editOpts,
-    treeExpandeds = $xetable.treeExpandeds,
+    treeExpandedMaps = $xetable.treeExpandedMaps,
     scrollYLoad = $xetable.scrollYLoad,
-    rowExpandeds = $xetable.rowExpandeds,
+    rowExpandedMaps = $xetable.rowExpandedMaps,
     radioOpts = $xetable.radioOpts,
     checkboxOpts = $xetable.checkboxOpts,
     expandColumn = $xetable.expandColumn,
     hasFixedColumn = $xetable.hasFixedColumn,
     fullAllDataRowIdData = $xetable.fullAllDataRowIdData,
     rowOpts = $xetable.rowOpts;
+  var childrenField = treeOpts.children || treeOpts.childrenField;
   var rows = [];
   tableData.forEach(function (row, $rowIndex) {
     var trOn = {};
@@ -13509,7 +13601,7 @@ function renderRows(h, _vm, $xetable, fixedType, tableData, tableColumn) {
     // 事件绑定
     if (rowOpts.isHover || highlightHoverRow) {
       trOn.mouseenter = function (evnt) {
-        if (isOperateMouse($xetable)) {
+        if (isVMScrollProcess($xetable)) {
           return;
         }
         $xetable.triggerHoverEvent(evnt, {
@@ -13518,7 +13610,7 @@ function renderRows(h, _vm, $xetable, fixedType, tableData, tableColumn) {
         });
       };
       trOn.mouseleave = function () {
-        if (isOperateMouse($xetable)) {
+        if (isVMScrollProcess($xetable)) {
           return;
         }
         $xetable.clearHoverRow();
@@ -13540,7 +13632,7 @@ function renderRows(h, _vm, $xetable, fixedType, tableData, tableColumn) {
       $rowIndex: $rowIndex
     };
     // 行是否被展开
-    var isExpandRow = expandColumn && rowExpandeds.length && rowExpandeds.indexOf(row) > -1;
+    var isExpandRow = expandColumn && !!rowExpandedMaps[rowid];
     // 树节点是否被展开
     var isExpandTree = false;
     var rowChildren = [];
@@ -13549,9 +13641,9 @@ function renderRows(h, _vm, $xetable, fixedType, tableData, tableColumn) {
     if (editConfig) {
       isNewRow = $xetable.isInsertByRow(row);
     }
-    if (treeConfig && !scrollYLoad && !treeOpts.transform && treeExpandeds.length) {
-      rowChildren = row[treeOpts.children];
-      isExpandTree = rowChildren && rowChildren.length && treeExpandeds.indexOf(row) > -1;
+    if (treeConfig && !scrollYLoad && !treeOpts.transform) {
+      rowChildren = row[childrenField];
+      isExpandTree = rowChildren && rowChildren.length && !!treeExpandedMaps[rowid];
     }
     rows.push(h('tr', {
       "class": ['vxe-body--row', treeConfig ? "row--level-".concat(rowLevel) : '', {
@@ -13560,7 +13652,7 @@ function renderRows(h, _vm, $xetable, fixedType, tableData, tableColumn) {
         'is--expand-row': isExpandRow,
         'is--expand-tree': isExpandTree,
         'row--new': isNewRow && (editOpts.showStatus || editOpts.showInsertStatus),
-        'row--radio': radioOpts.highlight && $xetable.selectRow === row,
+        'row--radio': radioOpts.highlight && $xetable.selectRadioRow === row,
         'row--checked': checkboxOpts.highlight && $xetable.isCheckedByCheckboxRow(row)
       }, rowClassName ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(rowClassName) ? rowClassName(params) : rowClassName : ''],
       attrs: {
@@ -13700,8 +13792,10 @@ function syncBodyScroll(_vm, fixedType, scrollTop, elem1, elem2) {
   },
   beforeDestroy: function beforeDestroy() {
     clearTimeout(this.wheelTime);
-    this.$el._onscroll = null;
-    this.$el.onscroll = null;
+    if (this.$el) {
+      this.$el._onscroll = null;
+      this.$el.onscroll = null;
+    }
   },
   destroyed: function destroyed() {
     var $xetable = this.$parent,
@@ -14980,22 +15074,22 @@ var Cell = {
     var $table = params.$table,
       isHidden = params.isHidden;
     var treeOpts = $table.treeOpts,
-      treeExpandeds = $table.treeExpandeds,
-      treeLazyLoadeds = $table.treeLazyLoadeds;
+      treeExpandedMaps = $table.treeExpandedMaps,
+      treeExpandLazyLoadedMaps = $table.treeExpandLazyLoadedMaps;
     var row = params.row,
       column = params.column,
       level = params.level;
     var slots = column.slots;
-    var children = treeOpts.children,
-      hasChild = treeOpts.hasChild,
-      indent = treeOpts.indent,
+    var indent = treeOpts.indent,
       lazy = treeOpts.lazy,
       trigger = treeOpts.trigger,
       iconLoaded = treeOpts.iconLoaded,
       showIcon = treeOpts.showIcon,
       iconOpen = treeOpts.iconOpen,
       iconClose = treeOpts.iconClose;
-    var rowChilds = row[children];
+    var childrenField = treeOpts.children || treeOpts.childrenField;
+    var hasChildField = treeOpts.hasChild || treeOpts.hasChildField;
+    var rowChilds = row[childrenField];
     var hasLazyChilds = false;
     var isAceived = false;
     var isLazyLoaded = false;
@@ -15004,10 +15098,11 @@ var Cell = {
       return $table.callSlot(slots.icon, params, h, cellVNodes);
     }
     if (!isHidden) {
-      isAceived = $table.findRowIndexOf(treeExpandeds, row) > -1;
+      var rowid = getRowid($table, row);
+      isAceived = !!treeExpandedMaps[rowid];
       if (lazy) {
-        isLazyLoaded = $table.findRowIndexOf(treeLazyLoadeds, row) > -1;
-        hasLazyChilds = row[hasChild];
+        isLazyLoaded = !!treeExpandLazyLoadedMaps[rowid];
+        hasLazyChilds = row[hasChildField];
       }
     }
     if (!trigger || trigger === 'default') {
@@ -15075,7 +15170,7 @@ var Cell = {
       column = params.column,
       isHidden = params.isHidden;
     var radioOpts = $table.radioOpts,
-      selectRow = $table.selectRow;
+      selectRadioRow = $table.selectRadioRow;
     var slots = column.slots;
     var labelField = radioOpts.labelField,
       checkMethod = radioOpts.checkMethod,
@@ -15083,7 +15178,7 @@ var Cell = {
     var row = params.row;
     var defaultSlot = slots ? slots["default"] : null;
     var radioSlot = slots ? slots.radio : null;
-    var isChecked = row === selectRow;
+    var isChecked = row === selectRadioRow;
     var isVisible = !visibleMethod || visibleMethod({
       row: row
     });
@@ -15195,8 +15290,8 @@ var Cell = {
       column = params.column,
       isHidden = params.isHidden;
     var treeConfig = $table.treeConfig,
-      treeIndeterminates = $table.treeIndeterminates,
-      selectCheckboxRows = $table.selectCheckboxRows;
+      treeIndeterminateMaps = $table.treeIndeterminateMaps,
+      selectCheckboxMaps = $table.selectCheckboxMaps;
     var _$table$checkboxOpts = $table.checkboxOpts,
       labelField = _$table$checkboxOpts.labelField,
       checkMethod = _$table$checkboxOpts.checkMethod,
@@ -15212,7 +15307,8 @@ var Cell = {
     var isDisabled = !!checkMethod;
     var on;
     if (!isHidden) {
-      isChecked = $table.findRowIndexOf(selectCheckboxRows, row) > -1;
+      var rowid = getRowid($table, row);
+      isChecked = !!selectCheckboxMaps[rowid];
       on = {
         click: function click(evnt) {
           if (!isDisabled && isVisible) {
@@ -15227,7 +15323,7 @@ var Cell = {
         });
       }
       if (treeConfig) {
-        indeterminate = $table.findRowIndexOf(treeIndeterminates, row) > -1;
+        indeterminate = !!treeIndeterminateMaps[rowid];
       }
     }
     var checkboxParams = _objectSpread2(_objectSpread2({}, params), {}, {
@@ -15268,17 +15364,17 @@ var Cell = {
       column = params.column,
       isHidden = params.isHidden;
     var treeConfig = $table.treeConfig,
-      treeIndeterminates = $table.treeIndeterminates;
-    var _$table$checkboxOpts2 = $table.checkboxOpts,
-      labelField = _$table$checkboxOpts2.labelField,
-      checkField = _$table$checkboxOpts2.checkField,
-      halfField = _$table$checkboxOpts2.halfField,
-      checkMethod = _$table$checkboxOpts2.checkMethod,
-      visibleMethod = _$table$checkboxOpts2.visibleMethod;
+      treeIndeterminateMaps = $table.treeIndeterminateMaps,
+      checkboxOpts = $table.checkboxOpts;
+    var labelField = checkboxOpts.labelField,
+      checkField = checkboxOpts.checkField,
+      checkMethod = checkboxOpts.checkMethod,
+      visibleMethod = checkboxOpts.visibleMethod;
+    var indeterminateField = checkboxOpts.indeterminateField || checkboxOpts.halfField;
     var slots = column.slots;
     var defaultSlot = slots ? slots["default"] : null;
     var checkboxSlot = slots ? slots.checkbox : null;
-    var indeterminate = false;
+    var isIndeterminate = false;
     var isChecked = false;
     var isVisible = !visibleMethod || visibleMethod({
       row: row
@@ -15286,6 +15382,7 @@ var Cell = {
     var isDisabled = !!checkMethod;
     var on;
     if (!isHidden) {
+      var rowid = getRowid($table, row);
       isChecked = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, checkField);
       on = {
         click: function click(evnt) {
@@ -15301,14 +15398,14 @@ var Cell = {
         });
       }
       if (treeConfig) {
-        indeterminate = $table.findRowIndexOf(treeIndeterminates, row) > -1;
+        isIndeterminate = !!treeIndeterminateMaps[rowid];
       }
     }
     var checkboxParams = _objectSpread2(_objectSpread2({}, params), {}, {
       checked: isChecked,
       disabled: isDisabled,
       visible: isVisible,
-      indeterminate: indeterminate
+      indeterminate: isIndeterminate
     });
     if (checkboxSlot) {
       return $table.callSlot(checkboxSlot, checkboxParams, h);
@@ -15316,7 +15413,7 @@ var Cell = {
     var checkVNs = [];
     if (isVisible) {
       checkVNs.push(h('span', {
-        "class": ['vxe-checkbox--icon', indeterminate ? conf.icon.TABLE_CHECKBOX_INDETERMINATE : isChecked ? conf.icon.TABLE_CHECKBOX_CHECKED : conf.icon.TABLE_CHECKBOX_UNCHECKED]
+        "class": ['vxe-checkbox--icon', isIndeterminate ? conf.icon.TABLE_CHECKBOX_INDETERMINATE : isChecked ? conf.icon.TABLE_CHECKBOX_CHECKED : conf.icon.TABLE_CHECKBOX_UNCHECKED]
       }));
     }
     if (defaultSlot || labelField) {
@@ -15328,7 +15425,7 @@ var Cell = {
       "class": ['vxe-cell--checkbox', {
         'is--checked': isChecked,
         'is--disabled': isDisabled,
-        'is--indeterminate': halfField && !isChecked ? row[halfField] : indeterminate
+        'is--indeterminate': indeterminateField && !isChecked ? row[indeterminateField] : isIndeterminate
       }],
       on: on
     }, checkVNs)];
@@ -15345,8 +15442,8 @@ var Cell = {
       row = params.row,
       column = params.column;
     var expandOpts = $table.expandOpts,
-      rowExpandeds = $table.rowExpandeds,
-      expandLazyLoadeds = $table.expandLazyLoadeds;
+      rowExpandedMaps = $table.rowExpandedMaps,
+      rowExpandLazyLoadedMaps = $table.rowExpandLazyLoadedMaps;
     var lazy = expandOpts.lazy,
       labelField = expandOpts.labelField,
       iconLoaded = expandOpts.iconLoaded,
@@ -15362,9 +15459,10 @@ var Cell = {
       return $table.callSlot(slots.icon, params, h);
     }
     if (!isHidden) {
-      isAceived = $table.findRowIndexOf(rowExpandeds, params.row) > -1;
+      var rowid = getRowid($table, row);
+      isAceived = !!rowExpandedMaps[rowid];
       if (lazy) {
-        isLazyLoaded = $table.findRowIndexOf(expandLazyLoadeds, row) > -1;
+        isLazyLoaded = !!rowExpandLazyLoadedMaps[rowid];
       }
     }
     return [showIcon && (!visibleMethod || visibleMethod(params)) ? h('span', {
@@ -15494,7 +15592,9 @@ var Cell = {
       },
       on: {
         click: function click(evnt) {
-          $table.triggerFilterEvent(evnt, params.column, params);
+          if ($table.triggerFilterEvent) {
+            $table.triggerFilterEvent(evnt, params.column, params);
+          }
         }
       }
     })])] : [];
@@ -15623,7 +15723,6 @@ var Cell = {
 
 
 
-
 
 
 var setCellValue = utils.setCellValue,
@@ -15672,12 +15771,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 = {};
+  external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(keyMaps, function (row, rowid) {
+    if (fullAllDataRowIdData[rowid]) {
+      restKeys[rowid] = row;
+    }
   });
-}
+  return restKeys;
+};
 function handleReserveRow(_vm, reserveRowMap) {
   var fullDataRowIdData = _vm.fullDataRowIdData;
   var reserveList = [];
@@ -16029,6 +16132,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) {
@@ -16038,8 +16142,8 @@ var Methods = {
         treeData = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toArrayTree(fullData, {
           key: treeOpts.rowField,
           parentKey: treeOpts.parentField,
-          children: treeOpts.children,
-          mapChildren: treeOpts.mapChildren
+          children: childrenField,
+          mapChildren: treeOpts.mapChildrenField
         });
         fullData = treeData.slice(0);
       } else {
@@ -16247,6 +16351,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 = getRowkey(this);
     var isLazy = treeConfig && treeOpts.lazy;
     var handleCache = function handleCache(row, index, items, path, parent, nodes) {
@@ -16257,8 +16363,8 @@ var Methods = {
         rowid = getRowUniqueId();
         external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(row, rowkey, rowid);
       }
-      if (isLazy && row[treeOpts.hasChild] && external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(row[treeOpts.children])) {
-        row[treeOpts.children] = null;
+      if (isLazy && row[hasChildField] && external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(row[childrenField])) {
+        row[childrenField] = null;
       }
       var rest = {
         row: row,
@@ -16285,7 +16391,9 @@ var Methods = {
     fullAllDataRowIdData = this.fullAllDataRowIdData = {};
     fullAllDataRowMap.clear();
     if (treeConfig) {
-      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(tableFullTreeData, handleCache, treeOpts);
+      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(tableFullTreeData, handleCache, {
+        children: childrenField
+      });
     } else {
       tableFullData.forEach(handleCache);
     }
@@ -16311,7 +16419,10 @@ var Methods = {
     };
     // 源数据缓存
     if (treeConfig && !treeOpts.transform) {
-      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(sourceData, handleSourceRow, treeOpts);
+      var childrenField = treeOpts.children || treeOpts.childrenField;
+      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(sourceData, handleSourceRow, {
+        children: treeOpts.transform ? treeOpts.mapChildrenField : childrenField
+      });
     } else {
       sourceData.forEach(handleSourceRow);
     }
@@ -16325,10 +16436,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,
-      children = treeOpts.children,
-      mapChildren = treeOpts.mapChildren;
+      mapChildrenField = treeOpts.mapChildrenField;
+    var childrenField = treeOpts.children || treeOpts.childrenField;
     var rest = fullAllDataRowIdData[getRowid(this, row)];
     var parentLevel = rest ? rest.level : 0;
     return this.createData(childRecords).then(function (rows) {
@@ -16336,10 +16448,16 @@ var Methods = {
         var rowid = getRowid(_this12, row);
         var matchObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findTree(tableSourceData, function (item) {
           return rowid === getRowid(_this12, item);
-        }, treeOpts);
+        }, {
+          children: childrenField
+        });
         if (matchObj) {
-          matchObj.item[children] = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(rows, true);
+          matchObj.item[childrenField] = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(rows, true);
         }
+        rows.forEach(function (childRow) {
+          var rowid = getRowid(_this12, childRow);
+          sourceDataRowIdData[rowid] = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(childRow, true);
+        });
       }
       external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(rows, function (childRow, index, items, path, parent, nodes) {
         var rowid = getRowid(_this12, childRow);
@@ -16358,10 +16476,12 @@ var Methods = {
         fullDataRowMap.set(childRow, rest);
         fullAllDataRowIdData[rowid] = rest;
         fullAllDataRowMap.set(childRow, rest);
-      }, treeOpts);
-      row[children] = rows;
+      }, {
+        children: childrenField
+      });
+      row[childrenField] = rows;
       if (transform) {
-        row[mapChildren] = rows;
+        row[mapChildrenField] = rows;
       }
       _this12.updateAfterDataIndex();
       return rows;
@@ -16587,6 +16707,7 @@ var Methods = {
       treeConfig = this.treeConfig,
       treeOpts = this.treeOpts,
       expandOpts = this.expandOpts;
+    var childrenField = treeOpts.children || treeOpts.childrenField;
     var rowkey = getRowkey(this);
     if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(records)) {
       records = [records || {}];
@@ -16616,8 +16737,8 @@ var Methods = {
           external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(record, key, null);
         }
       });
-      if (treeConfig && treeOpts.lazy && external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(record[treeOpts.children])) {
-        record[treeOpts.children] = null;
+      if (treeConfig && treeOpts.lazy && external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(record[childrenField])) {
+        record[childrenField] = null;
       }
       // 必须有行数据的唯一主键，可以自行设置；也可以默认生成一个随机数
       if (eqEmptyValue(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(record, rowkey))) {
@@ -16825,18 +16946,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,
-      children = treeOpts.children,
-      mapChildren = treeOpts.mapChildren;
+      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) {
@@ -16844,7 +16965,7 @@ var Methods = {
         rowList = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().filterTree(currTableData, function (row) {
           return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, checkField);
         }, {
-          children: transform ? mapChildren : children
+          children: transform ? mapChildrenField : childrenField
         });
       } else {
         rowList = currTableData.filter(function (row) {
@@ -16852,18 +16973,13 @@ var Methods = {
         });
       }
     } else {
-      var selectCheckboxRows = this.selectCheckboxRows;
-      if (treeConfig) {
-        rowList = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().filterTree(currTableData, function (row) {
-          return _this17.findRowIndexOf(selectCheckboxRows, row) > -1;
-        }, {
-          children: transform ? mapChildren : children
-        });
-      } else {
-        rowList = currTableData.filter(function (row) {
-          return _this17.findRowIndexOf(selectCheckboxRows, row) > -1;
-        });
-      }
+      var selectCheckboxMaps = this.selectCheckboxMaps,
+        fullDataRowIdData = this.fullDataRowIdData;
+      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(selectCheckboxMaps, function (row, rowid) {
+        if (isFull ? fullDataRowIdData[rowid] : afterFullRowMaps[rowid]) {
+          rowList.push(row);
+        }
+      });
     }
     return rowList;
   },
@@ -16872,21 +16988,24 @@ 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 = {};
       external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(afterTreeFullData, function (row, index, items, path, parent) {
-        if (!parent || expandMaps.has(parent) && treeExpandeds.indexOf(parent) > -1) {
-          expandMaps.set(row, 1);
+        var rowid = getRowid(_this17, row);
+        var parentRowid = getRowid(_this17, parent);
+        if (!parent || expandMaps[parentRowid] && treeExpandedMaps[parentRowid]) {
+          expandMaps[rowid] = 1;
           fullData.push(row);
         }
       }, {
-        children: treeOpts.mapChildren
+        children: treeOpts.mapChildrenField
       });
       this.afterFullData = fullData;
       this.updateScrollYStatus(fullData);
@@ -17111,6 +17230,8 @@ var Methods = {
       fullAllDataRowIdData = this.fullAllDataRowIdData,
       afterTreeFullData = this.afterTreeFullData,
       treeOpts = this.treeOpts;
+    var childrenField = treeOpts.children || treeOpts.childrenField;
+    var fullMaps = {};
     if (treeConfig) {
       external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(afterTreeFullData, function (row, index, items, path) {
         var rowid = getRowid(_this19, row);
@@ -17136,8 +17257,9 @@ var Methods = {
           fullAllDataRowIdData[rowid] = rest;
           fullDataRowIdData[rowid] = rest;
         }
+        fullMaps[rowid] = row;
       }, {
-        children: treeOpts.transform ? treeOpts.mapChildren : treeOpts.children
+        children: treeOpts.transform ? treeOpts.mapChildrenField : childrenField
       });
     } else {
       afterFullData.forEach(function (row, index) {
@@ -17162,8 +17284,10 @@ var Methods = {
           fullAllDataRowIdData[rowid] = rest;
           fullDataRowIdData[rowid] = rest;
         }
+        fullMaps[rowid] = row;
       });
     }
+    this.afterFullRowMaps = fullMaps;
   },
   /**
    * 只对 tree-config 有效，获取行的父级
@@ -17302,7 +17426,7 @@ var Methods = {
    */
   showColumn: function showColumn(fieldOrColumn) {
     var column = handleFieldOrColumn(this, fieldOrColumn);
-    if (column && column.visible) {
+    if (column && !column.visible) {
       column.visible = true;
       return this.handleCustom();
     }
@@ -18452,6 +18576,7 @@ var Methods = {
         var operArrow = isLeftArrow || isUpArrow || isRightArrow || isDwArrow;
         var operCtxMenu = isCtxMenu && ctxMenuStore.visible && (isEnter || isSpacebar || operArrow);
         var isEditStatus = isEnableConf(editConfig) && actived.column && actived.row;
+        var childrenField = treeOpts.children || treeOpts.childrenField;
         var params;
         if (filterStore.visible) {
           if (isEsc) {
@@ -18526,7 +18651,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];
@@ -18596,7 +18721,9 @@ var Methods = {
               // 如果树形表格回退键关闭当前行返回父节点
               var _XEUtils$findTree = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findTree(_this29.afterFullData, function (item) {
                   return item === currentRow;
-                }, treeOpts),
+                }, {
+                  children: childrenField
+                }),
                 parentRow = _XEUtils$findTree.parent;
               if (parentRow) {
                 evnt.preventDefault();
@@ -18902,15 +19029,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 = getRowid(_this31, row);
-        return fullDataRowIdData[rowid];
+      var fullRest = [];
+      var defRest = [];
+      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(treeIndeterminateMaps, function (item, rowid) {
+        if (item) {
+          fullRest.push(item);
+          if (fullDataRowIdData[rowid]) {
+            defRest.push(item);
+          }
+        }
       });
+      if (isFull) {
+        return fullRest;
+      }
+      return defRest;
     }
     return [];
   },
@@ -18935,12 +19071,12 @@ var Methods = {
     }
   },
   handleCheckedCheckboxRow: function handleCheckedCheckboxRow(rows, value, isForce) {
-    var _this32 = this;
+    var _this31 = this;
     if (rows && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(rows)) {
       rows = [rows];
     }
     rows.forEach(function (row) {
-      return _this32.handleSelectRow({
+      return _this31.handleSelectRow({
         row: row
       }, !!value, isForce);
     });
@@ -18955,78 +19091,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 external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, checkField);
     }
-    return this.findRowIndexOf(selectCheckboxRows, row) > -1;
+    return !!selectCheckboxMaps[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[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 = _objectSpread2({}, selectCheckboxMaps);
+    var childrenField = treeOpts.children || treeOpts.childrenField;
+    var indeterminateField = checkboxOpts.indeterminateField || checkboxOpts.halfField;
+    var rowid = 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) {
+              external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(row, indeterminateField, true);
+            }
+            treeIndeterminateMaps[rowid] = row;
           }
           external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(row, checkField, false);
         } else {
           // 更新子节点状态
           external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree([row], function (item) {
-            if (_this33.eqRow(item, row) || isForce || !checkMethod || checkMethod({
+            if (_this32.eqRow(item, row) || isForce || !checkMethod || checkMethod({
               row: item
             })) {
               external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(item, checkField, value);
-              external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().remove(treeIndeterminates, function (half) {
-                return _this33.eqRow(half, item);
-              });
-              _this33.handleCheckboxReserveRow(row, value);
+              if (indeterminateField) {
+                external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(row, indeterminateField, false);
+              }
+              delete treeIndeterminateMaps[getRowid(_this32, item)];
+              _this32.handleCheckboxReserveRow(row, value);
             }
-          }, treeOpts);
+          }, {
+            children: childrenField
+          });
         }
         // 如果存在父节点，更新父节点状态
         var matchObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_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 = getRowid(_this32, item);
+                vItemMaps[itemRid] = item;
+                vItems.push(item);
+              }
+            });
+          } else {
+            matchObj.items.forEach(function (item) {
+              var itemRid = getRowid(_this32, item);
+              vItemMaps[itemRid] = item;
+              vItems.push(item);
             });
-          }) : matchObj.items;
+          }
           var indeterminatesItem = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().find(matchObj.items, function (item) {
-            return _this33.findRowIndexOf(treeIndeterminates, item) > -1;
+            return !!treeIndeterminateMaps[getRowid(_this32, item)];
           });
           if (indeterminatesItem) {
             parentStatus = -1;
           } else {
-            var selectItems = matchObj.items.filter(function (item) {
-              return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(item, checkField);
+            var selectItems = [];
+            matchObj.items.forEach(function (item) {
+              if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(item, checkField)) {
+                selectItems.push(item);
+              }
             });
             parentStatus = selectItems.filter(function (item) {
-              return _this33.findRowIndexOf(vItems, item) > -1;
+              return vItemMaps[getRowid(_this32, item)];
             }).length === vItems.length ? true : selectItems.length || value === -1 ? -1 : false;
           }
+          this.selectCheckboxMaps = selectRowMaps;
           return this.handleSelectRow({
             row: matchObj.parent
           }, parentStatus, isForce);
@@ -19042,56 +19208,84 @@ var Methods = {
     } else {
       if (treeConfig && !checkStrictly) {
         if (value === -1) {
-          if (this.findRowIndexOf(treeIndeterminates, row) === -1) {
-            treeIndeterminates.push(row);
+          if (!treeIndeterminateMaps[rowid]) {
+            if (indeterminateField) {
+              external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(row, indeterminateField, true);
+            }
+            treeIndeterminateMaps[rowid] = row;
+          }
+          if (selectRowMaps[rowid]) {
+            delete selectRowMaps[rowid];
           }
-          external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().remove(selectCheckboxRows, function (item) {
-            return _this33.eqRow(item, row);
-          });
         } else {
           // 更新子节点状态
           external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree([row], function (item) {
-            if (_this33.eqRow(item, row) || isForce || !checkMethod || checkMethod({
+            var itemRid = getRowid(_this32, item);
+            if (_this32.eqRow(item, row) || isForce || !checkMethod || checkMethod({
               row: item
             })) {
               if (value) {
-                selectCheckboxRows.push(item);
+                selectRowMaps[itemRid] = item;
               } else {
-                external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().remove(selectCheckboxRows, function (select) {
-                  return _this33.eqRow(select, item);
-                });
+                if (selectRowMaps[itemRid]) {
+                  delete selectRowMaps[itemRid];
+                }
               }
-              external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().remove(treeIndeterminates, function (half) {
-                return _this33.eqRow(half, item);
-              });
-              _this33.handleCheckboxReserveRow(row, value);
+              if (indeterminateField) {
+                external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(row, indeterminateField, false);
+              }
+              delete treeIndeterminateMaps[getRowid(_this32, item)];
+              _this32.handleCheckboxReserveRow(row, value);
             }
-          }, treeOpts);
+          }, {
+            children: childrenField
+          });
         }
         // 如果存在父节点，更新父节点状态
         var _matchObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_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 = getRowid(_this32, item);
+                _vItemMaps[itemRid] = item;
+                _vItems.push(item);
+              }
+            });
+          } else {
+            _matchObj.items.forEach(function (item) {
+              var itemRid = getRowid(_this32, item);
+              _vItemMaps[itemRid] = item;
+              _vItems.push(item);
             });
-          }) : _matchObj.items;
+          }
           var _indeterminatesItem = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().find(_matchObj.items, function (item) {
-            return _this33.findRowIndexOf(treeIndeterminates, item) > -1;
+            return !!treeIndeterminateMaps[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 = getRowid(_this32, item);
+              if (selectRowMaps[itemRid]) {
+                _selectItems.push(item);
+              }
             });
             _parentStatus = _selectItems.filter(function (item) {
-              return _this33.findRowIndexOf(_vItems, item) > -1;
+              return _vItemMaps[getRowid(_this32, item)];
             }).length === _vItems.length ? true : _selectItems.length || value === -1 ? -1 : false;
           }
+          this.selectCheckboxMaps = selectRowMaps;
           return this.handleSelectRow({
             row: _matchObj.parent
           }, _parentStatus, isForce);
@@ -19101,26 +19295,32 @@ var Methods = {
           row: row
         })) {
           if (value) {
-            if (this.findRowIndexOf(selectCheckboxRows, row) === -1) {
-              selectCheckboxRows.push(row);
+            if (!selectRowMaps[rowid]) {
+              selectRowMaps[rowid] = row;
             }
           } else {
-            external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_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 ? !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, checkField) : this.findRowIndexOf(selectCheckboxRows, row) === -1;
+    var value = false;
+    if (checkField) {
+      value = !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, checkField);
+    } else {
+      value = !selectCheckboxMaps[getRowid(this, row)];
+    }
     if (evnt) {
       this.triggerCheckRowEvent(evnt, params, value);
     } else {
@@ -19128,9 +19328,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({
@@ -19145,31 +19365,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 ? !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, checkField) : this.findRowIndexOf(selectCheckboxRows, row) === -1;
+    var value = checkField ? !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, checkField) : !selectCheckboxMaps[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) {
+      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(selectCheckboxMaps, function (row, rowid) {
+        if (!afterFullRowMaps[rowid]) {
+          selectRowMaps[rowid] = row;
+        }
+      });
+    }
+    // 疑惑！
+
     if (checkStrictly) {
       this.isAllSelected = value;
     } else {
@@ -19183,15 +19414,20 @@ var Methods = {
             row: row
           })) {
             if (value) {
-              selectRows.push(row);
+              selectRowMaps[getRowid(_this33, row)] = row;
             }
             external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(row, checkField, value);
           }
+          if (treeConfig && indeterminateField) {
+            external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(row, indeterminateField, false);
+          }
         };
         // 如果存在选中方法
         // 如果方法成立，则更新值，否则忽略该数据
         if (treeConfig) {
-          external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(afterFullData, checkValFn, treeOpts);
+          external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(afterFullData, checkValFn, {
+            children: childrenField
+          });
         } else {
           afterFullData.forEach(checkValFn);
         }
@@ -19210,9 +19446,11 @@ var Methods = {
               if (isForce || !checkMethod || checkMethod({
                 row: row
               })) {
-                selectRows.push(row);
+                selectRowMaps[getRowid(_this33, row)] = row;
               }
-            }, treeOpts);
+            }, {
+              children: childrenField
+            });
           } else {
             /**
              * 如果是树取消
@@ -19220,12 +19458,15 @@ var Methods = {
              */
             if (!isForce && checkMethod) {
               external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(afterFullData, function (row) {
+                var rowid = 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 {
@@ -19236,13 +19477,18 @@ var Methods = {
              * 如果不存在选中方法，则添加所有数据到临时集合中
              */
             if (!isForce && checkMethod) {
-              selectRows = afterFullData.filter(function (row) {
-                return _this34.findRowIndexOf(selectCheckboxRows, row) > -1 || checkMethod({
+              afterFullData.forEach(function (row) {
+                var rowid = getRowid(_this33, row);
+                if (selectCheckboxMaps[rowid] || checkMethod({
                   row: row
-                });
+                })) {
+                  selectRowMaps[rowid] = row;
+                }
               });
             } else {
-              selectRows = afterFullData.slice(0);
+              afterFullData.forEach(function (row) {
+                selectRowMaps[getRowid(_this33, row)] = row;
+              });
             }
           } else {
             /**
@@ -19251,10 +19497,13 @@ var Methods = {
              * 如果不存在选中方法，无需处理，临时集合默认为空
              */
             if (!isForce && checkMethod) {
-              selectRows = afterFullData.filter(function (row) {
-                return checkMethod({
+              afterFullData.forEach(function (row) {
+                var rowid = getRowid(_this33, row);
+                if (checkMethod({
                   row: row
-                }) ? 0 : _this34.findRowIndexOf(selectCheckboxRows, row) > -1;
+                }) ? 0 : selectCheckboxMaps[rowid]) {
+                  selectRowMaps[rowid] = row;
+                }
               });
             }
           }
@@ -19262,18 +19511,19 @@ var Methods = {
       }
       if (reserve) {
         if (value) {
-          selectRows.forEach(function (row) {
-            checkboxReserveRowMap[getRowid(_this34, row)] = row;
+          external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_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();
   },
@@ -19285,16 +19535,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 = [];
@@ -19319,19 +19569,19 @@ var Methods = {
         });
         isAllSelected = isAllResolve && afterFullData.length !== disableRows.length;
         if (treeConfig) {
-          if (halfField) {
+          if (indeterminateField) {
             isIndeterminate = !isAllSelected && afterFullData.some(function (row) {
-              return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, checkField) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, halfField) || _this35.findRowIndexOf(treeIndeterminates, row) > -1;
+              return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, checkField) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, indeterminateField) || !!treeIndeterminateMaps[getRowid(_this34, row)];
             });
           } else {
             isIndeterminate = !isAllSelected && afterFullData.some(function (row) {
-              return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, checkField) || _this35.findRowIndexOf(treeIndeterminates, row) > -1;
+              return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, checkField) || !!treeIndeterminateMaps[getRowid(_this34, row)];
             });
           }
         } else {
-          if (halfField) {
+          if (indeterminateField) {
             isIndeterminate = !isAllSelected && afterFullData.some(function (row) {
-              return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, checkField) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, halfField);
+              return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, checkField) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, indeterminateField);
             });
           } else {
             isIndeterminate = !isAllSelected && afterFullData.some(function (row) {
@@ -19347,22 +19597,23 @@ var Methods = {
             disableRows.push(row);
             return true;
           }
-          if (_this35.findRowIndexOf(selectCheckboxRows, row) > -1) {
+          if (selectCheckboxMaps[getRowid(_this34, row)]) {
             checkRows.push(row);
             return true;
           }
           return false;
         } : function (row) {
-          return _this35.findRowIndexOf(selectCheckboxRows, row) > -1;
+          return selectCheckboxMaps[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 = getRowid(_this34, row);
+            return treeIndeterminateMaps[itemRid] || selectCheckboxMaps[itemRid];
           });
         } else {
           isIndeterminate = !isAllSelected && afterFullData.some(function (row) {
-            return _this35.findRowIndexOf(selectCheckboxRows, row) > -1;
+            return selectCheckboxMaps[getRowid(_this34, row)];
           });
         }
       }
@@ -19378,17 +19629,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) {
@@ -19398,7 +19649,7 @@ var Methods = {
       }
     }
     // 复选框
-    this.selectCheckboxRows = getRecoverRow(this, selectCheckboxRows); // 刷新多选行状态
+    this.selectCheckboxMaps = getRecoverRowMaps(this, selectCheckboxMaps); // 刷新多选行状态
     // 还原保留选中状态
     if (checkboxOpts.reserve) {
       this.handleCheckedCheckboxRow(handleReserveRow(this, this.checkboxReserveRowMap), true, true);
@@ -19407,13 +19658,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);
     }
@@ -19428,6 +19679,7 @@ var Methods = {
       afterFullData = this.afterFullData,
       treeConfig = this.treeConfig,
       treeOpts = this.treeOpts;
+    var childrenField = treeOpts.children || treeOpts.childrenField;
     if (radioOpts.reserve && radioReserveRow) {
       var rowid = getRowid(this, radioReserveRow);
       if (isFull) {
@@ -19439,7 +19691,9 @@ var Methods = {
         if (treeConfig) {
           var matchObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findTree(afterFullData, function (row) {
             return rowid === external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, rowkey);
-          }, treeOpts);
+          }, {
+            children: childrenField
+          });
           if (matchObj) {
             return radioReserveRow;
           }
@@ -19468,23 +19722,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) {
         external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(afterFullData, function (row) {
-          afterFullIdMaps[getRowid(_this36, row)] = 1;
-        }, treeOpts);
+          afterFullIdMaps[getRowid(_this35, row)] = 1;
+        }, {
+          children: childrenField
+        });
       } else {
         afterFullData.forEach(function (row) {
-          afterFullIdMaps[getRowid(_this36, row)] = 1;
+          afterFullIdMaps[getRowid(_this35, row)] = 1;
         });
       }
       external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(checkboxReserveRowMap, function (oldRow, oldRowid) {
@@ -19543,33 +19800,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) {
+          external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(item, indeterminateField, false);
+        }
+        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(item, checkField, false);
+      };
       if (treeConfig) {
-        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(tableFullData, function (item) {
-          return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(item, checkField, false);
-        }, treeOpts);
-      } else {
-        tableFullData.forEach(function (item) {
-          return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(item, checkField, false);
+        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_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();
   },
   /**
@@ -19594,7 +19857,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;
@@ -19647,7 +19910,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;
@@ -19655,7 +19918,7 @@ var Methods = {
     if (row && (isForce || !checkMethod || checkMethod({
       row: row
     }))) {
-      this.selectRow = row;
+      this.selectRadioRow = row;
       this.handleRadioReserveRow(row);
     }
     return this.$nextTick();
@@ -19685,7 +19948,7 @@ var Methods = {
    * 用于单选行，手动清空用户的选择
    */
   clearRadioRow: function clearRadioRow() {
-    this.selectRow = null;
+    this.selectRadioRow = null;
     return this.$nextTick();
   },
   /**
@@ -19698,30 +19961,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 = getRowid(this, selectRow);
+      afterFullRowMaps = this.afterFullRowMaps;
+    if (selectRadioRow) {
+      var rowid = getRowid(this, selectRadioRow);
       if (isFull) {
         if (!fullDataRowIdData[rowid]) {
-          return selectRow;
+          return selectRadioRow;
         }
       } else {
-        if (treeConfig) {
-          var rowkey = getRowkey(this);
-          var matchObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findTree(afterFullData, function (row) {
-            return rowid === external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, rowkey);
-          }, treeOpts);
-          if (matchObj) {
-            return selectRow;
-          }
-        } else {
-          if (afterFullData.indexOf(selectRow) > -1) {
-            return selectRow;
-          }
+        if (afterFullRowMaps[rowid]) {
+          return selectRadioRow;
         }
       }
     }
@@ -19815,12 +20066,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;
       });
@@ -19914,7 +20165,7 @@ var Methods = {
    * 如果是双击模式，则激活为编辑状态
    */
   triggerCellDblclickEvent: function triggerCellDblclickEvent(evnt, params) {
-    var _this39 = this;
+    var _this38 = this;
     var editStore = this.editStore,
       editConfig = this.editConfig,
       editOpts = this.editOpts;
@@ -19927,15 +20178,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;
           });
@@ -19945,7 +20196,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;
@@ -19958,7 +20209,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;
@@ -20005,7 +20256,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,
@@ -20031,14 +20282,14 @@ var Methods = {
           order = confs.order;
         var column = field;
         if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_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;
@@ -20051,8 +20302,8 @@ var Methods = {
         this.handleTableData(true);
       }
       return this.$nextTick().then(function () {
-        _this41.updateCellAreas();
-        return _this41.updateStyle();
+        _this40.updateCellAreas();
+        return _this40.updateStyle();
       });
     }
     return this.$nextTick();
@@ -20165,17 +20416,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 = getRowid(this, row);
     var rest = fullAllDataRowMap.get(row);
     if (lazy && rest) {
       rest.expandLoaded = false;
-      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().remove(expandLazyLoadeds, function (item) {
-        return _this42.eqRow(item, row);
-      });
+      var rowTempExpandLazyLoadedMaps = _objectSpread2({}, rowExpandLazyLoadedMaps);
+      if (rowTempExpandLazyLoadedMaps[rowid]) {
+        delete rowTempExpandLazyLoadedMaps[rowid];
+      }
+      this.rowExpandLazyLoadedMaps = rowTempExpandLazyLoadedMaps;
     }
     return this.$nextTick();
   },
@@ -20184,13 +20437,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 = getRowid(this, row);
+    if (lazy && !rowExpandLazyLoadedMaps[rowid]) {
       this.clearRowExpandLoaded(row).then(function () {
-        return _this43.handleAsyncRowExpand(row);
+        return _this41.handleAsyncRowExpand(row);
       });
     }
     return this.$nextTick();
@@ -20205,11 +20459,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 = getRowid(this, row);
+    if (!lazy || !rowExpandLazyLoadedMaps[rowid]) {
       var expanded = !this.isExpandByRow(row);
       var columnIndex = this.getColumnIndex(column);
       var $columnIndex = this.getVMColumnIndex(column);
@@ -20260,37 +20515,57 @@ var Methods = {
       treeOpts = this.treeOpts,
       tableFullData = this.tableFullData,
       tableFullTreeData = this.tableFullTreeData;
+    var childrenField = treeOpts.children || treeOpts.childrenField;
     var expandedRows = [];
     if (treeConfig) {
       external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_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 () {
-        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().remove(_this44.expandLazyLoadeds, function (item) {
-          return _this44.eqRow(item, row);
+      var loadMethod = expandOpts.loadMethod;
+      if (loadMethod) {
+        var rowExpandLazyLoadedMaps = _this42.rowExpandLazyLoadedMaps;
+        var rowTempExpandLazyLoadedMaps = _objectSpread2({}, rowExpandLazyLoadedMaps);
+        var rowid = 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 = _objectSpread2({}, rowExpandedMaps);
+          rowTempExpandedMaps[rowid] = row;
+          _this42.rowExpandedMaps = rowTempExpandedMaps;
+        })["catch"](function () {
+          rest.expandLoaded = false;
+        })["finally"](function () {
+          var rowExpandLazyLoadedMaps = _this42.rowExpandLazyLoadedMaps;
+          var rowTempExpandLazyLoadedMaps = _objectSpread2({}, rowExpandLazyLoadedMaps);
+          if (rowTempExpandLazyLoadedMaps[rowid]) {
+            delete rowTempExpandLazyLoadedMaps[rowid];
+          }
+          _this42.rowExpandLazyLoadedMaps = rowTempExpandLazyLoadedMaps;
+          resolve(_this42.$nextTick().then(_this42.recalculate));
         });
-        resolve(_this44.$nextTick().then(_this44.recalculate));
-      });
+      } else {
+        resolve();
+      }
     });
   },
   /**
@@ -20301,12 +20576,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 = _objectSpread2({}, rowExpandedMaps);
     var reserve = expandOpts.reserve,
       lazy = expandOpts.lazy,
       accordion = expandOpts.accordion,
@@ -20320,7 +20596,7 @@ var Methods = {
       }
       if (accordion) {
         // 只能同时展开一个
-        rowExpandeds = [];
+        rExpandedMaps = {};
         rows = rows.slice(rows.length - 1, rows.length);
       }
       var validRows = toggleMethod ? rows.filter(function (row) {
@@ -20330,34 +20606,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 = 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 {
-        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().remove(rowExpandeds, function (row) {
-          return _this45.findRowIndexOf(validRows, row) > -1;
+        validRows.forEach(function (item) {
+          var rowid = 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);
   },
   /**
@@ -20365,28 +20645,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 = 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();
       }
     });
   },
@@ -20407,13 +20687,25 @@ var Methods = {
     }
   },
   getRowExpandRecords: function getRowExpandRecords() {
-    return this.rowExpandeds.slice(0);
+    var rest = [];
+    external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(this.rowExpandedMaps, function (item) {
+      if (item) {
+        rest.push(item);
+      }
+    });
+    return rest;
   },
   getTreeExpandRecords: function getTreeExpandRecords() {
-    return this.treeExpandeds.slice(0);
+    var rest = [];
+    external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(this.treeExpandedMaps, function (item) {
+      if (item) {
+        rest.push(item);
+      }
+    });
+    return rest;
   },
   /**
-   * 获取数表格状态
+   * 获取树表格状态
    */
   getTreeStatus: function getTreeStatus() {
     if (this.treeConfig) {
@@ -20434,16 +20726,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 = getRowid(this, row);
     var rest = fullAllDataRowMap.get(row);
     if (lazy && rest) {
       rest.treeLoaded = false;
-      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().remove(treeExpandeds, function (item) {
-        return row === item;
-      });
+      if (treeExpandedMaps[rowid]) {
+        delete treeExpandedMaps[rowid];
+      }
     }
     if (transform) {
       this.handleVirtualTreeToList();
@@ -20456,22 +20749,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,
-      hasChild = treeOpts.hasChild;
-    if (lazy && row[hasChild] && treeLazyLoadeds.indexOf(row) === -1) {
+      lazy = treeOpts.lazy;
+    var hasChildField = treeOpts.hasChild || treeOpts.hasChildField;
+    var rowid = 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();
@@ -20486,11 +20780,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 = getRowid(this, row);
+    if (!lazy || !treeExpandLazyLoadedMaps[rowid]) {
       var expanded = !this.isTreeExpandByRow(row);
       var columnIndex = this.getColumnIndex(column);
       var $columnIndex = this.getVMColumnIndex(column);
@@ -20520,6 +20815,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) {
@@ -20528,7 +20824,9 @@ var Methods = {
         expandRowKeys.forEach(function (rowid) {
           var matchObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findTree(tableFullData, function (item) {
             return rowid === external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(item, rowkey);
-          }, treeOpts);
+          }, {
+            children: childrenField
+          });
           if (matchObj) {
             defExpandeds.push(matchObj.item);
           }
@@ -20538,59 +20836,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;
-        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().remove(treeLazyLoadeds, function (item) {
-          return item === row;
-        });
-        if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_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 = 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 (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(childRecords)) {
+            childRecords = [];
+          }
+          if (childRecords) {
+            return _this46.loadTreeChildren(row, childRecords).then(function (childRows) {
+              var treeExpandedMaps = _this46.treeExpandedMaps;
+              var treeTempExpandedMaps = _objectSpread2({}, 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;
-        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().remove(treeLazyLoadeds, function (item) {
-          return item === row;
         });
-      })["finally"](function () {
-        _this48.$nextTick().then(function () {
-          return _this48.recalculate();
-        }).then(function () {
-          return resolve();
-        });
-      });
+      } else {
+        resolve();
+      }
     });
   },
   /**
@@ -20600,15 +20906,17 @@ var Methods = {
   setAllTreeExpand: function setAllTreeExpand(expanded) {
     var tableFullData = this.tableFullData,
       treeOpts = this.treeOpts;
-    var lazy = treeOpts.lazy,
-      children = treeOpts.children;
+    var lazy = treeOpts.lazy;
+    var childrenField = treeOpts.children || treeOpts.childrenField;
     var expandeds = [];
     external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(tableFullData, function (row) {
-      var rowChildren = row[children];
+      var rowChildren = row[childrenField];
       if (lazy || rowChildren && rowChildren.length) {
         expandeds.push(row);
       }
-    }, treeOpts);
+    }, {
+      children: childrenField
+    });
     return this.setTreeExpand(expandeds, expanded);
   },
   /**
@@ -20618,19 +20926,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,
-      hasChild = treeOpts.hasChild,
-      children = treeOpts.children,
       accordion = treeOpts.accordion,
       toggleMethod = treeOpts.toggleMethod;
+    var treeTempExpandedMaps = _objectSpread2({}, 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);
@@ -20648,38 +20957,48 @@ var Methods = {
       // 同一级只能展开一个
       var matchObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findTree(tableFullData, function (item) {
         return item === validRows[0];
-      }, treeOpts);
+      }, {
+        children: childrenField
+      });
       if (matchObj) {
-        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().remove(treeExpandeds, function (item) {
-          return matchObj.items.indexOf(item) > -1;
+        matchObj.items.forEach(function (item) {
+          var rowid = getRowid(_this47, item);
+          if (treeTempExpandedMaps[rowid]) {
+            delete treeTempExpandedMaps[rowid];
+          }
         });
       }
     }
     if (expanded) {
       validRows.forEach(function (row) {
-        if (treeExpandeds.indexOf(row) === -1) {
+        var rowid = getRowid(_this47, row);
+        if (!treeTempExpandedMaps[rowid]) {
           var rest = fullAllDataRowMap.get(row);
-          var isLoad = lazy && row[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[children] && row[children].length) {
-              treeExpandeds.push(row);
+            if (row[childrenField] && row[childrenField].length) {
+              treeTempExpandedMaps[rowid] = row;
             }
           }
         }
       });
     } else {
-      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().remove(treeExpandeds, function (row) {
-        return validRows.indexOf(row) > -1;
+      validRows.forEach(function (item) {
+        var rowid = 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);
   },
   /**
@@ -20689,12 +21008,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();
     });
   },
   /**
@@ -20727,33 +21046,36 @@ var Methods = {
    * @param {Row} row 行对象
    */
   isTreeExpandByRow: function isTreeExpandByRow(row) {
-    return this.treeExpandeds.indexOf(row) > -1;
+    var treeExpandedMaps = this.treeExpandedMaps;
+    return !!treeExpandedMaps[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) {
       external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_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();
       }
     });
   },
@@ -20872,28 +21194,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 ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(sXOpts.oSize) : browse.msie ? 10 : 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;
@@ -20902,12 +21224,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() {
@@ -20917,11 +21239,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 可视渲染上下剩余空间大小
@@ -20972,11 +21294,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 可视渲染上下剩余空间大小
@@ -21017,7 +21339,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,
@@ -21034,7 +21356,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);
       });
     }
@@ -21076,26 +21398,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 = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_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 rowToVisible(_this56, row);
+      return rowToVisible(_this54, row);
     });
   },
   /**
@@ -21150,30 +21475,30 @@ var Methods = {
    * 如果单元格配置了校验规则，则会进行校验
    */
   updateStatus: function updateStatus(slotParams, cellValue) {
-    var _this57 = this;
+    var _this55 = this;
     var customVal = !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_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,
@@ -21193,13 +21518,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) {
       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();
     });
   },
   /**
@@ -21207,13 +21532,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) {
       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;
     });
   },
@@ -21234,23 +21559,23 @@ var Methods = {
     this.setMergeFooterItems(this.mergeFooterItems);
   },
   setMergeFooterItems: function setMergeFooterItems(merges) {
-    var _this60 = this;
+    var _this58 = this;
     if (this.footerSpanMethod) {
       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) {
       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;
     });
   },
@@ -21350,10 +21675,10 @@ var Methods = {
       };
       if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(formatter)) {
         var gFormatOpts = formats.get(formatter);
-        cellLabel = gFormatOpts && gFormatOpts.formatMethod ? gFormatOpts.formatMethod(formatParams) : '';
+        cellLabel = gFormatOpts && gFormatOpts.cellFormatMethod ? gFormatOpts.cellFormatMethod(formatParams) : '';
       } else if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(formatter)) {
         var _gFormatOpts = formats.get(formatter[0]);
-        cellLabel = _gFormatOpts && _gFormatOpts.formatMethod ? _gFormatOpts.formatMethod.apply(_gFormatOpts, [formatParams].concat(_toConsumableArray(formatter.slice(1)))) : '';
+        cellLabel = _gFormatOpts && _gFormatOpts.cellFormatMethod ? _gFormatOpts.cellFormatMethod.apply(_gFormatOpts, [formatParams].concat(_toConsumableArray(formatter.slice(1)))) : '';
       } else {
         cellLabel = formatter(formatParams);
       }
@@ -21367,9 +21692,9 @@ var Methods = {
     return cellLabel;
   },
   findRowIndexOf: function findRowIndexOf(list, row) {
-    var _this62 = this;
+    var _this60 = this;
     return row ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findIndexOf(list, function (item) {
-      return _this62.eqRow(item, row);
+      return _this60.eqRow(item, row);
     }) : -1;
   },
   eqRow: function eqRow(row1, row2) {
@@ -21390,7 +21715,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 (false) {}
@@ -21899,14 +22224,14 @@ function handleUupdateResize(_vm) {
       isAllSelected: false,
       // 复选框属性，有选中且非全选状态
       isIndeterminate: false,
-      // 复选框属性，已选中的行
-      selectCheckboxRows: [],
+      // 复选框属性，已选中的行集合
+      selectCheckboxMaps: {},
       // 当前行
       currentRow: null,
       // 单选框属性，选中列
       currentColumn: null,
       // 单选框属性，选中行
-      selectRow: null,
+      selectRadioRow: null,
       // 表尾合计数据
       footerTableData: [],
       // 展开列信息
@@ -21914,16 +22239,16 @@ function handleUupdateResize(_vm) {
       hasFixedColumn: false,
       // 树节点列信息
       treeNodeColumn: null,
-      // 已展开的行
-      rowExpandeds: [],
-      // 懒加载中的展开行的列表
-      expandLazyLoadeds: [],
-      // 已展开树节点
-      treeExpandeds: [],
-      // 懒加载中的树节点的列表
-      treeLazyLoadeds: [],
-      // 树节点不确定状态的列表
-      treeIndeterminates: [],
+      // 已展开的行集合
+      rowExpandedMaps: {},
+      // 懒加载中的展开行的集合
+      rowExpandLazyLoadedMaps: {},
+      // 已展开树节点集合
+      treeExpandedMaps: {},
+      // 懒加载中的树节点的集合
+      treeExpandLazyLoadedMaps: {},
+      // 树节点不确定状态的集合
+      treeIndeterminateMaps: {},
       // 合并单元格的对象集
       mergeList: [],
       // 合并表尾数据的对象集
@@ -22386,6 +22711,8 @@ function handleUupdateResize(_vm) {
         // 完整数据、条件处理后
         tableFullData: [],
         afterFullData: [],
+        // 列表条件处理后数据集合
+        afterFullRowMaps: {},
         // 收集的列配置（带分组）
         collectColumn: [],
         // 完整所有列（不带分组）
@@ -22542,7 +22869,7 @@ function handleUupdateResize(_vm) {
     var leftList = columnStore.leftList,
       rightList = columnStore.rightList;
     return h('div', {
-      "class": ['vxe-table', 'vxe-table--render-default', "tid_".concat(tId), vSize ? "size--".concat(vSize) : '', "border--".concat(tableBorder), (_ref = {}, _defineProperty(_ref, "vaild-msg--".concat(validOpts.msgMode), !!editRules), _defineProperty(_ref, 'vxe-editable', !!editConfig), _defineProperty(_ref, 'cell--highlight', highlightCell), _defineProperty(_ref, 'cell--selected', mouseConfig && mouseOpts.selected), _defineProperty(_ref, 'cell--area', mouseConfig && mouseOpts.area), _defineProperty(_ref, 'row--highlight', rowOpts.isHover || highlightHoverRow), _defineProperty(_ref, 'column--highlight', columnOpts.isHover || highlightHoverColumn), _defineProperty(_ref, 'is--header', showHeader), _defineProperty(_ref, 'is--footer', showFooter), _defineProperty(_ref, 'is--group', isGroup), _defineProperty(_ref, 'is--tree-line', treeConfig && treeOpts.line), _defineProperty(_ref, 'is--fixed-left', leftList.length), _defineProperty(_ref, 'is--fixed-right', rightList.length), _defineProperty(_ref, 'is--animat', !!this.animat), _defineProperty(_ref, 'is--round', this.round), _defineProperty(_ref, 'is--stripe', !treeConfig && stripe), _defineProperty(_ref, 'is--loading', loading), _defineProperty(_ref, 'is--empty', !loading && !tableData.length), _defineProperty(_ref, 'is--scroll-y', overflowY), _defineProperty(_ref, 'is--scroll-x', overflowX), _defineProperty(_ref, 'is--virtual-x', scrollXLoad), _defineProperty(_ref, 'is--virtual-y', scrollYLoad), _ref)],
+      "class": ['vxe-table', 'vxe-table--render-default', "tid_".concat(tId), vSize ? "size--".concat(vSize) : '', "border--".concat(tableBorder), (_ref = {}, _defineProperty(_ref, "vaild-msg--".concat(validOpts.msgMode), !!editRules), _defineProperty(_ref, 'vxe-editable', !!editConfig), _defineProperty(_ref, 'cell--highlight', highlightCell), _defineProperty(_ref, 'cell--selected', mouseConfig && mouseOpts.selected), _defineProperty(_ref, 'cell--area', mouseConfig && mouseOpts.area), _defineProperty(_ref, 'row--highlight', rowOpts.isHover || highlightHoverRow), _defineProperty(_ref, 'column--highlight', columnOpts.isHover || highlightHoverColumn), _defineProperty(_ref, 'is--header', showHeader), _defineProperty(_ref, 'is--footer', showFooter), _defineProperty(_ref, 'is--group', isGroup), _defineProperty(_ref, 'is--tree-line', treeConfig && (treeOpts.showLine || treeOpts.line)), _defineProperty(_ref, 'is--fixed-left', leftList.length), _defineProperty(_ref, 'is--fixed-right', rightList.length), _defineProperty(_ref, 'is--animat', !!this.animat), _defineProperty(_ref, 'is--round', this.round), _defineProperty(_ref, 'is--stripe', !treeConfig && stripe), _defineProperty(_ref, 'is--loading', loading), _defineProperty(_ref, 'is--empty', !loading && !tableData.length), _defineProperty(_ref, 'is--scroll-y', overflowY), _defineProperty(_ref, 'is--scroll-x', overflowX), _defineProperty(_ref, 'is--virtual-x', scrollXLoad), _defineProperty(_ref, 'is--virtual-y', scrollYLoad), _ref)],
       on: {
         keydown: this.keydownEvent
       }
@@ -23750,6 +24077,7 @@ var es_array_unshift = __webpack_require__(541);
 
 
 
+
 
 
 function insertTreeRow(_vm, newRecords, isAppend) {
@@ -23760,8 +24088,8 @@ function insertTreeRow(_vm, newRecords, isAppend) {
     treeOpts = _vm.treeOpts;
   var rowField = treeOpts.rowField,
     parentField = treeOpts.parentField,
-    children = treeOpts.children,
-    mapChildren = treeOpts.mapChildren;
+    mapChildrenField = treeOpts.mapChildrenField;
+  var childrenField = treeOpts.children || treeOpts.childrenField;
   var funcName = isAppend ? 'push' : 'unshift';
   newRecords.forEach(function (item) {
     var parentRowId = item[parentField];
@@ -23769,17 +24097,22 @@ function insertTreeRow(_vm, newRecords, isAppend) {
     var matchObj = parentRowId ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findTree(tableFullTreeData, function (item) {
       return parentRowId === item[rowField];
     }, {
-      children: mapChildren
+      children: mapChildrenField
     }) : null;
     if (matchObj) {
       var parentRow = matchObj.item;
       var parentRest = fullAllDataRowIdData[getRowid(_vm, parentRow)];
       var parentLevel = parentRest ? parentRest.level : 0;
-      var parentChilds = parentRow[children];
+      var parentChilds = parentRow[childrenField];
+      var mapChilds = parentRow[mapChildrenField];
       if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(parentChilds)) {
-        parentChilds = parentRow[children] = [];
+        parentChilds = parentRow[childrenField] = [];
+      }
+      if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(mapChilds)) {
+        mapChilds = parentRow[childrenField] = [];
       }
       parentChilds[funcName](item);
+      mapChilds[funcName](item);
       var rest = {
         row: item,
         rowid: rowid,
@@ -23813,6 +24146,181 @@ function insertTreeRow(_vm, newRecords, isAppend) {
     }
   });
 }
+function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
+  var tableFullTreeData = _vm.tableFullTreeData,
+    mergeList = _vm.mergeList,
+    afterFullData = _vm.afterFullData,
+    editStore = _vm.editStore,
+    tableFullData = _vm.tableFullData,
+    treeConfig = _vm.treeConfig,
+    fullDataRowIdData = _vm.fullDataRowIdData,
+    fullAllDataRowIdData = _vm.fullAllDataRowIdData,
+    treeOpts = _vm.treeOpts;
+  var transform = treeOpts.transform,
+    rowField = treeOpts.rowField,
+    mapChildrenField = treeOpts.mapChildrenField;
+  var childrenField = treeOpts.children || treeOpts.childrenField;
+  if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(records)) {
+    records = [records];
+  }
+  var newRecords = _vm.defineField(records.map(function (record) {
+    var _ref;
+    return Object.assign(treeConfig && transform ? (_ref = {}, _defineProperty(_ref, mapChildrenField, []), _defineProperty(_ref, childrenField, []), _ref) : {}, record);
+  }));
+  if (!row) {
+    // 如果为虚拟树
+    if (treeConfig && transform) {
+      insertTreeRow(_vm, newRecords, false);
+    } else {
+      afterFullData.unshift.apply(afterFullData, _toConsumableArray(newRecords));
+      tableFullData.unshift.apply(tableFullData, _toConsumableArray(newRecords));
+      // 刷新单元格合并
+      mergeList.forEach(function (mergeItem) {
+        var mergeRowIndex = mergeItem.row;
+        if (mergeRowIndex > 0) {
+          mergeItem.row = mergeRowIndex + newRecords.length;
+        }
+      });
+    }
+  } else {
+    if (row === -1) {
+      // 如果为虚拟树
+      if (treeConfig && transform) {
+        insertTreeRow(_vm, newRecords, true);
+      } else {
+        afterFullData.push.apply(afterFullData, _toConsumableArray(newRecords));
+        tableFullData.push.apply(tableFullData, _toConsumableArray(newRecords));
+        // 刷新单元格合并
+        mergeList.forEach(function (mergeItem) {
+          var mergeRowIndex = mergeItem.row,
+            mergeRowspan = mergeItem.rowspan;
+          if (mergeRowIndex + mergeRowspan > afterFullData.length) {
+            mergeItem.rowspan = mergeRowspan + newRecords.length;
+          }
+        });
+      }
+    } else {
+      // 如果为虚拟树
+      if (treeConfig && transform) {
+        var matchMapObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findTree(tableFullTreeData, function (item) {
+          return row[rowField] === item[rowField];
+        }, {
+          children: mapChildrenField
+        });
+        if (matchMapObj) {
+          var parentRow = matchMapObj.parent;
+          var parentMapChilds = parentRow ? parentRow[mapChildrenField] : tableFullTreeData;
+          var parentRest = fullAllDataRowIdData[getRowid(_vm, parentRow)];
+          var parentLevel = parentRest ? parentRest.level : 0;
+          newRecords.forEach(function (item, i) {
+            var rowid = getRowid(_vm, item);
+            if (false) {}
+            if (parentRow) {
+              item[treeOpts.parentField] = parentRow[rowField];
+            }
+            var targetIndex = matchMapObj.index + i;
+            if (isInsertNextRow) {
+              targetIndex = targetIndex + 1;
+            }
+            parentMapChilds.splice(targetIndex, 0, item);
+            var rest = {
+              row: item,
+              rowid: rowid,
+              seq: -1,
+              index: -1,
+              _index: -1,
+              $index: -1,
+              items: parentMapChilds,
+              parent: parentRow,
+              level: parentLevel + 1
+            };
+            fullDataRowIdData[rowid] = rest;
+            fullAllDataRowIdData[rowid] = rest;
+          });
+
+          // 源
+          if (parentRow) {
+            var matchObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findTree(tableFullTreeData, function (item) {
+              return row[rowField] === item[rowField];
+            }, {
+              children: childrenField
+            });
+            if (matchObj) {
+              var parentChilds = matchObj.items;
+              var targetIndex = matchObj.index;
+              if (isInsertNextRow) {
+                targetIndex = targetIndex + 1;
+              }
+              parentChilds.splice.apply(parentChilds, [targetIndex, 0].concat(_toConsumableArray(newRecords)));
+            }
+          }
+        } else {
+          if (false) {}
+          insertTreeRow(_vm, newRecords, true);
+        }
+      } else {
+        if (treeConfig) {
+          throw new Error(getLog('vxe.error.noTree', ['insert']));
+        }
+        var afIndex = -1;
+        // 如果是可视索引
+        if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(row)) {
+          if (row < afterFullData.length) {
+            afIndex = row;
+          }
+        } else {
+          afIndex = _vm.findRowIndexOf(afterFullData, row);
+        }
+        // 如果是插入指定行的下一行
+        if (isInsertNextRow) {
+          afIndex = Math.max(afterFullData.length, afIndex + 1);
+        }
+        if (afIndex === -1) {
+          throw new Error(errLog('vxe.error.unableInsert'));
+        }
+        afterFullData.splice.apply(afterFullData, [afIndex, 0].concat(_toConsumableArray(newRecords)));
+        tableFullData.splice.apply(tableFullData, [_vm.findRowIndexOf(tableFullData, row), 0].concat(_toConsumableArray(newRecords)));
+        // 刷新单元格合并
+        mergeList.forEach(function (mergeItem) {
+          var mergeRowIndex = mergeItem.row,
+            mergeRowspan = mergeItem.rowspan;
+          if (mergeRowIndex > afIndex) {
+            mergeItem.row = mergeRowIndex + newRecords.length;
+          } else if (mergeRowIndex + mergeRowspan > afIndex) {
+            mergeItem.rowspan = mergeRowspan + newRecords.length;
+          }
+        });
+      }
+    }
+  }
+  var insertList = editStore.insertList,
+    insertMaps = editStore.insertMaps;
+  newRecords.forEach(function (newRow) {
+    var rowid = getRowid(_vm, newRow);
+    insertMaps[rowid] = newRow;
+  });
+  insertList.unshift.apply(insertList, _toConsumableArray(newRecords));
+  _vm.cacheRowMap();
+  _vm.updateScrollYStatus();
+  _vm.handleTableData(treeConfig && transform);
+  if (!(treeConfig && transform)) {
+    _vm.updateAfterDataIndex();
+  }
+  _vm.updateFooter();
+  _vm.checkSelectionStatus();
+  if (_vm.scrollYLoad) {
+    _vm.updateScrollYSpace();
+  }
+  return _vm.$nextTick().then(function () {
+    _vm.updateCellAreas();
+    return _vm.recalculate();
+  }).then(function () {
+    return {
+      row: newRecords.length ? newRecords[newRecords.length - 1] : null,
+      rows: newRecords
+    };
+  });
+}
 /* harmony default export */ const edit_src_mixin = ({
   methods: {
     /**
@@ -23821,7 +24329,7 @@ function insertTreeRow(_vm, newRecords, isAppend) {
      * @param {*} records
      */
     _insert: function _insert(records) {
-      return this.insertAt(records);
+      return handleInsertRowAt(this, records, null);
     },
     /**
      * 往表格指定行中插入临时数据
@@ -23830,155 +24338,13 @@ function insertTreeRow(_vm, newRecords, isAppend) {
      * 如果 row 为有效行则插入到该行的位置
      * @param {Object/Array} records 新的数据
      * @param {Row} row 指定行
+     * @returns
      */
     _insertAt: function _insertAt(records, row) {
-      var _this = this;
-      var tableFullTreeData = this.tableFullTreeData,
-        mergeList = this.mergeList,
-        afterFullData = this.afterFullData,
-        editStore = this.editStore,
-        tableFullData = this.tableFullData,
-        treeConfig = this.treeConfig,
-        fullDataRowIdData = this.fullDataRowIdData,
-        fullAllDataRowIdData = this.fullAllDataRowIdData,
-        treeOpts = this.treeOpts;
-      var transform = treeOpts.transform,
-        rowField = treeOpts.rowField,
-        mapChildren = treeOpts.mapChildren;
-      if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(records)) {
-        records = [records];
-      }
-      var newRecords = this.defineField(records.map(function (record) {
-        return Object.assign({}, record);
-      }));
-      if (!row) {
-        // 如果为虚拟树
-        if (treeConfig && transform) {
-          insertTreeRow(this, newRecords, false);
-        } else {
-          afterFullData.unshift.apply(afterFullData, _toConsumableArray(newRecords));
-          tableFullData.unshift.apply(tableFullData, _toConsumableArray(newRecords));
-          // 刷新单元格合并
-          mergeList.forEach(function (mergeItem) {
-            var mergeRowIndex = mergeItem.row;
-            if (mergeRowIndex > 0) {
-              mergeItem.row = mergeRowIndex + newRecords.length;
-            }
-          });
-        }
-      } else {
-        if (row === -1) {
-          // 如果为虚拟树
-          if (treeConfig && transform) {
-            insertTreeRow(this, newRecords, true);
-          } else {
-            afterFullData.push.apply(afterFullData, _toConsumableArray(newRecords));
-            tableFullData.push.apply(tableFullData, _toConsumableArray(newRecords));
-            // 刷新单元格合并
-            mergeList.forEach(function (mergeItem) {
-              var mergeRowIndex = mergeItem.row,
-                mergeRowspan = mergeItem.rowspan;
-              if (mergeRowIndex + mergeRowspan > afterFullData.length) {
-                mergeItem.rowspan = mergeRowspan + newRecords.length;
-              }
-            });
-          }
-        } else {
-          // 如果为虚拟树
-          if (treeConfig && transform) {
-            var matchObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findTree(tableFullTreeData, function (item) {
-              return row[rowField] === item[rowField];
-            }, {
-              children: mapChildren
-            });
-            if (matchObj) {
-              var parentRow = matchObj.parent;
-              var parentChilds = matchObj.items;
-              var parentRest = fullAllDataRowIdData[getRowid(this, parentRow)];
-              var parentLevel = parentRest ? parentRest.level : 0;
-              newRecords.forEach(function (item, i) {
-                var rowid = getRowid(_this, item);
-                if (false) {}
-                if (parentRow) {
-                  item[treeOpts.parentField] = parentRow[rowField];
-                }
-                parentChilds.splice(matchObj.index + i, 0, item);
-                var rest = {
-                  row: item,
-                  rowid: rowid,
-                  seq: -1,
-                  index: -1,
-                  _index: -1,
-                  $index: -1,
-                  items: parentChilds,
-                  parent: parentRow,
-                  level: parentLevel + 1
-                };
-                fullDataRowIdData[rowid] = rest;
-                fullAllDataRowIdData[rowid] = rest;
-              });
-            } else {
-              if (false) {}
-              insertTreeRow(this, newRecords, true);
-            }
-          } else {
-            if (treeConfig) {
-              throw new Error(getLog('vxe.error.noTree', ['insert']));
-            }
-            var afIndex = -1;
-            // 如果是可视索引
-            if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(row)) {
-              if (row < afterFullData.length) {
-                afIndex = row;
-              }
-            } else {
-              afIndex = this.findRowIndexOf(afterFullData, row);
-            }
-            if (afIndex === -1) {
-              throw new Error(errLog('vxe.error.unableInsert'));
-            }
-            afterFullData.splice.apply(afterFullData, [afIndex, 0].concat(_toConsumableArray(newRecords)));
-            tableFullData.splice.apply(tableFullData, [this.findRowIndexOf(tableFullData, row), 0].concat(_toConsumableArray(newRecords)));
-            // 刷新单元格合并
-            mergeList.forEach(function (mergeItem) {
-              var mergeRowIndex = mergeItem.row,
-                mergeRowspan = mergeItem.rowspan;
-              if (mergeRowIndex > afIndex) {
-                mergeItem.row = mergeRowIndex + newRecords.length;
-              } else if (mergeRowIndex + mergeRowspan > afIndex) {
-                mergeItem.rowspan = mergeRowspan + newRecords.length;
-              }
-            });
-          }
-        }
-      }
-      var insertList = editStore.insertList,
-        insertMaps = editStore.insertMaps;
-      newRecords.forEach(function (newRow) {
-        var rowid = getRowid(_this, newRow);
-        insertMaps[rowid] = newRow;
-      });
-      insertList.unshift.apply(insertList, _toConsumableArray(newRecords));
-      this.cacheRowMap();
-      this.updateScrollYStatus();
-      this.handleTableData(treeConfig && transform);
-      if (!(treeConfig && transform)) {
-        this.updateAfterDataIndex();
-      }
-      this.updateFooter();
-      this.checkSelectionStatus();
-      if (this.scrollYLoad) {
-        this.updateScrollYSpace();
-      }
-      return this.$nextTick().then(function () {
-        _this.updateCellAreas();
-        return _this.recalculate();
-      }).then(function () {
-        return {
-          row: newRecords.length ? newRecords[newRecords.length - 1] : null,
-          rows: newRecords
-        };
-      });
+      return handleInsertRowAt(this, records, row);
+    },
+    _insertNextAt: function _insertNextAt(records, row) {
+      return handleInsertRowAt(this, records, row, true);
     },
     /**
      * 删除指定行数据
@@ -23987,7 +24353,7 @@ function insertTreeRow(_vm, newRecords, isAppend) {
      * 如果为空则删除所有
      */
     _remove: function _remove(rows) {
-      var _this2 = this;
+      var _this = this;
       var afterFullData = this.afterFullData,
         tableFullData = this.tableFullData,
         tableFullTreeData = this.tableFullTreeData,
@@ -23995,16 +24361,18 @@ function insertTreeRow(_vm, newRecords, isAppend) {
         mergeList = this.mergeList,
         editStore = this.editStore,
         checkboxOpts = this.checkboxOpts,
-        selectCheckboxRows = this.selectCheckboxRows,
+        selectCheckboxMaps = this.selectCheckboxMaps,
         isInsertByRow = this.isInsertByRow,
         treeOpts = this.treeOpts;
-      var transform = treeOpts.transform;
+      var transform = treeOpts.transform,
+        mapChildrenField = treeOpts.mapChildrenField;
+      var childrenField = treeOpts.children || treeOpts.childrenField;
       var actived = editStore.actived,
         removeList = editStore.removeList,
         insertList = editStore.insertList,
         insertMaps = editStore.insertMaps;
       var checkField = checkboxOpts.checkField;
-      var rest = [];
+      var delList = [];
       if (!rows) {
         rows = tableFullData;
       } else if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(rows)) {
@@ -24018,16 +24386,18 @@ function insertTreeRow(_vm, newRecords, isAppend) {
       });
       // 如果绑定了多选属性，则更新状态
       if (!checkField) {
+        var selectRowMaps = _objectSpread2({}, selectCheckboxMaps);
         rows.forEach(function (row) {
-          var sIndex = _this2.findRowIndexOf(selectCheckboxRows, row);
-          if (sIndex > -1) {
-            selectCheckboxRows.splice(sIndex, 1);
+          var rowid = getRowid(_this, row);
+          if (selectRowMaps[rowid]) {
+            delete selectRowMaps[rowid];
           }
         });
+        this.selectCheckboxMaps = selectRowMaps;
       }
       // 从数据源中移除
       if (tableFullData === rows) {
-        rows = rest = tableFullData.slice(0);
+        rows = delList = tableFullData.slice(0);
         this.tableFullData = [];
         this.afterFullData = [];
         this.clearMergeCells();
@@ -24035,27 +24405,37 @@ function insertTreeRow(_vm, newRecords, isAppend) {
         // 如果为虚拟树
         if (treeConfig && transform) {
           rows.forEach(function (row) {
-            var rowid = getRowid(_this2, row);
+            var rowid = getRowid(_this, row);
+            var matchMapObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findTree(tableFullTreeData, function (item) {
+              return rowid === getRowid(_this, item);
+            }, {
+              children: mapChildrenField
+            });
+            if (matchMapObj) {
+              var rItems = matchMapObj.items.splice(matchMapObj.index, 1);
+              delList.push(rItems[0]);
+            }
             var matchObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findTree(tableFullTreeData, function (item) {
-              return rowid === getRowid(_this2, item);
-            }, treeOpts);
+              return rowid === getRowid(_this, item);
+            }, {
+              children: childrenField
+            });
             if (matchObj) {
-              var rItems = matchObj.items.splice(matchObj.index, 1);
-              rest.push(rItems[0]);
+              matchObj.items.splice(matchObj.index, 1);
             }
-            var afIndex = _this2.findRowIndexOf(afterFullData, row);
+            var afIndex = _this.findRowIndexOf(afterFullData, row);
             if (afIndex > -1) {
               afterFullData.splice(afIndex, 1);
             }
           });
         } else {
           rows.forEach(function (row) {
-            var tfIndex = _this2.findRowIndexOf(tableFullData, row);
+            var tfIndex = _this.findRowIndexOf(tableFullData, row);
             if (tfIndex > -1) {
               var rItems = tableFullData.splice(tfIndex, 1);
-              rest.push(rItems[0]);
+              delList.push(rItems[0]);
             }
-            var afIndex = _this2.findRowIndexOf(afterFullData, row);
+            var afIndex = _this.findRowIndexOf(afterFullData, row);
             if (afIndex > -1) {
               // 刷新单元格合并
               mergeList.forEach(function (mergeItem) {
@@ -24078,8 +24458,8 @@ function insertTreeRow(_vm, newRecords, isAppend) {
       }
       // 从新增中移除已删除的数据
       rows.forEach(function (row) {
-        var rowid = getRowid(_this2, row);
-        var iIndex = _this2.findRowIndexOf(insertList, row);
+        var rowid = getRowid(_this, row);
+        var iIndex = _this.findRowIndexOf(insertList, row);
         if (iIndex > -1) {
           insertList.splice(iIndex, 1);
         }
@@ -24096,12 +24476,12 @@ function insertTreeRow(_vm, newRecords, isAppend) {
         this.updateScrollYSpace();
       }
       return this.$nextTick().then(function () {
-        _this2.updateCellAreas();
-        return _this2.recalculate();
+        _this.updateCellAreas();
+        return _this.recalculate();
       }).then(function () {
         return {
-          row: rest.length ? rest[rest.length - 1] : null,
-          rows: rest
+          row: delList.length ? delList[delList.length - 1] : null,
+          rows: delList
         };
       });
     },
@@ -24109,9 +24489,9 @@ function insertTreeRow(_vm, newRecords, isAppend) {
      * 删除复选框选中的数据
      */
     _removeCheckboxRow: function _removeCheckboxRow() {
-      var _this3 = this;
+      var _this2 = this;
       return this.remove(this.getCheckboxRecords()).then(function (params) {
-        _this3.clearCheckboxRow();
+        _this2.clearCheckboxRow();
         return params;
       });
     },
@@ -24119,10 +24499,10 @@ function insertTreeRow(_vm, newRecords, isAppend) {
      * 删除单选框选中的数据
      */
     _removeRadioRow: function _removeRadioRow() {
-      var _this4 = this;
+      var _this3 = this;
       var radioRecord = this.getRadioRecord();
       return this.remove(radioRecord || []).then(function (params) {
-        _this4.clearRadioRow();
+        _this3.clearRadioRow();
         return params;
       });
     },
@@ -24130,10 +24510,10 @@ function insertTreeRow(_vm, newRecords, isAppend) {
      * 删除当前行选中的数据
      */
     _removeCurrentRow: function _removeCurrentRow() {
-      var _this5 = this;
+      var _this4 = this;
       var currentRecord = this.getCurrentRecord();
       return this.remove(currentRecord || []).then(function (params) {
-        _this5.clearCurrentRow();
+        _this4.clearCurrentRow();
         return params;
       });
     },
@@ -24151,12 +24531,12 @@ function insertTreeRow(_vm, newRecords, isAppend) {
      * 获取新增的临时数据
      */
     _getInsertRecords: function _getInsertRecords() {
-      var _this6 = this;
+      var _this5 = this;
       var fullAllDataRowIdData = this.fullAllDataRowIdData;
       var insertList = this.editStore.insertList;
       var insertRecords = [];
       insertList.forEach(function (row) {
-        var rowid = getRowid(_this6, row);
+        var rowid = getRowid(_this5, row);
         if (fullAllDataRowIdData[rowid]) {
           insertRecords.push(row);
         }
@@ -24203,7 +24583,7 @@ function insertTreeRow(_vm, newRecords, isAppend) {
      * 处理激活编辑
      */
     handleActived: function handleActived(params, evnt) {
-      var _this7 = this;
+      var _this6 = this;
       var editStore = this.editStore,
         editOpts = this.editOpts,
         tableColumn = this.tableColumn,
@@ -24239,13 +24619,13 @@ function insertTreeRow(_vm, newRecords, isAppend) {
             actived.column = column;
             if (mode === 'row') {
               tableColumn.forEach(function (column) {
-                return _this7._getColumnModel(row, column);
+                return _this6._getColumnModel(row, column);
               });
             } else {
               this._getColumnModel(row, column);
             }
             this.$nextTick(function () {
-              _this7.handleFocus(params, evnt);
+              _this6.handleFocus(params, evnt);
             });
           }
           this.emitEvent(type, {
@@ -24274,7 +24654,7 @@ function insertTreeRow(_vm, newRecords, isAppend) {
           actived.args = params;
           actived.column = column;
           setTimeout(function () {
-            _this7.handleFocus(params, evnt);
+            _this6.handleFocus(params, evnt);
           });
         }
         this.focus();
@@ -24299,7 +24679,7 @@ function insertTreeRow(_vm, newRecords, isAppend) {
       }
     },
     _syncActivedCell: function _syncActivedCell() {
-      var _this8 = this;
+      var _this7 = this;
       var tableColumn = this.tableColumn,
         editStore = this.editStore,
         editOpts = this.editOpts;
@@ -24309,7 +24689,7 @@ function insertTreeRow(_vm, newRecords, isAppend) {
       if (row || column) {
         if (editOpts.mode === 'row') {
           tableColumn.forEach(function (column) {
-            return _this8._setColumnModel(row, column);
+            return _this7._setColumnModel(row, column);
           });
         } else {
           this._setColumnModel(row, column);
@@ -24452,22 +24832,22 @@ function insertTreeRow(_vm, newRecords, isAppend) {
      * 激活单元格编辑
      */
     _setEditCell: function _setEditCell(row, fieldOrColumn) {
-      var _this9 = this;
+      var _this8 = this;
       var editConfig = this.editConfig;
       var column = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(fieldOrColumn) ? this.getColumnByField(fieldOrColumn) : fieldOrColumn;
       if (row && column && isEnableConf(editConfig) && isEnableConf(column.editRender)) {
         return this.scrollToRow(row, true).then(function () {
-          var cell = _this9.getCell(row, column);
+          var cell = _this8.getCell(row, column);
           if (cell) {
-            _this9.handleActived({
+            _this8.handleActived({
               row: row,
-              rowIndex: _this9.getRowIndex(row),
+              rowIndex: _this8.getRowIndex(row),
               column: column,
-              columnIndex: _this9.getColumnIndex(column),
+              columnIndex: _this8.getColumnIndex(column),
               cell: cell,
-              $table: _this9
+              $table: _this8
             });
-            _this9.lastCallTime = Date.now();
+            _this8.lastCallTime = Date.now();
           }
         });
       }
@@ -24501,7 +24881,7 @@ function insertTreeRow(_vm, newRecords, isAppend) {
      * 处理选中源
      */
     handleSelected: function handleSelected(params, evnt) {
-      var _this10 = this;
+      var _this9 = this;
       var mouseConfig = this.mouseConfig,
         mouseOpts = this.mouseOpts,
         editOpts = this.editOpts,
@@ -24514,23 +24894,23 @@ function insertTreeRow(_vm, newRecords, isAppend) {
       var selectMethod = function selectMethod() {
         if (isMouseSelected && (selected.row !== row || selected.column !== column)) {
           if (actived.row !== row || (editOpts.mode === 'cell' ? actived.column !== column : false)) {
-            _this10.clearActived(evnt);
-            _this10.clearSelected(evnt);
-            _this10.clearCellAreas(evnt);
-            _this10.clearCopyCellArea(evnt);
+            _this9.clearActived(evnt);
+            _this9.clearSelected(evnt);
+            _this9.clearCellAreas(evnt);
+            _this9.clearCopyCellArea(evnt);
             selected.args = params;
             selected.row = row;
             selected.column = column;
             if (isMouseSelected) {
-              _this10.addColSdCls();
+              _this9.addColSdCls();
             }
-            _this10.focus();
+            _this9.focus();
             if (evnt) {
-              _this10.emitEvent('cell-selected', params, evnt);
+              _this9.emitEvent('cell-selected', params, evnt);
             }
           }
         }
-        return _this10.$nextTick();
+        return _this9.$nextTick();
       };
       return selectMethod();
     },
@@ -26428,6 +26808,9 @@ function renderExtraSuffixIcon(h, _vm) {
       }
     },
     multiple: Boolean,
+    // text
+    showWordCount: Boolean,
+    countMethod: Function,
     // number、integer、float
     min: {
       type: [String, Number],
@@ -26570,6 +26953,12 @@ function renderExtraSuffixIcon(h, _vm) {
     isSearch: function isSearch() {
       return this.type === 'search';
     },
+    inputCount: function inputCount() {
+      return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().getSize(this.inputValue);
+    },
+    isCountError: function isCountError() {
+      return this.maxlength && this.inputCount > external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(this.maxlength);
+    },
     stepValue: function stepValue() {
       var type = this.type,
         step = this.step;
@@ -27034,6 +27423,8 @@ function renderExtraSuffixIcon(h, _vm) {
       inpReadonly = this.inpReadonly,
       className = this.className,
       controls = this.controls,
+      showWordCount = this.showWordCount,
+      countMethod = this.countMethod,
       inputValue = this.inputValue,
       isDatePickerType = this.isDatePickerType,
       visiblePanel = this.visiblePanel,
@@ -27089,8 +27480,20 @@ function renderExtraSuffixIcon(h, _vm) {
     if (isDatePickerType) {
       childs.push(renderPanel(h, this));
     }
+    var isWordCount = false;
+    // 统计字数
+    if (showWordCount && ['text', 'search'].includes(type)) {
+      isWordCount = true;
+      childs.push(h('span', {
+        "class": ['vxe-input--count', {
+          'is--error': this.isCountError
+        }]
+      }, countMethod ? "".concat(countMethod({
+        value: inputValue
+      })) : "".concat(this.inputCount).concat(inpMaxlength ? "/".concat(inpMaxlength) : '')));
+    }
     return h('div', {
-      "class": ['vxe-input', "type--".concat(type), className, (_ref2 = {}, _defineProperty(_ref2, "size--".concat(vSize), vSize), _defineProperty(_ref2, "is--".concat(align), align), _defineProperty(_ref2, 'is--controls', controls), _defineProperty(_ref2, 'is--prefix', !!prefix), _defineProperty(_ref2, 'is--suffix', !!suffix), _defineProperty(_ref2, 'is--readonly', readonly), _defineProperty(_ref2, 'is--visivle', visiblePanel), _defineProperty(_ref2, 'is--disabled', disabled), _defineProperty(_ref2, 'is--active', isActivated), _ref2)]
+      "class": ['vxe-input', "type--".concat(type), className, (_ref2 = {}, _defineProperty(_ref2, "size--".concat(vSize), vSize), _defineProperty(_ref2, "is--".concat(align), align), _defineProperty(_ref2, 'is--controls', controls), _defineProperty(_ref2, 'is--prefix', !!prefix), _defineProperty(_ref2, 'is--suffix', !!suffix), _defineProperty(_ref2, 'is--readonly', readonly), _defineProperty(_ref2, 'is--visivle', visiblePanel), _defineProperty(_ref2, 'is--count', isWordCount), _defineProperty(_ref2, 'is--disabled', disabled), _defineProperty(_ref2, 'is--active', isActivated), _ref2)]
     }, childs);
   },
   methods: {
@@ -30312,7 +30715,8 @@ function getExportBlobByContent(content, options) {
 }
 function hasTreeChildren($xetable, row) {
   var treeOpts = $xetable.treeOpts;
-  return row[treeOpts.children] && row[treeOpts.children].length > 0;
+  var childrenField = treeOpts.children || treeOpts.childrenField;
+  return row[childrenField] && row[childrenField].length > 0;
 }
 function getSeq($xetable, row, $rowIndex, column, $columnIndex) {
   var seqOpts = $xetable.seqOpts;
@@ -30352,6 +30756,7 @@ function getLabelData($xetable, opts, columns, datas) {
     radioOpts = $xetable.radioOpts,
     checkboxOpts = $xetable.checkboxOpts,
     columnOpts = $xetable.columnOpts;
+  var childrenField = treeOpts.children || treeOpts.childrenField;
   if (!htmlCellElem) {
     htmlCellElem = document.createElement('div');
   }
@@ -30433,7 +30838,9 @@ function getLabelData($xetable, opts, columns, datas) {
         expandMaps.set(row, 1);
         rest.push(Object.assign(_item, row));
       }
-    }, treeOpts);
+    }, {
+      children: childrenField
+    });
     return rest;
   }
   return datas.map(function (row, $rowIndex) {
@@ -31208,7 +31615,7 @@ function handleFileImport($xetable, file, opts) {
     filename = _UtilTools$parseFile.filename;
 
   // 检查类型，如果为自定义导出，则不需要校验类型
-  if (!importMethod && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().includes(v_x_e_table.config.importTypes, type)) {
+  if (!importMethod && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().includes(v_x_e_table.globalConfs.importTypes, type)) {
     if (opts.message !== false) {
       // 检测弹窗模块
       if (false) {}
@@ -31440,7 +31847,7 @@ function handleExportAndPrint($xetable, options, isPrint) {
     message: true,
     isHeader: true
   }, options);
-  var types = defOpts.types || v_x_e_table.config.exportTypes;
+  var types = defOpts.types || v_x_e_table.globalConfs.exportTypes;
   var modes = defOpts.modes;
   var checkMethod = customOpts.checkMethod;
   var exportColumns = collectColumn.slice(0);
@@ -31700,7 +32107,7 @@ var mixin_convertToRows = function convertToRows(originColumns) {
       }
 
       // 检查类型，如果为自定义导出，则不需要校验类型
-      if (!opts.exportMethod && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().includes(v_x_e_table.config.exportTypes, type)) {
+      if (!opts.exportMethod && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().includes(v_x_e_table.globalConfs.exportTypes, type)) {
         if (false) {}
         var params = {
           status: false
@@ -31780,7 +32187,7 @@ var mixin_convertToRows = function convertToRows(originColumns) {
     _importData: function _importData(options) {
       var _this2 = this;
       var opts = Object.assign({
-        types: v_x_e_table.config.importTypes
+        types: v_x_e_table.globalConfs.importTypes
         // beforeImportMethod: null,
         // afterImportMethod: null
       }, this.importOpts, options);
@@ -31841,7 +32248,7 @@ var mixin_convertToRows = function convertToRows(originColumns) {
       var defOpts = Object.assign({
         mode: 'insert',
         message: true,
-        types: v_x_e_table.config.importTypes
+        types: v_x_e_table.globalConfs.importTypes
       }, options, this.importOpts);
       var types = defOpts.types;
       var isTree = !!this.getTreeStatus();
@@ -32069,13 +32476,16 @@ function getCheckboxRangeRows(_vm, params, targetTrElem, moveRange) {
         treeConfig = this.treeConfig,
         treeOpts = this.treeOpts,
         afterFullData = this.afterFullData;
+      var childrenField = treeOpts.children || treeOpts.childrenField;
       var targetRow;
       evnt.preventDefault();
       if (currentRow) {
         if (treeConfig) {
           var _XEUtils$findTree = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findTree(afterFullData, function (item) {
               return item === currentRow;
-            }, treeOpts),
+            }, {
+              children: childrenField
+            }),
             index = _XEUtils$findTree.index,
             items = _XEUtils$findTree.items;
           if (isUpArrow && index > 0) {
@@ -32455,12 +32865,14 @@ function validErrorRuleValue(rule, val) {
      * 完整校验，和 validate 的区别就是会给有效数据中的每一行进行校验
      */
     _fullValidate: function _fullValidate(rows, cb) {
+      if (false) {}
       return this.beginValidate(rows, cb, true);
     },
     /**
      * 快速校验，如果存在记录不通过的记录，则返回不再继续校验（异步校验除外）
      */
     _validate: function _validate(rows, cb) {
+      if (false) {}
       return this.beginValidate(rows, cb);
     },
     /**
@@ -32500,6 +32912,7 @@ function validErrorRuleValue(rule, val) {
         afterFullData = this.afterFullData,
         treeConfig = this.treeConfig,
         treeOpts = this.treeOpts;
+      var childrenField = treeOpts.children || treeOpts.childrenField;
       var vaildDatas;
       if (rows === true) {
         vaildDatas = afterFullData;
@@ -32552,7 +32965,9 @@ function validErrorRuleValue(rule, val) {
           }
         };
         if (treeConfig) {
-          external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(vaildDatas, handleVaild, treeOpts);
+          external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(vaildDatas, handleVaild, {
+            children: childrenField
+          });
         } else {
           vaildDatas.forEach(handleVaild);
         }
@@ -34963,7 +35378,8 @@ function renderCustoms(h, _vm) {
   created: function created() {
     var _this = this;
     var refresh = this.refresh,
-      refreshOpts = this.refreshOpts;
+      refreshOpts = this.refreshOpts,
+      customOpts = this.customOpts;
     this.$nextTick(function () {
       var $xetable = _this.fintTable();
       var queryMethod = refreshOpts.queryMethod || refreshOpts.query;
@@ -37593,7 +38009,8 @@ var VxeFormConfigItem = {
       allTitleWidth = $xeform.titleWidth,
       allTitleColon = $xeform.titleColon,
       allTitleAsterisk = $xeform.titleAsterisk,
-      allTitleOverflow = $xeform.titleOverflow;
+      allTitleOverflow = $xeform.titleOverflow,
+      allVertical = $xeform.vertical;
     var slots = item.slots,
       title = item.title,
       folding = item.folding,
@@ -37605,6 +38022,7 @@ var VxeFormConfigItem = {
       errRule = item.errRule,
       className = item.className,
       titleOverflow = item.titleOverflow,
+      vertical = item.vertical,
       children = item.children,
       showTitle = item.showTitle,
       contentClassName = item.contentClassName,
@@ -37625,6 +38043,7 @@ var VxeFormConfigItem = {
     var titleColon = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(item.titleColon) ? allTitleColon : item.titleColon;
     var titleAsterisk = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(item.titleAsterisk) ? allTitleAsterisk : item.titleAsterisk;
     var itemOverflow = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(titleOverflow) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNull(titleOverflow) ? allTitleOverflow : titleOverflow;
+    var itemVertical = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(vertical) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNull(vertical) ? allVertical : vertical;
     var ovEllipsis = itemOverflow === 'ellipsis';
     var ovTitle = itemOverflow === 'title';
     var ovTooltip = itemOverflow === true || itemOverflow === 'tooltip';
@@ -37684,6 +38103,7 @@ var VxeFormConfigItem = {
       "class": ['vxe-form--item', item.id, span ? "vxe-col--".concat(span, " is--span") : null, className ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(className) ? className(params) : className : '', itemClassName ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(itemClassName) ? itemClassName(params) : itemClassName : '', {
         'is--title': title,
         'is--colon': titleColon,
+        'is--vertical': itemVertical,
         'is--asterisk': titleAsterisk,
         'is--required': isRequired,
         'is--hidden': folding && collapseAll,
@@ -37875,6 +38295,10 @@ function getResetValue(value, resetValue) {
       type: [Boolean, String],
       "default": null
     },
+    vertical: {
+      type: Boolean,
+      "default": null
+    },
     className: [String, Function],
     readonly: Boolean,
     items: Array,
@@ -38506,6 +38930,10 @@ var form_item_props = {
     type: Boolean,
     "default": true
   },
+  vertical: {
+    type: Boolean,
+    "default": null
+  },
   className: [String, Function],
   contentClassName: [String, Function],
   contentStyle: [Object, Function],
@@ -38545,7 +38973,8 @@ var renderItem = function renderItem(h, _vm, item, slots) {
     allTitleWidth = _vm.titleWidth,
     allTitleColon = _vm.titleColon,
     allTitleAsterisk = _vm.titleAsterisk,
-    allTitleOverflow = _vm.titleOverflow;
+    allTitleOverflow = _vm.titleOverflow,
+    allVertical = _vm.vertical;
   var title = item.title,
     folding = item.folding,
     visible = item.visible,
@@ -38556,6 +38985,7 @@ var renderItem = function renderItem(h, _vm, item, slots) {
     errRule = item.errRule,
     className = item.className,
     titleOverflow = item.titleOverflow,
+    vertical = item.vertical,
     showTitle = item.showTitle,
     contentClassName = item.contentClassName,
     contentStyle = item.contentStyle,
@@ -38575,6 +39005,7 @@ var renderItem = function renderItem(h, _vm, item, slots) {
   var titleColon = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(item.titleColon) ? allTitleColon : item.titleColon;
   var titleAsterisk = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(item.titleAsterisk) ? allTitleAsterisk : item.titleAsterisk;
   var itemOverflow = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(titleOverflow) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNull(titleOverflow) ? allTitleOverflow : titleOverflow;
+  var itemVertical = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(vertical) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNull(vertical) ? allVertical : vertical;
   var ovEllipsis = itemOverflow === 'ellipsis';
   var ovTitle = itemOverflow === 'title';
   var ovTooltip = itemOverflow === true || itemOverflow === 'tooltip';
@@ -38619,6 +39050,7 @@ var renderItem = function renderItem(h, _vm, item, slots) {
     "class": ['vxe-form--item', item.id, span ? "vxe-col--".concat(span, " is--span") : '', className ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(className) ? className(params) : className : '', itemClassName ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(itemClassName) ? itemClassName(params) : itemClassName : '', {
       'is--title': title,
       'is--colon': titleColon,
+      'is--vertical': itemVertical,
       'is--asterisk': titleAsterisk,
       'is--required': isRequired,
       'is--hidden': folding && collapseAll,