vxe-table 3.17.0-beta.9 → 3.17.1

package/es/table/src/methods.js

@@ -3,7 +3,7 @@ import { getTpImg, isPx, isScale, hasClass, addClass, removeClass, getEventTarge
 import { getLastZIndex, nextZIndex, hasChildrenList, getFuncText, isEnableConf, formatText, eqEmptyValue } from '../../ui/src/utils';
 import { VxeUI } from '../../ui';
 import Cell from './cell';
-import { getRowUniqueId, clearTableAllStatus, toFilters, getRowkey, getRowid, rowToVisible, colToVisible, getCellValue, setCellValue, handleRowidOrRow, handleFieldOrColumn, toTreePathSeq, restoreScrollLocation, getRootColumn, getColReMinWidth, createHandleUpdateRowId, createHandleGetRowId, getRefElem, getCellRestHeight } from './util';
+import { getRowUniqueId, clearTableAllStatus, getColumnList, toFilters, getRowkey, getRowid, rowToVisible, colToVisible, getCellValue, setCellValue, handleRowidOrRow, handleFieldOrColumn, toTreePathSeq, restoreScrollLocation, getRootColumn, getColReMinWidth, createHandleUpdateRowId, createHandleGetRowId, getRefElem, getCellRestHeight } from './util';
 import { getSlotVNs } from '../../ui/src/vn';
 import { moveRowAnimateToTb, clearRowAnimate, moveColAnimateToLr, clearColAnimate } from './anime';
 import { warnLog, errLog } from '../../ui/src/log';
@@ -115,37 +115,91 @@ function handleVirtualXVisible($xeTable) {
     return { toVisibleIndex: 0, visibleSize: 6 };
 }
 function handleCustomRestore($xeTable, storeData) {
+    const props = $xeTable;
     const reactData = $xeTable;
     const internalData = $xeTable;
-    let { collectColumn } = internalData;
-    const { resizableData, sortData, visibleData, fixedData } = storeData;
-    let hasCustomSort = false;
+    const { aggregateConfig, rowGroupConfig } = props;
+    const { collectColumn } = internalData;
+    const customOpts = $xeTable.computeCustomOpts;
+    const { storage, storeOptions } = customOpts;
+    const isAllCustom = storage === true;
+    const storageOpts = isAllCustom ? {} : Object.assign({}, storage || {}, storeOptions);
+    const isCustomResizable = hangleStorageDefaultValue(storageOpts.resizable, isAllCustom);
+    const isCustomVisible = hangleStorageDefaultValue(storageOpts.visible, isAllCustom);
+    const isCustomFixed = hangleStorageDefaultValue(storageOpts.fixed, isAllCustom);
+    const isCustomSort = hangleStorageDefaultValue(storageOpts.sort, isAllCustom);
+    const isCustomAggGroup = hangleStorageDefaultValue(storageOpts.aggGroup, isAllCustom);
+    const isCustomAggFunc = hangleStorageDefaultValue(storageOpts.aggFunc, isAllCustom);
+    let { resizableData, sortData, visibleData, fixedData, aggGroupData, aggFuncData } = storeData;
     // 处理还原
-    if (resizableData || sortData || visibleData || fixedData) {
+    if ((isCustomResizable && resizableData) || (isCustomSort && sortData) || (isCustomVisible && visibleData) || (isCustomFixed && fixedData) || (isCustomAggGroup && aggGroupData) || (isCustomAggFunc && aggFuncData)) {
+        const sortColMaps = {};
+        if (isCustomSort && sortData) {
+            // 转换兼容老版本数据，即将废弃兼容
+            if (!XEUtils.isArray(sortData)) {
+                const sortRests = [];
+                XEUtils.each(sortData, (index, colKey) => {
+                    sortRests.push({ key: colKey, index });
+                });
+                sortData = XEUtils.orderBy(sortRests, { field: 'index', order: 'asc' }).map(item => ({ k: item.key }));
+            }
+            let colNum = 1;
+            XEUtils.eachTree(sortData, (sObj, index, sOjs, path, pSObj) => {
+                sortColMaps[sObj.k] = {
+                    key: sObj.k,
+                    sNum: colNum++,
+                    pKey: pSObj ? pSObj.k : null
+                };
+            }, { children: 'c' });
+        }
+        const colKeyMaps = {};
+        const allCols = [];
+        const aggGroupConfs = [];
         XEUtils.eachTree(collectColumn, (column, index, items, path, parentColumn) => {
             const colKey = column.getKey();
             // 支持一级
             if (!parentColumn) {
-                if (fixedData && fixedData[colKey] !== undefined) {
+                if (isCustomFixed && fixedData && fixedData[colKey] !== undefined) {
                     column.fixed = fixedData[colKey];
                 }
-                if (sortData && XEUtils.isNumber(sortData[colKey])) {
-                    hasCustomSort = true;
-                    column.renderSortNumber = sortData[colKey];
-                }
             }
-            if (resizableData && XEUtils.isNumber(resizableData[colKey])) {
+            if (isCustomResizable && resizableData && XEUtils.isNumber(resizableData[colKey])) {
                 column.resizeWidth = resizableData[colKey];
             }
-            if (visibleData && XEUtils.isBoolean(visibleData[colKey])) {
+            if (isCustomVisible && visibleData && XEUtils.isBoolean(visibleData[colKey])) {
                 column.visible = visibleData[colKey];
             }
+            if (isCustomAggFunc && aggFuncData && (aggregateConfig || rowGroupConfig) && aggFuncData[colKey]) {
+                column.aggFunc = aggFuncData[colKey];
+            }
+            if (isCustomAggGroup && aggGroupData && aggGroupData[colKey]) {
+                aggGroupConfs.push({ field: column.field });
+            }
+            colKeyMaps[colKey] = column;
+            allCols.push(column);
         });
+        if ((aggregateConfig || rowGroupConfig) && aggGroupConfs.length) {
+            const groupRest = handleGroupData($xeTable, internalData.tableFullData, aggGroupConfs);
+            internalData.tableFullTreeData = [];
+            internalData.tableFullGroupData = groupRest.treeData;
+            reactData.isRowGroupStatus = true;
+            reactData.rowGroupList = aggGroupConfs;
+            $xeTable.cacheRowMap(false);
+        }
         // 如果自定义了顺序
-        if (hasCustomSort) {
-            collectColumn = XEUtils.orderBy(collectColumn, 'renderSortNumber');
-            internalData.collectColumn = collectColumn;
-            internalData.tableFullColumn = getColumnList(collectColumn);
+        if (isCustomSort && sortData) {
+            allCols.forEach(column => {
+                const colKey = column.getKey();
+                const scItem = sortColMaps[colKey];
+                if (scItem) {
+                    const parentColumn = scItem.pKey ? colKeyMaps[scItem.pKey] : null;
+                    column.parentId = parentColumn ? parentColumn.id : null;
+                    column.renderSortNumber = scItem.sNum;
+                }
+            });
+            const newCollectCols = XEUtils.toArrayTree(XEUtils.orderBy(allCols, 'renderSortNumber'), { key: 'id', parentKey: 'parentId', children: 'children' });
+            internalData.collectColumn = newCollectCols;
+            internalData.tableFullColumn = getColumnList(newCollectCols);
         }
         reactData.isCustomStatus = true;
     }
@@ -197,8 +251,8 @@ function cacheColumnMap($xeTable) {
     const reactData = $xeTable;
     const internalData = $xeTable;
     const { tableFullColumn, collectColumn } = internalData;
-    const fullColumnIdData = internalData.fullColumnIdData = {};
-    const fullColumnFieldData = internalData.fullColumnFieldData = {};
+    const fullColIdData = internalData.fullColumnIdData = {};
+    const fullColFieldData = internalData.fullColumnFieldData = {};
     const mouseOpts = $xeTable.computeMouseOpts;
     const expandOpts = $xeTable.computeExpandOpts;
     const columnOpts = $xeTable.computeColumnOpts;
@@ -220,10 +274,10 @@ function cacheColumnMap($xeTable) {
         const { id: colid, field, fixed, type, treeNode, rowGroupNode } = column;
         const rest = { $index: -1, _index: -1, column, colid, index, items, parent: parentColumn || null, width: 0, oLeft: 0 };
         if (field) {
-            if (fullColumnFieldData[field]) {
+            if (fullColFieldData[field]) {
                 errLog('vxe.error.colRepet', ['field', field]);
             }
-            fullColumnFieldData[field] = rest;
+            fullColFieldData[field] = rest;
         }
         else {
             if ((storage && !type) || (columnOpts.drag && (isCrossDrag || isSelfToChildDrag))) {
@@ -279,10 +333,10 @@ function cacheColumnMap($xeTable) {
         if (isAllOverflow && column.showOverflow === false) {
             isAllOverflow = false;
         }
-        if (fullColumnIdData[colid]) {
+        if (fullColIdData[colid]) {
             errLog('vxe.error.colRepet', ['colId', colid]);
         }
-        fullColumnIdData[colid] = rest;
+        fullColIdData[colid] = rest;
     };
     if (isGroup) {
         XEUtils.eachTree(collectColumn, (column, index, items, path, parentColumn, nodes) => {
@@ -298,10 +352,10 @@ function cacheColumnMap($xeTable) {
     }
     if (htmlColumn) {
         if (!columnOpts.useKey) {
-            errLog('vxe.error.reqProp', ['column-config.useKey & column.type=html']);
+            errLog('vxe.error.notSupportProp', ['column.type=html', 'column-config.useKey=false', 'column-config.useKey=true']);
         }
         if (!rowOpts.useKey) {
-            errLog('vxe.error.reqProp', ['row-config.useKey & column.type=html']);
+            errLog('vxe.error.notSupportProp', ['column.type=html', 'row-config.useKey=false', 'row-config.useKey=true']);
         }
     }
     reactData.isGroup = isGroup;
@@ -535,7 +589,7 @@ function updateAfterListIndex($xeTable) {
             rowRest._index = index;
         }
         else {
-            const rest = { row, rowid, seq, index: -1, $index: -1, _index: index, treeIndex: -1, items: [], parent: null, level: 0, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 };
+            const rest = { row, rowid, seq, index: -1, $index: -1, _index: index, treeIndex: -1, _tIndex: -1, items: [], parent: null, level: 0, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 };
             fullAllDataRowIdData[rowid] = rest;
             fullDataRowIdData[rowid] = rest;
         }
@@ -557,6 +611,7 @@ function updateAfterDataIndex($xeTable) {
     const childrenField = treeOpts.children || treeOpts.childrenField;
     const fullMaps = {};
     if (treeConfig) {
+        let _treeIndex = 0;
         const { handleGetRowId } = createHandleGetRowId($xeTable);
         XEUtils.eachTree(afterTreeFullData, (row, index, items, path) => {
             const rowid = handleGetRowId(row);
@@ -565,12 +620,14 @@ function updateAfterDataIndex($xeTable) {
             if (rowRest) {
                 rowRest.seq = seq;
                 rowRest.treeIndex = index;
+                rowRest._tIndex = _treeIndex;
             }
             else {
-                const rest = { row, rowid, seq, index: -1, $index: -1, _index: -1, treeIndex: -1, items: [], parent: null, level: 0, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 };
+                const rest = { row, rowid, seq, index: -1, $index: -1, _index: -1, treeIndex: -1, _tIndex: _treeIndex, items: [], parent: null, level: 0, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 };
                 fullAllDataRowIdData[rowid] = rest;
                 fullDataRowIdData[rowid] = rest;
             }
+            _treeIndex++;
             fullMaps[rowid] = row;
         }, { children: transform ? treeOpts.mapChildrenField : childrenField });
         if (transform) {
@@ -1981,16 +2038,24 @@ function removeFooterMerges($xeTable, merges) {
     return rest;
 }
 function handleSortEvent($xeTable, evnt, sortConfs, isUpdate) {
+    const internalData = $xeTable;
+    const { tableFullColumn } = internalData;
     const sortOpts = $xeTable.computeSortOpts;
     const { multiple, remote, orders } = sortOpts;
     if (!XEUtils.isArray(sortConfs)) {
         sortConfs = [sortConfs];
     }
     if (sortConfs && sortConfs.length) {
+        const orderActiveMaps = {};
         if (!multiple) {
             sortConfs = [sortConfs[0]];
-            clearAllSort($xeTable);
+            tableFullColumn.forEach((column) => {
+                if (column.order) {
+                    orderActiveMaps[column.id] = column;
+                }
+            });
         }
+        const sortColMpps = {};
         let firstColumn = null;
         sortConfs.forEach((confs, index) => {
             let { field, order } = confs;
@@ -2009,8 +2074,16 @@ function handleSortEvent($xeTable, evnt, sortConfs, isUpdate) {
                     column.order = order;
                 }
                 column.sortTime = Date.now() + index;
+                sortColMpps[column.id] = column;
             }
         });
+        if (!multiple) {
+            XEUtils.each(orderActiveMaps, (oaCol, oaId) => {
+                if (!sortColMpps[oaId]) {
+                    oaCol.order = null;
+                }
+            });
+        }
         if (isUpdate) {
             if (!remote) {
                 $xeTable.handleTableData(true);
@@ -2192,7 +2265,7 @@ const calcCellHeight = ($xeTable) => {
     const { fullAllDataRowIdData } = internalData;
     const defaultRowHeight = $xeTable.computeDefaultRowHeight;
     const el = $xeTable.$refs.refElem;
-    if (!isAllOverflow && scrollYLoad && el) {
+    if (!isAllOverflow && (scrollYLoad || scrollXLoad) && el) {
         const { handleGetRowId } = createHandleGetRowId($xeTable);
         tableData.forEach(row => {
             const rowid = handleGetRowId(row);
@@ -2680,18 +2753,18 @@ function handleUpdateAggValues($xeTable) {
 }
 function handleUpdateRowGroup($xeTable, groupFields) {
     const reactData = $xeTable;
-    const aggFields = [];
-    const aggConfs = [];
+    const aggGroupFields = [];
+    const aggGroupConfs = [];
     if (groupFields) {
         (XEUtils.isArray(groupFields) ? groupFields : [groupFields]).forEach(field => {
-            aggFields.push(field);
-            aggConfs.push({
+            aggGroupFields.push(field);
+            aggGroupConfs.push({
                 field
             });
         });
     }
-    reactData.rowGroupList = aggConfs;
-    reactData.aggHandleFields = aggFields;
+    reactData.rowGroupList = aggGroupConfs;
+    reactData.aggHandleFields = aggGroupFields;
     handleUpdateAggValues($xeTable);
 }
 function handleeGroupSummary($xeTable, aggList) {
@@ -3065,14 +3138,6 @@ function loadScrollXData($xeTable) {
     }
     $xeTable.closeTooltip();
 }
-// 获取所有的列，排除分组
-function getColumnList(columns) {
-    const result = [];
-    columns.forEach((column) => {
-        result.push(...(column.children && column.children.length ? getColumnList(column.children) : [column]));
-    });
-    return result;
-}
 function parseColumns($xeTable, isReset) {
     const props = $xeTable;
     const reactData = $xeTable;
@@ -3095,7 +3160,7 @@ function parseColumns($xeTable, isReset) {
             if (parentColumn && parentColumn.fixed) {
                 column.fixed = parentColumn.fixed;
             }
-            if (parentColumn && column.fixed !== parentColumn.fixed) {
+            if (parentColumn && (column.fixed || '') !== (parentColumn.fixed || '')) {
                 errLog('vxe.error.groupFixed');
             }
             if (isColGroup) {
@@ -3205,16 +3270,33 @@ function parseColumns($xeTable, isReset) {
     }
     return $xeTable.updateFooter();
 }
-function initColumnSort($xeTable) {
+function initColumnHierarchy($xeTable) {
     const internalData = $xeTable;
     const { collectColumn } = internalData;
-    collectColumn.forEach((column, index) => {
-        const sortIndex = index + 1;
+    const fullColIdData = {};
+    const fullColFieldData = {};
+    let sortIndex = 1;
+    XEUtils.eachTree(collectColumn, (column, index, items, path, parentColumn) => {
+        const { id: colid, field } = column;
+        const parentId = parentColumn ? parentColumn.id : null;
+        const rest = { $index: -1, _index: -1, column, colid, index, items, parent: parentColumn || null, width: 0, oLeft: 0 };
+        column.parentId = parentId;
+        column.defaultParentId = parentId;
         column.sortNumber = sortIndex;
         column.renderSortNumber = sortIndex;
+        sortIndex++;
+        if (field) {
+            if (fullColFieldData[field]) {
+                errLog('vxe.error.colRepet', ['field', field]);
+            }
+            fullColFieldData[field] = rest;
+        }
+        fullColIdData[colid] = rest;
     });
+    internalData.fullColumnIdData = fullColIdData;
+    internalData.fullColumnFieldData = fullColFieldData;
 }
-function handleColumn($xeTable, collectColumn) {
+function handleInitColumn($xeTable, collectColumn) {
     const $xeToolbar = $xeTable.$refs.$xeToolbar;
     const reactData = $xeTable;
     const internalData = $xeTable;
@@ -3223,7 +3305,7 @@ function handleColumn($xeTable, collectColumn) {
     const tableFullColumn = getColumnList(collectColumn);
     internalData.tableFullColumn = tableFullColumn;
     reactData.isColLoading = true;
-    initColumnSort($xeTable);
+    initColumnHierarchy($xeTable);
     return Promise.resolve(restoreCustomStorage($xeTable)).then(() => {
         const { scrollXLoad, scrollYLoad, expandColumn } = reactData;
         cacheColumnMap($xeTable);
@@ -3863,7 +3945,7 @@ const Methods = {
         const internalData = $xeTable;
         const { lastScrollLeft, lastScrollTop } = internalData;
         const collectColumn = XEUtils.mapTree(columns, column => Cell.createColumn($xeTable, column), { children: 'children' });
-        return handleColumn($xeTable, collectColumn).then(() => {
+        return handleInitColumn($xeTable, collectColumn).then(() => {
             let targetScrollLeft = lastScrollLeft;
             let targetScrollTop = lastScrollTop;
             const virtualXOpts = $xeTable.computeVirtualXOpts;
@@ -3888,9 +3970,9 @@ const Methods = {
             return this.loadColumn(columns);
         });
     },
-    handleColumn(collectColumn) {
+    handleInitColumn(collectColumn) {
         const $xeTable = this;
-        return handleColumn($xeTable, collectColumn);
+        return handleInitColumn($xeTable, collectColumn);
     },
     /**
      * 更新数据行的 Map
@@ -3909,7 +3991,7 @@ const Methods = {
         const handleRowCache = (row, index, items, currIndex, parentRow, rowid, level, seq) => {
             let rowRest = fullAllDataRowIdMaps[rowid];
             if (!rowRest) {
-                rowRest = { row, rowid, seq, index: -1, _index: -1, $index: -1, treeIndex: index, items, parent: parentRow, level, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 };
+                rowRest = { row, rowid, seq, index: -1, _index: -1, $index: -1, treeIndex: index, _tIndex: -1, items, parent: parentRow, level, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 };
             }
             rowRest.treeLoaded = false;
             rowRest.expandLoaded = false;
@@ -4014,7 +4096,7 @@ const Methods = {
             XEUtils.eachTree(rows, (childRow, index, items, path, parentItem, nodes) => {
                 const rowid = getRowid($xeTable, childRow);
                 const parentRow = parentItem || parentRest.row;
-                const rest = { row: childRow, rowid, seq: -1, index, _index: -1, $index: -1, treeIndex: -1, items, parent: parentRow, level: parentLevel + nodes.length, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 };
+                const rest = { row: childRow, rowid, seq: -1, index, _index: -1, $index: -1, treeIndex: -1, _tIndex: -1, items, parent: parentRow, level: parentLevel + nodes.length, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 };
                 fullDataRowIdData[rowid] = rest;
                 fullAllDataRowIdData[rowid] = rest;
             }, { children: childrenField });
@@ -5006,8 +5088,9 @@ const Methods = {
         const isCustomResizable = hangleStorageDefaultValue(storageOpts.resizable, isAllCustom);
         const isCustomVisible = hangleStorageDefaultValue(storageOpts.visible, isAllCustom);
         const isCustomFixed = hangleStorageDefaultValue(storageOpts.fixed, isAllCustom);
+        const isCustomAggGroup = hangleStorageDefaultValue(storageOpts.aggGroup, isAllCustom);
         const isCustomSort = hangleStorageDefaultValue(storageOpts.sort, isAllCustom);
-        if (storage && (customConfig ? isEnableConf(customOpts) : customOpts.enabled) && (isCustomResizable || isCustomVisible || isCustomFixed || isCustomSort)) {
+        if (storage && (customConfig ? isEnableConf(customOpts) : customOpts.enabled) && (isCustomResizable || isCustomVisible || isCustomFixed || isCustomAggGroup || isCustomSort)) {
             if (!tableId) {
                 errLog('vxe.error.reqProp', ['id']);
                 return;
@@ -5029,10 +5112,12 @@ const Methods = {
     getCustomStoreData() {
         const $xeTable = this;
         const props = $xeTable;
+        const reactData = $xeTable;
         const internalData = $xeTable;
         const { id } = props;
         const customOpts = $xeTable.computeCustomOpts;
-        const { collectColumn } = internalData;
+        const { isRowGroupStatus, rowGroupList } = reactData;
+        const { fullColumnFieldData, collectColumn } = internalData;
         const { storage, checkMethod, storeOptions } = customOpts;
         const isAllCustom = storage === true;
         const storageOpts = isAllCustom ? {} : Object.assign({}, storage || {}, storeOptions);
@@ -5040,17 +5125,20 @@ const Methods = {
         const isCustomVisible = hangleStorageDefaultValue(storageOpts.visible, isAllCustom);
         const isCustomFixed = hangleStorageDefaultValue(storageOpts.fixed, isAllCustom);
         const isCustomSort = hangleStorageDefaultValue(storageOpts.sort, isAllCustom);
+        const isCustomAggGroup = hangleStorageDefaultValue(storageOpts.aggGroup, isAllCustom);
         const isCustomAggFunc = hangleStorageDefaultValue(storageOpts.aggFunc, isAllCustom);
         const resizableData = {};
-        const sortData = {};
+        const sortData = [];
         const visibleData = {};
         const fixedData = {};
+        const aggGroupData = {};
         const aggFuncData = {};
         const storeData = {
             resizableData: undefined,
             sortData: undefined,
             visibleData: undefined,
             fixedData: undefined,
+            aggGroupData: undefined,
             aggFuncData: undefined
         };
         if (!id) {
@@ -5064,19 +5152,37 @@ const Methods = {
         let hasFixed = 0;
         let hasVisible = 0;
         let hasAggFunc = 0;
+        const sortMaps = {};
         XEUtils.eachTree(collectColumn, (column, index, items, path, parentColumn) => {
             const colKey = column.getKey();
             if (!colKey) {
                 errLog('vxe.error.reqProp', [`${column.getTitle() || column.type || ''} -> column.field=?`]);
                 return;
             }
-            // 只支持一级
-            if (!parentColumn) {
+            if (parentColumn) {
+                if (isCustomSort) {
+                    const pColKey = parentColumn.getKey();
+                    const psObj = sortMaps[pColKey];
+                    hasSort = 1;
+                    if (psObj) {
+                        const sObj = { k: colKey };
+                        sortMaps[colKey] = sObj;
+                        if (!psObj.c) {
+                            psObj.c = [];
+                        }
+                        psObj.c.push(sObj);
+                    }
+                }
+            }
+            else {
                 if (isCustomSort) {
                     hasSort = 1;
-                    sortData[colKey] = column.renderSortNumber;
+                    const sObj = { k: colKey };
+                    sortMaps[colKey] = sObj;
+                    sortData.push(sObj);
                 }
-                if (isCustomFixed && column.fixed !== column.defaultFixed) {
+                // 只支持一级
+                if (isCustomFixed && (column.fixed || '') !== (column.defaultFixed || '')) {
                     hasFixed = 1;
                     fixedData[colKey] = column.fixed;
                 }
@@ -5095,7 +5201,7 @@ const Methods = {
                     visibleData[colKey] = true;
                 }
             }
-            if (isCustomAggFunc && column.aggFunc !== column.defaultAggFunc) {
+            if (isCustomAggFunc && (column.aggFunc || '') !== (column.defaultAggFunc || '')) {
                 hasAggFunc = 1;
                 aggFuncData[colKey] = column.aggFunc;
             }
@@ -5112,6 +5218,15 @@ const Methods = {
         if (hasVisible) {
             storeData.visibleData = visibleData;
         }
+        if (isCustomAggGroup && isRowGroupStatus) {
+            rowGroupList.forEach(aggConf => {
+                const colRest = fullColumnFieldData[aggConf.field];
+                if (colRest) {
+                    aggGroupData[colRest.column.getKey()] = true;
+                }
+            });
+            storeData.aggGroupData = aggGroupData;
+        }
         if (hasAggFunc) {
             storeData.aggFuncData = aggFuncData;
         }
@@ -5131,11 +5246,12 @@ const Methods = {
         const isCustomVisible = hangleStorageDefaultValue(storageOpts.visible, isAllCustom);
         const isCustomFixed = hangleStorageDefaultValue(storageOpts.fixed, isAllCustom);
         const isCustomSort = hangleStorageDefaultValue(storageOpts.sort, isAllCustom);
+        const isCustomAggGroup = hangleStorageDefaultValue(storageOpts.aggGroup, isAllCustom);
         const isCustomAggFunc = hangleStorageDefaultValue(storageOpts.aggFunc, isAllCustom);
         if (type !== 'reset') {
             reactData.isCustomStatus = true;
         }
-        if (storage && (customConfig ? isEnableConf(customOpts) : customOpts.enabled) && (isCustomResizable || isCustomVisible || isCustomFixed || isCustomSort || isCustomAggFunc)) {
+        if (storage && (customConfig ? isEnableConf(customOpts) : customOpts.enabled) && (isCustomResizable || isCustomVisible || isCustomFixed || isCustomSort || isCustomAggGroup || isCustomAggFunc)) {
             if (!tableId) {
                 errLog('vxe.error.reqProp', ['id']);
                 return this.$nextTick();
@@ -5145,7 +5261,9 @@ const Methods = {
                     resizableData: {},
                     sortData: {},
                     visibleData: {},
-                    fixedData: {}
+                    fixedData: {},
+                    aggGroupData: {},
+                    aggFuncData: {}
                 }
                 : this.getCustomStoreData();
             if (updateStore) {
@@ -8722,9 +8840,9 @@ const Methods = {
         const $xeTable = this;
         return handleSortEvent($xeTable, null, sortConfs, isUpdate);
     },
-    setSortByEvent(evnt, sortConfs, isUpdate) {
+    setSortByEvent(evnt, sortConfs) {
         const $xeTable = this;
-        return handleSortEvent($xeTable, evnt, sortConfs, isUpdate);
+        return handleSortEvent($xeTable, evnt, sortConfs, true);
     },
     /**
      * 清空指定列的排序条件
@@ -8756,6 +8874,7 @@ const Methods = {
         const internalData = $xeTable;
         const { tableFullColumn } = internalData;
         const sortOpts = $xeTable.computeSortOpts;
+        const { multiple } = sortOpts;
         const sortCols = [];
         let column = null;
         if (evnt) {
@@ -8776,13 +8895,16 @@ const Methods = {
             if (!sortOpts.remote) {
                 $xeTable.handleTableData(true);
             }
-            if (sortCols.length) {
-                const params = { $table: $xeTable, $event: evnt, cols: sortCols, sortList: [] };
-                $xeTable.dispatchEvent('clear-all-sort', params, evnt);
+            if (!multiple) {
+                column = sortCols[0];
             }
-            else if (column) {
+            if (column) {
                 $xeTable.handleColumnSortEvent(evnt, column);
             }
+            if (multiple && sortCols.length) {
+                const params = { $table: $xeTable, $event: evnt, cols: sortCols, sortList: [] };
+                $xeTable.dispatchEvent('clear-all-sort', params, evnt);
+            }
         }
         return $xeTable.$nextTick().then(() => {
             updateRowOffsetTop($xeTable);
@@ -8815,21 +8937,12 @@ const Methods = {
         }
         return sortList;
     },
-    setFilterByEvent(evnt, fieldOrColumn, options, isUpdate) {
+    setFilterByEvent(evnt, fieldOrColumn, options) {
         const $xeTable = this;
-        const reactData = $xeTable;
-        const { filterStore } = reactData;
         const column = handleFieldOrColumn($xeTable, fieldOrColumn);
         if (column && column.filters) {
             column.filters = toFilters(options || []);
-            if (isUpdate) {
-                return $xeTable.handleColumnConfirmFilter(column, evnt);
-            }
-            else {
-                if (filterStore.visible) {
-                    $xeTable.handleFilterOptions(column);
-                }
-            }
+            return $xeTable.handleColumnConfirmFilter(column, evnt);
         }
         return $xeTable.$nextTick();
     },
@@ -8879,6 +8992,7 @@ const Methods = {
         const { filterStore } = reactData;
         const { tableFullColumn } = internalData;
         const filterOpts = $xeTable.computeFilterOpts;
+        const { multiple } = filterOpts;
         const filterCols = [];
         let column = null;
         if (fieldOrColumn) {
@@ -8909,13 +9023,37 @@ const Methods = {
         if (!filterOpts.remote) {
             $xeTable.updateData();
         }
-        if (filterCols.length) {
+        if (!multiple) {
+            column = filterCols[0];
+        }
+        if (column) {
+            const filterList = () => $xeTable.getCheckedFilters();
+            const values = [];
+            const datas = [];
+            column.filters.forEach((item) => {
+                if (item.checked) {
+                    values.push(item.value);
+                    datas.push(item.data);
+                }
+            });
+            const params = {
+                $table: $xeTable,
+                $event: evnt,
+                column,
+                field: column.field,
+                property: column.field,
+                values,
+                datas,
+                filters: filterList,
+                filterList
+            };
+            $xeTable.dispatchEvent('filter-change', params, evnt);
+            $xeTable.dispatchEvent('clear-filter', params, evnt);
+        }
+        if (multiple && filterCols.length) {
             const params = { $table: $xeTable, $event: evnt, cols: filterCols, filterList: [] };
             $xeTable.dispatchEvent('clear-all-filter', params, evnt);
         }
-        else if (column) {
-            $xeTable.dispatchEvent('clear-filter', { filterList: () => $xeTable.getCheckedFilters() }, evnt);
-        }
         return $xeTable.$nextTick();
     },
     /**
@@ -10672,7 +10810,7 @@ const Methods = {
     }
 };
 // Module methods
-const funcs = 'setFilter,openFilter,clearFilter,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,openCustom,closeCustom,toggleCustom,saveCustom,cancelCustom,resetCustom,toggleCustomAllCheckbox,setCustomAllCheckbox'.split(',');
+const funcs = 'setFilter,openFilter,clearFilter,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) {
         if (!this[`_${name}`]) {