vxe-table 4.15.0-beta.9 → 4.15.1

package/es/table/src/table.js

@@ -4,7 +4,7 @@ import XEUtils from 'xe-utils';
 import { initTpImg, getTpImg, isPx, isScale, hasClass, addClass, removeClass, getEventTargetNode, getPaddingTopBottomSize, setScrollTop, setScrollLeft, toCssUnit, hasControlKey } from '../../ui/src/dom';
 import { getLastZIndex, nextZIndex, hasChildrenList, getFuncText, isEnableConf, formatText, eqEmptyValue } from '../../ui/src/utils';
 import { VxeUI } from '../../ui';
-import { getRowUniqueId, clearTableAllStatus, toFilters, hasDeepKey, getRowkey, getRowid, rowToVisible, colToVisible, getCellValue, setCellValue, handleRowidOrRow, handleFieldOrColumn, toTreePathSeq, restoreScrollLocation, getRootColumn, getRefElem, getColReMinWidth, createHandleUpdateRowId, createHandleGetRowId, getCalcHeight, getCellRestHeight } from './util';
+import { getRowUniqueId, clearTableAllStatus, getColumnList, toFilters, hasDeepKey, getRowkey, getRowid, rowToVisible, colToVisible, getCellValue, setCellValue, handleRowidOrRow, handleFieldOrColumn, toTreePathSeq, restoreScrollLocation, getRootColumn, getRefElem, getColReMinWidth, createHandleUpdateRowId, createHandleGetRowId, getCalcHeight, getCellRestHeight } from './util';
 import { getSlotVNs } from '../../ui/src/vn';
 import { moveRowAnimateToTb, clearRowAnimate, moveColAnimateToLr, clearColAnimate } from './anime';
 import { warnLog, errLog } from '../../ui/src/log';
