vxe-table 4.11.11 → 4.11.13

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

package/lib/table/src/header.js

@@ -72,6 +72,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
       } = tableProps;
       const {
         currentColumn,
+        dragCol,
         scrollXLoad,
         scrollYLoad,
         overflowX
@@ -171,8 +172,10 @@ var _default = exports.default = (0, _vue.defineComponent)({
         const isAutoCellWidth = !column.resizeWidth && (column.minWidth === 'auto' || column.width === 'auto');
         let isVNPreEmptyStatus = false;
         if (!isGroup) {
-          if (scrollXLoad && !column.fixed && (_columnIndex < scrollXStore.visibleStartIndex - scrollXStore.preloadSize || _columnIndex > scrollXStore.visibleEndIndex + scrollXStore.preloadSize)) {
-            isVNPreEmptyStatus = true;
+          if (!dragCol || dragCol.id !== colid) {
+            if (scrollXLoad && !column.fixed && (_columnIndex < scrollXStore.visibleStartIndex - scrollXStore.preloadSize || _columnIndex > scrollXStore.visibleEndIndex + scrollXStore.preloadSize)) {
+              isVNPreEmptyStatus = true;
+            }
           }
         }
         const tcStyle = {};

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(_){let J=(0,_vue.inject)("$xeTable",{}),{xID:m,props:b,reactData:C,internalData:y}=J,{computeColumnOpts:w,computeColumnDragOpts:D,computeCellOpts:l,computeMouseOpts:H,computeHeaderCellOpts:a,computeDefaultRowHeight:r}=J.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)(),n=()=>{var e=C.isGroup;E.value=e?(0,_util.convertHeaderColumnToRows)(_.tableGroupColumn):[]},k=(H,E,S,M)=>{let T=_.fixedType,{resizable:I,columnKey:O,headerCellClassName:U,headerCellStyle:k,showHeaderOverflow:z,headerAlign:R,align:$,mouseConfig:F}=b,{currentColumn:A,scrollXLoad:q,scrollYLoad:j,overflowX:G}=C,L=y.scrollXStore,X=w.value,N=D.value,V=l.value;var e=r.value;let B=a.value,K=(0,_util.getCellHeight)(B.height||V.height)||e,{disabledMethod:P,isCrossDrag:W,isPeerDrag:Y}=N;return S.map((e,l)=>{var{type:a,showHeaderOverflow:r,headerAlign:t,align:n,filters:i,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=T?e.fixed!==T&&!d:!!e.fixed&&G,v=(_xeUtils.default.isBoolean(B.padding)?B:V).padding,r=_xeUtils.default.eqNull(r)?z:r,t=t||(u?u.tableHeaderCellAlign:"")||R||n||(u?u.tableCellAlign:"")||$;let p="ellipsis"===r;n="title"===r,u=!0===r||"tooltip"===r;let x=n||u||p,h=!1,g=null;i&&(g=i[0],h=i.some(e=>e.checked));var r=J.getColumnIndex(e),f=J.getVTColumnIndex(e);let _={$table:J,$grid:J.xegrid,$rowIndex:M,column:e,columnIndex:r,$columnIndex:l,_columnIndex:f,firstFilterOption:g,fixed:T,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=>J.triggerHeaderCellClickEvent(e,_),onDblclick:e=>J.triggerHeaderCellDblclickEvent(e,_)},b=(q&&!x&&(p=x=!0),X.drag&&"cell"===N.trigger);let C=!1;b&&(C=!(!P||!P(_))),(F||b)&&(m.onMousedown=e=>J.triggerHeaderCellMousedownEvent(e,_)),X.drag&&(m.onDragstart=J.handleHeaderCellDragDragstartEvent,m.onDragend=J.handleHeaderCellDragDragendEvent,m.onDragover=J.handleHeaderCellDragDragoverEvent,b)&&(m.onMouseup=J.handleHeaderCellDragMouseupEvent);var b=l===S.length-1,y=_xeUtils.default.isBoolean(e.resizable)?e.resizable:X.resizable||I,w=!e.resizeWidth&&("auto"===e.minWidth||"auto"===e.width);let D=!1;H||q&&!e.fixed&&(f<L.visibleStartIndex-L.preloadSize||f>L.visibleEndIndex+L.preloadSize)&&(D=!0);f={};return x?f.height=K+"px":f.minHeight=K+"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":!!i,"is--filter-active":h,"is--drag-active":X.drag&&!e.fixed&&!C&&(W||Y||!e.parentId),"is--drag-disabled":X.drag&&C,"col--current":A===e},o?_xeUtils.default.isFunction(o)?o(_):o:"",U?_xeUtils.default.isFunction(U)?U(_):U:""],style:k?_xeUtils.default.isFunction(k)?k(_):k:null},r),m),{key:O||q||j||X.useKey||X.drag||d?s:l}),[(0,_vue.h)("div",{class:["vxe-cell",{"c--title":n,"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=>J.handleColResizeMousedownEvent(e,T,_),onDblclick:e=>J.handleColResizeDblclickEvent(e,_)}):renderEmptyElement(J)])})};return(0,_vue.watch)(()=>_.tableColumn,n),(0,_vue.onMounted)(()=>{(0,_vue.nextTick)(()=>{var e=_.fixedType,l=J.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,n()})}),(0,_vue.onUnmounted)(()=>{var e=_.fixedType,l=J.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}=_;var{mouseConfig:r,showHeaderOverflow:t,spanMethod:n,footerSpanMethod:i}=b,{isGroup:o,overflowX:d,scrollXLoad:u,scrollYLoad:s,dragCol:c}=C,{visibleColumn:v,fullColumnIdData:p}=y,x=H.value;let h=E.value,g=a,f=!1;return o?g=v:(!(u||s||t)||n||i||(f=!0),!l&&d||(g=v),l&&f&&(g=e||[]),h=[g]),l||o||u&&c&&2<g.length&&(s=p[c.id])&&(t=s._index,n=g[0],i=g[g.length-1],d=p[n.id],v=p[i.id],d)&&v&&(u=d._index,s=v._index,t<u?(g=[c].concat(g),h=[[c].concat(h[0])].concat(h.slice(1))):s<t&&(g=g.concat([c]),h=[h[0].concat([c])].concat(h.slice(1)))),(0,_vue.h)("div",{ref:S,class:["vxe-table--header-wrapper",l?`fixed-${l}--wrapper`:"body--wrapper"],xid:m},[(0,_vue.h)("div",{ref:M,class:"vxe-table--header-inner-wrapper",onScroll(e){J.triggerHeaderScrollEvent(e,l)}},[l?renderEmptyElement(J):(0,_vue.h)("div",{ref:U,class:"vxe-body--x-space"}),(0,_vue.h)("table",{ref:T,class:"vxe-table--header",xid:m,cellspacing:0,cellpadding:0,border:0},[(0,_vue.h)("colgroup",{ref:I},g.map((e,l)=>(0,_vue.h)("col",{name:e.id,key:l}))),(0,_vue.h)("thead",{ref:O},((r,t,e)=>{let n=_.fixedType,{headerRowClassName:i,headerRowStyle:o}=b,{isColLoading:d,isDragColMove:u}=C,s=w.value,c=D.value;return e.map((e,l)=>{var a={$table:J,$rowIndex:l,fixed:n,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",i?_xeUtils.default.isFunction(i)?i(a):i:""],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",i?_xeUtils.default.isFunction(i)?i(a):i:""],style:o?_xeUtils.default.isFunction(o)?o(a):o:null},k(r,t,e,l))})})(o,f,h))]),r&&x.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(J)])])}}});
+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(_){let Q=(0,_vue.inject)("$xeTable",{}),{xID:m,props:b,reactData:C,internalData:y}=Q,{computeColumnOpts:w,computeColumnDragOpts:D,computeCellOpts:l,computeMouseOpts:H,computeHeaderCellOpts:a,computeDefaultRowHeight:r}=Q.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)(),n=()=>{var e=C.isGroup;E.value=e?(0,_util.convertHeaderColumnToRows)(_.tableGroupColumn):[]},k=(H,E,S,M)=>{let T=_.fixedType,{resizable:I,columnKey:O,headerCellClassName:U,headerCellStyle:k,showHeaderOverflow:z,headerAlign:R,align:$,mouseConfig:F}=b,{currentColumn:A,dragCol:q,scrollXLoad:j,scrollYLoad:G,overflowX:L}=C,X=y.scrollXStore,N=w.value,V=D.value,B=l.value;var e=r.value;let K=a.value,P=(0,_util.getCellHeight)(K.height||B.height)||e,{disabledMethod:W,isCrossDrag:Y,isPeerDrag:J}=V;return S.map((e,l)=>{var{type:a,showHeaderOverflow:r,headerAlign:t,align:n,filters:i,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=T?e.fixed!==T&&!d:!!e.fixed&&L,v=(_xeUtils.default.isBoolean(K.padding)?K:B).padding,r=_xeUtils.default.eqNull(r)?z:r,t=t||(u?u.tableHeaderCellAlign:"")||R||n||(u?u.tableCellAlign:"")||$;let p="ellipsis"===r;n="title"===r,u=!0===r||"tooltip"===r;let x=n||u||p,g=!1,h=null;i&&(h=i[0],g=i.some(e=>e.checked));var r=Q.getColumnIndex(e),f=Q.getVTColumnIndex(e);let _={$table:Q,$grid:Q.xegrid,$rowIndex:M,column:e,columnIndex:r,$columnIndex:l,_columnIndex:f,firstFilterOption:h,fixed:T,type:renderType,isHidden:c,hasFilter:g};var r={colid:s,colspan:1<e.colSpan?e.colSpan:null,rowspan:1<e.rowSpan?e.rowSpan:null},m={onClick:e=>Q.triggerHeaderCellClickEvent(e,_),onDblclick:e=>Q.triggerHeaderCellDblclickEvent(e,_)},b=(j&&!x&&(p=x=!0),N.drag&&"cell"===V.trigger);let C=!1;b&&(C=!(!W||!W(_))),(F||b)&&(m.onMousedown=e=>Q.triggerHeaderCellMousedownEvent(e,_)),N.drag&&(m.onDragstart=Q.handleHeaderCellDragDragstartEvent,m.onDragend=Q.handleHeaderCellDragDragendEvent,m.onDragover=Q.handleHeaderCellDragDragoverEvent,b)&&(m.onMouseup=Q.handleHeaderCellDragMouseupEvent);var b=l===S.length-1,y=_xeUtils.default.isBoolean(e.resizable)?e.resizable:N.resizable||I,w=!e.resizeWidth&&("auto"===e.minWidth||"auto"===e.width);let D=!1;H||q&&q.id===s||j&&!e.fixed&&(f<X.visibleStartIndex-X.preloadSize||f>X.visibleEndIndex+X.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":!!i,"is--filter-active":g,"is--drag-active":N.drag&&!e.fixed&&!C&&(Y||J||!e.parentId),"is--drag-disabled":N.drag&&C,"col--current":A===e},o?_xeUtils.default.isFunction(o)?o(_):o:"",U?_xeUtils.default.isFunction(U)?U(_):U:""],style:k?_xeUtils.default.isFunction(k)?k(_):k:null},r),m),{key:O||j||G||N.useKey||N.drag||d?s:l}),[(0,_vue.h)("div",{class:["vxe-cell",{"c--title":n,"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=>Q.handleColResizeMousedownEvent(e,T,_),onDblclick:e=>Q.handleColResizeDblclickEvent(e,_)}):renderEmptyElement(Q)])})};return(0,_vue.watch)(()=>_.tableColumn,n),(0,_vue.onMounted)(()=>{(0,_vue.nextTick)(()=>{var e=_.fixedType,l=Q.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,n()})}),(0,_vue.onUnmounted)(()=>{var e=_.fixedType,l=Q.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}=_;var{mouseConfig:r,showHeaderOverflow:t,spanMethod:n,footerSpanMethod:i}=b,{isGroup:o,overflowX:d,scrollXLoad:u,scrollYLoad:s,dragCol:c}=C,{visibleColumn:v,fullColumnIdData:p}=y,x=H.value;let g=E.value,h=a,f=!1;return o?h=v:(!(u||s||t)||n||i||(f=!0),!l&&d||(h=v),l&&f&&(h=e||[]),g=[h]),l||o||u&&c&&2<h.length&&(s=p[c.id])&&(t=s._index,n=h[0],i=h[h.length-1],d=p[n.id],v=p[i.id],d)&&v&&(u=d._index,s=v._index,t<u?(h=[c].concat(h),g=[[c].concat(g[0])].concat(g.slice(1))):s<t&&(h=h.concat([c]),g=[g[0].concat([c])].concat(g.slice(1)))),(0,_vue.h)("div",{ref:S,class:["vxe-table--header-wrapper",l?`fixed-${l}--wrapper`:"body--wrapper"],xid:m},[(0,_vue.h)("div",{ref:M,class:"vxe-table--header-inner-wrapper",onScroll(e){Q.triggerHeaderScrollEvent(e,l)}},[l?renderEmptyElement(Q):(0,_vue.h)("div",{ref:U,class:"vxe-body--x-space"}),(0,_vue.h)("table",{ref:T,class:"vxe-table--header",xid:m,cellspacing:0,cellpadding:0,border:0},[(0,_vue.h)("colgroup",{ref:I},h.map((e,l)=>(0,_vue.h)("col",{name:e.id,key:l}))),(0,_vue.h)("thead",{ref:O},((r,t,e)=>{let n=_.fixedType,{headerRowClassName:i,headerRowStyle:o}=b,{isColLoading:d,isDragColMove:u}=C,s=w.value,c=D.value;return e.map((e,l)=>{var a={$table:Q,$rowIndex:l,fixed:n,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",i?_xeUtils.default.isFunction(i)?i(a):i:""],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",i?_xeUtils.default.isFunction(i)?i(a):i:""],style:o?_xeUtils.default.isFunction(o)?o(a):o:null},k(r,t,e,l))})})(o,f,g))]),r&&x.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(Q)])])}}});

