vxe-table 4.10.6-beta.25 → 4.10.6-beta.26

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

package/lib/table/src/table.js

@@ -940,14 +940,14 @@ var _default = exports.default = (0, _vue.defineComponent)({
     };
     const computeRowHeight = () => {
       const {
-        showOverflow
-      } = props;
+        isAllOverflow
+      } = reactData;
       const tableHeader = refTableHeader.value;
       const tableBody = refTableBody.value;
       const tableBodyElem = tableBody ? tableBody.$el : null;
       const defaultRowHeight = computeDefaultRowHeight.value;
       let rowHeight = 0;
-      if (showOverflow) {
+      if (isAllOverflow) {
         if (tableBodyElem) {
           const tableHeaderElem = tableHeader ? tableHeader.$el : null;
           let firstTrElem;
@@ -970,8 +970,8 @@ var _default = exports.default = (0, _vue.defineComponent)({
     };
     const handleVirtualYVisible = currScrollTop => {
       const {
-        showOverflow
-      } = props;
+        isAllOverflow
+      } = reactData;
       const {
         elemStore,
         isResizeCellHeight,
@@ -990,7 +990,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
         let offsetTop = 0;
         let visibleSize = 0;
         const isCustomCellHeight = isResizeCellHeight || cellOpts.height || rowOpts.height;
-        if (!isCustomCellHeight && showOverflow) {
+        if (!isCustomCellHeight && isAllOverflow) {
           toVisibleIndex = Math.floor(scrollTop / defaultRowHeight);
           visibleSize = Math.ceil(clientHeight / defaultRowHeight) + 1;
         } else {
@@ -1586,11 +1586,9 @@ var _default = exports.default = (0, _vue.defineComponent)({
       return colHeight + topBottomPadding;
     };
     const calcCellHeight = () => {
-      const {
-        showOverflow
-      } = props;
       const {
         tableData,
+        isAllOverflow,
         scrollYLoad,
         scrollXLoad
       } = reactData;
@@ -1599,7 +1597,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
       } = internalData;
       const defaultRowHeight = computeDefaultRowHeight.value;
       const el = refElem.value;
-      if (!showOverflow && scrollYLoad && el) {
+      if (!isAllOverflow && scrollYLoad && el) {
         tableData.forEach(row => {
           const rowid = (0, _util.getRowid)($xeTable, row);
           const rowRest = fullAllDataRowIdData[rowid];
@@ -1983,7 +1981,6 @@ var _default = exports.default = (0, _vue.defineComponent)({
     const updateStyle = () => {
       const {
         border,
-        showOverflow: allColumnOverflow,
         showHeaderOverflow: allColumnHeaderOverflow,
         showFooterOverflow: allColumnFooterOverflow,
         mouseConfig,
@@ -2204,7 +2201,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
             let renderColumnList = tableColumn;
             let isOptimizeMode = false;
             // 如果是使用优化模式
-            if (scrollXLoad || scrollYLoad || allColumnOverflow && isAllOverflow) {
+            if (scrollXLoad || scrollYLoad || isAllOverflow) {
               if (expandColumn || spanMethod || footerSpanMethod) {
                 // 如果不支持优化模式
               } else {
@@ -2288,7 +2285,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
                 } else if (layout === 'footer') {
                   cellOverflow = _xeUtils.default.isUndefined(showFooterOverflow) || _xeUtils.default.isNull(showFooterOverflow) ? allColumnFooterOverflow : showFooterOverflow;
                 } else {
-                  cellOverflow = _xeUtils.default.isUndefined(showOverflow) || _xeUtils.default.isNull(showOverflow) ? allColumnOverflow : showOverflow;
+                  cellOverflow = _xeUtils.default.isUndefined(showOverflow) || _xeUtils.default.isNull(showOverflow) ? isAllOverflow : showOverflow;
                 }
                 const showEllipsis = cellOverflow === 'ellipsis';
                 const showTitle = cellOverflow === 'title';
@@ -2985,8 +2982,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
     const loadTableData = (datas, isReset) => {
       const {
         keepSource,
-        treeConfig,
-        showOverflow
+        treeConfig
       } = props;
       const {
         editStore,
@@ -2999,7 +2995,6 @@ var _default = exports.default = (0, _vue.defineComponent)({
         lastScrollTop
       } = internalData;
       const treeOpts = computeTreeOpts.value;
-      const rowOpts = computeRowOpts.value;
       const {
         transform
       } = treeOpts;
@@ -3060,32 +3055,15 @@ var _default = exports.default = (0, _vue.defineComponent)({
       internalData.tableSynchData = datas;
       if (isReset) {
         internalData.isResizeCellHeight = false;
+        reactData.rowExpandedMaps = {};
+        reactData.rowExpandLazyLoadedMaps = {};
+        reactData.treeExpandedMaps = {};
+        reactData.treeExpandLazyLoadedMaps = {};
       }
       // 克隆原数据，用于显示编辑状态，与编辑值做对比
       if (keepSource) {
         tablePrivateMethods.cacheSourceMap(fullData);
       }
-      if (sYLoad) {
-        if (showOverflow) {
-          if (!rowOpts.height) {
-            const errColumn = internalData.tableFullColumn.find(column => column.showOverflow === false);
-            if (errColumn) {
-              (0, _log.errLog)('vxe.error.errProp', [`column[field="${errColumn.field}"].show-overflow=false`, 'show-overflow=true']);
-            }
-          }
-        }
-        if (process.env.NODE_ENV === 'development') {
-          if (!(props.height || props.maxHeight)) {
-            (0, _log.errLog)('vxe.error.reqProp', ['table.height | table.max-height | table.scroll-y={enabled: false}']);
-          }
-          // if (!props.showOverflow) {
-          //   warnLog('vxe.error.reqProp', ['table.show-overflow'])
-          // }
-          if (props.spanMethod) {
-            (0, _log.warnLog)('vxe.error.scrollErrProp', ['table.span-method']);
-          }
-        }
-      }
       if ($xeTable.clearCellAreas && props.mouseConfig) {
         $xeTable.clearCellAreas();
         $xeTable.clearCopyCellArea();
@@ -3104,6 +3082,27 @@ var _default = exports.default = (0, _vue.defineComponent)({
         if (sYLoad) {
           scrollYStore.endIndex = scrollYStore.visibleSize;
         }
+        if (sYLoad) {
+          // if (showOverflow) {
+          //   if (!rowOpts.height) {
+          //     const errColumn = internalData.tableFullColumn.find(column => column.showOverflow === false)
+          //     if (errColumn) {
+          //       errLog('vxe.error.errProp', [`column[field="${errColumn.field}"].show-overflow=false`, 'show-overflow=true'])
+          //     }
+          //   }
+          // }
+          if (process.env.NODE_ENV === 'development') {
+            if (!(props.height || props.maxHeight)) {
+              (0, _log.errLog)('vxe.error.reqProp', ['table.height | table.max-height | table.scroll-y={enabled: false}']);
+            }
+            // if (!props.showOverflow) {
+            //   warnLog('vxe.error.reqProp', ['table.show-overflow'])
+            // }
+            if (props.spanMethod) {
+              (0, _log.warnLog)('vxe.error.scrollErrProp', ['table.span-method']);
+            }
+          }
+        }
         handleReserveStatus();
         tablePrivateMethods.checkSelectionStatus();
         return new Promise(resolve => {
@@ -3552,10 +3551,8 @@ var _default = exports.default = (0, _vue.defineComponent)({
      */
     const loadScrollYData = scrollTop => {
       const {
-        showOverflow
-      } = props;
-      const {
-        mergeList
+        mergeList,
+        isAllOverflow
       } = reactData;
       const {
         scrollYStore
@@ -3566,7 +3563,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
         endIndex,
         offsetSize
       } = scrollYStore;
-      const autoOffsetYSize = showOverflow ? offsetSize : offsetSize + 1;
+      const autoOffsetYSize = isAllOverflow ? offsetSize : offsetSize + 1;
       const {
         toVisibleIndex,
         visibleSize
@@ -6136,9 +6133,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
        */
       scrollToRow(row, fieldOrColumn) {
         const {
-          showOverflow
-        } = props;
-        const {
+          isAllOverflow,
           scrollYLoad,
           scrollXLoad
         } = reactData;
@@ -6155,7 +6150,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
         }
         return Promise.all(rest).then(() => {
           if (row) {
-            if (!showOverflow && (scrollYLoad || scrollXLoad)) {
+            if (!isAllOverflow && (scrollYLoad || scrollXLoad)) {
               calcCellHeight();
               calcCellWidth();
             }
@@ -10216,9 +10211,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
       // 更新纵向 Y 可视渲染上下剩余空间大小
       updateScrollYSpace() {
         const {
-          showOverflow
-        } = props;
-        const {
+          isAllOverflow,
           scrollYLoad
         } = reactData;
         const {
@@ -10240,7 +10233,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
         let ySpaceHeight = 0;
         if (scrollYLoad) {
           const isCustomCellHeight = isResizeCellHeight || cellOpts.height || rowOpts.height;
-          if (!isCustomCellHeight && showOverflow) {
+          if (!isCustomCellHeight && isAllOverflow) {
             ySpaceHeight = afterFullData.length * defaultRowHeight;
             topSpaceHeight = Math.max(0, startIndex * defaultRowHeight);
           } else {
@@ -10285,13 +10278,13 @@ var _default = exports.default = (0, _vue.defineComponent)({
       },
       updateScrollXData() {
         const {
-          showOverflow
-        } = props;
+          isAllOverflow
+        } = reactData;
         handleTableColumn();
         return (0, _vue.nextTick)().then(() => {
           handleTableColumn();
           $xeTable.updateScrollXSpace();
-          if (!showOverflow) {
+          if (!isAllOverflow) {
             $xeTable.updateScrollYSpace();
           }
         });
@@ -10880,7 +10873,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
       if (value && value.length >= 50000) {
         (0, _log.warnLog)('vxe.error.errLargeData', ['loadData(data), reloadData(data)']);
       }
-      loadTableData(value, false).then(() => {
+      loadTableData(value, true).then(() => {
         const {
           scrollXLoad,
           scrollYLoad,