vxe-table 3.19.21 → 3.19.24

package/es/table/src/cell.js

@@ -364,8 +364,9 @@ export const Cell = {
             const aggRow = row;
             const { fullColumnFieldData } = tableInternalData;
             const aggregateOpts = $table.computeAggregateOpts;
-            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] || []) : [];
@@ -407,9 +408,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/methods.js

@@ -2462,26 +2462,53 @@ const calcCellHeight = ($xeTable) => {
     }
 };
 function getOrderField($xeTable, column) {
-    const { sortBy, sortType } = column;
-    return (row) => {
-        let cellValue;
-        if (sortBy) {
-            cellValue = XEUtils.isFunction(sortBy) ? sortBy({ row, column }) : XEUtils.get(row, sortBy);
-        }
-        else {
-            cellValue = $xeTable.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 reactData = $xeTable;
+    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 = $xeTable.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 = $xeTable.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;
+        };
 }
 function handleTargetEnterEvent($xeTable, isClear) {
     const internalData = $xeTable;
@@ -3019,8 +3046,12 @@ function handleUpdateRowGroup($xeTable, groupFields) {
     handleUpdateAggValues($xeTable);
 }
 function handleeGroupSummary($xeTable, aggList) {
+    const internalData = $xeTable;
+    const { fullColumnFieldData } = internalData;
     const aggregateOpts = $xeTable.computeAggregateOpts;
+    const aggFuncColumns = $xeTable.computeAggFuncColumns;
     const { mapChildrenField } = aggregateOpts;
+    const aggCalcMethod = aggregateOpts.calcValuesMethod || aggregateOpts.countMethod || aggregateOpts.aggregateMethod;
     if (mapChildrenField) {
         XEUtils.lastEach(aggList, aggRow => {
             let count = 0;
@@ -3037,6 +3068,62 @@ function handleeGroupSummary($xeTable, aggList) {
         if ($xeTable.handlePivotTableAggregateData) {
             $xeTable.handlePivotTableAggregateData(aggList);
         }
+        else {
+            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;
+            });
+        }
     }
 }
 function updateGroupData($xeTable) {
@@ -4098,7 +4185,36 @@ function handleRowExpandScroll($xeTable) {
         rowExpandEl.scrollTop = bodyScrollElem.scrollTop;
     }
 }
-const Methods = {
+function handleColumnVisible(visible) {
+    return function (fieldOrColumn) {
+        const $xeTable = this;
+        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 $xeTable.$nextTick();
+    };
+}
+const tableMethods = {
     callSlot(slotFunc, params, h, vNodes) {
         const $xeTable = this;
         // const slots = $xeTable.$scopedSlots
@@ -5538,45 +5654,11 @@ const Methods = {
     /**
      * 隐藏指定列
      */
-    hideColumn(fieldOrColumn) {
-        const $xeTable = this;
-        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 $xeTable.handleCustom();
-        }
-        return $xeTable.$nextTick();
-    },
+    hideColumn: handleColumnVisible(false),
     /**
      * 显示指定列
      */
-    showColumn(fieldOrColumn) {
-        const $xeTable = this;
-        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 $xeTable.handleCustom();
-        }
-        return $xeTable.$nextTick();
-    },
+    showColumn: handleColumnVisible(true),
     setColumnWidth(fieldOrColumn, width) {
         const $xeTable = this;
         const internalData = $xeTable;
@@ -7135,7 +7217,7 @@ const Methods = {
     },
     handleAggregateSummaryData() {
         const $xeTable = this;
-        return updateGroupData($xeTable);
+        return $xeTable.refreshAggregateCalcValues();
     },
     handleTargetLeaveEvent() {
         const $xeTable = this;
@@ -10408,6 +10490,11 @@ const Methods = {
         const { isRowGroupStatus } = reactData;
         return isRowGroupStatus && row && row.isAggregate && childrenField && mapChildrenField ? (row[mapChildrenField] || []) : [];
     },
+    refreshAggregateCalcValues() {
+        const $xeTable = this;
+        updateGroupData($xeTable);
+        return $xeTable.$nextTick();
+    },
     isAggregateExpandByRow(row) {
         const $xeTable = this;
         const reactData = $xeTable;
@@ -12052,10 +12139,12 @@ const Methods = {
         return getConfig();
     }
 };
+const tablePrivateMethods = {};
+const exportMethods = Object.assign({}, tableMethods, tablePrivateMethods);
 // Module methods
 const funcs = 'setFilter,openFilter,clearFilter,saveFilter,saveFilterByEvent,resetFilter,resetFilterByEvent,saveFilterPanel,saveFilterPanelByEvent,resetFilterPanel,resetFilterPanelByEvent,getCheckedFilters,updateFilterOptionStatus,closeMenu,setActiveCellArea,getActiveCellArea,getCellAreas,clearCellAreas,copyCellArea,cutCellArea,pasteCellArea,getCopyCellArea,getCopyCellAreas,clearCopyCellArea,setCellAreas,openFNR,openFind,openReplace,closeFNR,getSelectedCell,clearSelected,insert,insertAt,insertNextAt,insertChild,insertChildAt,insertChildNextAt,remove,removeCheckboxRow,removeRadioRow,removeCurrentRow,getRecordset,getInsertRecords,getRemoveRecords,getUpdateRecords,clearEdit,clearActived,getEditRecord,getEditCell,getActiveRecord,isEditByRow,isActiveByRow,setEditRow,setActiveRow,setEditCell,setActiveCell,setSelectCell,clearValidate,fullValidate,validate,fullValidateField,validateField,openExport,closeExport,openPrint,closePrint,getPrintHtml,exportData,openImport,closeImport,importData,saveFile,readFile,importByFile,print,getCustomVisible,openCustom,closeCustom,toggleCustom,saveCustom,cancelCustom,resetCustom,toggleCustomAllCheckbox,setCustomAllCheckbox'.split(',');
 funcs.forEach(name => {
-    Methods[name] = function (...args) {
+    exportMethods[name] = function (...args) {
         // if (!this[`_${name}`]) {
         //   if ('openExport,openPrint,exportData,openImport,importData,saveFile,readFile,importByFile,print'.split(',').includes(name)) {
         //     errLog('vxe.error.reqModule', ['Export'])
@@ -12072,4 +12161,4 @@ funcs.forEach(name => {
         return this[`_${name}`] ? this[`_${name}`](...args) : null;
     };
 });
-export default Methods;
+export default exportMethods;

package/es/table/src/table.js

@@ -1444,6 +1444,15 @@ export default {
             });
             return rgColumns;
         },
+        computeAggFuncColumns() {
+            const $xeTable = this;
+            const reactData = $xeTable;
+            const { rowGroupList, tableColumn } = reactData;
+            if (rowGroupList.length) {
+                return tableColumn.filter(column => column.field && column.aggFunc);
+            }
+            return [];
+        },
         tabsResizeFlag() {
             const $xeTable = this;
             const $xeTabs = $xeTable.$xeTabs;
@@ -1994,8 +2003,9 @@ export default {
         if (this.$resize) {
             this.$resize.disconnect();
         }
-        this.closeFilter();
-        this.closeMenu();
+        $xeTable.closeTooltip();
+        $xeTable.closeFilter();
+        $xeTable.closeMenu();
         globalEvents.off($xeTable, 'paste');
         globalEvents.off($xeTable, 'copy');
         globalEvents.off($xeTable, 'cut');

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "3.19.21";
+export const version = "3.19.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${"3.19.21"}`;
+const version = `table v${"3.19.24"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);