vxe-table 3.17.0-beta.13 → 3.17.0-beta.15

package/es/table/module/custom/mixin.js

@@ -1,4 +1,5 @@
 import XEUtils from 'xe-utils';
+import { getColumnList } from '../../src/util';
 function calcMaxHeight($xeTable) {
     const reactData = $xeTable;
     const { customStore } = reactData;
@@ -87,7 +88,7 @@ export default {
             });
             reactData.isCustomStatus = true;
             return $xeTable.saveCustomStore('confirm').then(() => {
-                if (allowGroup && allowValues && $xeTable.handlePivotTableAggregateData) {
+                if (allowGroup && allowValues && !!$xeTable.handlePivotTableAggregateData) {
                     if (rowGroupList.length !== aggHandleFields.length || rowGroupList.some((conf, i) => conf.field !== aggHandleFields[i])) {
                         // 更新数据分组
                         if (aggHandleFields.length) {
@@ -97,7 +98,7 @@ export default {
                             $xeTable.clearRowGroups();
                         }
                     }
-                    else {
+                    else if (allowValues) {
                         // 更新聚合函数
                         $xeTable.handleUpdateAggData();
                     }
@@ -147,6 +148,7 @@ export default {
                 sort: options === true,
                 aggFunc: options === true
             }, options);
+            const allCols = [];
             XEUtils.eachTree(collectColumn, (column) => {
                 if (opts.resizable) {
                     column.resizeWidth = 0;
@@ -156,6 +158,7 @@ export default {
                 }
                 if (opts.sort) {
                     column.renderSortNumber = column.sortNumber;
+                    column.parentId = column.defaultParentId;
                 }
                 if (!checkMethod || checkMethod({ $table: $xeTable, column })) {
                     column.visible = column.defaultVisible;
@@ -165,7 +168,13 @@ export default {
                     column.renderAggFn = column.defaultAggFunc;
                 }
                 column.renderResizeWidth = column.renderWidth;
+                allCols.push(column);
             });
+            if (opts.sort) {
+                const newCollectCols = XEUtils.toArrayTree(XEUtils.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(() => {

package/es/table/src/columnInfo.js

@@ -119,6 +119,7 @@ export class ColumnInfo {
             parentId: null,
             visible,
             // 内部属性（一旦被使用，将导致不可升级版本）
+            defaultParentId: null,
             halfVisible: false,
             defaultVisible: visible,
             defaultFixed: _vm.fixed,
@@ -126,8 +127,11 @@ export class ColumnInfo {
             checked: false,
             halfChecked: false,
             disabled: false,
+            // 分组层级
             level: 1,
+            // 跨行
             rowSpan: 1,
+            // 跨列
             colSpan: 1,
             // 数据排序
             order: null,

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';
@@ -117,11 +117,31 @@ function handleVirtualXVisible($xeTable) {
 function handleCustomRestore($xeTable, storeData) {
     const reactData = $xeTable;
     const internalData = $xeTable;
-    let { collectColumn } = internalData;
-    const { resizableData, sortData, visibleData, fixedData } = storeData;
-    let hasCustomSort = false;
+    const { collectColumn } = internalData;
+    let { resizableData, sortData, visibleData, fixedData } = storeData;
     // 处理还原
     if (resizableData || sortData || visibleData || fixedData) {
+        const sortColMaps = {};
+        // 转换兼容老版本数据
+        if (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 = [];
         XEUtils.eachTree(collectColumn, (column, index, items, path, parentColumn) => {
             const colKey = column.getKey();
             // 支持一级
@@ -129,10 +149,6 @@ function handleCustomRestore($xeTable, storeData) {
                 if (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])) {
                 column.resizeWidth = resizableData[colKey];
@@ -140,12 +156,23 @@ function handleCustomRestore($xeTable, storeData) {
             if (visibleData && XEUtils.isBoolean(visibleData[colKey])) {
                 column.visible = visibleData[colKey];
             }
+            colKeyMaps[colKey] = column;
+            allCols.push(column);
         });
         // 如果自定义了顺序
-        if (hasCustomSort) {
-            collectColumn = XEUtils.orderBy(collectColumn, 'renderSortNumber');
-            internalData.collectColumn = collectColumn;
-            internalData.tableFullColumn = getColumnList(collectColumn);
+        if (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;
     }
@@ -3084,14 +3111,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;
@@ -3224,16 +3243,20 @@ 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;
+    XEUtils.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;
@@ -3242,7 +3265,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);
@@ -3882,7 +3905,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;
@@ -3907,9 +3930,9 @@ const Methods = {
             return this.loadColumn(columns);
         });
     },
-    handleColumn(collectColumn) {
+    handleInitColumn(collectColumn) {
         const $xeTable = this;
-        return handleColumn($xeTable, collectColumn);
+        return handleInitColumn($xeTable, collectColumn);
     },
     /**
      * 更新数据行的 Map
@@ -5061,7 +5084,7 @@ const Methods = {
         const isCustomSort = hangleStorageDefaultValue(storageOpts.sort, isAllCustom);
         const isCustomAggFunc = hangleStorageDefaultValue(storageOpts.aggFunc, isAllCustom);
         const resizableData = {};
-        const sortData = {};
+        const sortData = [];
         const visibleData = {};
         const fixedData = {};
         const aggFuncData = {};
@@ -5083,18 +5106,36 @@ 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) {
                     hasFixed = 1;
                     fixedData[colKey] = column.fixed;

package/es/table/src/table.js

@@ -1273,7 +1273,7 @@ export default {
             });
         },
         staticColumns(value) {
-            this.handleColumn(XEUtils.clone(value));
+            this.handleInitColumn(XEUtils.clone(value));
         },
         tableColumn() {
             this.analyColumnWidth();

package/es/table/src/util.js

@@ -206,6 +206,7 @@ export function assembleColumn(_vm) {
         if (!groupConfig.children) {
             groupConfig.children = [];
         }
+        columnConfig.defaultParentId = groupConfig.id;
         groupConfig.children.splice(XEUtils.arrayIndexOf($xeColumn.$el.children, $el), 0, columnConfig);
     }
     else {
@@ -403,6 +404,14 @@ export function clearTableAllStatus(_vm) {
 export function isColumnInfo(column) {
     return column instanceof ColumnInfo;
 }
+// 获取所有的列，排除分组
+export function getColumnList(columns) {
+    const result = [];
+    columns.forEach((column) => {
+        result.push(...(column.children && column.children.length ? getColumnList(column.children) : [column]));
+    });
+    return result;
+}
 export function createColumn($xeTable, options, renderOptions) {
     return isColumnInfo(options) ? options : new ColumnInfo($xeTable, options, renderOptions);
 }

package/es/ui/index.js

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

package/es/ui/src/log.js

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

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.13";
+const version = "3.17.0-beta.15";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2668,7 +2668,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.17.0-beta.13"}`;
+const log_version = `table v${"3.17.0-beta.15"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -2805,6 +2805,7 @@ class ColumnInfo {
       parentId: null,
       visible,
       // 内部属性（一旦被使用，将导致不可升级版本）
+      defaultParentId: null,
       halfVisible: false,
       defaultVisible: visible,
       defaultFixed: _vm.fixed,
@@ -2812,8 +2813,11 @@ class ColumnInfo {
       checked: false,
       halfChecked: false,
       disabled: false,
+      // 分组层级
       level: 1,
+      // 跨行
       rowSpan: 1,
+      // 跨列
       colSpan: 1,
       // 数据排序
       order: null,
@@ -3089,6 +3093,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);
@@ -3335,6 +3340,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);
 }
@@ -5378,18 +5391,48 @@ function handleVirtualXVisible($xeTable) {
 function handleCustomRestore($xeTable, storeData) {
   const reactData = $xeTable;
   const internalData = $xeTable;
-  let {
+  const {
     collectColumn
   } = internalData;
-  const {
+  let {
     resizableData,
     sortData,
     visibleData,
     fixedData
   } = storeData;
-  let hasCustomSort = false;
   // 处理还原
   if (resizableData || sortData || visibleData || fixedData) {
+    const sortColMaps = {};
+    // 转换兼容老版本数据
+    if (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 = [];
     external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(collectColumn, (column, index, items, path, parentColumn) => {
       const colKey = column.getKey();
       // 支持一级
@@ -5397,10 +5440,6 @@ function handleCustomRestore($xeTable, storeData) {
         if (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])) {
         column.resizeWidth = resizableData[colKey];
@@ -5408,12 +5447,27 @@ function handleCustomRestore($xeTable, storeData) {
       if (visibleData && external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(visibleData[colKey])) {
         column.visible = visibleData[colKey];
       }
+      colKeyMaps[colKey] = column;
+      allCols.push(column);
     });
     // 如果自定义了顺序
-    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 (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 {
@@ -8899,14 +8953,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;
@@ -9045,18 +9091,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;
@@ -9065,7 +9115,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,
@@ -9792,7 +9842,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;
@@ -9817,9 +9867,9 @@ const Methods = {
       return this.loadColumn(columns);
     });
   },
-  handleColumn(collectColumn) {
+  handleInitColumn(collectColumn) {
     const $xeTable = this;
-    return handleColumn($xeTable, collectColumn);
+    return handleInitColumn($xeTable, collectColumn);
   },
   /**
    * 更新数据行的 Map
@@ -11178,7 +11228,7 @@ const Methods = {
     const isCustomSort = hangleStorageDefaultValue(storageOpts.sort, isAllCustom);
     const isCustomAggFunc = hangleStorageDefaultValue(storageOpts.aggFunc, isAllCustom);
     const resizableData = {};
-    const sortData = {};
+    const sortData = [];
     const visibleData = {};
     const fixedData = {};
     const aggFuncData = {};
@@ -11200,18 +11250,39 @@ 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);
+          }
+        }
+      } 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;
@@ -27565,6 +27636,8 @@ function checkRuleStatus(rule, val) {
 });
 ;// CONCATENATED MODULE: ./packages/table/module/custom/mixin.ts
 
+
+
 function calcMaxHeight($xeTable) {
   const reactData = $xeTable;
   const {
@@ -27674,7 +27747,7 @@ function emitCustomEvent($xeTable, type, evnt) {
       });
       reactData.isCustomStatus = true;
       return $xeTable.saveCustomStore('confirm').then(() => {
-        if (allowGroup && allowValues && $xeTable.handlePivotTableAggregateData) {
+        if (allowGroup && allowValues && !!$xeTable.handlePivotTableAggregateData) {
           if (rowGroupList.length !== aggHandleFields.length || rowGroupList.some((conf, i) => conf.field !== aggHandleFields[i])) {
             // 更新数据分组
             if (aggHandleFields.length) {
@@ -27682,7 +27755,7 @@ function emitCustomEvent($xeTable, type, evnt) {
             } else {
               $xeTable.clearRowGroups();
             }
-          } else {
+          } else if (allowValues) {
             // 更新聚合函数
             $xeTable.handleUpdateAggData();
           }
@@ -27752,6 +27825,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;
@@ -27761,6 +27835,7 @@ function emitCustomEvent($xeTable, type, evnt) {
         }
         if (opts.sort) {
           column.renderSortNumber = column.sortNumber;
+          column.parentId = column.defaultParentId;
         }
         if (!checkMethod || checkMethod({
           $table: $xeTable,
@@ -27773,7 +27848,17 @@ 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(() => {
@@ -29305,7 +29390,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.handleInitColumn(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(value));
     },
     tableColumn() {
       this.analyColumnWidth();