vxe-table 3.17.0-beta.8 → 3.17.0

package/lib/index.umd.js

@@ -2002,7 +2002,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.17.0-beta.8";
+const version = "3.17.0";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2136,6 +2136,7 @@ core_.VxeUI.setConfig({
       // filterMethod: null,
       // destroyOnClose: false,
       // isEvery: false,
+      multiple: true,
       showIcon: true
     },
     aggregateConfig: {
@@ -2667,7 +2668,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.17.0-beta.8"}`;
+const log_version = `table v${"3.17.0"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -2804,15 +2805,20 @@ class ColumnInfo {
       parentId: null,
       visible,
       // 内部属性（一旦被使用，将导致不可升级版本）
+      defaultParentId: null,
       halfVisible: false,
       defaultVisible: visible,
       defaultFixed: _vm.fixed,
+      defaultAggGroup: _vm.aggGroup,
       defaultAggFunc: _vm.aggFunc,
       checked: false,
       halfChecked: false,
       disabled: false,
+      // 分组层级
       level: 1,
+      // 跨行
       rowSpan: 1,
+      // 跨列
       colSpan: 1,
       // 数据排序
       order: null,
@@ -3088,6 +3094,7 @@ function assembleColumn(_vm) {
     if (!groupConfig.children) {
       groupConfig.children = [];
     }
+    columnConfig.defaultParentId = groupConfig.id;
     groupConfig.children.splice(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().arrayIndexOf($xeColumn.$el.children, $el), 0, columnConfig);
   } else {
     staticColumns.splice(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().arrayIndexOf($xeTable.$refs.hideColumn.children, $el), 0, columnConfig);
@@ -3334,6 +3341,14 @@ function clearTableAllStatus(_vm) {
 function isColumnInfo(column) {
   return column instanceof ColumnInfo;
 }
+// 获取所有的列，排除分组
+function getColumnList(columns) {
+  const result = [];
+  columns.forEach(column => {
+    result.push(...(column.children && column.children.length ? getColumnList(column.children) : [column]));
+  });
+  return result;
+}
 function createColumn($xeTable, options, renderOptions) {
   return isColumnInfo(options) ? options : new ColumnInfo($xeTable, options, renderOptions);
 }
@@ -3970,7 +3985,7 @@ const Cell = {
         contentMethod,
         mapChildrenField
       } = aggregateOpts;
-      const aggMethod = aggregateOpts.calcValuesMethod || aggregateOpts.countMethod || aggregateOpts.aggregateMethod;
+      const aggCalcMethod = aggregateOpts.calcValuesMethod || aggregateOpts.countMethod || aggregateOpts.aggregateMethod;
       const groupField = aggRow.groupField;
       const groupContent = aggRow.groupContent;
       const childList = mapChildrenField ? aggRow[mapChildrenField] || [] : [];
@@ -4002,9 +4017,9 @@ const Cell = {
       } else if ($table.getPivotTableAggregateCellAggValue) {
         cellValue = $table.getPivotTableAggregateCellAggValue(params);
       } else if (aggFunc === true || countFields && countFields.includes(field)) {
-        if (aggMethod) {
+        if (aggCalcMethod) {
           ctParams.aggValue = childCount;
-          cellValue = `${aggMethod(ctParams)}`;
+          cellValue = `${aggCalcMethod(ctParams)}`;
         }
       }
     } else {
@@ -4060,6 +4075,7 @@ const Cell = {
     } = tableInternalData;
     const aggregateOpts = $table.computeAggregateOpts;
     const {
+      mode,
       padding,
       indent
     } = aggregateOpts;
@@ -4069,7 +4085,7 @@ const Cell = {
       class: ['vxe-row-group--tree-node', {
         'is--expanded': isExpand
       }],
-      style: padding && indent ? {
+      style: mode !== 'column' && padding && indent ? {
         paddingLeft: `${level * indent}px`
       } : undefined
     }, [row.isAggregate ? h('span', {
@@ -5374,44 +5390,122 @@ function handleVirtualXVisible($xeTable) {
   };
 }
 function handleCustomRestore($xeTable, storeData) {
+  const props = $xeTable;
   const reactData = $xeTable;
   const internalData = $xeTable;
-  let {
+  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
+    fixedData,
+    aggGroupData,
+    aggFuncData
   } = storeData;
-  let hasCustomSort = false;
   // 处理还原
-  if (resizableData || sortData || visibleData || fixedData) {
+  if (isCustomResizable && resizableData || isCustomSort && sortData || isCustomVisible && visibleData || isCustomFixed && fixedData || isCustomAggGroup && aggGroupData || isCustomAggFunc && aggFuncData) {
+    const sortColMaps = {};
+    if (isCustomSort && sortData) {
+      // 转换兼容老版本数据，即将废弃兼容
+      if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(sortData)) {
+        const sortRests = [];
+        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(sortData, (index, colKey) => {
+          sortRests.push({
+            key: colKey,
+            index
+          });
+        });
+        sortData = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().orderBy(sortRests, {
+          field: 'index',
+          order: 'asc'
+        }).map(item => ({
+          k: item.key
+        }));
+      }
+      let colNum = 1;
+      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().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 = [];
     external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().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 && external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(sortData[colKey])) {
-          hasCustomSort = true;
-          column.renderSortNumber = sortData[colKey];
-        }
       }
-      if (resizableData && external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(resizableData[colKey])) {
+      if (isCustomResizable && resizableData && external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(resizableData[colKey])) {
         column.resizeWidth = resizableData[colKey];
       }
-      if (visibleData && external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(visibleData[colKey])) {
+      if (isCustomVisible && visibleData && external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().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 = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().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 = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toArrayTree(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().orderBy(allCols, 'renderSortNumber'), {
+        key: 'id',
+        parentKey: 'parentId',
+        children: 'children'
+      });
+      internalData.collectColumn = newCollectCols;
+      internalData.tableFullColumn = getColumnList(newCollectCols);
     }
     reactData.isCustomStatus = true;
   } else {
@@ -5886,6 +5980,7 @@ function updateAfterListIndex($xeTable) {
         $index: -1,
         _index: index,
         treeIndex: -1,
+        _tIndex: -1,
         items: [],
         parent: null,
         level: 0,
@@ -5924,6 +6019,7 @@ function updateAfterDataIndex($xeTable) {
   const childrenField = treeOpts.children || treeOpts.childrenField;
   const fullMaps = {};
   if (treeConfig) {
+    let _treeIndex = 0;
     const {
       handleGetRowId
     } = createHandleGetRowId($xeTable);
@@ -5934,6 +6030,7 @@ function updateAfterDataIndex($xeTable) {
       if (rowRest) {
         rowRest.seq = seq;
         rowRest.treeIndex = index;
+        rowRest._tIndex = _treeIndex;
       } else {
         const rest = {
           row,
@@ -5943,6 +6040,7 @@ function updateAfterDataIndex($xeTable) {
           $index: -1,
           _index: -1,
           treeIndex: -1,
+          _tIndex: _treeIndex,
           items: [],
           parent: null,
           level: 0,
@@ -5954,6 +6052,7 @@ function updateAfterDataIndex($xeTable) {
         fullAllDataRowIdData[rowid] = rest;
         fullDataRowIdData[rowid] = rest;
       }
+      _treeIndex++;
       fullMaps[rowid] = row;
     }, {
       children: transform ? treeOpts.mapChildrenField : childrenField
@@ -7657,6 +7756,10 @@ function removeFooterMerges($xeTable, merges) {
   return rest;
 }
 function handleSortEvent($xeTable, evnt, sortConfs, isUpdate) {
+  const internalData = $xeTable;
+  const {
+    tableFullColumn
+  } = internalData;
   const sortOpts = $xeTable.computeSortOpts;
   const {
     multiple,
@@ -7667,10 +7770,16 @@ function handleSortEvent($xeTable, evnt, sortConfs, isUpdate) {
     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 {
@@ -7692,8 +7801,16 @@ function handleSortEvent($xeTable, evnt, sortConfs, isUpdate) {
           column.order = order;
         }
         column.sortTime = Date.now() + index;
+        sortColMpps[column.id] = column;
       }
     });
+    if (!multiple) {
+      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(orderActiveMaps, (oaCol, oaId) => {
+        if (!sortColMpps[oaId]) {
+          oaCol.order = null;
+        }
+      });
+    }
     if (isUpdate) {
       if (!remote) {
         $xeTable.handleTableData(true);
@@ -7898,7 +8015,7 @@ const calcCellHeight = $xeTable => {
   } = internalData;
   const defaultRowHeight = $xeTable.computeDefaultRowHeight;
   const el = $xeTable.$refs.refElem;
-  if (!isAllOverflow && scrollYLoad && el) {
+  if (!isAllOverflow && (scrollYLoad || scrollXLoad) && el) {
     const {
       handleGetRowId
     } = createHandleGetRowId($xeTable);
@@ -8437,18 +8554,18 @@ function handleUpdateAggValues($xeTable) {
 }
 function handleUpdateRowGroup($xeTable, groupFields) {
   const reactData = $xeTable;
-  const aggFields = [];
-  const aggConfs = [];
+  const aggGroupFields = [];
+  const aggGroupConfs = [];
   if (groupFields) {
     (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().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) {
@@ -8874,14 +8991,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;
@@ -8912,7 +9021,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) {
@@ -9020,18 +9129,22 @@ 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;
+  let sortIndex = 1;
+  external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(collectColumn, (column, index, items, path, parentColumn) => {
+    const parentId = parentColumn ? parentColumn.id : null;
+    column.parentId = parentId;
+    column.defaultParentId = parentId;
     column.sortNumber = sortIndex;
     column.renderSortNumber = sortIndex;
+    sortIndex++;
   });
 }
-function handleColumn($xeTable, collectColumn) {
+function handleInitColumn($xeTable, collectColumn) {
   const $xeToolbar = $xeTable.$refs.$xeToolbar;
   const reactData = $xeTable;
   const internalData = $xeTable;
@@ -9040,7 +9153,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,
@@ -9767,7 +9880,7 @@ const Methods = {
     const collectColumn = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().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;
@@ -9792,9 +9905,9 @@ const Methods = {
       return this.loadColumn(columns);
     });
   },
-  handleColumn(collectColumn) {
+  handleInitColumn(collectColumn) {
     const $xeTable = this;
-    return handleColumn($xeTable, collectColumn);
+    return handleInitColumn($xeTable, collectColumn);
   },
   /**
    * 更新数据行的 Map
@@ -9835,6 +9948,7 @@ const Methods = {
           _index: -1,
           $index: -1,
           treeIndex: index,
+          _tIndex: -1,
           items,
           parent: parentRow,
           level,
@@ -9978,6 +10092,7 @@ const Methods = {
           _index: -1,
           $index: -1,
           treeIndex: -1,
+          _tIndex: -1,
           items,
           parent: parentRow,
           level: parentLevel + nodes.length,
@@ -11103,8 +11218,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;
@@ -11130,12 +11246,18 @@ const Methods = {
   getCustomStoreData() {
     const $xeTable = this;
     const props = $xeTable;
+    const reactData = $xeTable;
     const internalData = $xeTable;
     const {
       id
     } = props;
     const customOpts = $xeTable.computeCustomOpts;
     const {
+      isRowGroupStatus,
+      rowGroupList
+    } = reactData;
+    const {
+      fullColumnFieldData,
       collectColumn
     } = internalData;
     const {
@@ -11149,17 +11271,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) {
@@ -11173,19 +11298,40 @@ const Methods = {
     let hasFixed = 0;
     let hasVisible = 0;
     let hasAggFunc = 0;
+    const sortMaps = {};
     external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().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;
-          sortData[colKey] = column.renderSortNumber;
+          if (psObj) {
+            const sObj = {
+              k: colKey
+            };
+            sortMaps[colKey] = sObj;
+            if (!psObj.c) {
+              psObj.c = [];
+            }
+            psObj.c.push(sObj);
+          }
         }
-        if (isCustomFixed && column.fixed !== column.defaultFixed) {
+      } else {
+        if (isCustomSort) {
+          hasSort = 1;
+          const sObj = {
+            k: colKey
+          };
+          sortMaps[colKey] = sObj;
+          sortData.push(sObj);
+        }
+        // 只支持一级
+        if (isCustomFixed && (column.fixed || '') !== (column.defaultFixed || '')) {
           hasFixed = 1;
           fixedData[colKey] = column.fixed;
         }
@@ -11206,7 +11352,7 @@ const Methods = {
           visibleData[colKey] = true;
         }
       }
-      if (isCustomAggFunc && column.aggFunc !== column.defaultAggFunc) {
+      if (isCustomAggFunc && (column.aggFunc || '') !== (column.defaultAggFunc || '')) {
         hasAggFunc = 1;
         aggFuncData[colKey] = column.aggFunc;
       }
@@ -11223,6 +11369,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;
     }
@@ -11248,11 +11403,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();
@@ -11261,7 +11417,9 @@ const Methods = {
         resizableData: {},
         sortData: {},
         visibleData: {},
-        fixedData: {}
+        fixedData: {},
+        aggGroupData: {},
+        aggFuncData: {}
       } : this.getCustomStoreData();
       if (updateStore) {
         return updateStore({
@@ -15415,9 +15573,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);
   },
   /**
    * 清空指定列的排序条件
@@ -15450,6 +15608,9 @@ const Methods = {
       tableFullColumn
     } = internalData;
     const sortOpts = $xeTable.computeSortOpts;
+    const {
+      multiple
+    } = sortOpts;
     const sortCols = [];
     let column = null;
     if (evnt) {
@@ -15469,7 +15630,13 @@ const Methods = {
       if (!sortOpts.remote) {
         $xeTable.handleTableData(true);
       }
-      if (sortCols.length) {
+      if (!multiple) {
+        column = sortCols[0];
+      }
+      if (column) {
+        $xeTable.handleColumnSortEvent(evnt, column);
+      }
+      if (multiple && sortCols.length) {
         const params = {
           $table: $xeTable,
           $event: evnt,
@@ -15477,8 +15644,6 @@ const Methods = {
           sortList: []
         };
         $xeTable.dispatchEvent('clear-all-sort', params, evnt);
-      } else if (column) {
-        $xeTable.handleColumnSortEvent(evnt, column);
       }
     }
     return $xeTable.$nextTick().then(() => {
@@ -15524,22 +15689,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();
   },
@@ -15598,6 +15753,9 @@ const Methods = {
       tableFullColumn
     } = internalData;
     const filterOpts = $xeTable.computeFilterOpts;
+    const {
+      multiple
+    } = filterOpts;
     const filterCols = [];
     let column = null;
     if (fieldOrColumn) {
@@ -15627,7 +15785,34 @@ 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,
@@ -15635,10 +15820,6 @@ const Methods = {
         filterList: []
       };
       $xeTable.dispatchEvent('clear-all-filter', params, evnt);
-    } else if (column) {
-      $xeTable.dispatchEvent('clear-filter', {
-        filterList: () => $xeTable.getCheckedFilters()
-      }, evnt);
     }
     return $xeTable.$nextTick();
   },
@@ -18033,7 +18214,7 @@ function renderTdColumn(h, $xeTable, seq, rowid, fixedType, isOptimizeMode, rowL
   if (!fixedHiddenColumn && editConfig && (editRender || cellRender) && (editOpts.showStatus || editOpts.showUpdateStatus)) {
     isDirty = $xeTable.isUpdateByRow(row, column.field);
   }
-  const isVNAutoHeight = scrollYLoad && !hasEllipsis;
+  const isVNAutoHeight = !hasEllipsis && (scrollYLoad || scrollXLoad);
   let cellHeight = getCellRestHeight(rowRest, cellOpts, rowOpts, defaultRowHeight);
   const isLastColumn = $columnIndex === columns.length - 1;
   const isAutoCellWidth = !column.resizeWidth && (column.minWidth === 'auto' || column.width === 'auto');
@@ -18069,7 +18250,7 @@ function renderTdColumn(h, $xeTable, seq, rowid, fixedType, isOptimizeMode, rowL
     }
     tcStyle.width = `${column.renderWidth + mergeColWidth - cellOffsetWidth}px`;
   }
-  if (scrollYLoad || hasEllipsis || isCsHeight || isRsHeight) {
+  if (scrollYLoad || scrollXLoad || hasEllipsis || isCsHeight || isRsHeight) {
     tcStyle.height = `${cellHeight}px`;
   } else {
     tcStyle.minHeight = `${cellHeight}px`;
@@ -18261,14 +18442,15 @@ function renderRows(h, _vm, fixedType, isOptimizeMode, tableData, tableColumn) {
       };
     }
     if (rowRest) {
+      rowIndex = rowRest.index;
+      _rowIndex = rowRest._index;
       rowLevel = rowRest.level;
+      seq = rowRest.seq;
       if (hasRowGroupAggregate || 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;
     }
     const params = {
       $table: $xeTable,
@@ -23185,6 +23367,7 @@ function insertTreeRow($xeTable, newRecords, isAppend) {
         _index: -1,
         $index: -1,
         treeIndex: -1,
+        _tIndex: -1,
         items: parentChilds,
         parent: parentRow,
         level: parentLevel + 1,
@@ -23209,6 +23392,7 @@ function insertTreeRow($xeTable, newRecords, isAppend) {
         _index: -1,
         $index: -1,
         treeIndex: -1,
+        _tIndex: -1,
         items: tableFullTreeData,
         parent: null,
         level: 0,
@@ -23279,6 +23463,7 @@ function handleInsertRowAt($xeTable, records, targetRow, isInsertNextRow) {
           _index: -1,
           $index: -1,
           treeIndex: -1,
+          _tIndex: -1,
           items: afterFullData,
           parent: null,
           level: 0,
@@ -23325,6 +23510,7 @@ function handleInsertRowAt($xeTable, records, targetRow, isInsertNextRow) {
             _index: -1,
             $index: -1,
             treeIndex: -1,
+            _tIndex: -1,
             items: afterFullData,
             parent: null,
             level: 0,
@@ -23375,6 +23561,7 @@ function handleInsertRowAt($xeTable, records, targetRow, isInsertNextRow) {
               _index: -1,
               $index: -1,
               treeIndex: -1,
+              _tIndex: -1,
               items: parentMapChilds,
               parent: parentRow,
               level: parentLevel + 1,
@@ -27509,6 +27696,8 @@ function checkRuleStatus(rule, val) {
 });
 ;// CONCATENATED MODULE: ./packages/table/module/custom/mixin.ts
 
+
+
 function calcMaxHeight($xeTable) {
   const reactData = $xeTable;
   const {
@@ -27617,21 +27806,20 @@ function emitCustomEvent($xeTable, type, evnt) {
         }
       });
       reactData.isCustomStatus = true;
-      return $xeTable.saveCustomStore('confirm').then(() => {
-        if (allowGroup && allowValues && $xeTable.handlePivotTableAggregateData) {
-          if (rowGroupList.length !== aggHandleFields.length || rowGroupList.some((conf, i) => conf.field !== aggHandleFields[i])) {
-            // 更新数据分组
-            if (aggHandleFields.length) {
-              $xeTable.setRowGroups(aggHandleFields);
-            } else {
-              $xeTable.clearRowGroups();
-            }
+      if (allowGroup && allowValues && !!$xeTable.handlePivotTableAggregateData) {
+        if (rowGroupList.length !== aggHandleFields.length || rowGroupList.some((conf, i) => conf.field !== aggHandleFields[i])) {
+          // 更新数据分组
+          if (aggHandleFields.length) {
+            $xeTable.setRowGroups(aggHandleFields);
           } else {
-            // 更新聚合函数
-            $xeTable.handleUpdateAggData();
+            $xeTable.clearRowGroups();
           }
+        } else if (allowValues) {
+          // 更新聚合函数
+          $xeTable.handleUpdateAggData();
         }
-      });
+      }
+      return $xeTable.saveCustomStore('confirm');
     },
     _cancelCustom() {
       const $xeTable = this;
@@ -27696,6 +27884,7 @@ function emitCustomEvent($xeTable, type, evnt) {
         sort: options === true,
         aggFunc: options === true
       }, options);
+      const allCols = [];
       external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(collectColumn, column => {
         if (opts.resizable) {
           column.resizeWidth = 0;
@@ -27705,6 +27894,7 @@ function emitCustomEvent($xeTable, type, evnt) {
         }
         if (opts.sort) {
           column.renderSortNumber = column.sortNumber;
+          column.parentId = column.defaultParentId;
         }
         if (!checkMethod || checkMethod({
           $table: $xeTable,
@@ -27717,9 +27907,18 @@ function emitCustomEvent($xeTable, type, evnt) {
           column.renderAggFn = column.defaultAggFunc;
         }
         column.renderResizeWidth = column.renderWidth;
+        allCols.push(column);
       });
+      if (opts.sort) {
+        const newCollectCols = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toArrayTree(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().orderBy(allCols, 'renderSortNumber'), {
+          key: 'id',
+          parentKey: 'parentId',
+          children: 'children'
+        });
+        internalData.collectColumn = newCollectCols;
+        internalData.tableFullColumn = getColumnList(newCollectCols);
+      }
       reactData.isCustomStatus = false;
-      $xeTable.saveCustomStore('reset');
       return $xeTable.handleCustom().then(() => {
         if (opts.aggFunc && $xeTable.handlePivotTableAggregateData) {
           const rowGroupFields = $xeTable.computeRowGroupFields;
@@ -27733,6 +27932,7 @@ function emitCustomEvent($xeTable, type, evnt) {
             $xeTable.handleUpdateAggData();
           }
         }
+        $xeTable.saveCustomStore('reset');
       });
     },
     _toggleCustomAllCheckbox() {
@@ -28164,15 +28364,16 @@ function renderRowExpandedVNs(h, $xeTable) {
       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`;
@@ -29248,7 +29449,7 @@ function renderBody(h, $xeTable) {
       });
     },
     staticColumns(value) {
-      this.handleColumn(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(value));
+      this.$nextTick(() => this.handleInitColumn(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(value)));
     },
     tableColumn() {
       this.analyColumnWidth();
@@ -31058,9 +31259,11 @@ function getTableOns(_vm) {
   if (proxyConfig) {
     if (proxyOpts.sort) {
       ons['sort-change'] = _vm.sortChangeEvent;
+      ons['clear-all-sort'] = _vm.clearAllSortEvent;
     }
     if (proxyOpts.filter) {
       ons['filter-change'] = _vm.filterChangeEvent;
+      ons['clear-all-filter'] = _vm.clearAllFilterEvent;
     }
   }
   return ons;
@@ -31329,6 +31532,14 @@ external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default(
       const pagerOpts = $xeGrid.computePagerOpts;
       return pagerOpts.total;
     },
+    computePageCount() {
+      const $xeGrid = this;
+      const reactData = $xeGrid.reactData;
+      const {
+        tablePage
+      } = reactData;
+      return Math.max(Math.ceil(tablePage.total / tablePage.pageSize), 1);
+    },
     computeIsLoading() {
       const $xeGrid = this;
       const props = $xeGrid;
@@ -31418,7 +31629,7 @@ external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default(
             tablePage.pageSize = pageSize;
           }
           if (total) {
-            tablePage.pageSize = total;
+            tablePage.total = total;
           }
         }
       }
@@ -32159,29 +32370,71 @@ external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default(
       return $xeGrid.$nextTick();
     },
     homePage() {
+      const $xeGrid = this;
+      const reactData = $xeGrid.reactData;
+      const {
+        tablePage
+      } = reactData;
+      tablePage.currentPage = 1;
+      return $xeGrid.$nextTick();
+    },
+    homePageByEvent(evnt) {
       const $xeGrid = this;
       const $pager = $xeGrid.$refs.refPager;
       if ($pager) {
-        return $pager.homePage();
+        $pager.homePageByEvent(evnt);
       }
-      return $xeGrid.$nextTick();
     },
     endPage() {
+      const $xeGrid = this;
+      const reactData = $xeGrid.reactData;
+      const {
+        tablePage
+      } = reactData;
+      const pageCount = $xeGrid.computePageCount;
+      tablePage.currentPage = pageCount;
+      return $xeGrid.$nextTick();
+    },
+    endPageByEvent(evnt) {
       const $xeGrid = this;
       const $pager = $xeGrid.$refs.refPager;
       if ($pager) {
-        return $pager.endPage();
+        $pager.endPageByEvent(evnt);
       }
+    },
+    setCurrentPage(currentPage) {
+      const $xeGrid = this;
+      const reactData = $xeGrid.reactData;
+      const {
+        tablePage
+      } = reactData;
+      const pageCount = $xeGrid.computePageCount;
+      tablePage.currentPage = Math.min(pageCount, Math.max(1, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(currentPage)));
       return $xeGrid.$nextTick();
     },
-    jumpPage(currentPage) {
+    setCurrentPageByEvent(evnt, currentPage) {
       const $xeGrid = this;
       const $pager = $xeGrid.$refs.refPager;
       if ($pager) {
-        return $pager.jumpPage(currentPage);
+        $pager.setCurrentPageByEvent(evnt, currentPage);
       }
+    },
+    setPageSize(pageSize) {
+      const $xeGrid = this;
+      const reactData = $xeGrid.reactData;
+      const {
+        tablePage
+      } = reactData;
+      tablePage.pageSize = Math.max(1, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(pageSize));
       return $xeGrid.$nextTick();
     },
+    setPageSizeByEvent(evnt, pageSize) {
+      const $xeGrid = this;
+      const $pager = $xeGrid.$refs.refPager;
+      if ($pager) {
+        $pager.setPageSizeByEvent(evnt, pageSize);
+      }
+    },
     triggerToolbarCommitEvent(params, evnt) {
       const $xeGrid = this;
       const {
@@ -32212,28 +32465,6 @@ external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default(
         tool
       }, evnt);
     },
-    sortChangeEvent(params) {
-      const $xeGrid = this;
-      const props = $xeGrid;
-      const reactData = $xeGrid.reactData;
-      const $xeTable = $xeGrid.$refs.refTable;
-      const {
-        proxyConfig
-      } = props;
-      const proxyOpts = $xeGrid.computeProxyOpts;
-      const sortOpts = $xeTable.computeSortOpts;
-      // 如果是服务端排序
-      if (sortOpts.remote) {
-        reactData.sortData = params.sortList;
-        if (proxyConfig && isEnableConf(proxyOpts)) {
-          reactData.tablePage.currentPage = 1;
-          $xeGrid.commitProxy('query').then(rest => {
-            $xeGrid.dispatchEvent('proxy-query', rest, params.$event);
-          });
-        }
-      }
-      $xeGrid.dispatchEvent('sort-change', params, params.$event);
-    },
     pageChangeEvent(params) {
       const $xeGrid = this;
       const props = $xeGrid;
@@ -32259,7 +32490,38 @@ external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default(
         });
       }
     },
