vxe-table 4.12.0-beta.28 → 4.12.0-beta.29

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

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _vue=require("vue"),_xeUtils=_interopRequireDefault(require("xe-utils")),_ui=require("../../ui"),_util=require("./util"),_dom=require("../../ui/src/dom"),_utils=require("../../ui/src/utils"),_vn=require("../../ui/src/vn");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let{getI18n,renderer,renderEmptyElement}=_ui.VxeUI,renderType="body";var _default=exports.default=(0,_vue.defineComponent)({name:"VxeTableBody",props:{tableData:Array,tableColumn:Array,fixedColumn:Array,fixedType:{type:String,default:""}},setup(k){let He=(0,_vue.inject)("$xeTable",{}),{xID:z,props:Le,context:q,reactData:je,internalData:Ne}=He,{computeEditOpts:Be,computeMouseOpts:We,computeCellOffsetWidth:Ge,computeAreaOpts:Pe,computeDefaultRowHeight:Ke,computeEmptyOpts:A,computeTooltipOpts:Ve,computeRadioOpts:e,computeExpandOpts:le,computeTreeOpts:v,computeCheckboxOpts:Xe,computeCellOpts:Ye,computeValidOpts:Je,computeRowOpts:Qe,computeColumnOpts:Ze,computeRowDragOpts:el,computeColumnDragOpts:l,computeResizableOpts:ll}=He.getComputeMaps(),$=(0,_vue.ref)(),U=(0,_vue.ref)(),F=(0,_vue.ref)(),H=(0,_vue.ref)(),L=(0,_vue.ref)(),j=(0,_vue.ref)(),N=(0,_vue.ref)(),B=(0,_vue.ref)(),tl=()=>{var e=Le.delayHover,{lastScrollTime:l,isDragResize:t}=je;return!!(t||l&&Date.now()<l+e)},al=(e,l,t)=>{var{row:a,column:r}=l,o=Ne.afterFullData,i=Le.treeConfig,s=v.value,{slots:r,treeNode:n}=r,d=Ne.fullAllDataRowIdData;if(r&&r.line)return He.callSlot(r.line,l);r=d[e];let u=0,c=null;r&&(u=r.level,c=r.items[r.treeIndex-1]);d=He.eqRow(o[0],a);return i&&n&&(s.showLine||s.line)?[(0,_vue.h)("div",{key:"tl",class:"vxe-tree--line-wrapper"},[(0,_vue.h)("div",{class:"vxe-tree--line",style:{height:`${d?1:(0,_util.calcTreeLine)(l,c)}px`,bottom:`-${Math.floor(t/2)}px`,left:u*s.indent+(u?2-(0,_util.getOffsetSize)(He):0)+16+"px"}})])]:[]},ae=($,e,l,U,F,t,a,H,r,o,L,j,i)=>{var s=He.xeGrid,{fullAllDataRowIdData:n,visibleColumn:N}=Ne,{columnKey:B,resizable:d,showOverflow:u,border:W,height:c,cellClassName:G,cellStyle:P,align:K,spanMethod:V,mouseConfig:X,editConfig:Y,editRules:v,tooltipConfig:p,padding:g}=Le,{tableData:h,dragRow:J,overflowX:Q,currentColumn:Z,scrollXLoad:ee,scrollYLoad:x,calcCellHeightFlag:w,resizeHeightFlag:m,resizeWidthFlag:le,mergeList:te,editStore:ae,isAllOverflow:re,validErrorMaps:_}=je,{afterFullData:oe,scrollXStore:f,scrollYStore:ie}=Ne,se=Ye.value,b=Je.value,ne=Xe.value,de=Be.value,y=Ve.value,{isAllColumnDrag:ue,isAllRowDrag:ce}=ll.value,C=Qe.value,R=el.value,ve=Ke.value,w=w?se.height||C.height:0,{disabledMethod:D,isCrossDrag:pe,isPeerDrag:ge}=R,he=Ze.value,xe=We.value,we=Pe.value,me=Ge.value,we=we.selectCellToRow,{type:_e,cellRender:fe,editRender:be,align:ye,showOverflow:Ce,className:Re,treeNode:De,rowResize:Ee,padding:E,verticalAlign:O,slots:Oe}=o,I=se.verticalAlign,ae=ae.actived,n=n[e],M=o.id,S=be||fe,S=S?renderer.get(S.name):null,Ie=S?S.tableCellClassName||S.cellClassName:null,Me=S?S.tableCellStyle||S.cellStyle:"";let Se=y.showAll;var Te=He.getColumnIndex(o),y=He.getVTColumnIndex(o),ke=(0,_utils.isEnableConf)(be),m=m?n.resizeHeight:0;let T=l?o.fixed!==l:o.fixed&&Q;Q=_xeUtils.default.eqNull(E)?null===g?se.padding:g:E,g=_xeUtils.default.eqNull(Ce)?u:Ce,E="ellipsis"===g;let k="title"===g,z=!0===g||"tooltip"===g;u=re||k||z||E,Ce=_xeUtils.default.isBoolean(o.resizable)?o.resizable:he.resizable||d,g=!!w,d=0<m;let ze;w={},m=ye||(S?S.tableCellAlign:"")||K,ye=_xeUtils.default.eqNull(O)?I:O,S=_[e+":"+M],K=v&&b.showMessage&&("default"===b.message?c||1<h.length:"inline"===b.message),I={colid:M};let q={$table:He,$grid:s,isEdit:!1,seq:$,rowid:e,row:t,rowIndex:a,$rowIndex:H,_rowIndex:r,column:o,columnIndex:Te,$columnIndex:L,_columnIndex:y,fixed:l,type:renderType,isHidden:!!T,level:F,visibleData:oe,data:h,items:i},A=!1,qe=!1,Ae=((A=C.drag?"row"===R.trigger||o.dragSort&&"cell"===R.trigger:A)&&(qe=!(!D||!D(q))),(k||z||Se||p)&&(w.onMouseenter=e=>{tl()||(k?(0,_dom.updateCellTitle)(e.currentTarget,o):(z||Se)&&He.triggerBodyTooltipEvent(e,q),He.dispatchEvent("cell-mouseenter",Object.assign({cell:e.currentTarget},q),e))}),(z||Se||p)&&(w.onMouseleave=e=>{tl()||((z||Se)&&He.handleTargetLeaveEvent(e),He.dispatchEvent("cell-mouseleave",Object.assign({cell:e.currentTarget},q),e))}),(A||ne.range||X)&&(w.onMousedown=e=>{He.triggerCellMousedownEvent(e,q)}),A&&(w.onMouseup=He.triggerCellMouseupEvent),w.onClick=e=>{He.triggerCellClickEvent(e,q)},!(w.onDblclick=e=>{He.triggerCellDblclickEvent(e,q)}));if(te.length){O=(0,_util.mergeBodyMethod)(te,r,y);if(O){var{rowspan:_,colspan:v}=O;if(!_||!v)return null;1<_&&(Ae=!0,I.rowspan=_),1<v&&(Ae=!0,I.colspan=v)}}else if(V){var{rowspan:c=1,colspan:s=1}=V(q)||{};if(!c||!s)return null;1<c&&(I.rowspan=c),1<s&&(I.colspan=s)}!(T=T&&te&&(1<I.colspan||1<I.rowspan)?!1:T)&&Y&&(be||fe)&&(de.showStatus||de.showUpdateStatus)&&(ze=He.isUpdateByRow(t,o.field));$=x&&!u,a=n.resizeHeight||se.height||C.height||n.height||ve,H=L===j.length-1,oe=!o.resizeWidth&&("auto"===o.minWidth||"auto"===o.width);let $e=!1;Ae||J&&(0,_util.getRowid)(He,J)===e||(x&&(r<ie.visibleStartIndex-ie.preloadSize||r>ie.visibleEndIndex+ie.preloadSize)||ee&&!o.fixed&&(y<f.visibleStartIndex-f.preloadSize||y>f.visibleEndIndex+f.preloadSize))&&($e=!0);h={};if(u&&le){let l=I.colspan||0;if(1<l)for(let e=1;e<l;e++){var Ue=N[Te+e];Ue&&(l+=Ue.renderWidth)}h.width=o.renderWidth-me*l+"px"}x||u||g||d?h.height=a+"px":h.minHeight=a+"px";i=[];T&&re?i.push((0,_vue.h)("div",{key:"tc",class:["vxe-cell",{"c--title":k,"c--tooltip":z,"c--ellipsis":E}],style:h})):(i.push(...al(e,q,a),(0,_vue.h)("div",{key:"tc",class:["vxe-cell",{"c--title":k,"c--tooltip":z,"c--ellipsis":E}],style:h,title:k?He.getCellLabel(t,o):null},$e?[]:[(0,_vue.h)("div",{colid:M,rowid:e,class:"vxe-cell--wrapper"},o.renderCell(q))])),K&&S&&(R=S.rule,D=Oe?Oe.valid:null,p=Object.assign(Object.assign(Object.assign({},q),S),{rule:S}),i.push((0,_vue.h)("div",{key:"tcv",class:["vxe-cell--valid-error-tip",(0,_dom.getPropClass)(b.className,p)],style:R&&R.maxWidth?{width:R.maxWidth+"px"}:null},[(0,_vue.h)("div",{class:"vxe-cell--valid-error-wrapper vxe-cell--valid-error-theme-"+(b.theme||"normal")},[D?He.callSlot(D,p):[(0,_vue.h)("span",{class:"vxe-cell--valid-error-msg"},S.content)]])]))));let Fe=!1;return X&&xe.area&&we&&((y||!0!==we)&&we!==o.field||(Fe=!0)),!T&&Ce&&ue&&i.push((0,_vue.h)("div",{key:"tcc",class:["vxe-cell--col-resizable",{"is--line":!W||"none"===W}],onMousedown:e=>He.handleColResizeMousedownEvent(e,l,q),onDblclick:e=>He.handleColResizeDblclickEvent(e,q)})),(Ee||ce)&&C.resizable&&i.push((0,_vue.h)("div",{key:"tcr",class:"vxe-cell--row-resizable",onMousedown:e=>He.handleRowResizeMousedownEvent(e,q),onDblclick:e=>He.handleRowResizeDblclickEvent(e,q)})),(0,_vue.h)("td",Object.assign(Object.assign(Object.assign({class:["vxe-body--column",M,ye?"col--vertical-"+ye:"",m?"col--"+m:"",_e?"col--"+_e:"",{"col--last":H,"col--tree-node":De,"col--edit":ke,"col--ellipsis":u,"col--cs-height":g,"col--rs-height":d,"col--to-row":Fe,"col--auto-height":$,"fixed--width":!oe,"fixed--hidden":T,"is--padding":Q,"is--progress":T&&re||$e,"is--drag-cell":A&&(pe||ge||!F),"is--drag-disabled":qe,"col--dirty":ze,"col--active":Y&&ke&&ae.row===t&&(ae.column===o||"row"===de.mode),"col--valid-error":!!S,"col--current":Z===o},(0,_dom.getPropClass)(Ie,q),(0,_dom.getPropClass)(Re,q),(0,_dom.getPropClass)(G,q)],key:B||ee||x||he.useKey||C.useKey||he.drag?M:L},I),{style:Object.assign({},_xeUtils.default.isFunction(Me)?Me(q):Me,_xeUtils.default.isFunction(P)?P(q):P)}),w),U&&T?[]:i)},te=(x,w,m,_)=>{let{stripe:f,rowKey:b,highlightHoverRow:y,rowClassName:C,rowStyle:R,editConfig:D,treeConfig:E}=Le,{hasFixedColumn:O,treeExpandedFlag:I,isColLoading:M,scrollXLoad:S,scrollYLoad:T,isAllOverflow:k,rowExpandedFlag:z,expandColumn:q,selectRadioRow:A,pendingRowFlag:$,isDragColMove:U,rowExpandHeightFlag:F}=je,{fullAllDataRowIdData:H,treeExpandedMaps:L,pendingRowMaps:j,rowExpandedMaps:N}=Ne,B=Xe.value,W=e.value,G=v.value,P=Be.value,K=Qe.value,V=Ze.value,X=l.value,{transform:Y,seqMode:Q}=G,Z=G.children||G.childrenField,J=[],ee=(0,_util.createHandleGetRowId)(He).handleGetRowId;return m.forEach((t,a)=>{var e={};let r,o=(r=He.getRowIndex(t),(K.isHover||y)&&(e.onMouseenter=e=>{tl()||He.triggerHoverEvent(e,{row:t,rowIndex:r})},e.onMouseleave=()=>{tl()||He.clearHoverRow()}),ee(t));var l=H[o];let i=0,s=-1,n=0;l&&(i=l.level,s=E&&Y&&"increasing"===Q?l._index+1:l.seq,n=l._index);var d={$table:He,seq:s,rowid:o,fixed:x,type:renderType,level:i,row:t,rowIndex:r,$rowIndex:a,_rowIndex:n},u=q&&!!z&&!!N[o];let c=!1,v=[],p=!1;D&&(p=He.isInsertByRow(t)),!E||T||Y||(v=t[Z],c=!!I&&v&&0<v.length&&!!L[o]),!K.drag||E&&!Y||(e.onDragstart=He.handleRowDragDragstartEvent,e.onDragend=He.handleRowDragDragendEvent,e.onDragover=He.handleRowDragDragoverEvent);var g=["vxe-body--row",E?"row--level-"+i:"",{"row--stripe":f&&(n+1)%2==0,"is--new":p,"is--expand-row":u,"is--expand-tree":c,"row--new":p&&(P.showStatus||P.showInsertStatus),"row--radio":W.highlight&&He.eqRow(A,t),"row--checked":B.highlight&&He.isCheckedByCheckboxRow(t),"row--pending":!!$&&!!j[o]},(0,_dom.getPropClass)(C,d)];let h=_.map((e,l)=>ae(s,o,x,w,i,t,r,a,n,e,l,_,m));J.push(!M&&V.drag&&X.animation?(0,_vue.h)(_vue.TransitionGroup,Object.assign({name:"vxe-header--col-list"+(U?"":"-disabled"),tag:"tr",class:g,rowid:o,style:R?_xeUtils.default.isFunction(R)?R(d):R:null,key:b||S||T||K.useKey||K.drag||V.drag||E?o:a},e),{default:()=>h}):(0,_vue.h)("tr",Object.assign({class:g,rowid:o,style:R?_xeUtils.default.isFunction(R)?R(d):R:null,key:b||S||T||K.useKey||K.drag||V.drag||E?o:a},e),h)),u&&({height:g,padding:d,mode:e}=le.value,"fixed"===e?J.push((0,_vue.h)("tr",{class:"vxe-body--row-expanded-place",key:"expand_"+o,rowid:o},[(0,_vue.h)("td",{class:"vxe-body--row-expanded-place-column",colspan:_.length,style:{height:`${F?l.expandHeight||g:0}px`}})])):(u={},e=(g&&(u.height=g+"px"),E&&(u.paddingLeft=i*G.indent+30+"px"),q).showOverflow,l=_xeUtils.default.isUndefined(e)||_xeUtils.default.isNull(e)?k:e,e={$table:He,seq:s,column:q,fixed:x,type:renderType,level:i,row:t,rowIndex:r,$rowIndex:a,_rowIndex:n},J.push((0,_vue.h)("tr",{class:["vxe-body--expanded-row",{"is--padding":d}],key:"expand_"+o},[(0,_vue.h)("td",{class:["vxe-body--expanded-column",{"fixed--hidden":x&&!O,"col--ellipsis":l}],colspan:_.length},[(0,_vue.h)("div",{class:["vxe-body--expanded-cell",{"is--ellipsis":g}],style:u},[q.renderData(e)])])])))),c&&J.push(...te(x,w,v,_))}),J};(0,_vue.onMounted)(()=>{(0,_vue.nextTick)(()=>{var e=k.fixedType,l=Ne.elemStore,e=`${e||"main"}-body-`;l[e+"wrapper"]=$,l[e+"scroll"]=U,l[e+"table"]=F,l[e+"colgroup"]=H,l[e+"list"]=L,l[e+"xSpace"]=j,l[e+"ySpace"]=N,l[e+"emptyBlock"]=B})}),(0,_vue.onUnmounted)(()=>{var e=k.fixedType,l=Ne.elemStore,e=`${e||"main"}-body-`;l[e+"wrapper"]=null,l[e+"scroll"]=null,l[e+"table"]=null,l[e+"colgroup"]=null,l[e+"list"]=null,l[e+"xSpace"]=null,l[e+"ySpace"]=null,l[e+"emptyBlock"]=null});return()=>{var e=q.slots,l=He.xeGrid;let{fixedColumn:t,fixedType:a,tableColumn:r}=k;var{spanMethod:o,footerSpanMethod:i,mouseConfig:s}=Le,{isGroup:n,tableData:d,isRowLoading:u,isColLoading:c,overflowX:v,scrollXLoad:p,scrollYLoad:g,isAllOverflow:h,isDragRowMove:x,expandColumn:w,dragRow:m,dragCol:_}=je,{visibleColumn:f,fullAllDataRowIdData:b,fullColumnIdData:y}=Ne,C=Qe.value,R=A.value,D=We.value,E=el.value,O=le.value;let I=d,M=r,S=!1;!(p||g||h)||w&&"fixed"!==O.mode||o||i||(S=!0),c||!a&&v||(M=f),a&&S&&(M=t||[]),g&&m&&2<I.length&&(d=b[(0,_util.getRowid)(He,m)])&&(h=d._index,w=I[0],O=I[I.length-1],o=b[(0,_util.getRowid)(He,w)],i=b[(0,_util.getRowid)(He,O)],o)&&i&&(v=o._index,f=i._index,h<v?I=[m].concat(I):f<h&&(I=I.concat([m]))),a||n||p&&_&&2<M.length&&(g=y[_.id])&&(d=g._index,w=M[0],b=M[M.length-1],O=y[w.id],o=y[b.id],O)&&o&&(i=O._index,v=o._index,d<i?M=[_].concat(M):v<d&&(M=M.concat([_])));let T;f=e?e.empty:null,T=f?He.callSlot(f,{$table:He,$grid:l}):(m=(h=R.name?renderer.get(R.name):null)?h.renderTableEmpty||h.renderTableEmptyView||h.renderEmpty:null)?(0,_vn.getSlotVNs)(m(R,{$table:He})):Le.emptyText||getI18n("vxe.table.emptyText"),n={onScroll(e){He.triggerBodyScrollEvent(e,a)}};return(0,_vue.h)("div",{ref:$,class:["vxe-table--body-wrapper",a?`fixed-${a}--wrapper`:"body--wrapper"],xid:z},[(0,_vue.h)("div",Object.assign({ref:U,class:"vxe-table--body-inner-wrapper"},n),[a?renderEmptyElement(He):(0,_vue.h)("div",{ref:j,class:"vxe-body--x-space"}),(0,_vue.h)("div",{ref:N,class:"vxe-body--y-space"}),(0,_vue.h)("table",{ref:F,class:"vxe-table--body",xid:z,cellspacing:0,cellpadding:0,border:0},[(0,_vue.h)("colgroup",{ref:H},M.map((e,l)=>(0,_vue.h)("col",{name:e.id,key:l,style:{width:e.renderWidth+"px"}}))),!u&&!c&&C.drag&&E.animation?(0,_vue.h)(_vue.TransitionGroup,{ref:L,name:"vxe-body--row-list"+(x?"":"-disabled"),tag:"tbody"},{default:()=>te(a,S,I,M)}):(0,_vue.h)("tbody",{ref:L},te(a,S,I,M))]),(0,_vue.h)("div",{class:"vxe-table--checkbox-range"}),s&&D.area?(0,_vue.h)("div",{class:"vxe-table--cell-area"},[(0,_vue.h)("span",{class:"vxe-table--cell-main-area"},D.extension?[(0,_vue.h)("span",{class:"vxe-table--cell-main-area-btn",onMousedown(e){He.triggerCellAreaExtendMousedownEvent&&He.triggerCellAreaExtendMousedownEvent(e,{$table:He,fixed:a,type:renderType})}})]:[]),(0,_vue.h)("span",{class:"vxe-table--cell-copy-area"}),(0,_vue.h)("span",{class:"vxe-table--cell-extend-area"}),(0,_vue.h)("span",{class:"vxe-table--cell-multi-area"}),(0,_vue.h)("span",{class:"vxe-table--cell-active-area"}),(0,_vue.h)("span",{class:"vxe-table--cell-row-status-area"})]):renderEmptyElement(He),a?renderEmptyElement(He):(0,_vue.h)("div",{class:"vxe-table--empty-block",ref:B},[(0,_vue.h)("div",{class:"vxe-table--empty-content"},T)])])])}}});
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _vue=require("vue"),_xeUtils=_interopRequireDefault(require("xe-utils")),_ui=require("../../ui"),_util=require("./util"),_dom=require("../../ui/src/dom"),_utils=require("../../ui/src/utils"),_vn=require("../../ui/src/vn");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let{getI18n,renderer,renderEmptyElement}=_ui.VxeUI,renderType="body";var _default=exports.default=(0,_vue.defineComponent)({name:"VxeTableBody",props:{tableData:Array,tableColumn:Array,fixedColumn:Array,fixedType:{type:String,default:""}},setup(T){let He=(0,_vue.inject)("$xeTable",{}),{xID:z,props:Le,context:q,reactData:je,internalData:Ne}=He,{computeEditOpts:Be,computeMouseOpts:We,computeCellOffsetWidth:Ge,computeAreaOpts:Pe,computeDefaultRowHeight:Ke,computeEmptyOpts:A,computeTooltipOpts:Xe,computeRadioOpts:e,computeExpandOpts:le,computeTreeOpts:v,computeCheckboxOpts:Ve,computeCellOpts:Ye,computeValidOpts:Je,computeRowOpts:Qe,computeColumnOpts:Ze,computeRowDragOpts:el,computeColumnDragOpts:l,computeResizableOpts:ll}=He.getComputeMaps(),$=(0,_vue.ref)(),U=(0,_vue.ref)(),F=(0,_vue.ref)(),H=(0,_vue.ref)(),L=(0,_vue.ref)(),j=(0,_vue.ref)(),N=(0,_vue.ref)(),B=(0,_vue.ref)(),tl=()=>{var e=Le.delayHover,{lastScrollTime:l,isDragResize:t}=je;return!!(t||l&&Date.now()<l+e)},al=(e,l,t)=>{var{row:a,column:r}=l,o=Ne.afterFullData,i=Le.treeConfig,s=v.value,{slots:r,treeNode:n}=r,d=Ne.fullAllDataRowIdData;if(r&&r.line)return He.callSlot(r.line,l);r=d[e];let u=0,c=null;r&&(u=r.level,c=r.items[r.treeIndex-1]);d=He.eqRow(o[0],a);return i&&n&&(s.showLine||s.line)?[(0,_vue.h)("div",{key:"tl",class:"vxe-tree--line-wrapper"},[(0,_vue.h)("div",{class:"vxe-tree--line",style:{height:`${d?1:(0,_util.calcTreeLine)(l,c)}px`,bottom:`-${Math.floor(t/2)}px`,left:u*s.indent+(u?2-(0,_util.getOffsetSize)(He):0)+16+"px"}})])]:[]},ae=($,e,l,U,F,t,a,H,r,o,L,j,i)=>{var s=He.xeGrid,{fullAllDataRowIdData:n,fullColumnIdData:d,visibleColumn:N}=Ne,{columnKey:B,resizable:u,showOverflow:c,border:W,height:v,cellClassName:G,cellStyle:P,align:K,spanMethod:X,mouseConfig:V,editConfig:Y,editRules:p,tooltipConfig:g,padding:h}=Le,{tableData:x,dragRow:J,overflowX:Q,currentColumn:Z,scrollXLoad:ee,scrollYLoad:w,calcCellHeightFlag:m,resizeHeightFlag:_,resizeWidthFlag:le,mergeList:te,editStore:ae,isAllOverflow:re,validErrorMaps:f}=je,{afterFullData:oe,scrollXStore:ie,scrollYStore:se}=Ne,ne=Ye.value,b=Je.value,de=Ve.value,ue=Be.value,y=Xe.value,{isAllColumnDrag:ce,isAllRowDrag:ve}=ll.value,C=Qe.value,R=el.value,pe=Ke.value,m=m?ne.height||C.height:0,{disabledMethod:D,isCrossDrag:ge,isPeerDrag:he}=R,xe=Ze.value,we=We.value,me=Pe.value,_e=Ge.value,me=me.selectCellToRow,{type:fe,cellRender:be,editRender:ye,align:Ce,showOverflow:Re,className:De,treeNode:Ee,rowResize:Oe,padding:E,verticalAlign:O,slots:Me}=o,M=ne.verticalAlign,ae=ae.actived,n=n[e]||{},S=o.id,d=d[S]||{},I=ye||be,I=I?renderer.get(I.name):null,Se=I?I.tableCellClassName||I.cellClassName:null,Ie=I?I.tableCellStyle||I.cellStyle:"";let ke=y.showAll;var Te=d.index,y=d._index,d=(0,_utils.isEnableConf)(ye),_=_?n.resizeHeight:0;let k=l?o.fixed!==l:o.fixed&&Q;Q=_xeUtils.default.eqNull(E)?null===h?ne.padding:h:E,h=_xeUtils.default.eqNull(Re)?c:Re,E="ellipsis"===h;let T="title"===h,z=!0===h||"tooltip"===h;c=re||T||z||E,Re=_xeUtils.default.isBoolean(o.resizable)?o.resizable:xe.resizable||u,h=!!m,u=0<_;let ze;m={},_=Ce||(I?I.tableCellAlign:"")||K,Ce=_xeUtils.default.eqNull(O)?M:O,I=f[e+":"+S],K=p&&b.showMessage&&("default"===b.message?v||1<x.length:"inline"===b.message),M={colid:S};let q={$table:He,$grid:s,isEdit:!1,seq:$,rowid:e,row:t,rowIndex:a,$rowIndex:H,_rowIndex:r,column:o,columnIndex:Te,$columnIndex:L,_columnIndex:y,fixed:l,type:renderType,isHidden:!!k,level:F,visibleData:oe,data:x,items:i},A=!1,qe=!1,Ae=((A=C.drag?"row"===R.trigger||o.dragSort&&"cell"===R.trigger:A)&&(qe=!(!D||!D(q))),(T||z||ke||g)&&(m.onMouseenter=e=>{tl()||(T?(0,_dom.updateCellTitle)(e.currentTarget,o):(z||ke)&&He.triggerBodyTooltipEvent(e,q),He.dispatchEvent("cell-mouseenter",Object.assign({cell:e.currentTarget},q),e))}),(z||ke||g)&&(m.onMouseleave=e=>{tl()||((z||ke)&&He.handleTargetLeaveEvent(e),He.dispatchEvent("cell-mouseleave",Object.assign({cell:e.currentTarget},q),e))}),(A||de.range||V)&&(m.onMousedown=e=>{He.triggerCellMousedownEvent(e,q)}),A&&(m.onMouseup=He.triggerCellMouseupEvent),m.onClick=e=>{He.triggerCellClickEvent(e,q)},!(m.onDblclick=e=>{He.triggerCellDblclickEvent(e,q)}));if(te.length){O=(0,_util.mergeBodyMethod)(te,r,y);if(O){var{rowspan:f,colspan:p}=O;if(!f||!p)return null;1<f&&(Ae=!0,M.rowspan=f),1<p&&(Ae=!0,M.colspan=p)}}else if(X){var{rowspan:v=1,colspan:s=1}=X(q)||{};if(!v||!s)return null;1<v&&(M.rowspan=v),1<s&&(M.colspan=s)}!(k=k&&te&&(1<M.colspan||1<M.rowspan)?!1:k)&&Y&&(ye||be)&&(ue.showStatus||ue.showUpdateStatus)&&(ze=He.isUpdateByRow(t,o.field));$=w&&!c,a=n.resizeHeight||ne.height||C.height||n.height||pe,H=L===j.length-1,oe=!o.resizeWidth&&("auto"===o.minWidth||"auto"===o.width);let $e=!1;Ae||J&&(0,_util.getRowid)(He,J)===e||(w&&(r<se.visibleStartIndex-se.preloadSize||r>se.visibleEndIndex+se.preloadSize)||ee&&!o.fixed&&(y<ie.visibleStartIndex-ie.preloadSize||y>ie.visibleEndIndex+ie.preloadSize))&&($e=!0);x={};if(c&&le){let l=M.colspan||0;if(1<l)for(let e=1;e<l;e++){var Ue=N[Te+e];Ue&&(l+=Ue.renderWidth)}x.width=o.renderWidth-_e*l+"px"}w||c||h||u?x.height=a+"px":x.minHeight=a+"px";i=[];k&&re?i.push((0,_vue.h)("div",{key:"tc",class:["vxe-cell",{"c--title":T,"c--tooltip":z,"c--ellipsis":E}],style:x})):(i.push(...al(e,q,a),(0,_vue.h)("div",{key:"tc",class:["vxe-cell",{"c--title":T,"c--tooltip":z,"c--ellipsis":E}],style:x,title:T?He.getCellLabel(t,o):null},$e?[]:[(0,_vue.h)("div",{colid:S,rowid:e,class:"vxe-cell--wrapper"},o.renderCell(q))])),K&&I&&(R=I.rule,D=Me?Me.valid:null,g=Object.assign(Object.assign(Object.assign({},q),I),{rule:I}),i.push((0,_vue.h)("div",{key:"tcv",class:["vxe-cell--valid-error-tip",(0,_dom.getPropClass)(b.className,g)],style:R&&R.maxWidth?{width:R.maxWidth+"px"}:null},[(0,_vue.h)("div",{class:"vxe-cell--valid-error-wrapper vxe-cell--valid-error-theme-"+(b.theme||"normal")},[D?He.callSlot(D,g):[(0,_vue.h)("span",{class:"vxe-cell--valid-error-msg"},I.content)]])]))));let Fe=!1;return V&&we.area&&me&&((y||!0!==me)&&me!==o.field||(Fe=!0)),!k&&Re&&ce&&i.push((0,_vue.h)("div",{key:"tcc",class:["vxe-cell--col-resizable",{"is--line":!W||"none"===W}],onMousedown:e=>He.handleColResizeMousedownEvent(e,l,q),onDblclick:e=>He.handleColResizeDblclickEvent(e,q)})),(Oe||ve)&&C.resizable&&i.push((0,_vue.h)("div",{key:"tcr",class:"vxe-cell--row-resizable",onMousedown:e=>He.handleRowResizeMousedownEvent(e,q),onDblclick:e=>He.handleRowResizeDblclickEvent(e,q)})),(0,_vue.h)("td",Object.assign(Object.assign(Object.assign({class:["vxe-body--column",S,Ce?"col--vertical-"+Ce:"",_?"col--"+_:"",fe?"col--"+fe:"",{"col--last":H,"col--tree-node":Ee,"col--edit":d,"col--ellipsis":c,"col--cs-height":h,"col--rs-height":u,"col--to-row":Fe,"col--auto-height":$,"fixed--width":!oe,"fixed--hidden":k,"is--padding":Q,"is--progress":k&&re||$e,"is--drag-cell":A&&(ge||he||!F),"is--drag-disabled":qe,"col--dirty":ze,"col--active":Y&&d&&ae.row===t&&(ae.column===o||"row"===ue.mode),"col--valid-error":!!I,"col--current":Z===o},(0,_dom.getPropClass)(Se,q),(0,_dom.getPropClass)(De,q),(0,_dom.getPropClass)(G,q)],key:B||ee||w||xe.useKey||C.useKey||xe.drag?S:L},M),{style:Object.assign({},_xeUtils.default.isFunction(Ie)?Ie(q):Ie,_xeUtils.default.isFunction(P)?P(q):P)}),m),U&&k?[]:i)},te=(x,w,m,_)=>{let{stripe:f,rowKey:b,highlightHoverRow:y,rowClassName:C,rowStyle:R,editConfig:D,treeConfig:E}=Le,{hasFixedColumn:O,treeExpandedFlag:M,isColLoading:S,scrollXLoad:I,scrollYLoad:k,isAllOverflow:T,rowExpandedFlag:z,expandColumn:q,selectRadioRow:A,pendingRowFlag:$,isDragColMove:U,rowExpandHeightFlag:F}=je,{fullAllDataRowIdData:H,treeExpandedMaps:L,pendingRowMaps:j,rowExpandedMaps:N}=Ne,B=Ve.value,W=e.value,G=v.value,P=Be.value,K=Qe.value,X=Ze.value,V=l.value,{transform:Y,seqMode:Q}=G,Z=G.children||G.childrenField,J=[],ee=(0,_util.createHandleGetRowId)(He).handleGetRowId;return m.forEach((t,a)=>{var e={};let r,o=(r=He.getRowIndex(t),(K.isHover||y)&&(e.onMouseenter=e=>{tl()||He.triggerHoverEvent(e,{row:t,rowIndex:r})},e.onMouseleave=()=>{tl()||He.clearHoverRow()}),ee(t));var l=H[o]||{};let i=0,s=-1,n=0;l&&(i=l.level,s=E&&Y&&"increasing"===Q?l._index+1:l.seq,n=l._index);var d={$table:He,seq:s,rowid:o,fixed:x,type:renderType,level:i,row:t,rowIndex:r,$rowIndex:a,_rowIndex:n},u=q&&!!z&&!!N[o];let c=!1,v=[],p=!1;D&&(p=He.isInsertByRow(t)),!E||k||Y||(v=t[Z],c=!!M&&v&&0<v.length&&!!L[o]),!K.drag||E&&!Y||(e.onDragstart=He.handleRowDragDragstartEvent,e.onDragend=He.handleRowDragDragendEvent,e.onDragover=He.handleRowDragDragoverEvent);var g=["vxe-body--row",E?"row--level-"+i:"",{"row--stripe":f&&(n+1)%2==0,"is--new":p,"is--expand-row":u,"is--expand-tree":c,"row--new":p&&(P.showStatus||P.showInsertStatus),"row--radio":W.highlight&&He.eqRow(A,t),"row--checked":B.highlight&&He.isCheckedByCheckboxRow(t),"row--pending":!!$&&!!j[o]},(0,_dom.getPropClass)(C,d)];let h=_.map((e,l)=>ae(s,o,x,w,i,t,r,a,n,e,l,_,m));J.push(!S&&X.drag&&V.animation?(0,_vue.h)(_vue.TransitionGroup,Object.assign({name:"vxe-header--col-list"+(U?"":"-disabled"),tag:"tr",class:g,rowid:o,style:R?_xeUtils.default.isFunction(R)?R(d):R:null,key:b||I||k||K.useKey||K.drag||X.drag||E?o:a},e),{default:()=>h}):(0,_vue.h)("tr",Object.assign({class:g,rowid:o,style:R?_xeUtils.default.isFunction(R)?R(d):R:null,key:b||I||k||K.useKey||K.drag||X.drag||E?o:a},e),h)),u&&({height:g,padding:d,mode:e}=le.value,"fixed"===e?J.push((0,_vue.h)("tr",{class:"vxe-body--row-expanded-place",key:"expand_"+o,rowid:o},[(0,_vue.h)("td",{class:"vxe-body--row-expanded-place-column",colspan:_.length,style:{height:`${F?l.expandHeight||g:0}px`}})])):(u={},e=(g&&(u.height=g+"px"),E&&(u.paddingLeft=i*G.indent+30+"px"),q).showOverflow,l=_xeUtils.default.isUndefined(e)||_xeUtils.default.isNull(e)?T:e,e={$table:He,seq:s,column:q,fixed:x,type:renderType,level:i,row:t,rowIndex:r,$rowIndex:a,_rowIndex:n},J.push((0,_vue.h)("tr",{class:["vxe-body--expanded-row",{"is--padding":d}],key:"expand_"+o},[(0,_vue.h)("td",{class:["vxe-body--expanded-column",{"fixed--hidden":x&&!O,"col--ellipsis":l}],colspan:_.length},[(0,_vue.h)("div",{class:["vxe-body--expanded-cell",{"is--ellipsis":g}],style:u},[q.renderData(e)])])])))),c&&J.push(...te(x,w,v,_))}),J};(0,_vue.onMounted)(()=>{(0,_vue.nextTick)(()=>{var e=T.fixedType,l=Ne.elemStore,e=`${e||"main"}-body-`;l[e+"wrapper"]=$,l[e+"scroll"]=U,l[e+"table"]=F,l[e+"colgroup"]=H,l[e+"list"]=L,l[e+"xSpace"]=j,l[e+"ySpace"]=N,l[e+"emptyBlock"]=B})}),(0,_vue.onUnmounted)(()=>{var e=T.fixedType,l=Ne.elemStore,e=`${e||"main"}-body-`;l[e+"wrapper"]=null,l[e+"scroll"]=null,l[e+"table"]=null,l[e+"colgroup"]=null,l[e+"list"]=null,l[e+"xSpace"]=null,l[e+"ySpace"]=null,l[e+"emptyBlock"]=null});return()=>{var e=q.slots,l=He.xeGrid;let{fixedColumn:t,fixedType:a,tableColumn:r}=T;var{spanMethod:o,footerSpanMethod:i,mouseConfig:s}=Le,{isGroup:n,tableData:d,isRowLoading:u,isColLoading:c,overflowX:v,scrollXLoad:p,scrollYLoad:g,isAllOverflow:h,isDragRowMove:x,expandColumn:w,dragRow:m,dragCol:_}=je,{visibleColumn:f,fullAllDataRowIdData:b,fullColumnIdData:y}=Ne,C=Qe.value,R=A.value,D=We.value,E=el.value,O=le.value;let M=d,S=r,I=!1;!(p||g||h)||w&&"fixed"!==O.mode||o||i||(I=!0),c||!a&&v||(S=f),a&&I&&(S=t||[]),g&&m&&2<M.length&&(d=b[(0,_util.getRowid)(He,m)])&&(h=d._index,w=M[0],O=M[M.length-1],o=b[(0,_util.getRowid)(He,w)],i=b[(0,_util.getRowid)(He,O)],o)&&i&&(v=o._index,f=i._index,h<v?M=[m].concat(M):f<h&&(M=M.concat([m]))),a||n||p&&_&&2<S.length&&(g=y[_.id])&&(d=g._index,w=S[0],b=S[S.length-1],O=y[w.id],o=y[b.id],O)&&o&&(i=O._index,v=o._index,d<i?S=[_].concat(S):v<d&&(S=S.concat([_])));let k;f=e?e.empty:null,k=f?He.callSlot(f,{$table:He,$grid:l}):(m=(h=R.name?renderer.get(R.name):null)?h.renderTableEmpty||h.renderTableEmptyView||h.renderEmpty:null)?(0,_vn.getSlotVNs)(m(R,{$table:He})):Le.emptyText||getI18n("vxe.table.emptyText"),n={onScroll(e){He.triggerBodyScrollEvent(e,a)}};return(0,_vue.h)("div",{ref:$,class:["vxe-table--body-wrapper",a?`fixed-${a}--wrapper`:"body--wrapper"],xid:z},[(0,_vue.h)("div",Object.assign({ref:U,class:"vxe-table--body-inner-wrapper"},n),[a?renderEmptyElement(He):(0,_vue.h)("div",{ref:j,class:"vxe-body--x-space"}),(0,_vue.h)("div",{ref:N,class:"vxe-body--y-space"}),(0,_vue.h)("table",{ref:F,class:"vxe-table--body",xid:z,cellspacing:0,cellpadding:0,border:0},[(0,_vue.h)("colgroup",{ref:H},S.map((e,l)=>(0,_vue.h)("col",{name:e.id,key:l,style:{width:e.renderWidth+"px"}}))),!u&&!c&&C.drag&&E.animation?(0,_vue.h)(_vue.TransitionGroup,{ref:L,name:"vxe-body--row-list"+(x?"":"-disabled"),tag:"tbody"},{default:()=>te(a,I,M,S)}):(0,_vue.h)("tbody",{ref:L},te(a,I,M,S))]),(0,_vue.h)("div",{class:"vxe-table--checkbox-range"}),s&&D.area?(0,_vue.h)("div",{class:"vxe-table--cell-area"},[(0,_vue.h)("span",{class:"vxe-table--cell-main-area"},D.extension?[(0,_vue.h)("span",{class:"vxe-table--cell-main-area-btn",onMousedown(e){He.triggerCellAreaExtendMousedownEvent&&He.triggerCellAreaExtendMousedownEvent(e,{$table:He,fixed:a,type:renderType})}})]:[]),(0,_vue.h)("span",{class:"vxe-table--cell-copy-area"}),(0,_vue.h)("span",{class:"vxe-table--cell-extend-area"}),(0,_vue.h)("span",{class:"vxe-table--cell-multi-area"}),(0,_vue.h)("span",{class:"vxe-table--cell-active-area"}),(0,_vue.h)("span",{class:"vxe-table--cell-row-status-area"})]):renderEmptyElement(He),a?renderEmptyElement(He):(0,_vue.h)("div",{class:"vxe-table--empty-block",ref:B},[(0,_vue.h)("div",{class:"vxe-table--empty-content"},k)])])])}}});

