vxe-table 3.9.13 → 3.9.14

package/lib/table/src/header.js

@@ -5,10 +5,14 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _xeUtils = _interopRequireDefault(require("xe-utils"));
+var _ui = require("../../ui");
 var _utils = require("../../ui/src/utils");
 var _dom = require("../../ui/src/dom");
 var _util = require("./util");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+const {
+  renderer
+} = _ui.VxeUI;
 const cellType = 'header';
 var _default = exports.default = {
   name: 'VxeTableHeader',
@@ -173,14 +177,18 @@ var _default = exports.default = {
           showHeaderOverflow,
           headerAlign,
           align,
-          headerClassName
+          headerClassName,
+          editRender,
+          cellRender
         } = column;
         // const { enabled } = tooltipOpts
         const colid = column.id;
+        const renderOpts = editRender || cellRender;
+        const compConf = renderOpts ? renderer.get(renderOpts.name) : null;
         const isColGroup = column.children && column.children.length;
         const fixedHiddenColumn = fixedType ? column.fixed !== fixedType && !isColGroup : column.fixed && overflowX;
         const headOverflow = _xeUtils.default.isUndefined(showHeaderOverflow) || _xeUtils.default.isNull(showHeaderOverflow) ? allColumnHeaderOverflow : showHeaderOverflow;
-        const headAlign = headerAlign || align || allHeaderAlign || allAlign;
+        const headAlign = headerAlign || (compConf ? compConf.tableHeaderCellAlign : '') || allHeaderAlign || align || (compConf ? compConf.tableCellAlign : '') || allAlign;
         let showEllipsis = headOverflow === 'ellipsis';
         const showTitle = headOverflow === 'title';
         const showTooltip = headOverflow === true || headOverflow === 'tooltip';

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

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_utils=require("../../ui/src/utils"),_dom=require("../../ui/src/dom"),_util=require("./util");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let cellType="header";var _default=exports.default={name:"VxeTableHeader",props:{tableData:Array,tableColumn:Array,tableGroupColumn:Array,fixedColumn:Array,size:String,fixedType:String},data(){return{headerColumn:[]}},watch:{tableColumn(){this.uploadColumn()}},created(){this.uploadColumn()},mounted(){var{$parent:e,$el:l,$refs:t,fixedType:r}=this,e=e.elemStore,r=`${r||"main"}-header-`;e[r+"wrapper"]=l,e[r+"table"]=t.table,e[r+"colgroup"]=t.colgroup,e[r+"list"]=t.thead,e[r+"xSpace"]=t.xSpace,e[r+"repair"]=t.repair},destroyed(){var{$parent:e,fixedType:l}=this,e=e.elemStore,l=`${l||"main"}-header-`;e[l+"wrapper"]=null,e[l+"table"]=null,e[l+"colgroup"]=null,e[l+"list"]=null,e[l+"xSpace"]=null,e[l+"repair"]=null},render(v){let{_e:e,$parent:C,fixedType:y,headerColumn:l,tableColumn:t,fixedColumn:r}=this,{$listeners:_,tId:i,isGroup:a,visibleColumn:o,resizable:w,border:$,columnKey:z,headerRowClassName:s,headerCellClassName:S,headerRowStyle:n,headerCellStyle:T,showHeaderOverflow:M,headerAlign:W,align:k,highlightCurrentColumn:H,currentColumn:I,scrollXLoad:R,overflowX:O,scrollbarWidth:d,sortOpts:U,mouseConfig:A,columnOpts:q}=C,u=l,c=t;return a?c=o:(y&&(R||M)&&(c=r),u=[c]),v("div",{class:["vxe-table--header-wrapper",y?`fixed-${y}--wrapper`:"body--wrapper"],attrs:{xid:i}},[y?e():v("div",{class:"vxe-body--x-space",ref:"xSpace"}),v("table",{class:"vxe-table--header",attrs:{xid:i,cellspacing:0,cellpadding:0,border:0},ref:"table"},[v("colgroup",{ref:"colgroup"},c.map((e,l)=>v("col",{attrs:{name:e.id},key:l})).concat(d?[v("col",{attrs:{name:"col_gutter"}})]:[])),v("thead",{ref:"thead"},u.map((g,b)=>v("tr",{class:["vxe-header--row",s?_xeUtils.default.isFunction(s)?s({$table:C,$rowIndex:b,fixed:y,type:cellType}):s:""],style:n?_xeUtils.default.isFunction(n)?n({$table:C,$rowIndex:b,fixed:y,type:cellType}):n:null},g.map((e,l)=>{var{type:t,showHeaderOverflow:r,headerAlign:i,align:a,headerClassName:o}=e,s=e.id,n=e.children&&e.children.length,d=y?e.fixed!==y&&!n:e.fixed&&O,r=_xeUtils.default.isUndefined(r)||_xeUtils.default.isNull(r)?M:r,i=i||a||W||k;let u="ellipsis"===r;a="title"===r,r=!0===r||"tooltip"===r;let c=a||r||u;var p={},m=e.filters&&e.filters.some(e=>e.checked),h=C.getColumnIndex(e),f=C.getVTColumnIndex(e);let x={$table:C,$grid:C.xegrid,$rowIndex:b,column:e,columnIndex:h,$columnIndex:l,_columnIndex:f,fixed:y,type:cellType,isHidden:d,hasFilter:m};return R&&!c&&(u=c=!0),(q.isCurrent||H||_["header-cell-click"]||"cell"===U.trigger)&&(p.click=e=>C.triggerHeaderCellClickEvent(e,x)),_["header-cell-dblclick"]&&(p.dblclick=e=>C.triggerHeaderCellDblclickEvent(e,x)),A&&(p.mousedown=e=>C.triggerHeaderCellMousedownEvent(e,x)),v("th",{class:["vxe-header--column",s,{["col--"+i]:i,["col--"+t]:t,"col--last":l===g.length-1,"col--fixed":e.fixed,"col--group":n,"col--ellipsis":c,"fixed--hidden":d,"is--sortable":e.sortable,"col--filter":!!e.filters,"is--filter-active":m,"col--current":I===e},(0,_utils.getClass)(o,x),(0,_utils.getClass)(S,x)],attrs:{colid:s,colspan:1<e.colSpan?e.colSpan:null,rowspan:1<e.rowSpan?e.rowSpan:null},style:T?_xeUtils.default.isFunction(T)?T(x):T:null,on:p,key:z||q.useKey||n?s:l},[v("div",{class:["vxe-cell",{"c--title":a,"c--tooltip":r,"c--ellipsis":u}]},e.renderHeader(v,x)),d||n||!(_xeUtils.default.isBoolean(e.resizable)?e.resizable:q.resizable||w)?null:v("div",{class:["vxe-resizable",{"is--line":!$||"none"===$}],on:{mousedown:e=>this.resizeMousedown(e,x)}})])}).concat(d?[v("th",{class:"vxe-header--gutter col--gutter"})]:[]))))]),v("div",{class:"vxe-table--header-border-line",ref:"repair"})])},methods:{uploadColumn(){var e=this.$parent;this.headerColumn=e.isGroup?(0,_util.convertHeaderColumnToRows)(this.tableGroupColumn):[]},resizeMousedown(e,t){let r=t.column,{$parent:i,$el:l,fixedType:a}=this,{tableBody:o,leftContainer:s,rightContainer:n,resizeBar:d}=i.$refs,{target:u,clientX:c}=e,p=t.cell=u.parentNode,m=0,h=o.$el;var f=(0,_dom.getOffsetPos)(u,l),x=u.clientWidth,g=Math.floor(x/2);let b=(0,_util.getColReMinWidth)(t)-g,v=f.left-p.clientWidth+x+b,C=f.left+g,y=document.onmousemove,_=document.onmouseup,w="left"===a,$="right"===a,z=0;if(w||$){var S=w?"nextElementSibling":"previousElementSibling";let e=p[S];for(;e&&!(0,_dom.hasClass)(e,"fixed--hidden");)(0,_dom.hasClass)(e,"col--group")||(z+=e.offsetWidth),e=e[S];$&&n&&(C=n.offsetLeft+z)}function T(e){e.stopPropagation(),e.preventDefault(),e=e.clientX-c;let l=C+e;e=a?0:h.scrollLeft,w?l=Math.min(l,(n?n.offsetLeft:h.clientWidth)-z-b):$?(v=(s?s.clientWidth:0)+z+b,l=Math.min(l,C+p.clientWidth-b)):v=Math.max(h.scrollLeft,v),m=Math.max(l,v),d.style.left=m-e+"px"}i._isResize=!0,(0,_dom.addClass)(i.$el,"drag--resize"),d.style.display="block",document.onmousemove=T,document.onmouseup=function(e){document.onmousemove=y,document.onmouseup=_;let l=r.renderWidth+($?C-m:m-C);r.resizeWidth=l,d.style.display="none",i._isResize=!1,i._lastResizeTime=Date.now(),i.analyColumnWidth(),i.recalculate(!0).then(()=>{i.saveCustomStore("update:visible"),i.updateCellAreas(),i.emitEvent("resizable-change",Object.assign(Object.assign({},t),{resizeWidth:l}),e),setTimeout(()=>i.recalculate(!0),300)}),(0,_dom.removeClass)(i.$el,"drag--resize")},T(e),i.closeMenu()}}};
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_ui=require("../../ui"),_utils=require("../../ui/src/utils"),_dom=require("../../ui/src/dom"),_util=require("./util");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let renderer=_ui.VxeUI.renderer,cellType="header";var _default=exports.default={name:"VxeTableHeader",props:{tableData:Array,tableColumn:Array,tableGroupColumn:Array,fixedColumn:Array,size:String,fixedType:String},data(){return{headerColumn:[]}},watch:{tableColumn(){this.uploadColumn()}},created(){this.uploadColumn()},mounted(){var{$parent:e,$el:l,$refs:t,fixedType:r}=this,e=e.elemStore,r=`${r||"main"}-header-`;e[r+"wrapper"]=l,e[r+"table"]=t.table,e[r+"colgroup"]=t.colgroup,e[r+"list"]=t.thead,e[r+"xSpace"]=t.xSpace,e[r+"repair"]=t.repair},destroyed(){var{$parent:e,fixedType:l}=this,e=e.elemStore,l=`${l||"main"}-header-`;e[l+"wrapper"]=null,e[l+"table"]=null,e[l+"colgroup"]=null,e[l+"list"]=null,e[l+"xSpace"]=null,e[l+"repair"]=null},render(C){let{_e:e,$parent:v,fixedType:y,headerColumn:l,tableColumn:t,fixedColumn:r}=this,{$listeners:_,tId:i,isGroup:a,visibleColumn:o,resizable:w,border:$,columnKey:z,headerRowClassName:n,headerCellClassName:S,headerRowStyle:s,headerCellStyle:T,showHeaderOverflow:M,headerAlign:W,align:R,highlightCurrentColumn:k,currentColumn:H,scrollXLoad:I,overflowX:A,scrollbarWidth:d,sortOpts:U,mouseConfig:O,columnOpts:q}=v,u=l,c=t;return a?c=o:(y&&(I||M)&&(c=r),u=[c]),C("div",{class:["vxe-table--header-wrapper",y?`fixed-${y}--wrapper`:"body--wrapper"],attrs:{xid:i}},[y?e():C("div",{class:"vxe-body--x-space",ref:"xSpace"}),C("table",{class:"vxe-table--header",attrs:{xid:i,cellspacing:0,cellpadding:0,border:0},ref:"table"},[C("colgroup",{ref:"colgroup"},c.map((e,l)=>C("col",{attrs:{name:e.id},key:l})).concat(d?[C("col",{attrs:{name:"col_gutter"}})]:[])),C("thead",{ref:"thead"},u.map((g,b)=>C("tr",{class:["vxe-header--row",n?_xeUtils.default.isFunction(n)?n({$table:v,$rowIndex:b,fixed:y,type:cellType}):n:""],style:s?_xeUtils.default.isFunction(s)?s({$table:v,$rowIndex:b,fixed:y,type:cellType}):s:null},g.map((e,l)=>{var{type:t,showHeaderOverflow:r,headerAlign:i,align:a,headerClassName:o,editRender:n,cellRender:s}=e,d=e.id,n=n||s,s=n?renderer.get(n.name):null,n=e.children&&e.children.length,u=y?e.fixed!==y&&!n:e.fixed&&A,r=_xeUtils.default.isUndefined(r)||_xeUtils.default.isNull(r)?M:r,i=i||(s?s.tableHeaderCellAlign:"")||W||a||(s?s.tableCellAlign:"")||R;let c="ellipsis"===r;a="title"===r,s=!0===r||"tooltip"===r;let p=a||s||c;var r={},m=e.filters&&e.filters.some(e=>e.checked),h=v.getColumnIndex(e),f=v.getVTColumnIndex(e);let x={$table:v,$grid:v.xegrid,$rowIndex:b,column:e,columnIndex:h,$columnIndex:l,_columnIndex:f,fixed:y,type:cellType,isHidden:u,hasFilter:m};return I&&!p&&(c=p=!0),(q.isCurrent||k||_["header-cell-click"]||"cell"===U.trigger)&&(r.click=e=>v.triggerHeaderCellClickEvent(e,x)),_["header-cell-dblclick"]&&(r.dblclick=e=>v.triggerHeaderCellDblclickEvent(e,x)),O&&(r.mousedown=e=>v.triggerHeaderCellMousedownEvent(e,x)),C("th",{class:["vxe-header--column",d,{["col--"+i]:i,["col--"+t]:t,"col--last":l===g.length-1,"col--fixed":e.fixed,"col--group":n,"col--ellipsis":p,"fixed--hidden":u,"is--sortable":e.sortable,"col--filter":!!e.filters,"is--filter-active":m,"col--current":H===e},(0,_utils.getClass)(o,x),(0,_utils.getClass)(S,x)],attrs:{colid:d,colspan:1<e.colSpan?e.colSpan:null,rowspan:1<e.rowSpan?e.rowSpan:null},style:T?_xeUtils.default.isFunction(T)?T(x):T:null,on:r,key:z||q.useKey||n?d:l},[C("div",{class:["vxe-cell",{"c--title":a,"c--tooltip":s,"c--ellipsis":c}]},e.renderHeader(C,x)),u||n||!(_xeUtils.default.isBoolean(e.resizable)?e.resizable:q.resizable||w)?null:C("div",{class:["vxe-resizable",{"is--line":!$||"none"===$}],on:{mousedown:e=>this.resizeMousedown(e,x)}})])}).concat(d?[C("th",{class:"vxe-header--gutter col--gutter"})]:[]))))]),C("div",{class:"vxe-table--header-border-line",ref:"repair"})])},methods:{uploadColumn(){var e=this.$parent;this.headerColumn=e.isGroup?(0,_util.convertHeaderColumnToRows)(this.tableGroupColumn):[]},resizeMousedown(e,t){let r=t.column,{$parent:i,$el:l,fixedType:a}=this,{tableBody:o,leftContainer:n,rightContainer:s,resizeBar:d}=i.$refs,{target:u,clientX:c}=e,p=t.cell=u.parentNode,m=0,h=o.$el;var f=(0,_dom.getOffsetPos)(u,l),x=u.clientWidth,g=Math.floor(x/2);let b=(0,_util.getColReMinWidth)(t)-g,C=f.left-p.clientWidth+x+b,v=f.left+g,y=document.onmousemove,_=document.onmouseup,w="left"===a,$="right"===a,z=0;if(w||$){var S=w?"nextElementSibling":"previousElementSibling";let e=p[S];for(;e&&!(0,_dom.hasClass)(e,"fixed--hidden");)(0,_dom.hasClass)(e,"col--group")||(z+=e.offsetWidth),e=e[S];$&&s&&(v=s.offsetLeft+z)}function T(e){e.stopPropagation(),e.preventDefault(),e=e.clientX-c;let l=v+e;e=a?0:h.scrollLeft,w?l=Math.min(l,(s?s.offsetLeft:h.clientWidth)-z-b):$?(C=(n?n.clientWidth:0)+z+b,l=Math.min(l,v+p.clientWidth-b)):C=Math.max(h.scrollLeft,C),m=Math.max(l,C),d.style.left=m-e+"px"}i._isResize=!0,(0,_dom.addClass)(i.$el,"drag--resize"),d.style.display="block",document.onmousemove=T,document.onmouseup=function(e){document.onmousemove=y,document.onmouseup=_;let l=r.renderWidth+($?v-m:m-v);r.resizeWidth=l,d.style.display="none",i._isResize=!1,i._lastResizeTime=Date.now(),i.analyColumnWidth(),i.recalculate(!0).then(()=>{i.saveCustomStore("update:visible"),i.updateCellAreas(),i.emitEvent("resizable-change",Object.assign(Object.assign({},t),{resizeWidth:l}),e),setTimeout(()=>i.recalculate(!0),300)}),(0,_dom.removeClass)(i.$el,"drag--resize")},T(e),i.closeMenu()}}};

package/lib/ui/index.js

@@ -13,9 +13,9 @@ Object.defineProperty(exports, "VxeUI", {
 exports.version = exports.validators = exports.use = exports.t = exports.setup = exports.setTheme = exports.setLanguage = exports.setIcon = exports.setI18n = exports.setConfig = exports.saveFile = exports.renderer = exports.readFile = exports.print = exports.modal = exports.menus = exports.log = exports.interceptor = exports.globalResize = exports.globalEvents = exports.getTheme = exports.getIcon = exports.getI18n = exports.getConfig = exports.formats = exports.default = exports.config = exports.commands = exports.clipboard = exports._t = void 0;
 var _core = require("@vxe-ui/core");
 var _utils = require("./src/utils");
-const version = exports.version = "3.9.13";
+const version = exports.version = "3.9.14";
 _core.VxeUI.version = version;
-_core.VxeUI.tableVersion = "3.9.13";
+_core.VxeUI.tableVersion = "3.9.14";
 _core.VxeUI.setConfig({
   emptyCell: '　',
   table: {

package/lib/ui/index.min.js

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),exports.VXETable=void 0,Object.defineProperty(exports,"VxeUI",{enumerable:!0,get:function(){return _core.VxeUI}}),exports.version=exports.validators=exports.use=exports.t=exports.setup=exports.setTheme=exports.setLanguage=exports.setIcon=exports.setI18n=exports.setConfig=exports.saveFile=exports.renderer=exports.readFile=exports.print=exports.modal=exports.menus=exports.log=exports.interceptor=exports.globalResize=exports.globalEvents=exports.getTheme=exports.getIcon=exports.getI18n=exports.getConfig=exports.formats=exports.default=exports.config=exports.commands=exports.clipboard=exports._t=void 0;var _core=require("@vxe-ui/core"),_utils=require("./src/utils");let version=exports.version="3.9.13",iconPrefix=(_core.VxeUI.version=version,_core.VxeUI.tableVersion="3.9.13",_core.VxeUI.setConfig({emptyCell:"　",table:{fit:!0,showHeader:!0,animat:!0,delayHover:250,autoResize:!0,padding:!0,minHeight:144,resizeConfig:{refreshDelay:250},radioConfig:{strict:!0},checkboxConfig:{strict:!0},tooltipConfig:{enterable:!0},validConfig:{showMessage:!0,autoClear:!0,autoPos:!0,message:"inline",msgMode:"single"},columnConfig:{maxFixedSize:4},customConfig:{allowVisible:!0,allowResizable:!0,allowFixed:!0,allowSort:!0,showFooter:!0,placement:"top-right",modalOptions:{showMaximize:!0,mask:!0,lockView:!0,resize:!0,escClosable:!0}},sortConfig:{showIcon:!0,iconLayout:"vertical"},filterConfig:{showIcon:!0},treeConfig:{rowField:"id",parentField:"parentId",childrenField:"children",hasChildField:"hasChild",mapChildrenField:"_X_ROW_CHILD",indent:20,showIcon:!0},expandConfig:{showIcon:!0},editConfig:{showIcon:!0,showAsterisk:!0,autoFocus:!0},importConfig:{_typeMaps:{csv:1,html:1,xml:1,txt:1}},exportConfig:{_typeMaps:{csv:1,html:1,xml:1,txt:1}},printConfig:{},mouseConfig:{extension:!0},keyboardConfig:{isEsc:!0},areaConfig:{autoClear:!0,selectCellByHeader:!0},clipConfig:{isCopy:!0,isCut:!0,isPaste:!0},fnrConfig:{isFind:!0,isReplace:!0},scrollX:{gt:60},scrollY:{gt:100}},grid:{formConfig:{enabled:!0},pagerConfig:{enabled:!0},toolbarConfig:{enabled:!0},proxyConfig:{enabled:!0,autoLoad:!0,showResponseMsg:!0,showActiveMsg:!0,props:{list:null,result:"result",total:"page.total",message:"message"}}},toolbar:{}}),"vxe-table-icon-"),setTheme=(_core.VxeUI.setIcon({TABLE_SORT_ASC:iconPrefix+"caret-up",TABLE_SORT_DESC:iconPrefix+"caret-down",TABLE_FILTER_NONE:iconPrefix+"funnel",TABLE_FILTER_MATCH:iconPrefix+"funnel",TABLE_EDIT:iconPrefix+"edit",TABLE_TITLE_PREFIX:iconPrefix+"question-circle-fill",TABLE_TITLE_SUFFIX:iconPrefix+"question-circle-fill",TABLE_TREE_LOADED:iconPrefix+"spinner roll",TABLE_TREE_OPEN:iconPrefix+"caret-right rotate90",TABLE_TREE_CLOSE:iconPrefix+"caret-right",TABLE_EXPAND_LOADED:iconPrefix+"spinner roll",TABLE_EXPAND_OPEN:iconPrefix+"arrow-right rotate90",TABLE_EXPAND_CLOSE:iconPrefix+"arrow-right",TABLE_CHECKBOX_CHECKED:iconPrefix+"checkbox-checked-fill",TABLE_CHECKBOX_UNCHECKED:iconPrefix+"checkbox-unchecked",TABLE_CHECKBOX_INDETERMINATE:iconPrefix+"checkbox-indeterminate-fill",TABLE_RADIO_CHECKED:iconPrefix+"radio-checked-fill",TABLE_RADIO_UNCHECKED:iconPrefix+"radio-unchecked",TABLE_CUSTOM_SORT:iconPrefix+"drag-handle",TABLE_MENU_OPTIONS:iconPrefix+"arrow-right",TOOLBAR_TOOLS_REFRESH:iconPrefix+"repeat",TOOLBAR_TOOLS_REFRESH_LOADING:iconPrefix+"repeat roll",TOOLBAR_TOOLS_IMPORT:iconPrefix+"upload",TOOLBAR_TOOLS_EXPORT:iconPrefix+"download",TOOLBAR_TOOLS_PRINT:iconPrefix+"print",TOOLBAR_TOOLS_FULLSCREEN:iconPrefix+"fullscreen",TOOLBAR_TOOLS_MINIMIZE:iconPrefix+"minimize",TOOLBAR_TOOLS_CUSTOM:iconPrefix+"custom-column",TOOLBAR_TOOLS_FIXED_LEFT:iconPrefix+"fixed-left",TOOLBAR_TOOLS_FIXED_LEFT_ACTIVE:iconPrefix+"fixed-left-fill",TOOLBAR_TOOLS_FIXED_RIGHT:iconPrefix+"fixed-right",TOOLBAR_TOOLS_FIXED_RIGHT_ACTIVE:iconPrefix+"fixed-right-fill"}),exports.setTheme=_core.VxeUI.setTheme),getTheme=exports.getTheme=_core.VxeUI.getTheme,setConfig=exports.setConfig=_core.VxeUI.setConfig,getConfig=exports.getConfig=_core.VxeUI.getConfig,setIcon=exports.setIcon=_core.VxeUI.setIcon,getIcon=exports.getIcon=_core.VxeUI.getIcon,setLanguage=exports.setLanguage=_core.VxeUI.setLanguage,setI18n=exports.setI18n=_core.VxeUI.setI18n,getI18n=exports.getI18n=_core.VxeUI.getI18n,globalEvents=exports.globalEvents=_core.VxeUI.globalEvents,globalResize=exports.globalResize=_core.VxeUI.globalResize,renderer=exports.renderer=_core.VxeUI.renderer,validators=exports.validators=_core.VxeUI.validators,menus=exports.menus=_core.VxeUI.menus,formats=exports.formats=_core.VxeUI.formats,commands=exports.commands=_core.VxeUI.commands,interceptor=exports.interceptor=_core.VxeUI.interceptor,clipboard=exports.clipboard=_core.VxeUI.clipboard,log=exports.log=_core.VxeUI.log,use=exports.use=_core.VxeUI.use,setup=e=>_core.VxeUI.setConfig(e),config=(exports.setup=setup,_core.VxeUI.setup=setup,e=>_core.VxeUI.setConfig(e)),t=(exports.config=config,_core.VxeUI.config=config,(e,o)=>_core.VxeUI.getI18n(e,o)),_t=(exports.t=t,_core.VxeUI.t=t,(e,o)=>(0,_utils.getFuncText)(e,o)),VXETable=(exports._t=_t,_core.VxeUI._t=_t,exports.VXETable=_core.VxeUI),saveFile=e=>_core.VxeUI.saveFile(e),readFile=(exports.saveFile=saveFile,e=>_core.VxeUI.readFile(e)),print=(exports.readFile=readFile,e=>_core.VxeUI.print(e)),modal=(exports.print=print,exports.modal={get(e){return _core.VxeUI.modal.get(e)},close(e){return _core.VxeUI.modal.close(e)},open(e){return _core.VxeUI.modal.open(e)},alert(e,o,r){return _core.VxeUI.modal.alert(e,o,r)},confirm(e,o,r){return _core.VxeUI.modal.confirm(e,o,r)},message(e,o){return _core.VxeUI.modal.message(e,o)},notification(e,o,r){return _core.VxeUI.modal.notification(e,o,r)}});var _default=exports.default=_core.VxeUI;
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.VXETable=void 0,Object.defineProperty(exports,"VxeUI",{enumerable:!0,get:function(){return _core.VxeUI}}),exports.version=exports.validators=exports.use=exports.t=exports.setup=exports.setTheme=exports.setLanguage=exports.setIcon=exports.setI18n=exports.setConfig=exports.saveFile=exports.renderer=exports.readFile=exports.print=exports.modal=exports.menus=exports.log=exports.interceptor=exports.globalResize=exports.globalEvents=exports.getTheme=exports.getIcon=exports.getI18n=exports.getConfig=exports.formats=exports.default=exports.config=exports.commands=exports.clipboard=exports._t=void 0;var _core=require("@vxe-ui/core"),_utils=require("./src/utils");let version=exports.version="3.9.14",iconPrefix=(_core.VxeUI.version=version,_core.VxeUI.tableVersion="3.9.14",_core.VxeUI.setConfig({emptyCell:"　",table:{fit:!0,showHeader:!0,animat:!0,delayHover:250,autoResize:!0,padding:!0,minHeight:144,resizeConfig:{refreshDelay:250},radioConfig:{strict:!0},checkboxConfig:{strict:!0},tooltipConfig:{enterable:!0},validConfig:{showMessage:!0,autoClear:!0,autoPos:!0,message:"inline",msgMode:"single"},columnConfig:{maxFixedSize:4},customConfig:{allowVisible:!0,allowResizable:!0,allowFixed:!0,allowSort:!0,showFooter:!0,placement:"top-right",modalOptions:{showMaximize:!0,mask:!0,lockView:!0,resize:!0,escClosable:!0}},sortConfig:{showIcon:!0,iconLayout:"vertical"},filterConfig:{showIcon:!0},treeConfig:{rowField:"id",parentField:"parentId",childrenField:"children",hasChildField:"hasChild",mapChildrenField:"_X_ROW_CHILD",indent:20,showIcon:!0},expandConfig:{showIcon:!0},editConfig:{showIcon:!0,showAsterisk:!0,autoFocus:!0},importConfig:{_typeMaps:{csv:1,html:1,xml:1,txt:1}},exportConfig:{_typeMaps:{csv:1,html:1,xml:1,txt:1}},printConfig:{},mouseConfig:{extension:!0},keyboardConfig:{isEsc:!0},areaConfig:{autoClear:!0,selectCellByHeader:!0},clipConfig:{isCopy:!0,isCut:!0,isPaste:!0},fnrConfig:{isFind:!0,isReplace:!0},scrollX:{gt:60},scrollY:{gt:100}},grid:{formConfig:{enabled:!0},pagerConfig:{enabled:!0},toolbarConfig:{enabled:!0},proxyConfig:{enabled:!0,autoLoad:!0,showResponseMsg:!0,showActiveMsg:!0,props:{list:null,result:"result",total:"page.total",message:"message"}}},toolbar:{}}),"vxe-table-icon-"),setTheme=(_core.VxeUI.setIcon({TABLE_SORT_ASC:iconPrefix+"caret-up",TABLE_SORT_DESC:iconPrefix+"caret-down",TABLE_FILTER_NONE:iconPrefix+"funnel",TABLE_FILTER_MATCH:iconPrefix+"funnel",TABLE_EDIT:iconPrefix+"edit",TABLE_TITLE_PREFIX:iconPrefix+"question-circle-fill",TABLE_TITLE_SUFFIX:iconPrefix+"question-circle-fill",TABLE_TREE_LOADED:iconPrefix+"spinner roll",TABLE_TREE_OPEN:iconPrefix+"caret-right rotate90",TABLE_TREE_CLOSE:iconPrefix+"caret-right",TABLE_EXPAND_LOADED:iconPrefix+"spinner roll",TABLE_EXPAND_OPEN:iconPrefix+"arrow-right rotate90",TABLE_EXPAND_CLOSE:iconPrefix+"arrow-right",TABLE_CHECKBOX_CHECKED:iconPrefix+"checkbox-checked-fill",TABLE_CHECKBOX_UNCHECKED:iconPrefix+"checkbox-unchecked",TABLE_CHECKBOX_INDETERMINATE:iconPrefix+"checkbox-indeterminate-fill",TABLE_RADIO_CHECKED:iconPrefix+"radio-checked-fill",TABLE_RADIO_UNCHECKED:iconPrefix+"radio-unchecked",TABLE_CUSTOM_SORT:iconPrefix+"drag-handle",TABLE_MENU_OPTIONS:iconPrefix+"arrow-right",TOOLBAR_TOOLS_REFRESH:iconPrefix+"repeat",TOOLBAR_TOOLS_REFRESH_LOADING:iconPrefix+"repeat roll",TOOLBAR_TOOLS_IMPORT:iconPrefix+"upload",TOOLBAR_TOOLS_EXPORT:iconPrefix+"download",TOOLBAR_TOOLS_PRINT:iconPrefix+"print",TOOLBAR_TOOLS_FULLSCREEN:iconPrefix+"fullscreen",TOOLBAR_TOOLS_MINIMIZE:iconPrefix+"minimize",TOOLBAR_TOOLS_CUSTOM:iconPrefix+"custom-column",TOOLBAR_TOOLS_FIXED_LEFT:iconPrefix+"fixed-left",TOOLBAR_TOOLS_FIXED_LEFT_ACTIVE:iconPrefix+"fixed-left-fill",TOOLBAR_TOOLS_FIXED_RIGHT:iconPrefix+"fixed-right",TOOLBAR_TOOLS_FIXED_RIGHT_ACTIVE:iconPrefix+"fixed-right-fill"}),exports.setTheme=_core.VxeUI.setTheme),getTheme=exports.getTheme=_core.VxeUI.getTheme,setConfig=exports.setConfig=_core.VxeUI.setConfig,getConfig=exports.getConfig=_core.VxeUI.getConfig,setIcon=exports.setIcon=_core.VxeUI.setIcon,getIcon=exports.getIcon=_core.VxeUI.getIcon,setLanguage=exports.setLanguage=_core.VxeUI.setLanguage,setI18n=exports.setI18n=_core.VxeUI.setI18n,getI18n=exports.getI18n=_core.VxeUI.getI18n,globalEvents=exports.globalEvents=_core.VxeUI.globalEvents,globalResize=exports.globalResize=_core.VxeUI.globalResize,renderer=exports.renderer=_core.VxeUI.renderer,validators=exports.validators=_core.VxeUI.validators,menus=exports.menus=_core.VxeUI.menus,formats=exports.formats=_core.VxeUI.formats,commands=exports.commands=_core.VxeUI.commands,interceptor=exports.interceptor=_core.VxeUI.interceptor,clipboard=exports.clipboard=_core.VxeUI.clipboard,log=exports.log=_core.VxeUI.log,use=exports.use=_core.VxeUI.use,setup=e=>_core.VxeUI.setConfig(e),config=(exports.setup=setup,_core.VxeUI.setup=setup,e=>_core.VxeUI.setConfig(e)),t=(exports.config=config,_core.VxeUI.config=config,(e,o)=>_core.VxeUI.getI18n(e,o)),_t=(exports.t=t,_core.VxeUI.t=t,(e,o)=>(0,_utils.getFuncText)(e,o)),VXETable=(exports._t=_t,_core.VxeUI._t=_t,exports.VXETable=_core.VxeUI),saveFile=e=>_core.VxeUI.saveFile(e),readFile=(exports.saveFile=saveFile,e=>_core.VxeUI.readFile(e)),print=(exports.readFile=readFile,e=>_core.VxeUI.print(e)),modal=(exports.print=print,exports.modal={get(e){return _core.VxeUI.modal.get(e)},close(e){return _core.VxeUI.modal.close(e)},open(e){return _core.VxeUI.modal.open(e)},alert(e,o,r){return _core.VxeUI.modal.alert(e,o,r)},confirm(e,o,r){return _core.VxeUI.modal.confirm(e,o,r)},message(e,o){return _core.VxeUI.modal.message(e,o)},notification(e,o,r){return _core.VxeUI.modal.notification(e,o,r)}});var _default=exports.default=_core.VxeUI;

package/lib/ui/src/log.js

@@ -8,6 +8,6 @@ var _core = require("@vxe-ui/core");
 const {
   log
 } = _core.VxeUI;
-const version = `table v${"3.9.13"}`;
+const version = `table v${"3.9.14"}`;
 const warnLog = exports.warnLog = log.create('warn', version);
 const errLog = exports.errLog = log.create('error', version);

package/lib/ui/src/log.min.js

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),exports.warnLog=exports.errLog=void 0;var _core=require("@vxe-ui/core");let log=_core.VxeUI.log,version="table v3.9.13",warnLog=exports.warnLog=log.create("warn",version),errLog=exports.errLog=log.create("error",version);
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.warnLog=exports.errLog=void 0;var _core=require("@vxe-ui/core");let log=_core.VxeUI.log,version="table v3.9.14",warnLog=exports.warnLog=log.create("warn",version),errLog=exports.errLog=log.create("error",version);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vxe-table",
-  "version": "3.9.13",
+  "version": "3.9.14",
   "description": "一个基于 vue 的 PC 端表格组件，支持增删改查、虚拟树、列拖拽，懒加载、快捷菜单、数据校验、树形结构、打印、导入导出、自定义模板、渲染器、JSON 配置式...",
   "scripts": {
     "update": "npm install --legacy-peer-deps",
@@ -28,7 +28,7 @@
   "style": "lib/style.css",
   "typings": "types/index.d.ts",
   "dependencies": {
-    "vxe-pc-ui": "^3.1.31"
+    "vxe-pc-ui": "^3.1.33"
   },
   "devDependencies": {
     "@babel/plugin-transform-modules-commonjs": "^7.25.7",

package/packages/table/src/body.ts

@@ -110,7 +110,7 @@ function renderColumn (h: any, _vm: any, $xetable: any, seq: any, rowid: any, fi
   let hasEllipsis = showTitle || showTooltip || showEllipsis
   let isDirty: any
   const tdOns: any = {}
-  const cellAlign = align || allAlign
+  const cellAlign = align || (compConf ? compConf.tableCellAlign : '') || allAlign
   const errorValidItem = validErrorMaps[`${rowid}:${column.id}`]
   const showValidTip = editRules && validOpts.showMessage && (validOpts.message === 'default' ? (height || tableData.length > 1) : validOpts.message === 'inline')
   const attrs: any = { colid: column.id }

package/packages/table/src/footer.ts

@@ -1,10 +1,13 @@
 import { CreateElement } from 'vue'
 import XEUtils from 'xe-utils'
+import { VxeUI } from '../../ui'
 import { getClass } from '../../ui/src/utils'
 import { updateCellTitle } from '../../ui/src/dom'
 
 const cellType = 'footer'
 
+const { renderer } = VxeUI
+
 function mergeFooterMethod (mergeFooterList: any, _rowIndex: any, _columnIndex: any) {
   for (let mIndex = 0; mIndex < mergeFooterList.length; mIndex++) {
     const { row: mergeRowIndex, col: mergeColIndex, rowspan: mergeRowspan, colspan: mergeColspan } = mergeFooterList[mIndex]
@@ -143,12 +146,14 @@ export default {
             class: ['vxe-footer--row', footerRowClassName ? XEUtils.isFunction(footerRowClassName) ? footerRowClassName(rowParams) : footerRowClassName : ''],
             style: footerRowStyle ? (XEUtils.isFunction(footerRowStyle) ? footerRowStyle(rowParams) : footerRowStyle) : null
           }, tableColumn.map((column: any, $columnIndex: any) => {
-            const { type, showFooterOverflow, footerAlign, align, footerClassName } = column
+            const { type, showFooterOverflow, footerAlign, align, footerClassName, editRender, cellRender } = column
+            const renderOpts = editRender || cellRender
+            const compConf = renderOpts ? renderer.get(renderOpts.name) : null
             const showAllTip = tooltipOpts.showAll || tooltipOpts.enabled
             const isColGroup = column.children && column.children.length
             const fixedHiddenColumn = fixedType ? column.fixed !== fixedType && !isColGroup : column.fixed && overflowX
             const footOverflow = XEUtils.isUndefined(showFooterOverflow) || XEUtils.isNull(showFooterOverflow) ? allColumnFooterOverflow : showFooterOverflow
-            const footAlign = footerAlign || align || allFooterAlign || allAlign
+            const footAlign = footerAlign || (compConf ? compConf.tableFooterCellAlign : '') || allFooterAlign || align || (compConf ? compConf.tableCellAlign : '') || allAlign
             let showEllipsis = footOverflow === 'ellipsis'
             const showTitle = footOverflow === 'title'
             const showTooltip = footOverflow === true || footOverflow === 'tooltip'

package/packages/table/src/header.ts

@@ -1,9 +1,12 @@
 import { CreateElement } from 'vue'
 import XEUtils from 'xe-utils'
+import { VxeUI } from '../../ui'
 import { getClass } from '../../ui/src/utils'
 import { getOffsetPos, hasClass, addClass, removeClass } from '../../ui/src/dom'
 import { convertHeaderColumnToRows, getColReMinWidth } from './util'
 
+const { renderer } = VxeUI
+
 const cellType = 'header'
 
 export default {
@@ -120,13 +123,15 @@ export default {
             class: ['vxe-header--row', headerRowClassName ? XEUtils.isFunction(headerRowClassName) ? headerRowClassName({ $table: $xetable, $rowIndex, fixed: fixedType, type: cellType }) : headerRowClassName : ''],
             style: headerRowStyle ? (XEUtils.isFunction(headerRowStyle) ? headerRowStyle({ $table: $xetable, $rowIndex, fixed: fixedType, type: cellType }) : headerRowStyle) : null
           }, cols.map((column: any, $columnIndex: any) => {
-            const { type, showHeaderOverflow, headerAlign, align, headerClassName } = column
+            const { type, showHeaderOverflow, headerAlign, align, headerClassName, editRender, cellRender } = column
             // const { enabled } = tooltipOpts
             const colid = column.id
+            const renderOpts = editRender || cellRender
+            const compConf = renderOpts ? renderer.get(renderOpts.name) : null
             const isColGroup = column.children && column.children.length
             const fixedHiddenColumn = fixedType ? column.fixed !== fixedType && !isColGroup : column.fixed && overflowX
             const headOverflow = XEUtils.isUndefined(showHeaderOverflow) || XEUtils.isNull(showHeaderOverflow) ? allColumnHeaderOverflow : showHeaderOverflow
-            const headAlign = headerAlign || align || allHeaderAlign || allAlign
+            const headAlign = headerAlign || (compConf ? compConf.tableHeaderCellAlign : '') || allHeaderAlign || align || (compConf ? compConf.tableCellAlign : '') || allAlign
             let showEllipsis = headOverflow === 'ellipsis'
             const showTitle = headOverflow === 'title'
             const showTooltip = headOverflow === true || headOverflow === 'tooltip'