vxe-table 4.1.8 → 4.1.11-beta.1

package/es/button/src/button.js

@@ -127,39 +127,39 @@ export default defineComponent({
                     var panelStyle = {
                         zIndex: panelIndex
                     };
-                    var _a = getAbsolutePos(targetElem), boundingTop = _a.boundingTop, boundingLeft = _a.boundingLeft, visibleHeight = _a.visibleHeight, visibleWidth = _a.visibleWidth;
+                    var _a = getAbsolutePos(targetElem), top_1 = _a.top, left = _a.left, boundingTop = _a.boundingTop, visibleHeight = _a.visibleHeight, visibleWidth = _a.visibleWidth;
                     var panelPlacement = 'bottom';
                     if (transfer) {
-                        var left = boundingLeft + targetWidth - panelWidth;
-                        var top_1 = boundingTop + targetHeight;
+                        var btnLeft = left + targetWidth - panelWidth;
+                        var btnTop = top_1 + targetHeight;
                         if (placement === 'top') {
                             panelPlacement = 'top';
-                            top_1 = boundingTop - panelHeight;
+                            btnTop = top_1 - panelHeight;
                         }
                         else if (!placement) {
                             // 如果下面不够放，则向上
-                            if (top_1 + panelHeight + marginSize > visibleHeight) {
+                            if (boundingTop + targetHeight + panelHeight + marginSize > visibleHeight) {
                                 panelPlacement = 'top';
-                                top_1 = boundingTop - panelHeight;
+                                btnTop = top_1 - panelHeight;
                             }
                             // 如果上面不够放，则向下（优先）
-                            if (top_1 < marginSize) {
+                            if (btnTop < marginSize) {
                                 panelPlacement = 'bottom';
-                                top_1 = boundingTop + targetHeight;
+                                btnTop = top_1 + 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: left + "px",
+                            left: btnLeft + "px",
                             right: 'auto',
-                            top: top_1 + "px",
+                            top: btnTop + "px",
                             minWidth: targetWidth + "px"
                         });
                     }

package/es/edit/src/hook.js

@@ -25,7 +25,7 @@ var editHook = {
     setupTable: function ($xetable) {
         var props = $xetable.props, reactData = $xetable.reactData, internalData = $xetable.internalData;
         var refElem = $xetable.getRefMaps().refElem;
-        var _a = $xetable.getComputeMaps(), computeMouseOpts = _a.computeMouseOpts, computeEditOpts = _a.computeEditOpts, computeCheckboxOpts = _a.computeCheckboxOpts, computeSYOpts = _a.computeSYOpts, computeTreeOpts = _a.computeTreeOpts;
+        var _a = $xetable.getComputeMaps(), computeMouseOpts = _a.computeMouseOpts, computeEditOpts = _a.computeEditOpts, computeCheckboxOpts = _a.computeCheckboxOpts, computeTreeOpts = _a.computeTreeOpts;
         var editMethods = {};
         var editPrivateMethods = {};
         var getEditColumnModel = function (row, column) {
@@ -67,13 +67,13 @@ var editHook = {
             }
         }
         function insertTreeRow(newRecords, isAppend) {
-            var treeFullData = internalData.treeFullData, afterFullData = internalData.afterFullData, fullDataRowIdData = internalData.fullDataRowIdData, fullAllDataRowIdData = internalData.fullAllDataRowIdData;
+            var tableFullTreeData = internalData.tableFullTreeData, afterFullData = internalData.afterFullData, fullDataRowIdData = internalData.fullDataRowIdData, fullAllDataRowIdData = internalData.fullAllDataRowIdData;
             var treeOpts = computeTreeOpts.value;
             var funcName = isAppend ? 'push' : 'unshift';
             newRecords.forEach(function (item) {
                 var parentRowId = item[treeOpts.parentField];
                 var rowid = getRowid($xetable, item);
-                var matchObj = parentRowId ? XEUtils.findTree(treeFullData, function (item) { return parentRowId === item[treeOpts.rowField]; }, treeOpts) : null;
+                var matchObj = parentRowId ? XEUtils.findTree(tableFullTreeData, function (item) { return parentRowId === item[treeOpts.rowField]; }, treeOpts) : null;
                 if (matchObj) {
                     var parentRow = matchObj.item;
                     var parentRest = fullAllDataRowIdData[getRowid($xetable, parentRow)];
@@ -83,7 +83,7 @@ var editHook = {
                         parentChilds = parentRow[treeOpts.children] = [];
                     }
                     parentChilds[funcName](item);
-                    var rest = { row: item, rowid: rowid, index: -1, _index: -1, $index: -1, items: parentChilds, parent: parent, level: parentLevel + 1 };
+                    var rest = { row: item, rowid: rowid, seq: -1, index: -1, _index: -1, $index: -1, items: parentChilds, parent: parent, level: parentLevel + 1 };
                     fullDataRowIdData[rowid] = rest;
                     fullAllDataRowIdData[rowid] = rest;
                 }
@@ -94,13 +94,12 @@ var editHook = {
                         }
                     }
                     afterFullData[funcName](item);
-                    treeFullData[funcName](item);
-                    var rest = { row: item, rowid: rowid, index: -1, _index: -1, $index: -1, items: treeFullData, parent: null, level: 0 };
+                    tableFullTreeData[funcName](item);
+                    var rest = { row: item, rowid: rowid, seq: -1, index: -1, _index: -1, $index: -1, items: tableFullTreeData, parent: null, level: 0 };
                     fullDataRowIdData[rowid] = rest;
                     fullAllDataRowIdData[rowid] = rest;
                 }
             });
-            $xetable.updateVirtualTreeData();
         }
         editMethods = {
             /**
@@ -122,9 +121,8 @@ var editHook = {
             insertAt: function (records, row) {
                 var _a;
                 var treeConfig = props.treeConfig;
-                var mergeList = reactData.mergeList, editStore = reactData.editStore, scrollYLoad = reactData.scrollYLoad;
-                var treeFullData = internalData.treeFullData, afterFullData = internalData.afterFullData, tableFullData = internalData.tableFullData, fullDataRowIdData = internalData.fullDataRowIdData, fullAllDataRowIdData = internalData.fullAllDataRowIdData;
-                var sYOpts = computeSYOpts.value;
+                var mergeList = reactData.mergeList, editStore = reactData.editStore;
+                var tableFullTreeData = internalData.tableFullTreeData, afterFullData = internalData.afterFullData, tableFullData = internalData.tableFullData, fullDataRowIdData = internalData.fullDataRowIdData, fullAllDataRowIdData = internalData.fullAllDataRowIdData;
                 var treeOpts = computeTreeOpts.value;
                 var transform = treeOpts.transform;
                 if (!XEUtils.isArray(records)) {
@@ -169,7 +167,7 @@ var editHook = {
                     else {
                         // 如果为虚拟树
                         if (treeConfig && transform) {
-                            var matchObj_1 = XEUtils.findTree(treeFullData, function (item) { return row[treeOpts.rowField] === item[treeOpts.rowField]; }, treeOpts);
+                            var matchObj_1 = XEUtils.findTree(tableFullTreeData, function (item) { return row[treeOpts.rowField] === item[treeOpts.rowField]; }, treeOpts);
                             if (matchObj_1) {
                                 var parentRow_1 = matchObj_1.parent;
                                 var parentChilds_1 = matchObj_1.items;
@@ -188,11 +186,10 @@ var editHook = {
                                         item[treeOpts.parentField] = parentRow_1[treeOpts.rowField];
                                     }
                                     parentChilds_1.splice(matchObj_1.index + i, 0, item);
-                                    var rest = { row: item, rowid: rowid, index: -1, _index: -1, $index: -1, items: parentChilds_1, parent: parentRow_1, level: parentLevel_1 + 1 };
+                                    var rest = { row: item, rowid: rowid, seq: -1, index: -1, _index: -1, $index: -1, items: parentChilds_1, parent: parentRow_1, level: parentLevel_1 + 1 };
                                     fullDataRowIdData[rowid] = rest;
                                     fullAllDataRowIdData[rowid] = rest;
                                 });
-                                $xetable.updateVirtualTreeData();
                             }
                             else {
                                 if (process.env.NODE_ENV === 'development') {
@@ -225,13 +222,11 @@ var editHook = {
                     }
                 }
                 (_a = editStore.insertList).unshift.apply(_a, newRecords);
-                reactData.scrollYLoad = !treeConfig && sYOpts.gt > -1 && sYOpts.gt < tableFullData.length;
                 $xetable.updateFooter();
                 $xetable.cacheRowMap();
-                $xetable.handleTableData(transform);
-                $xetable.updateAfterDataIndex();
+                $xetable.handleTableData(treeConfig && treeOpts.transform);
                 $xetable.checkSelectionStatus();
-                if (scrollYLoad) {
+                if (reactData.scrollYLoad) {
                     $xetable.updateScrollYSpace();
                 }
                 return nextTick().then(function () {
@@ -252,10 +247,9 @@ var editHook = {
              */
             remove: function (rows) {
                 var treeConfig = props.treeConfig;
-                var mergeList = reactData.mergeList, editStore = reactData.editStore, selection = reactData.selection, scrollYLoad = reactData.scrollYLoad;
-                var treeFullData = internalData.treeFullData, afterFullData = internalData.afterFullData, tableFullData = internalData.tableFullData;
+                var mergeList = reactData.mergeList, editStore = reactData.editStore, selection = reactData.selection;
+                var tableFullTreeData = internalData.tableFullTreeData, afterFullData = internalData.afterFullData, tableFullData = internalData.tableFullData;
                 var checkboxOpts = computeCheckboxOpts.value;
-                var sYOpts = computeSYOpts.value;
                 var treeOpts = computeTreeOpts.value;
                 var transform = treeOpts.transform;
                 var actived = editStore.actived, removeList = editStore.removeList, insertList = editStore.insertList;
@@ -294,7 +288,7 @@ var editHook = {
                     if (treeConfig && transform) {
                         rows.forEach(function (row) {
                             var rowid = getRowid($xetable, row);
-                            var matchObj = XEUtils.findTree(treeFullData, function (item) { return rowid === getRowid($xetable, item); }, treeOpts);
+                            var matchObj = XEUtils.findTree(tableFullTreeData, function (item) { return rowid === getRowid($xetable, item); }, treeOpts);
                             if (matchObj) {
                                 var rItems = matchObj.items.splice(matchObj.index, 1);
                                 rest.push(rItems[0]);
@@ -303,7 +297,6 @@ var editHook = {
                             if (afIndex > -1) {
                                 afterFullData.splice(afIndex, 1);
                             }
-                            $xetable.updateVirtualTreeData();
                         });
                     }
                     else {
@@ -341,13 +334,11 @@ var editHook = {
                         insertList.splice(iIndex, 1);
                     }
                 });
-                reactData.scrollYLoad = !treeConfig && sYOpts.gt > -1 && sYOpts.gt < tableFullData.length;
                 $xetable.updateFooter();
                 $xetable.cacheRowMap();
-                $xetable.handleTableData(transform);
-                $xetable.updateAfterDataIndex();
+                $xetable.handleTableData(treeConfig && treeOpts.transform);
                 $xetable.checkSelectionStatus();
-                if (scrollYLoad) {
+                if (reactData.scrollYLoad) {
                     $xetable.updateScrollYSpace();
                 }
                 return nextTick().then(function () {
@@ -402,7 +393,7 @@ var editHook = {
             getInsertRecords: function () {
                 var treeConfig = props.treeConfig;
                 var editStore = reactData.editStore;
-                var treeFullData = internalData.treeFullData, tableFullData = internalData.tableFullData;
+                var tableFullTreeData = internalData.tableFullTreeData, tableFullData = internalData.tableFullData;
                 var treeOpts = computeTreeOpts.value;
                 var insertList = editStore.insertList;
                 var insertRecords = [];
@@ -411,7 +402,7 @@ var editHook = {
                     if (treeConfig && treeOpts.transform) {
                         insertList.forEach(function (row) {
                             var rowid = getRowid($xetable, row);
-                            var matchObj = XEUtils.findTree(treeFullData, function (item) { return rowid === getRowid($xetable, item); }, treeOpts);
+                            var matchObj = XEUtils.findTree(tableFullTreeData, function (item) { return rowid === getRowid($xetable, item); }, treeOpts);
                             if (matchObj) {
                                 insertRecords.push(row);
                             }

package/es/export/src/hook.js

@@ -2,7 +2,7 @@ import { inject, nextTick } from 'vue';
 import XEUtils from 'xe-utils';
 import GlobalConfig from '../../v-x-e-table/src/conf';
 import { VXETable } from '../../v-x-e-table';
-import { isColumnInfo, mergeBodyMethod, getCellValue } from '../../table/src/util';
+import { isColumnInfo, mergeBodyMethod, getCellValue, toTreePathSeq } from '../../table/src/util';
 import { errLog, warnLog, parseFile, formatText } from '../../tools/utils';
 import { readLocalFile, handlePrint, saveLocalFile, createHtmlPage, getExportBlobByContent } from './util';
 var htmlCellElem;
@@ -265,14 +265,14 @@ var tableExportHook = {
             var treeOpts = computeTreeOpts.value;
             return row[treeOpts.children] && row[treeOpts.children].length;
         };
-        var getSeq = function (row, rowIndex, column, columnIndex, paths) {
+        var getSeq = function (row, rowIndex, column, columnIndex, path) {
             var seqOpts = computeSeqOpts.value;
             var seqMethod = seqOpts.seqMethod || column.seqMethod;
             if (seqMethod) {
                 return seqMethod({ row: row, rowIndex: rowIndex, column: column, columnIndex: columnIndex });
             }
-            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;
         };

package/es/filter/src/hook.js

@@ -13,7 +13,7 @@ import { nextTick } from 'vue';
 import XEUtils from 'xe-utils';
 import { VXETable } from '../../v-x-e-table';
 import { toFilters, handleFieldOrColumn } from '../../table/src/util';
-import { getDomNode } from '../../tools/dom';
+import { getDomNode, triggerEvent } from '../../tools/dom';
 var tableFilterMethodKeys = ['setFilter', 'clearFilter', 'getCheckedFilters'];
 var tableFilterHook = {
     setupTable: function ($xetable) {
@@ -91,7 +91,7 @@ var tableFilterHook = {
                         // 判断面板不能大于表格高度
                         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') {
                             left = targetElem_1.offsetLeft + targetElem_1.offsetParent.offsetLeft - centerWidth;
@@ -181,6 +181,25 @@ var tableFilterHook = {
             }
         };
         var filterMethods = {
+            /**
+             * 手动弹出筛选面板
+             * @param column
+             */
+            openFilter: function (fieldOrColumn) {
+                var column = handleFieldOrColumn($xetable, fieldOrColumn);
+                if (column && column.filters) {
+                    var elemStore_1 = internalData.elemStore;
+                    var fixed_1 = column.fixed;
+                    return $xetable.scrollToColumn(column).then(function () {
+                        var headerWrapperElem = elemStore_1[(fixed_1 || 'main') + "-header-wrapper"] || elemStore_1['main-header-wrapper'];
+                        if (headerWrapperElem) {
+                            var filterBtnElem = headerWrapperElem.querySelector(".vxe-header--column." + column.id + " .vxe-filter--btn");
+                            triggerEvent(filterBtnElem, 'click');
+                        }
+                    });
+                }
+                return nextTick();
+            },
             /**
              * 修改筛选条件列表
              * @param {ColumnInfo} fieldOrColumn 列或字段名

package/es/select/src/select.js

@@ -151,7 +151,7 @@ export default defineComponent({
             return getSelectLabel(modelValue);
         });
         var getOptkey = function () {
-            return props.optionId || '_XID';
+            return props.optionId || '_X_ID';
         };
         var getOptid = function (option) {
             var optid = option[getOptkey()];

package/es/table/src/body.js

@@ -110,7 +110,7 @@ export default defineComponent({
         /**
          * 渲染列
          */
-        var renderColumn = function ($seq, seq, rowid, fixedType, rowLevel, row, rowIndex, $rowIndex, _rowIndex, column, $columnIndex, columns, items) {
+        var renderColumn = function (seq, rowid, fixedType, rowLevel, row, rowIndex, $rowIndex, _rowIndex, column, $columnIndex, columns, items) {
             var _a;
             var columnKey = tableProps.columnKey, height = tableProps.height, allColumnOverflow = tableProps.showOverflow, cellClassName = tableProps.cellClassName, cellStyle = tableProps.cellStyle, allAlign = tableProps.align, spanMethod = tableProps.spanMethod, mouseConfig = tableProps.mouseConfig, editConfig = tableProps.editConfig, editRules = tableProps.editRules, tooltipConfig = tableProps.tooltipConfig;
             var tableData = tableReactData.tableData, overflowX = tableReactData.overflowX, scrollYLoad = tableReactData.scrollYLoad, currentColumn = tableReactData.currentColumn, mergeList = tableReactData.mergeList, editStore = tableReactData.editStore, validStore = tableReactData.validStore, isAllOverflow = tableReactData.isAllOverflow;
@@ -141,7 +141,7 @@ export default defineComponent({
             var hasValidError = validStore.row === row && validStore.column === column;
             var showValidTip = editRules && validOpts.showMessage && (validOpts.message === 'default' ? (height || tableData.length > 1) : validOpts.message === 'inline');
             var attrs = { colid: column.id };
-            var params = { $table: $xetable, $seq: $seq, seq: seq, rowid: rowid, row: row, rowIndex: rowIndex, $rowIndex: $rowIndex, _rowIndex: _rowIndex, column: column, columnIndex: columnIndex, $columnIndex: $columnIndex, _columnIndex: _columnIndex, fixed: fixedType, type: renderType, isHidden: fixedHiddenColumn, level: rowLevel, visibleData: afterFullData, data: tableData, items: items };
+            var params = { $table: $xetable, seq: seq, rowid: rowid, row: row, rowIndex: rowIndex, $rowIndex: $rowIndex, _rowIndex: _rowIndex, column: column, columnIndex: columnIndex, $columnIndex: $columnIndex, _columnIndex: _columnIndex, fixed: fixedType, type: renderType, isHidden: fixedHiddenColumn, level: rowLevel, visibleData: afterFullData, data: tableData, items: items };
             // 虚拟滚动不支持动态高度
             if (scrollYLoad && !hasEllipsis) {
                 showEllipsis = hasEllipsis = true;
@@ -282,23 +282,20 @@ export default defineComponent({
                     height: hasEllipsis && (scrollYRHeight || rowHeight) ? (scrollYRHeight || rowHeight) + "px" : ''
                 }, cellStyle ? (XEUtils.isFunction(cellStyle) ? cellStyle(params) : cellStyle) : null) }), tdOns), tdVNs);
         };
-        var renderRows = function ($seq, fixedType, tableData, tableColumn) {
+        var renderRows = function (fixedType, tableData, tableColumn) {
             var stripe = tableProps.stripe, rowKey = tableProps.rowKey, highlightHoverRow = tableProps.highlightHoverRow, rowClassName = tableProps.rowClassName, rowStyle = tableProps.rowStyle, allColumnOverflow = tableProps.showOverflow, editConfig = tableProps.editConfig, treeConfig = tableProps.treeConfig;
             var hasFixedColumn = tableReactData.hasFixedColumn, treeExpandeds = tableReactData.treeExpandeds, scrollYLoad = tableReactData.scrollYLoad, editStore = tableReactData.editStore, 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;
             var editOpts = computeEditOpts.value;
             var rowOpts = computeRowOpts.value;
+            var transform = treeOpts.transform;
             var rows = [];
             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 索引
                 rowIndex = $xetable.getRowIndex(row);
@@ -318,9 +315,15 @@ export default defineComponent({
                     };
                 }
                 var rowid = getRowid($xetable, row);
-                var rest = fullAllDataRowIdData[rowid];
-                var rowLevel = rest ? rest.level : 0;
-                var params = { $table: $xetable, $seq: $seq, seq: seq, rowid: rowid, fixed: fixedType, type: renderType, level: rowLevel, row: row, rowIndex: rowIndex, $rowIndex: $rowIndex, _rowIndex: _rowIndex };
+                var rest = fullDataRowIdData[rowid];
+                var rowLevel = 0;
+                var seq = -1;
+                if (rest) {
+                    rowLevel = rest.level;
+                    seq = rest.seq;
+                }
+                var params = { $table: $xetable, seq: seq, rowid: rowid, fixed: fixedType, type: renderType, level: rowLevel, row: row, rowIndex: rowIndex, $rowIndex: $rowIndex, _rowIndex: _rowIndex };
+                // 处理新增状态
                 var isNewRow = false;
                 if (editConfig) {
                     isNewRow = $xetable.findRowIndexOf(editStore.insertList, row) > -1;
@@ -332,7 +335,7 @@ export default defineComponent({
                             'row--radio': radioOpts.highlight && selectRow === row,
                             'row--checked': checkboxOpts.highlight && $xetable.isCheckedByCheckboxRow(row)
                         }, rowClassName ? (XEUtils.isFunction(rowClassName) ? rowClassName(params) : rowClassName) : ''], rowid: rowid, style: rowStyle ? (XEUtils.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) {
@@ -344,7 +347,7 @@ export default defineComponent({
                     }
                     var showOverflow = expandColumn.showOverflow;
                     var hasEllipsis = (XEUtils.isUndefined(showOverflow) || XEUtils.isNull(showOverflow)) ? allColumnOverflow : showOverflow;
-                    var expandParams = { $table: $xetable, $seq: $seq, seq: seq, column: expandColumn, fixed: fixedType, type: renderType, level: rowLevel, row: row, rowIndex: rowIndex, $rowIndex: $rowIndex, _rowIndex: _rowIndex };
+                    var expandParams = { $table: $xetable, seq: seq, column: expandColumn, fixed: fixedType, type: renderType, level: rowLevel, row: row, rowIndex: rowIndex, $rowIndex: $rowIndex, _rowIndex: _rowIndex };
                     rows.push(h('tr', __assign({ class: 'vxe-body--expanded-row', key: "expand_" + rowid, style: rowStyle ? (XEUtils.isFunction(rowStyle) ? rowStyle(expandParams) : rowStyle) : null }, trOn), [
                         h('td', {
                             class: ['vxe-body--expanded-column', {
@@ -363,10 +366,10 @@ export default defineComponent({
                     ]));
                 }
                 // 如果是树形表格
-                if (treeConfig && !scrollYLoad && treeExpandeds.length) {
+                if (treeConfig && !scrollYLoad && !transform && treeExpandeds.length) {
                     var rowChildren = row[treeOpts.children];
                     if (rowChildren && rowChildren.length && $xetable.findRowIndexOf(treeExpandeds, row) > -1) {
-                        rows.push.apply(rows, renderRows($seq ? $seq + "." + seq : "" + seq, fixedType, rowChildren, tableColumn));
+                        rows.push.apply(rows, renderRows(fixedType, rowChildren, tableColumn));
                     }
                 }
             });
@@ -655,7 +658,7 @@ export default defineComponent({
                      */
                     h('tbody', {
                         ref: refBodyTBody
-                    }, renderRows('', fixedType, tableData, tableColumn))
+                    }, renderRows(fixedType, tableData, tableColumn))
                 ]),
                 h('div', {
                     class: 'vxe-table--checkbox-range'

package/es/table/src/cell.js

@@ -105,16 +105,16 @@ export 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':
                 renConfs.renderHeader = Cell.renderRadioHeader;
                 renConfs.renderCell = treeNode ? Cell.renderTreeRadioCell : Cell.renderRadioCell;
                 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':
                 renConfs.renderCell = Cell.renderExpandCell;
@@ -266,14 +266,16 @@ export var Cell = {
     /**
      * 索引
      */
-    renderIndexHeader: function (params) {
+    renderSeqHeader: function (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 (params) {
+    renderSeqCell: function (params) {
         var $table = params.$table, column = params.column;
+        var props = $table.props;
+        var treeConfig = props.treeConfig;
         var computeSeqOpts = $table.getComputeMaps().computeSeqOpts;
         var seqOpts = computeSeqOpts.value;
         var slots = column.slots;
@@ -281,12 +283,12 @@ export var Cell = {
         if (defaultSlot) {
             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 ? $seq + "." + seq : (seqOpts.startIndex || 0) + seq, 1)];
+        return [formatText(seqMethod ? seqMethod(params) : treeConfig ? seq : (seqOpts.startIndex || 0) + seq, 1)];
     },
     renderTreeIndexCell: function (params) {
-        return Cell.renderTreeIcon(params, Cell.renderIndexCell(params));
+        return Cell.renderTreeIcon(params, Cell.renderSeqCell(params));
     },
     /**
      * 单选
@@ -359,7 +361,7 @@ export var Cell = {
     /**
      * 多选
      */
-    renderSelectionHeader: function (params) {
+    renderCheckboxHeader: function (params) {
         var $table = params.$table, column = params.column, isHidden = params.isHidden;
         var reactData = $table.reactData;
         var _a = $table.getComputeMaps(), computeIsAllCheckboxDisabled = _a.computeIsAllCheckboxDisabled, computeCheckboxOpts = _a.computeCheckboxOpts;
@@ -415,7 +417,7 @@ export var Cell = {
             ] : []))
         ]);
     },
-    renderSelectionCell: function (params) {
+    renderCheckboxCell: function (params) {
         var $table = params.$table, row = params.row, column = params.column, isHidden = params.isHidden;
         var props = $table.props, reactData = $table.reactData;
         var treeConfig = props.treeConfig;
@@ -475,9 +477,9 @@ export var Cell = {
         ];
     },
     renderTreeSelectionCell: function (params) {
-        return Cell.renderTreeIcon(params, Cell.renderSelectionCell(params));
+        return Cell.renderTreeIcon(params, Cell.renderCheckboxCell(params));
     },
-    renderSelectionCellByProp: function (params) {
+    renderCheckboxCellByProp: function (params) {
         var $table = params.$table, row = params.row, column = params.column, isHidden = params.isHidden;
         var props = $table.props, reactData = $table.reactData;
         var treeConfig = props.treeConfig;
@@ -537,7 +539,7 @@ export var Cell = {
         ];
     },
     renderTreeSelectionCellByProp: function (params) {
-        return Cell.renderTreeIcon(params, Cell.renderSelectionCellByProp(params));
+        return Cell.renderTreeIcon(params, Cell.renderCheckboxCellByProp(params));
     },
     /**
      * 展开行