vxe-table 4.13.5 → 4.13.6

package/es/table/module/custom/hook.js

@@ -131,10 +131,10 @@ VxeUI.hooks.add('tableCustomModule', {
             const isAll = !!checked;
             if (customOpts.immediate) {
                 XEUtils.eachTree(customColumnList, (column) => {
-                    if (visibleMethod && !visibleMethod({ column })) {
+                    if (visibleMethod && !visibleMethod({ $table: $xeTable, column })) {
                         return;
                     }
-                    if (checkMethod && !checkMethod({ column })) {
+                    if (checkMethod && !checkMethod({ $table: $xeTable, column })) {
                         return;
                     }
                     column.visible = isAll;
@@ -148,10 +148,10 @@ VxeUI.hooks.add('tableCustomModule', {
             }
             else {
                 XEUtils.eachTree(customColumnList, (column) => {
-                    if (visibleMethod && !visibleMethod({ column })) {
+                    if (visibleMethod && !visibleMethod({ $table: $xeTable, column })) {
                         return;
                     }
-                    if (checkMethod && !checkMethod({ column })) {
+                    if (checkMethod && !checkMethod({ $table: $xeTable, column })) {
                         return;
                     }
                     column.renderVisible = isAll;
@@ -187,7 +187,7 @@ VxeUI.hooks.add('tableCustomModule', {
                     if (opts.sort) {
                         column.renderSortNumber = column.sortNumber;
                     }
-                    if (!checkMethod || checkMethod({ column })) {
+                    if (!checkMethod || checkMethod({ $table: $xeTable, column })) {
                         column.visible = column.defaultVisible;
                     }
                     column.renderResizeWidth = column.renderWidth;
@@ -208,8 +208,8 @@ VxeUI.hooks.add('tableCustomModule', {
             const { collectColumn } = internalData;
             const customOpts = computeCustomOpts.value;
             const { checkMethod } = customOpts;
-            customStore.isAll = collectColumn.every((column) => (checkMethod ? !checkMethod({ column }) : false) || column.renderVisible);
-            customStore.isIndeterminate = !customStore.isAll && collectColumn.some((column) => (!checkMethod || checkMethod({ column })) && (column.renderVisible || column.halfVisible));
+            customStore.isAll = collectColumn.every((column) => (checkMethod ? !checkMethod({ $table: $xeTable, column }) : false) || column.renderVisible);
+            customStore.isIndeterminate = !customStore.isAll && collectColumn.some((column) => (!checkMethod || checkMethod({ $table: $xeTable, column })) && (column.renderVisible || column.halfVisible));
         };
         const emitCustomEvent = (type, evnt) => {
             const comp = $xeGrid || $xeTable;
@@ -219,7 +219,8 @@ VxeUI.hooks.add('tableCustomModule', {
             checkCustomStatus,
             emitCustomEvent,
             triggerCustomEvent(evnt) {
-                const { customStore } = $xeTable.reactData;
+                const reactData = $xeTable.reactData;
+                const { customStore } = reactData;
                 if (customStore.visible) {
                     closeCustom();
                     emitCustomEvent('close', evnt);
@@ -231,6 +232,7 @@ VxeUI.hooks.add('tableCustomModule', {
                 }
             },
             customOpenEvent(evnt) {
+                const reactData = $xeTable.reactData;
                 const { customStore } = reactData;
                 if (!customStore.visible) {
                     customStore.activeBtn = true;
@@ -240,6 +242,7 @@ VxeUI.hooks.add('tableCustomModule', {
                 }
             },
             customCloseEvent(evnt) {
+                const reactData = $xeTable.reactData;
                 const { customStore } = reactData;
                 if (customStore.visible) {
                     customStore.activeBtn = false;

package/es/table/module/custom/panel.js

@@ -1,7 +1,7 @@
 import { defineComponent, h, inject, ref, nextTick, TransitionGroup, createCommentVNode } from 'vue';
 import { VxeUI } from '../../../ui';
 import { formatText } from '../../../ui/src/utils';
-import { getTpImg, addClass, removeClass } from '../../../ui/src/dom';
+import { getTpImg, addClass, removeClass, hasControlKey } from '../../../ui/src/dom';
 import { errLog } from '../../../ui/src/log';
 import XEUtils from 'xe-utils';
 const { getI18n, getIcon, renderEmptyElement } = VxeUI;
@@ -409,7 +409,7 @@ export default defineComponent({
             const columnDragOpts = computeColumnDragOpts.value;
             const { isCrossDrag, isToChildDrag } = columnDragOpts;
             const optEl = evnt.currentTarget;
-            const hasCtrlKey = evnt.ctrlKey;
+            const isControlKey = hasControlKey(evnt);
             const colid = optEl.getAttribute('colid');
             const column = $xeTable.getColumnById(colid);
             const dragCol = dragColumnRef.value;
@@ -425,7 +425,7 @@ export default defineComponent({
                     showDropTip(evnt, optEl, false, dragPos);
                     return;
                 }
-                prevDragToChild = !!((isCrossDrag && isToChildDrag) && hasCtrlKey && immediate);
+                prevDragToChild = !!((isCrossDrag && isToChildDrag) && isControlKey && immediate);
                 prevDragCol = column;
                 prevDragPos = dragPos;
                 showDropTip(evnt, optEl, true, dragPos);
@@ -503,13 +503,13 @@ export default defineComponent({
                 isCustomStatus
             };
             XEUtils.eachTree(customColumnList, (column, index, items, path, parent) => {
-                const isVisible = visibleMethod ? visibleMethod({ column }) : true;
+                const isVisible = visibleMethod ? visibleMethod({ $table: $xeTable, column }) : true;
                 if (isVisible) {
                     const isChecked = column.renderVisible;
                     const isIndeterminate = column.halfVisible;
                     const isColGroup = column.children && column.children.length;
                     const colTitle = formatText(column.getTitle(), 1);
-                    const isDisabled = checkMethod ? !checkMethod({ column }) : false;
+                    const isDisabled = checkMethod ? !checkMethod({ $table: $xeTable, column }) : false;
                     const isHidden = !isChecked;
                     colVNs.push(h('li', {
                         key: column.id,
@@ -758,7 +758,7 @@ export default defineComponent({
                 isCustomStatus
             };
             XEUtils.eachTree(customColumnList, (column, index, items, path, parent) => {
-                const isVisible = visibleMethod ? visibleMethod({ column }) : true;
+                const isVisible = visibleMethod ? visibleMethod({ $table: $xeTable, column }) : true;
                 if (isVisible) {
                     // 默认继承调整宽度
                     let customMinWidth = 0;
@@ -782,7 +782,7 @@ export default defineComponent({
                     const isIndeterminate = column.halfVisible;
                     const colTitle = formatText(column.getTitle(), 1);
                     const isColGroup = column.children && column.children.length;
-                    const isDisabled = checkMethod ? !checkMethod({ column }) : false;
+                    const isDisabled = checkMethod ? !checkMethod({ $table: $xeTable, column }) : false;
                     const isHidden = !isChecked;
                     trVNs.push(h('tr', {
                         key: column.id,

package/es/table/module/export/hook.js

@@ -79,9 +79,9 @@ function toTableBorder(border) {
 function getBooleanValue(cellValue) {
     return cellValue === 'TRUE' || cellValue === 'true' || cellValue === true;
 }
-function getFooterData(opts, footerTableData) {
+function getFooterData($xeTable, opts, footerTableData) {
     const { footerFilterMethod } = opts;
-    return footerFilterMethod ? footerTableData.filter((items, index) => footerFilterMethod({ items, $rowIndex: index })) : footerTableData;
+    return footerFilterMethod ? footerTableData.filter((items, index) => footerFilterMethod({ $table: $xeTable, items, $rowIndex: index })) : footerTableData;
 }
 function getCsvCellTypeLabel(column, cellValue) {
     if (cellValue) {
@@ -266,6 +266,7 @@ hooks.add('tableExportModule', {
             const seqMethod = seqOpts.seqMethod || column.seqMethod;
             if (seqMethod) {
                 return seqMethod({
+                    $table: $xeTable,
                     row,
                     rowIndex: $xeTable.getRowIndex(row),
                     $rowIndex,
@@ -339,12 +340,12 @@ hooks.add('tableExportModule', {
                                     case 'checkbox':
                                         cellValue = toBooleanValue($xeTable.isCheckedByCheckboxRow(row));
                                         item._checkboxLabel = checkboxOpts.labelField ? XEUtils.get(row, checkboxOpts.labelField) : '';
-                                        item._checkboxDisabled = checkboxOpts.checkMethod && !checkboxOpts.checkMethod({ row });
+                                        item._checkboxDisabled = checkboxOpts.checkMethod && !checkboxOpts.checkMethod({ $table: $xeTable, row });
                                         break;
                                     case 'radio':
                                         cellValue = toBooleanValue($xeTable.isCheckedByRadioRow(row));
                                         item._radioLabel = radioOpts.labelField ? XEUtils.get(row, radioOpts.labelField) : '';
-                                        item._radioDisabled = radioOpts.checkMethod && !radioOpts.checkMethod({ row });
+                                        item._radioDisabled = radioOpts.checkMethod && !radioOpts.checkMethod({ $table: $xeTable, row });
                                         break;
                                     default:
                                         if (opts.original) {
@@ -400,12 +401,12 @@ hooks.add('tableExportModule', {
                             case 'checkbox':
                                 cellValue = toBooleanValue($xeTable.isCheckedByCheckboxRow(row));
                                 item._checkboxLabel = checkboxOpts.labelField ? XEUtils.get(row, checkboxOpts.labelField) : '';
-                                item._checkboxDisabled = checkboxOpts.checkMethod && !checkboxOpts.checkMethod({ row });
+                                item._checkboxDisabled = checkboxOpts.checkMethod && !checkboxOpts.checkMethod({ $table: $xeTable, row });
                                 break;
                             case 'radio':
                                 cellValue = toBooleanValue($xeTable.isCheckedByRadioRow(row));
                                 item._radioLabel = radioOpts.labelField ? XEUtils.get(row, radioOpts.labelField) : '';
-                                item._radioDisabled = radioOpts.checkMethod && !radioOpts.checkMethod({ row });
+                                item._radioDisabled = radioOpts.checkMethod && !radioOpts.checkMethod({ $table: $xeTable, row });
                                 break;
                             default:
                                 if (opts.original) {
@@ -435,7 +436,7 @@ hooks.add('tableExportModule', {
             const { columns, dataFilterMethod } = opts;
             let datas = opts.data;
             if (dataFilterMethod) {
-                datas = datas.filter((row, index) => dataFilterMethod({ row, $rowIndex: index }));
+                datas = datas.filter((row, index) => dataFilterMethod({ $table: $xeTable, row, $rowIndex: index }));
             }
             return getBodyLabelData(opts, columns, datas);
         };
@@ -462,7 +463,7 @@ hooks.add('tableExportModule', {
             }
             return XEUtils.get(row, column.field);
         };
-        const toCsv = (opts, columns, datas) => {
+        const toCsv = ($xeTable, opts, columns, datas) => {
             let content = csvBOM;
             if (opts.isHeader) {
                 content += columns.map((column) => toTxtCellLabel(getHeaderTitle(opts, column))).join(',') + enterSymbol;
@@ -472,14 +473,14 @@ hooks.add('tableExportModule', {
             });
             if (opts.isFooter) {
                 const { footerTableData } = reactData;
-                const footers = getFooterData(opts, footerTableData);
+                const footers = getFooterData($xeTable, opts, footerTableData);
                 footers.forEach((row) => {
                     content += columns.map((column) => toTxtCellLabel(getFooterCellValue(opts, row, column))).join(',') + enterSymbol;
                 });
             }
             return content;
         };
-        const toTxt = (opts, columns, datas) => {
+        const toTxt = ($xeTable, opts, columns, datas) => {
             let content = '';
             if (opts.isHeader) {
                 content += columns.map((column) => toTxtCellLabel(getHeaderTitle(opts, column))).join('\t') + enterSymbol;
@@ -489,7 +490,7 @@ hooks.add('tableExportModule', {
             });
             if (opts.isFooter) {
                 const { footerTableData } = reactData;
-                const footers = getFooterData(opts, footerTableData);
+                const footers = getFooterData($xeTable, opts, footerTableData);
                 footers.forEach((row) => {
                     content += columns.map((column) => toTxtCellLabel(getFooterCellValue(opts, row, column))).join('\t') + enterSymbol;
                 });
@@ -648,7 +649,7 @@ hooks.add('tableExportModule', {
             }
             if (isFooter) {
                 const { footerTableData } = reactData;
-                const footers = getFooterData(opts, footerTableData);
+                const footers = getFooterData($xeTable, opts, footerTableData);
                 if (footers.length) {
                     tables.push('<tfoot>');
                     footers.forEach((row) => {
@@ -698,20 +699,20 @@ hooks.add('tableExportModule', {
             });
             if (opts.isFooter) {
                 const { footerTableData } = reactData;
-                const footers = getFooterData(opts, footerTableData);
+                const footers = getFooterData($xeTable, opts, footerTableData);
                 footers.forEach((row) => {
                     xml += `<Row>${columns.map((column) => `<Cell><Data ss:Type="String">${getFooterCellValue(opts, row, column)}</Data></Cell>`).join('')}</Row>`;
                 });
             }
             return `${xml}</Table></Worksheet></Workbook>`;
         };
-        const getContent = (opts, columns, datas) => {
+        const getContent = ($xeTable, opts, columns, datas) => {
             if (columns.length) {
                 switch (opts.type) {
                     case 'csv':
-                        return toCsv(opts, columns, datas);
+                        return toCsv($xeTable, opts, columns, datas);
                     case 'txt':
-                        return toTxt(opts, columns, datas);
+                        return toTxt($xeTable, opts, columns, datas);
                     case 'html':
                         return toHtml(opts, columns, datas);
                     case 'xml':
@@ -746,7 +747,7 @@ hooks.add('tableExportModule', {
                 else {
                     const datas = getExportData(opts);
                     resolve($xeTable.preventEvent(null, 'event.export', { options: opts, columns, colgroups, datas }, () => {
-                        return downloadFile(opts, getContent(opts, columns, datas));
+                        return downloadFile(opts, getContent($xeTable, opts, columns, datas));
                     }));
                 }
             }).then((params) => {
@@ -1013,7 +1014,7 @@ hooks.add('tableExportModule', {
                 }
                 column.checked = isChecked;
                 column.halfChecked = false;
-                column.disabled = (parent && parent.disabled) || (checkMethod ? !checkMethod({ column }) : false);
+                column.disabled = (parent && parent.disabled) || (checkMethod ? !checkMethod({ $table: $xeTable, column }) : false);
             });
             // 更新条件
             Object.assign(exportStore, {
@@ -1184,14 +1185,14 @@ hooks.add('tableExportModule', {
                     }, {
                         children: 'childNodes',
                         mapChildren: '_children'
-                    }), (column, index) => isColumnInfo(column) && (!columnFilterMethod || columnFilterMethod({ column: column, $columnIndex: index })), {
+                    }), (column, index) => isColumnInfo(column) && (!columnFilterMethod || columnFilterMethod({ $table: $xeTable, column: column, $columnIndex: index })), {
                         children: '_children',
                         mapChildren: 'childNodes',
                         original: true
                     });
                 }
                 else {
-                    groups = XEUtils.searchTree(isGroup ? collectColumn : tableFullColumn, (column, index) => column.visible && (!columnFilterMethod || columnFilterMethod({ column, $columnIndex: index })), { children: 'children', mapChildren: 'childNodes', original: true });
+                    groups = XEUtils.searchTree(isGroup ? collectColumn : tableFullColumn, (column, index) => column.visible && (!columnFilterMethod || columnFilterMethod({ $table: $xeTable, column, $columnIndex: index })), { children: 'children', mapChildren: 'childNodes', original: true });
                 }
                 // 获取所有列
                 const cols = [];

package/es/table/module/keyboard/hook.js

@@ -1,7 +1,7 @@
 import XEUtils from 'xe-utils';
 import { VxeUI } from '../../../ui';
 import { getRefElem } from '../../src/util';
-import { hasClass, getAbsolutePos, addClass, removeClass } from '../../../ui/src/dom';
+import { hasClass, getAbsolutePos, addClass, removeClass, hasControlKey } from '../../../ui/src/dom';
 const { hooks } = VxeUI;
 const browseObj = XEUtils.browse();
 function getTargetOffset(target, container) {
@@ -178,8 +178,9 @@ hooks.add('tableKeyboardModule', {
                     const rangeRows = getCheckboxRangeRows(evnt, params, trElem, trRect, offsetClientTop, offsetTop < marginSize ? -rangeHeight : rangeHeight);
                     // 至少滑动 10px 才能有效匹配
                     if (rangeHeight > 10 && rangeRows.length !== lastRangeRows.length) {
+                        const isControlKey = hasControlKey(evnt);
                         lastRangeRows = rangeRows;
-                        if (evnt.ctrlKey) {
+                        if (isControlKey) {
                             rangeRows.forEach((row) => {
                                 $xeTable.handleBatchSelectRows([row], selectRecords.indexOf(row) === -1);
                             });

package/es/table/src/body.js

@@ -399,9 +399,10 @@ export default defineComponent({
                 ], key: columnKey || scrollXLoad || scrollYLoad || columnOpts.useKey || rowOpts.useKey || columnOpts.drag ? colid : $columnIndex }, tdAttrs), { style: Object.assign({}, XEUtils.isFunction(compCellStyle) ? compCellStyle(cellParams) : compCellStyle, XEUtils.isFunction(cellStyle) ? cellStyle(cellParams) : cellStyle) }), tdOns), isOptimizeMode && fixedHiddenColumn ? [] : tdVNs);
         };
         const renderRows = (fixedType, isOptimizeMode, tableData, tableColumn) => {
+            const $xeGrid = $xeTable.xeGrid;
             const { stripe, rowKey, highlightHoverRow, rowClassName, rowStyle, editConfig, treeConfig } = tableProps;
-            const { hasFixedColumn, treeExpandedFlag, isColLoading, scrollXLoad, scrollYLoad, isAllOverflow, rowExpandedFlag, expandColumn, selectRadioRow, pendingRowFlag, isDragColMove, rowExpandHeightFlag } = tableReactData;
-            const { fullAllDataRowIdData, treeExpandedMaps, pendingRowMaps, rowExpandedMaps } = tableInternalData;
+            const { hasFixedColumn, treeExpandedFlag, isColLoading, scrollXLoad, scrollYLoad, isAllOverflow, rowExpandedFlag, expandColumn, selectRadioRow, pendingRowFlag, isDragColMove, rowExpandHeightFlag, isRowGroupStatus } = tableReactData;
+            const { fullAllDataRowIdData, fullColumnIdData, treeExpandedMaps, pendingRowMaps, rowExpandedMaps } = tableInternalData;
             const checkboxOpts = computeCheckboxOpts.value;
             const radioOpts = computeRadioOpts.value;
             const treeOpts = computeTreeOpts.value;
@@ -413,6 +414,7 @@ export default defineComponent({
             const childrenField = treeOpts.children || treeOpts.childrenField;
             const rows = [];
             const { handleGetRowId } = createHandleGetRowId($xeTable);
+            const isDeepRow = treeConfig || isRowGroupStatus;
             tableData.forEach((row, $rowIndex) => {
                 const rowid = handleGetRowId(row);
                 const rowRest = fullAllDataRowIdData[rowid] || {};
@@ -420,6 +422,7 @@ export default defineComponent({
                 let rowLevel = 0;
                 let seq = -1;
                 let _rowIndex = -1;
+                const hasRowGroupAggregate = isRowGroupStatus && row.isAggregate;
                 const trOn = {};
                 // 当前行事件
                 if (rowOpts.isHover || highlightHoverRow) {
@@ -438,7 +441,7 @@ export default defineComponent({
                 }
                 if (rowRest) {
                     rowLevel = rowRest.level;
-                    if (treeConfig && transform && seqMode === 'increasing') {
+                    if (hasRowGroupAggregate || (treeConfig && transform && seqMode === 'increasing')) {
                         seq = rowRest._index + 1;
                     }
                     else {
@@ -462,14 +465,14 @@ export default defineComponent({
                     isExpandTree = !!treeExpandedFlag && rowChildren && rowChildren.length > 0 && !!treeExpandedMaps[rowid];
                 }
                 // 拖拽行事件
-                if (rowOpts.drag && (!treeConfig || transform)) {
+                if (rowOpts.drag && !isRowGroupStatus && (!treeConfig || transform)) {
                     trOn.onDragstart = $xeTable.handleRowDragDragstartEvent;
                     trOn.onDragend = $xeTable.handleRowDragDragendEvent;
                     trOn.onDragover = $xeTable.handleRowDragDragoverEvent;
                 }
                 const trClass = [
                     'vxe-body--row',
-                    treeConfig ? `row--level-${rowLevel}` : '',
+                    isDeepRow ? `row--level-${rowLevel}` : '',
                     {
                         'row--stripe': stripe && (_rowIndex + 1) % 2 === 0,
                         'is--new': isNewRow,
@@ -478,7 +481,8 @@ export default defineComponent({
                         'row--new': isNewRow && (editOpts.showStatus || editOpts.showInsertStatus),
                         'row--radio': radioOpts.highlight && $xeTable.eqRow(selectRadioRow, row),
                         'row--checked': checkboxOpts.highlight && $xeTable.isCheckedByCheckboxRow(row),
-                        'row--pending': !!pendingRowFlag && !!pendingRowMaps[rowid]
+                        'row--pending': !!pendingRowFlag && !!pendingRowMaps[rowid],
+                        'row--group': hasRowGroupAggregate
                     },
                     getPropClass(rowClassName, params)
                 ];
@@ -486,10 +490,10 @@ export default defineComponent({
                     return renderTdColumn(seq, rowid, fixedType, isOptimizeMode, rowLevel, row, rowIndex, $rowIndex, _rowIndex, column, $columnIndex, tableColumn, tableData);
                 });
                 rows.push(!isColLoading && (columnOpts.drag && columnDragOpts.animation)
-                    ? h(TransitionGroup, Object.assign({ name: `vxe-header--col-list${isDragColMove ? '' : '-disabled'}`, tag: 'tr', class: trClass, rowid: rowid, style: rowStyle ? (XEUtils.isFunction(rowStyle) ? rowStyle(params) : rowStyle) : null, key: rowKey || scrollXLoad || scrollYLoad || rowOpts.useKey || rowOpts.drag || columnOpts.drag || treeConfig ? rowid : $rowIndex }, trOn), {
+                    ? h(TransitionGroup, Object.assign({ name: `vxe-header--col-list${isDragColMove ? '' : '-disabled'}`, tag: 'tr', class: trClass, rowid: rowid, style: rowStyle ? (XEUtils.isFunction(rowStyle) ? rowStyle(params) : rowStyle) : null, key: rowKey || scrollXLoad || scrollYLoad || rowOpts.useKey || rowOpts.drag || columnOpts.drag || isRowGroupStatus || treeConfig ? rowid : $rowIndex }, trOn), {
                         default: () => tdVNs
                     })
-                    : h('tr', Object.assign({ class: trClass, rowid: rowid, style: rowStyle ? (XEUtils.isFunction(rowStyle) ? rowStyle(params) : rowStyle) : null, key: rowKey || scrollXLoad || scrollYLoad || rowOpts.useKey || rowOpts.drag || columnOpts.drag || treeConfig ? rowid : $rowIndex }, trOn), tdVNs));
+                    : h('tr', Object.assign({ class: trClass, rowid: rowid, style: rowStyle ? (XEUtils.isFunction(rowStyle) ? rowStyle(params) : rowStyle) : null, key: rowKey || scrollXLoad || scrollYLoad || rowOpts.useKey || rowOpts.drag || columnOpts.drag || isRowGroupStatus || treeConfig ? rowid : $rowIndex }, trOn), tdVNs));
                 // 如果行被展开了
                 if (isExpandRow) {
                     const expandOpts = computeExpandOpts.value;
@@ -517,9 +521,40 @@ export default defineComponent({
                         if (treeConfig) {
                             cellStyle.paddingLeft = `${(rowLevel * treeOpts.indent) + 30}px`;
                         }
-                        const { showOverflow } = expandColumn;
+                        const { showOverflow } = expandColumn || {};
+                        const colid = expandColumn.id;
+                        const colRest = fullColumnIdData[colid] || {};
                         const hasEllipsis = (XEUtils.isUndefined(showOverflow) || XEUtils.isNull(showOverflow)) ? isAllOverflow : showOverflow;
-                        const expandParams = { $table: $xeTable, seq, column: expandColumn, fixed: fixedType, type: renderType, level: rowLevel, row, rowIndex, $rowIndex, _rowIndex };
+                        let columnIndex = -1;
+                        let $columnIndex = -1;
+                        let _columnIndex = -1;
+                        if (colRest) {
+                            columnIndex = colRest.index;
+                            $columnIndex = colRest.$index;
+                            _columnIndex = colRest._index;
+                        }
+                        const expandParams = {
+                            $grid: $xeGrid,
+                            $table: $xeTable,
+                            seq,
+                            column: expandColumn,
+                            columnIndex,
+                            $columnIndex,
+                            _columnIndex,
+                            fixed: fixedType,
+                            type: renderType,
+                            level: rowLevel,
+                            row,
+                            rowid,
+                            rowIndex,
+                            $rowIndex,
+                            _rowIndex,
+                            isHidden: false,
+                            isEdit: false,
+                            visibleData: [],
+                            data: [],
+                            items: []
+                        };
                         rows.push(h('tr', {
                             class: ['vxe-body--expanded-row', {
                                     'is--padding': padding