package/lib/table/style/style.css

@@ -2057,19 +2057,19 @@
 .vxe-table--render-default.is--round.is--footer:not(.is--header) .vxe-table--body-wrapper.body--wrapper, .vxe-table--render-default.is--round.is--header .vxe-table--header-wrapper.body--wrapper {
   border-radius: var(--vxe-ui-table-border-radius) var(--vxe-ui-table-border-radius) 0 0;
 }
-.vxe-table--render-default.is--round.is--header .vxe-table--header-wrapper.fixed-left--wrapper {
+.vxe-table--render-default.is--round.sx-pos--bottom.sy-pos--left .vxe-table--scroll-y-top-corner::before, .vxe-table--render-default.is--round.sx-pos--bottom.sy-pos--left .vxe-table--scroll-y-top-corner, .vxe-table--render-default.is--round.sx-pos--top .vxe-table--scroll-x-left-corner::before, .vxe-table--render-default.is--round.is--header .vxe-table--header-wrapper.fixed-left--wrapper {
   border-radius: var(--vxe-ui-table-border-radius) 0 0 0;
 }
-.vxe-table--render-default.is--round.is--header .vxe-table--header-wrapper.fixed-right--wrapper {
+.vxe-table--render-default.is--round.sx-pos--bottom.sy-pos--right .vxe-table--scroll-y-top-corner::before, .vxe-table--render-default.is--round.sx-pos--bottom.sy-pos--right .vxe-table--scroll-y-top-corner, .vxe-table--render-default.is--round.sx-pos--top .vxe-table--scroll-x-right-corner::before, .vxe-table--render-default.is--round.is--header .vxe-table--header-wrapper.fixed-right--wrapper {
   border-radius: 0 var(--vxe-ui-table-border-radius) 0 0;
 }
 .vxe-table--render-default.is--round.is--footer .vxe-table--footer-wrapper.body--wrapper, .vxe-table--render-default.is--round.is--header:not(.is--footer) .vxe-table--body-wrapper.body--wrapper {
   border-radius: 0 0 var(--vxe-ui-table-border-radius) var(--vxe-ui-table-border-radius);
 }
-.vxe-table--render-default.is--round.is--footer .vxe-table--footer-wrapper.fixed-left--wrapper, .vxe-table--render-default.is--round.is--footer:not(.is--header) .vxe-table--body-wrapper.fixed-left--wrapper, .vxe-table--render-default.is--round.is--header:not(.is--footer) .vxe-table--body-wrapper.fixed-left--wrapper {
+.vxe-table--render-default.is--round.sx-pos--bottom .vxe-table--scroll-x-left-corner::before, .vxe-table--render-default.is--round.is--footer .vxe-table--footer-wrapper.fixed-left--wrapper, .vxe-table--render-default.is--round.is--footer:not(.is--header) .vxe-table--body-wrapper.fixed-left--wrapper, .vxe-table--render-default.is--round.is--header:not(.is--footer) .vxe-table--body-wrapper.fixed-left--wrapper {
   border-radius: 0 0 0 var(--vxe-ui-table-border-radius);
 }
-.vxe-table--render-default.is--round.is--footer .vxe-table--footer-wrapper.fixed-right--wrapper, .vxe-table--render-default.is--round.is--footer:not(.is--header) .vxe-table--body-wrapper.fixed-right--wrapper, .vxe-table--render-default.is--round.is--header:not(.is--footer) .vxe-table--body-wrapper.fixed-right--wrapper {
+.vxe-table--render-default.is--round.sx-pos--bottom .vxe-table--scroll-x-right-corner::before, .vxe-table--render-default.is--round.is--footer .vxe-table--footer-wrapper.fixed-right--wrapper, .vxe-table--render-default.is--round.is--footer:not(.is--header) .vxe-table--body-wrapper.fixed-right--wrapper, .vxe-table--render-default.is--round.is--header:not(.is--footer) .vxe-table--body-wrapper.fixed-right--wrapper {
   border-radius: 0 0 var(--vxe-ui-table-border-radius) 0;
 }
 /*列宽*/
@@ -2538,24 +2538,23 @@
 .vxe-table--render-default.border--default .vxe-table--scroll-y-bottom-corner, .vxe-table--render-default.border--full .vxe-table--scroll-y-bottom-corner, .vxe-table--render-default.border--outer .vxe-table--scroll-y-bottom-corner, .vxe-table--render-default.border--inner .vxe-table--scroll-y-bottom-corner {
   border-top: var(--vxe-ui-table-border-width) solid var(--vxe-ui-table-border-color);
 }
-.vxe-table--render-default.border--default .vxe-table--scroll-x-wrapper::before, .vxe-table--render-default.border--default .vxe-table--scroll-x-wrapper::after, .vxe-table--render-default.border--full .vxe-table--scroll-x-wrapper::before, .vxe-table--render-default.border--full .vxe-table--scroll-x-wrapper::after, .vxe-table--render-default.border--outer .vxe-table--scroll-x-wrapper::before, .vxe-table--render-default.border--outer .vxe-table--scroll-x-wrapper::after, .vxe-table--render-default.border--inner .vxe-table--scroll-x-wrapper::before, .vxe-table--render-default.border--inner .vxe-table--scroll-x-wrapper::after {
+.vxe-table--render-default.border--default .vxe-table--scroll-x-wrapper::after, .vxe-table--render-default.border--full .vxe-table--scroll-x-wrapper::after, .vxe-table--render-default.border--outer .vxe-table--scroll-x-wrapper::after, .vxe-table--render-default.border--inner .vxe-table--scroll-x-wrapper::after {
   content: "";
   position: absolute;
   left: 0;
   width: 100%;
-  height: 0;
+  height: 100%;
   z-index: 1;
+  pointer-events: none;
 }
-.vxe-table--render-default.border--default .vxe-table--scroll-x-wrapper::before, .vxe-table--render-default.border--full .vxe-table--scroll-x-wrapper::before, .vxe-table--render-default.border--outer .vxe-table--scroll-x-wrapper::before, .vxe-table--render-default.border--inner .vxe-table--scroll-x-wrapper::before {
+.vxe-table--render-default.border--default.sx-pos--top .vxe-table--scroll-x-wrapper::after, .vxe-table--render-default.border--full.sx-pos--top .vxe-table--scroll-x-wrapper::after, .vxe-table--render-default.border--outer.sx-pos--top .vxe-table--scroll-x-wrapper::after, .vxe-table--render-default.border--inner.sx-pos--top .vxe-table--scroll-x-wrapper::after {
   top: 0;
-  border-top: var(--vxe-ui-table-border-width) solid var(--vxe-ui-table-border-color);
-}
-.vxe-table--render-default.border--default .vxe-table--scroll-x-wrapper::after, .vxe-table--render-default.border--full .vxe-table--scroll-x-wrapper::after, .vxe-table--render-default.border--outer .vxe-table--scroll-x-wrapper::after, .vxe-table--render-default.border--inner .vxe-table--scroll-x-wrapper::after {
-  bottom: 0;
   border-bottom: var(--vxe-ui-table-border-width) solid var(--vxe-ui-table-border-color);
 }
-.vxe-table--render-default.border--default.sx-pos--bottom .vxe-table--scroll-x-wrapper::before, .vxe-table--render-default.border--full.sx-pos--bottom .vxe-table--scroll-x-wrapper::before, .vxe-table--render-default.border--outer.sx-pos--bottom .vxe-table--scroll-x-wrapper::before, .vxe-table--render-default.border--inner.sx-pos--bottom .vxe-table--scroll-x-wrapper::before {
-  top: -1px;
+.vxe-table--render-default.border--default.sx-pos--bottom .vxe-table--scroll-x-wrapper::after, .vxe-table--render-default.border--full.sx-pos--bottom .vxe-table--scroll-x-wrapper::after, .vxe-table--render-default.border--outer.sx-pos--bottom .vxe-table--scroll-x-wrapper::after, .vxe-table--render-default.border--inner.sx-pos--bottom .vxe-table--scroll-x-wrapper::after {
+  bottom: 0;
+  height: calc(100% + var(--vxe-ui-table-border-width));
+  border-top: var(--vxe-ui-table-border-width) solid var(--vxe-ui-table-border-color);
 }
 .vxe-table--render-default.border--default .vxe-cell--col-resizable:before, .vxe-table--render-default.border--default .vxe-cell--col-resizable:after, .vxe-table--render-default.border--none .vxe-cell--col-resizable:before, .vxe-table--render-default.border--none .vxe-cell--col-resizable:after, .vxe-table--render-default.border--outer .vxe-cell--col-resizable:before, .vxe-table--render-default.border--outer .vxe-cell--col-resizable:after, .vxe-table--render-default.border--inner .vxe-cell--col-resizable:before, .vxe-table--render-default.border--inner .vxe-cell--col-resizable:after {
   content: "";
@@ -2598,24 +2597,23 @@
   width: calc(100% + 1px);
   left: -1px;
 }
-.vxe-table--render-default.border--default .vxe-table--scroll-y-wrapper::before, .vxe-table--render-default.border--default .vxe-table--scroll-y-wrapper::after, .vxe-table--render-default.border--full .vxe-table--scroll-y-wrapper::before, .vxe-table--render-default.border--full .vxe-table--scroll-y-wrapper::after {
+.vxe-table--render-default.border--default .vxe-table--scroll-y-wrapper::after, .vxe-table--render-default.border--full .vxe-table--scroll-y-wrapper::after {
   content: "";
   position: absolute;
   top: 0;
-  width: 0;
+  width: 100%;
   height: 100%;
   z-index: 1;
+  pointer-events: none;
 }
-.vxe-table--render-default.border--default .vxe-table--scroll-y-wrapper::before, .vxe-table--render-default.border--full .vxe-table--scroll-y-wrapper::before {
+.vxe-table--render-default.border--default.sy-pos--left .vxe-table--scroll-y-wrapper::after, .vxe-table--render-default.border--full.sy-pos--left .vxe-table--scroll-y-wrapper::after {
   left: 0;
-  border-left: var(--vxe-ui-table-border-width) solid var(--vxe-ui-table-border-color);
-}
-.vxe-table--render-default.border--default .vxe-table--scroll-y-wrapper::after, .vxe-table--render-default.border--full .vxe-table--scroll-y-wrapper::after {
-  right: 0;
   border-right: var(--vxe-ui-table-border-width) solid var(--vxe-ui-table-border-color);
 }
-.vxe-table--render-default.border--default.sy-pos--right .vxe-table--scroll-y-wrapper::before, .vxe-table--render-default.border--full.sy-pos--right .vxe-table--scroll-y-wrapper::before {
-  left: -1px;
+.vxe-table--render-default.border--default.sy-pos--right .vxe-table--scroll-y-wrapper::after, .vxe-table--render-default.border--full.sy-pos--right .vxe-table--scroll-y-wrapper::after {
+  right: 0;
+  width: calc(100% + var(--vxe-ui-table-border-width));
+  border-left: var(--vxe-ui-table-border-width) solid var(--vxe-ui-table-border-color);
 }
 .vxe-table--render-default.border--full .vxe-header--column,
 .vxe-table--render-default.border--full .vxe-body--column,