vxe-table 4.1.10 → 4.1.13

package/lib/index.umd.js

@@ -12370,7 +12370,12 @@ var editHook = {
 
         $xetable.updateFooter();
         $xetable.cacheRowMap();
-        $xetable.handleTableData(treeConfig && treeOpts.transform);
+        $xetable.handleTableData(treeConfig && transform);
+
+        if (!(treeConfig && transform)) {
+          $xetable.updateAfterDataIndex();
+        }
+
         $xetable.checkSelectionStatus();
 
         if (reactData.scrollYLoad) {
@@ -12504,7 +12509,12 @@ var editHook = {
         });
         $xetable.updateFooter();
         $xetable.cacheRowMap();
-        $xetable.handleTableData(treeConfig && treeOpts.transform);
+        $xetable.handleTableData(treeConfig && transform);
+
+        if (!(treeConfig && transform)) {
+          $xetable.updateAfterDataIndex();
+        }
+
         $xetable.checkSelectionStatus();
 
         if (reactData.scrollYLoad) {
@@ -19631,7 +19641,7 @@ var tableExportHook = {
       return row[treeOpts.children] && row[treeOpts.children].length;
     };
 
-    var getSeq = function getSeq(row, rowIndex, column, columnIndex, path) {
+    var getSeq = function getSeq(row, rowIndex, column, columnIndex) {
       var seqOpts = computeSeqOpts.value;
       var seqMethod = seqOpts.seqMethod || column.seqMethod;
 
@@ -19644,11 +19654,7 @@ var tableExportHook = {
         });
       }
 
-      if (path) {
-        return toTreePathSeq(path);
-      }
-
-      return seqOpts.startIndex + rowIndex + 1;
+      return $xetable.getRowSeq(row);
     };
 
     var toBooleanValue = function toBooleanValue(cellValue) {
@@ -19705,7 +19711,7 @@ var tableExportHook = {
               } else {
                 switch (column.type) {
                   case 'seq':
-                    cellValue = getSeq(row, rowIndex, column, columnIndex, path);
+                    cellValue = getSeq(row, rowIndex, column, columnIndex);
                     break;
 
                   case 'checkbox':
@@ -19781,7 +19787,7 @@ var tableExportHook = {
           } else {
             switch (column.type) {
               case 'seq':
-                cellValue = getSeq(row, rowIndex, column, columnIndex, []);
+                cellValue = getSeq(row, rowIndex, column, columnIndex);
                 break;
 
               case 'checkbox':
@@ -21739,7 +21745,7 @@ var validatorHook = {
           var ruleProps = Object.keys(validRest);
           return Object(external_commonjs_vue_commonjs2_vue_root_Vue_["nextTick"])().then(function () {
             if (ruleProps.length) {
-              return validRest[ruleProps[0]][0];
+              return Promise.reject(validRest[ruleProps[0]][0]);
             }
 
             if (cb) {
@@ -31194,7 +31200,7 @@ var lineOffsetSizes = {
           rowExpandeds = tableReactData.rowExpandeds,
           expandColumn = tableReactData.expandColumn,
           selectRow = tableReactData.selectRow;
-      var fullDataRowIdData = tableInternalData.fullDataRowIdData;
+      var fullAllDataRowIdData = tableInternalData.fullAllDataRowIdData;
       var checkboxOpts = computeCheckboxOpts.value;
       var radioOpts = computeRadioOpts.value;
       var treeOpts = computeTreeOpts.value;
@@ -31233,7 +31239,7 @@ var lineOffsetSizes = {
         }
 
         var rowid = util_getRowid($xetable, row);
-        var rest = fullDataRowIdData[rowid];
+        var rest = fullAllDataRowIdData[rowid];
         var rowLevel = 0;
         var seq = -1;
 
@@ -33009,7 +33015,6 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
           var rowid = util_getRowid($xetable, row);
 
           var allrest = fullAllDataRowIdData[rowid];
-          var fullrest = fullDataRowIdData[rowid];
           var seq = path.map(function (num, i) {
             return i % 2 === 0 ? Number(num) + 1 : '.';
           }).join('');
@@ -33017,24 +33022,8 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
           if (allrest) {
             allrest.seq = seq;
             allrest._index = index;
-          }
-
-          if (fullrest) {
-            fullrest.seq = seq;
-            fullrest._index = index;
           } else {
-            fullAllDataRowIdData[rowid] = {
-              row: row,
-              rowid: rowid,
-              seq: seq,
-              index: -1,
-              $index: -1,
-              _index: index,
-              items: [],
-              parent: null,
-              level: 0
-            };
-            fullDataRowIdData[rowid] = {
+            var rest = {
               row: row,
               rowid: rowid,
               seq: seq,
@@ -33045,37 +33034,24 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
               parent: null,
               level: 0
             };
+            fullAllDataRowIdData[rowid] = rest;
+            fullDataRowIdData[rowid] = rest;
           }
-        }, treeOpts);
+        }, {
+          children: treeOpts.mapChildren
+        });
       } else {
         afterFullData.forEach(function (row, index) {
           var rowid = util_getRowid($xetable, row);
 
           var allrest = fullAllDataRowIdData[rowid];
-          var fullrest = fullDataRowIdData[rowid];
           var seq = index + 1;
 
           if (allrest) {
             allrest.seq = seq;
             allrest._index = index;
-          }
-
-          if (fullrest) {
-            fullrest.seq = seq;
-            fullrest._index = index;
           } else {
-            fullAllDataRowIdData[rowid] = {
-              row: row,
-              rowid: rowid,
-              seq: seq,
-              index: -1,
-              $index: -1,
-              _index: index,
-              items: [],
-              parent: null,
-              level: 0
-            };
-            fullDataRowIdData[rowid] = {
+            var rest = {
               row: row,
               rowid: rowid,
               seq: seq,
@@ -33086,10 +33062,41 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
               parent: null,
               level: 0
             };
+            fullAllDataRowIdData[rowid] = rest;
+            fullDataRowIdData[rowid] = rest;
           }
         });
       }
     };
+    /**
+     * 如果为虚拟树，将树结构拍平
+     * @returns
+     */
+
+
+    var handleVirtualTreeToList = function handleVirtualTreeToList() {
+      var treeConfig = props.treeConfig;
+      var treeExpandeds = reactData.treeExpandeds;
+      var treeOpts = computeTreeOpts.value;
+
+      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(internalData.afterTreeFullData, function (row, index, items, path, parent) {
+          if (!parent || expandMaps.has(parent) && $xetable.findRowIndexOf(treeExpandeds, parent) > -1) {
+            expandMaps.set(row, 1);
+            fullData.push(row);
+          }
+        }, {
+          children: treeOpts.mapChildren
+        });
+        internalData.afterFullData = fullData;
+        updateScrollYStatus(fullData);
+        return fullData;
+      }
+
+      return internalData.afterFullData;
+    };
     /**
      * 获取处理后全量的表格数据
      * 如果存在筛选条件，继续处理
@@ -33210,6 +33217,7 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
           };
 
           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
             }));
@@ -33219,8 +33227,18 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
             tableTree = tableData;
           }
         } else {
-          tableData = treeConfig ? tableFullTreeData.slice(0) : tableFullData.slice(0);
-          tableTree = tableData;
+          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;
+          }
         } // 处理排序（不能用于树形结构）
         // 支持单列、多列、组合排序
 
@@ -34526,6 +34544,7 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
 
     var handleVirtualTreeExpand = function handleVirtualTreeExpand(rows, expanded) {
       return handleBaseTreeExpand(rows, expanded).then(function () {
+        handleVirtualTreeToList();
         return tablePrivateMethods.handleTableData();
       }).then(function () {
         return tableMethods.recalculate();
@@ -34566,12 +34585,12 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
 
     var createGetRowCacheProp = function createGetRowCacheProp(prop) {
       return function (row) {
-        var fullDataRowIdData = internalData.fullDataRowIdData;
+        var fullAllDataRowIdData = internalData.fullAllDataRowIdData;
 
         if (row) {
           var rowid = util_getRowid($xetable, row);
 
-          var rest = fullDataRowIdData[rowid];
+          var rest = fullAllDataRowIdData[rowid];
 
           if (rest) {
             return rest[prop];
@@ -36225,7 +36244,8 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
         var treeExpandeds = reactData.treeExpandeds;
         var fullAllDataRowIdData = internalData.fullAllDataRowIdData;
         var treeOpts = computeTreeOpts.value;
-        var lazy = treeOpts.lazy;
+        var transform = treeOpts.transform,
+            lazy = treeOpts.lazy;
 
         var rest = fullAllDataRowIdData[util_getRowid($xetable, row)];
 
@@ -36236,6 +36256,11 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
           });
         }
 
+        if (transform) {
+          handleVirtualTreeToList();
+          return tablePrivateMethods.handleTableData();
+        }
+
         return Object(external_commonjs_vue_commonjs2_vue_root_Vue_["nextTick"])();
       },
 
@@ -36287,7 +36312,8 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
       setAllTreeExpand: function setAllTreeExpand(expanded) {
         var tableFullData = internalData.tableFullData;
         var treeOpts = computeTreeOpts.value;
-        var lazy = treeOpts.lazy,
+        var transform = treeOpts.transform,
+            lazy = treeOpts.lazy,
             children = treeOpts.children;
         var expandeds = [];
         external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.eachTree(tableFullData, function (row) {
@@ -36297,7 +36323,12 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
             expandeds.push(row);
           }
         }, treeOpts);
-        return tableMethods.setTreeExpand(expandeds, expanded);
+        return tableMethods.setTreeExpand(expandeds, expanded).then(function () {
+          if (transform) {
+            handleVirtualTreeToList();
+            return tableMethods.recalculate();
+          }
+        });
       },
 
       /**
@@ -36345,7 +36376,8 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
         var treeExpandeds = reactData.treeExpandeds;
         var tableFullTreeData = internalData.tableFullTreeData;
         var treeOpts = computeTreeOpts.value;
-        var reserve = treeOpts.reserve;
+        var transform = treeOpts.transform,
+            reserve = treeOpts.reserve;
         var isExists = treeExpandeds.length;
         reactData.treeExpandeds = [];
 
@@ -36356,6 +36388,10 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
         }
 
         return tablePrivateMethods.handleTableData().then(function () {
+          if (transform) {
+            handleVirtualTreeToList();
+          }
+
           if (isExists) {
             tableMethods.recalculate();
           }
@@ -37327,31 +37363,16 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
         return record;
       },
       handleTableData: function handleTableData(force) {
-        var treeConfig = props.treeConfig;
         var scrollYLoad = reactData.scrollYLoad;
         var scrollYStore = internalData.scrollYStore,
             fullDataRowIdData = internalData.fullDataRowIdData;
-        var treeExpandeds = reactData.treeExpandeds;
-        var treeOpts = computeTreeOpts.value;
-        var fullList = []; // 是否进行数据处理
+        var fullList = internalData.afterFullData; // 是否进行数据处理
 
         if (force) {
-          updateAfterFullData();
-        } // 如果为虚拟树，将树结构拍平
+          // 更新数据，处理筛选和排序
+          updateAfterFullData(); // 如果为虚拟树，将树结构拍平
 
-
-        if (treeConfig && treeOpts.transform) {
-          var expandMaps = new Map();
-          external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.eachTree(internalData.afterTreeFullData, function (row, index, items, path, parent) {
-            if (!parent || expandMaps.has(parent) && $xetable.findRowIndexOf(treeExpandeds, parent) > -1) {
-              expandMaps.set(row, 1);
-              fullList.push(row);
-            }
-          }, {
-            children: treeOpts.mapChildren
-          });
-        } else {
-          fullList = internalData.afterFullData;
+          fullList = handleVirtualTreeToList();
         }
 
         var tableData = scrollYLoad ? fullList.slice(scrollYStore.startIndex, scrollYStore.endIndex) : fullList.slice(0);