vxe-table 3.21.22 → 3.21.24

package/lib/index.umd.js

@@ -3311,7 +3311,7 @@ function getClass(property, params) {
 /* unused harmony import specifier */ var VxeUI;
 
 
-const version = "3.21.22";
+const version = "3.21.24";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -3423,6 +3423,7 @@ core_.VxeUI.setConfig({
       allowResizable: true,
       allowFixed: true,
       allowSort: true,
+      allowAlign: true,
       showSortDragButton: true,
       showFooter: true,
       placement: 'top-right',
@@ -3431,9 +3432,11 @@ core_.VxeUI.setConfig({
         visible: true,
         resizable: true,
         sort: true,
-        fixed: true
-        // rowGroup: false,
-        // aggFunc: false
+        fixed: true,
+        align: true,
+        headerAlign: true,
+        footerAlign: true,
+        aggFunc: true
       },
       // autoAggGroupValues: false,
       //  checkMethod () {},
@@ -3656,6 +3659,15 @@ core_.VxeUI.setIcon({
   TABLE_RADIO_UNCHECKED: iconPrefix + 'radio-unchecked',
   TABLE_RADIO_DISABLED_UNCHECKED: iconPrefix + 'radio-unchecked-fill',
   TABLE_CUSTOM_SORT: iconPrefix + 'drag-handle',
+  TABLE_CUSTOM_FIXED_LEFT: iconPrefix + 'fixed-left',
+  TABLE_CUSTOM_FIXED_RIGHT: iconPrefix + 'fixed-right',
+  TABLE_CUSTOM_ALIGN_LEFT: iconPrefix + 'align-left',
+  TABLE_CUSTOM_ALIGN_CENTER: iconPrefix + 'align-center',
+  TABLE_CUSTOM_ALIGN_RIGHT: iconPrefix + 'align-right',
+  TABLE_CUSTOM_MOVE_UP: iconPrefix + 'arrows-up',
+  TABLE_CUSTOM_MOVE_DN: iconPrefix + 'arrows-down',
+  TABLE_CUSTOM_PUT_TOP: iconPrefix + 'top',
+  TABLE_CUSTOM_PUT_BOTTOM: iconPrefix + 'bottom',
   TABLE_MENU_OPTIONS: iconPrefix + 'arrow-right',
   TABLE_MENU_OPTION_LOADING: iconPrefix + 'repeat roll',
   TABLE_DRAG_ROW: iconPrefix + 'drag-handle',
@@ -4074,7 +4086,7 @@ function wheelScrollTopTo(diffNum, cb) {
 const {
   log: log_log
 } = core_.VxeUI;
-const tableVersion = `table v${"3.21.22"}`;
+const tableVersion = `table v${"3.21.24"}`;
 function createComponentLog(name) {
   const uiVersion = core_.VxeUI.uiVersion ? `ui v${core_.VxeUI.uiVersion}` : '';
   const ganttVersion = core_.VxeUI.ganttVersion ? `gantt v${core_.VxeUI.ganttVersion}` : '';
@@ -4120,6 +4132,10 @@ class ColumnInfo {
       field,
       width,
       visible,
+      fixed,
+      align,
+      headerAlign,
+      footerAlign,
       aggFunc,
       formatter,
       filterMultiple,
@@ -4196,10 +4212,10 @@ class ColumnInfo {
       minWidth: colConfs.minWidth,
       maxWidth: colConfs.maxWidth,
       resizable: colConfs.resizable,
-      fixed: colConfs.fixed,
-      align: colConfs.align,
-      headerAlign: colConfs.headerAlign,
-      footerAlign: colConfs.footerAlign,
+      fixed,
+      align,
+      headerAlign,
+      footerAlign,
       showOverflow: colConfs.showOverflow,
       showHeaderOverflow: colConfs.showHeaderOverflow,
       showFooterOverflow: colConfs.showFooterOverflow,
@@ -4240,7 +4256,7 @@ class ColumnInfo {
       titleHelp: colConfs.titleHelp,
       titlePrefix: colConfs.titlePrefix,
       titleSuffix: colConfs.titleSuffix,
-      aggFunc: colConfs.aggFunc,
+      aggFunc,
       copyMethod: colConfs.copyMethod,
       cutMethod: colConfs.cutMethod,
       pasteMethod: colConfs.pasteMethod,
@@ -4254,7 +4270,10 @@ class ColumnInfo {
       defaultParentId: null,
       halfVisible: false,
       defaultVisible: defaultVisible,
-      defaultFixed: colConfs.fixed,
+      defaultFixed: fixed,
+      defaultAlign: align,
+      defaultHeaderAlign: headerAlign,
+      defaultFooterAlign: footerAlign,
       defaultAggFunc: colConfs.aggFunc,
       checked: false,
       halfChecked: false,
@@ -4278,6 +4297,9 @@ class ColumnInfo {
       renderAggFn: '',
       renderAggDigits: null,
       renderAggFormat: null,
+      renderAlign: '',
+      renderHeaderAlign: '',
+      renderFooterAlign: '',
       renderFixed: '',
       renderVisible: false,
       renderWidth: defaultRenderWidth,
@@ -4566,7 +4588,8 @@ function createReactData() {
       activeWrapper: false,
       visible: false,
       maxHeight: null,
-      popupStyle: {},
+      defPopupStyle: {},
+      panePopupStyle: {},
       oldSortMaps: {},
       oldFixedMaps: {},
       oldVisibleMaps: {}
@@ -5417,6 +5440,38 @@ function colToVisible($xeTable, isForce, column, row) {
   }
   return Promise.resolve();
 }
+function hangleBolleanDefaultValue(currVal, defVal) {
+  return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(currVal) ? currVal : defVal;
+}
+function handleCustomStoreConfig($xeTable) {
+  const customOpts = $xeTable.computeCustomOpts;
+  const {
+    storage,
+    storeOptions
+  } = customOpts;
+  const isAllCustom = storage === true;
+  const storageOpts = Object.assign({}, isAllCustom ? {} : storage || {}, storeOptions);
+  const isCustomAlign = hangleBolleanDefaultValue(storageOpts.align, isAllCustom);
+  const isCustomHeaderAlign = hangleBolleanDefaultValue(storageOpts.headerAlign, isAllCustom);
+  const isCustomFooterAlign = hangleBolleanDefaultValue(storageOpts.footerAlign, isAllCustom);
+  const isCustomResizable = hangleBolleanDefaultValue(storageOpts.resizable, isAllCustom);
+  const isCustomVisible = hangleBolleanDefaultValue(storageOpts.visible, isAllCustom);
+  const isCustomFixed = hangleBolleanDefaultValue(storageOpts.fixed, isAllCustom);
+  const isCustomSort = hangleBolleanDefaultValue(storageOpts.sort, isAllCustom);
+  const isCustomAggGroup = hangleBolleanDefaultValue(storageOpts.aggGroup, isAllCustom);
+  const isCustomAggFunc = hangleBolleanDefaultValue(storageOpts.aggFunc, isAllCustom);
+  return {
+    isCustomAlign,
+    isCustomHeaderAlign,
+    isCustomFooterAlign,
+    isCustomResizable,
+    isCustomVisible,
+    isCustomFixed,
+    isCustomSort,
+    isCustomAggGroup,
+    isCustomAggFunc
+  };
+}
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.iterator.every.js
 var es_iterator_every = __webpack_require__(1148);
 ;// ./packages/ui/src/vn.ts
@@ -6152,6 +6207,7 @@ const Cell = {
       indent,
       lazy,
       trigger,
+      visibleMethod,
       iconLoaded,
       showIcon,
       iconOpen,
@@ -6192,7 +6248,7 @@ const Cell = {
       style: padding && indent ? {
         paddingLeft: `${level * indent}px`
       } : undefined
-    }, [showIcon && (lazy ? isLazyLoaded ? hasChild : hasChild || hasLazyChilds : hasChild) ? [h('div', {
+    }, [showIcon && (lazy ? isLazyLoaded ? hasChild : hasChild || hasLazyChilds : hasChild) && (!visibleMethod || visibleMethod(params)) ? [h('div', {
       class: 'vxe-cell--tree-btn',
       on: ons
     }, [h('i', {
@@ -7726,13 +7782,13 @@ function getCrossTableDragRowInfo($xeTable) {
   return crossTableDragRowInfo;
 }
 ;// ./packages/table/src/methods.ts
-const{warnLog: methods_warnLog,errLog: methods_errLog}=createComponentLog('table');const{getConfig: methods_getConfig,getI18n: methods_getI18n,renderer: methods_renderer,formats: methods_formats,interceptor: methods_interceptor,createEvent,globalEvents: methods_globalEvents,GLOBAL_EVENT_KEYS}=core_.VxeUI;const supportMaxRow=5e6;const customStorageKey='VXE_CUSTOM_STORE';const maxYHeight=5e6;const maxXWidth=5e6;const sourceType='table';let crossTableDragRowObj=null;function eqCellValue(newRow,oldRow,field){const val1=external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(newRow,field);const val2=external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(oldRow,field);let result=false;if(eqEmptyValue(val1)&&eqEmptyValue(val2)){result=true;}else if(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(val1)||external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(val1)){result=''+val1===''+val2;}else{result=external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isEqual(val1,val2);}return{newValue:val1,oldValue:val2,result};}function hangleStorageDefaultValue(value,isAll){return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(value)?value:isAll;}function getNextSortOrder($xeTable,column){const sortOpts=$xeTable.computeSortOpts;const{orders=[]}=sortOpts;const currOrder=column.order||null;const oIndex=orders.indexOf(currOrder)+1;return orders[oIndex<orders.length?oIndex:0];}const getCustomStorageMap=id=>{const version=methods_getConfig().version;const rest=external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toStringJSON(localStorage.getItem(customStorageKey)||'');const maps=rest&&rest._v===version?rest:{_v:version};return(id?maps[id]:maps)||{};};const setCustomStorageMap=(id,data)=>{const version=methods_getConfig().version;const maps=getCustomStorageMap();maps[id]=data||undefined;maps._v=version;localStorage.setItem(customStorageKey,external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toJSONString(maps));};const getRecoverRowMaps=($xeTable,keyMaps)=>{const internalData=$xeTable;const{fullAllDataRowIdData}=internalData;const restKeys={};external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(keyMaps,(row,rowid)=>{if(fullAllDataRowIdData[rowid]){restKeys[rowid]=row;}});return restKeys;};function handleReserveRow($xeTable,reserveRowMap){const internalData=$xeTable;const{fullDataRowIdData}=internalData;const reserveList=[];external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(reserveRowMap,(item,rowid)=>{if(fullDataRowIdData[rowid]&&reserveList.indexOf(fullDataRowIdData[rowid].row)===-1){reserveList.push(fullDataRowIdData[rowid].row);}});return reserveList;}function handleVirtualXVisible($xeTable){const reactData=$xeTable;const internalData=$xeTable;const{isScrollXBig,scrollXWidth}=reactData;const{elemStore,visibleColumn,fullColumnIdData}=internalData;const leftFixedWidth=$xeTable.computeLeftFixedWidth;const rightFixedWidth=$xeTable.computeRightFixedWidth;const bodyScrollElem=getRefElem(elemStore['main-body-scroll']);if(bodyScrollElem){const clientWidth=bodyScrollElem.clientWidth;let scrollLeft=bodyScrollElem.scrollLeft;if(isScrollXBig){scrollLeft=Math.ceil((scrollXWidth-clientWidth)*Math.min(1,scrollLeft/(maxXWidth-clientWidth)));}const startLeft=scrollLeft+leftFixedWidth;const endLeft=scrollLeft+clientWidth-rightFixedWidth;let leftIndex=0;let rightIndex=visibleColumn.length;while(leftIndex<rightIndex){const cIndex=Math.floor((leftIndex+rightIndex)/2);const column=visibleColumn[cIndex];const colid=column.id;const colRest=fullColumnIdData[colid]||{};if(colRest.oLeft<=startLeft){leftIndex=cIndex+1;}else{rightIndex=cIndex;}}let visibleSize=0;const toVisibleIndex=leftIndex===visibleColumn.length?leftIndex:Math.max(0,leftIndex<visibleColumn.length?leftIndex-2:0);for(let cIndex=toVisibleIndex,cLen=visibleColumn.length;cIndex<cLen;cIndex++){const column=visibleColumn[cIndex];const colid=column.id;const colRest=fullColumnIdData[colid]||{};visibleSize++;if(colRest.oLeft>endLeft||visibleSize>=60){break;}}return{toVisibleIndex:Math.max(0,toVisibleIndex),visibleSize:Math.max(6,visibleSize)};}return{toVisibleIndex:0,visibleSize:6};}function handleCustomRestore($xeTable,storeData){const props=$xeTable;const reactData=$xeTable;const internalData=$xeTable;const{aggregateConfig,rowGroupConfig}=props;const{collectColumn}=internalData;const customOpts=$xeTable.computeCustomOpts;const{storage,storeOptions}=customOpts;const isAllCustom=storage===true;const storageOpts=Object.assign({},isAllCustom?{}:storage||{},storeOptions);const isCustomResizable=hangleStorageDefaultValue(storageOpts.resizable,isAllCustom);const isCustomVisible=hangleStorageDefaultValue(storageOpts.visible,isAllCustom);const isCustomFixed=hangleStorageDefaultValue(storageOpts.fixed,isAllCustom);const isCustomSort=hangleStorageDefaultValue(storageOpts.sort,isAllCustom);const isCustomAggGroup=hangleStorageDefaultValue(storageOpts.aggGroup,isAllCustom);const isCustomAggFunc=hangleStorageDefaultValue(storageOpts.aggFunc,isAllCustom);let{resizableData,sortData,visibleData,fixedData,aggGroupData,aggFuncData}=storeData;// 处理还原
-if(isCustomResizable&&resizableData||isCustomSort&&sortData||isCustomVisible&&visibleData||isCustomFixed&&fixedData||isCustomAggGroup&&aggGroupData||isCustomAggFunc&&aggFuncData){const sortColMaps={};if(isCustomSort&&sortData){// 转换兼容老版本数据，即将废弃兼容
+const{warnLog: methods_warnLog,errLog: methods_errLog}=createComponentLog('table');const{getConfig: methods_getConfig,getI18n: methods_getI18n,renderer: methods_renderer,formats: methods_formats,interceptor: methods_interceptor,createEvent,globalEvents: methods_globalEvents,GLOBAL_EVENT_KEYS}=core_.VxeUI;const supportMaxRow=5e6;const customStorageKey='VXE_CUSTOM_STORE';const maxYHeight=5e6;const maxXWidth=5e6;const sourceType='table';let crossTableDragRowObj=null;function eqCellValue(newRow,oldRow,field){const val1=external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(newRow,field);const val2=external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(oldRow,field);let result=false;if(eqEmptyValue(val1)&&eqEmptyValue(val2)){result=true;}else if(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(val1)||external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(val1)){result=''+val1===''+val2;}else{result=external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isEqual(val1,val2);}return{newValue:val1,oldValue:val2,result};}function getNextSortOrder($xeTable,column){const sortOpts=$xeTable.computeSortOpts;const{orders=[]}=sortOpts;const currOrder=column.order||null;const oIndex=orders.indexOf(currOrder)+1;return orders[oIndex<orders.length?oIndex:0];}const getCustomStorageMap=id=>{const version=methods_getConfig().version;const rest=external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toStringJSON(localStorage.getItem(customStorageKey)||'');const maps=rest&&rest._v===version?rest:{_v:version};return(id?maps[id]:maps)||{};};const setCustomStorageMap=(id,data)=>{const version=methods_getConfig().version;const maps=getCustomStorageMap();maps[id]=data||undefined;maps._v=version;localStorage.setItem(customStorageKey,external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toJSONString(maps));};const getRecoverRowMaps=($xeTable,keyMaps)=>{const internalData=$xeTable;const{fullAllDataRowIdData}=internalData;const restKeys={};external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(keyMaps,(row,rowid)=>{if(fullAllDataRowIdData[rowid]){restKeys[rowid]=row;}});return restKeys;};function handleReserveRow($xeTable,reserveRowMap){const internalData=$xeTable;const{fullDataRowIdData}=internalData;const reserveList=[];external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(reserveRowMap,(item,rowid)=>{if(fullDataRowIdData[rowid]&&reserveList.indexOf(fullDataRowIdData[rowid].row)===-1){reserveList.push(fullDataRowIdData[rowid].row);}});return reserveList;}function handleVirtualXVisible($xeTable){const reactData=$xeTable;const internalData=$xeTable;const{isScrollXBig,scrollXWidth}=reactData;const{elemStore,visibleColumn,fullColumnIdData}=internalData;const leftFixedWidth=$xeTable.computeLeftFixedWidth;const rightFixedWidth=$xeTable.computeRightFixedWidth;const bodyScrollElem=getRefElem(elemStore['main-body-scroll']);if(bodyScrollElem){const clientWidth=bodyScrollElem.clientWidth;let scrollLeft=bodyScrollElem.scrollLeft;if(isScrollXBig){scrollLeft=Math.ceil((scrollXWidth-clientWidth)*Math.min(1,scrollLeft/(maxXWidth-clientWidth)));}const startLeft=scrollLeft+leftFixedWidth;const endLeft=scrollLeft+clientWidth-rightFixedWidth;let leftIndex=0;let rightIndex=visibleColumn.length;while(leftIndex<rightIndex){const cIndex=Math.floor((leftIndex+rightIndex)/2);const column=visibleColumn[cIndex];const colid=column.id;const colRest=fullColumnIdData[colid]||{};if(colRest.oLeft<=startLeft){leftIndex=cIndex+1;}else{rightIndex=cIndex;}}let visibleSize=0;const toVisibleIndex=leftIndex===visibleColumn.length?leftIndex:Math.max(0,leftIndex<visibleColumn.length?leftIndex-2:0);for(let cIndex=toVisibleIndex,cLen=visibleColumn.length;cIndex<cLen;cIndex++){const column=visibleColumn[cIndex];const colid=column.id;const colRest=fullColumnIdData[colid]||{};visibleSize++;if(colRest.oLeft>endLeft||visibleSize>=60){break;}}return{toVisibleIndex:Math.max(0,toVisibleIndex),visibleSize:Math.max(6,visibleSize)};}return{toVisibleIndex:0,visibleSize:6};}function handleCustomRestore($xeTable,storeData){const props=$xeTable;const reactData=$xeTable;const internalData=$xeTable;const{aggregateConfig,rowGroupConfig}=props;const{collectColumn}=internalData;const{isCustomAlign,isCustomHeaderAlign,isCustomFooterAlign,isCustomResizable,isCustomVisible,isCustomFixed,isCustomSort,isCustomAggGroup,isCustomAggFunc}=handleCustomStoreConfig($xeTable);let{alignData,headerAlignData,footerAlignData,resizableData,sortData,visibleData,fixedData,aggGroupData,aggFuncData}=storeData;// 处理还原
+if(isCustomAlign&&alignData||isCustomHeaderAlign&&headerAlignData||isCustomFooterAlign&&footerAlignData||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(isCustomFixed&&fixedData&&fixedData[colKey]!==undefined){column.fixed=fixedData[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(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(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.updateColFlag++;}reactData.isCustomStatus=true;}else{reactData.isCustomStatus=false;}}/**
  * 还原自定义列操作状态
- */function restoreCustomStorage($xeTable){const props=$xeTable;const{customConfig}=props;const tableId=$xeTable.computeTableId;const customOpts=$xeTable.computeCustomOpts;const{storage,restoreStore,storeOptions}=customOpts;const isAllCustom=storage===true;const storageOpts=Object.assign({},isAllCustom?{}: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 isCustomAggFunc=hangleStorageDefaultValue(storageOpts.aggFunc,isAllCustom);if(storage&&(customConfig?isEnableConf(customOpts):customOpts.enabled)&&(isCustomResizable||isCustomVisible||isCustomFixed||isCustomSort||isCustomAggFunc)){if(!tableId){methods_errLog('vxe.error.reqProp',['id']);return;}const storeData=getCustomStorageMap(tableId);if(restoreStore){return Promise.resolve(restoreStore({$table:$xeTable,id:tableId,type:'restore',storeData})).then(storeData=>{if(!storeData){return;}return handleCustomRestore($xeTable,storeData);}).catch(e=>e);}else{return handleCustomRestore($xeTable,storeData);}}}/**
+ */function restoreCustomStorage($xeTable){const props=$xeTable;const{customConfig}=props;const tableId=$xeTable.computeTableId;const customOpts=$xeTable.computeCustomOpts;const{storage,restoreStore}=customOpts;const{isCustomAlign,isCustomHeaderAlign,isCustomFooterAlign,isCustomResizable,isCustomVisible,isCustomFixed,isCustomSort,isCustomAggGroup,isCustomAggFunc}=handleCustomStoreConfig($xeTable);if(storage&&(customConfig?isEnableConf(customOpts):customOpts.enabled)&&(isCustomAlign||isCustomHeaderAlign||isCustomFooterAlign||isCustomResizable||isCustomVisible||isCustomFixed||isCustomSort||isCustomAggGroup||isCustomAggFunc)){if(!tableId){methods_errLog('vxe.error.reqProp',['id']);return;}const storeData=getCustomStorageMap(tableId);if(restoreStore){return Promise.resolve(restoreStore({$table:$xeTable,id:tableId,type:'restore',storeData})).then(storeData=>{if(!storeData){return;}return handleCustomRestore($xeTable,storeData);}).catch(e=>e);}else{return handleCustomRestore($xeTable,storeData);}}}/**
  * 更新数据列的 Map
  * 牺牲数据组装的耗时，用来换取使用过程中的流畅
  */function cacheColumnMap($xeTable){const props=$xeTable;const reactData=$xeTable;const internalData=$xeTable;const{treeConfig,showOverflow}=props;const{tableFullColumn,collectColumn}=internalData;const fullColIdData=internalData.fullColumnIdData={};const fullColFieldData=internalData.fullColumnFieldData={};const mouseOpts=$xeTable.computeMouseOpts;const expandOpts=$xeTable.computeExpandOpts;const columnOpts=$xeTable.computeColumnOpts;const columnDragOpts=$xeTable.computeColumnDragOpts;const virtualYOpts=$xeTable.computeVirtualYOpts;const{isCrossDrag,isSelfToChildDrag}=columnDragOpts;const customOpts=$xeTable.computeCustomOpts;const treeOpts=$xeTable.computeTreeOpts;const{storage}=customOpts;const rowOpts=$xeTable.computeRowOpts;const isGroup=collectColumn.some(hasChildrenList);let isAllOverflow=!!showOverflow;let rowGroupColumn;let expandColumn;let treeNodeColumn;let checkboxColumn;let radioColumn;let htmlColumn;let hasFixed;const handleFunc=(column,index,items,path,parentColumn)=>{const{id:colid,field,fixed,type,treeNode,rowGroupNode}=column;const rest={$index:-1,_index:-1,column,colid,index,items,parent:parentColumn||null,width:0,oLeft:0};if(field){if(fullColFieldData[field]){methods_errLog('vxe.error.colRepet',['field',field]);}fullColFieldData[field]=rest;}else{if(storage&&!type){methods_errLog('vxe.error.reqSupportProp',['storage',`[${type?`type=${type}`:`title=${column.getTitle()}`}]field=?`]);}if(columnOpts.drag&&(isCrossDrag||isSelfToChildDrag)){methods_errLog('vxe.error.reqSupportProp',['column-drag-config.isCrossDrag | column-drag-config.isSelfToChildDrag',`${column.getTitle()||type||''} -> field=?`]);}}if(!hasFixed&&fixed){hasFixed=fixed;}if(!htmlColumn&&type==='html'){htmlColumn=column;}if(treeNode){if(treeNodeColumn){methods_warnLog('vxe.error.colRepet',['tree-node',treeNode]);}if(!treeNodeColumn){treeNodeColumn=column;}}if(rowGroupNode){if(treeNodeColumn){methods_warnLog('vxe.error.colRepet',['row-group-node',rowGroupNode]);}if(!rowGroupColumn){rowGroupColumn=column;}}if(type==='expand'){if(expandColumn){methods_warnLog('vxe.error.colRepet',['type',type]);}if(!expandColumn){expandColumn=column;}}if(type==='checkbox'){if(checkboxColumn){methods_warnLog('vxe.error.colRepet',['type',type]);}if(!checkboxColumn){checkboxColumn=column;}}else if(type==='radio'){if(radioColumn){methods_warnLog('vxe.error.colRepet',['type',type]);}if(!radioColumn){radioColumn=column;}}if(isAllOverflow&&column.showOverflow===false){isAllOverflow=false;}if(fullColIdData[colid]){methods_errLog('vxe.error.colRepet',['colId',colid]);}fullColIdData[colid]=rest;};if(isGroup){external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(collectColumn,(column,index,items,path,parentColumn,nodes)=>{column.level=nodes.length;handleFunc(column,index,items,path,parentColumn);});}else{tableFullColumn.forEach(handleFunc);}if(expandColumn){if(expandOpts.mode!=='fixed'&&virtualYOpts.enabled){methods_warnLog('vxe.error.notConflictProp',['column.type="expand','virtual-y-config.enabled=false']);}if(expandOpts.mode!=='fixed'&&mouseOpts.area){methods_errLog('vxe.error.errConflicts',['mouse-config.area','column.type=expand']);}if(expandOpts.mode!=='inside'&&treeConfig&&!treeOpts.transform){methods_errLog('vxe.error.notConflictProp',['tree-config.transform=false','expand-config.mode=inside']);}// if (props.spanMethod) {
@@ -7745,7 +7801,7 @@ let scrollYLoad=!!virtualYOpts.enabled&&virtualYOpts.gt>-1&&(virtualYOpts.gt===0
  * @param rows
  * @param expanded
  * @returns
- */function handleBaseTreeExpand($xeTable,rows,expanded){const reactData=$xeTable;const internalData=$xeTable;const{treeNodeColumn}=reactData;const{fullAllDataRowIdData,tableFullTreeData,treeExpandedMaps,treeExpandLazyLoadedMaps}=internalData;const treeOpts=$xeTable.computeTreeOpts;const{reserve,lazy,accordion,toggleMethod}=treeOpts;const childrenField=treeOpts.children||treeOpts.childrenField;const hasChildField=treeOpts.hasChild||treeOpts.hasChildField;const result=[];const columnIndex=$xeTable.getColumnIndex(treeNodeColumn);const $columnIndex=$xeTable.getVMColumnIndex(treeNodeColumn);const{handleGetRowId}=createHandleGetRowId($xeTable);let validRows=toggleMethod?rows.filter(row=>toggleMethod({$table:$xeTable,expanded,column:treeNodeColumn,columnIndex,$columnIndex,row})):rows;if(accordion){validRows=validRows.length?[validRows[validRows.length-1]]:[];// 同一级只能展开一个
+ */function handleBaseTreeExpand($xeTable,rows,expanded){const reactData=$xeTable;const internalData=$xeTable;const{treeNodeColumn}=reactData;const{fullAllDataRowIdData,tableFullTreeData,treeExpandedMaps,treeExpandLazyLoadedMaps}=internalData;const treeOpts=$xeTable.computeTreeOpts;const{reserve,lazy,accordion,toggleMethod}=treeOpts;const childrenField=treeOpts.children||treeOpts.childrenField;const hasChildField=treeOpts.hasChild||treeOpts.hasChildField;const result=[];const columnIndex=$xeTable.getColumnIndex(treeNodeColumn);const $columnIndex=$xeTable.getVMColumnIndex(treeNodeColumn);const _columnIndex=$xeTable.getVTColumnIndex(treeNodeColumn);const{handleGetRowId}=createHandleGetRowId($xeTable);let validRows=toggleMethod?rows.filter(row=>toggleMethod({$table:$xeTable,expanded,column:treeNodeColumn,columnIndex,$columnIndex,_columnIndex,row})):rows;if(accordion){validRows=validRows.length?[validRows[validRows.length-1]]:[];// 同一级只能展开一个
 const matchObj=external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findTree(tableFullTreeData,item=>item===validRows[0],{children:childrenField});if(matchObj){matchObj.items.forEach(item=>{const rowid=handleGetRowId(item);if(treeExpandedMaps[rowid]){delete treeExpandedMaps[rowid];}});}}if(expanded){validRows.forEach(row=>{const rowid=handleGetRowId(row);if(!treeExpandedMaps[rowid]){const rowRest=fullAllDataRowIdData[rowid];if(rowRest){const isLoad=lazy&&row[hasChildField]&&!rowRest.treeLoaded&&!treeExpandLazyLoadedMaps[rowid];// 是否使用懒加载
 if(isLoad){result.push(handleAsyncTreeExpandChilds($xeTable,row));}else{if(row[childrenField]&&row[childrenField].length){treeExpandedMaps[rowid]=row;}}}}});}else{validRows.forEach(item=>{const rowid=handleGetRowId(item);if(treeExpandedMaps[rowid]){delete treeExpandedMaps[rowid];}});}if(reserve){validRows.forEach(row=>handleTreeExpandReserve($xeTable,row,expanded));}reactData.treeExpandedFlag++;return Promise.all(result).then(()=>{updateTreeLineStyle($xeTable);return $xeTable.recalculate();});}/**
  * 虚拟树的展开与收起
@@ -8177,20 +8233,21 @@ if(!targetColumn.fixed&&isMaxFixedColumn){if(core_.VxeUI.modal){core_.VxeUI.moda
      * @private
      */handleCustom(){const $xeTable=this;const props=$xeTable;const{mouseConfig}=props;if(mouseConfig){if($xeTable.clearSelected){$xeTable.clearSelected();}if($xeTable.clearCellAreas){$xeTable.clearCellAreas();$xeTable.clearCopyCellArea();}}$xeTable.analyColumnWidth();return $xeTable.refreshColumn(true);},/**
      * 还原自定义列操作状态
-     */restoreCustomStorage(){const $xeTable=this;const props=$xeTable;const{customConfig}=props;const tableId=$xeTable.computeTableId;const customOpts=$xeTable.computeCustomOpts;const{storage,restoreStore,storeOptions}=customOpts;const isAllCustom=storage===true;const storageOpts=Object.assign({},isAllCustom?{}:storage||{},storeOptions);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||isCustomAggGroup||isCustomSort)){if(!tableId){methods_errLog('vxe.error.reqProp',['id']);return;}const storeData=getCustomStorageMap(tableId);if(restoreStore){return Promise.resolve(restoreStore({$table:$xeTable,id:tableId,type:'restore',storeData})).then(storeData=>{if(!storeData){return;}return handleCustomRestore($xeTable,storeData);}).catch(e=>e);}else{return handleCustomRestore($xeTable,storeData);}}},/**
+     */restoreCustomStorage(){const $xeTable=this;const props=$xeTable;const{customConfig}=props;const tableId=$xeTable.computeTableId;const customOpts=$xeTable.computeCustomOpts;const{storage,restoreStore}=customOpts;const{isCustomAlign,isCustomHeaderAlign,isCustomFooterAlign,isCustomResizable,isCustomVisible,isCustomFixed,isCustomSort,isCustomAggGroup,isCustomAggFunc}=handleCustomStoreConfig($xeTable);if(storage&&(customConfig?isEnableConf(customOpts):customOpts.enabled)&&(isCustomAlign||isCustomHeaderAlign||isCustomFooterAlign||isCustomResizable||isCustomVisible||isCustomFixed||isCustomSort||isCustomAggGroup||isCustomAggFunc)){if(!tableId){methods_errLog('vxe.error.reqProp',['id']);return;}const storeData=getCustomStorageMap(tableId);if(restoreStore){return Promise.resolve(restoreStore({$table:$xeTable,id:tableId,type:'restore',storeData})).then(storeData=>{if(!storeData){return;}return handleCustomRestore($xeTable,storeData);}).catch(e=>e);}else{return handleCustomRestore($xeTable,storeData);}}},/**
      * 用于 custom-config，用于手动恢复自定义列设置信息，恢复表格重置为初始状态
      * @param storeData
      * @returns
      */setCustomStoreData(storeData){const $xeTable=this;const reactData=$xeTable;const internalData=$xeTable;if(!storeData){return $xeTable.$nextTick();}const customOpts=$xeTable.computeCustomOpts;const{checkMethod}=customOpts;// 重置状态
 clearTableAllStatus($xeTable);// 恢复列
-const allCols=[];external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(internalData.collectColumn,column=>{column.resizeWidth=0;column.fixed=column.defaultFixed;column.renderSortNumber=column.sortNumber;column.parentId=column.defaultParentId;if(!checkMethod||checkMethod({$table:$xeTable,column})){column.visible=column.defaultVisible;}column.aggFunc=column.defaultAggFunc;column.renderAggFn=column.defaultAggFunc;column.renderResizeWidth=column.renderWidth;allCols.push(column);});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.updateColFlag++;reactData.isColLoading=true;initColumnHierarchy($xeTable);return Promise.resolve(handleCustomRestore($xeTable,storeData)).then(()=>{return buildColumnInfo($xeTable);}).then(()=>{// 恢复数据聚合分组
+const allCols=[];external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(internalData.collectColumn,column=>{column.resizeWidth=0;column.fixed=column.defaultFixed;column.renderSortNumber=column.sortNumber;column.parentId=column.defaultParentId;if(!checkMethod||checkMethod({$table:$xeTable,column})){column.visible=column.defaultVisible;}column.align=column.defaultAlign;column.headerAlign=column.defaultHeaderAlign;column.footerAlign=column.defaultFooterAlign;column.aggFunc=column.defaultAggFunc;column.renderAggFn=column.defaultAggFunc;column.renderResizeWidth=column.renderWidth;allCols.push(column);});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.updateColFlag++;reactData.isColLoading=true;initColumnHierarchy($xeTable);return Promise.resolve(handleCustomRestore($xeTable,storeData)).then(()=>{return buildColumnInfo($xeTable);}).then(()=>{// 恢复数据聚合分组
 const{isRowGroupStatus,rowGroupList}=reactData;if(isRowGroupStatus&&!!$xeTable.handlePivotTableAggData){const rowGroupFields=$xeTable.computeRowGroupFields;if(rowGroupFields?rowGroupFields.length:rowGroupList.length){if(rowGroupFields&&rowGroupFields.length){$xeTable.setRowGroups(rowGroupFields);}else{$xeTable.clearRowGroups();}}else{$xeTable.handleUpdateAggData();}}});},/**
      * 用于 custom-config，用于获取自定义列设置信息，用于自定义保持
      * @returns
-     */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{storage,checkMethod,storeOptions}=customOpts;const isAllCustom=storage===true;const storageOpts=Object.assign({},isAllCustom?{}: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);const resizableData={};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){if(storage){methods_errLog('vxe.error.reqProp',['id']);}return storeData;}let hasResizable=0;let hasSort=0;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){methods_errLog('vxe.error.reqProp',[`${column.getTitle()||column.type||''} -> column.field=?`]);return;}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;const sObj={k:colKey};sortMaps[colKey]=sObj;sortData.push(sObj);}// 只支持一级
-if(isCustomFixed&&(column.fixed||'')!==(column.defaultFixed||'')){hasFixed=1;fixedData[colKey]=column.fixed;}}if(isCustomResizable&&column.resizeWidth){hasResizable=1;resizableData[colKey]=column.renderWidth;}if(isCustomVisible&&(!checkMethod||checkMethod({$table:$xeTable,column}))){if(!column.visible&&column.defaultVisible){hasVisible=1;visibleData[colKey]=false;}else if(column.visible&&!column.defaultVisible){hasVisible=1;visibleData[colKey]=true;}}if(isCustomAggFunc&&(column.aggFunc||'')!==(column.defaultAggFunc||'')){hasAggFunc=1;aggFuncData[colKey]=column.aggFunc;}});if(hasResizable){storeData.resizableData=resizableData;}if(hasSort){storeData.sortData=sortData;}if(hasFixed){storeData.fixedData=fixedData;}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;}return storeData;},/**
+     */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{storage,checkMethod}=customOpts;const{isCustomAlign,isCustomHeaderAlign,isCustomFooterAlign,isCustomResizable,isCustomVisible,isCustomFixed,isCustomSort,isCustomAggGroup,isCustomAggFunc}=handleCustomStoreConfig($xeTable);const alignData={};const headerAlignData={};const footerAlignData={};const resizableData={};const sortData=[];const visibleData={};const fixedData={};const aggGroupData={};const aggFuncData={};const storeData={alignData:undefined,headerAlignData:undefined,footerAlignData:undefined,resizableData:undefined,sortData:undefined,visibleData:undefined,fixedData:undefined,aggGroupData:undefined,aggFuncData:undefined};if(!id){if(storage){methods_errLog('vxe.error.reqProp',['id']);}return storeData;}let hasAlign=0;let hasHeaderAlign=0;let hasFooterAlign=0;let hasResizable=0;let hasSort=0;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){methods_errLog('vxe.error.reqProp',[`${column.getTitle()||column.type||''} -> column.field=?`]);return;}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;const sObj={k:colKey};sortMaps[colKey]=sObj;sortData.push(sObj);}// 只支持一级
+if(isCustomFixed&&(column.fixed||'')!==(column.defaultFixed||'')){hasFixed=1;fixedData[colKey]=column.fixed;}}if(isCustomAlign&&column.align){hasAlign=1;alignData[colKey]=column.align;}if(isCustomHeaderAlign&&column.headerAlign){hasHeaderAlign=1;headerAlignData[colKey]=column.headerAlign;}if(isCustomFooterAlign&&column.footerAlign){hasFooterAlign=1;footerAlignData[colKey]=column.footerAlign;}if(isCustomResizable&&column.resizeWidth){hasResizable=1;resizableData[colKey]=column.renderWidth;}if(isCustomVisible&&(!checkMethod||checkMethod({$table:$xeTable,column}))){if(!column.visible&&column.defaultVisible){hasVisible=1;visibleData[colKey]=false;}else if(column.visible&&!column.defaultVisible){hasVisible=1;visibleData[colKey]=true;}}if(isCustomAggFunc&&(column.aggFunc||'')!==(column.defaultAggFunc||'')){hasAggFunc=1;aggFuncData[colKey]=column.aggFunc;}});if(hasAlign){storeData.alignData=alignData;}if(hasHeaderAlign){storeData.headerAlignData=headerAlignData;}if(hasFooterAlign){storeData.footerAlignData=footerAlignData;}if(hasResizable){storeData.resizableData=resizableData;}if(hasSort){storeData.sortData=sortData;}if(hasFixed){storeData.fixedData=fixedData;}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;}return storeData;},/**
      * @private
-     */saveCustomStore(type){const $xeTable=this;const props=$xeTable;const reactData=$xeTable;const{customConfig}=props;const tableId=$xeTable.computeTableId;const customOpts=$xeTable.computeCustomOpts;const{updateStore,storage,storeOptions}=customOpts;const isAllCustom=storage===true;const storageOpts=Object.assign({},isAllCustom?{}: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);if(type!=='reset'){reactData.isCustomStatus=true;}if(storage&&(customConfig?isEnableConf(customOpts):customOpts.enabled)&&(isCustomResizable||isCustomVisible||isCustomFixed||isCustomSort||isCustomAggGroup||isCustomAggFunc)){if(!tableId){methods_errLog('vxe.error.reqProp',['id']);return this.$nextTick();}const storeData=type==='reset'?{resizableData:{},sortData:{},visibleData:{},fixedData:{},aggGroupData:{},aggFuncData:{}}:this.getCustomStoreData();if(updateStore){return updateStore({$table:$xeTable,id:tableId,type,storeData});}else{setCustomStorageMap(tableId,type==='reset'?null:storeData);}}return this.$nextTick();},handleUpdateDataQueue(){this.upDataFlag++;},handleRefreshColumnQueue(){this.reColumnFlag++;},handleFilterOptions(column){const $xeTable=this;const reactData=$xeTable;if(column){const{filterStore}=reactData;const{filterRender,filters}=column;const filterOptions=filters||[];const compConf=isEnableConf(filterRender)?methods_renderer.get(filterRender.name):null;const frMethod=column.filterRecoverMethod||(compConf?compConf.tableFilterRecoverMethod||compConf.filterRecoverMethod:null);filterStore.column=column;// 复原状态
+     */saveCustomStore(type){const $xeTable=this;const props=$xeTable;const reactData=$xeTable;const{customConfig}=props;const tableId=$xeTable.computeTableId;const customOpts=$xeTable.computeCustomOpts;const{updateStore,storage}=customOpts;const{isCustomAlign,isCustomHeaderAlign,isCustomFooterAlign,isCustomResizable,isCustomVisible,isCustomFixed,isCustomSort,isCustomAggGroup,isCustomAggFunc}=handleCustomStoreConfig($xeTable);if(type!=='reset'){// fix：修复拖动列宽，重置按钮无法点击的问题
+reactData.isCustomStatus=true;}if(storage&&(customConfig?isEnableConf(customOpts):customOpts.enabled)&&(isCustomAlign||isCustomHeaderAlign||isCustomFooterAlign||isCustomResizable||isCustomVisible||isCustomFixed||isCustomSort||isCustomAggGroup||isCustomAggFunc)){if(!tableId){methods_errLog('vxe.error.reqProp',['id']);return $xeTable.$nextTick();}const storeData=type==='reset'?{alignData:{},headerAlignData:{},footerAlignData:{},resizableData:{},sortData:[],visibleData:{},fixedData:{},aggGroupData:{},aggFuncData:{}}:$xeTable.getCustomStoreData();if(updateStore){return updateStore({$table:$xeTable,id:tableId,type,storeData});}else{setCustomStorageMap(tableId,type==='reset'?null:storeData);}}return $xeTable.$nextTick();},handleUpdateDataQueue(){const $xeTable=this;const reactData=$xeTable;reactData.upDataFlag++;},handleRefreshColumnQueue(){const $xeTable=this;const reactData=$xeTable;reactData.reColumnFlag++;},handleFilterOptions(column){const $xeTable=this;const reactData=$xeTable;if(column){const{filterStore}=reactData;const{filterRender,filters}=column;const filterOptions=filters||[];const compConf=isEnableConf(filterRender)?methods_renderer.get(filterRender.name):null;const frMethod=column.filterRecoverMethod||(compConf?compConf.tableFilterRecoverMethod||compConf.filterRecoverMethod:null);filterStore.column=column;// 复原状态
 filterOptions.forEach(option=>{const{_checked,checked}=option;option._checked=checked;if(!checked&&_checked!==checked){if(frMethod){frMethod({option,column,$table:$xeTable});}}});$xeTable.checkFilterOptions();}},/**
      * 刷新列配置
      */refreshColumn(initSort){const $xeTable=this;if(initSort){handleUpdateColumn($xeTable);}return parseColumns($xeTable,true).then(()=>{return this.refreshScroll();}).then(()=>{return handleLazyRecalculate($xeTable,false,true,true);});},/**
@@ -11075,6 +11132,25 @@ function panel_hideDropTip($xeTableCustomPanel) {
         }, evnt);
       }
     },
+    changeAlignOption(column, targetAlign, colProperty, renderProperty, eName, evnt) {
+      const $xeTableCustomPanel = this;
+      const $xeTable = $xeTableCustomPanel.$xeTable;
+      const tableReactData = $xeTable;
+      const customOpts = $xeTable.computeCustomOpts;
+      if (customOpts.immediate) {
+        column[colProperty] = targetAlign;
+        column[renderProperty] = targetAlign;
+        tableReactData.isCustomStatus = true;
+        $xeTable.handleCustom();
+        $xeTable.saveCustomStore(`update:${colProperty}`);
+      } else {
+        column[renderProperty] = targetAlign;
+      }
+      $xeTable.dispatchEvent(eName, {
+        column,
+        [colProperty]: targetAlign
+      }, evnt);
+    },
     allOptionEvent(evnt) {
       const $xeTableCustomPanel = this;
       const $xeTable = $xeTableCustomPanel.$xeTable;
@@ -11589,7 +11665,7 @@ function panel_hideDropTip($xeTableCustomPanel) {
       const customOpts = $xeTable.computeCustomOpts;
       const columnDragOpts = $xeTable.computeColumnDragOpts;
       const {
-        popupStyle
+        defPopupStyle
       } = customStore;
       const {
         immediate,
@@ -11765,7 +11841,7 @@ function panel_hideDropTip($xeTableCustomPanel) {
             }
           }) : panel_renderEmptyElement($xeTable)] : []) : panel_renderEmptyElement($xeTable), !parentItem && allowFixed ? h('div', {
             class: 'vxe-table-custom--fixed-option'
-          }, [h(VxeUIButtonComponent, {
+          }, VxeUIButtonComponent ? [h(VxeUIButtonComponent, {
             props: {
               mode: 'text',
               icon: column.renderFixed === 'left' ? panel_getIcon().TOOLBAR_TOOLS_FIXED_LEFT_ACTIVE : panel_getIcon().TOOLBAR_TOOLS_FIXED_LEFT,
@@ -11795,7 +11871,7 @@ function panel_hideDropTip($xeTableCustomPanel) {
                 $xeTableCustomPanel.changeFixedOption(column, 'right', $event);
               }
             }
-          })]) : panel_renderEmptyElement($xeTable)]));
+          })] : []) : panel_renderEmptyElement($xeTable)]));
         }
       });
       return h('div', {
@@ -11805,7 +11881,7 @@ function panel_hideDropTip($xeTableCustomPanel) {
           [`size--${vSize}`]: vSize,
           'is--active': customStore.visible
         }],
-        style: popupStyle
+        style: defPopupStyle
       }, customStore.visible ? [h('div', {
         ref: 'refBodyWrapperElem',
         class: 'vxe-table-custom-simple--body-wrapper'
@@ -11894,48 +11970,33 @@ function panel_hideDropTip($xeTableCustomPanel) {
         }
       })])]) : null]), $xeTableCustomPanel.renderDragTip(h)])] : []);
     },
-    renderPopupPanel(h) {
-      const VxeUIModalComponent = core_.VxeUI.getComponent('VxeModal');
-      const VxeUIDrawerComponent = core_.VxeUI.getComponent('VxeDrawer');
+    renderPopupBodys(h) {
       const VxeUIButtonComponent = core_.VxeUI.getComponent('VxeButton');
       const VxeUINumberInputComponent = core_.VxeUI.getComponent('VxeNumberInput');
+      const VxeUIRadioGroupComponent = core_.VxeUI.getComponent('VxeRadioGroup');
       const $xeTableCustomPanel = this;
-      const props = $xeTableCustomPanel;
       const $xeTable = $xeTableCustomPanel.$xeTable;
       const tableProps = $xeTable;
       const tableReactData = $xeTable;
-      const $xeGrid = $xeTable.$xeGrid;
-      const $xeGantt = $xeTable.$xeGantt;
-      const {
-        customStore
-      } = props;
       const {
-        treeConfig,
-        rowGroupConfig,
-        aggregateConfig,
         resizable: allResizable
       } = tableProps;
       const {
-        isCustomStatus,
         customColumnList
       } = tableReactData;
       const customOpts = $xeTable.computeCustomOpts;
       const columnDragOpts = $xeTable.computeColumnDragOpts;
-      const aggregateOpts = $xeTable.computeAggregateOpts;
       const {
-        placement: aggPlacement
-      } = aggregateOpts;
-      const {
-        mode,
         immediate,
         showSortDragButton,
         showSortMoveButton,
         showSortPutButton,
-        modalOptions,
-        drawerOptions,
         allowVisible,
         allowSort,
         allowFixed,
+        allowAlign,
+        allowHeaderAlign,
+        allowFooterAlign,
         allowResizable,
         allowGroup,
         allowValues,
@@ -11943,40 +12004,17 @@ function panel_hideDropTip($xeTableCustomPanel) {
         visibleMethod
       } = customOpts;
       const columnOpts = $xeTable.computeColumnOpts;
-      const {
-        maxFixedSize
-      } = columnOpts;
       const resizableOpts = $xeTable.computeResizableOpts;
       const {
         minWidth: reMinWidth,
         maxWidth: reMaxWidth
       } = resizableOpts;
-      const modalOpts = Object.assign({}, modalOptions);
-      const drawerOpts = Object.assign({}, drawerOptions);
       const isMaxFixedColumn = $xeTable.computeIsMaxFixedColumn;
       const {
         isCrossDrag,
         isPeerDrag
       } = columnDragOpts;
-      const slots = customOpts.slots || {};
-      const headerSlot = slots.header;
-      const topSlot = slots.top;
-      const bottomSlot = slots.bottom;
-      const defaultSlot = slots.default;
-      const footerSlot = slots.footer;
       const trVNs = [];
-      const isAllChecked = customStore.isAll;
-      const isAllIndeterminate = customStore.isIndeterminate;
-      const isAggRtBmLayout = aggPlacement === 'right' || aggPlacement === 'bottom';
-      const params = {
-        $table: $xeTable,
-        $grid: $xeGrid,
-        $gantt: $xeGantt,
-        columns: customColumnList,
-        isAllChecked,
-        isAllIndeterminate,
-        isCustomStatus
-      };
       external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(customColumnList, (column, index, items, path, parentItem) => {
         const isVisible = visibleMethod ? visibleMethod({
           $table: $xeTable,
@@ -12014,41 +12052,50 @@ function panel_hideDropTip($xeTableCustomPanel) {
           }) : false;
           const isHidden = !isChecked;
           const showSortBtn = (isCrossDrag || isPeerDrag ? immediate : false) || column.level === 1;
-          trVNs.push(h('tr', {
-            key: column.id,
-            attrs: {
-              colid: column.id
-            },
-            class: [`vxe-table-custom-popup--row level--${column.level}`, {
-              'is--group': isColGroup
-            }],
-            on: {
-              dragstart: $xeTableCustomPanel.sortDragstartEvent,
-              dragend: $xeTableCustomPanel.sortDragendEvent,
-              dragover: $xeTableCustomPanel.sortDragoverEvent
-            }
-          }, [allowVisible ? h('td', {
-            class: 'vxe-table-custom-popup--column-item col--visible'
-          }, [h('div', {
-            class: ['vxe-table-custom--checkbox-option', {
-              'is--checked': isChecked,
-              'is--indeterminate': isIndeterminate,
-              'is--disabled': isDisabled
-            }],
-            attrs: {
-              title: panel_getI18n('vxe.custom.setting.colVisible')
-            },
-            on: {
-              click: evnt => {
-                if (!isDisabled) {
-                  $xeTableCustomPanel.changeCheckboxOption(column, evnt);
+          const alignList = [{
+            icon: panel_getIcon().TABLE_CUSTOM_ALIGN_LEFT,
+            value: 'left',
+            title: panel_getI18n('vxe.custom.setting.anLeftTitle'),
+            disabled: isHidden
+          }, {
+            icon: panel_getIcon().TABLE_CUSTOM_ALIGN_CENTER,
+            value: 'center',
+            title: panel_getI18n('vxe.custom.setting.anCenterTitle'),
+            disabled: isHidden
+          }, {
+            icon: panel_getIcon().TABLE_CUSTOM_ALIGN_RIGHT,
+            value: 'right',
+            title: panel_getI18n('vxe.custom.setting.anRightTitle'),
+            disabled: isHidden
+          }];
+          const tdVNs = [];
+          if (allowVisible) {
+            tdVNs.push(h('td', {
+              key: 'av',
+              class: 'vxe-table-custom-popup--column-td col--visible'
+            }, [h('div', {
+              class: ['vxe-table-custom--checkbox-option', {
+                'is--checked': isChecked,
+                'is--indeterminate': isIndeterminate,
+                'is--disabled': isDisabled
+              }],
+              attrs: {
+                title: panel_getI18n('vxe.custom.setting.colVisible')
+              },
+              on: {
+                click: evnt => {
+                  if (!isDisabled) {
+                    $xeTableCustomPanel.changeCheckboxOption(column, evnt);
+                  }
                 }
               }
-            }
-          }, [h('span', {
-            class: ['vxe-checkbox--icon', isIndeterminate ? panel_getIcon().TABLE_CHECKBOX_INDETERMINATE : isChecked ? panel_getIcon().TABLE_CHECKBOX_CHECKED : panel_getIcon().TABLE_CHECKBOX_UNCHECKED]
-          })])]) : panel_renderEmptyElement($xeTable), h('td', {
-            class: 'vxe-table-custom-popup--column-item col--name'
+            }, [h('span', {
+              class: ['vxe-checkbox--icon', isIndeterminate ? panel_getIcon().TABLE_CHECKBOX_INDETERMINATE : isChecked ? panel_getIcon().TABLE_CHECKBOX_CHECKED : panel_getIcon().TABLE_CHECKBOX_UNCHECKED]
+            })])]));
+          }
+          tdVNs.push(h('td', {
+            key: 'at',
+            class: 'vxe-table-custom-popup--column-td col--name'
           }, [h('div', {
             class: 'vxe-table-custom-popup--name'
           }, [allowSort && showSortDragButton || allowGroup || allowValues ? showSortBtn || (allowGroup || allowValues) && !isColGroup ? h('div', {
@@ -12083,7 +12130,7 @@ function panel_hideDropTip($xeTableCustomPanel) {
           }, VxeUIButtonComponent ? [showSortMoveButton ? h(VxeUIButtonComponent, {
             props: {
               mode: 'text',
-              content: panel_getI18n('vxe.custom.setting.moveUp'),
+              icon: 'vxe-icon-arrows-up',
               title: panel_getI18n('vxe.custom.setting.moveUpTitle'),
               disabled: index <= 0
             },
@@ -12095,7 +12142,7 @@ function panel_hideDropTip($xeTableCustomPanel) {
           }) : panel_renderEmptyElement($xeTable), showSortMoveButton ? h(VxeUIButtonComponent, {
             props: {
               mode: 'text',
-              content: panel_getI18n('vxe.custom.setting.moveDn'),
+              icon: 'vxe-icon-arrows-down',
               title: panel_getI18n('vxe.custom.setting.moveDnTitle'),
               disabled: index >= items.length - 1
             },
@@ -12107,7 +12154,7 @@ function panel_hideDropTip($xeTableCustomPanel) {
           }) : panel_renderEmptyElement($xeTable), showSortPutButton && !parentItem ? h(VxeUIButtonComponent, {
             props: {
               mode: 'text',
-              content: panel_getI18n('vxe.custom.setting.putTop'),
+              icon: 'vxe-icon-top',
               title: panel_getI18n('vxe.custom.setting.putTopTitle'),
               disabled: index <= 0
             },
@@ -12119,7 +12166,7 @@ function panel_hideDropTip($xeTableCustomPanel) {
           }) : panel_renderEmptyElement($xeTable), showSortPutButton && !parentItem ? h(VxeUIButtonComponent, {
             props: {
               mode: 'text',
-              content: panel_getI18n('vxe.custom.setting.putBottom'),
+              icon: 'vxe-icon-bottom',
               title: panel_getI18n('vxe.custom.setting.putBottomTitle'),
               disabled: index >= items.length - 1
             },
@@ -12128,63 +12175,312 @@ function panel_hideDropTip($xeTableCustomPanel) {
                 $xeTableCustomPanel.sortMoveBottomEvent(evntParame, column);
               }
             }
-          }) : panel_renderEmptyElement($xeTable)] : []) : panel_renderEmptyElement($xeTable)])]), allowResizable ? h('td', {
-            class: 'vxe-table-custom-popup--column-item col--resizable'
-          }, [column.children && column.children.length || !(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(column.resizable) ? column.resizable : columnOpts.resizable || allResizable) ? h('span', '-') : VxeUINumberInputComponent ? h(VxeUINumberInputComponent, {
-            props: {
-              type: 'integer',
-              immediate: false,
-              disabled: isHidden,
-              value: column.renderResizeWidth,
-              min: customMinWidth || undefined,
-              max: customMaxWidth || undefined
-            },
-            on: {
-              modelValue(value) {
-                column.renderResizeWidth = Math.max(0, Number(value));
+          }) : panel_renderEmptyElement($xeTable)] : []) : panel_renderEmptyElement($xeTable)])]));
+          if (allowResizable) {
+            tdVNs.push(h('td', {
+              key: 'aw',
+              class: 'vxe-table-custom-popup--column-td col--resizable'
+            }, [column.children && column.children.length || !(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(column.resizable) ? column.resizable : columnOpts.resizable || allResizable) ? h('span', '-') : VxeUINumberInputComponent ? h(VxeUINumberInputComponent, {
+              props: {
+                type: 'integer',
+                immediate: false,
+                disabled: isHidden,
+                value: column.renderResizeWidth,
+                min: customMinWidth || undefined,
+                max: customMaxWidth || undefined
               },
-              change() {
-                $xeTableCustomPanel.changeColumnWidth(column);
+              on: {
+                modelValue(value) {
+                  const width = Math.max(0, Number(value));
+                  column.renderResizeWidth = width;
+                },
+                change() {
+                  $xeTableCustomPanel.changeColumnWidth(column);
+                }
               }
-            }
-          }) : panel_renderEmptyElement($xeTableCustomPanel)]) : panel_renderEmptyElement($xeTable), allowFixed ? h('td', {
-            class: 'vxe-table-custom-popup--column-item col--fixed'
-          }, [parentItem ? h('span', '-') : h('vxe-radio-group', {
-            props: {
-              value: column.renderFixed || '',
-              type: 'button',
-              size: 'mini',
-              disabled: isHidden,
-              options: [{
-                label: panel_getI18n('vxe.custom.setting.fixedLeft'),
-                value: 'left',
-                disabled: isHidden || isMaxFixedColumn
-              }, {
-                label: panel_getI18n('vxe.custom.setting.fixedUnset'),
-                value: '',
-                disabled: isHidden
-              }, {
-                label: panel_getI18n('vxe.custom.setting.fixedRight'),
-                value: 'right',
-                disabled: isHidden || isMaxFixedColumn
-              }]
+            }) : panel_renderEmptyElement($xeTable)]));
+          }
+          if (allowFixed) {
+            tdVNs.push(h('td', {
+              key: 'af',
+              class: 'vxe-table-custom-popup--column-td col--fixed'
+            }, parentItem ? [h('span', '-')] : VxeUIRadioGroupComponent ? [h(VxeUIButtonComponent, {
+              props: {
+                icon: column.renderFixed === 'left' ? panel_getIcon().TOOLBAR_TOOLS_FIXED_LEFT_ACTIVE : panel_getIcon().TOOLBAR_TOOLS_FIXED_LEFT,
+                status: column.renderFixed === 'left' ? 'primary' : '',
+                disabled: isHidden || isMaxFixedColumn && !column.renderFixed,
+                title: panel_getI18n(column.renderFixed === 'left' ? 'vxe.toolbar.cancelFixed' : 'vxe.toolbar.fixedLeft')
+              },
+              on: {
+                click: ({
+                  $event
+                }) => {
+                  $xeTableCustomPanel.changeFixedOption(column, 'left', $event);
+                }
+              }
+            }), h(VxeUIButtonComponent, {
+              props: {
+                icon: column.renderFixed === 'right' ? panel_getIcon().TOOLBAR_TOOLS_FIXED_RIGHT_ACTIVE : panel_getIcon().TOOLBAR_TOOLS_FIXED_RIGHT,
+                status: column.renderFixed === 'right' ? 'primary' : '',
+                disabled: isHidden || isMaxFixedColumn && !column.renderFixed,
+                title: panel_getI18n(column.renderFixed === 'right' ? 'vxe.toolbar.cancelFixed' : 'vxe.toolbar.fixedRight')
+              },
+              on: {
+                click: ({
+                  $event
+                }) => {
+                  $xeTableCustomPanel.changeFixedOption(column, 'right', $event);
+                }
+              }
+            })] : []));
+          }
+          if (allowAlign) {
+            tdVNs.push(h('td', {
+              key: 'aa',
+              class: 'vxe-table-custom-popup--column-td col--align'
+            }, VxeUIRadioGroupComponent ? [h(VxeUIRadioGroupComponent, {
+              props: {
+                value: column.renderAlign || '',
+                type: 'button',
+                strict: false,
+                disabled: isHidden,
+                options: alignList
+              },
+              on: {
+                change({
+                  value,
+                  $event
+                }) {
+                  $xeTableCustomPanel.changeAlignOption(column, value, 'align', 'renderAlign', 'custom-align-change', $event);
+                }
+              }
+            })] : []));
+          }
+          if (allowHeaderAlign) {
+            tdVNs.push(h('td', {
+              key: 'aha',
+              class: 'vxe-table-custom-popup--column-td col--header-align'
+            }, isColGroup ? [h('span', '-')] : VxeUIRadioGroupComponent ? [h(VxeUIRadioGroupComponent, {
+              props: {
+                value: column.renderHeaderAlign || '',
+                type: 'button',
+                strict: false,
+                disabled: isHidden,
+                options: alignList
+              },
+              on: {
+                change({
+                  value,
+                  $event
+                }) {
+                  $xeTableCustomPanel.changeAlignOption(column, value, 'headerAlign', 'renderHeaderAlign', 'custom-header-align-change', $event);
+                }
+              }
+            })] : []));
+          }
+          if (allowFooterAlign) {
+            tdVNs.push(h('td', {
+              key: 'afa',
+              class: 'vxe-table-custom-popup--column-td col--footer-align'
+            }, isColGroup ? [h('span', '-')] : VxeUIRadioGroupComponent ? [h(VxeUIRadioGroupComponent, {
+              props: {
+                value: column.renderFooterAlign || '',
+                type: 'button',
+                strict: false,
+                disabled: isHidden,
+                options: alignList
+              },
+              on: {
+                change({
+                  value,
+                  $event
+                }) {
+                  $xeTableCustomPanel.changeAlignOption(column, value, 'footerAlign', 'renderFooterAlign', 'custom-footer-align-change', $event);
+                }
+              }
+            })] : []));
+          }
+          trVNs.push(h('tr', {
+            key: column.id,
+            attrs: {
+              colid: column.id
             },
+            class: [`vxe-table-custom-popup--row level--${column.level}`, {
+              'is--group': isColGroup
+            }],
             on: {
-              change({
-                label,
-                $event
-              }) {
-                $xeTableCustomPanel.changeFixedOption(column, label, $event);
-              }
+              dragstart: $xeTableCustomPanel.sortDragstartEvent,
+              dragend: $xeTableCustomPanel.sortDragendEvent,
+              dragover: $xeTableCustomPanel.sortDragoverEvent
             }
-          })]) : panel_renderEmptyElement($xeTable)]));
+          }, tdVNs));
         }
       });
+      return trVNs;
+    },
+    renderPopupPanel(h) {
+      const VxeUIModalComponent = core_.VxeUI.getComponent('VxeModal');
+      const VxeUIDrawerComponent = core_.VxeUI.getComponent('VxeDrawer');
+      const VxeUIButtonComponent = core_.VxeUI.getComponent('VxeButton');
+      const $xeTableCustomPanel = this;
+      const props = $xeTableCustomPanel;
+      const $xeTable = $xeTableCustomPanel.$xeTable;
+      const tableProps = $xeTable;
+      const tableReactData = $xeTable;
+      const $xeGrid = $xeTable.$xeGrid;
+      const $xeGantt = $xeTable.$xeGantt;
+      const {
+        customStore
+      } = props;
+      const {
+        treeConfig,
+        rowGroupConfig,
+        aggregateConfig
+      } = tableProps;
+      const {
+        isCustomStatus,
+        customColumnList
+      } = tableReactData;
+      const vSize = $xeTable.computeSize;
+      const customOpts = $xeTable.computeCustomOpts;
+      const aggregateOpts = $xeTable.computeAggregateOpts;
+      const {
+        panePopupStyle
+      } = customStore;
+      const {
+        placement: aggPlacement
+      } = aggregateOpts;
+      const {
+        mode,
+        immediate,
+        modalOptions,
+        drawerOptions,
+        allowVisible,
+        allowFixed,
+        allowAlign,
+        allowHeaderAlign,
+        allowFooterAlign,
+        allowResizable
+      } = customOpts;
+      const columnOpts = $xeTable.computeColumnOpts;
+      const {
+        maxFixedSize
+      } = columnOpts;
+      const modalOpts = Object.assign({}, modalOptions);
+      const drawerOpts = Object.assign({}, drawerOptions);
+      const slots = customOpts.slots || {};
+      const headerSlot = slots.header;
+      const topSlot = slots.top;
+      const bottomSlot = slots.bottom;
+      const defaultSlot = slots.default;
+      const footerSlot = slots.footer;
+      const isAllChecked = customStore.isAll;
+      const isAllIndeterminate = customStore.isIndeterminate;
+      const isAggRtBmLayout = aggPlacement === 'right' || aggPlacement === 'bottom';
+      const params = {
+        $table: $xeTable,
+        $grid: $xeGrid,
+        $gantt: $xeGantt,
+        columns: customColumnList,
+        isAllChecked,
+        isAllIndeterminate,
+        isCustomStatus
+      };
+      const colVNs = [];
+      const headVNs = [];
+      if (allowVisible) {
+        colVNs.push(h('col', {
+          key: 'av',
+          class: 'vxe-table-custom-popup--column-col col--checkbox'
+        }));
+        headVNs.push(h('th', {
+          key: 'av',
+          class: 'vxe-table-custom-popup--column-th col--checkbox'
+        }, [h('div', {
+          class: ['vxe-table-custom--checkbox-option', {
+            'is--checked': isAllChecked,
+            'is--indeterminate': isAllIndeterminate
+          }],
+          attrs: {
+            title: panel_getI18n('vxe.table.allTitle')
+          },
+          on: {
+            click: $xeTableCustomPanel.allOptionEvent
+          }
+        }, [h('span', {
+          class: ['vxe-checkbox--icon', isAllIndeterminate ? panel_getIcon().TABLE_CHECKBOX_INDETERMINATE : isAllChecked ? panel_getIcon().TABLE_CHECKBOX_CHECKED : panel_getIcon().TABLE_CHECKBOX_UNCHECKED]
+        })
+        // h('span', {
+        //   class: 'vxe-checkbox--label'
+        // }, getI18n('vxe.toolbar.customAll'))
+        ])]));
+      }
+      colVNs.push(h('col', {
+        key: 'at',
+        class: 'vxe-table-custom-popup--column-col col--title'
+      }));
+      headVNs.push(h('th', {
+        key: 'at',
+        class: 'vxe-table-custom-popup--column-th col--title'
+      }, panel_getI18n('vxe.custom.setting.colTitle')));
+      if (allowResizable) {
+        colVNs.push(h('col', {
+          key: 'aw',
+          class: 'vxe-table-custom-popup--column-col col--width'
+        }));
+        headVNs.push(h('th', {
+          key: 'aw',
+          class: 'vxe-table-custom-popup--column-th col--width'
+        }, panel_getI18n('vxe.custom.setting.colResizable')));
+      }
+      if (allowFixed) {
+        colVNs.push(h('col', {
+          key: 'af',
+          class: 'vxe-table-custom-popup--column-col col--fixed'
+        }));
+        headVNs.push(h('th', {
+          key: 'af',
+          class: 'vxe-table-custom-popup--column-th col--fixed'
+        }, panel_getI18n(`vxe.custom.setting.${maxFixedSize ? 'colFixedMax' : 'colFixed'}`, [maxFixedSize])));
+      }
+      if (allowAlign) {
+        colVNs.push(h('col', {
+          key: 'aa',
+          class: 'vxe-table-custom-popup--column-col col--align'
+        }));
+        headVNs.push(h('th', {
+          key: 'aa',
+          class: 'vxe-table-custom-popup--column-th col--align'
+        }, panel_getI18n('vxe.custom.setting.colAlign')));
+      }
+      if (allowHeaderAlign) {
+        colVNs.push(h('col', {
+          key: 'aha',
+          class: 'vxe-table-custom-popup--column-col col--header-align'
+        }));
+        headVNs.push(h('th', {
+          key: 'aha',
+          class: 'vxe-table-custom-popup--column-th col--header-align'
+        }, panel_getI18n('vxe.custom.setting.colHeadAlign')));
+      }
+      if (allowFooterAlign) {
+        colVNs.push(h('col', {
+          key: 'afa',
+          class: 'vxe-table-custom-popup--column-col col--footer-align'
+        }));
+        headVNs.push(h('th', {
+          key: 'afa',
+          class: 'vxe-table-custom-popup--column-th col--footer-align'
+        }, panel_getI18n('vxe.custom.setting.colFootAlign')));
+      }
       const scopedSlots = {
         default: () => {
           return h('div', {
             ref: 'refBodyWrapperElem',
-            class: ['vxe-table-custom-popup--body-wrapper', `agg-layout--${aggPlacement}`]
+            class: ['vxe-table-custom-popup--body-wrapper', `agg-layout--${aggPlacement}`, {
+              [`size--${vSize}`]: vSize
+            }],
+            style: panePopupStyle
           }, defaultSlot ? $xeTable.callSlot(defaultSlot, params, h) : [!isAggRtBmLayout && !treeConfig && (aggregateConfig || rowGroupConfig) && $xeTable.getPivotTableAggregatePopupPanel ? h($xeTable.getPivotTableAggregatePopupPanel(), {
             props: {
               customStore
@@ -12196,36 +12492,13 @@ function panel_hideDropTip($xeTableCustomPanel) {
             class: 'vxe-table-custom-popup--table-top'
           }, $xeTable.callSlot(topSlot, params, h)) : panel_renderEmptyElement($xeTable), h('div', {
             class: 'vxe-table-custom-popup--table-wrapper'
-          }, [h('table', {}, [h('colgroup', {}, [allowVisible ? h('col', {
-            class: 'vxe-table-custom-popup--table-col-seq'
-          }) : panel_renderEmptyElement($xeTable), h('col', {
-            class: 'vxe-table-custom-popup--table-col-title'
-          }), allowResizable ? h('col', {
-            class: 'vxe-table-custom-popup--table-col-width'
-          }) : panel_renderEmptyElement($xeTable), allowFixed ? h('col', {
-            class: 'vxe-table-custom-popup--table-col-fixed'
-          }) : panel_renderEmptyElement($xeTable)]), h('thead', {}, [h('tr', {}, [allowVisible ? h('th', {}, [h('div', {
-            class: ['vxe-table-custom--checkbox-option', {
-              'is--checked': isAllChecked,
-              'is--indeterminate': isAllIndeterminate
-            }],
-            attrs: {
-              title: panel_getI18n('vxe.table.allTitle')
-            },
-            on: {
-              click: $xeTableCustomPanel.allOptionEvent
-            }
-          }, [h('span', {
-            class: ['vxe-checkbox--icon', isAllIndeterminate ? panel_getIcon().TABLE_CHECKBOX_INDETERMINATE : isAllChecked ? panel_getIcon().TABLE_CHECKBOX_CHECKED : panel_getIcon().TABLE_CHECKBOX_UNCHECKED]
-          }), h('span', {
-            class: 'vxe-checkbox--label'
-          }, panel_getI18n('vxe.toolbar.customAll'))])]) : panel_renderEmptyElement($xeTable), h('th', {}, panel_getI18n('vxe.custom.setting.colTitle')), allowResizable ? h('th', {}, panel_getI18n('vxe.custom.setting.colResizable')) : panel_renderEmptyElement($xeTable), allowFixed ? h('th', {}, panel_getI18n(`vxe.custom.setting.${maxFixedSize ? 'colFixedMax' : 'colFixed'}`, [maxFixedSize])) : panel_renderEmptyElement($xeTable)])]), h('transition-group', {
+          }, [h('table', {}, [h('colgroup', {}, colVNs), h('thead', {}, [h('tr', {}, headVNs)]), h('transition-group', {
             class: 'vxe-table-custom--panel-list',
             props: {
               tag: 'tbody',
               name: 'vxe-table-custom--list'
             }
-          }, trVNs)])]), bottomSlot ? h('div', {
+          }, $xeTableCustomPanel.renderPopupBodys(h))])]), bottomSlot ? h('div', {
             class: 'vxe-table-custom-popup--table-bottom'
           }, $xeTable.callSlot(bottomSlot, params, h)) : panel_renderEmptyElement($xeTable), $xeTableCustomPanel.renderDragTip(h)]), isAggRtBmLayout && !treeConfig && (aggregateConfig || rowGroupConfig) && $xeTable.getPivotTableAggregatePopupPanel ? h($xeTable.getPivotTableAggregatePopupPanel(), {
             props: {
@@ -12249,6 +12522,7 @@ function panel_hideDropTip($xeTableCustomPanel) {
             }
           }), immediate ? h(VxeUIButtonComponent, {
             props: {
+              status: 'primary',
               content: customOpts.resetButtonText || panel_getI18n('vxe.table.customClose')
             },
             on: {
@@ -12301,11 +12575,11 @@ function panel_hideDropTip($xeTableCustomPanel) {
       return VxeUIModalComponent ? h(VxeUIModalComponent, {
         key: 'modal',
         props: {
-          className: ['vxe-table-custom-popup-wrapper', 'vxe-table--ignore-clear', modalOpts.className || ''].join(' '),
+          className: ['vxe-table-custom-modal-wrapper', 'vxe-table--ignore-clear', modalOpts.className || ''].join(' '),
           value: customStore.visible,
           title: modalOpts.title || panel_getI18n('vxe.custom.cstmTitle'),
-          width: modalOpts.width || Math.min(880, document.documentElement.clientWidth),
-          minWidth: modalOpts.minWidth || 700,
+          width: modalOpts.width || Math.min(1000, document.documentElement.clientWidth),
+          minWidth: modalOpts.minWidth || 800,
           height: modalOpts.height || Math.min(680, document.documentElement.clientHeight),
           minHeight: modalOpts.minHeight || 400,
           showZoom: modalOpts.showZoom,
@@ -12314,6 +12588,7 @@ function panel_hideDropTip($xeTableCustomPanel) {
           mask: modalOpts.mask,
           lockView: modalOpts.lockView,
           resize: modalOpts.resize,
+          transfer: modalOpts.transfer,
           escClosable: !!modalOpts.escClosable,
           maskClosable: !!modalOpts.maskClosable,
           destroyOnClose: true,
@@ -19580,6 +19855,7 @@ function beginValidate($xeTable, rows, cols, cb, isFull) {
 
 
 
+const customColumnCssKeys = ['checkbox', 'sort', 'title', 'width', 'fixed', 'align', 'header-align', 'footer-align'];
 function updatePopupStyle($xeTable) {
   const $xeGrid = $xeTable.$xeGrid;
   const $xeGantt = $xeTable.$xeGantt;
@@ -19597,6 +19873,8 @@ function updatePopupStyle($xeTable) {
   const showSimple = !(mode === 'modal' || mode === 'drawer');
   const {
     transfer,
+    minWidth,
+    maxWidth,
     maxHeight
   } = popupOptions || {};
   const customSimpleMode = $xeTable.computeCustomSimpleMode;
@@ -19605,7 +19883,8 @@ function updatePopupStyle($xeTable) {
   let wrapperEl = $xeTable.$refs.refElem;
   let popupTop = 0;
   let popupMaxHeight = 0;
-  const popupStys = {};
+  const defPupStys = {};
+  const panePupStys = {};
   if ($xeGantt) {
     const ganttContainerElem = $xeGantt.$refs.refGanttContainerElem;
     if (ganttContainerElem) {
@@ -19635,23 +19914,40 @@ function updatePopupStyle($xeTable) {
   }
   if (!placement || !['left', 'right', 'bottom-left', 'bottom-right'].includes(placement)) {
     if (popupTop) {
-      popupStys.top = toCssUnit(popupTop);
+      defPupStys.top = toCssUnit(popupTop);
     }
   }
   if (showSimple && transfer) {
     if (placement === 'bottom-left' || placement === 'bottom-right') {
-      popupStys.bottom = toCssUnit(bodyEl.scrollHeight - tableRect.top - tableRect.height + 1);
+      defPupStys.bottom = toCssUnit(bodyEl.scrollHeight - tableRect.top - tableRect.height + 1);
     }
     if (placement === 'top-left' || placement === 'bottom-left') {
-      popupStys.left = toCssUnit(tableRect.left);
+      defPupStys.left = toCssUnit(tableRect.left);
     } else if (!placement || placement === 'top-right' || placement === 'bottom-right') {
-      popupStys.right = toCssUnit(bodyEl.scrollWidth - tableRect.left - tableRect.width + 1);
+      defPupStys.right = toCssUnit(bodyEl.scrollWidth - tableRect.left - tableRect.width + 1);
+    }
+  }
+  // 同步表格的css变量到弹窗中
+  const bodyComputeStyle = getComputedStyle(bodyEl);
+  const tableComputeStyle = getComputedStyle(wrapperEl);
+  customColumnCssKeys.forEach(key => {
+    const currCssKey = `--vxe-ui-vxe-table-custom-column-${key}-${key === 'title' ? 'min-' : ''}width`;
+    const currCssVal = tableComputeStyle.getPropertyValue(currCssKey);
+    if (currCssVal && currCssVal !== bodyComputeStyle.getPropertyValue(currCssKey)) {
+      panePupStys[currCssKey] = currCssVal;
     }
+  });
+  if (minWidth) {
+    defPupStys['--vxe-ui-vxe-table-custom-default-min-width'] = toCssUnit(minWidth);
+  }
+  if (maxWidth) {
+    defPupStys['--vxe-ui-vxe-table-custom-default-max-width'] = toCssUnit(maxWidth);
   }
   if (popupMxHeight) {
-    popupStys.maxHeight = toCssUnit(popupMxHeight);
+    defPupStys.maxHeight = toCssUnit(popupMxHeight);
   }
-  customStore.popupStyle = popupStys;
+  customStore.defPopupStyle = defPupStys;
+  customStore.panePopupStyle = panePupStys;
   customStore.maxHeight = popupMxHeight;
   return $xeTable.$nextTick();
 }
@@ -19765,10 +20061,21 @@ function emitCustomEvent($xeTable, type, evnt) {
         allowSort,
         allowFixed,
         allowResizable,
+        allowAlign,
+        allowHeaderAlign,
+        allowFooterAlign,
         allowGroup,
         allowValues
       } = customOpts;
-      if (!isDirectly) {
+      if (isDirectly) {
+        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(customColumnList, column => {
+          if (allowResizable) {
+            if (column.renderVisible && (!column.children || !column.children.length)) {
+              column.resizeWidth = Math.max(0, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(column.renderWidth));
+            }
+          }
+        });
+      } else {
         external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(customColumnList, (column, index, items, path, parentColumn) => {
           if (parentColumn) {
             // 更新子列信息
@@ -19793,13 +20100,22 @@ function emitCustomEvent($xeTable, type, evnt) {
           if (allowVisible) {
             column.visible = column.renderVisible;
           }
+          if (allowAlign) {
+            column.align = column.renderAlign;
+          }
+          if (allowHeaderAlign) {
+            column.headerAlign = column.renderHeaderAlign;
+          }
+          if (allowFooterAlign) {
+            column.footerAlign = column.renderFooterAlign;
+          }
           if (allowGroup && allowValues) {
             column.aggFunc = column.renderAggFn;
           }
         });
       }
       reactData.isCustomStatus = true;
-      if (allowGroup && allowValues && !!$xeTable.handlePivotTableAggData) {
+      if (allowGroup && !!$xeTable.handlePivotTableAggData) {
         if (rowGroupList.length !== aggHandleFields.length || rowGroupList.some((conf, i) => conf.field !== aggHandleFields[i])) {
           // 更新数据分组
           if (aggHandleFields.length) {
@@ -19834,7 +20150,12 @@ function emitCustomEvent($xeTable, type, evnt) {
         allowVisible,
         allowSort,
         allowFixed,
-        allowResizable
+        allowAlign,
+        allowHeaderAlign,
+        allowFooterAlign,
+        allowResizable,
+        allowGroup,
+        allowValues
       } = customOpts;
       external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(customColumnList, column => {
         const colid = column.getKey();
@@ -19854,6 +20175,21 @@ function emitCustomEvent($xeTable, type, evnt) {
         if (allowResizable) {
           column.renderResizeWidth = column.renderWidth;
         }
+        if (allowAlign) {
+          column.align = column.renderAlign;
+        }
+        if (allowHeaderAlign) {
+          column.headerAlign = column.renderHeaderAlign;
+        }
+        if (allowFooterAlign) {
+          column.footerAlign = column.renderFooterAlign;
+        }
+        if (allowGroup) {
+          // 无
+        }
+        if (allowValues) {
+          // 无
+        }
       }, {
         children: 'children'
       });
@@ -19878,7 +20214,10 @@ function emitCustomEvent($xeTable, type, evnt) {
         resizable: options === true,
         fixed: options === true,
         sort: options === true,
-        aggFunc: options === true
+        aggFunc: options === true,
+        align: options === true,
+        headerAlign: options === true,
+        footerAlign: options === true
       }, options);
       const allCols = [];
       external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(collectColumn, column => {
@@ -19887,6 +20226,7 @@ function emitCustomEvent($xeTable, type, evnt) {
         }
         if (opts.fixed) {
           column.fixed = column.defaultFixed;
+          column.renderFixed = column.defaultFixed;
         }
         if (opts.sort) {
           column.renderSortNumber = column.sortNumber;
@@ -19898,6 +20238,18 @@ function emitCustomEvent($xeTable, type, evnt) {
         })) {
           column.visible = column.defaultVisible;
         }
+        if (opts.align) {
+          column.align = column.defaultAlign;
+          column.renderAlign = column.defaultAlign;
+        }
+        if (opts.headerAlign) {
+          column.headerAlign = column.defaultHeaderAlign;
+          column.renderHeaderAlign = column.defaultHeaderAlign;
+        }
+        if (opts.footerAlign) {
+          column.footerAlign = column.defaultFooterAlign;
+          column.renderFooterAlign = column.defaultFooterAlign;
+        }
         if (opts.aggFunc) {
           column.aggFunc = column.defaultAggFunc;
           column.renderAggFn = column.defaultAggFunc;
@@ -20090,6 +20442,9 @@ function emitCustomEvent($xeTable, type, evnt) {
           column.renderFixed = column.fixed;
           column.renderVisible = column.visible;
           column.renderResizeWidth = column.renderWidth;
+          column.renderAlign = column.align;
+          column.renderHeaderAlign = column.headerAlign;
+          column.renderFooterAlign = column.footerAlign;
           sortMaps[colid] = column.renderSortNumber;
           fixedMaps[colid] = column.fixed;
           visibleMaps[colid] = column.visible;
@@ -27900,10 +28255,16 @@ const Toolbar = VxeToolbar;
         colResizable: '列宽（像素）',
         colVisible: '是否显示',
         colFixed: '冻结列',
-        colFixedMax: '冻结列（最多 {0} 列）',
-        fixedLeft: '左侧',
-        fixedUnset: '不设置',
-        fixedRight: '右侧',
+        colFixedMax: '冻结列（{0}）',
+        colAlign: '对齐方式',
+        colHeadAlign: '表头对齐方式',
+        colFootAlign: '表尾对齐方式',
+        fixedLeft: '左',
+        fixedUnset: '无',
+        fixedRight: '右',
+        alignLeft: '左',
+        alignCenter: '中',
+        alignRight: '右',
         moveUp: '上移',
         moveDn: '下移',
         putTop: '置顶',
@@ -27911,7 +28272,10 @@ const Toolbar = VxeToolbar;
         moveUpTitle: '点击向上移动',
         moveDnTitle: '点击向下移动',
         putTopTitle: '点击置顶',
-        putBottomTitle: '点击置尾'
+        putBottomTitle: '点击置尾',
+        anLeftTitle: '左对齐',
+        anCenterTitle: '居中',
+        anRightTitle: '右对齐'
       }
     },
     import: {