vxe-table 3.4.7-beta.2 → 3.4.10-beta.0

package/lib/index.umd.js

@@ -10851,9 +10851,14 @@ function getColMinWidth(params) {
 }
 
 function countTreeExpand(prevRow, params) {
+  var count = 1;
+
+  if (!prevRow) {
+    return count;
+  }
+
   var $table = params.$table;
   var rowChildren = prevRow[$table.treeOpts.children];
-  var count = 1;
 
   if ($table.isTreeExpandByRow(prevRow)) {
     for (var index = 0; index < rowChildren.length; index++) {
@@ -10867,16 +10872,15 @@ function countTreeExpand(prevRow, params) {
 function getOffsetSize($xetable) {
   return lineOffsetSizes[$xetable.vSize] || 0;
 }
-function calcTreeLine(params, items) {
-  var $table = params.$table,
-      $rowIndex = params.$rowIndex;
+function calcTreeLine(params, items, rIndex) {
+  var $table = params.$table;
   var expandSize = 1;
 
-  if ($rowIndex) {
-    expandSize = countTreeExpand(items[$rowIndex - 1], params);
+  if (rIndex) {
+    expandSize = countTreeExpand(items[rIndex - 1], params);
   }
 
-  return $table.rowHeight * expandSize - ($rowIndex ? 1 : 12 - getOffsetSize($table));
+  return $table.rowHeight * expandSize - (rIndex ? 1 : 12 - getOffsetSize($table));
 }
 function mergeBodyMethod(mergeList, _rowIndex, _columnIndex) {
   for (var mIndex = 0; mIndex < mergeList.length; mIndex++) {
@@ -10970,12 +10974,25 @@ function isOperateMouse($xetable) {
   return $xetable._isResize || $xetable.lastScrollTime && Date.now() < $xetable.lastScrollTime + $xetable.delayHover;
 }
 
-function renderLine(h, _vm, $xetable, rowLevel, items, params) {
-  var column = params.column;
+function renderLine(h, _vm, $xetable, params) {
+  var row = params.row,
+      column = params.column;
   var treeOpts = $xetable.treeOpts,
-      treeConfig = $xetable.treeConfig;
+      treeConfig = $xetable.treeConfig,
+      fullAllDataRowIdData = $xetable.fullAllDataRowIdData;
   var slots = column.slots,
       treeNode = column.treeNode;
+  var rowid = UtilTools.getRowid($xetable, row);
+  var rest = fullAllDataRowIdData[rowid];
+  var rLevel = 0;
+  var rIndex = 0;
+  var items = [];
+
+  if (rest) {
+    rLevel = rest.level;
+    rIndex = rest._index;
+    items = rest.items;
+  }
 
   if (slots && slots.line) {
     return $xetable.callSlot(slots.line, params, h);
@@ -10987,8 +11004,8 @@ function renderLine(h, _vm, $xetable, rowLevel, items, params) {
     }, [h('div', {
       class: 'vxe-tree--line',
       style: {
-        height: "".concat(calcTreeLine(params, items), "px"),
-        left: "".concat(rowLevel * treeOpts.indent + (rowLevel ? 2 - getOffsetSize($xetable) : 0) + 16, "px")
+        height: "".concat(calcTreeLine(params, items, rIndex), "px"),
+        left: "".concat(rLevel * treeOpts.indent + (rLevel ? 2 - getOffsetSize($xetable) : 0) + 16, "px")
       }
     })])];
   }
@@ -11223,7 +11240,7 @@ function renderColumn(h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, ro
     }));
   } else {
     // 渲染单元格
-    tdVNs.push.apply(tdVNs, _toConsumableArray(renderLine(h, _vm, $xetable, rowLevel, items, params)).concat([h('div', {
+    tdVNs.push.apply(tdVNs, _toConsumableArray(renderLine(h, _vm, $xetable, params)).concat([h('div', {
       class: ['vxe-cell', {
         'c--title': showTitle,
         'c--tooltip': showTooltip,
@@ -11279,7 +11296,7 @@ function renderRows(h, _vm, $xetable, fixedType, tableData, tableColumn) {
       checkboxOpts = $xetable.checkboxOpts,
       expandColumn = $xetable.expandColumn,
       hasFixedColumn = $xetable.hasFixedColumn,
-      fullDataRowIdData = $xetable.fullDataRowIdData,
+      fullAllDataRowIdData = $xetable.fullAllDataRowIdData,
       rowOpts = $xetable.rowOpts;
   var rows = [];
   tableData.forEach(function (row, $rowIndex) {
@@ -11313,7 +11330,7 @@ function renderRows(h, _vm, $xetable, fixedType, tableData, tableColumn) {
     }
 
     var rowid = UtilTools.getRowid($xetable, row);
-    var rest = fullDataRowIdData[rowid];
+    var rest = fullAllDataRowIdData[rowid];
     var rowLevel = rest ? rest.level : 0;
     var seq = rest ? rest.seq : -1;
     var params = {
@@ -13216,7 +13233,7 @@ var Methods = {
   },
 
   /**
-   * 同步 data 数据
+   * 同步 data 数据（即将废弃）
    * 如果用了该方法，那么组件将不再记录增删改的状态，只能自行实现对应逻辑
    * 对于某些特殊的场景，比如深层树节点元素发生变动时可能会用到
    */
@@ -13241,31 +13258,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 +14247,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;
+  },
+
   /**
    * 获取处理后全量的表格数据
    * 如果存在筛选条件，继续处理
@@ -14367,58 +14400,91 @@ var Methods = {
       };
 
       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 {
-      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;
+      }
     }
 
     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(_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(_this16, 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;
+        tableTree = tableData;
+      }
     }
 
     this.afterFullData = tableData;
@@ -14444,30 +14510,15 @@ var Methods = {
       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) {
           return i % 2 === 0 ? Number(num) + 1 : '.';
         }).join('');
 
         if (allrest) {
           allrest.seq = seq;
-        }
-
-        if (fullrest) {
-          fullrest.seq = seq;
+          allrest._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,
@@ -14478,35 +14529,23 @@ var Methods = {
             parent: null,
             level: 0
           };
+          fullAllDataRowIdData[rowid] = rest;
+          fullDataRowIdData[rowid] = rest;
         }
-      }, treeOpts);
+      }, {
+        children: treeOpts.mapChildren
+      });
     } else {
       afterFullData.forEach(function (row, index) {
         var rowid = methods_getRowid(_this17, row);
         var allrest = fullAllDataRowIdData[rowid];
-        var fullrest = fullDataRowIdData[rowid];
         var seq = index + 1;
 
         if (allrest) {
           allrest.seq = seq;
-        }
-
-        if (fullrest) {
-          fullrest.seq = seq;
-          fullrest._index = index;
+          allrest._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,
@@ -14517,6 +14556,8 @@ var Methods = {
             parent: null,
             level: 0
           };
+          fullAllDataRowIdData[rowid] = rest;
+          fullDataRowIdData[rowid] = rest;
         }
       });
     }
@@ -14740,9 +14781,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) {
@@ -16353,10 +16394,10 @@ var Methods = {
    * 多选，行选中事件
    * value 选中true 不选false 半选-1
    */
-  handleSelectRow: function handleSelectRow(_ref5, value) {
+  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,
@@ -17172,8 +17213,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) {
@@ -17937,7 +17978,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) {
@@ -17947,6 +17989,11 @@ var Methods = {
       });
     }
 
+    if (transform) {
+      this.handleVirtualTreeToList();
+      return this.handleTableData();
+    }
+
     return this.$nextTick();
   },
 
@@ -17968,6 +18015,8 @@ var Methods = {
         return _this42.handleAsyncTreeExpandChilds(row);
       }).then(function () {
         if (transform) {
+          _this42.handleVirtualTreeToList();
+
           return _this42.handleTableData();
         }
       }).then(function () {
@@ -18215,6 +18264,8 @@ var Methods = {
     var _this45 = this;
 
     return this.handleBaseTreeExpand(rows, expanded).then(function () {
+      _this45.handleVirtualTreeToList();
+
       return _this45.handleTableData();
     }).then(function () {
       return _this45.recalculate();
@@ -18267,7 +18318,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 = [];
 
@@ -18278,6 +18330,12 @@ var Methods = {
     }
 
     return this.handleTableData().then(function () {
+      if (transform) {
+        _this46.handleVirtualTreeToList();
+
+        return _this46.handleTableData();
+      }
+    }).then(function () {
       if (isExists) {
         _this46.recalculate();
       }
@@ -18749,8 +18807,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);
@@ -21572,10 +21630,14 @@ function insertTreeRow(_vm, newRecords, isAppend) {
 
       (_editStore$insertList = editStore.insertList).unshift.apply(_editStore$insertList, _toConsumableArray(newRecords));
 
-      this.handleTableData(treeConfig && treeOpts.transform);
+      this.handleTableData(treeConfig && transform);
+
+      if (!(treeConfig && transform)) {
+        this.updateAfterDataIndex();
+      }
+
       this.updateFooter();
       this.cacheRowMap();
-      this.updateAfterDataIndex();
       this.checkSelectionStatus();
 
       if (this.scrollYLoad) {
@@ -21711,10 +21773,14 @@ function insertTreeRow(_vm, newRecords, isAppend) {
           insertList.splice(iIndex, 1);
         }
       });
-      this.handleTableData(treeConfig && treeOpts.transform);
+      this.handleTableData(treeConfig && transform);
+
+      if (!(treeConfig && transform)) {
+        this.updateAfterDataIndex();
+      }
+
       this.updateFooter();
       this.cacheRowMap();
-      this.updateAfterDataIndex();
       this.checkSelectionStatus();
 
       if (this.scrollYLoad) {
@@ -27898,7 +27964,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;
 
@@ -27911,11 +27977,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) {
@@ -27988,7 +28050,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':
@@ -28064,7 +28126,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':
@@ -30254,6 +30316,7 @@ var Keyboard = {
 
 
 
+
 /**
  * 校验规则
  */
@@ -30452,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) {
@@ -30460,14 +30523,19 @@ function validErrorRuleValue(rule, val) {
             }
           });
         }).catch(function (firstErrParams) {
-          return new Promise(function (resolve) {
+          return new Promise(function (resolve, reject) {
             var finish = function finish() {
               _this2.$nextTick(function () {
                 if (cb) {
                   cb(validRest);
                   resolve();
                 } else {
-                  resolve(validRest);
+                  if (conf.validToReject) {
+                    // 已废弃，校验失败将不会执行catch
+                    reject(validRest);
+                  } else {
+                    resolve(validRest);
+                  }
                 }
               });
             };