vxe-table 3.4.7-beta.0 → 3.4.8

package/lib/index.umd.js

@@ -8452,7 +8452,7 @@ var iconPrefix = 'vxe-icon--';
     //  storage: false,
     //  checkMethod () {}
     // },
-    // rowId: '_XID', // 行数据的唯一主键字段名
+    // rowId: '_X_ID', // 行数据的唯一主键字段名
     sortConfig: {
       // remote: false,
       // trigger: 'default',
@@ -8470,6 +8470,7 @@ var iconPrefix = 'vxe-icon--';
       parentField: 'parentId',
       children: 'children',
       hasChild: 'hasChild',
+      mapChildren: '_X_CHILD',
       indent: 20,
       showIcon: true
     },
@@ -8757,6 +8758,9 @@ var es_object_to_string = __webpack_require__("d3b7");
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.symbol.iterator.js
 var es_symbol_iterator = __webpack_require__("d28b");
 
+// EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.iterator.js
+var es_array_iterator = __webpack_require__("e260");
+
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.iterator.js
 var es_string_iterator = __webpack_require__("3ca3");
 
@@ -8774,6 +8778,7 @@ var es_array_from = __webpack_require__("a630");
 
 
 
+
 function _iterableToArray(iter) {
   if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter);
 }
@@ -8810,6 +8815,9 @@ function _nonIterableSpread() {
 function _toConsumableArray(arr) {
   return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread();
 }
+// EXTERNAL MODULE: ./node_modules/core-js/modules/es.object.assign.js
+var es_object_assign = __webpack_require__("cca6");
+
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.fixed.js
 var es_string_fixed = __webpack_require__("c7cd");
 
@@ -8824,6 +8832,7 @@ var es_array_splice = __webpack_require__("a434");
 
 
 
+
 /**
  * 创建数据仓库
  */
@@ -8869,6 +8878,7 @@ var store_Store = /*#__PURE__*/function () {
 /* harmony default export */ var store = (store_Store);
 // CONCATENATED MODULE: ./packages/v-x-e-table/src/formats.js
 
+
 var formats = new store();
 
 if (false) {}
@@ -8885,6 +8895,7 @@ if (false) {}
 
 
 
+
 var zindexIndex = 0;
 var lastZindex = 1;
 
@@ -9048,7 +9059,7 @@ var UtilTools = {
   },
   // 行主键 key
   getRowkey: function getRowkey($xetable) {
-    return $xetable.rowId || '_XID';
+    return $xetable.rowId || '_X_ID';
   },
   // 行主键 value
   getRowid: function getRowid($xetable, row) {
@@ -9758,6 +9769,7 @@ var es_number_to_fixed = __webpack_require__("b680");
 
 
 
+
 var defaultCompProps = {
   transfer: true
 };
@@ -10547,11 +10559,13 @@ var renderer = {
 };
 // CONCATENATED MODULE: ./packages/v-x-e-table/src/commands.js
 
+
 var commands = new store();
 
 if (false) {}
 // CONCATENATED MODULE: ./packages/v-x-e-table/src/menus.js
 
+
 var menus = new store();
 
 if (false) {}
@@ -10695,12 +10709,6 @@ var Icon = {
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.number.constructor.js
 var es_number_constructor = __webpack_require__("a9e3");
 
-// EXTERNAL MODULE: ./node_modules/core-js/modules/es.object.assign.js
-var es_object_assign = __webpack_require__("cca6");
-
-// EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.iterator.js
-var es_array_iterator = __webpack_require__("e260");
-
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.map.js
 var es_map = __webpack_require__("4ec9");
 
@@ -11385,7 +11393,7 @@ function renderRows(h, _vm, $xetable, fixedType, tableData, tableColumn) {
     } // 如果是树形表格
 
 
-    if (treeConfig && !scrollYLoad && treeExpandeds.length) {
+    if (treeConfig && !scrollYLoad && !treeOpts.transform && treeExpandeds.length) {
       var rowChildren = row[treeOpts.children];
 
       if (rowChildren && rowChildren.length && treeExpandeds.indexOf(row) > -1) {
@@ -13208,7 +13216,7 @@ var Methods = {
   },
 
   /**
-   * 同步 data 数据
+   * 同步 data 数据（即将废弃）
    * 如果用了该方法，那么组件将不再记录增删改的状态，只能自行实现对应逻辑
    * 对于某些特殊的场景，比如深层树节点元素发生变动时可能会用到
    */
@@ -13231,10 +13239,31 @@ var Methods = {
     return this.handleTableData(true).then(this.updateFooter).then(this.recalculate);
   },
   handleTableData: function handleTableData(force) {
+    var _this2 = this;
+
     var scrollYLoad = this.scrollYLoad,
-        scrollYStore = this.scrollYStore;
-    var fullData = force ? this.updateAfterFullData() : this.afterFullData;
-    this.tableData = scrollYLoad ? fullData.slice(scrollYStore.startIndex, scrollYStore.endIndex) : fullData.slice(0);
+        scrollYStore = this.scrollYStore,
+        fullDataRowIdData = this.fullDataRowIdData,
+        afterFullData = this.afterFullData;
+    var fullList = afterFullData; // 是否进行数据处理
+
+    if (force) {
+      // 更新数据，处理筛选和排序
+      this.updateAfterFullData(); // 如果为虚拟树，将树结构拍平
+
+      fullList = this.handleVirtualTreeToList();
+    }
+
+    var tableData = scrollYLoad ? fullList.slice(scrollYStore.startIndex, scrollYStore.endIndex) : fullList.slice(0);
+    tableData.forEach(function (row, $index) {
+      var rowid = methods_getRowid(_this2, row);
+      var rest = fullDataRowIdData[rowid];
+
+      if (rest) {
+        rest.$index = $index;
+      }
+    });
+    this.tableData = tableData;
     return this.$nextTick();
   },
   updateScrollYStatus: function updateScrollYStatus(fullData) {
@@ -13252,7 +13281,7 @@ var Methods = {
    * @param {Array} datas 数据
    */
   loadTableData: function loadTableData(datas) {
-    var _this2 = this;
+    var _this3 = this;
 
     var keepSource = this.keepSource,
         treeConfig = this.treeConfig,
@@ -13274,7 +13303,8 @@ var Methods = {
         treeData = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toArrayTree(fullData, {
           key: treeOpts.rowField,
           parentKey: treeOpts.parentField,
-          children: treeOpts.children
+          children: treeOpts.children,
+          mapChildren: treeOpts.mapChildren
         });
         fullData = treeData.slice(0);
       } else {
@@ -13292,7 +13322,7 @@ var Methods = {
     this.scrollYLoad = sYLoad; // 全量数据
 
     this.tableFullData = fullData;
-    this.treeFullData = treeData; // 缓存数据
+    this.tableFullTreeData = treeData; // 缓存数据
 
     this.cacheRowMap(true); // 原始数据
 
@@ -13314,31 +13344,31 @@ var Methods = {
     this.handleTableData(true);
     this.updateFooter();
     return this.$nextTick().then(function () {
-      _this2.updateHeight();
+      _this3.updateHeight();
 
-      _this2.updateStyle();
+      _this3.updateStyle();
     }).then(function () {
-      _this2.computeScrollLoad();
+      _this3.computeScrollLoad();
     }).then(function () {
       // 是否启用了虚拟滚动
       if (sYLoad) {
         scrollYStore.endIndex = scrollYStore.visibleSize;
       }
 
-      _this2.handleReserveStatus();
+      _this3.handleReserveStatus();
 
-      _this2.checkSelectionStatus();
+      _this3.checkSelectionStatus();
 
       return new Promise(function (resolve) {
-        _this2.$nextTick().then(function () {
-          return _this2.recalculate();
+        _this3.$nextTick().then(function () {
+          return _this3.recalculate();
         }).then(function () {
           // 是否变更虚拟滚动
           if (oldScrollYLoad === sYLoad) {
-            restoreScrollLocation(_this2, lastScrollLeft, lastScrollTop).then(resolve);
+            restoreScrollLocation(_this3, lastScrollLeft, lastScrollTop).then(resolve);
           } else {
             setTimeout(function () {
-              return restoreScrollLocation(_this2, lastScrollLeft, lastScrollTop).then(resolve);
+              return restoreScrollLocation(_this3, lastScrollLeft, lastScrollTop).then(resolve);
             });
           }
         });
@@ -13351,23 +13381,23 @@ var Methods = {
    * @param {Array} datas 数据
    */
   loadData: function loadData(datas) {
-    var _this3 = this;
+    var _this4 = this;
 
     var inited = this.inited,
         initStatus = this.initStatus;
     return this.loadTableData(datas).then(function () {
-      _this3.inited = true;
-      _this3.initStatus = true;
+      _this4.inited = true;
+      _this4.initStatus = true;
 
       if (!initStatus) {
-        _this3.handleLoadDefaults();
+        _this4.handleLoadDefaults();
       }
 
       if (!inited) {
-        _this3.handleInitDefaults();
+        _this4.handleInitDefaults();
       }
 
-      return _this3.recalculate();
+      return _this4.recalculate();
     });
   },
 
@@ -13376,21 +13406,21 @@ var Methods = {
    * @param {Array} datas 数据
    */
   reloadData: function reloadData(datas) {
-    var _this4 = this;
+    var _this5 = this;
 
     var inited = this.inited;
     return this.clearAll().then(function () {
-      _this4.inited = true;
-      _this4.initStatus = true;
-      return _this4.loadTableData(datas);
+      _this5.inited = true;
+      _this5.initStatus = true;
+      return _this5.loadTableData(datas);
     }).then(function () {
-      _this4.handleLoadDefaults();
+      _this5.handleLoadDefaults();
 
       if (!inited) {
-        _this4.handleInitDefaults();
+        _this5.handleInitDefaults();
       }
 
-      return _this4.recalculate();
+      return _this5.recalculate();
     });
   },
 
@@ -13435,10 +13465,10 @@ var Methods = {
    * @param {ColumnInfo} columns 列配置
    */
   loadColumn: function loadColumn(columns) {
-    var _this5 = this;
+    var _this6 = this;
 
     var collectColumn = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.mapTree(columns, function (column) {
-      return src_cell.createColumn(_this5, column);
+      return src_cell.createColumn(_this6, column);
     }, {
       children: 'children'
     });
@@ -13451,14 +13481,14 @@ var Methods = {
    * @param {ColumnInfo} columns 列配置
    */
   reloadColumn: function reloadColumn(columns) {
-    var _this6 = this;
+    var _this7 = this;
 
     return this.clearAll().then(function () {
-      return _this6.loadColumn(columns);
+      return _this7.loadColumn(columns);
     });
   },
   handleColumn: function handleColumn(collectColumn) {
-    var _this7 = this;
+    var _this8 = this;
 
     this.collectColumn = collectColumn;
     var tableFullColumn = methods_getColumnList(collectColumn);
@@ -13466,8 +13496,8 @@ var Methods = {
     this.cacheColumnMap();
     this.restoreCustomStorage();
     this.parseColumns().then(function () {
-      if (_this7.scrollXLoad) {
-        _this7.loadScrollXData(true);
+      if (_this8.scrollXLoad) {
+        _this8.loadScrollXData(true);
       }
     });
     this.clearMergeCells();
@@ -13477,14 +13507,14 @@ var Methods = {
     if (false) {}
 
     return this.$nextTick().then(function () {
-      if (_this7.$toolbar) {
-        _this7.$toolbar.syncUpdate({
+      if (_this8.$toolbar) {
+        _this8.$toolbar.syncUpdate({
           collectColumn: collectColumn,
-          $table: _this7
+          $table: _this8
         });
       }
 
-      return _this7.recalculate();
+      return _this8.recalculate();
     });
   },
 
@@ -13493,20 +13523,21 @@ var Methods = {
    * 牺牲数据组装的耗时，用来换取使用过程中的流畅
    */
   cacheRowMap: function cacheRowMap(source) {
-    var _this8 = this;
+    var _this9 = this;
 
     var treeConfig = this.treeConfig,
         treeOpts = this.treeOpts,
         tableFullData = this.tableFullData,
         fullDataRowMap = this.fullDataRowMap,
-        fullAllDataRowMap = this.fullAllDataRowMap;
+        fullAllDataRowMap = this.fullAllDataRowMap,
+        tableFullTreeData = this.tableFullTreeData;
     var fullDataRowIdData = this.fullDataRowIdData,
         fullAllDataRowIdData = this.fullAllDataRowIdData;
     var rowkey = getRowkey(this);
     var isLazy = treeConfig && treeOpts.lazy;
 
     var handleCache = function handleCache(row, index, items, path, parent, nodes) {
-      var rowid = methods_getRowid(_this8, row);
+      var rowid = methods_getRowid(_this9, row);
       var seq = treeConfig && path ? toTreePathSeq(path) : index + 1;
       var level = nodes ? nodes.length - 1 : 0;
 
@@ -13549,13 +13580,13 @@ var Methods = {
     fullAllDataRowMap.clear();
 
     if (treeConfig) {
-      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.eachTree(tableFullData, handleCache, treeOpts);
+      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.eachTree(tableFullTreeData, handleCache, treeOpts);
     } else {
       tableFullData.forEach(handleCache);
     }
   },
   loadTreeChildren: function loadTreeChildren(row, childRecords) {
-    var _this9 = this;
+    var _this10 = this;
 
     var keepSource = this.keepSource,
         tableSourceData = this.tableSourceData,
@@ -13564,14 +13595,16 @@ var Methods = {
         fullDataRowMap = this.fullDataRowMap,
         fullAllDataRowMap = this.fullAllDataRowMap,
         fullAllDataRowIdData = this.fullAllDataRowIdData;
-    var children = treeOpts.children;
+    var transform = treeOpts.transform,
+        children = treeOpts.children,
+        mapChildren = treeOpts.mapChildren;
     var rest = fullAllDataRowIdData[methods_getRowid(this, row)];
     var parentLevel = rest ? rest.level : 0;
     return this.createData(childRecords).then(function (rows) {
       if (keepSource) {
-        var rowid = methods_getRowid(_this9, row);
+        var rowid = methods_getRowid(_this10, row);
         var matchObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.findTree(tableSourceData, function (item) {
-          return rowid === methods_getRowid(_this9, item);
+          return rowid === methods_getRowid(_this10, item);
         }, treeOpts);
 
         if (matchObj) {
@@ -13580,7 +13613,7 @@ var Methods = {
       }
 
       external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.eachTree(rows, function (childRow, index, items, path, parent, nodes) {
-        var rowid = methods_getRowid(_this9, childRow);
+        var rowid = methods_getRowid(_this10, childRow);
         var rest = {
           row: childRow,
           rowid: rowid,
@@ -13598,6 +13631,11 @@ var Methods = {
         fullAllDataRowMap.set(childRow, rest);
       }, treeOpts);
       row[children] = rows;
+
+      if (transform) {
+        row[mapChildren] = rows;
+      }
+
       return rows;
     });
   },
@@ -13607,7 +13645,7 @@ var Methods = {
    * 牺牲数据组装的耗时，用来换取使用过程中的流畅
    */
   cacheColumnMap: function cacheColumnMap() {
-    var _this10 = this;
+    var _this11 = this;
 
     var tableFullColumn = this.tableFullColumn,
         collectColumn = this.collectColumn,
@@ -13901,13 +13939,13 @@ var Methods = {
    * @param {Array} records 新数据
    */
   createData: function createData(records) {
-    var _this11 = this;
+    var _this12 = this;
 
     var treeConfig = this.treeConfig,
         treeOpts = this.treeOpts;
 
     var handleRrecord = function handleRrecord(record) {
-      return _this11.defineField(Object.assign({}, record));
+      return _this12.defineField(Object.assign({}, record));
     };
 
     var rows = treeConfig ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.mapTree(records, handleRrecord, treeOpts) : records.map(handleRrecord);
@@ -13922,7 +13960,7 @@ var Methods = {
    * @param {Array/Object} records 新数据
    */
   createRow: function createRow(records) {
-    var _this12 = this;
+    var _this13 = this;
 
     var isArr = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isArray(records);
 
@@ -13931,7 +13969,7 @@ var Methods = {
     }
 
     return this.$nextTick().then(function () {
-      return _this12.createData(records).then(function (rows) {
+      return _this13.createData(records).then(function (rows) {
         return isArr ? rows : rows[0];
       });
     });
@@ -13945,7 +13983,7 @@ var Methods = {
    * 如果还额外传了 field 则还原指定的单元格数据
    */
   revertData: function revertData(rows, field) {
-    var _this13 = this;
+    var _this14 = this;
 
     var keepSource = this.keepSource,
         tableSourceData = this.tableSourceData,
@@ -13969,8 +14007,8 @@ var Methods = {
 
     if (targetRows.length) {
       targetRows.forEach(function (row) {
-        if (!_this13.isInsertByRow(row)) {
-          var rowIndex = _this13.getRowIndex(row);
+        if (!_this14.isInsertByRow(row)) {
+          var rowIndex = _this14.getRowIndex(row);
 
           if (treeConfig && rowIndex === -1) {
             throw new Error(UtilTools.getLog('vxe.error.noTree', ['revertData']));
@@ -14054,7 +14092,7 @@ var Methods = {
    * @param {String} field 字段名
    */
   isUpdateByRow: function isUpdateByRow(row, field) {
-    var _this14 = this;
+    var _this15 = this;
 
     var visibleColumn = this.visibleColumn,
         keepSource = this.keepSource,
@@ -14074,7 +14112,7 @@ var Methods = {
       if (treeConfig) {
         var children = treeOpts.children;
         var matchObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.findTree(tableSourceData, function (item) {
-          return rowid === methods_getRowid(_this14, item);
+          return rowid === methods_getRowid(_this15, item);
         }, treeOpts);
         row = Object.assign({}, row, _defineProperty({}, children, null));
 
@@ -14192,23 +14230,58 @@ var Methods = {
     return rowList;
   },
 
+  /**
+   * 如果为虚拟树，将树结构拍平
+   * @returns
+   */
+  handleVirtualTreeToList: function handleVirtualTreeToList() {
+    var treeOpts = this.treeOpts,
+        treeConfig = this.treeConfig,
+        treeExpandeds = this.treeExpandeds,
+        afterTreeFullData = this.afterTreeFullData,
+        afterFullData = this.afterFullData;
+
+    if (treeConfig && treeOpts.transform) {
+      var fullData = [];
+      var expandMaps = new Map();
+      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.eachTree(afterTreeFullData, function (row, index, items, path, parent) {
+        if (!parent || expandMaps.has(parent) && treeExpandeds.indexOf(parent) > -1) {
+          expandMaps.set(row, 1);
+          fullData.push(row);
+        }
+      }, {
+        children: treeOpts.mapChildren
+      });
+      this.afterFullData = fullData;
+      this.updateScrollYStatus(fullData);
+      return fullData;
+    }
+
+    return afterFullData;
+  },
+
   /**
    * 获取处理后全量的表格数据
    * 如果存在筛选条件，继续处理
    */
   updateAfterFullData: function updateAfterFullData() {
-    var _this15 = this;
+    var _this16 = this;
 
     var tableFullColumn = this.tableFullColumn,
         tableFullData = this.tableFullData,
         filterOpts = this.filterOpts,
-        sortOpts = this.sortOpts;
+        sortOpts = this.sortOpts,
+        treeConfig = this.treeConfig,
+        treeOpts = this.treeOpts,
+        tableFullTreeData = this.tableFullTreeData;
     var allRemoteFilter = filterOpts.remote,
         allFilterMethod = filterOpts.filterMethod;
     var allRemoteSort = sortOpts.remote,
         allSortMethod = sortOpts.sortMethod,
         sortMultiple = sortOpts.multiple;
-    var tableData = tableFullData.slice(0);
+    var transform = treeOpts.transform;
+    var tableData = [];
+    var tableTree = [];
     var filterColumns = [];
     var orderColumns = [];
     tableFullColumn.forEach(function (column) {
@@ -14245,7 +14318,7 @@ var Methods = {
     });
 
     if (filterColumns.length) {
-      tableData = tableData.filter(function (row) {
+      var handleFilter = function handleFilter(row) {
         return filterColumns.every(function (_ref) {
           var column = _ref.column,
               valueList = _ref.valueList,
@@ -14267,7 +14340,7 @@ var Methods = {
                   cellValue: cellValue,
                   row: row,
                   column: column,
-                  $table: _this15
+                  $table: _this16
                 });
               });
             } else if (compFilterMethod) {
@@ -14278,7 +14351,7 @@ var Methods = {
                   cellValue: cellValue,
                   row: row,
                   column: column,
-                  $table: _this15
+                  $table: _this16
                 });
               });
             } else if (allFilterMethod) {
@@ -14297,7 +14370,7 @@ var Methods = {
                   cellValue: cellValue,
                   row: row,
                   column: column,
-                  $table: _this15
+                  $table: _this16
                 });
               });
             }
@@ -14307,51 +14380,99 @@ var Methods = {
 
           return true;
         });
-      });
+      };
+
+      if (treeConfig && transform) {
+        // 筛选虚拟树
+        tableTree = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.searchTree(tableFullTreeData, handleFilter, _objectSpread2(_objectSpread2({}, treeOpts), {}, {
+          original: true
+        }));
+        tableData = tableTree;
+      } else {
+        tableData = treeConfig ? tableFullTreeData.filter(handleFilter) : tableFullData.filter(handleFilter);
+        tableTree = tableData;
+      }
+    } else {
+      if (treeConfig && transform) {
+        // 还原虚拟树
+        tableTree = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.searchTree(tableFullTreeData, function () {
+          return true;
+        }, _objectSpread2(_objectSpread2({}, treeOpts), {}, {
+          original: true
+        }));
+        tableData = tableTree;
+      } else {
+        tableData = treeConfig ? tableFullTreeData.slice(0) : tableFullData.slice(0);
+        tableTree = tableData;
+      }
     }
 
     var firstOrderColumn = orderColumns[0];
 
     if (!allRemoteSort && firstOrderColumn) {
-      if (allSortMethod) {
-        var sortRests = allSortMethod({
-          data: tableData,
-          column: firstOrderColumn.column,
-          property: firstOrderColumn.property,
-          order: firstOrderColumn.order,
-          sortList: orderColumns,
-          $table: this
-        });
-        tableData = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isArray(sortRests) ? sortRests : tableData;
-      } else {
-        // 兼容 v4
-        if (sortMultiple) {
-          tableData = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.orderBy(tableData, orderColumns.map(function (_ref2) {
+      if (treeConfig && transform) {
+        // 虚拟树和列表一样，只能排序根级节点
+        if (allSortMethod) {
+          var sortRests = allSortMethod({
+            data: tableTree,
+            sortList: orderColumns,
+            $table: this
+          });
+          tableTree = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isArray(sortRests) ? sortRests : tableTree;
+        } else {
+          tableTree = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.orderBy(tableTree, orderColumns.map(function (_ref2) {
             var column = _ref2.column,
                 order = _ref2.order;
-            return [getOrderField(_this15, column), order];
+            return [getOrderField(_this16, column), order];
           }));
+        }
+
+        tableData = tableTree;
+      } else {
+        if (allSortMethod) {
+          var _sortRests = allSortMethod({
+            data: tableData,
+            column: firstOrderColumn.column,
+            property: firstOrderColumn.property,
+            order: firstOrderColumn.order,
+            sortList: orderColumns,
+            $table: this
+          });
+
+          tableData = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isArray(_sortRests) ? _sortRests : tableData;
         } else {
-          // 兼容 v2，在 v4 中废弃， sortBy 不能为数组
-          var sortByConfs;
+          // 兼容 v4
+          if (sortMultiple) {
+            tableData = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.orderBy(tableData, orderColumns.map(function (_ref3) {
+              var column = _ref3.column,
+                  order = _ref3.order;
+              return [getOrderField(_this16, column), order];
+            }));
+          } else {
+            // 兼容 v2，在 v4 中废弃， sortBy 不能为数组
+            var sortByConfs;
 
-          if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isArray(firstOrderColumn.sortBy)) {
-            sortByConfs = firstOrderColumn.sortBy.map(function (item) {
-              return [item, firstOrderColumn.order];
-            });
-          }
+            if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isArray(firstOrderColumn.sortBy)) {
+              sortByConfs = firstOrderColumn.sortBy.map(function (item) {
+                return [item, firstOrderColumn.order];
+              });
+            }
 
-          tableData = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.orderBy(tableData, sortByConfs || [firstOrderColumn].map(function (_ref3) {
-            var column = _ref3.column,
-                order = _ref3.order;
-            return [getOrderField(_this15, column), order];
-          }));
+            tableData = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.orderBy(tableData, sortByConfs || [firstOrderColumn].map(function (_ref4) {
+              var column = _ref4.column,
+                  order = _ref4.order;
+              return [getOrderField(_this16, column), order];
+            }));
+          }
         }
+
+        tableTree = tableData;
       }
     }
 
     this.afterFullData = tableData;
-    return tableData;
+    this.afterTreeFullData = tableTree;
+    this.updateAfterDataIndex();
   },
 
   /**
@@ -14359,18 +14480,18 @@ var Methods = {
    * 对渲染中的数据提前解析序号及索引。牺牲提前编译耗时换取渲染中额外损耗，使运行时更加流畅
    */
   updateAfterDataIndex: function updateAfterDataIndex() {
-    var _this16 = this;
+    var _this17 = this;
 
     var treeConfig = this.treeConfig,
         afterFullData = this.afterFullData,
         fullDataRowIdData = this.fullDataRowIdData,
         fullAllDataRowIdData = this.fullAllDataRowIdData,
-        treeFullData = this.treeFullData,
+        afterTreeFullData = this.afterTreeFullData,
         treeOpts = this.treeOpts;
 
     if (treeConfig) {
-      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.eachTree(treeFullData, function (row, index, items, path) {
-        var rowid = methods_getRowid(_this16, row);
+      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.eachTree(afterTreeFullData, function (row, index, items, path) {
+        var rowid = methods_getRowid(_this17, row);
         var allrest = fullAllDataRowIdData[rowid];
         var fullrest = fullDataRowIdData[rowid];
         var seq = path.map(function (num, i) {
@@ -14379,10 +14500,12 @@ var Methods = {
 
         if (allrest) {
           allrest.seq = seq;
+          allrest._index = index;
         }
 
         if (fullrest) {
           fullrest.seq = seq;
+          fullrest._index = index;
         } else {
           fullAllDataRowIdData[rowid] = {
             row: row,
@@ -14407,16 +14530,19 @@ var Methods = {
             level: 0
           };
         }
-      }, treeOpts);
+      }, {
+        children: treeOpts.mapChildren
+      });
     } else {
       afterFullData.forEach(function (row, index) {
-        var rowid = methods_getRowid(_this16, row);
+        var rowid = methods_getRowid(_this17, row);
         var allrest = fullAllDataRowIdData[rowid];
         var fullrest = fullDataRowIdData[rowid];
         var seq = index + 1;
 
         if (allrest) {
           allrest.seq = seq;
+          allrest._index = index;
         }
 
         if (fullrest) {
@@ -14491,7 +14617,7 @@ var Methods = {
    * 默认执行一次，除非被重置
    */
   handleLoadDefaults: function handleLoadDefaults() {
-    var _this17 = this;
+    var _this18 = this;
 
     if (this.checkboxConfig) {
       this.handleDefaultSelectionChecked();
@@ -14518,7 +14644,7 @@ var Methods = {
     }
 
     this.$nextTick(function () {
-      return setTimeout(_this17.recalculate);
+      return setTimeout(_this18.recalculate);
     });
   },
 
@@ -14668,9 +14794,9 @@ var Methods = {
           keyMap[colKey] = column;
         }
       });
-      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.each(customMap, function (_ref4, field) {
-        var visible = _ref4.visible,
-            resizeWidth = _ref4.resizeWidth;
+      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.each(customMap, function (_ref5, field) {
+        var visible = _ref5.visible,
+            resizeWidth = _ref5.resizeWidth;
         var column = keyMap[field];
 
         if (column) {
@@ -14768,12 +14894,12 @@ var Methods = {
    * 刷新列配置
    */
   refreshColumn: function refreshColumn() {
-    var _this18 = this;
+    var _this19 = this;
 
     return this.parseColumns().then(function () {
-      return _this18.refreshScroll();
+      return _this19.refreshScroll();
     }).then(function () {
-      return _this18.recalculate();
+      return _this19.recalculate();
     });
   },
 
@@ -14782,7 +14908,7 @@ var Methods = {
    * 将固定的列左边、右边分别靠边
    */
   parseColumns: function parseColumns() {
-    var _this19 = this;
+    var _this20 = this;
 
     var leftList = [];
     var centerList = [];
@@ -14889,11 +15015,11 @@ var Methods = {
     this.visibleColumn = visibleColumn;
     this.handleTableColumn();
     return this.updateFooter().then(function () {
-      return _this19.recalculate();
+      return _this20.recalculate();
     }).then(function () {
-      _this19.updateCellAreas();
+      _this20.updateCellAreas();
 
-      return _this19.recalculate();
+      return _this20.recalculate();
     });
   },
 
@@ -14977,7 +15103,7 @@ var Methods = {
    * 支持 width=? width=?px width=?% min-width=? min-width=?px min-width=?%
    */
   recalculate: function recalculate(refull) {
-    var _this20 = this;
+    var _this21 = this;
 
     var $refs = this.$refs;
     var tableBody = $refs.tableBody,
@@ -14993,9 +15119,9 @@ var Methods = {
       if (refull === true) {
         // 初始化时需要在列计算之后再执行优化运算，达到最优显示效果
         return this.computeScrollLoad().then(function () {
-          _this20.autoCellWidth(headerElem, bodyElem, footerElem);
+          _this21.autoCellWidth(headerElem, bodyElem, footerElem);
 
-          return _this20.computeScrollLoad();
+          return _this21.computeScrollLoad();
         });
       }
     }
@@ -15143,7 +15269,7 @@ var Methods = {
     this.customMaxHeight = methods_calcHeight(this, 'maxHeight');
   },
   updateStyle: function updateStyle() {
-    var _this21 = this;
+    var _this22 = this;
 
     var $refs = this.$refs,
         isGroup = this.isGroup,
@@ -15247,7 +15373,7 @@ var Methods = {
 
           if (isGroup && listElem) {
             external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.arrayEach(listElem.querySelectorAll('.col--group'), function (thElem) {
-              var colNode = _this21.getColumnNode(thElem);
+              var colNode = _this22.getColumnNode(thElem);
 
               if (colNode) {
                 var column = colNode.item;
@@ -15428,10 +15554,10 @@ var Methods = {
 
                   if (cellElem) {
                     if (colspan > 1) {
-                      var columnIndex = _this21.getColumnIndex(column);
+                      var columnIndex = _this22.getColumnIndex(column);
 
                       for (var _index = 1; _index < colspan; _index++) {
-                        var nextColumn = _this21.getColumns(columnIndex + _index);
+                        var nextColumn = _this22.getColumns(columnIndex + _index);
 
                         if (nextColumn) {
                           colWidth += nextColumn.renderWidth;
@@ -15481,15 +15607,15 @@ var Methods = {
     }
   },
   preventEvent: function preventEvent(evnt, type, args, next, end) {
-    var _this22 = this;
+    var _this23 = this;
 
     var evntList = v_x_e_table.interceptor.get(type);
     var rest;
 
     if (!evntList.some(function (func) {
       return func(Object.assign({
-        $grid: _this22.$xegrid,
-        $table: _this22,
+        $grid: _this23.$xegrid,
+        $table: _this23,
         $event: evnt
       }, args)) === false;
     })) {
@@ -15509,7 +15635,7 @@ var Methods = {
    * 全局按下事件处理
    */
   handleGlobalMousedownEvent: function handleGlobalMousedownEvent(evnt) {
-    var _this23 = this;
+    var _this24 = this;
 
     var $el = this.$el,
         $refs = this.$refs,
@@ -15570,7 +15696,7 @@ var Methods = {
                 } // 如果固定了高度且点击了行之外的空白处，则清除激活状态
 
 
-                if (!isClearActived && _this23.height && !_this23.overflowY) {
+                if (!isClearActived && _this24.height && !_this24.overflowY) {
                   var bodyWrapperElem = evnt.target;
 
                   if (methods_hasClass(bodyWrapperElem, 'vxe-table--body-wrapper')) {
@@ -15581,7 +15707,7 @@ var Methods = {
                 if (isClearActived || // 如果点击了当前表格之外
                 !getEventTargetNode(evnt, $el).flag) {
                   setTimeout(function () {
-                    return _this23.clearActived(evnt);
+                    return _this24.clearActived(evnt);
                   });
                 }
               });
@@ -15595,9 +15721,9 @@ var Methods = {
 
         if (!getEventTargetNode(evnt, document.body, 'vxe-table--ignore-areas-clear').flag) {
           this.preventEvent(evnt, 'event.clearAreas', {}, function () {
-            _this23.clearCellAreas();
+            _this24.clearCellAreas();
 
-            _this23.clearCopyCellArea();
+            _this24.clearCopyCellArea();
           });
         }
       }
@@ -15632,7 +15758,7 @@ var Methods = {
    * 表格键盘事件
    */
   keydownEvent: function keydownEvent(evnt) {
-    var _this24 = this;
+    var _this25 = this;
 
     var filterStore = this.filterStore,
         ctxMenuStore = this.ctxMenuStore,
@@ -15647,33 +15773,33 @@ var Methods = {
 
     if (isEsc) {
       this.preventEvent(evnt, 'event.keydown', null, function () {
-        if (keyboardConfig && mouseConfig && mouseOpts.area && _this24.handleKeyboardEvent) {
-          _this24.handleKeyboardEvent(evnt);
+        if (keyboardConfig && mouseConfig && mouseOpts.area && _this25.handleKeyboardEvent) {
+          _this25.handleKeyboardEvent(evnt);
         } else if (actived.row || filterStore.visible || ctxMenuStore.visible) {
           evnt.stopPropagation(); // 如果按下了 Esc 键，关闭快捷菜单、筛选
 
-          _this24.closeFilter();
+          _this25.closeFilter();
 
-          _this24.closeMenu();
+          _this25.closeMenu();
 
           if (keyboardConfig && keyboardOpts.isEsc) {
             // 如果是激活编辑状态，则取消编辑
             if (actived.row) {
               var params = actived.args;
 
-              _this24.clearActived(evnt); // 如果配置了选中功能，则为选中状态
+              _this25.clearActived(evnt); // 如果配置了选中功能，则为选中状态
 
 
               if (mouseConfig && mouseOpts.selected) {
-                _this24.$nextTick(function () {
-                  return _this24.handleSelected(params, evnt);
+                _this25.$nextTick(function () {
+                  return _this25.handleSelected(params, evnt);
                 });
               }
             }
           }
         }
 
-        _this24.emitEvent('keydown', {}, evnt);
+        _this25.emitEvent('keydown', {}, evnt);
       });
     }
   },
@@ -15682,27 +15808,27 @@ var Methods = {
    * 全局键盘事件
    */
   handleGlobalKeydownEvent: function handleGlobalKeydownEvent(evnt) {
-    var _this25 = this;
+    var _this26 = this;
 
     // 该行为只对当前激活的表格有效
     if (this.isActivated) {
       this.preventEvent(evnt, 'event.keydown', null, function () {
-        var filterStore = _this25.filterStore,
-            isCtxMenu = _this25.isCtxMenu,
-            ctxMenuStore = _this25.ctxMenuStore,
-            editStore = _this25.editStore,
-            editOpts = _this25.editOpts,
-            editConfig = _this25.editConfig,
-            mouseConfig = _this25.mouseConfig,
-            mouseOpts = _this25.mouseOpts,
-            keyboardConfig = _this25.keyboardConfig,
-            keyboardOpts = _this25.keyboardOpts,
-            treeConfig = _this25.treeConfig,
-            treeOpts = _this25.treeOpts,
-            highlightCurrentRow = _this25.highlightCurrentRow,
-            currentRow = _this25.currentRow,
-            bodyCtxMenu = _this25.bodyCtxMenu,
-            rowOpts = _this25.rowOpts;
+        var filterStore = _this26.filterStore,
+            isCtxMenu = _this26.isCtxMenu,
+            ctxMenuStore = _this26.ctxMenuStore,
+            editStore = _this26.editStore,
+            editOpts = _this26.editOpts,
+            editConfig = _this26.editConfig,
+            mouseConfig = _this26.mouseConfig,
+            mouseOpts = _this26.mouseOpts,
+            keyboardConfig = _this26.keyboardConfig,
+            keyboardOpts = _this26.keyboardOpts,
+            treeConfig = _this26.treeConfig,
+            treeOpts = _this26.treeOpts,
+            highlightCurrentRow = _this26.highlightCurrentRow,
+            currentRow = _this26.currentRow,
+            bodyCtxMenu = _this26.bodyCtxMenu,
+            rowOpts = _this26.rowOpts;
         var selected = editStore.selected,
             actived = editStore.actived;
         var keyCode = evnt.keyCode;
@@ -15729,7 +15855,7 @@ var Methods = {
 
         if (filterStore.visible) {
           if (isEsc) {
-            _this25.closeFilter();
+            _this26.closeFilter();
           }
 
           return;
@@ -15740,20 +15866,20 @@ var Methods = {
           evnt.preventDefault();
 
           if (ctxMenuStore.showChild && hasChildrenList(ctxMenuStore.selected)) {
-            _this25.moveCtxMenu(evnt, keyCode, ctxMenuStore, 'selectChild', 37, false, ctxMenuStore.selected.children);
+            _this26.moveCtxMenu(evnt, keyCode, ctxMenuStore, 'selectChild', 37, false, ctxMenuStore.selected.children);
           } else {
-            _this25.moveCtxMenu(evnt, keyCode, ctxMenuStore, 'selected', 39, true, _this25.ctxMenuList);
+            _this26.moveCtxMenu(evnt, keyCode, ctxMenuStore, 'selected', 39, true, _this26.ctxMenuList);
           }
-        } else if (keyboardConfig && mouseConfig && mouseOpts.area && _this25.handleKeyboardEvent) {
-          _this25.handleKeyboardEvent(evnt);
+        } else if (keyboardConfig && mouseConfig && mouseOpts.area && _this26.handleKeyboardEvent) {
+          _this26.handleKeyboardEvent(evnt);
         } else if (keyboardConfig && isSpacebar && keyboardOpts.isChecked && selected.row && selected.column && (selected.column.type === 'checkbox' || selected.column.type === 'radio')) {
           // 空格键支持选中复选框
           evnt.preventDefault();
 
           if (selected.column.type === 'checkbox') {
-            _this25.handleToggleCheckRowEvent(evnt, selected.args);
+            _this26.handleToggleCheckRowEvent(evnt, selected.args);
           } else {
-            _this25.triggerRadioRowEvent(evnt, selected.args);
+            _this26.triggerRadioRowEvent(evnt, selected.args);
           }
         } else if (isF2 && isEnableConf(editConfig)) {
           if (!isEditStatus) {
@@ -15762,15 +15888,15 @@ var Methods = {
               evnt.stopPropagation();
               evnt.preventDefault();
 
-              _this25.handleActived(selected.args, evnt);
+              _this26.handleActived(selected.args, evnt);
             }
           }
         } else if (isContextMenu) {
           // 如果按下上下文键
-          _this25._keyCtx = selected.row && selected.column && bodyCtxMenu.length;
-          clearTimeout(_this25.keyCtxTimeout);
-          _this25.keyCtxTimeout = setTimeout(function () {
-            _this25._keyCtx = false;
+          _this26._keyCtx = selected.row && selected.column && bodyCtxMenu.length;
+          clearTimeout(_this26.keyCtxTimeout);
+          _this26.keyCtxTimeout = setTimeout(function () {
+            _this26._keyCtx = false;
           }, 1000);
         } else if (isEnter && !hasAltKey && keyboardConfig && keyboardOpts.isEnter && (selected.row || actived.row || treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow)) {
           // 退出选中
@@ -15779,12 +15905,12 @@ var Methods = {
             if (actived.row) {
               params = actived.args;
 
-              _this25.clearActived(evnt); // 如果配置了选中功能，则为选中状态
+              _this26.clearActived(evnt); // 如果配置了选中功能，则为选中状态
 
 
               if (mouseConfig && mouseOpts.selected) {
-                _this25.$nextTick(function () {
-                  return _this25.handleSelected(params, evnt);
+                _this26.$nextTick(function () {
+                  return _this26.handleSelected(params, evnt);
                 });
               }
             }
@@ -15795,15 +15921,15 @@ var Methods = {
 
               if (hasShiftKey) {
                 if (keyboardOpts.enterToTab) {
-                  _this25.moveTabSelected(targetArgs, hasShiftKey, evnt);
+                  _this26.moveTabSelected(targetArgs, hasShiftKey, evnt);
                 } else {
-                  _this25.moveSelected(targetArgs, isLeftArrow, true, isRightArrow, false, evnt);
+                  _this26.moveSelected(targetArgs, isLeftArrow, true, isRightArrow, false, evnt);
                 }
               } else {
                 if (keyboardOpts.enterToTab) {
-                  _this25.moveTabSelected(targetArgs, hasShiftKey, evnt);
+                  _this26.moveTabSelected(targetArgs, hasShiftKey, evnt);
                 } else {
-                  _this25.moveSelected(targetArgs, isLeftArrow, false, isRightArrow, true, evnt);
+                  _this26.moveSelected(targetArgs, isLeftArrow, false, isRightArrow, true, evnt);
                 }
               }
             } else if (treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow) {
@@ -15814,14 +15940,14 @@ var Methods = {
                 evnt.preventDefault();
                 var targetRow = childrens[0];
                 params = {
-                  $table: _this25,
+                  $table: _this26,
                   row: targetRow
                 };
 
-                _this25.setTreeExpand(currentRow, true).then(function () {
-                  return _this25.scrollToRow(targetRow);
+                _this26.setTreeExpand(currentRow, true).then(function () {
+                  return _this26.scrollToRow(targetRow);
                 }).then(function () {
-                  return _this25.triggerCurrentRowEvent(evnt, params);
+                  return _this26.triggerCurrentRowEvent(evnt, params);
                 });
               }
             }
@@ -15830,18 +15956,18 @@ var Methods = {
           if (!isEditStatus) {
             // 如果按下了方向键
             if (selected.row && selected.column) {
-              _this25.moveSelected(selected.args, isLeftArrow, isUpArrow, isRightArrow, isDwArrow, evnt);
+              _this26.moveSelected(selected.args, isLeftArrow, isUpArrow, isRightArrow, isDwArrow, evnt);
             } else if ((isUpArrow || isDwArrow) && (rowOpts.isCurrent || highlightCurrentRow)) {
               // 当前行按键上下移动
-              _this25.moveCurrentRow(isUpArrow, isDwArrow, evnt);
+              _this26.moveCurrentRow(isUpArrow, isDwArrow, evnt);
             }
           }
         } else if (isTab && keyboardConfig && keyboardOpts.isTab) {
           // 如果按下了 Tab 键切换
           if (selected.row || selected.column) {
-            _this25.moveTabSelected(selected.args, hasShiftKey, evnt);
+            _this26.moveTabSelected(selected.args, hasShiftKey, evnt);
           } else if (actived.row || actived.column) {
-            _this25.moveTabSelected(actived.args, hasShiftKey, evnt);
+            _this26.moveTabSelected(actived.args, hasShiftKey, evnt);
           }
         } else if (keyboardConfig && (isDel || (treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow ? isBack && keyboardOpts.isArrow : isBack))) {
           if (!isEditStatus) {
@@ -15852,10 +15978,10 @@ var Methods = {
               if (delMethod) {
                 delMethod({
                   row: selected.row,
-                  rowIndex: _this25.getRowIndex(selected.row),
+                  rowIndex: _this26.getRowIndex(selected.row),
                   column: selected.column,
-                  columnIndex: _this25.getColumnIndex(selected.column),
-                  $table: _this25
+                  columnIndex: _this26.getColumnIndex(selected.column),
+                  $table: _this26
                 });
               } else {
                 methods_setCellValue(selected.row, selected.column, null);
@@ -15865,21 +15991,21 @@ var Methods = {
                 if (backMethod) {
                   backMethod({
                     row: selected.row,
-                    rowIndex: _this25.getRowIndex(selected.row),
+                    rowIndex: _this26.getRowIndex(selected.row),
                     column: selected.column,
-                    columnIndex: _this25.getColumnIndex(selected.column),
-                    $table: _this25
+                    columnIndex: _this26.getColumnIndex(selected.column),
+                    $table: _this26
                   });
                 } else {
-                  _this25.handleActived(selected.args, evnt);
+                  _this26.handleActived(selected.args, evnt);
                 }
               } else if (isDel) {
                 // 如果按下 del 键，更新表尾数据
-                _this25.updateFooter();
+                _this26.updateFooter();
               }
             } else if (isBack && keyboardOpts.isArrow && treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow) {
               // 如果树形表格回退键关闭当前行返回父节点
-              var _XEUtils$findTree = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.findTree(_this25.afterFullData, function (item) {
+              var _XEUtils$findTree = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.findTree(_this26.afterFullData, function (item) {
                 return item === currentRow;
               }, treeOpts),
                   parentRow = _XEUtils$findTree.parent;
@@ -15887,14 +16013,14 @@ var Methods = {
               if (parentRow) {
                 evnt.preventDefault();
                 params = {
-                  $table: _this25,
+                  $table: _this26,
                   row: parentRow
                 };
 
-                _this25.setTreeExpand(parentRow, false).then(function () {
-                  return _this25.scrollToRow(parentRow);
+                _this26.setTreeExpand(parentRow, false).then(function () {
+                  return _this26.scrollToRow(parentRow);
                 }).then(function () {
-                  return _this25.triggerCurrentRowEvent(evnt, params);
+                  return _this26.triggerCurrentRowEvent(evnt, params);
                 });
               }
             }
@@ -15911,21 +16037,21 @@ var Methods = {
               if (editMethod) {
                 editMethod({
                   row: selected.row,
-                  rowIndex: _this25.getRowIndex(selected.row),
+                  rowIndex: _this26.getRowIndex(selected.row),
                   column: selected.column,
-                  columnIndex: _this25.getColumnIndex(selected.column),
-                  $table: _this25
+                  columnIndex: _this26.getColumnIndex(selected.column),
+                  $table: _this26
                 });
               } else {
                 methods_setCellValue(selected.row, selected.column, null);
 
-                _this25.handleActived(selected.args, evnt);
+                _this26.handleActived(selected.args, evnt);
               }
             }
           }
         }
 
-        _this25.emitEvent('keydown', {}, evnt);
+        _this26.emitEvent('keydown', {}, evnt);
       });
     }
   },
@@ -15995,12 +16121,12 @@ var Methods = {
     this.recalculate(true);
   },
   handleTooltipLeaveMethod: function handleTooltipLeaveMethod() {
-    var _this26 = this;
+    var _this27 = this;
 
     var tooltipOpts = this.tooltipOpts;
     setTimeout(function () {
-      if (!_this26.tooltipActive) {
-        _this26.closeTooltip();
+      if (!_this27.tooltipActive) {
+        _this27.closeTooltip();
       }
     }, tooltipOpts.leaveDelay);
     return false;
@@ -16011,17 +16137,17 @@ var Methods = {
     this.closeTooltip();
   },
   handleTargetLeaveEvent: function handleTargetLeaveEvent() {
-    var _this27 = this;
+    var _this28 = this;
 
     var tooltipOpts = this.tooltipOpts;
     this.tooltipActive = false;
 
     if (tooltipOpts.enterable) {
       this.tooltipTimeout = setTimeout(function () {
-        var tooltip = _this27.$refs.tooltip;
+        var tooltip = _this28.$refs.tooltip;
 
         if (tooltip && !tooltip.isHover) {
-          _this27.closeTooltip();
+          _this28.closeTooltip();
         }
       }, tooltipOpts.leaveDelay);
     } else {
@@ -16251,14 +16377,14 @@ var Methods = {
    * @param {Boolean} value 是否选中
    */
   setCheckboxRow: function setCheckboxRow(rows, value) {
-    var _this28 = this;
+    var _this29 = this;
 
     if (rows && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isArray(rows)) {
       rows = [rows];
     }
 
     rows.forEach(function (row) {
-      return _this28.handleSelectRow({
+      return _this29.handleSelectRow({
         row: row
       }, !!value);
     });
@@ -16281,10 +16407,10 @@ var Methods = {
    * 多选，行选中事件
    * value 选中true 不选false 半选-1
    */
-  handleSelectRow: function handleSelectRow(_ref5, value) {
-    var _this29 = this;
+  handleSelectRow: function handleSelectRow(_ref6, value) {
+    var _this30 = this;
 
-    var row = _ref5.row;
+    var row = _ref6.row;
     var selection = this.selection,
         afterFullData = this.afterFullData,
         treeConfig = this.treeConfig,
@@ -16314,7 +16440,7 @@ var Methods = {
                 return half === item;
               });
 
-              _this29.handleCheckboxReserveRow(row, value);
+              _this30.handleCheckboxReserveRow(row, value);
             }
           }, treeOpts);
         } // 如果存在父节点，更新父节点状态
@@ -16386,7 +16512,7 @@ var Methods = {
                 return half === item;
               });
 
-              _this29.handleCheckboxReserveRow(row, value);
+              _this30.handleCheckboxReserveRow(row, value);
             }
           }, treeOpts);
         } // 如果存在父节点，更新父节点状态
@@ -16490,7 +16616,7 @@ var Methods = {
    * @param {Boolean} value 是否选中
    */
   setAllCheckboxRow: function setAllCheckboxRow(value) {
-    var _this30 = this;
+    var _this31 = this;
 
     var afterFullData = this.afterFullData,
         treeConfig = this.treeConfig,
@@ -16603,11 +16729,11 @@ var Methods = {
       if (reserve) {
         if (value) {
           selectRows.forEach(function (row) {
-            checkboxReserveRowMap[methods_getRowid(_this30, row)] = row;
+            checkboxReserveRowMap[methods_getRowid(_this31, row)] = row;
           });
         } else {
           afterFullData.forEach(function (row) {
-            return _this30.handleCheckboxReserveRow(row, false);
+            return _this31.handleCheckboxReserveRow(row, false);
           });
         }
       }
@@ -16802,7 +16928,7 @@ var Methods = {
    * 获取复选框保留选中的行
    */
   getCheckboxReserveRecords: function getCheckboxReserveRecords(isFull) {
-    var _this31 = this;
+    var _this32 = this;
 
     var fullDataRowIdData = this.fullDataRowIdData,
         afterFullData = this.afterFullData,
@@ -16817,11 +16943,11 @@ var Methods = {
 
       if (treeConfig) {
         external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.eachTree(afterFullData, function (row) {
-          afterFullIdMaps[methods_getRowid(_this31, row)] = 1;
+          afterFullIdMaps[methods_getRowid(_this32, row)] = 1;
         }, treeOpts);
       } else {
         afterFullData.forEach(function (row) {
-          afterFullIdMaps[methods_getRowid(_this31, row)] = 1;
+          afterFullIdMaps[methods_getRowid(_this32, row)] = 1;
         });
       }
 
@@ -16887,7 +17013,7 @@ var Methods = {
    * 清空行为不管是否被禁用还是保留记录，都将彻底清空选中状态
    */
   clearCheckboxRow: function clearCheckboxRow() {
-    var _this32 = this;
+    var _this33 = this;
 
     var tableFullData = this.tableFullData,
         treeConfig = this.treeConfig,
@@ -16910,7 +17036,7 @@ var Methods = {
 
     if (reserve) {
       tableFullData.forEach(function (row) {
-        return _this32.handleCheckboxReserveRow(row, false);
+        return _this33.handleCheckboxReserveRow(row, false);
       });
     }
 
@@ -17100,8 +17226,8 @@ var Methods = {
   /**
    * 行 hover 事件
    */
-  triggerHoverEvent: function triggerHoverEvent(evnt, _ref6) {
-    var row = _ref6.row;
+  triggerHoverEvent: function triggerHoverEvent(evnt, _ref7) {
+    var row = _ref7.row;
     this.setHoverRow(row);
   },
   setHoverRow: function setHoverRow(row) {
@@ -17201,13 +17327,13 @@ var Methods = {
    * 如果存在规则，则校验
    */
   handleChangeCell: function handleChangeCell(evnt, params) {
-    var _this33 = this;
+    var _this34 = this;
 
     this.checkValidate('blur').catch(function (e) {
       return e;
     }).then(function () {
-      _this33.handleActived(params, evnt).then(function () {
-        return _this33.checkValidate('change');
+      _this34.handleActived(params, evnt).then(function () {
+        return _this34.checkValidate('change');
       }).catch(function (e) {
         return e;
       });
@@ -17310,7 +17436,7 @@ var Methods = {
    * 如果是双击模式，则激活为编辑状态
    */
   triggerCellDblclickEvent: function triggerCellDblclickEvent(evnt, params) {
-    var _this34 = this;
+    var _this35 = this;
 
     var editStore = this.editStore,
         editConfig = this.editConfig,
@@ -17325,15 +17451,15 @@ var Methods = {
           this.checkValidate('blur').catch(function (e) {
             return e;
           }).then(function () {
-            _this34.handleActived(params, evnt).then(function () {
-              return _this34.checkValidate('change');
+            _this35.handleActived(params, evnt).then(function () {
+              return _this35.checkValidate('change');
             }).catch(function (e) {
               return e;
             });
           });
         } else if (editOpts.mode === 'cell') {
           this.handleActived(params, evnt).then(function () {
-            return _this34.checkValidate('change');
+            return _this35.checkValidate('change');
           }).catch(function (e) {
             return e;
           });
@@ -17344,7 +17470,7 @@ var Methods = {
     this.emitEvent('cell-dblclick', params, evnt);
   },
   handleDefaultSort: function handleDefaultSort() {
-    var _this35 = this;
+    var _this36 = this;
 
     var sortConfig = this.sortConfig,
         sortOpts = this.sortOpts;
@@ -17361,7 +17487,7 @@ var Methods = {
               order = item.order;
 
           if (field && order) {
-            var column = _this35.getColumnByField(field);
+            var column = _this36.getColumnByField(field);
 
             if (column && column.sortable) {
               column.order = order;
@@ -17404,7 +17530,7 @@ var Methods = {
     }
   },
   sort: function sort(sortConfs, sortOrder) {
-    var _this36 = this;
+    var _this37 = this;
 
     var sortOpts = this.sortOpts;
     var multiple = sortOpts.multiple,
@@ -17437,7 +17563,7 @@ var Methods = {
         var column = field;
 
         if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isString(field)) {
-          column = _this36.getColumnByField(field);
+          column = _this37.getColumnByField(field);
         }
 
         if (column && (column.sortable || column.remoteSort)) {
@@ -17446,7 +17572,7 @@ var Methods = {
           }
 
           if (orders.indexOf(order) === -1) {
-            order = getNextSortOrder(_this36, column);
+            order = getNextSortOrder(_this37, column);
           }
 
           if (column.order !== order) {
@@ -17594,7 +17720,7 @@ var Methods = {
    * @param {Row} row 行对象
    */
   reloadRowExpand: function reloadRowExpand(row) {
-    var _this37 = this;
+    var _this38 = this;
 
     var expandOpts = this.expandOpts,
         expandLazyLoadeds = this.expandLazyLoadeds;
@@ -17602,7 +17728,7 @@ var Methods = {
 
     if (lazy && expandLazyLoadeds.indexOf(row) === -1) {
       this.clearRowExpandLoaded(row).then(function () {
-        return _this37.handleAsyncRowExpand(row);
+        return _this38.handleAsyncRowExpand(row);
       });
     }
 
@@ -17679,28 +17805,28 @@ var Methods = {
     return this.setRowExpand(this.expandOpts.lazy ? this.tableData : this.tableFullData, expanded);
   },
   handleAsyncRowExpand: function handleAsyncRowExpand(row) {
-    var _this38 = this;
+    var _this39 = this;
 
     var rest = this.fullAllDataRowMap.get(row);
     return new Promise(function (resolve) {
-      _this38.expandLazyLoadeds.push(row);
+      _this39.expandLazyLoadeds.push(row);
 
-      _this38.expandOpts.loadMethod({
-        $table: _this38,
+      _this39.expandOpts.loadMethod({
+        $table: _this39,
         row: row,
-        rowIndex: _this38.getRowIndex(row),
-        $rowIndex: _this38.getVMRowIndex(row)
+        rowIndex: _this39.getRowIndex(row),
+        $rowIndex: _this39.getVMRowIndex(row)
       }).catch(function (e) {
         return e;
       }).then(function () {
         rest.expandLoaded = true;
-        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.remove(_this38.expandLazyLoadeds, function (item) {
+        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.remove(_this39.expandLazyLoadeds, function (item) {
           return item === row;
         });
 
-        _this38.rowExpandeds.push(row);
+        _this39.rowExpandeds.push(row);
 
-        resolve(_this38.$nextTick().then(_this38.recalculate));
+        resolve(_this39.$nextTick().then(_this39.recalculate));
       });
     });
   },
@@ -17713,7 +17839,7 @@ var Methods = {
    * @param {Boolean} expanded 是否展开
    */
   setRowExpand: function setRowExpand(rows, expanded) {
-    var _this39 = this;
+    var _this40 = this;
 
     var fullAllDataRowMap = this.fullAllDataRowMap,
         expandLazyLoadeds = this.expandLazyLoadeds,
@@ -17746,8 +17872,8 @@ var Methods = {
           columnIndex: columnIndex,
           $columnIndex: $columnIndex,
           row: row,
-          rowIndex: _this39.getRowIndex(row),
-          $rowIndex: _this39.getVMRowIndex(row)
+          rowIndex: _this40.getRowIndex(row),
+          $rowIndex: _this40.getVMRowIndex(row)
         });
       }) : rows;
 
@@ -17758,7 +17884,7 @@ var Methods = {
             var isLoad = lazy && !rest.expandLoaded && expandLazyLoadeds.indexOf(row) === -1;
 
             if (isLoad) {
-              lazyRests.push(_this39.handleAsyncRowExpand(row));
+              lazyRests.push(_this40.handleAsyncRowExpand(row));
             } else {
               rowExpandeds.push(row);
             }
@@ -17772,7 +17898,7 @@ var Methods = {
 
       if (reserve) {
         validRows.forEach(function (row) {
-          return _this39.handleRowExpandReserve(row, expanded);
+          return _this40.handleRowExpandReserve(row, expanded);
         });
       }
     }
@@ -17793,7 +17919,7 @@ var Methods = {
    * 手动清空展开行状态，数据会恢复成未展开的状态
    */
   clearRowExpand: function clearRowExpand() {
-    var _this40 = this;
+    var _this41 = this;
 
     var expandOpts = this.expandOpts,
         rowExpandeds = this.rowExpandeds,
@@ -17804,13 +17930,13 @@ var Methods = {
 
     if (reserve) {
       tableFullData.forEach(function (row) {
-        return _this40.handleRowExpandReserve(row, false);
+        return _this41.handleRowExpandReserve(row, false);
       });
     }
 
     return this.$nextTick().then(function () {
       if (isExists) {
-        _this40.recalculate();
+        _this41.recalculate();
       }
     });
   },
@@ -17865,7 +17991,8 @@ var Methods = {
     var treeOpts = this.treeOpts,
         treeExpandeds = this.treeExpandeds,
         fullAllDataRowMap = this.fullAllDataRowMap;
-    var lazy = treeOpts.lazy;
+    var transform = treeOpts.transform,
+        lazy = treeOpts.lazy;
     var rest = fullAllDataRowMap.get(row);
 
     if (lazy && rest) {
@@ -17875,6 +18002,11 @@ var Methods = {
       });
     }
 
+    if (transform) {
+      this.handleVirtualTreeToList();
+      return this.handleTableData();
+    }
+
     return this.$nextTick();
   },
 
@@ -17883,7 +18015,7 @@ var Methods = {
    * @param {Row} row 行对象
    */
   reloadTreeExpand: function reloadTreeExpand(row) {
-    var _this41 = this;
+    var _this42 = this;
 
     var treeOpts = this.treeOpts,
         treeLazyLoadeds = this.treeLazyLoadeds;
@@ -17893,13 +18025,13 @@ var Methods = {
 
     if (lazy && row[hasChild] && treeLazyLoadeds.indexOf(row) === -1) {
       this.clearTreeExpandLoaded(row).then(function () {
-        return _this41.handleAsyncTreeExpandChilds(row);
+        return _this42.handleAsyncTreeExpandChilds(row);
       }).then(function () {
         if (transform) {
-          return _this41.updateVirtualTreeData();
+          return _this42.handleTableData();
         }
       }).then(function () {
-        return _this41.recalculate();
+        return _this42.recalculate();
       });
     }
 
@@ -17975,20 +18107,21 @@ var Methods = {
     }
   },
   handleAsyncTreeExpandChilds: function handleAsyncTreeExpandChilds(row) {
-    var _this42 = this;
+    var _this43 = this;
 
     var fullAllDataRowMap = this.fullAllDataRowMap,
         treeExpandeds = this.treeExpandeds,
         treeOpts = this.treeOpts,
         treeLazyLoadeds = this.treeLazyLoadeds,
         checkboxOpts = this.checkboxOpts;
-    var loadMethod = treeOpts.loadMethod;
+    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: _this42,
+        $table: _this43,
         row: row
       }).catch(function () {
         return [];
@@ -18003,19 +18136,33 @@ var Methods = {
         }
 
         if (childRecords) {
-          _this42.loadTreeChildren(row, childRecords).then(function (childRows) {
+          _this43.loadTreeChildren(row, childRecords).then(function (childRows) {
             if (childRows.length && treeExpandeds.indexOf(row) === -1) {
               treeExpandeds.push(row);
             } // 如果当前节点已选中，则展开后子节点也被选中
 
 
-            if (!checkStrictly && _this42.isCheckedByCheckboxRow(row)) {
-              _this42.setCheckboxRow(childRows, true);
+            if (!checkStrictly && _this43.isCheckedByCheckboxRow(row)) {
+              _this43.setCheckboxRow(childRows, true);
             }
+
+            _this43.$nextTick().then(function () {
+              if (transform) {
+                return _this43.handleTableData();
+              }
+            }).then(function () {
+              return _this43.recalculate();
+            }).then(function () {
+              return resolve();
+            });
+          });
+        } else {
+          _this43.$nextTick().then(function () {
+            return _this43.recalculate();
+          }).then(function () {
+            return resolve();
           });
         }
-
-        resolve(_this42.$nextTick().then(_this42.recalculate));
       });
     });
   },
@@ -18047,7 +18194,7 @@ var Methods = {
    * @returns
    */
   handleBaseTreeExpand: function handleBaseTreeExpand(rows, expanded) {
-    var _this43 = this;
+    var _this44 = this;
 
     var fullAllDataRowMap = this.fullAllDataRowMap,
         tableFullData = this.tableFullData,
@@ -18095,7 +18242,7 @@ var Methods = {
           var isLoad = lazy && row[hasChild] && !rest.treeLoaded && treeLazyLoadeds.indexOf(row) === -1; // 是否使用懒加载
 
           if (isLoad) {
-            result.push(_this43.handleAsyncTreeExpandChilds(row));
+            result.push(_this44.handleAsyncTreeExpandChilds(row));
           } else {
             if (row[children] && row[children].length) {
               treeExpandeds.push(row);
@@ -18111,38 +18258,12 @@ var Methods = {
 
     if (reserve) {
       validRows.forEach(function (row) {
-        return _this43.handleTreeExpandReserve(row, expanded);
+        return _this44.handleTreeExpandReserve(row, expanded);
       });
     }
 
     return Promise.all(result).then(this.recalculate);
   },
-  updateVirtualTreeData: function updateVirtualTreeData() {
-    var _this44 = this;
-
-    var oldScrollYLoad = this.scrollYLoad,
-        treeExpandeds = this.treeExpandeds,
-        treeOpts = this.treeOpts,
-        treeFullData = this.treeFullData;
-    var fullData = [];
-    var expandMaps = new Map();
-    external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.eachTree(treeFullData, function (row, index, items, path, parent) {
-      if (!parent || expandMaps.has(parent) && treeExpandeds.indexOf(parent) > -1) {
-        expandMaps.set(row, 1);
-        fullData.push(row);
-      }
-    }, treeOpts);
-    var scrollYLoad = this.updateScrollYStatus(fullData);
-    this.tableFullData = scrollYLoad ? fullData : treeFullData;
-
-    if (scrollYLoad || oldScrollYLoad !== scrollYLoad) {
-      return this.handleTableData(true).then(function () {
-        return _this44.recalculate();
-      });
-    }
-
-    return this.$nextTick();
-  },
 
   /**
    * 虚拟树的展开与收起
@@ -18154,7 +18275,9 @@ var Methods = {
     var _this45 = this;
 
     return this.handleBaseTreeExpand(rows, expanded).then(function () {
-      return _this45.updateVirtualTreeData();
+      _this45.handleVirtualTreeToList();
+
+      return _this45.handleTableData();
     }).then(function () {
       return _this45.recalculate();
     });
@@ -18206,7 +18329,8 @@ var Methods = {
     var treeOpts = this.treeOpts,
         treeExpandeds = this.treeExpandeds,
         tableFullData = this.tableFullData;
-    var reserve = treeOpts.reserve;
+    var transform = treeOpts.transform,
+        reserve = treeOpts.reserve;
     var isExists = treeExpandeds.length;
     this.treeExpandeds = [];
 
@@ -18216,7 +18340,11 @@ var Methods = {
       }, treeOpts);
     }
 
-    return this.updateVirtualTreeData().then(function () {
+    return this.handleTableData().then(function () {
+      if (transform) {
+        _this46.handleVirtualTreeToList();
+      }
+
       if (isExists) {
         _this46.recalculate();
       }
@@ -18688,8 +18816,8 @@ var Methods = {
               }
 
               _this50.clearValidate();
-            }).catch(function (_ref7) {
-              var rule = _ref7.rule;
+            }).catch(function (_ref8) {
+              var rule = _ref8.rule;
 
               if (customVal) {
                 methods_setCellValue(row, column, cellValue);
@@ -20216,6 +20344,7 @@ function handleUupdateResize(_vm) {
 
 
 
+
 var Table = Object.assign(table, {
   install: function install(Vue) {
     if (typeof window !== 'undefined' && window.VXETableMixin) {
@@ -20252,6 +20381,7 @@ var Table = Object.assign(table, {
 
 
 
+
 /* harmony default export */ var panel = ({
   name: 'VxeTableFilter',
   props: {
@@ -20594,7 +20724,7 @@ var Table = Object.assign(table, {
           var maxHeight = null;
 
           if (filterHeight >= bodyElem.clientHeight) {
-            maxHeight = Math.max(40, bodyElem.clientHeight - (filterFootElem ? filterFootElem.offsetHeight : 0) - (filterHeadElem ? filterHeadElem.offsetHeight : 0));
+            maxHeight = Math.max(60, bodyElem.clientHeight - (filterFootElem ? filterFootElem.offsetHeight : 0) - (filterHeadElem ? filterHeadElem.offsetHeight : 0));
           }
 
           if (column.fixed === 'left') {
@@ -20909,6 +21039,7 @@ var Filter = {
 
 
 
+
 /* harmony default export */ var menu_src_mixin = ({
   methods: {
     /**
@@ -21302,7 +21433,7 @@ var Menu = {
 var mixin_getRowid = UtilTools.getRowid;
 
 function insertTreeRow(_vm, newRecords, isAppend) {
-  var treeFullData = _vm.treeFullData,
+  var tableFullTreeData = _vm.tableFullTreeData,
       afterFullData = _vm.afterFullData,
       fullDataRowIdData = _vm.fullDataRowIdData,
       fullAllDataRowIdData = _vm.fullAllDataRowIdData,
@@ -21311,7 +21442,7 @@ function insertTreeRow(_vm, newRecords, isAppend) {
   newRecords.forEach(function (item) {
     var parentRowId = item[treeOpts.parentField];
     var rowid = mixin_getRowid(_vm, item);
-    var matchObj = parentRowId ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.findTree(treeFullData, function (item) {
+    var matchObj = parentRowId ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.findTree(tableFullTreeData, function (item) {
       return parentRowId === item[treeOpts.rowField];
     }, treeOpts) : null;
 
@@ -21343,7 +21474,7 @@ function insertTreeRow(_vm, newRecords, isAppend) {
       if (false) {}
 
       afterFullData[funcName](item);
-      treeFullData[funcName](item);
+      tableFullTreeData[funcName](item);
       var _rest = {
         row: item,
         rowid: rowid,
@@ -21351,7 +21482,7 @@ function insertTreeRow(_vm, newRecords, isAppend) {
         index: -1,
         _index: -1,
         $index: -1,
-        items: treeFullData,
+        items: tableFullTreeData,
         parent: null,
         level: 0
       };
@@ -21359,8 +21490,6 @@ function insertTreeRow(_vm, newRecords, isAppend) {
       fullAllDataRowIdData[rowid] = _rest;
     }
   });
-
-  _vm.updateVirtualTreeData();
 }
 
 /* harmony default export */ var edit_src_mixin = ({
@@ -21386,12 +21515,10 @@ function insertTreeRow(_vm, newRecords, isAppend) {
       var _this = this,
           _editStore$insertList;
 
-      var treeFullData = this.treeFullData,
+      var tableFullTreeData = this.tableFullTreeData,
           mergeList = this.mergeList,
           afterFullData = this.afterFullData,
           editStore = this.editStore,
-          sYOpts = this.sYOpts,
-          scrollYLoad = this.scrollYLoad,
           tableFullData = this.tableFullData,
           treeConfig = this.treeConfig,
           fullDataRowIdData = this.fullDataRowIdData,
@@ -21444,7 +21571,7 @@ function insertTreeRow(_vm, newRecords, isAppend) {
         } else {
           // 如果为虚拟树
           if (treeConfig && transform) {
-            var matchObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.findTree(treeFullData, function (item) {
+            var matchObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.findTree(tableFullTreeData, function (item) {
               return row[treeOpts.rowField] === item[treeOpts.rowField];
             }, treeOpts);
 
@@ -21477,7 +21604,6 @@ function insertTreeRow(_vm, newRecords, isAppend) {
                 fullDataRowIdData[rowid] = rest;
                 fullAllDataRowIdData[rowid] = rest;
               });
-              this.updateVirtualTreeData();
             } else {
               if (false) {}
 
@@ -21513,14 +21639,13 @@ function insertTreeRow(_vm, newRecords, isAppend) {
 
       (_editStore$insertList = editStore.insertList).unshift.apply(_editStore$insertList, _toConsumableArray(newRecords));
 
-      this.scrollYLoad = !treeConfig && sYOpts.gt > -1 && sYOpts.gt < tableFullData.length;
-      this.handleTableData(transform);
+      this.handleTableData(treeConfig && treeOpts.transform);
       this.updateFooter();
       this.cacheRowMap();
       this.updateAfterDataIndex();
       this.checkSelectionStatus();
 
-      if (scrollYLoad) {
+      if (this.scrollYLoad) {
         this.updateScrollYSpace();
       }
 
@@ -21547,15 +21672,13 @@ function insertTreeRow(_vm, newRecords, isAppend) {
 
       var afterFullData = this.afterFullData,
           tableFullData = this.tableFullData,
-          treeFullData = this.treeFullData,
+          tableFullTreeData = this.tableFullTreeData,
           treeConfig = this.treeConfig,
           mergeList = this.mergeList,
           editStore = this.editStore,
           checkboxOpts = this.checkboxOpts,
           selection = this.selection,
           isInsertByRow = this.isInsertByRow,
-          sYOpts = this.sYOpts,
-          scrollYLoad = this.scrollYLoad,
           treeOpts = this.treeOpts;
       var transform = treeOpts.transform;
       var actived = editStore.actived,
@@ -21598,7 +21721,7 @@ function insertTreeRow(_vm, newRecords, isAppend) {
         if (treeConfig && transform) {
           rows.forEach(function (row) {
             var rowid = mixin_getRowid(_this2, row);
-            var matchObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.findTree(treeFullData, function (item) {
+            var matchObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.findTree(tableFullTreeData, function (item) {
               return rowid === mixin_getRowid(_this2, item);
             }, treeOpts);
 
@@ -21612,8 +21735,6 @@ function insertTreeRow(_vm, newRecords, isAppend) {
             if (afIndex > -1) {
               afterFullData.splice(afIndex, 1);
             }
-
-            _this2.updateVirtualTreeData();
           });
         } else {
           rows.forEach(function (row) {
@@ -21657,14 +21778,13 @@ function insertTreeRow(_vm, newRecords, isAppend) {
           insertList.splice(iIndex, 1);
         }
       });
-      this.scrollYLoad = !treeConfig && sYOpts.gt > -1 && sYOpts.gt < tableFullData.length;
-      this.handleTableData(transform);
+      this.handleTableData(treeConfig && treeOpts.transform);
       this.updateFooter();
       this.cacheRowMap();
       this.updateAfterDataIndex();
       this.checkSelectionStatus();
 
-      if (scrollYLoad) {
+      if (this.scrollYLoad) {
         this.updateScrollYSpace();
       }
 
@@ -21739,7 +21859,7 @@ function insertTreeRow(_vm, newRecords, isAppend) {
       var _this6 = this;
 
       var treeConfig = this.treeConfig,
-          treeFullData = this.treeFullData,
+          tableFullTreeData = this.tableFullTreeData,
           tableFullData = this.tableFullData,
           treeOpts = this.treeOpts;
       var insertList = this.editStore.insertList;
@@ -21750,7 +21870,7 @@ function insertTreeRow(_vm, newRecords, isAppend) {
         if (treeConfig && treeOpts.transform) {
           insertList.forEach(function (row) {
             var rowid = mixin_getRowid(_this6, row);
-            var matchObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.findTree(treeFullData, function (item) {
+            var matchObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.findTree(tableFullTreeData, function (item) {
               return rowid === mixin_getRowid(_this6, item);
             }, treeOpts);
 
@@ -22237,6 +22357,7 @@ function _arrayWithHoles(arr) {
 
 
 
+
 function _iterableToArrayLimit(arr, i) {
   var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"];
 
@@ -22293,6 +22414,8 @@ function _slicedToArray(arr, i) {
 
 
 
+
+
 var allActivedModals = [];
 var msgQueue = [];
 /* harmony default export */ var modal = ({
@@ -23493,6 +23616,7 @@ var es_string_pad_start = __webpack_require__("4d90");
 
 
 
+
 var yearSize = 20;
 var monthSize = 20;
 var quarterSize = 8;
@@ -26031,6 +26155,7 @@ function renderExtraSuffixIcon(h, _vm) {
 
 
 
+
 function isOptionVisible(option) {
   return option.visible !== false;
 }
@@ -26040,7 +26165,7 @@ function getOptUniqueId() {
 }
 
 function getOptkey(_vm) {
-  return _vm.optionId || '_XID';
+  return _vm.optionId || '_X_ID';
 }
 
 function getOptid(_vm, option) {
@@ -26925,6 +27050,7 @@ function select_renderOpts(h, _vm) {
 
 
 
+
 var util_OptionConfig = /*#__PURE__*/function () {
   function OptionConfig($xeselect, _vm) {
     _classCallCheck(this, OptionConfig);
@@ -27049,6 +27175,7 @@ Object.keys(option_props).forEach(function (name) {
 
 
 
+
 /* harmony default export */ var export_panel = ({
   name: 'VxeExportPanel',
   props: {
@@ -27588,6 +27715,7 @@ Object.keys(option_props).forEach(function (name) {
 
 
 
+
 /* harmony default export */ var import_panel = ({
   name: 'VxeImportPanel',
   props: {
@@ -27837,7 +27965,7 @@ function hasTreeChildren($xetable, row) {
   return row[treeOpts.children] && row[treeOpts.children].length > 0;
 }
 
-function getSeq($xetable, row, rowIndex, column, columnIndex, path) {
+function getSeq($xetable, row, rowIndex, column, columnIndex) {
   var seqOpts = $xetable.seqOpts;
   var seqMethod = seqOpts.seqMethod || column.seqMethod;
 
@@ -27850,11 +27978,7 @@ function getSeq($xetable, row, rowIndex, column, columnIndex, path) {
     });
   }
 
-  if (path) {
-    return toTreePathSeq(path);
-  }
-
-  return seqOpts.startIndex + rowIndex + 1;
+  return $xetable.getRowSeq(row);
 }
 
 function defaultFilterExportColumn(column) {
@@ -27927,7 +28051,7 @@ function getLabelData($xetable, opts, columns, datas) {
           } else {
             switch (column.type) {
               case 'seq':
-                cellValue = getSeq($xetable, row, rowIndex, column, columnIndex, path);
+                cellValue = getSeq($xetable, row, rowIndex, column, columnIndex);
                 break;
 
               case 'checkbox':
@@ -28003,7 +28127,7 @@ function getLabelData($xetable, opts, columns, datas) {
       } else {
         switch (column.type) {
           case 'seq':
-            cellValue = getSeq($xetable, row, rowIndex, column, columnIndex, null);
+            cellValue = getSeq($xetable, row, rowIndex, column, columnIndex);
             break;
 
           case 'checkbox':
@@ -29662,6 +29786,7 @@ var convertToRows = function convertToRows(originColumns) {
 
 
 
+
 function print(options) {
   var opts = Object.assign({}, options, {
     type: 'html'
@@ -29700,6 +29825,7 @@ var Export = {
 
 
 
+
 function getTargetOffset(target, container) {
   var offsetTop = 0;
   var offsetLeft = 0;
@@ -30188,6 +30314,9 @@ var Keyboard = {
 
 
 
+
+
+
 /**
  * 校验规则
  */
@@ -30386,7 +30515,7 @@ function validErrorRuleValue(rule, val) {
           var ruleProps = Object.keys(validRest);
           return _this2.$nextTick().then(function () {
             if (ruleProps.length) {
-              return validRest[ruleProps[0]][0];
+              return Promise.reject(validRest[ruleProps[0]][0]);
             }
 
             if (cb) {
@@ -31085,6 +31214,7 @@ var cellType = 'header';
 // CONCATENATED MODULE: ./packages/header/index.js
 
 
+
 var Header = Object.assign(header, {
   install: function install(Vue) {
     Vue.component(header.name, header);
@@ -31098,6 +31228,7 @@ var Header = Object.assign(header, {
 
 
 
+
 var footer_cellType = 'footer';
 
 function mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex) {
@@ -31446,6 +31577,7 @@ function mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex) {
 // CONCATENATED MODULE: ./packages/footer/index.js
 
 
+
 var Footer = Object.assign(footer, {
   install: function install(Vue) {
     Vue.component(footer.name, footer);
@@ -31603,6 +31735,7 @@ Object.keys(column_props).forEach(function (name) {
 // CONCATENATED MODULE: ./packages/column/index.js
 
 
+
 var Column = Object.assign(src_column, {
   install: function install(Vue) {
     Vue.component(src_column.name, src_column); // 兼容旧用法
@@ -31626,6 +31759,7 @@ var Column = Object.assign(src_column, {
 // CONCATENATED MODULE: ./packages/colgroup/index.js
 
 
+
 var Colgroup = Object.assign(src_group, {
   install: function install(Vue) {
     Vue.component(src_group.name, src_group); // 兼容旧用法
@@ -32853,6 +32987,7 @@ Object.keys(packages_table.methods).forEach(function (name) {
 
 
 
+
 var Grid = Object.assign(grid, {
   install: function install(Vue) {
     v_x_e_table.Grid = grid;
@@ -32874,6 +33009,8 @@ var Grid = Object.assign(grid, {
 
 
 
+
+
 var renderDropdowns = function renderDropdowns(h, _vm, item, isBtn) {
   var _e = _vm._e;
   var dropdowns = item.dropdowns;
@@ -33645,6 +33782,7 @@ function renderCustoms(h, _vm) {
 // CONCATENATED MODULE: ./packages/toolbar/index.js
 
 
+
 var Toolbar = Object.assign(src_toolbar, {
   install: function install(Vue) {
     Vue.component(src_toolbar.name, src_toolbar);
@@ -34134,6 +34272,7 @@ var Toolbar = Object.assign(src_toolbar, {
 // CONCATENATED MODULE: ./packages/pager/index.js
 
 
+
 var Pager = Object.assign(pager, {
   install: function install(Vue) {
     Vue.component(pager.name, pager);
@@ -34143,6 +34282,7 @@ var Pager = Object.assign(pager, {
 // CONCATENATED MODULE: ./packages/checkbox/index.js
 
 
+
 var Checkbox = Object.assign(src_checkbox, {
   install: function install(Vue) {
     Vue.component(src_checkbox.name, src_checkbox);
@@ -34152,6 +34292,7 @@ var Checkbox = Object.assign(src_checkbox, {
 // CONCATENATED MODULE: ./packages/checkbox/src/group.js
 
 
+
 /* harmony default export */ var checkbox_src_group = ({
   name: 'VxeCheckboxGroup',
   props: {
@@ -34205,6 +34346,7 @@ var Checkbox = Object.assign(src_checkbox, {
 // CONCATENATED MODULE: ./packages/checkbox-group/index.js
 
 
+
 var CheckboxGroup = Object.assign(checkbox_src_group, {
   install: function install(Vue) {
     Vue.component(checkbox_src_group.name, checkbox_src_group);
@@ -34214,6 +34356,7 @@ var CheckboxGroup = Object.assign(checkbox_src_group, {
 // CONCATENATED MODULE: ./packages/radio/index.js
 
 
+
 var Radio = Object.assign(src_radio, {
   install: function install(Vue) {
     Vue.component(src_radio.name, src_radio);
@@ -34267,6 +34410,7 @@ var Radio = Object.assign(src_radio, {
 // CONCATENATED MODULE: ./packages/radio-group/index.js
 
 
+
 var RadioGroup = Object.assign(radio_src_group, {
   install: function install(Vue) {
     Vue.component(radio_src_group.name, radio_src_group);
@@ -34370,6 +34514,7 @@ var RadioGroup = Object.assign(radio_src_group, {
 // CONCATENATED MODULE: ./packages/radio-button/index.js
 
 
+
 var RadioButton = Object.assign(src_button, {
   install: function install(Vue) {
     Vue.component(src_button.name, src_button);
@@ -34379,6 +34524,7 @@ var RadioButton = Object.assign(src_button, {
 // CONCATENATED MODULE: ./packages/input/index.js
 
 
+
 var Input = Object.assign(input, {
   install: function install(Vue) {
     Vue.component(input.name, input);
@@ -34397,6 +34543,7 @@ var Input = Object.assign(input, {
 
 
 
+
 var autoTxtElem;
 /* harmony default export */ var src_textarea = ({
   name: 'VxeTextarea',
@@ -34665,6 +34812,7 @@ var autoTxtElem;
 // CONCATENATED MODULE: ./packages/textarea/index.js
 
 
+
 var Textarea = Object.assign(src_textarea, {
   install: function install(Vue) {
     Vue.component(src_textarea.name, src_textarea);
@@ -35068,6 +35216,7 @@ var Textarea = Object.assign(src_textarea, {
 // CONCATENATED MODULE: ./packages/button/index.js
 
 
+
 var Button = Object.assign(button_src_button, {
   install: function install(Vue) {
     Vue.component(button_src_button.name, button_src_button);
@@ -35082,6 +35231,8 @@ var Button = Object.assign(button_src_button, {
 
 
 
+
+
 /* eslint-disable @typescript-eslint/no-use-before-define */
 
 var ModalClass = null;
@@ -35217,6 +35368,7 @@ var Modal = Object.assign(modal, {
 
 
 
+
 function updateTipStyle(_vm) {
   var wrapperElem = _vm.$el,
       tipTarget = _vm.tipTarget,
@@ -35537,6 +35689,7 @@ function updateTipStyle(_vm) {
 
 
 
+
 var Tooltip = Object.assign(src_tooltip, {
   install: function install(Vue) {
     v_x_e_table._tooltip = 1;
@@ -35553,6 +35706,7 @@ var Tooltip = Object.assign(src_tooltip, {
 
 
 
+
 var util_ItemConfig = /*#__PURE__*/function () {
   function ItemConfig($xeform, item) {
     _classCallCheck(this, ItemConfig);
@@ -35730,6 +35884,9 @@ function renderTitle(h, _vm, item) {
 
 
 
+
+
+
 
 
 
@@ -36562,6 +36719,7 @@ function renderItems(h, _vm, itemList) {
 // CONCATENATED MODULE: ./packages/form/index.js
 
 
+
 var Form = Object.assign(src_form, {
   install: function install(Vue) {
     Vue.component(src_form.name, src_form);
@@ -36751,6 +36909,7 @@ var form_item_renderItem = function renderItem(h, _vm, item, slots) {
 // CONCATENATED MODULE: ./packages/form-item/index.js
 
 
+
 var FormItem = Object.assign(form_item, {
   install: function install(Vue) {
     Vue.component(form_item.name, form_item);
@@ -36780,6 +36939,7 @@ var FormItem = Object.assign(form_item, {
 // CONCATENATED MODULE: ./packages/form-gather/index.js
 
 
+
 var FormGather = Object.assign(form_gather, {
   install: function install(Vue) {
     Vue.component(form_gather.name, form_gather);
@@ -36846,6 +37006,7 @@ Object.keys(optgroup_props).forEach(function (name) {
 
 
 
+
 var Select = Object.assign(src_select, {
   Option: src_option,
   Optgroup: optgroup,
@@ -36859,6 +37020,7 @@ var Select = Object.assign(src_select, {
 // CONCATENATED MODULE: ./packages/optgroup/index.js
 
 
+
 var Optgroup = Object.assign(optgroup, {
   install: function install(Vue) {
     Vue.component(optgroup.name, optgroup);
@@ -36868,6 +37030,7 @@ var Optgroup = Object.assign(optgroup, {
 // CONCATENATED MODULE: ./packages/option/index.js
 
 
+
 var Option = Object.assign(src_option, {
   install: function install(Vue) {
     Vue.component(src_option.name, src_option);
@@ -37022,6 +37185,7 @@ var Option = Object.assign(src_option, {
 // CONCATENATED MODULE: ./packages/switch/index.js
 
 
+
 var Switch = Object.assign(src_switch, {
   install: function install(Vue) {
     Vue.component(src_switch.name, src_switch);
@@ -37037,6 +37201,8 @@ var Switch = Object.assign(src_switch, {
 
 
 
+
+
 /* harmony default export */ var src_list = ({
   name: 'VxeList',
   mixins: [size],
@@ -37403,6 +37569,7 @@ var Switch = Object.assign(src_switch, {
 // CONCATENATED MODULE: ./packages/list/index.js
 
 
+
 var List = Object.assign(src_list, {
   install: function install(Vue) {
     Vue.component(src_list.name, src_list);
@@ -37415,6 +37582,8 @@ var List = Object.assign(src_list, {
 
 
 
+
+
 /* harmony default export */ var pulldown = ({
   name: 'VxePulldown',
   mixins: [size],
@@ -37715,6 +37884,7 @@ var List = Object.assign(src_list, {
 // CONCATENATED MODULE: ./packages/pulldown/index.js
 
 
+
 var Pulldown = Object.assign(pulldown, {
   install: function install(Vue) {
     Vue.component(pulldown.name, pulldown);