vxe-table 4.1.8 → 4.1.9

package/lib/index.umd.js

@@ -8945,6 +8945,9 @@ var es_number_to_fixed = __webpack_require__("b680");
 // EXTERNAL MODULE: external {"commonjs":"vue","commonjs2":"vue","root":"Vue"}
 var external_commonjs_vue_commonjs2_vue_root_Vue_ = __webpack_require__("8bbf");
 
+// 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.array.splice.js
 var es_array_splice = __webpack_require__("a434");
 
@@ -8954,6 +8957,9 @@ var es_array_slice = __webpack_require__("fb6a");
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.object.to-string.js
 var es_object_to_string = __webpack_require__("d3b7");
 
+// EXTERNAL MODULE: ./node_modules/core-js/modules/es.promise.js
+var es_promise = __webpack_require__("e6cf");
+
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.fixed.js
 var es_string_fixed = __webpack_require__("c7cd");
 
@@ -9322,16 +9328,9 @@ function scrollToView(elem) {
   }
 }
 function dom_triggerEvent(targetElem, type) {
-  var evnt;
-
-  if (typeof Event === 'function') {
-    evnt = new Event(type);
-  } else {
-    evnt = document.createEvent('Event');
-    evnt.initEvent(type, true, true);
+  if (targetElem) {
+    targetElem.dispatchEvent(new Event(type));
   }
-
-  targetElem.dispatchEvent(evnt);
 }
 // CONCATENATED MODULE: ./packages/table/src/util.ts
 
@@ -9344,6 +9343,9 @@ function dom_triggerEvent(targetElem, type) {
 
 
 
+
+
+
 function restoreScrollLocation($xetable, scrollLeft, scrollTop) {
   var internalData = $xetable.internalData;
   return $xetable.clearScroll().then(function () {
@@ -9439,6 +9441,11 @@ function toFilters(filters) {
 
   return filters;
 }
+function toTreePathSeq(path) {
+  return path.map(function (num, i) {
+    return i % 2 === 0 ? Number(num) + 1 : '.';
+  }).join('');
+}
 function getCellValue(row, column) {
   return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.get(row, column.property);
 }
@@ -10949,6 +10956,9 @@ var Icon = {
     return renderVN;
   }
 }));
+// EXTERNAL MODULE: ./node_modules/core-js/modules/es.object.assign.js
+var es_object_assign = __webpack_require__("cca6");
+
 // CONCATENATED MODULE: ./packages/filter/src/hook.ts
 
 
@@ -10960,6 +10970,7 @@ var Icon = {
 
 
 
+
 var tableFilterMethodKeys = ['setFilter', 'clearFilter', 'getCheckedFilters'];
 var tableFilterHook = {
   setupTable: function setupTable($xetable) {
@@ -11186,6 +11197,29 @@ var tableFilterHook = {
       }
     };
     var filterMethods = {
+      /**
+       * 手动弹出筛选面板
+       * @param column
+       */
+      openFilter: function openFilter(fieldOrColumn) {
+        var column = util_handleFieldOrColumn($xetable, fieldOrColumn);
+
+        if (column && column.filters) {
+          var elemStore = internalData.elemStore;
+          var fixed = column.fixed;
+          return $xetable.scrollToColumn(column).then(function () {
+            var headerWrapperElem = elemStore["".concat(fixed || 'main', "-header-wrapper")] || elemStore['main-header-wrapper'];
+
+            if (headerWrapperElem) {
+              var filterBtnElem = headerWrapperElem.querySelector(".vxe-header--column.".concat(column.id, " .vxe-filter--btn"));
+              dom_triggerEvent(filterBtnElem, 'click');
+            }
+          });
+        }
+
+        return Object(external_commonjs_vue_commonjs2_vue_root_Vue_["nextTick"])();
+      },
+
       /**
        * 修改筛选条件列表
        * @param {ColumnInfo} fieldOrColumn 列或字段名
@@ -12032,6 +12066,7 @@ function _toConsumableArray(arr) {
 
 
 
+
 var tableEditMethodKeys = ['insert', 'insertAt', 'remove', 'removeCheckboxRow', 'removeRadioRow', 'removeCurrentRow', 'getRecordset', 'getInsertRecords', 'getRemoveRecords', 'getUpdateRecords', 'getActiveRecord', 'getSelectedCell', 'clearActived', 'clearSelected', 'isActiveByRow', 'setActiveRow', 'setActiveCell', 'setSelectCell'];
 var editHook = {
   setupTable: function setupTable($xetable) {
@@ -12132,6 +12167,7 @@ var editHook = {
           var rest = {
             row: item,
             rowid: rowid,
+            seq: -1,
             index: -1,
             _index: -1,
             $index: -1,
@@ -12153,6 +12189,7 @@ var editHook = {
           var _rest = {
             row: item,
             rowid: rowid,
+            seq: -1,
             index: -1,
             _index: -1,
             $index: -1,
@@ -12274,6 +12311,7 @@ var editHook = {
                   var rest = {
                     row: item,
                     rowid: rowid,
+                    seq: -1,
                     index: -1,
                     _index: -1,
                     $index: -1,
@@ -13019,9 +13057,6 @@ function _nonIterableRest() {
 function _slicedToArray(arr, i) {
   return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest();
 }
-// 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.string.split.js
 var es_string_split = __webpack_require__("1276");
 
@@ -13048,6 +13083,7 @@ function useSize(props) {
 
 
 
+
 /* harmony default export */ var src_button = (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["defineComponent"])({
   name: 'VxeButton',
   props: {
@@ -13200,48 +13236,49 @@ function useSize(props) {
           };
 
           var _getAbsolutePos = getAbsolutePos(targetElem),
+              top = _getAbsolutePos.top,
+              left = _getAbsolutePos.left,
               boundingTop = _getAbsolutePos.boundingTop,
-              boundingLeft = _getAbsolutePos.boundingLeft,
               visibleHeight = _getAbsolutePos.visibleHeight,
               visibleWidth = _getAbsolutePos.visibleWidth;
 
           var panelPlacement = 'bottom';
 
           if (transfer) {
-            var left = boundingLeft + targetWidth - panelWidth;
-            var top = boundingTop + targetHeight;
+            var btnLeft = left + targetWidth - panelWidth;
+            var btnTop = top + targetHeight;
 
             if (placement === 'top') {
               panelPlacement = 'top';
-              top = boundingTop - panelHeight;
+              btnTop = top - panelHeight;
             } else if (!placement) {
               // 如果下面不够放，则向上
-              if (top + panelHeight + marginSize > visibleHeight) {
+              if (boundingTop + targetHeight + panelHeight + marginSize > visibleHeight) {
                 panelPlacement = 'top';
-                top = boundingTop - panelHeight;
+                btnTop = top - panelHeight;
               } // 如果上面不够放，则向下（优先）
 
 
-              if (top < marginSize) {
+              if (btnTop < marginSize) {
                 panelPlacement = 'bottom';
-                top = boundingTop + targetHeight;
+                btnTop = top + targetHeight;
               }
             } // 如果溢出右边
 
 
-            if (left + panelWidth + marginSize > visibleWidth) {
-              left -= left + panelWidth + marginSize - visibleWidth;
+            if (btnLeft + panelWidth + marginSize > visibleWidth) {
+              btnLeft -= btnLeft + panelWidth + marginSize - visibleWidth;
             } // 如果溢出左边
 
 
-            if (left < marginSize) {
-              left = marginSize;
+            if (btnLeft < marginSize) {
+              btnLeft = marginSize;
             }
 
             Object.assign(panelStyle, {
-              left: "".concat(left, "px"),
+              left: "".concat(btnLeft, "px"),
               right: 'auto',
-              top: "".concat(top, "px"),
+              top: "".concat(btnTop, "px"),
               minWidth: "".concat(targetWidth, "px")
             });
           } else {
@@ -18984,12 +19021,6 @@ var es_array_iterator = __webpack_require__("e260");
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.map.js
 var es_map = __webpack_require__("4ec9");
 
-// 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.promise.js
-var es_promise = __webpack_require__("e6cf");
-
 // EXTERNAL MODULE: ./node_modules/core-js/modules/web.url.js
 var web_url = __webpack_require__("2b3d");
 
@@ -19243,7 +19274,6 @@ var util_saveLocalFile = function saveLocalFile(options) {
 
 
 
-
 
 
 var htmlCellElem;
@@ -19591,7 +19621,7 @@ var tableExportHook = {
       return row[treeOpts.children] && row[treeOpts.children].length;
     };
 
-    var getSeq = function getSeq(row, rowIndex, column, columnIndex, paths) {
+    var getSeq = function getSeq(row, rowIndex, column, columnIndex, path) {
       var seqOpts = computeSeqOpts.value;
       var seqMethod = seqOpts.seqMethod || column.seqMethod;
 
@@ -19604,10 +19634,8 @@ var tableExportHook = {
         });
       }
 
-      if (paths) {
-        return paths.map(function (num, i) {
-          return i % 2 === 0 ? Number(num) + 1 : '.';
-        }).join('');
+      if (path) {
+        return toTreePathSeq(path);
       }
 
       return seqOpts.startIndex + rowIndex + 1;
@@ -22832,6 +22860,7 @@ var Footer = Object.assign(footer, {
 
 
 
+
 function renderHelpIcon(params) {
   var $table = params.$table,
       column = params.column;
@@ -22957,8 +22986,8 @@ var Cell = {
 
     switch (type) {
       case 'seq':
-        renConfs.renderHeader = Cell.renderIndexHeader;
-        renConfs.renderCell = treeNode ? Cell.renderTreeIndexCell : Cell.renderIndexCell;
+        renConfs.renderHeader = Cell.renderSeqHeader;
+        renConfs.renderCell = treeNode ? Cell.renderTreeIndexCell : Cell.renderSeqCell;
         break;
 
       case 'radio':
@@ -22967,8 +22996,8 @@ var Cell = {
         break;
 
       case 'checkbox':
-        renConfs.renderHeader = Cell.renderSelectionHeader;
-        renConfs.renderCell = checkboxOpts.checkField ? treeNode ? Cell.renderTreeSelectionCellByProp : Cell.renderSelectionCellByProp : treeNode ? Cell.renderTreeSelectionCell : Cell.renderSelectionCell;
+        renConfs.renderHeader = Cell.renderCheckboxHeader;
+        renConfs.renderCell = checkboxOpts.checkField ? treeNode ? Cell.renderTreeSelectionCellByProp : Cell.renderCheckboxCellByProp : treeNode ? Cell.renderTreeSelectionCell : Cell.renderCheckboxCell;
         break;
 
       case 'expand':
@@ -23151,16 +23180,18 @@ var Cell = {
   /**
    * 索引
    */
-  renderIndexHeader: function renderIndexHeader(params) {
+  renderSeqHeader: function renderSeqHeader(params) {
     var $table = params.$table,
         column = params.column;
     var slots = column.slots;
     var headerSlot = slots ? slots.header : null;
     return renderTitleContent(params, headerSlot ? $table.callSlot(headerSlot, params) : formatText(column.getTitle(), 1));
   },
-  renderIndexCell: function renderIndexCell(params) {
+  renderSeqCell: function renderSeqCell(params) {
     var $table = params.$table,
         column = params.column;
+    var props = $table.props;
+    var treeConfig = props.treeConfig;
 
     var _$table$getComputeMap3 = $table.getComputeMaps(),
         computeSeqOpts = _$table$getComputeMap3.computeSeqOpts;
@@ -23173,14 +23204,12 @@ var Cell = {
       return $table.callSlot(defaultSlot, params);
     }
 
-    var $seq = params.$seq,
-        seq = params.seq,
-        level = params.level;
+    var seq = params.seq;
     var seqMethod = seqOpts.seqMethod;
-    return [formatText(seqMethod ? seqMethod(params) : level ? "".concat($seq, ".").concat(seq) : (seqOpts.startIndex || 0) + seq, 1)];
+    return [formatText(seqMethod ? seqMethod(params) : treeConfig ? seq : (seqOpts.startIndex || 0) + seq, 1)];
   },
   renderTreeIndexCell: function renderTreeIndexCell(params) {
-    return Cell.renderTreeIcon(params, Cell.renderIndexCell(params));
+    return Cell.renderTreeIcon(params, Cell.renderSeqCell(params));
   },
 
   /**
@@ -23277,7 +23306,7 @@ var Cell = {
   /**
    * 多选
    */
-  renderSelectionHeader: function renderSelectionHeader(params) {
+  renderCheckboxHeader: function renderCheckboxHeader(params) {
     var $table = params.$table,
         column = params.column,
         isHidden = params.isHidden;
@@ -23342,7 +23371,7 @@ var Cell = {
       class: 'vxe-checkbox--label'
     }, titleSlot ? $table.callSlot(titleSlot, checkboxParams) : headerTitle)] : []))]);
   },
-  renderSelectionCell: function renderSelectionCell(params) {
+  renderCheckboxCell: function renderCheckboxCell(params) {
     var $table = params.$table,
         row = params.row,
         column = params.column,
@@ -23430,9 +23459,9 @@ var Cell = {
     }, ons), checkVNs)];
   },
   renderTreeSelectionCell: function renderTreeSelectionCell(params) {
-    return Cell.renderTreeIcon(params, Cell.renderSelectionCell(params));
+    return Cell.renderTreeIcon(params, Cell.renderCheckboxCell(params));
   },
-  renderSelectionCellByProp: function renderSelectionCellByProp(params) {
+  renderCheckboxCellByProp: function renderCheckboxCellByProp(params) {
     var $table = params.$table,
         row = params.row,
         column = params.column,
@@ -23521,7 +23550,7 @@ var Cell = {
     }, ons), checkVNs)];
   },
   renderTreeSelectionCellByProp: function renderTreeSelectionCellByProp(params) {
-    return Cell.renderTreeIcon(params, Cell.renderSelectionCellByProp(params));
+    return Cell.renderTreeIcon(params, Cell.renderCheckboxCellByProp(params));
   },
 
   /**
@@ -30717,6 +30746,7 @@ var Pulldown = Object.assign(pulldown, {
 
 
 
+
 var body_renderType = 'body';
 var lineOffsetSizes = {
   mini: 3,
@@ -30847,7 +30877,7 @@ var lineOffsetSizes = {
      */
 
 
-    var renderColumn = function renderColumn($seq, seq, rowid, fixedType, rowLevel, row, rowIndex, $rowIndex, _rowIndex, column, $columnIndex, columns, items) {
+    var renderColumn = function renderColumn(seq, rowid, fixedType, rowLevel, row, rowIndex, $rowIndex, _rowIndex, column, $columnIndex, columns, items) {
       var _ref2;
 
       var columnKey = tableProps.columnKey,
@@ -30908,7 +30938,6 @@ var lineOffsetSizes = {
       };
       var params = {
         $table: $xetable,
-        $seq: $seq,
         seq: seq,
         rowid: rowid,
         row: row,
@@ -31088,7 +31117,7 @@ var lineOffsetSizes = {
       }, tdOns), tdVNs);
     };
 
-    var renderRows = function renderRows($seq, fixedType, tableData, tableColumn) {
+    var renderRows = function renderRows(fixedType, tableData, tableColumn) {
       var stripe = tableProps.stripe,
           rowKey = tableProps.rowKey,
           highlightHoverRow = tableProps.highlightHoverRow,
@@ -31104,8 +31133,7 @@ var lineOffsetSizes = {
           rowExpandeds = tableReactData.rowExpandeds,
           expandColumn = tableReactData.expandColumn,
           selectRow = tableReactData.selectRow;
-      var fullAllDataRowIdData = tableInternalData.fullAllDataRowIdData,
-          scrollYStore = tableInternalData.scrollYStore;
+      var fullDataRowIdData = tableInternalData.fullDataRowIdData;
       var checkboxOpts = computeCheckboxOpts.value;
       var radioOpts = computeRadioOpts.value;
       var treeOpts = computeTreeOpts.value;
@@ -31115,11 +31143,6 @@ var lineOffsetSizes = {
       tableData.forEach(function (row, $rowIndex) {
         var trOn = {};
         var rowIndex = $rowIndex;
-        var seq = rowIndex + 1;
-
-        if (scrollYLoad) {
-          seq += scrollYStore.startIndex;
-        }
 
         var _rowIndex = $xetable.getVTRowIndex(row); // 确保任何情况下 rowIndex 都精准指向真实 data 索引
 
@@ -31148,11 +31171,11 @@ var lineOffsetSizes = {
         }
 
         var rowid = util_getRowid($xetable, row);
-        var rest = fullAllDataRowIdData[rowid];
+        var rest = fullDataRowIdData[rowid];
         var rowLevel = rest ? rest.level : 0;
+        var seq = rest ? rest.seq : -1;
         var params = {
           $table: $xetable,
-          $seq: $seq,
           seq: seq,
           rowid: rowid,
           fixed: fixedType,
@@ -31181,7 +31204,7 @@ var lineOffsetSizes = {
           style: rowStyle ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isFunction(rowStyle) ? rowStyle(params) : rowStyle : null,
           key: rowKey || treeConfig ? rowid : $rowIndex
         }, trOn), tableColumn.map(function (column, $columnIndex) {
-          return renderColumn($seq, seq, rowid, fixedType, rowLevel, row, rowIndex, $rowIndex, _rowIndex, column, $columnIndex, tableColumn, tableData);
+          return renderColumn(seq, rowid, fixedType, rowLevel, row, rowIndex, $rowIndex, _rowIndex, column, $columnIndex, tableColumn, tableData);
         }))); // 如果行被展开了
 
         if (expandColumn && rowExpandeds.length && $xetable.findRowIndexOf(rowExpandeds, row) > -1) {
@@ -31197,7 +31220,6 @@ var lineOffsetSizes = {
           var hasEllipsis = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isUndefined(showOverflow) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isNull(showOverflow) ? allColumnOverflow : showOverflow;
           var expandParams = {
             $table: $xetable,
-            $seq: $seq,
             seq: seq,
             column: expandColumn,
             fixed: fixedType,
@@ -31229,7 +31251,7 @@ var lineOffsetSizes = {
           var rowChildren = row[treeOpts.children];
 
           if (rowChildren && rowChildren.length && $xetable.findRowIndexOf(treeExpandeds, row) > -1) {
-            rows.push.apply(rows, _toConsumableArray(renderRows($seq ? "".concat($seq, ".").concat(seq) : "".concat(seq), fixedType, rowChildren, tableColumn)));
+            rows.push.apply(rows, _toConsumableArray(renderRows(fixedType, rowChildren, tableColumn)));
           }
         }
       });
@@ -31589,7 +31611,7 @@ var lineOffsetSizes = {
        */
       Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('tbody', {
         ref: refBodyTBody
-      }, renderRows('', fixedType, tableData, tableColumn))]), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('div', {
+      }, renderRows(fixedType, tableData, tableColumn))]), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('div', {
         class: 'vxe-table--checkbox-range'
       }), mouseConfig && mouseOpts.area ? Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('div', {
         class: 'vxe-table--cell-area'
@@ -31662,6 +31684,7 @@ var lineOffsetSizes = {
 
 
 
+
 
 
 var isWebkit = browse['-webkit'] && !browse.edge;
@@ -31913,8 +31936,9 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
       tableFullColumn: [],
       // 渲染所有列
       visibleColumn: [],
-      // 缓存数据集
+      // 总的缓存数据集
       fullAllDataRowIdData: {},
+      // 渲染中缓存数据
       fullDataRowIdData: {},
       fullColumnIdData: {},
       fullColumnFieldData: {},
@@ -32895,30 +32919,102 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
         return cellValue;
       };
     };
+    /**
+     * 预编译
+     * 对渲染中的数据提前解析序号及索引。牺牲提前编译耗时换取渲染中额外损耗，使运行时更加流畅
+     */
+
 
     var updateAfterDataIndex = function updateAfterDataIndex() {
+      var treeConfig = props.treeConfig;
       var afterFullData = internalData.afterFullData,
-          fullDataRowIdData = internalData.fullDataRowIdData;
-      afterFullData.forEach(function (row, _index) {
-        var rowid = util_getRowid($xetable, row);
+          fullDataRowIdData = internalData.fullDataRowIdData,
+          fullAllDataRowIdData = internalData.fullAllDataRowIdData;
+      var treeFullData = internalData.treeFullData;
+      var treeOpts = computeTreeOpts.value;
 
-        var rest = fullDataRowIdData[rowid];
+      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 = util_getRowid($xetable, row);
 
-        if (rest) {
-          rest._index = _index;
-        } else {
-          fullDataRowIdData[rowid] = {
-            row: row,
-            rowid: rowid,
-            index: -1,
-            $index: -1,
-            _index: _index,
-            items: [],
-            parent: null,
-            level: 0
-          };
-        }
-      });
+          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;
+          } else {
+            fullAllDataRowIdData[rowid] = {
+              row: row,
+              rowid: rowid,
+              seq: seq,
+              index: -1,
+              $index: -1,
+              _index: index,
+              items: [],
+              parent: null,
+              level: 0
+            };
+            fullDataRowIdData[rowid] = {
+              row: row,
+              rowid: rowid,
+              seq: seq,
+              index: -1,
+              $index: -1,
+              _index: index,
+              items: [],
+              parent: null,
+              level: 0
+            };
+          }
+        }, treeOpts);
+      } 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;
+          }
+
+          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] = {
+              row: row,
+              rowid: rowid,
+              seq: seq,
+              index: -1,
+              $index: -1,
+              _index: index,
+              items: [],
+              parent: null,
+              level: 0
+            };
+          }
+        });
+      }
     };
     /**
      * 获取处理后全量的表格数据
@@ -33344,8 +33440,8 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
                       if (colspan > 1) {
                         var columnIndex = tableMethods.getColumnIndex(column);
 
-                        for (var _index2 = 1; _index2 < colspan; _index2++) {
-                          var nextColumn = tableMethods.getColumns(columnIndex + _index2);
+                        for (var _index = 1; _index < colspan; _index++) {
+                          var nextColumn = tableMethods.getColumns(columnIndex + _index);
 
                           if (nextColumn) {
                             colWidth += nextColumn.renderWidth;
@@ -34140,12 +34236,12 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
       }
 
       reactData.scrollXLoad = scrollXLoad;
-      visibleColumn.forEach(function (column, _index) {
+      visibleColumn.forEach(function (column, index) {
         var colid = column.id;
         var rest = fullColumnIdData[colid];
 
         if (rest) {
-          rest._index = _index;
+          rest._index = index;
         }
       });
       internalData.visibleColumn = visibleColumn;
@@ -34354,6 +34450,40 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
       }
     };
 
+    var createGetRowCacheProp = function createGetRowCacheProp(prop) {
+      return function (row) {
+        var fullDataRowIdData = internalData.fullDataRowIdData;
+
+        if (row) {
+          var rowid = util_getRowid($xetable, row);
+
+          var rest = fullDataRowIdData[rowid];
+
+          if (rest) {
+            return rest[prop];
+          }
+        }
+
+        return -1;
+      };
+    };
+
+    var createGetColumnCacheProp = function createGetColumnCacheProp(prop) {
+      return function (column) {
+        var fullColumnIdData = internalData.fullColumnIdData;
+
+        if (column) {
+          var rest = fullColumnIdData[column.id];
+
+          if (rest) {
+            return rest[prop];
+          }
+        }
+
+        return -1;
+      };
+    };
+
     var debounceScrollY = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.debounce(function (evnt) {
       loadScrollYData(evnt);
     }, 20, {
@@ -34513,6 +34643,7 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
             var rest = {
               row: childRow,
               rowid: rowid,
+              seq: -1,
               index: -1,
               _index: -1,
               $index: -1,
@@ -34606,118 +34737,46 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
       },
 
       /**
-       * 根据 row 获取相对于 data 中的索引
+       * 根据 row 获取序号
        * @param {Row} row 行对象
        */
-      getRowIndex: function getRowIndex(row) {
-        var fullDataRowIdData = internalData.fullDataRowIdData;
-
-        if (row) {
-          var rowid = util_getRowid($xetable, row);
-
-          var rest = fullDataRowIdData[rowid];
+      getRowSeq: createGetRowCacheProp('seq'),
 
-          if (rest) {
-            return rest.index;
-          }
-        }
-
-        return -1;
-      },
+      /**
+       * 根据 row 获取相对于 data 中的索引
+       * @param {Row} row 行对象
+       */
+      getRowIndex: createGetRowCacheProp('index'),
 
       /**
        * 根据 row 获取相对于当前数据中的索引
        * @param {Row} row 行对象
        */
-      getVTRowIndex: function getVTRowIndex(row) {
-        var fullDataRowIdData = internalData.fullDataRowIdData;
-
-        if (row) {
-          var rowid = util_getRowid($xetable, row);
-
-          var rest = fullDataRowIdData[rowid];
-
-          if (rest) {
-            return rest._index;
-          }
-        }
-
-        return -1;
-      },
+      getVTRowIndex: createGetRowCacheProp('_index'),
 
       /**
        * 根据 row 获取渲染中的虚拟索引
        * @param {Row} row 行对象
        */
-      getVMRowIndex: function getVMRowIndex(row) {
-        var fullDataRowIdData = internalData.fullDataRowIdData;
-
-        if (row) {
-          var rowid = util_getRowid($xetable, row);
-
-          var rest = fullDataRowIdData[rowid];
-
-          if (rest) {
-            return rest.$index;
-          }
-        }
-
-        return -1;
-      },
+      getVMRowIndex: createGetRowCacheProp('$index'),
 
       /**
        * 根据 column 获取相对于 columns 中的索引
        * @param {ColumnInfo} column 列配置
        */
-      getColumnIndex: function getColumnIndex(column) {
-        var fullColumnIdData = internalData.fullColumnIdData;
-
-        if (column) {
-          var rest = fullColumnIdData[column.id];
-
-          if (rest) {
-            return rest.index;
-          }
-        }
-
-        return -1;
-      },
+      getColumnIndex: createGetColumnCacheProp('index'),
 
       /**
        * 根据 column 获取相对于当前表格列中的索引
        * @param {ColumnInfo} column 列配置
        */
-      getVTColumnIndex: function getVTColumnIndex(column) {
-        var fullColumnIdData = internalData.fullColumnIdData;
-
-        if (column) {
-          var rest = fullColumnIdData[column.id];
-
-          if (rest) {
-            return rest._index;
-          }
-        }
-
-        return -1;
-      },
+      getVTColumnIndex: createGetColumnCacheProp('_index'),
 
       /**
        * 根据 column 获取渲染中的虚拟索引
        * @param {ColumnInfo} column 列配置
        */
-      getVMColumnIndex: function getVMColumnIndex(column) {
-        var fullColumnIdData = internalData.fullColumnIdData;
-
-        if (column) {
-          var rest = fullColumnIdData[column.id];
-
-          if (rest) {
-            return rest.$index;
-          }
-        }
-
-        return -1;
-      },
+      getVMColumnIndex: createGetColumnCacheProp('$index'),
 
       /**
        * 创建 data 对象
@@ -37182,6 +37241,9 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
         var handleCache = function handleCache(row, index, items, path, parent, nodes) {
           var rowid = util_getRowid($xetable, row);
 
+          var seq = treeConfig && path ? toTreePathSeq(path) : index + 1;
+          var level = nodes ? nodes.length - 1 : 0;
+
           if (eqEmptyValue(rowid)) {
             rowid = getRowUniqueId();
             external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.set(row, rowkey, rowid);
@@ -37194,12 +37256,13 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
           var rest = {
             row: row,
             rowid: rowid,
+            seq: seq,
             index: treeConfig && parent ? -1 : index,
             _index: -1,
             $index: -1,
             items: items,
             parent: parent,
-            level: nodes ? nodes.length - 1 : 0
+            level: level
           };
 
           if (isSource) {