@@ -473,10 +473,18 @@ export default defineVxeComponent({
             return virtualYOpts;
         });
         const computeVirtualXOpts = computed(() => {
-            return Object.assign({}, getConfig().table.virtualXConfig || getConfig().table.scrollX, props.virtualXConfig || props.scrollX);
+            const { virtualXConfig } = props;
+            if (virtualXConfig) {
+                return Object.assign({}, getConfig().table.virtualXConfig, virtualXConfig);
+            }
+            return Object.assign({}, getConfig().table.virtualXConfig, getConfig().table.scrollX, props.scrollX);
         });
         const computeVirtualYOpts = computed(() => {
-            return Object.assign({}, getConfig().table.virtualYConfig || getConfig().table.scrollY, props.virtualYConfig || props.scrollY);
+            const { virtualYConfig } = props;
+            if (virtualYConfig) {
+                return Object.assign({}, getConfig().table.virtualYConfig, virtualYConfig);
+            }
+            return Object.assign({}, getConfig().table.virtualYConfig, getConfig().table.scrollY, props.scrollY);
         });
         const computeScrollbarOpts = computed(() => {
             return Object.assign({}, getConfig().table.scrollbarConfig, props.scrollbarConfig);
@@ -1327,16 +1335,23 @@ export default defineVxeComponent({
             return rest;
         };
         const handleSortEvent = (evnt, sortConfs, isUpdate) => {
+            const { tableFullColumn } = internalData;
             const sortOpts = computeSortOpts.value;
             const { multiple, remote, orders } = sortOpts;
             if (!XEUtils.isArray(sortConfs)) {
                 sortConfs = [sortConfs];
             }
             if (sortConfs && sortConfs.length) {
+                const orderActiveMaps = {};
                 if (!multiple) {
                     sortConfs = [sortConfs[0]];
-                    clearAllSort();
+                    tableFullColumn.forEach((column) => {
+                        if (column.order) {
+                            orderActiveMaps[column.id] = column;
+                        }
+                    });
                 }
+                const sortColMpps = {};
                 let firstColumn = null;
                 sortConfs.forEach((confs, index) => {
                     let { field, order } = confs;
@@ -1355,8 +1370,16 @@ export default defineVxeComponent({
                             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);
@@ -1401,35 +1424,88 @@ export default defineVxeComponent({
             return num;
         };
         const handleCustomRestore = (storeData) => {
-            let { collectColumn } = internalData;
-            const { resizableData, sortData, visibleData, fixedData } = storeData;
-            let hasCustomSort = false;
+            const { aggregateConfig, rowGroupConfig } = props;
+            const { collectColumn } = internalData;
+            const customOpts = computeCustomOpts.value;
+            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(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;
             }
@@ -1451,8 +1527,9 @@ export default defineVxeComponent({
             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 (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;
@@ -1477,8 +1554,8 @@ export default defineVxeComponent({
          */
         const cacheColumnMap = () => {
             const { tableFullColumn, collectColumn } = internalData;
-            const fullColumnIdData = internalData.fullColumnIdData = {};
-            const fullColumnFieldData = internalData.fullColumnFieldData = {};
+            const fullColIdData = internalData.fullColumnIdData = {};
+            const fullColFieldData = internalData.fullColumnFieldData = {};
             const mouseOpts = computeMouseOpts.value;
             const expandOpts = computeExpandOpts.value;
             const columnOpts = computeColumnOpts.value;
@@ -1501,10 +1578,10 @@ export default defineVxeComponent({
                 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))) {
@@ -1560,10 +1637,10 @@ export default defineVxeComponent({
                 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) => {
@@ -1582,10 +1659,10 @@ export default defineVxeComponent({
             }
             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;
@@ -1780,7 +1857,7 @@ export default defineVxeComponent({
             const { fullAllDataRowIdData } = internalData;
             const defaultRowHeight = computeDefaultRowHeight.value;
             const el = refElem.value;
-            if (!isAllOverflow && scrollYLoad && el) {
+            if (!isAllOverflow && (scrollYLoad || scrollXLoad) && el) {
                 const { handleGetRowId } = createHandleGetRowId($xeTable);
                 el.setAttribute('data-calc-row', 'Y');
                 tableData.forEach(row => {
@@ -1833,7 +1910,7 @@ export default defineVxeComponent({
                     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;
                 }
@@ -1853,6 +1930,7 @@ export default defineVxeComponent({
             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);
@@ -1861,12 +1939,14 @@ export default defineVxeComponent({
                     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) {
@@ -3084,18 +3164,18 @@ export default defineVxeComponent({
             reactData.aggHandleAggColumns = aggCols;
         };
         const handleUpdateRowGroup = (groupFields) => {
-            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();
         };
         const handleeGroupSummary = (aggList) => {
@@ -3458,14 +3538,6 @@ export default defineVxeComponent({
             }
             $xeTable.closeTooltip();
         };
-        // 获取所有的列，排除分组
-        const getColumnList = (columns) => {
-            const result = [];
-            columns.forEach((column) => {
-                result.push(...(column.children && column.children.length ? getColumnList(column.children) : [column]));
-            });
-            return result;
-        };
         const parseColumns = (isReset) => {
             // const { showOverflow } = props
             // const rowOpts = computeRowOpts.value
@@ -3485,7 +3557,7 @@ export default defineVxeComponent({
                     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) {
@@ -3596,21 +3668,38 @@ export default defineVxeComponent({
             }
             return $xeTable.updateFooter();
         };
-        const initColumnSort = () => {
+        const initColumnHierarchy = () => {
             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;
         };
-        const handleColumn = (collectColumn) => {
+        const handleInitColumn = (collectColumn) => {
             const expandOpts = computeExpandOpts.value;
             internalData.collectColumn = collectColumn;
             const tableFullColumn = getColumnList(collectColumn);
             internalData.tableFullColumn = tableFullColumn;
             reactData.isColLoading = true;
-            initColumnSort();
+            initColumnHierarchy();
             return Promise.resolve(restoreCustomStorage()).then(() => {
                 const { scrollXLoad, scrollYLoad, expandColumn } = reactData;
                 cacheColumnMap();
@@ -4313,7 +4402,7 @@ export default defineVxeComponent({
                     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 });
@@ -4333,7 +4422,7 @@ export default defineVxeComponent({
             loadColumn(columns) {
                 const { lastScrollLeft, lastScrollTop } = internalData;
                 const collectColumn = XEUtils.mapTree(columns, column => reactive(Cell.createColumn($xeTable, column)));
-                return handleColumn(collectColumn).then(() => {
+                return handleInitColumn(collectColumn).then(() => {
                     let targetScrollLeft = lastScrollLeft;
                     let targetScrollTop = lastScrollTop;
                     const virtualXOpts = computeVirtualXOpts.value;
@@ -5796,8 +5885,8 @@ export default defineVxeComponent({
             setSort(sortConfs, isUpdate) {
                 return handleSortEvent(null, sortConfs, isUpdate);
             },
-            setSortByEvent(evnt, sortConfs, isUpdate) {
-                return handleSortEvent(evnt, sortConfs, isUpdate);
+            setSortByEvent(evnt, sortConfs) {
+                return handleSortEvent(evnt, sortConfs, true);
             },
             /**
              * 清空指定列的排序条件
@@ -5826,6 +5915,7 @@ export default defineVxeComponent({
             clearSortByEvent(evnt, fieldOrColumn) {
                 const { tableFullColumn } = internalData;
                 const sortOpts = computeSortOpts.value;
+                const { multiple } = sortOpts;
                 const sortCols = [];
                 let column = null;
                 if (evnt) {
@@ -5846,13 +5936,16 @@ export default defineVxeComponent({
                     if (!sortOpts.remote) {
                         $xeTable.handleTableData(true);
                     }
-                    if (sortCols.length) {
-                        const params = { $table: $xeTable, $event: evnt, cols: sortCols, sortList: [] };
-                        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: [] };
+                        dispatchEvent('clear-all-sort', params, evnt);
+                    }
                 }
                 return nextTick().then(() => {
                     updateRowOffsetTop();
@@ -5882,19 +5975,11 @@ export default defineVxeComponent({
                 }
                 return sortList;
             },
-            setFilterByEvent(evnt, fieldOrColumn, options, isUpdate) {
-                const { filterStore } = reactData;
+            setFilterByEvent(evnt, fieldOrColumn, options) {
                 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 nextTick();
             },
@@ -5938,6 +6023,7 @@ export default defineVxeComponent({
                 const { filterStore } = reactData;
                 const { tableFullColumn } = internalData;
                 const filterOpts = computeFilterOpts.value;
+                const { multiple } = filterOpts;
                 const filterCols = [];
                 let column = null;
                 if (fieldOrColumn) {
@@ -5968,13 +6054,37 @@ export default defineVxeComponent({
                 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: [] };
                     dispatchEvent('clear-all-filter', params, evnt);
                 }
-                else if (column) {
-                    $xeTable.dispatchEvent('clear-filter', { filterList: () => $xeTable.getCheckedFilters() }, evnt);
-                }
                 return nextTick();
             },
             /**
@@ -6729,7 +6839,8 @@ export default defineVxeComponent({
             getCustomStoreData() {
                 const { id } = props;
                 const customOpts = computeCustomOpts.value;
-                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);
@@ -6737,17 +6848,20 @@ export default defineVxeComponent({
                 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) {
@@ -6761,19 +6875,37 @@ export default defineVxeComponent({
                 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;
                         }
@@ -6792,7 +6924,7 @@ export default defineVxeComponent({
                             visibleData[colKey] = true;
                         }
                     }
-                    if (isCustomAggFunc && column.aggFunc !== column.defaultAggFunc) {
+                    if (isCustomAggFunc && (column.aggFunc || '') !== (column.defaultAggFunc || '')) {
                         hasAggFunc = 1;
                         aggFuncData[colKey] = column.aggFunc;
                     }
@@ -6809,6 +6941,15 @@ export default defineVxeComponent({
                 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;
                 }
@@ -7793,7 +7934,7 @@ export default defineVxeComponent({
                 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 };
                         fullDataRowIdMaps[rowid] = rowRest;
                         fullAllDataRowIdMaps[rowid] = rowRest;
                     }
@@ -8258,12 +8399,13 @@ export default defineVxeComponent({
                 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') {
                     // fix：修复拖动列宽，重置按钮无法点击的问题
                     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 nextTick();
@@ -8271,9 +8413,11 @@ export default defineVxeComponent({
                     const storeData = type === 'reset'
                         ? {
                             resizableData: {},
-                            sortData: {},
+                            sortData: [],
                             visibleData: {},
-                            fixedData: {}
+                            fixedData: {},
+                            aggGroupData: {},
+                            aggFuncData: {}
                         }
                         : tableMethods.getCustomStoreData();
                     if (updateStore) {
@@ -11054,16 +11198,17 @@ export default defineVxeComponent({
                     let rowIndex = -1;
                     let $rowIndex = -1;
                     if (rowRest) {
+                        rowIndex = rowRest.index;
+                        $rowIndex = rowRest.$index;
+                        _rowIndex = rowRest._index;
                         rowLevel = rowRest.level;
+                        seq = rowRest.seq;
                         if (isRowGroupStatus || (treeConfig && transform && seqMode === 'increasing')) {
                             seq = rowRest._index + 1;
                         }
-                        else {
-                            seq = rowRest.seq;
+                        else if ((treeConfig && seqMode === 'fixed')) {
+                            seq = rowRest._tIndex + 1;
                         }
-                        rowIndex = rowRest.index;
-                        $rowIndex = rowRest.$index;
-                        _rowIndex = rowRest._index;
                     }
                     if (expandHeight) {
                         cellStyle.height = `${expandHeight}px`;
@@ -11545,7 +11690,7 @@ export default defineVxeComponent({
             staticColumnFlag.value++;
         });
         watch(staticColumnFlag, () => {
-            handleColumn(XEUtils.clone(reactData.staticColumns));
+            nextTick(() => handleInitColumn(XEUtils.clone(reactData.staticColumns)));
         });
         const tableColumnFlag = ref(0);
         watch(() => reactData.tableColumn.length, () => {