package/lib/table/src/footer.js

@@ -106,6 +106,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
         mergeFooterList
       } = tableReactData;
       const {
+        fullColumnIdData,
         scrollXStore
       } = tableInternalData;
       const tooltipOpts = computeTooltipOpts.value;
@@ -129,6 +130,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
           cellRender
         } = column;
         const colid = column.id;
+        const colRest = fullColumnIdData[colid] || {};
         const renderOpts = editRender || cellRender;
         const compConf = renderOpts ? renderer.get(renderOpts.name) : null;
         const showAllTip = tooltipOpts.showAll;
@@ -146,8 +148,8 @@ var _default = exports.default = (0, _vue.defineComponent)({
           colid
         };
         const tfOns = {};
-        const columnIndex = $xeTable.getColumnIndex(column);
-        const _columnIndex = $xeTable.getVTColumnIndex(column);
+        const columnIndex = colRest.index;
+        const _columnIndex = colRest._index;
         const itemIndex = _columnIndex;
         const cellParams = {
           $table: $xeTable,

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

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _vue=require("vue"),_xeUtils=_interopRequireDefault(require("xe-utils")),_ui=require("../../ui"),_dom=require("../../ui/src/dom"),_util=require("./util");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let{renderer,renderEmptyElement}=_ui.VxeUI,renderType="footer";function mergeFooterMethod(l,t,o){for(let e=0;e<l.length;e++){var{row:r,col:n,rowspan:i,colspan:a}=l[e];if(-1<n&&-1<r&&i&&a){if(r===t&&n===o)return{rowspan:i,colspan:a};if(r<=t&&t<r+i&&n<=o&&o<n+a)return{rowspan:0,colspan:0}}}}var _default=exports.default=(0,_vue.defineComponent)({name:"VxeTableFooter",props:{footerTableData:{type:Array,default:()=>[]},tableColumn:{type:Array,default:()=>[]},fixedColumn:{type:Array,default:()=>[]},fixedType:{type:String,default:null}},setup(g){let Y=(0,_vue.inject)("$xeTable",{}),{xID:m,props:_,reactData:h,internalData:b}=Y,{computeTooltipOpts:l,computeColumnOpts:w,computeColumnDragOpts:y,computeCellOpts:t,computeFooterCellOpts:o,computeDefaultRowHeight:r,computeResizableOpts:n}=Y.getComputeMaps(),C=(0,_vue.ref)(),T=(0,_vue.ref)(),F=(0,_vue.ref)(),I=(0,_vue.ref)(),O=(0,_vue.ref)(),D=(0,_vue.ref)(),S=(y,C,T,F,I)=>{let O=Y.xeGrid,D=g.fixedType,{resizable:S,border:E,footerCellClassName:M,footerCellStyle:k,footerAlign:z,footerSpanMethod:U,align:R,columnKey:$,showFooterOverflow:A}=_,{scrollXLoad:j,scrollYLoad:q,overflowX:L,currentColumn:X,mergeFooterList:N}=h,G=b.scrollXStore,H=l.value;let P=n.value.isAllColumnDrag,V=w.value;var e=r.value;let W=t.value,B=o.value,K=(0,_util.getCellHeight)(B.height||W.height)||e;return y.map((l,e)=>{var{type:t,showFooterOverflow:o,footerAlign:r,align:n,footerClassName:i,editRender:a,cellRender:u}=l,s=l.id,a=a||u,u=a?renderer.get(a.name):null;let d=H.showAll;var a=l.children&&l.children.length,a=D?l.fixed!==D&&!a:l.fixed&&L,c=(_xeUtils.default.isBoolean(B.padding)?B:W).padding,o=_xeUtils.default.eqNull(o)?A:o,r=r||(u?u.tableFooterCellAlign:"")||z||n||(u?u.tableCellAlign:"")||R;let p="ellipsis"===o,f="title"===o,v=!0===o||"tooltip"===o,x=f||v||p;var n=_xeUtils.default.isBoolean(l.resizable)?l.resizable:V.resizable||S,u={colid:s},o={},g=Y.getColumnIndex(l),m=Y.getVTColumnIndex(l),_=m;let h={$table:Y,$grid:O,row:T,rowIndex:I,_rowIndex:I,$rowIndex:F,column:l,columnIndex:g,$columnIndex:e,_columnIndex:m,itemIndex:_,items:T,fixed:D,type:renderType,data:C},b=(j&&!x&&(p=x=!0),(f||v||d)&&(o.onMouseenter=e=>{f?(0,_dom.updateCellTitle)(e.currentTarget,l):(v||d)&&Y.triggerFooterTooltipEvent(e,h)}),(v||d)&&(o.onMouseleave=e=>{(v||d)&&Y.handleTargetLeaveEvent(e)}),o.onClick=e=>{Y.dispatchEvent("footer-cell-click",Object.assign({cell:e.currentTarget},h),e)},!(o.onDblclick=e=>{Y.dispatchEvent("footer-cell-dblclick",Object.assign({cell:e.currentTarget},h),e)}));if(N.length){g=mergeFooterMethod(N,I,m);if(g){var{rowspan:_,colspan:g}=g;if(!_||!g)return null;1<_&&(b=!0,u.rowspan=_),1<g&&(b=!0,u.colspan=g)}}else if(U){var{rowspan:_=1,colspan:g=1}=U(h)||{};if(!_||!g)return null;1<_&&(u.rowspan=_),1<g&&(u.colspan=g)}_=e===y.length-1,g=!l.resizeWidth&&("auto"===l.minWidth||"auto"===l.width);let w=!1;b||j&&!l.fixed&&(m<G.visibleStartIndex-G.preloadSize||m>G.visibleEndIndex+G.preloadSize)&&(w=!0);m={};return x?m.height=K+"px":m.minHeight=K+"px",(0,_vue.h)("td",Object.assign(Object.assign(Object.assign(Object.assign({class:["vxe-footer--column",l.id,{["col--"+r]:r,["col--"+t]:t,"col--last":_,"fixed--width":!g,"fixed--hidden":a,"is--padding":c,"col--ellipsis":x,"col--current":X===l},(0,_dom.getPropClass)(i,h),(0,_dom.getPropClass)(M,h)]},u),{style:k?_xeUtils.default.isFunction(k)?k(h):k:null}),o),{key:$||j||q||V.useKey||V.drag?l.id:e}),[(0,_vue.h)("div",{class:["vxe-cell",{"c--title":f,"c--tooltip":v,"c--ellipsis":p}],style:m},w?[]:[(0,_vue.h)("div",{colid:s,class:"vxe-cell--wrapper"},l.renderFooter(h))]),!a&&n&&P?(0,_vue.h)("div",{class:["vxe-cell--col-resizable",{"is--line":!E||"none"===E}],onMousedown:e=>Y.handleColResizeMousedownEvent(e,D,h),onDblclick:e=>Y.handleColResizeDblclickEvent(e,h)}):renderEmptyElement(Y)])})};return(0,_vue.onMounted)(()=>{(0,_vue.nextTick)(()=>{var e=g.fixedType,l=b.elemStore,e=`${e||"main"}-footer-`;l[e+"wrapper"]=C,l[e+"scroll"]=T,l[e+"table"]=F,l[e+"colgroup"]=I,l[e+"list"]=O,l[e+"xSpace"]=D})}),(0,_vue.onUnmounted)(()=>{var e=g.fixedType,l=b.elemStore,e=`${e||"main"}-footer-`;l[e+"wrapper"]=null,l[e+"scroll"]=null,l[e+"table"]=null,l[e+"colgroup"]=null,l[e+"list"]=null,l[e+"xSpace"]=null}),()=>{let{fixedType:l,fixedColumn:e,tableColumn:t}=g;var{spanMethod:o,footerSpanMethod:r,showFooterOverflow:n}=_,{visibleColumn:i,fullColumnIdData:a}=b,{isGroup:u,isColLoading:s,overflowX:d,scrollXLoad:c,scrollYLoad:p,dragCol:f}=h;let v=t,x=!(c||p||n)||o||r?!1:!0;return s||!l&&d||(v=i),l&&x&&(v=e||[]),l||u||c&&f&&2<v.length&&(p=a[f.id])&&(n=p._index,o=v[0],r=v[v.length-1],s=a[o.id],d=a[r.id],s)&&d&&(i=s._index,u=d._index,n<i?v=[f].concat(v):u<n&&(v=v.concat([f]))),(0,_vue.h)("div",{ref:C,class:["vxe-table--footer-wrapper",l?`fixed-${l}--wrapper`:"body--wrapper"],xid:m},[(0,_vue.h)("div",{ref:T,class:"vxe-table--footer-inner-wrapper",onScroll(e){Y.triggerFooterScrollEvent(e,l)}},[l?renderEmptyElement(Y):(0,_vue.h)("div",{ref:D,class:"vxe-body--x-space"}),(0,_vue.h)("table",{ref:F,class:"vxe-table--footer",xid:m,cellspacing:0,cellpadding:0,border:0},[(0,_vue.h)("colgroup",{ref:I},v.map((e,l)=>(0,_vue.h)("col",{name:e.id,key:l,style:{width:e.renderWidth+"px"}}))),(0,_vue.h)("tfoot",{ref:O},(r=>{let{fixedType:n,footerTableData:i}=g,{footerRowClassName:a,footerRowStyle:u}=_,{isColLoading:s,isDragColMove:d}=h,c=w.value,p=y.value;return i.map((e,l)=>{let t=l;var o={$table:Y,row:e,_rowIndex:t,$rowIndex:l,fixed:n,type:renderType};return!s&&c.drag&&p.animation?(0,_vue.h)(_vue.TransitionGroup,{key:l,name:"vxe-header--col-list"+(d?"":"-disabled"),tag:"tr",class:["vxe-footer--row",a?_xeUtils.default.isFunction(a)?a(o):a:""],style:u?_xeUtils.default.isFunction(u)?u(o):u:null},{default:()=>S(r,i,e,l,t)}):(0,_vue.h)("tr",{key:l,class:["vxe-footer--row",a?_xeUtils.default.isFunction(a)?a(o):a:""],style:u?_xeUtils.default.isFunction(u)?u(o):u:null},S(r,i,e,l,t))})})(v))])])])}}});
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _vue=require("vue"),_xeUtils=_interopRequireDefault(require("xe-utils")),_ui=require("../../ui"),_dom=require("../../ui/src/dom"),_util=require("./util");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let{renderer,renderEmptyElement}=_ui.VxeUI,renderType="footer";function mergeFooterMethod(l,t,o){for(let e=0;e<l.length;e++){var{row:r,col:i,rowspan:n,colspan:a}=l[e];if(-1<i&&-1<r&&n&&a){if(r===t&&i===o)return{rowspan:n,colspan:a};if(r<=t&&t<r+n&&i<=o&&o<i+a)return{rowspan:0,colspan:0}}}}var _default=exports.default=(0,_vue.defineComponent)({name:"VxeTableFooter",props:{footerTableData:{type:Array,default:()=>[]},tableColumn:{type:Array,default:()=>[]},fixedColumn:{type:Array,default:()=>[]},fixedType:{type:String,default:null}},setup(m){let J=(0,_vue.inject)("$xeTable",{}),{xID:g,props:_,reactData:h,internalData:b}=J,{computeTooltipOpts:l,computeColumnOpts:w,computeColumnDragOpts:y,computeCellOpts:t,computeFooterCellOpts:o,computeDefaultRowHeight:r,computeResizableOpts:i}=J.getComputeMaps(),C=(0,_vue.ref)(),T=(0,_vue.ref)(),F=(0,_vue.ref)(),D=(0,_vue.ref)(),O=(0,_vue.ref)(),I=(0,_vue.ref)(),S=(y,C,T,F,D)=>{let O=J.xeGrid,I=m.fixedType,{resizable:S,border:E,footerCellClassName:M,footerCellStyle:k,footerAlign:z,footerSpanMethod:U,align:R,columnKey:$,showFooterOverflow:A}=_,{scrollXLoad:j,scrollYLoad:q,overflowX:L,currentColumn:X,mergeFooterList:N}=h,{fullColumnIdData:G,scrollXStore:H}=b,P=l.value;let W=i.value.isAllColumnDrag,B=w.value;var e=r.value;let K=t.value,V=o.value,Y=(0,_util.getCellHeight)(V.height||K.height)||e;return y.map((l,e)=>{var{type:t,showFooterOverflow:o,footerAlign:r,align:i,footerClassName:n,editRender:a,cellRender:u}=l,s=l.id,d=G[s]||{},a=a||u,u=a?renderer.get(a.name):null;let c=P.showAll;var a=l.children&&l.children.length,a=I?l.fixed!==I&&!a:l.fixed&&L,p=(_xeUtils.default.isBoolean(V.padding)?V:K).padding,o=_xeUtils.default.eqNull(o)?A:o,r=r||(u?u.tableFooterCellAlign:"")||z||i||(u?u.tableCellAlign:"")||R;let f="ellipsis"===o,v="title"===o,x=!0===o||"tooltip"===o,m=v||x||f;var i=_xeUtils.default.isBoolean(l.resizable)?l.resizable:B.resizable||S,u={colid:s},o={},g=d.index,d=d._index,_=d;let h={$table:J,$grid:O,row:T,rowIndex:D,_rowIndex:D,$rowIndex:F,column:l,columnIndex:g,$columnIndex:e,_columnIndex:d,itemIndex:_,items:T,fixed:I,type:renderType,data:C},b=(j&&!m&&(f=m=!0),(v||x||c)&&(o.onMouseenter=e=>{v?(0,_dom.updateCellTitle)(e.currentTarget,l):(x||c)&&J.triggerFooterTooltipEvent(e,h)}),(x||c)&&(o.onMouseleave=e=>{(x||c)&&J.handleTargetLeaveEvent(e)}),o.onClick=e=>{J.dispatchEvent("footer-cell-click",Object.assign({cell:e.currentTarget},h),e)},!(o.onDblclick=e=>{J.dispatchEvent("footer-cell-dblclick",Object.assign({cell:e.currentTarget},h),e)}));if(N.length){g=mergeFooterMethod(N,D,d);if(g){var{rowspan:_,colspan:g}=g;if(!_||!g)return null;1<_&&(b=!0,u.rowspan=_),1<g&&(b=!0,u.colspan=g)}}else if(U){var{rowspan:_=1,colspan:g=1}=U(h)||{};if(!_||!g)return null;1<_&&(u.rowspan=_),1<g&&(u.colspan=g)}_=e===y.length-1,g=!l.resizeWidth&&("auto"===l.minWidth||"auto"===l.width);let w=!1;b||j&&!l.fixed&&(d<H.visibleStartIndex-H.preloadSize||d>H.visibleEndIndex+H.preloadSize)&&(w=!0);d={};return m?d.height=Y+"px":d.minHeight=Y+"px",(0,_vue.h)("td",Object.assign(Object.assign(Object.assign(Object.assign({class:["vxe-footer--column",l.id,{["col--"+r]:r,["col--"+t]:t,"col--last":_,"fixed--width":!g,"fixed--hidden":a,"is--padding":p,"col--ellipsis":m,"col--current":X===l},(0,_dom.getPropClass)(n,h),(0,_dom.getPropClass)(M,h)]},u),{style:k?_xeUtils.default.isFunction(k)?k(h):k:null}),o),{key:$||j||q||B.useKey||B.drag?l.id:e}),[(0,_vue.h)("div",{class:["vxe-cell",{"c--title":v,"c--tooltip":x,"c--ellipsis":f}],style:d},w?[]:[(0,_vue.h)("div",{colid:s,class:"vxe-cell--wrapper"},l.renderFooter(h))]),!a&&i&&W?(0,_vue.h)("div",{class:["vxe-cell--col-resizable",{"is--line":!E||"none"===E}],onMousedown:e=>J.handleColResizeMousedownEvent(e,I,h),onDblclick:e=>J.handleColResizeDblclickEvent(e,h)}):renderEmptyElement(J)])})};return(0,_vue.onMounted)(()=>{(0,_vue.nextTick)(()=>{var e=m.fixedType,l=b.elemStore,e=`${e||"main"}-footer-`;l[e+"wrapper"]=C,l[e+"scroll"]=T,l[e+"table"]=F,l[e+"colgroup"]=D,l[e+"list"]=O,l[e+"xSpace"]=I})}),(0,_vue.onUnmounted)(()=>{var e=m.fixedType,l=b.elemStore,e=`${e||"main"}-footer-`;l[e+"wrapper"]=null,l[e+"scroll"]=null,l[e+"table"]=null,l[e+"colgroup"]=null,l[e+"list"]=null,l[e+"xSpace"]=null}),()=>{let{fixedType:l,fixedColumn:e,tableColumn:t}=m;var{spanMethod:o,footerSpanMethod:r,showFooterOverflow:i}=_,{visibleColumn:n,fullColumnIdData:a}=b,{isGroup:u,isColLoading:s,overflowX:d,scrollXLoad:c,scrollYLoad:p,dragCol:f}=h;let v=t,x=!(c||p||i)||o||r?!1:!0;return s||!l&&d||(v=n),l&&x&&(v=e||[]),l||u||c&&f&&2<v.length&&(p=a[f.id])&&(i=p._index,o=v[0],r=v[v.length-1],s=a[o.id],d=a[r.id],s)&&d&&(n=s._index,u=d._index,i<n?v=[f].concat(v):u<i&&(v=v.concat([f]))),(0,_vue.h)("div",{ref:C,class:["vxe-table--footer-wrapper",l?`fixed-${l}--wrapper`:"body--wrapper"],xid:g},[(0,_vue.h)("div",{ref:T,class:"vxe-table--footer-inner-wrapper",onScroll(e){J.triggerFooterScrollEvent(e,l)}},[l?renderEmptyElement(J):(0,_vue.h)("div",{ref:I,class:"vxe-body--x-space"}),(0,_vue.h)("table",{ref:F,class:"vxe-table--footer",xid:g,cellspacing:0,cellpadding:0,border:0},[(0,_vue.h)("colgroup",{ref:D},v.map((e,l)=>(0,_vue.h)("col",{name:e.id,key:l,style:{width:e.renderWidth+"px"}}))),(0,_vue.h)("tfoot",{ref:O},(r=>{let{fixedType:i,footerTableData:n}=m,{footerRowClassName:a,footerRowStyle:u}=_,{isColLoading:s,isDragColMove:d}=h,c=w.value,p=y.value;return n.map((e,l)=>{let t=l;var o={$table:J,row:e,_rowIndex:t,$rowIndex:l,fixed:i,type:renderType};return!s&&c.drag&&p.animation?(0,_vue.h)(_vue.TransitionGroup,{key:l,name:"vxe-header--col-list"+(d?"":"-disabled"),tag:"tr",class:["vxe-footer--row",a?_xeUtils.default.isFunction(a)?a(o):a:""],style:u?_xeUtils.default.isFunction(u)?u(o):u:null},{default:()=>S(r,n,e,l,t)}):(0,_vue.h)("tr",{key:l,class:["vxe-footer--row",a?_xeUtils.default.isFunction(a)?a(o):a:""],style:u?_xeUtils.default.isFunction(u)?u(o):u:null},S(r,n,e,l,t))})})(v))])])])}}});

package/lib/table/src/header.js

@@ -79,6 +79,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
         overflowX
       } = tableReactData;
       const {
+        fullColumnIdData,
         scrollXStore
       } = tableInternalData;
       const columnOpts = computeColumnOpts.value;
@@ -104,6 +105,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
           cellRender
         } = column;
         const colid = column.id;
