vxe-table 4.19.3 → 4.19.4

package/dist/all.esm.js

@@ -44,7 +44,7 @@ function eqEmptyValue(cellValue) {
     return cellValue === '' || XEUtils.eqNull(cellValue);
 }
 
-const version$1 = "4.19.3";
+const version$1 = "4.19.4";
 VxeUI.version = version$1;
 VxeUI.tableVersion = version$1;
 VxeUI.setConfig({
@@ -556,7 +556,7 @@ const modal = {
 const defineVxeComponent = defineComponent;
 
 const { log } = VxeUI;
-const version = `table v${"4.19.3"}`;
+const version = `table v${"4.19.4"}`;
 const warnLog = log.create('warn', version);
 const errLog = log.create('error', version);
 
@@ -2541,7 +2541,13 @@ const Cell = {
             const { computeAggregateOpts } = $table.getComputeMaps();
             const aggregateOpts = computeAggregateOpts.value;
             const { mode } = aggregateOpts;
-            if (mode === 'column' ? column.field === row.groupField : rowGroupNode) {
+            if (mode === 'column') {
+                if (row.groupField && column.field === row.groupField) {
+                    return [Cell.renderRowGroupBtn(params, cellVNodes)];
+                }
+                return cellVNodes;
+            }
+            else if (rowGroupNode) {
                 return [Cell.renderRowGroupBtn(params, cellVNodes)];
             }
         }
@@ -10418,9 +10424,10 @@ hooks$4.add('tableExportModule', {
             return eqEmptyValue(cellValue) ? '' : `${cellValue}`;
         };
         const getBodyLabelData = (opts, columns, datas) => {
-            const { isTreeAllExpanded, isRowGroupAllExpanded, mode } = opts;
+            const { isTreeAllExpanded, isRowGroupAllExpanded, mode: expMode } = opts;
             const { treeConfig } = props;
             const { isRowGroupStatus } = reactData;
+            const { fullColumnFieldData } = internalData;
             const radioOpts = computeRadioOpts.value;
             const checkboxOpts = computeCheckboxOpts.value;
             const treeOpts = computeTreeOpts.value;
@@ -10432,7 +10439,7 @@ hooks$4.add('tableExportModule', {
             const { handleGetRowId } = createHandleGetRowId($xeTable);
             if (isRowGroupStatus) {
                 // 如果是数据分组
-                const { mapChildrenField } = aggregateOpts;
+                const { mode: aggMode, showTotal, totalMethod, countFields, contentMethod, formatValuesMethod, mapChildrenField } = aggregateOpts;
                 const rest = [];
                 const expandMaps = {};
                 const useMaps = {};
@@ -10453,8 +10460,9 @@ hooks$4.add('tableExportModule', {
                             _expand: hasRowChild && $xeTable.isRowExpandByRow(row)
                         };
                         columns.forEach((column, $columnIndex) => {
+                            const { field, editRender, cellRender, aggFunc, rowGroupNode } = column;
                             let cellValue = '';
-                            const renderOpts = column.editRender || column.cellRender;
+                            const renderOpts = editRender || cellRender;
                             let bodyExportMethod = column.exportMethod || columnOpts.exportMethod;
                             if (!bodyExportMethod && renderOpts && renderOpts.name) {
                                 const compConf = renderer$3.get(renderOpts.name);
@@ -10472,21 +10480,77 @@ hooks$4.add('tableExportModule', {
                                 switch (column.type) {
                                     case 'seq': {
                                         const seqVal = path.map((num, i) => i % 2 === 0 ? (Number(num) + 1) : '.').join('');
-                                        cellValue = mode === 'all' ? seqVal : getSeq(seqVal, row, $rowIndex, column, $columnIndex);
+                                        cellValue = expMode === 'all' ? seqVal : getSeq(seqVal, row, $rowIndex, column, $columnIndex);
                                         break;
                                     }
-                                    case 'checkbox':
+                                    case 'checkbox': {
                                         cellValue = toBooleanValue($xeTable.isCheckedByCheckboxRow(row));
                                         item._checkboxLabel = checkboxOpts.labelField ? XEUtils.get(row, checkboxOpts.labelField) : '';
                                         item._checkboxDisabled = checkboxOpts.checkMethod && !checkboxOpts.checkMethod({ $table: $xeTable, row });
                                         break;
-                                    case 'radio':
+                                    }
+                                    case 'radio': {
                                         cellValue = toBooleanValue($xeTable.isCheckedByRadioRow(row));
                                         item._radioLabel = radioOpts.labelField ? XEUtils.get(row, radioOpts.labelField) : '';
                                         item._radioDisabled = radioOpts.checkMethod && !radioOpts.checkMethod({ $table: $xeTable, row });
                                         break;
-                                    default:
-                                        if (opts.original) {
+                                    }
+                                    default: {
+                                        if (field && row.isAggregate) {
+                                            const aggRow = row;
+                                            const aggData = aggRow.aggData;
+                                            const currAggData = aggData ? aggData[field] : null;
+                                            const groupField = aggRow.groupField;
+                                            const groupContent = aggRow.groupContent;
+                                            const childList = mapChildrenField ? (aggRow[mapChildrenField] || []) : [];
+                                            const childCount = aggRow.childCount;
+                                            const colRest = fullColumnFieldData[groupField] || {};
+                                            const ctParams = {
+                                                $table: $xeTable,
+                                                groupField,
+                                                groupColumn: (colRest ? colRest.column : null),
+                                                column,
+                                                groupValue: groupContent,
+                                                childList,
+                                                childCount,
+                                                aggValue: null,
+                                                /**
+                                                 * 已废弃
+                                                 * @deprecated
+                                                 */
+                                                children: childList,
+                                                /**
+                                                 * 已废弃
+                                                 * @deprecated
+                                                 */
+                                                totalValue: childCount
+                                            };
+                                            if (aggMode === 'column' ? field === aggRow.groupField : rowGroupNode) {
+                                                cellValue = groupContent;
+                                                if (contentMethod) {
+                                                    cellValue = `${contentMethod(ctParams)}`;
+                                                }
+                                                if (showTotal) {
+                                                    cellValue = getI18n$4('vxe.table.rowGroupContentTotal', [cellValue, totalMethod ? totalMethod(ctParams) : childCount, childCount]);
+                                                }
+                                            }
+                                            else if ($xeTable.getPivotTableAggregateCellAggValue) {
+                                                const aggParams = {
+                                                    $table: $xeTable,
+                                                    row,
+                                                    column
+                                                };
+                                                cellValue = $xeTable.getPivotTableAggregateCellAggValue(aggParams);
+                                            }
+                                            else if (aggFunc === true || (countFields && countFields.includes(field))) {
+                                                cellValue = currAggData ? currAggData.value : childCount;
+                                                ctParams.aggValue = cellValue;
+                                                if (formatValuesMethod) {
+                                                    cellValue = formatValuesMethod(ctParams);
+                                                }
+                                            }
+                                        }
+                                        else if (opts.original) {
                                             cellValue = getCellValue(row, column);
                                         }
                                         else {
@@ -10502,6 +10566,8 @@ hooks$4.add('tableExportModule', {
                                                 }
                                             }
                                         }
+                                        break;
+                                    }
                                 }
                             }
                             item[column.id] = toStringValue(cellValue);
@@ -10557,7 +10623,7 @@ hooks$4.add('tableExportModule', {
                                 switch (column.type) {
                                     case 'seq': {
                                         const seqVal = path.map((num, i) => i % 2 === 0 ? (Number(num) + 1) : '.').join('');
-                                        cellValue = mode === 'all' ? seqVal : getSeq(seqVal, row, $rowIndex, column, $columnIndex);
+                                        cellValue = expMode === 'all' ? seqVal : getSeq(seqVal, row, $rowIndex, column, $columnIndex);
                                         break;
                                     }
                                     case 'checkbox':
@@ -10621,7 +10687,7 @@ hooks$4.add('tableExportModule', {
                         switch (column.type) {
                             case 'seq': {
                                 const seqValue = $rowIndex + 1;
-                                cellValue = mode === 'all' ? seqValue : getSeq(seqValue, row, $rowIndex, column, $columnIndex);
+                                cellValue = expMode === 'all' ? seqValue : getSeq(seqValue, row, $rowIndex, column, $columnIndex);
                                 break;
                             }
                             case 'checkbox':