vxe-table 4.17.21 → 4.17.24

package/es/table/src/cell.js

@@ -366,8 +366,9 @@ export const Cell = {
             const { fullColumnFieldData } = tableInternalData;
             const { computeAggregateOpts } = $table.getComputeMaps();
             const aggregateOpts = computeAggregateOpts.value;
-            const { mode, showTotal, totalMethod, countFields, contentMethod, mapChildrenField } = aggregateOpts;
-            const aggCalcMethod = aggregateOpts.calcValuesMethod || aggregateOpts.countMethod || aggregateOpts.aggregateMethod;
+            const { mode, showTotal, totalMethod, countFields, contentMethod, formatValuesMethod, mapChildrenField } = aggregateOpts;
+            const aggData = aggRow.aggData;
+            const currAggData = aggData ? aggData[field] : null;
             const groupField = aggRow.groupField;
             const groupContent = aggRow.groupContent;
             const childList = mapChildrenField ? (aggRow[mapChildrenField] || []) : [];
@@ -409,9 +410,10 @@ export const Cell = {
                 cellValue = $table.getPivotTableAggregateCellAggValue(params);
             }
             else if (aggFunc === true || (countFields && countFields.includes(field))) {
-                if (aggCalcMethod) {
-                    ctParams.aggValue = childCount;
-                    cellValue = `${aggCalcMethod(ctParams)}`;
+                cellValue = currAggData ? currAggData.value : childCount;
+                ctParams.aggValue = cellValue;
+                if (formatValuesMethod) {
+                    cellValue = formatValuesMethod(ctParams);
                 }
             }
         }

package/es/table/src/table.js

@@ -818,6 +818,13 @@ export default defineVxeComponent({
             });
             return rgColumns;
         });