-    filterChangeEvent(params) {
+    handleSortEvent(params) {
+      const $xeGrid = this;
+      const props = $xeGrid;
+      const reactData = $xeGrid.reactData;
+      const $xeTable = $xeGrid.$refs.refTable;
+      const {
+        proxyConfig
+      } = props;
+      const proxyOpts = $xeGrid.computeProxyOpts;
+      const sortOpts = $xeTable.computeSortOpts;
+      // 如果是服务端排序
+      if (sortOpts.remote) {
+        reactData.sortData = params.sortList;
+        if (proxyConfig && isEnableConf(proxyOpts)) {
+          reactData.tablePage.currentPage = 1;
+          $xeGrid.commitProxy('query').then(rest => {
+            $xeGrid.dispatchEvent('proxy-query', rest, params.$event);
+          });
+        }
+      }
+    },
+    sortChangeEvent(params) {
+      const $xeGrid = this;
+      $xeGrid.handleSortEvent(params);
+      $xeGrid.dispatchEvent('sort-change', params, params.$event);
+    },
+    clearAllSortEvent(params) {
+      const $xeGrid = this;
+      $xeGrid.handleSortEvent(params);
+      $xeGrid.dispatchEvent('clear-all-sort', params, params.$event);
+    },
+    handleFilterEvent(params) {
       const $xeGrid = this;
       const props = $xeGrid;
       const reactData = $xeGrid.reactData;
@@ -32279,8 +32541,17 @@ external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default(
           });
         }
       }
+    },
+    filterChangeEvent(params) {
+      const $xeGrid = this;
+      $xeGrid.handleFilterEvent(params);
       $xeGrid.dispatchEvent('filter-change', params, params.$event);
     },
+    clearAllFilterEvent(params) {
+      const $xeGrid = this;
+      $xeGrid.handleFilterEvent(params);
+      $xeGrid.dispatchEvent('clear-all-filter', params, params.$event);
+    },
     submitFormEvent(params) {
       const $xeGrid = this;
       const props = $xeGrid;
@@ -32344,6 +32615,11 @@ external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default(
         type: reactData.isZMax ? 'max' : 'revert'
       }, evnt);
     },
+    getParams() {
+      const $xeGrid = this;
+      const props = $xeGrid;
+      return props.params;
+    },
     zoom() {
       const $xeGrid = this;
       const reactData = $xeGrid.reactData;