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

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

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _xeUtils = _interopRequireDefault(require("xe-utils"));
+var _util = require("../../src/util");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function calcMaxHeight($xeTable) {
   const reactData = $xeTable;
@@ -115,7 +116,7 @@ var _default = exports.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) {
@@ -123,7 +124,7 @@ var _default = exports.default = {
             } else {
               $xeTable.clearRowGroups();
             }
-          } else {
+          } else if (allowValues) {
             // 更新聚合函数
             $xeTable.handleUpdateAggData();
           }
@@ -193,6 +194,7 @@ var _default = exports.default = {
         sort: options === true,
         aggFunc: options === true
       }, options);
+      const allCols = [];
       _xeUtils.default.eachTree(collectColumn, column => {
         if (opts.resizable) {
           column.resizeWidth = 0;
@@ -202,6 +204,7 @@ var _default = exports.default = {
         }
         if (opts.sort) {
           column.renderSortNumber = column.sortNumber;
+          column.parentId = column.defaultParentId;
         }
         if (!checkMethod || checkMethod({
           $table: $xeTable,
@@ -214,7 +217,17 @@ var _default = exports.default = {
           column.renderAggFn = column.defaultAggFunc;
         }
         column.renderResizeWidth = column.renderWidth;
+        allCols.push(column);
       });
+      if (opts.sort) {
+        const newCollectCols = _xeUtils.default.toArrayTree(_xeUtils.default.orderBy(allCols, 'renderSortNumber'), {
+          key: 'id',
+          parentKey: 'parentId',
+          children: 'children'
+        });
+        internalData.collectColumn = newCollectCols;
+        internalData.tableFullColumn = (0, _util.getColumnList)(newCollectCols);
+      }
       reactData.isCustomStatus = false;
       $xeTable.saveCustomStore('reset');
       return $xeTable.handleCustom().then(() => {

package/lib/table/module/custom/mixin.min.js

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function calcMaxHeight(e){var t=e.customStore,e=e.$refs.refElem;let s=0;e&&(s=e.clientHeight-28),t.maxHeight=Math.max(88,s)}function emitCustomEvent(e,t,s){(e.$xeGrid||e).dispatchEvent("custom",{type:t},s)}var _default=exports.default={methods:{_openCustom(){let e=this;var{initStore:t,customStore:s}=e;return s.visible=!0,t.custom=!0,e.handleUpdateCustomColumn(),e.checkCustomStatus(),calcMaxHeight(e),e.$nextTick().then(()=>calcMaxHeight(e))},_closeCustom(){var e=this,t=e.customStore,s=e.computeCustomOpts;return t.visible&&(t.visible=!1,s.immediate||e.handleCustom()),e.$nextTick()},_toggleCustom(){var e=this,t=e.customStore;return t.visible?e.closeCustom():e.openCustom()},_saveCustom(){let e=this;var t=e;let{customColumnList:s,aggHandleFields:i,rowGroupList:l}=t,{allowVisible:o,allowSort:r,allowFixed:u,allowResizable:a,allowGroup:n,allowValues:d}=e.computeCustomOpts;return _xeUtils.default.eachTree(s,(e,t,s,i,l)=>{l?e.fixed=l.fixed:(r&&(e.renderSortNumber=t+1),u&&(e.fixed=e.renderFixed)),a&&e.renderVisible&&(!e.children||e.children.length)&&e.renderResizeWidth!==e.renderWidth&&(e.resizeWidth=e.renderResizeWidth,e.renderWidth=e.renderResizeWidth),o&&(e.visible=e.renderVisible),n&&d&&(e.aggFunc=e.renderAggFn)}),t.isCustomStatus=!0,e.saveCustomStore("confirm").then(()=>{n&&d&&e.handlePivotTableAggregateData&&(l.length!==i.length||l.some((e,t)=>e.field!==i[t])?i.length?e.setRowGroups(i):e.clearRowGroups():e.handleUpdateAggData())})},_cancelCustom(){var e=this,{customColumnList:t,customStore:s}=e;let{oldSortMaps:l,oldFixedMaps:o,oldVisibleMaps:r}=s,{allowVisible:u,allowSort:a,allowFixed:n,allowResizable:d}=e.computeCustomOpts;return _xeUtils.default.eachTree(t,e=>{var t=e.getKey(),s=!!r[t],i=o[t]||"";u&&(e.renderVisible=s,e.visible=s),n&&(e.renderFixed=i,e.fixed=i),a&&(e.renderSortNumber=l[t]||0),d&&(e.renderResizeWidth=e.renderWidth)},{children:"children"}),e.$nextTick()},_resetCustom(e){let t=this;var s=t,i=t;let l=s.rowGroupList;i=i.collectColumn;let o=t.computeCustomOpts.checkMethod,r=Object.assign({visible:!0,resizable:!0===e,fixed:!0===e,sort:!0===e,aggFunc:!0===e},e);return _xeUtils.default.eachTree(i,e=>{r.resizable&&(e.resizeWidth=0),r.fixed&&(e.fixed=e.defaultFixed),r.sort&&(e.renderSortNumber=e.sortNumber),o&&!o({$table:t,column:e})||(e.visible=e.defaultVisible),r.aggFunc&&(e.aggFunc=e.defaultAggFunc,e.renderAggFn=e.defaultAggFunc),e.renderResizeWidth=e.renderWidth}),s.isCustomStatus=!1,t.saveCustomStore("reset"),t.handleCustom().then(()=>{var e;r.aggFunc&&t.handlePivotTableAggregateData&&(((e=t.computeRowGroupFields)||l).length?e&&e.length?t.setRowGroups(e):t.clearRowGroups():t.handleUpdateAggData())})},_toggleCustomAllCheckbox(){var e=this.customStore,e=!e.isAll;return this.setCustomAllCheckbox(e)},_setCustomAllCheckbox(e){let t=this;var s=t,i=s.customStore,l=s.customColumnList,o=t.computeCustomOpts;let{checkMethod:r,visibleMethod:u}=o,a=!!e;o.immediate?(_xeUtils.default.eachTree(l,e=>{u&&!u({$table:t,column:e})||r&&!r({$table:t,column:e})||(e.visible=a,e.renderVisible=a,e.halfVisible=!1)}),i.isAll=a,s.isCustomStatus=!0,t.handleCustom(),t.saveCustomStore("update:visible")):(_xeUtils.default.eachTree(l,e=>{u&&!u({$table:t,column:e})||r&&!r({$table:t,column:e})||(e.renderVisible=a,e.halfVisible=!1)}),i.isAll=a),t.checkCustomStatus()},checkCustomStatus(){let t=this;var e=t.customStore,s=t.collectColumn;let i=t.computeCustomOpts.checkMethod;e.isAll=s.every(e=>!!i&&!i({$table:t,column:e})||e.renderVisible),e.isIndeterminate=!e.isAll&&s.some(e=>(!i||i({$table:t,column:e}))&&(e.renderVisible||e.halfVisible))},emitCustomEvent(e,t){(this.$xeGrid||this).dispatchEvent("custom",{type:e},t)},triggerCustomEvent(e){var t=this.customStore;t.visible?(this.closeCustom(),emitCustomEvent(this,"close",e)):(t.btnEl=e.target,this.openCustom(),emitCustomEvent(this,"open",e))},customOpenEvent(e){var t=this.customStore;t.visible&&(t.activeBtn=!0,t.btnEl=e.target,this.openCustom(),emitCustomEvent(this,"open",e))},customCloseEvent(e){var t=this.customStore;t.visible&&(t.activeBtn=!1,this.closeCustom(),emitCustomEvent(this,"close",e))},handleUpdateCustomColumn(){var e=this,t=e.customStore,o=this.collectColumn;if(t.visible){let s={},i={},l={};_xeUtils.default.eachTree(o,e=>{var t=e.getKey();e.renderFixed=e.fixed,e.renderVisible=e.visible,e.renderResizeWidth=e.renderWidth,s[t]=e.renderSortNumber,i[t]=e.fixed,l[t]=e.visible}),t.oldSortMaps=s,t.oldFixedMaps=i,t.oldVisibleMaps=l,e.customColumnList=o.slice(0)}}}};
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_util=require("../../src/util");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function calcMaxHeight(e){var t=e.customStore,e=e.$refs.refElem;let s=0;e&&(s=e.clientHeight-28),t.maxHeight=Math.max(88,s)}function emitCustomEvent(e,t,s){(e.$xeGrid||e).dispatchEvent("custom",{type:t},s)}var _default=exports.default={methods:{_openCustom(){let e=this;var{initStore:t,customStore:s}=e;return s.visible=!0,t.custom=!0,e.handleUpdateCustomColumn(),e.checkCustomStatus(),calcMaxHeight(e),e.$nextTick().then(()=>calcMaxHeight(e))},_closeCustom(){var e=this,t=e.customStore,s=e.computeCustomOpts;return t.visible&&(t.visible=!1,s.immediate||e.handleCustom()),e.$nextTick()},_toggleCustom(){var e=this,t=e.customStore;return t.visible?e.closeCustom():e.openCustom()},_saveCustom(){let e=this;var t=e;let{customColumnList:s,aggHandleFields:i,rowGroupList:l}=t,{allowVisible:o,allowSort:r,allowFixed:u,allowResizable:a,allowGroup:n,allowValues:d}=e.computeCustomOpts;return _xeUtils.default.eachTree(s,(e,t,s,i,l)=>{l?e.fixed=l.fixed:(r&&(e.renderSortNumber=t+1),u&&(e.fixed=e.renderFixed)),a&&e.renderVisible&&(!e.children||e.children.length)&&e.renderResizeWidth!==e.renderWidth&&(e.resizeWidth=e.renderResizeWidth,e.renderWidth=e.renderResizeWidth),o&&(e.visible=e.renderVisible),n&&d&&(e.aggFunc=e.renderAggFn)}),t.isCustomStatus=!0,e.saveCustomStore("confirm").then(()=>{n&&d&&e.handlePivotTableAggregateData&&(l.length!==i.length||l.some((e,t)=>e.field!==i[t])?i.length?e.setRowGroups(i):e.clearRowGroups():d&&e.handleUpdateAggData())})},_cancelCustom(){var e=this,{customColumnList:t,customStore:s}=e;let{oldSortMaps:l,oldFixedMaps:o,oldVisibleMaps:r}=s,{allowVisible:u,allowSort:a,allowFixed:n,allowResizable:d}=e.computeCustomOpts;return _xeUtils.default.eachTree(t,e=>{var t=e.getKey(),s=!!r[t],i=o[t]||"";u&&(e.renderVisible=s,e.visible=s),n&&(e.renderFixed=i,e.fixed=i),a&&(e.renderSortNumber=l[t]||0),d&&(e.renderResizeWidth=e.renderWidth)},{children:"children"}),e.$nextTick()},_resetCustom(e){let t=this;var s=t,i=t;let l=s.rowGroupList;var o=i.collectColumn;let r=t.computeCustomOpts.checkMethod,u=Object.assign({visible:!0,resizable:!0===e,fixed:!0===e,sort:!0===e,aggFunc:!0===e},e),a=[];return _xeUtils.default.eachTree(o,e=>{u.resizable&&(e.resizeWidth=0),u.fixed&&(e.fixed=e.defaultFixed),u.sort&&(e.renderSortNumber=e.sortNumber,e.parentId=e.defaultParentId),r&&!r({$table:t,column:e})||(e.visible=e.defaultVisible),u.aggFunc&&(e.aggFunc=e.defaultAggFunc,e.renderAggFn=e.defaultAggFunc),e.renderResizeWidth=e.renderWidth,a.push(e)}),u.sort&&(e=_xeUtils.default.toArrayTree(_xeUtils.default.orderBy(a,"renderSortNumber"),{key:"id",parentKey:"parentId",children:"children"}),i.collectColumn=e,i.tableFullColumn=(0,_util.getColumnList)(e)),s.isCustomStatus=!1,t.saveCustomStore("reset"),t.handleCustom().then(()=>{var e;u.aggFunc&&t.handlePivotTableAggregateData&&(((e=t.computeRowGroupFields)||l).length?e&&e.length?t.setRowGroups(e):t.clearRowGroups():t.handleUpdateAggData())})},_toggleCustomAllCheckbox(){var e=this.customStore,e=!e.isAll;return this.setCustomAllCheckbox(e)},_setCustomAllCheckbox(e){let t=this;var s=t,i=s.customStore,l=s.customColumnList,o=t.computeCustomOpts;let{checkMethod:r,visibleMethod:u}=o,a=!!e;o.immediate?(_xeUtils.default.eachTree(l,e=>{u&&!u({$table:t,column:e})||r&&!r({$table:t,column:e})||(e.visible=a,e.renderVisible=a,e.halfVisible=!1)}),i.isAll=a,s.isCustomStatus=!0,t.handleCustom(),t.saveCustomStore("update:visible")):(_xeUtils.default.eachTree(l,e=>{u&&!u({$table:t,column:e})||r&&!r({$table:t,column:e})||(e.renderVisible=a,e.halfVisible=!1)}),i.isAll=a),t.checkCustomStatus()},checkCustomStatus(){let t=this;var e=t.customStore,s=t.collectColumn;let i=t.computeCustomOpts.checkMethod;e.isAll=s.every(e=>!!i&&!i({$table:t,column:e})||e.renderVisible),e.isIndeterminate=!e.isAll&&s.some(e=>(!i||i({$table:t,column:e}))&&(e.renderVisible||e.halfVisible))},emitCustomEvent(e,t){(this.$xeGrid||this).dispatchEvent("custom",{type:e},t)},triggerCustomEvent(e){var t=this.customStore;t.visible?(this.closeCustom(),emitCustomEvent(this,"close",e)):(t.btnEl=e.target,this.openCustom(),emitCustomEvent(this,"open",e))},customOpenEvent(e){var t=this.customStore;t.visible&&(t.activeBtn=!0,t.btnEl=e.target,this.openCustom(),emitCustomEvent(this,"open",e))},customCloseEvent(e){var t=this.customStore;t.visible&&(t.activeBtn=!1,this.closeCustom(),emitCustomEvent(this,"close",e))},handleUpdateCustomColumn(){var e=this,t=e.customStore,o=this.collectColumn;if(t.visible){let s={},i={},l={};_xeUtils.default.eachTree(o,e=>{var t=e.getKey();e.renderFixed=e.fixed,e.renderVisible=e.visible,e.renderResizeWidth=e.renderWidth,s[t]=e.renderSortNumber,i[t]=e.fixed,l[t]=e.visible}),t.oldSortMaps=s,t.oldFixedMaps=i,t.oldVisibleMaps=l,e.customColumnList=o.slice(0)}}}};

package/lib/table/src/columnInfo.js

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

package/lib/table/src/columnInfo.min.js

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),exports.ColumnInfo=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_ui=require("../../ui"),_util=require("./util"),_utils=require("../../ui/src/utils"),_log=require("../../ui/src/log");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let{getI18n,formats}=_ui.VxeUI;class ColumnInfo{constructor(e,r,{renderHeader:t,renderCell:o,renderFooter:l,renderData:i}={}){var d=e,n=e.$xeGrid,{field:s,editRender:a}=r,u=n?n.computeProxyOpts:null,f=r.formatter,g=!_xeUtils.default.isBoolean(r.visible)||r.visible,c=["seq","checkbox","radio","expand","html"];r.type&&-1===c.indexOf(r.type)&&(0,_log.warnLog)("vxe.error.errProp",["type="+r.type,c.join(", ")]),(_xeUtils.default.isBoolean(r.cellRender)||r.cellRender&&!_xeUtils.default.isObject(r.cellRender))&&(0,_log.warnLog)("vxe.error.errProp",["column.cell-render="+r.cellRender,"column.cell-render={}"]),(_xeUtils.default.isBoolean(r.editRender)||r.editRender&&!_xeUtils.default.isObject(r.editRender))&&(0,_log.warnLog)("vxe.error.errProp",["column.edit-render="+r.editRender,"column.edit-render={}"]),"expand"===r.type&&(c=d.treeConfig,c)&&(e.treeOpts.showLine||e.treeOpts.line)&&(0,_log.errLog)("vxe.error.errConflicts",["tree-config.line","column.type=expand"]),r.remoteSort&&(0,_log.warnLog)("vxe.error.delProp",["column.remote-sort","sort-config.remote"]),r.sortMethod&&(0,_log.warnLog)("vxe.error.delProp",["column.sort-method","sort-config.sortMethod"]),f&&(_xeUtils.default.isString(f)?(d=formats.get(f)||_xeUtils.default[f])&&_xeUtils.default.isFunction(d.tableCellFormatMethod||d.cellFormatMethod)||(0,_log.errLog)("vxe.error.notFormats",[f]):!_xeUtils.default.isArray(f)||(c=formats.get(f[0])||_xeUtils.default[f[0]])&&_xeUtils.default.isFunction(c.tableCellFormatMethod||c.cellFormatMethod)||(0,_log.errLog)("vxe.error.notFormats",[f[0]])),r.aggFunc&&!e.handlePivotTableAggregateData&&!0!==r.aggFunc&&(0,_log.errLog)("vxe.error.errProp",["column.agg-func="+r.aggFunc,"column.agg-func=true"]),s&&a&&(a.startField&&0<=(""+a.startField).indexOf(s)&&(0,_log.errLog)("vxe.error.modelConflicts",["field="+s,"edit-render.startField="+a.startField]),a.endField)&&0<=(""+a.endField).indexOf(s)&&(0,_log.errLog)("vxe.error.modelConflicts",["field="+s,"edit-render.endField="+a.endField]),Object.assign(this,{type:r.type,property:r.field,field:s,title:r.title,width:r.width,minWidth:r.minWidth,maxWidth:r.maxWidth,resizable:r.resizable,fixed:r.fixed,align:r.align,headerAlign:r.headerAlign,footerAlign:r.footerAlign,showOverflow:r.showOverflow,showHeaderOverflow:r.showHeaderOverflow,showFooterOverflow:r.showFooterOverflow,className:r.className,headerClassName:r.headerClassName,footerClassName:r.footerClassName,formatter:f,footerFormatter:r.footerFormatter,padding:r.padding,verticalAlign:r.verticalAlign,sortable:r.sortable,sortBy:r.sortBy,sortType:r.sortType,sortMethod:r.sortMethod,remoteSort:r.remoteSort,filters:(0,_util.toFilters)(r.filters),filterMultiple:!_xeUtils.default.isBoolean(r.filterMultiple)||r.filterMultiple,filterMethod:r.filterMethod,filterResetMethod:r.filterResetMethod,filterRecoverMethod:r.filterRecoverMethod,filterRender:r.filterRender,rowGroupNode:r.rowGroupNode,treeNode:r.treeNode,dragSort:r.dragSort,rowResize:r.rowResize,cellType:r.cellType,cellRender:r.cellRender,editRender:a,contentRender:r.contentRender,headerExportMethod:r.headerExportMethod,exportMethod:r.exportMethod,footerExportMethod:r.footerExportMethod,titleHelp:r.titleHelp,titlePrefix:r.titlePrefix,titleSuffix:r.titleSuffix,aggFunc:r.aggFunc,params:r.params,id:r.colId||_xeUtils.default.uniqueId("col_"),parentId:null,visible:g,halfVisible:!1,defaultVisible:g,defaultFixed:r.fixed,defaultAggFunc:r.aggFunc,checked:!1,halfChecked:!1,disabled:!1,level:1,rowSpan:1,colSpan:1,order:null,sortTime:0,sortNumber:0,renderSortNumber:0,renderAggFn:"",renderFixed:"",renderVisible:!1,renderWidth:0,renderHeight:0,renderResizeWidth:0,renderAutoWidth:0,resizeWidth:0,renderLeft:0,renderArgs:[],model:{},renderHeader:t||r.renderHeader,renderCell:o||r.renderCell,renderFooter:l||r.renderFooter,renderData:i,slots:r.slots}),u&&u.beforeColumn&&u.beforeColumn({$grid:n,column:this})}getTitle(){return(0,_utils.getFuncText)(this.title||("seq"===this.type?getI18n("vxe.table.seqTitle"):""))}getKey(){var e=this.type;return this.field||(e?"type="+e:null)}update(e,r){"filters"!==e&&("field"===e&&(this.property=r),this[e]=r)}}exports.ColumnInfo=ColumnInfo;
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.ColumnInfo=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_ui=require("../../ui"),_util=require("./util"),_utils=require("../../ui/src/utils"),_log=require("../../ui/src/log");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let{getI18n,formats}=_ui.VxeUI;class ColumnInfo{constructor(e,r,{renderHeader:t,renderCell:o,renderFooter:l,renderData:i}={}){var d=e,n=e.$xeGrid,{field:s,editRender:a}=r,u=n?n.computeProxyOpts:null,f=r.formatter,g=!_xeUtils.default.isBoolean(r.visible)||r.visible,c=["seq","checkbox","radio","expand","html"];r.type&&-1===c.indexOf(r.type)&&(0,_log.warnLog)("vxe.error.errProp",["type="+r.type,c.join(", ")]),(_xeUtils.default.isBoolean(r.cellRender)||r.cellRender&&!_xeUtils.default.isObject(r.cellRender))&&(0,_log.warnLog)("vxe.error.errProp",["column.cell-render="+r.cellRender,"column.cell-render={}"]),(_xeUtils.default.isBoolean(r.editRender)||r.editRender&&!_xeUtils.default.isObject(r.editRender))&&(0,_log.warnLog)("vxe.error.errProp",["column.edit-render="+r.editRender,"column.edit-render={}"]),"expand"===r.type&&(c=d.treeConfig,c)&&(e.treeOpts.showLine||e.treeOpts.line)&&(0,_log.errLog)("vxe.error.errConflicts",["tree-config.line","column.type=expand"]),r.remoteSort&&(0,_log.warnLog)("vxe.error.delProp",["column.remote-sort","sort-config.remote"]),r.sortMethod&&(0,_log.warnLog)("vxe.error.delProp",["column.sort-method","sort-config.sortMethod"]),f&&(_xeUtils.default.isString(f)?(d=formats.get(f)||_xeUtils.default[f])&&_xeUtils.default.isFunction(d.tableCellFormatMethod||d.cellFormatMethod)||(0,_log.errLog)("vxe.error.notFormats",[f]):!_xeUtils.default.isArray(f)||(c=formats.get(f[0])||_xeUtils.default[f[0]])&&_xeUtils.default.isFunction(c.tableCellFormatMethod||c.cellFormatMethod)||(0,_log.errLog)("vxe.error.notFormats",[f[0]])),r.aggFunc&&!e.handlePivotTableAggregateData&&!0!==r.aggFunc&&(0,_log.errLog)("vxe.error.errProp",["column.agg-func="+r.aggFunc,"column.agg-func=true"]),s&&a&&(a.startField&&0<=(""+a.startField).indexOf(s)&&(0,_log.errLog)("vxe.error.modelConflicts",["field="+s,"edit-render.startField="+a.startField]),a.endField)&&0<=(""+a.endField).indexOf(s)&&(0,_log.errLog)("vxe.error.modelConflicts",["field="+s,"edit-render.endField="+a.endField]),Object.assign(this,{type:r.type,property:r.field,field:s,title:r.title,width:r.width,minWidth:r.minWidth,maxWidth:r.maxWidth,resizable:r.resizable,fixed:r.fixed,align:r.align,headerAlign:r.headerAlign,footerAlign:r.footerAlign,showOverflow:r.showOverflow,showHeaderOverflow:r.showHeaderOverflow,showFooterOverflow:r.showFooterOverflow,className:r.className,headerClassName:r.headerClassName,footerClassName:r.footerClassName,formatter:f,footerFormatter:r.footerFormatter,padding:r.padding,verticalAlign:r.verticalAlign,sortable:r.sortable,sortBy:r.sortBy,sortType:r.sortType,sortMethod:r.sortMethod,remoteSort:r.remoteSort,filters:(0,_util.toFilters)(r.filters),filterMultiple:!_xeUtils.default.isBoolean(r.filterMultiple)||r.filterMultiple,filterMethod:r.filterMethod,filterResetMethod:r.filterResetMethod,filterRecoverMethod:r.filterRecoverMethod,filterRender:r.filterRender,rowGroupNode:r.rowGroupNode,treeNode:r.treeNode,dragSort:r.dragSort,rowResize:r.rowResize,cellType:r.cellType,cellRender:r.cellRender,editRender:a,contentRender:r.contentRender,headerExportMethod:r.headerExportMethod,exportMethod:r.exportMethod,footerExportMethod:r.footerExportMethod,titleHelp:r.titleHelp,titlePrefix:r.titlePrefix,titleSuffix:r.titleSuffix,aggFunc:r.aggFunc,params:r.params,id:r.colId||_xeUtils.default.uniqueId("col_"),parentId:null,visible:g,defaultParentId:null,halfVisible:!1,defaultVisible:g,defaultFixed:r.fixed,defaultAggFunc:r.aggFunc,checked:!1,halfChecked:!1,disabled:!1,level:1,rowSpan:1,colSpan:1,order:null,sortTime:0,sortNumber:0,renderSortNumber:0,renderAggFn:"",renderFixed:"",renderVisible:!1,renderWidth:0,renderHeight:0,renderResizeWidth:0,renderAutoWidth:0,resizeWidth:0,renderLeft:0,renderArgs:[],model:{},renderHeader:t||r.renderHeader,renderCell:o||r.renderCell,renderFooter:l||r.renderFooter,renderData:i,slots:r.slots}),u&&u.beforeColumn&&u.beforeColumn({$grid:n,column:this})}getTitle(){return(0,_utils.getFuncText)(this.title||("seq"===this.type?getI18n("vxe.table.seqTitle"):""))}getKey(){var e=this.type;return this.field||(e?"type="+e:null)}update(e,r){"filters"!==e&&("field"===e&&(this.property=r),this[e]=r)}}exports.ColumnInfo=ColumnInfo;

package/lib/table/src/methods.js

@@ -151,18 +151,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 (!_xeUtils.default.isArray(sortData)) {
+        const sortRests = [];
+        _xeUtils.default.each(sortData, (index, colKey) => {
+          sortRests.push({
+            key: colKey,
+            index
+          });
+        });
+        sortData = _xeUtils.default.orderBy(sortRests, {
+          field: 'index',
+          order: 'asc'
+        }).map(item => ({
+          k: item.key
+        }));
+      }
+      let colNum = 1;
+      _xeUtils.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 = [];
     _xeUtils.default.eachTree(collectColumn, (column, index, items, path, parentColumn) => {
       const colKey = column.getKey();
       // 支持一级
@@ -170,10 +200,6 @@ function handleCustomRestore($xeTable, storeData) {
         if (fixedData && fixedData[colKey] !== undefined) {
           column.fixed = fixedData[colKey];
         }
-        if (sortData && _xeUtils.default.isNumber(sortData[colKey])) {
-          hasCustomSort = true;
-          column.renderSortNumber = sortData[colKey];
-        }
       }
       if (resizableData && _xeUtils.default.isNumber(resizableData[colKey])) {
         column.resizeWidth = resizableData[colKey];
@@ -181,12 +207,27 @@ function handleCustomRestore($xeTable, storeData) {
       if (visibleData && _xeUtils.default.isBoolean(visibleData[colKey])) {
         column.visible = visibleData[colKey];
       }
+      colKeyMaps[colKey] = column;
+      allCols.push(column);
     });
     // 如果自定义了顺序
-    if (hasCustomSort) {
-      collectColumn = _xeUtils.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 = _xeUtils.default.toArrayTree(_xeUtils.default.orderBy(allCols, 'renderSortNumber'), {
+        key: 'id',
+        parentKey: 'parentId',
+        children: 'children'
+      });
+      internalData.collectColumn = newCollectCols;
+      internalData.tableFullColumn = (0, _util.getColumnList)(newCollectCols);
     }
     reactData.isCustomStatus = true;
   } else {
@@ -3627,7 +3668,7 @@ function handleUpdateColumn($xeTable) {
   const internalData = $xeTable;
   const columnList = _xeUtils.default.orderBy(internalData.collectColumn, 'renderSortNumber');
   internalData.collectColumn = columnList;
-  const tableFullColumn = getColumnList(columnList);
+  const tableFullColumn = (0, _util.getColumnList)(columnList);
   internalData.tableFullColumn = tableFullColumn;
   cacheColumnMap($xeTable);
 }
@@ -3672,14 +3713,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;
@@ -3818,27 +3851,31 @@ 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.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;
   const expandOpts = $xeTable.computeExpandOpts;
   internalData.collectColumn = collectColumn;
-  const tableFullColumn = getColumnList(collectColumn);
+  const tableFullColumn = (0, _util.getColumnList)(collectColumn);
   internalData.tableFullColumn = tableFullColumn;
   reactData.isColLoading = true;
-  initColumnSort($xeTable);
+  initColumnHierarchy($xeTable);
   return Promise.resolve(restoreCustomStorage($xeTable)).then(() => {
     const {
       scrollXLoad,
@@ -4565,7 +4602,7 @@ const Methods = {
     const collectColumn = _xeUtils.default.mapTree(columns, column => _cell.default.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;
@@ -4590,9 +4627,9 @@ const Methods = {
       return this.loadColumn(columns);
     });
   },
-  handleColumn(collectColumn) {
+  handleInitColumn(collectColumn) {
     const $xeTable = this;
-    return handleColumn($xeTable, collectColumn);
+    return handleInitColumn($xeTable, collectColumn);
   },
   /**
    * 更新数据行的 Map
@@ -5949,7 +5986,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 = {};
@@ -5971,18 +6008,39 @@ const Methods = {
     let hasFixed = 0;
     let hasVisible = 0;
     let hasAggFunc = 0;
+    const sortMaps = {};
     _xeUtils.default.eachTree(collectColumn, (column, index, items, path, parentColumn) => {
       const colKey = column.getKey();
       if (!colKey) {
         (0, _log.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;