+        const computeAggFuncColumns = computed(() => {
+            const { rowGroupList, tableColumn } = reactData;
+            if (rowGroupList.length) {
+                return tableColumn.filter(column => column.aggFunc);
+            }
+            return [];
+        });
         const refMaps = {
             refElem,
             refTooltip,
@@ -917,6 +924,7 @@ export default defineVxeComponent({
             computeVirtualScrollBars,
             computeRowGroupFields,
             computeRowGroupColumns,
+            computeAggFuncColumns,
             computeFNROpts,
             computeSXOpts,
             computeSYOpts
@@ -2072,26 +2080,52 @@ export default defineVxeComponent({
             }
         };
         const getOrderField = (column) => {
-            const { sortBy, sortType } = column;
-            return (row) => {
-                let cellValue;
-                if (sortBy) {
-                    cellValue = XEUtils.isFunction(sortBy) ? sortBy({ row, column }) : XEUtils.get(row, sortBy);
-                }
-                else {
-                    cellValue = tableMethods.getCellLabel(row, column);
-                }
-                if (!sortType || sortType === 'auto') {
-                    return isNaN(cellValue) ? cellValue : XEUtils.toNumber(cellValue);
-                }
-                else if (sortType === 'number') {
-                    return XEUtils.toNumber(cellValue);
-                }
-                else if (sortType === 'string') {
-                    return XEUtils.toValueString(cellValue);
+            const { isRowGroupStatus } = reactData;
+            const { sortBy, sortType, aggFunc } = column;
+            return isRowGroupStatus && aggFunc
+                ? (row) => {
+                    if (row.isAggregate) {
+                        const aggData = row.aggData;
+                        const currAggData = aggData ? aggData[column.field] : null;
+                        return currAggData ? currAggData.value : null;
+                    }
+                    let cellValue;
+                    if (sortBy) {
+                        cellValue = XEUtils.isFunction(sortBy) ? sortBy({ row, column }) : XEUtils.get(row, sortBy);
+                    }
+                    else {
+                        cellValue = tableMethods.getCellLabel(row, column);
+                    }
+                    if (!sortType || sortType === 'auto') {
+                        return isNaN(cellValue) ? cellValue : XEUtils.toNumber(cellValue);
+                    }
+                    else if (sortType === 'number') {
+                        return XEUtils.toNumber(cellValue);
+                    }
+                    else if (sortType === 'string') {
+                        return XEUtils.toValueString(cellValue);
+                    }
+                    return cellValue;
                 }
-                return cellValue;
-            };
+                : (row) => {
+                    let cellValue;
+                    if (sortBy) {
+                        cellValue = XEUtils.isFunction(sortBy) ? sortBy({ row, column }) : XEUtils.get(row, sortBy);
+                    }
+                    else {
+                        cellValue = tableMethods.getCellLabel(row, column);
+                    }
+                    if (!sortType || sortType === 'auto') {
+                        return isNaN(cellValue) ? cellValue : XEUtils.toNumber(cellValue);
+                    }
+                    else if (sortType === 'number') {
+                        return XEUtils.toNumber(cellValue);
+                    }
+                    else if (sortType === 'string') {
+                        return XEUtils.toValueString(cellValue);
+                    }
+                    return cellValue;
+                };
         };
         const updateAfterListIndex = () => {
             const { treeConfig } = props;
@@ -3415,8 +3449,11 @@ export default defineVxeComponent({
             handleUpdateAggValues();
         };
         const handleeGroupSummary = (aggList) => {
+            const { fullColumnFieldData } = internalData;
             const aggregateOpts = computeAggregateOpts.value;
+            const aggFuncColumns = computeAggFuncColumns.value;
             const { mapChildrenField } = aggregateOpts;
+            const aggCalcMethod = aggregateOpts.calcValuesMethod || aggregateOpts.countMethod || aggregateOpts.aggregateMethod;
             if (mapChildrenField) {
                 XEUtils.lastEach(aggList, aggRow => {
                     let count = 0;
@@ -3433,6 +3470,64 @@ export default defineVxeComponent({
                 if ($xeTable.handlePivotTableAggregateData) {
                     $xeTable.handlePivotTableAggregateData(aggList);
                 }
+                else {
+                    if (aggFuncColumns.length) {
+                        XEUtils.lastEach(aggList, aggRow => {
+                            const aggDtObj = {};
+                            const aggData = aggRow.aggData;
+                            const groupField = aggRow.groupField;
+                            const groupContent = aggRow.groupContent;
+                            const childList = mapChildrenField ? (aggRow[mapChildrenField] || []) : [];
+                            const childCount = aggRow.childCount;
+                            const colRest = fullColumnFieldData[groupField] || {};
+                            aggFuncColumns.forEach(column => {
+                                const { field } = column;
+                                const currAggData = aggData ? aggData[field] : null;
+                                const ctParams = {
+                                    $table: $xeTable,
+                                    groupField,
+                                    groupColumn: (colRest ? colRest.column : null),
+                                    column,
+                                    groupValue: groupContent,
+                                    childList,
+                                    childCount,
+                                    aggValue: currAggData ? currAggData.value : 0,
+                                    /**
+                                   * 已废弃
+                                   * @deprecated
+                                   */
+                                    children: childList,
+                                    /**
+                                   * 已废弃
+                                   * @deprecated
+                                   */
+                                    totalValue: childCount
+                                };
+                                let aggVal = 0;
+                                // 如果下层同时也是分组
+                                if (childList.length && childList[0].isAggregate) {
+                                    XEUtils.each(childList, (row) => {
+                                        if (row.isAggregate) {
+                                            const currAggData = row.aggData[field];
+                                            if (currAggData) {
+                                                aggVal += currAggData.value;
+                                            }
+                                        }
+                                    });
+                                }
+                                else {
+                                    aggVal = aggCalcMethod ? aggCalcMethod(ctParams) : aggRow.childCount;
+                                }
+                                aggDtObj[field] = {
+                                    type: 'count',
+                                    value: aggVal,
+                                    label: aggVal
+                                };
+                            });
+                            aggRow.aggData = aggDtObj;
+                        });
+                    }
+                }
             }
         };
         const updateGroupData = () => {
@@ -4635,6 +4730,34 @@ export default defineVxeComponent({
                 rowExpandEl.scrollTop = bodyScrollElem.scrollTop;
             }
         };
+        const handleColumnVisible = (visible) => {
+            return function (fieldOrColumn) {
+                let status = false;
+                const cols = XEUtils.isArray(fieldOrColumn) ? fieldOrColumn : [fieldOrColumn];
+                cols.forEach(item => {
+                    const column = handleFieldOrColumn($xeTable, item);
+                    if (column) {
+                        if (column.children && column.children.length) {
+                            XEUtils.eachTree([column], (item) => {
+                                item.visible = visible;
+                                item.renderVisible = visible;
+                            });
+                        }
+                        else {
+                            column.visible = visible;
+                            column.renderVisible = visible;
+                        }
+                        if (!status) {
+                            status = true;
+                        }
+                    }
+                });
+                if (status) {
+                    return $xeTable.handleCustom();
+                }
+                return nextTick();
+            };
+        };
         tableMethods = {
             dispatchEvent,
             getEl() {
@@ -5649,43 +5772,11 @@ export default defineVxeComponent({
             /**
              * 隐藏指定列
              */
-            hideColumn(fieldOrColumn) {
-                let status = false;
-                const cols = XEUtils.isArray(fieldOrColumn) ? fieldOrColumn : [fieldOrColumn];
-                cols.forEach(item => {
-                    const column = handleFieldOrColumn($xeTable, item);
-                    if (column && column.visible) {
-                        column.visible = false;
-                        if (!status) {
-                            status = true;
-                        }
-                    }
-                });
-                if (status) {
-                    return tablePrivateMethods.handleCustom();
-                }
-                return nextTick();
-            },
+            hideColumn: handleColumnVisible(false),
             /**
              * 显示指定列
              */
-            showColumn(fieldOrColumn) {
-                let status = false;
-                const cols = XEUtils.isArray(fieldOrColumn) ? fieldOrColumn : [fieldOrColumn];
-                cols.forEach(item => {
-                    const column = handleFieldOrColumn($xeTable, item);
-                    if (column && !column.visible) {
-                        column.visible = true;
-                        if (!status) {
-                            status = true;
-                        }
-                    }
-                });
-                if (status) {
-                    return tablePrivateMethods.handleCustom();
-                }
-                return nextTick();
-            },
+            showColumn: handleColumnVisible(true),
             setColumnWidth(fieldOrColumn, width) {
                 const { elemStore } = internalData;
                 let status = false;
@@ -6899,6 +6990,10 @@ export default defineVxeComponent({
                 const { isRowGroupStatus } = reactData;
                 return isRowGroupStatus && row && row.isAggregate && childrenField && mapChildrenField ? (row[mapChildrenField] || []) : [];
             },
+            refreshAggregateCalcValues() {
+                updateGroupData();
+                return nextTick();
+            },
             isAggregateExpandByRow(row) {
                 const { rowGroupExpandedFlag } = reactData;
                 const { rowGroupExpandedMaps } = internalData;
@@ -9592,7 +9687,7 @@ export default defineVxeComponent({
                 reactData.mergeFootFlag++;
             },
             handleAggregateSummaryData() {
-                return updateGroupData();
+                return $xeTable.refreshAggregateCalcValues();
             },
             triggerHeaderTitleEvent(evnt, iconParams, params) {
                 const tipContent = iconParams.content || iconParams.message;
@@ -13396,6 +13491,7 @@ export default defineVxeComponent({
             if (resizeObserver) {
                 resizeObserver.disconnect();
             }
+            $xeTable.closeTooltip();
             tableMethods.closeFilter();
             if ($xeTable.closeMenu) {
                 $xeTable.closeMenu();

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "4.17.21";
+export const version = "4.17.24";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({

package/es/ui/src/log.js

@@ -1,5 +1,5 @@
 import { VxeUI } from '@vxe-ui/core';
 const { log } = VxeUI;
-const version = `table v${"4.17.21"}`;
+const version = `table v${"4.17.24"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);