+        const colRest = fullColumnIdData[colid] || {};
         const renderOpts = editRender || cellRender;
         const compConf = renderOpts ? renderer.get(renderOpts.name) : null;
         const isColGroup = column.children && column.children.length;
@@ -121,8 +123,8 @@ var _default = exports.default = (0, _vue.defineComponent)({
           firstFilterOption = filters[0];
           hasFilter = filters.some(item => item.checked);
         }
-        const columnIndex = $xeTable.getColumnIndex(column);
-        const _columnIndex = $xeTable.getVTColumnIndex(column);
+        const columnIndex = colRest.index;
+        const _columnIndex = colRest._index;
         const cellParams = {
           $table: $xeTable,
           $grid: $xeGrid,

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

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _vue=require("vue"),_xeUtils=_interopRequireDefault(require("xe-utils")),_ui=require("../../ui"),_util=require("./util");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let{renderer,renderEmptyElement}=_ui.VxeUI,renderType="header";var _default=exports.default=(0,_vue.defineComponent)({name:"VxeTableHeader",props:{tableData:Array,tableColumn:Array,tableGroupColumn:Array,fixedColumn:Array,fixedType:{type:String,default:null}},setup(m){let Z=(0,_vue.inject)("$xeTable",{}),{xID:b,props:C,reactData:y,internalData:w}=Z,{computeColumnOpts:D,computeColumnDragOpts:ee,computeCellOpts:l,computeMouseOpts:H,computeHeaderCellOpts:a,computeDefaultRowHeight:r}=Z.getComputeMaps(),E=(0,_vue.ref)([]),S=(0,_vue.ref)(),M=(0,_vue.ref)(),T=(0,_vue.ref)(),I=(0,_vue.ref)(),O=(0,_vue.ref)(),U=(0,_vue.ref)(),t=(0,_vue.ref)(),i=()=>{var e=y.isGroup;E.value=e?(0,_util.convertHeaderColumnToRows)(m.tableGroupColumn):[]},k=(H,E,S,M)=>{let T=Z.xeGrid,I=m.fixedType,{resizable:O,columnKey:U,headerCellClassName:k,headerCellStyle:z,showHeaderOverflow:R,headerAlign:$,align:F,mouseConfig:A}=C,{currentColumn:q,dragCol:G,scrollXLoad:L,scrollYLoad:j,overflowX:X}=y,N=w.scrollXStore,V=D.value,W=ee.value,B=l.value;var e=r.value;let K=a.value,P=(0,_util.getCellHeight)(K.height||B.height)||e,{disabledMethod:Y,isCrossDrag:J,isPeerDrag:Q}=W;return S.map((e,l)=>{var{type:a,showHeaderOverflow:r,headerAlign:t,align:i,filters:n,headerClassName:o,editRender:d,cellRender:u}=e,s=e.id,d=d||u,u=d?renderer.get(d.name):null,d=e.children&&e.children.length,c=I?e.fixed!==I&&!d:!!e.fixed&&X,v=(_xeUtils.default.isBoolean(K.padding)?K:B).padding,r=_xeUtils.default.eqNull(r)?R:r,t=t||(u?u.tableHeaderCellAlign:"")||$||i||(u?u.tableCellAlign:"")||F;let p="ellipsis"===r;i="title"===r,u=!0===r||"tooltip"===r;let x=i||u||p,h=!1,g=null;n&&(g=n[0],h=n.some(e=>e.checked));var r=Z.getColumnIndex(e),f=Z.getVTColumnIndex(e);let _={$table:Z,$grid:T,$rowIndex:M,column:e,columnIndex:r,$columnIndex:l,_columnIndex:f,firstFilterOption:g,fixed:I,type:renderType,isHidden:c,hasFilter:h};var r={colid:s,colspan:1<e.colSpan?e.colSpan:null,rowspan:1<e.rowSpan?e.rowSpan:null},m={onClick:e=>Z.triggerHeaderCellClickEvent(e,_),onDblclick:e=>Z.triggerHeaderCellDblclickEvent(e,_)},b=(L&&!x&&(p=x=!0),V.drag&&"cell"===W.trigger);let C=!1;b&&(C=!(!Y||!Y(_))),(A||b)&&(m.onMousedown=e=>Z.triggerHeaderCellMousedownEvent(e,_)),V.drag&&(m.onDragstart=Z.handleHeaderCellDragDragstartEvent,m.onDragend=Z.handleHeaderCellDragDragendEvent,m.onDragover=Z.handleHeaderCellDragDragoverEvent,b)&&(m.onMouseup=Z.handleHeaderCellDragMouseupEvent);var b=l===S.length-1,y=_xeUtils.default.isBoolean(e.resizable)?e.resizable:V.resizable||O,w=!e.resizeWidth&&("auto"===e.minWidth||"auto"===e.width);let D=!1;H||G&&G.id===s||L&&!e.fixed&&(f<N.visibleStartIndex-N.preloadSize||f>N.visibleEndIndex+N.preloadSize)&&(D=!0);f={};return x?f.height=P+"px":f.minHeight=P+"px",(0,_vue.h)("th",Object.assign(Object.assign(Object.assign({class:["vxe-header--column",s,{["col--"+t]:t,["col--"+a]:a,"col--last":b,"col--fixed":e.fixed,"col--group":d,"col--ellipsis":x,"fixed--width":!w,"fixed--hidden":c,"is--padding":v,"is--sortable":e.sortable,"col--filter":!!n,"is--filter-active":h,"is--drag-active":V.drag&&!e.fixed&&!C&&(J||Q||!e.parentId),"is--drag-disabled":V.drag&&C,"col--current":q===e},o?_xeUtils.default.isFunction(o)?o(_):o:"",k?_xeUtils.default.isFunction(k)?k(_):k:""],style:z?_xeUtils.default.isFunction(z)?z(_):z:null},r),m),{key:U||L||j||V.useKey||V.drag||d?s:l}),[(0,_vue.h)("div",{class:["vxe-cell",{"c--title":i,"c--tooltip":u,"c--ellipsis":p}],style:f},D||E&&c?[]:[(0,_vue.h)("div",{colid:s,class:"vxe-cell--wrapper"},e.renderHeader(_))]),!c&&y?(0,_vue.h)("div",{class:"vxe-cell--col-resizable",onMousedown:e=>Z.handleColResizeMousedownEvent(e,I,_),onDblclick:e=>Z.handleColResizeDblclickEvent(e,_)}):renderEmptyElement(Z)])})};return(0,_vue.watch)(()=>m.tableColumn,i),(0,_vue.onMounted)(()=>{(0,_vue.nextTick)(()=>{var e=m.fixedType,l=Z.internalData,l=l.elemStore,e=`${e||"main"}-header-`;l[e+"wrapper"]=S,l[e+"scroll"]=M,l[e+"table"]=T,l[e+"colgroup"]=I,l[e+"list"]=O,l[e+"xSpace"]=U,l[e+"repair"]=t,i()})}),(0,_vue.onUnmounted)(()=>{var e=m.fixedType,l=Z.internalData,l=l.elemStore,e=`${e||"main"}-header-`;l[e+"wrapper"]=null,l[e+"scroll"]=null,l[e+"table"]=null,l[e+"colgroup"]=null,l[e+"list"]=null,l[e+"xSpace"]=null,l[e+"repair"]=null}),()=>{let{fixedType:l,fixedColumn:e,tableColumn:a}=m;var{mouseConfig:r,showHeaderOverflow:t,spanMethod:i,footerSpanMethod:n}=C,{isGroup:o,isColLoading:d,overflowX:u,scrollXLoad:s,scrollYLoad:c,dragCol:v}=y,{visibleColumn:p,fullColumnIdData:x}=w,h=H.value;let g=E.value,f=a,_=!1;return o?f=p:(!(s||c||t)||i||n||(_=!0),d||!l&&u||(f=p),l&&_&&(f=e||[]),g=[f]),l||o||s&&v&&2<f.length&&(c=x[v.id])&&(t=c._index,i=f[0],n=f[f.length-1],d=x[i.id],u=x[n.id],d)&&u&&(p=d._index,s=u._index,t<p?(f=[v].concat(f),g=[[v].concat(g[0])].concat(g.slice(1))):s<t&&(f=f.concat([v]),g=[g[0].concat([v])].concat(g.slice(1)))),(0,_vue.h)("div",{ref:S,class:["vxe-table--header-wrapper",l?`fixed-${l}--wrapper`:"body--wrapper"],xid:b},[(0,_vue.h)("div",{ref:M,class:"vxe-table--header-inner-wrapper",onScroll(e){Z.triggerHeaderScrollEvent(e,l)}},[l?renderEmptyElement(Z):(0,_vue.h)("div",{ref:U,class:"vxe-body--x-space"}),(0,_vue.h)("table",{ref:T,class:"vxe-table--header",xid:b,cellspacing:0,cellpadding:0,border:0},[(0,_vue.h)("colgroup",{ref:I},f.map((e,l)=>(0,_vue.h)("col",{name:e.id,key:l,style:{width:e.renderWidth+"px"}}))),(0,_vue.h)("thead",{ref:O},((r,t,e)=>{let i=m.fixedType,{headerRowClassName:n,headerRowStyle:o}=C,{isColLoading:d,isDragColMove:u}=y,s=D.value,c=ee.value;return e.map((e,l)=>{var a={$table:Z,$rowIndex:l,fixed:i,type:renderType};return!d&&s.drag&&c.animation?(0,_vue.h)(_vue.TransitionGroup,{key:l,name:"vxe-header--col-list"+(u?"":"-disabled"),tag:"tr",class:["vxe-header--row",n?_xeUtils.default.isFunction(n)?n(a):n:""],style:o?_xeUtils.default.isFunction(o)?o(a):o:null},{default:()=>k(r,t,e,l)}):(0,_vue.h)("tr",{key:l,class:["vxe-header--row",n?_xeUtils.default.isFunction(n)?n(a):n:""],style:o?_xeUtils.default.isFunction(o)?o(a):o:null},k(r,t,e,l))})})(o,_,g))]),r&&h.area?(0,_vue.h)("div",{class:"vxe-table--cell-area"},[(0,_vue.h)("span",{class:"vxe-table--cell-main-area"}),(0,_vue.h)("span",{class:"vxe-table--cell-copy-area"}),(0,_vue.h)("span",{class:"vxe-table--cell-extend-area"}),(0,_vue.h)("span",{class:"vxe-table--cell-multi-area"}),(0,_vue.h)("span",{class:"vxe-table--cell-active-area"}),(0,_vue.h)("span",{class:"vxe-table--cell-col-status-area"})]):renderEmptyElement(Z)])])}}});
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _vue=require("vue"),_xeUtils=_interopRequireDefault(require("xe-utils")),_ui=require("../../ui"),_util=require("./util");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let{renderer,renderEmptyElement}=_ui.VxeUI,renderType="header";var _default=exports.default=(0,_vue.defineComponent)({name:"VxeTableHeader",props:{tableData:Array,tableColumn:Array,tableGroupColumn:Array,fixedColumn:Array,fixedType:{type:String,default:null}},setup(m){let ee=(0,_vue.inject)("$xeTable",{}),{xID:b,props:C,reactData:y,internalData:w}=ee,{computeColumnOpts:D,computeColumnDragOpts:le,computeCellOpts:l,computeMouseOpts:H,computeHeaderCellOpts:a,computeDefaultRowHeight:r}=ee.getComputeMaps(),E=(0,_vue.ref)([]),S=(0,_vue.ref)(),M=(0,_vue.ref)(),T=(0,_vue.ref)(),O=(0,_vue.ref)(),U=(0,_vue.ref)(),k=(0,_vue.ref)(),t=(0,_vue.ref)(),i=()=>{var e=y.isGroup;E.value=e?(0,_util.convertHeaderColumnToRows)(m.tableGroupColumn):[]},I=(H,E,S,M)=>{let T=ee.xeGrid,O=m.fixedType,{resizable:U,columnKey:k,headerCellClassName:I,headerCellStyle:z,showHeaderOverflow:R,headerAlign:$,align:F,mouseConfig:A}=C,{currentColumn:q,dragCol:G,scrollXLoad:L,scrollYLoad:j,overflowX:X}=y,{fullColumnIdData:N,scrollXStore:W}=w,B=D.value,K=le.value,P=l.value;var e=r.value;let V=a.value,Y=(0,_util.getCellHeight)(V.height||P.height)||e,{disabledMethod:J,isCrossDrag:Q,isPeerDrag:Z}=K;return S.map((e,l)=>{var{type:a,showHeaderOverflow:r,headerAlign:t,align:i,filters:n,headerClassName:o,editRender:d,cellRender:u}=e,s=e.id,c=N[s]||{},d=d||u,u=d?renderer.get(d.name):null,d=e.children&&e.children.length,v=O?e.fixed!==O&&!d:!!e.fixed&&X,p=(_xeUtils.default.isBoolean(V.padding)?V:P).padding,r=_xeUtils.default.eqNull(r)?R:r,t=t||(u?u.tableHeaderCellAlign:"")||$||i||(u?u.tableCellAlign:"")||F;let x="ellipsis"===r;i="title"===r,u=!0===r||"tooltip"===r;let h=i||u||x,g=!1,f=null;n&&(f=n[0],g=n.some(e=>e.checked));r=c.index,c=c._index;let _={$table:ee,$grid:T,$rowIndex:M,column:e,columnIndex:r,$columnIndex:l,_columnIndex:c,firstFilterOption:f,fixed:O,type:renderType,isHidden:v,hasFilter:g};var r={colid:s,colspan:1<e.colSpan?e.colSpan:null,rowspan:1<e.rowSpan?e.rowSpan:null},m={onClick:e=>ee.triggerHeaderCellClickEvent(e,_),onDblclick:e=>ee.triggerHeaderCellDblclickEvent(e,_)},b=(L&&!h&&(x=h=!0),B.drag&&"cell"===K.trigger);let C=!1;b&&(C=!(!J||!J(_))),(A||b)&&(m.onMousedown=e=>ee.triggerHeaderCellMousedownEvent(e,_)),B.drag&&(m.onDragstart=ee.handleHeaderCellDragDragstartEvent,m.onDragend=ee.handleHeaderCellDragDragendEvent,m.onDragover=ee.handleHeaderCellDragDragoverEvent,b)&&(m.onMouseup=ee.handleHeaderCellDragMouseupEvent);var b=l===S.length-1,y=_xeUtils.default.isBoolean(e.resizable)?e.resizable:B.resizable||U,w=!e.resizeWidth&&("auto"===e.minWidth||"auto"===e.width);let D=!1;H||G&&G.id===s||L&&!e.fixed&&(c<W.visibleStartIndex-W.preloadSize||c>W.visibleEndIndex+W.preloadSize)&&(D=!0);c={};return h?c.height=Y+"px":c.minHeight=Y+"px",(0,_vue.h)("th",Object.assign(Object.assign(Object.assign({class:["vxe-header--column",s,{["col--"+t]:t,["col--"+a]:a,"col--last":b,"col--fixed":e.fixed,"col--group":d,"col--ellipsis":h,"fixed--width":!w,"fixed--hidden":v,"is--padding":p,"is--sortable":e.sortable,"col--filter":!!n,"is--filter-active":g,"is--drag-active":B.drag&&!e.fixed&&!C&&(Q||Z||!e.parentId),"is--drag-disabled":B.drag&&C,"col--current":q===e},o?_xeUtils.default.isFunction(o)?o(_):o:"",I?_xeUtils.default.isFunction(I)?I(_):I:""],style:z?_xeUtils.default.isFunction(z)?z(_):z:null},r),m),{key:k||L||j||B.useKey||B.drag||d?s:l}),[(0,_vue.h)("div",{class:["vxe-cell",{"c--title":i,"c--tooltip":u,"c--ellipsis":x}],style:c},D||E&&v?[]:[(0,_vue.h)("div",{colid:s,class:"vxe-cell--wrapper"},e.renderHeader(_))]),!v&&y?(0,_vue.h)("div",{class:"vxe-cell--col-resizable",onMousedown:e=>ee.handleColResizeMousedownEvent(e,O,_),onDblclick:e=>ee.handleColResizeDblclickEvent(e,_)}):renderEmptyElement(ee)])})};return(0,_vue.watch)(()=>m.tableColumn,i),(0,_vue.onMounted)(()=>{(0,_vue.nextTick)(()=>{var e=m.fixedType,l=ee.internalData,l=l.elemStore,e=`${e||"main"}-header-`;l[e+"wrapper"]=S,l[e+"scroll"]=M,l[e+"table"]=T,l[e+"colgroup"]=O,l[e+"list"]=U,l[e+"xSpace"]=k,l[e+"repair"]=t,i()})}),(0,_vue.onUnmounted)(()=>{var e=m.fixedType,l=ee.internalData,l=l.elemStore,e=`${e||"main"}-header-`;l[e+"wrapper"]=null,l[e+"scroll"]=null,l[e+"table"]=null,l[e+"colgroup"]=null,l[e+"list"]=null,l[e+"xSpace"]=null,l[e+"repair"]=null}),()=>{let{fixedType:l,fixedColumn:e,tableColumn:a}=m;var{mouseConfig:r,showHeaderOverflow:t,spanMethod:i,footerSpanMethod:n}=C,{isGroup:o,isColLoading:d,overflowX:u,scrollXLoad:s,scrollYLoad:c,dragCol:v}=y,{visibleColumn:p,fullColumnIdData:x}=w,h=H.value;let g=E.value,f=a,_=!1;return o?f=p:(!(s||c||t)||i||n||(_=!0),d||!l&&u||(f=p),l&&_&&(f=e||[]),g=[f]),l||o||s&&v&&2<f.length&&(c=x[v.id])&&(t=c._index,i=f[0],n=f[f.length-1],d=x[i.id],u=x[n.id],d)&&u&&(p=d._index,s=u._index,t<p?(f=[v].concat(f),g=[[v].concat(g[0])].concat(g.slice(1))):s<t&&(f=f.concat([v]),g=[g[0].concat([v])].concat(g.slice(1)))),(0,_vue.h)("div",{ref:S,class:["vxe-table--header-wrapper",l?`fixed-${l}--wrapper`:"body--wrapper"],xid:b},[(0,_vue.h)("div",{ref:M,class:"vxe-table--header-inner-wrapper",onScroll(e){ee.triggerHeaderScrollEvent(e,l)}},[l?renderEmptyElement(ee):(0,_vue.h)("div",{ref:k,class:"vxe-body--x-space"}),(0,_vue.h)("table",{ref:T,class:"vxe-table--header",xid:b,cellspacing:0,cellpadding:0,border:0},[(0,_vue.h)("colgroup",{ref:O},f.map((e,l)=>(0,_vue.h)("col",{name:e.id,key:l,style:{width:e.renderWidth+"px"}}))),(0,_vue.h)("thead",{ref:U},((r,t,e)=>{let i=m.fixedType,{headerRowClassName:n,headerRowStyle:o}=C,{isColLoading:d,isDragColMove:u}=y,s=D.value,c=le.value;return e.map((e,l)=>{var a={$table:ee,$rowIndex:l,fixed:i,type:renderType};return!d&&s.drag&&c.animation?(0,_vue.h)(_vue.TransitionGroup,{key:l,name:"vxe-header--col-list"+(u?"":"-disabled"),tag:"tr",class:["vxe-header--row",n?_xeUtils.default.isFunction(n)?n(a):n:""],style:o?_xeUtils.default.isFunction(o)?o(a):o:null},{default:()=>I(r,t,e,l)}):(0,_vue.h)("tr",{key:l,class:["vxe-header--row",n?_xeUtils.default.isFunction(n)?n(a):n:""],style:o?_xeUtils.default.isFunction(o)?o(a):o:null},I(r,t,e,l))})})(o,_,g))]),r&&h.area?(0,_vue.h)("div",{class:"vxe-table--cell-area"},[(0,_vue.h)("span",{class:"vxe-table--cell-main-area"}),(0,_vue.h)("span",{class:"vxe-table--cell-copy-area"}),(0,_vue.h)("span",{class:"vxe-table--cell-extend-area"}),(0,_vue.h)("span",{class:"vxe-table--cell-multi-area"}),(0,_vue.h)("span",{class:"vxe-table--cell-active-area"}),(0,_vue.h)("span",{class:"vxe-table--cell-col-status-area"})]):renderEmptyElement(ee)])])}}});

package/lib/ui/index.js

@@ -13,7 +13,7 @@ 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.hooks = 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 = "4.12.0-beta.28";
+const version = exports.version = "4.12.0-beta.29";
 _core.VxeUI.version = version;
 _core.VxeUI.tableVersion = version;
 _core.VxeUI.setConfig({

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.hooks=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="4.12.0-beta.28",iconPrefix=(_core.VxeUI.version=version,_core.VxeUI.tableVersion=version,_core.VxeUI.setConfig({emptyCell:"　",table:{fit:!0,showHeader:!0,animat:!0,delayHover:250,autoResize:!0,minHeight:144,resizeConfig:{},resizableConfig:{dragMode:"auto",showDragTip:!0,isSyncAutoHeight:!0,isSyncAutoWidth:!0,minHeight:18},radioConfig:{strict:!0},rowDragConfig:{showIcon:!0,animation:!0,showGuidesStatus:!0,showDragTip:!0},columnDragConfig:{showIcon:!0,animation:!0,showGuidesStatus:!0,showDragTip:!0},checkboxConfig:{strict:!0},tooltipConfig:{enterable:!0},validConfig:{showMessage:!0,autoClear:!0,autoPos:!0,message:"inline",msgMode:"single",theme:"beautify"},columnConfig:{maxFixedSize:4},cellConfig:{padding:!0},headerCellConfig:{height:"unset"},footerCellConfig:{height:"unset"},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},drawerOptions:{mask:!0,lockView:!0,escClosable:!0,resize:!0}},sortConfig:{showIcon:!0,allowClear:!0,allowBtn:!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,mode:"fixed"},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,selectCellByBody:!0,extendDirection:{top:!0,left:!0,bottom:!0,right:!0}},clipConfig:{isCopy:!0,isCut:!0,isPaste:!0},fnrConfig:{isFind:!0,isReplace:!0},virtualXConfig:{enabled:!0,gt:60,preSize:1,oSize:2},virtualYConfig:{enabled:!0,gt:100,preSize:1,oSize:2},scrollbarConfig:{}},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",TABLE_DRAG_ROW:iconPrefix+"drag-handle",TABLE_DRAG_COLUMN:iconPrefix+"drag-handle",TABLE_DRAG_STATUS_ROW:iconPrefix+"sort",TABLE_DRAG_STATUS_SUB_ROW:iconPrefix+"add-sub",TABLE_DRAG_STATUS_COLUMN:iconPrefix+"swap",TABLE_DRAG_DISABLED:iconPrefix+"no-drop",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,hooks=exports.hooks=_core.VxeUI.hooks,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.hooks=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="4.12.0-beta.29",iconPrefix=(_core.VxeUI.version=version,_core.VxeUI.tableVersion=version,_core.VxeUI.setConfig({emptyCell:"　",table:{fit:!0,showHeader:!0,animat:!0,delayHover:250,autoResize:!0,minHeight:144,resizeConfig:{},resizableConfig:{dragMode:"auto",showDragTip:!0,isSyncAutoHeight:!0,isSyncAutoWidth:!0,minHeight:18},radioConfig:{strict:!0},rowDragConfig:{showIcon:!0,animation:!0,showGuidesStatus:!0,showDragTip:!0},columnDragConfig:{showIcon:!0,animation:!0,showGuidesStatus:!0,showDragTip:!0},checkboxConfig:{strict:!0},tooltipConfig:{enterable:!0},validConfig:{showMessage:!0,autoClear:!0,autoPos:!0,message:"inline",msgMode:"single",theme:"beautify"},columnConfig:{maxFixedSize:4},cellConfig:{padding:!0},headerCellConfig:{height:"unset"},footerCellConfig:{height:"unset"},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},drawerOptions:{mask:!0,lockView:!0,escClosable:!0,resize:!0}},sortConfig:{showIcon:!0,allowClear:!0,allowBtn:!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,mode:"fixed"},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,selectCellByBody:!0,extendDirection:{top:!0,left:!0,bottom:!0,right:!0}},clipConfig:{isCopy:!0,isCut:!0,isPaste:!0},fnrConfig:{isFind:!0,isReplace:!0},virtualXConfig:{enabled:!0,gt:60,preSize:1,oSize:2},virtualYConfig:{enabled:!0,gt:100,preSize:1,oSize:2},scrollbarConfig:{}},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",TABLE_DRAG_ROW:iconPrefix+"drag-handle",TABLE_DRAG_COLUMN:iconPrefix+"drag-handle",TABLE_DRAG_STATUS_ROW:iconPrefix+"sort",TABLE_DRAG_STATUS_SUB_ROW:iconPrefix+"add-sub",TABLE_DRAG_STATUS_COLUMN:iconPrefix+"swap",TABLE_DRAG_DISABLED:iconPrefix+"no-drop",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,hooks=exports.hooks=_core.VxeUI.hooks,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${"4.12.0-beta.28"}`;
+const version = `table v${"4.12.0-beta.29"}`;
 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 v4.12.0-beta.28",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 v4.12.0-beta.29",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": "4.12.0-beta.28",
+  "version": "4.12.0-beta.29",
   "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": "^4.4.23"
+    "vxe-pc-ui": "^4.4.25"
   },
   "devDependencies": {
     "@types/resize-observer-browser": "^0.1.11",

package/packages/table/src/body.ts

@@ -103,7 +103,7 @@ export default defineComponent({
     ) => {
       const $xeGrid = $xeTable.xeGrid
 
-      const { fullAllDataRowIdData, visibleColumn } = tableInternalData
+      const { fullAllDataRowIdData, fullColumnIdData, visibleColumn } = tableInternalData
       const { columnKey, resizable: allResizable, showOverflow: allShowOverflow, border, height, cellClassName: allCellClassName, cellStyle, align: allAlign, spanMethod, mouseConfig, editConfig, editRules, tooltipConfig, padding: allPadding } = tableProps
       const { tableData, dragRow, overflowX, currentColumn, scrollXLoad, scrollYLoad, calcCellHeightFlag, resizeHeightFlag, resizeWidthFlag, mergeList, editStore, isAllOverflow, validErrorMaps } = tableReactData
       const { afterFullData, scrollXStore, scrollYStore } = tableInternalData
@@ -127,15 +127,16 @@ export default defineComponent({
       const { type, cellRender, editRender, align, showOverflow, className, treeNode, rowResize, padding, verticalAlign, slots } = column
       const { verticalAlign: allVerticalAlign } = cellOpts
       const { actived } = editStore
-      const rowRest = fullAllDataRowIdData[rowid]
+      const rowRest = fullAllDataRowIdData[rowid] || {}
       const colid = column.id
+      const colRest = fullColumnIdData[colid] || {}
       const renderOpts = editRender || cellRender
       const compConf = renderOpts ? renderer.get(renderOpts.name) : null
       const compCellClassName = compConf ? (compConf.tableCellClassName || compConf.cellClassName) : null
       const compCellStyle = compConf ? (compConf.tableCellStyle || compConf.cellStyle) : ''
       const showAllTip = tooltipOpts.showAll
-      const columnIndex = $xeTable.getColumnIndex(column)
-      const _columnIndex = $xeTable.getVTColumnIndex(column)
+      const columnIndex = colRest.index
+      const _columnIndex = colRest._index
       const isEdit = isEnableConf(editRender)
       const resizeHeight = resizeHeightFlag ? rowRest.resizeHeight : 0
       let fixedHiddenColumn = fixedType ? column.fixed !== fixedType : column.fixed && overflowX
@@ -484,7 +485,7 @@ export default defineComponent({
           }
         }
         const rowid = handleGetRowId(row)
-        const rowRest = fullAllDataRowIdData[rowid]
+        const rowRest = fullAllDataRowIdData[rowid] || {}
         let rowLevel = 0
         let seq: string | number = -1
         let _rowIndex = 0

package/packages/table/src/footer.ts

@@ -63,7 +63,7 @@ export default defineComponent({
       const { fixedType } = props
       const { resizable: allResizable, border, footerCellClassName, footerCellStyle, footerAlign: allFooterAlign, footerSpanMethod, align: allAlign, columnKey, showFooterOverflow: allColumnFooterOverflow } = tableProps
       const { scrollXLoad, scrollYLoad, overflowX, currentColumn, mergeFooterList } = tableReactData
-      const { scrollXStore } = tableInternalData
+      const { fullColumnIdData, scrollXStore } = tableInternalData
       const tooltipOpts = computeTooltipOpts.value
       const resizableOpts = computeResizableOpts.value
       const { isAllColumnDrag } = resizableOpts
@@ -76,6 +76,7 @@ export default defineComponent({
       return tableColumn.map((column, $columnIndex) => {
         const { type, showFooterOverflow, footerAlign, align, footerClassName, editRender, cellRender } = column
         const colid = column.id
+        const colRest = fullColumnIdData[colid] || {}
         const renderOpts = editRender || cellRender
         const compConf = renderOpts ? renderer.get(renderOpts.name) : null
         const showAllTip = tooltipOpts.showAll
@@ -91,8 +92,8 @@ export default defineComponent({
         const showResizable = (XEUtils.isBoolean(column.resizable) ? column.resizable : (columnOpts.resizable || allResizable))
         const attrs: any = { colid }
         const tfOns: any = {}
-        const columnIndex = $xeTable.getColumnIndex(column)
-        const _columnIndex = $xeTable.getVTColumnIndex(column)
+        const columnIndex = colRest.index
+        const _columnIndex = colRest._index
         const itemIndex = _columnIndex
         const cellParams: VxeTableDefines.CellRenderFooterParams & {
           $table: VxeTableConstructor<any> & VxeTablePrivateMethods

package/packages/table/src/header.ts

@@ -48,7 +48,7 @@ export default defineComponent({
       const { fixedType } = props
       const { resizable: allResizable, columnKey, headerCellClassName, headerCellStyle, showHeaderOverflow: allColumnHeaderOverflow, headerAlign: allHeaderAlign, align: allAlign, mouseConfig } = tableProps
       const { currentColumn, dragCol, scrollXLoad, scrollYLoad, overflowX } = tableReactData
-      const { scrollXStore } = tableInternalData
+      const { fullColumnIdData, scrollXStore } = tableInternalData
       const columnOpts = computeColumnOpts.value
       const columnDragOpts = computeColumnDragOpts.value
       const cellOpts = computeCellOpts.value
@@ -59,6 +59,7 @@ export default defineComponent({
       return cols.map((column, $columnIndex) => {
         const { type, showHeaderOverflow, headerAlign, align, filters, headerClassName, editRender, cellRender } = column
         const colid = column.id
+        const colRest = fullColumnIdData[colid] || {}
         const renderOpts = editRender || cellRender
         const compConf = renderOpts ? renderer.get(renderOpts.name) : null
         const isColGroup = column.children && column.children.length
@@ -76,8 +77,8 @@ export default defineComponent({
           firstFilterOption = filters[0]
           hasFilter = filters.some((item) => item.checked)
         }
-        const columnIndex = $xeTable.getColumnIndex(column)
-        const _columnIndex = $xeTable.getVTColumnIndex(column)
+        const columnIndex = colRest.index
+        const _columnIndex = colRest._index
         const cellParams: VxeTableDefines.CellRenderHeaderParams & {
           $table: VxeTableConstructor & VxeTablePrivateMethods
         } = { $table: $xeTable, $grid: $xeGrid, $rowIndex, column, columnIndex, $columnIndex, _columnIndex, firstFilterOption, fixed: fixedType, type: renderType, isHidden: fixedHiddenColumn, hasFilter }