vxe-table 3.15.5 → 3.15.6

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

@@ -1,4 +1,20 @@
 import XEUtils from 'xe-utils';
+function calcMaxHeight($xeTable) {
+    const reactData = $xeTable;
+    const { customStore } = reactData;
+    const el = $xeTable.$refs.refElem;
+    // 判断面板不能大于表格高度
+    let tableHeight = 0;
+    if (el) {
+        tableHeight = el.clientHeight - 28;
+    }
+    customStore.maxHeight = Math.max(88, tableHeight);
+}
+function emitCustomEvent($xeTable, type, evnt) {
+    const $xeGrid = $xeTable.$xeGrid;
+    const comp = $xeGrid || $xeTable;
+    comp.dispatchEvent('custom', { type }, evnt);
+}
 export default {
     methods: {
         _openCustom() {
@@ -9,18 +25,21 @@ export default {
             initStore.custom = true;
             $xeTable.handleUpdateCustomColumn();
             $xeTable.checkCustomStatus();
-            $xeTable.calcMaxHeight();
-            return this.$nextTick().then(() => this.calcMaxHeight());
+            calcMaxHeight($xeTable);
+            return $xeTable.$nextTick().then(() => calcMaxHeight($xeTable));
         },
         _closeCustom() {
-            const { customStore, customOpts } = this;
+            const $xeTable = this;
+            const reactData = $xeTable;
+            const { customStore } = reactData;
+            const customOpts = $xeTable.computeCustomOpts;
             if (customStore.visible) {
                 customStore.visible = false;
                 if (!customOpts.immediate) {
-                    this.handleCustom();
+                    $xeTable.handleCustom();
                 }
             }
-            return this.$nextTick();
+            return $xeTable.$nextTick();
         },
         _saveCustom() {
             const $xeTable = this;
@@ -62,8 +81,10 @@ export default {
         },
         _cancelCustom() {
             const $xeTable = this;
-            const { customStore, customOpts, customColumnList } = $xeTable;
+            const reactData = $xeTable;
+            const { customColumnList, customStore } = reactData;
             const { oldSortMaps, oldFixedMaps, oldVisibleMaps } = customStore;
+            const customOpts = $xeTable.computeCustomOpts;
             const { allowVisible, allowSort, allowFixed, allowResizable } = customOpts;
             XEUtils.eachTree(customColumnList, column => {
                 const colid = column.getKey();
@@ -90,7 +111,8 @@ export default {
             const $xeTable = this;
             const reactData = $xeTable;
             const internalData = $xeTable;
-            const { collectColumn, customOpts } = internalData;
+            const { collectColumn } = internalData;
+            const customOpts = $xeTable.computeCustomOpts;
             const { checkMethod } = customOpts;
             const opts = Object.assign({
                 visible: true,
@@ -108,7 +130,7 @@ export default {
                 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;
@@ -125,16 +147,17 @@ export default {
         _setCustomAllCheckbox(checked) {
             const $xeTable = this;
             const reactData = $xeTable;
-            const { customStore } = this;
-            const { customColumnList, customOpts } = this;
+            const { customStore } = reactData;
+            const { customColumnList } = reactData;
+            const customOpts = $xeTable.computeCustomOpts;
             const { checkMethod, visibleMethod } = customOpts;
             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 +171,10 @@ export default {
             }
             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;
@@ -161,54 +184,56 @@ export default {
             }
             $xeTable.checkCustomStatus();
         },
-        calcMaxHeight() {
-            const { $el, customStore } = this;
-            // 判断面板不能大于表格高度
-            let tableHeight = 0;
-            if ($el) {
-                tableHeight = $el.clientHeight - 28;
-            }
-            customStore.maxHeight = Math.max(88, tableHeight);
-        },
         checkCustomStatus() {
-            const { customStore, collectColumn, customOpts } = this;
+            const $xeTable = this;
+            const reactData = $xeTable;
+            const internalData = $xeTable;
+            const { customStore } = reactData;
+            const { collectColumn } = internalData;
+            const customOpts = $xeTable.computeCustomOpts;
             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));
         },
         emitCustomEvent(type, evnt) {
             const $xeTable = this;
             const $xeGrid = $xeTable.$xeGrid;
             const comp = $xeGrid || $xeTable;
-            comp.$emit('custom', { type, $table: $xeTable, $grid: $xeGrid, $event: evnt });
+            comp.dispatchEvent('custom', { type }, evnt);
         },
         triggerCustomEvent(evnt) {
-            const { customStore } = this;
+            const $xeTable = this;
+            const reactData = $xeTable;
+            const { customStore } = reactData;
             if (customStore.visible) {
                 this.closeCustom();
-                this.emitCustomEvent('close', evnt);
+                emitCustomEvent($xeTable, 'close', evnt);
             }
             else {
                 customStore.btnEl = evnt.target;
                 this.openCustom();
-                this.emitCustomEvent('open', evnt);
+                emitCustomEvent($xeTable, 'open', evnt);
             }
         },
         customOpenEvent(evnt) {
-            const { customStore } = this;
-            if (!customStore.visible) {
+            const $xeTable = this;
+            const reactData = $xeTable;
+            const { customStore } = reactData;
+            if (customStore.visible) {
                 customStore.activeBtn = true;
                 customStore.btnEl = evnt.target;
-                this.openCustom();
-                this.emitCustomEvent('open', evnt);
+                $xeTable.openCustom();
+                emitCustomEvent($xeTable, 'open', evnt);
             }
         },
         customCloseEvent(evnt) {
-            const { customStore } = this;
+            const $xeTable = this;
+            const reactData = $xeTable;
+            const { customStore } = reactData;
             if (customStore.visible) {
                 customStore.activeBtn = false;
-                this.closeCustom();
-                this.emitCustomEvent('close', evnt);
+                $xeTable.closeCustom();
+                emitCustomEvent($xeTable, 'close', evnt);
             }
         },
         handleUpdateCustomColumn() {

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

@@ -1,6 +1,6 @@
 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;
@@ -123,13 +123,13 @@ const renderSimplePanel = (h, _vm) => {
         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,
@@ -426,7 +426,7 @@ const renderPopupPanel = (h, _vm) => {
         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;
@@ -450,7 +450,7 @@ const renderPopupPanel = (h, _vm) => {
             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,
@@ -1230,7 +1230,7 @@ export default {
             const columnDragOpts = $xeTable.computeColumnDragOpts;
             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);
             // 是否移入有效列
@@ -1245,7 +1245,7 @@ export default {
                     showDropTip(this, evnt, optEl, false, dragPos);
                     return;
                 }
-                this.prevDragToChild = !!((isCrossDrag && isToChildDrag) && hasCtrlKey && immediate);
+                this.prevDragToChild = !!((isCrossDrag && isToChildDrag) && isControlKey && immediate);
                 this.prevDragCol = column;
                 this.prevDragPos = dragPos;
                 showDropTip(this, evnt, optEl, true, dragPos);

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

@@ -22,6 +22,7 @@ function getSeq($xeTable, cellValue, row, $rowIndex, column, $columnIndex) {
     const seqMethod = seqOpts.seqMethod || column.seqMethod;
     if (seqMethod) {
         return seqMethod({
+            $table: $xeTable,
             row,
             rowIndex: $xeTable.getRowIndex(row),
             $rowIndex,
@@ -103,12 +104,12 @@ function getBodyLabelData($xeTable, opts, columns, datas) {
                             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) {
@@ -164,12 +165,12 @@ function getBodyLabelData($xeTable, opts, columns, datas) {
                     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) {
@@ -199,7 +200,7 @@ function getExportData($xeTable, opts) {
     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($xeTable, opts, columns, datas);
 }
@@ -234,9 +235,9 @@ function getFooterCellValue($xeTable, opts, row, column) {
     }
     return XEUtils.get(row, column.field);
 }
-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) {
@@ -277,7 +278,7 @@ function toCsv($xeTable, opts, columns, datas) {
     });
     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($xeTable, opts, row, column))).join(',') + enterSymbol;
         });
@@ -295,7 +296,7 @@ function toTxt($xeTable, opts, columns, datas) {
     });
     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($xeTable, opts, row, column))).join('\t') + enterSymbol;
         });
@@ -458,7 +459,7 @@ function toHtml($xeTable, opts, columns, datas) {
     }
     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) => {
@@ -509,7 +510,7 @@ function toXML($xeTable, opts, columns, datas) {
     });
     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($xeTable, opts, row, column)}</Data></Cell>`).join('')}</Row>`;
         });
@@ -1066,7 +1067,7 @@ function handleExportAndPrint($xeTable, options, isPrint) {
         }
         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, {

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

@@ -1,6 +1,6 @@
 import XEUtils from 'xe-utils';
 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 browseObj = XEUtils.browse();
 function getTargetOffset(target, container) {
     let offsetTop = 0;
@@ -446,8 +446,9 @@ export default {
                     const rangeRows = getCheckboxRangeRows(this, 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

@@ -14,8 +14,7 @@ const isVMScrollProcess = ($xeTable) => {
     const { lastScrollTime, isDragResize } = tableReactData;
     return !!(isDragResize || (lastScrollTime && Date.now() < lastScrollTime + delayHover));
 };
-function renderLine(h, _vm, rowid, params, cellHeight) {
-    const $xeTable = _vm.$parent;
+function renderLine(h, $xeTable, rowid, params, cellHeight) {
     const tableProps = $xeTable;
     const tableInternalData = $xeTable;
     const { row, column } = params;
@@ -56,8 +55,7 @@ function renderLine(h, _vm, rowid, params, cellHeight) {
 /**
  * 渲染列
  */
-function renderTdColumn(h, _vm, seq, rowid, fixedType, isOptimizeMode, rowLevel, row, rowIndex, $rowIndex, _rowIndex, column, $columnIndex, columns, items) {
-    const $xeTable = _vm.$parent;
+function renderTdColumn(h, $xeTable, seq, rowid, fixedType, isOptimizeMode, rowLevel, row, rowIndex, $rowIndex, _rowIndex, column, $columnIndex, columns, items) {
     const tableProps = $xeTable;
     const tableReactData = $xeTable;
     const tableInternalData = $xeTable;
@@ -281,7 +279,7 @@ function renderTdColumn(h, _vm, seq, rowid, fixedType, isOptimizeMode, rowLevel,
     }
     else {
         // 渲染单元格
-        tdVNs.push(...renderLine(h, _vm, rowid, cellParams, cellHeight), h('div', {
+        tdVNs.push(...renderLine(h, $xeTable, rowid, cellParams, cellHeight), h('div', {
             key: 'tc',
             class: ['vxe-cell', {
                     'c--title': showTitle,
@@ -401,9 +399,10 @@ function renderRows(h, _vm, fixedType, isOptimizeMode, tableData, tableColumn) {
     const tableProps = $xeTable;
     const tableReactData = $xeTable;
     const tableInternalData = $xeTable;
+    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 = $xeTable.computeCheckboxOpts;
     const radioOpts = $xeTable.computeRadioOpts;
     const treeOpts = $xeTable.computeTreeOpts;
@@ -415,6 +414,7 @@ function renderRows(h, _vm, fixedType, isOptimizeMode, tableData, tableColumn) {
     const childrenField = treeOpts.children || treeOpts.childrenField;
     const rows = [];
     const { handleGetRowId } = createHandleGetRowId($xeTable);
+    const isDeepRow = treeConfig || isRowGroupStatus;
     tableData.forEach((row, $rowIndex) => {
         const trOn = {};
         const rowid = handleGetRowId(row);
@@ -423,6 +423,7 @@ function renderRows(h, _vm, fixedType, isOptimizeMode, tableData, tableColumn) {
         let rowLevel = 0;
         let seq = -1;
         let _rowIndex = -1;
+        const hasRowGroupAggregate = isRowGroupStatus && row.isAggregate;
         // 当前行事件
         if (rowOpts.isHover || highlightHoverRow) {
             trOn.mouseenter = (evnt) => {
@@ -440,7 +441,7 @@ function renderRows(h, _vm, fixedType, isOptimizeMode, tableData, tableColumn) {
         }
         if (rowRest) {
             rowLevel = rowRest.level;
-            if (treeConfig && transform && seqMode === 'increasing') {
+            if (hasRowGroupAggregate || (treeConfig && transform && seqMode === 'increasing')) {
                 seq = rowRest._index + 1;
             }
             else {
@@ -465,14 +466,14 @@ function renderRows(h, _vm, fixedType, isOptimizeMode, tableData, tableColumn) {
             isExpandTree = !!treeExpandedFlag && rowChildren && rowChildren.length > 0 && !!treeExpandedMaps[rowid];
         }
         // 拖拽行事件
-        if (rowOpts.drag && (!treeConfig || transform)) {
+        if (rowOpts.drag && !isRowGroupStatus && (!treeConfig || transform)) {
             trOn.dragstart = $xeTable.handleRowDragDragstartEvent;
             trOn.dragend = $xeTable.handleRowDragDragendEvent;
             trOn.dragover = $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,
@@ -481,12 +482,13 @@ function renderRows(h, _vm, fixedType, isOptimizeMode, tableData, tableColumn) {
                 'row--new': isNewRow && (editOpts.showStatus || editOpts.showInsertStatus),
                 'row--radio': radioOpts.highlight && selectRadioRow === row,
                 'row--checked': checkboxOpts.highlight && $xeTable.isCheckedByCheckboxRow(row),
-                'row--pending': !!pendingRowFlag && !!pendingRowMaps[rowid]
+                'row--pending': !!pendingRowFlag && !!pendingRowMaps[rowid],
+                'row--group': hasRowGroupAggregate
             },
             rowClassName ? (XEUtils.isFunction(rowClassName) ? rowClassName(params) : rowClassName) : ''
         ];
         const tdVNs = tableColumn.map((column, $columnIndex) => {
-            return renderTdColumn(h, _vm, seq, rowid, fixedType, isOptimizeMode, rowLevel, row, rowIndex, $rowIndex, _rowIndex, column, $columnIndex, tableColumn, tableData);
+            return renderTdColumn(h, $xeTable, seq, rowid, fixedType, isOptimizeMode, rowLevel, row, rowIndex, $rowIndex, _rowIndex, column, $columnIndex, tableColumn, tableData);
         });
         rows.push(!isColLoading && (columnOpts.drag && columnDragOpts.animation)
             ? h('transition-group', {
@@ -499,7 +501,7 @@ function renderRows(h, _vm, fixedType, isOptimizeMode, tableData, tableColumn) {
                     rowid
                 },
                 style: rowStyle ? (XEUtils.isFunction(rowStyle) ? rowStyle(params) : rowStyle) : undefined,
-                key: rowKey || scrollXLoad || scrollYLoad || rowOpts.useKey || rowOpts.drag || columnOpts.drag || treeConfig ? rowid : $rowIndex,
+                key: rowKey || scrollXLoad || scrollYLoad || rowOpts.useKey || rowOpts.drag || columnOpts.drag || isRowGroupStatus || treeConfig ? rowid : $rowIndex,
                 nativeOn: trOn
             }, tdVNs)
             : h('tr', {
@@ -508,7 +510,7 @@ function renderRows(h, _vm, fixedType, isOptimizeMode, tableData, tableColumn) {
                     rowid
                 },
                 style: rowStyle ? (XEUtils.isFunction(rowStyle) ? rowStyle(params) : rowStyle) : undefined,
-                key: rowKey || scrollXLoad || scrollYLoad || rowOpts.useKey || rowOpts.drag || columnOpts.drag || treeConfig ? rowid : $rowIndex,
+                key: rowKey || scrollXLoad || scrollYLoad || rowOpts.useKey || rowOpts.drag || columnOpts.drag || isRowGroupStatus || treeConfig ? rowid : $rowIndex,
                 on: trOn
             }, tdVNs));
         // 如果行被展开了
@@ -542,9 +544,40 @@ function renderRows(h, _vm, fixedType, isOptimizeMode, tableData, tableColumn) {
                 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