vxe-table 3.4.7 → 3.4.8

package/lib/index.umd.js

@@ -13241,31 +13241,17 @@ var Methods = {
   handleTableData: function handleTableData(force) {
     var _this2 = this;
 
-    var treeConfig = this.treeConfig,
-        scrollYLoad = this.scrollYLoad,
+    var scrollYLoad = this.scrollYLoad,
         scrollYStore = this.scrollYStore,
         fullDataRowIdData = this.fullDataRowIdData,
-        treeExpandeds = this.treeExpandeds,
-        treeOpts = this.treeOpts;
-    var fullList = []; // 是否进行数据处理
+        afterFullData = this.afterFullData;
+    var fullList = afterFullData; // 是否进行数据处理
 
     if (force) {
-      this.updateAfterFullData();
-    } // 如果为虚拟树，将树结构拍平
-
+      // 更新数据，处理筛选和排序
+      this.updateAfterFullData(); // 如果为虚拟树，将树结构拍平
 
-    if (treeConfig && treeOpts.transform) {
-      var expandMaps = new Map();
-      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.eachTree(this.afterTreeFullData, function (row, index, items, path, parent) {
-        if (!parent || expandMaps.has(parent) && treeExpandeds.indexOf(parent) > -1) {
-          expandMaps.set(row, 1);
-          fullList.push(row);
-        }
-      }, {
-        children: treeOpts.mapChildren
-      });
-    } else {
-      fullList = this.afterFullData;
+      fullList = this.handleVirtualTreeToList();
     }
 
     var tableData = scrollYLoad ? fullList.slice(scrollYStore.startIndex, scrollYStore.endIndex) : fullList.slice(0);
@@ -14244,6 +14230,36 @@ 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;
+  },
+
   /**
    * 获取处理后全量的表格数据
    * 如果存在筛选条件，继续处理
@@ -17975,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) {
@@ -17985,6 +18002,11 @@ var Methods = {
       });
     }
 
+    if (transform) {
+      this.handleVirtualTreeToList();
+      return this.handleTableData();
+    }
+
     return this.$nextTick();
   },
 
@@ -18253,6 +18275,8 @@ var Methods = {
     var _this45 = this;
 
     return this.handleBaseTreeExpand(rows, expanded).then(function () {
+      _this45.handleVirtualTreeToList();
+
       return _this45.handleTableData();
     }).then(function () {
       return _this45.recalculate();
@@ -18305,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 = [];
 
@@ -18316,6 +18341,10 @@ var Methods = {
     }
 
     return this.handleTableData().then(function () {
+      if (transform) {
+        _this46.handleVirtualTreeToList();
+      }
+
       if (isExists) {
         _this46.recalculate();
       }