vxe-table 3.12.1-beta.2 → 3.12.1-beta.3

package/lib/table/src/body.js

@@ -78,6 +78,7 @@ function renderColumn(h, _vm, $xeTable, seq, rowid, fixedType, rowLevel, row, ro
     sYOpts,
     scrollXLoad,
     scrollYLoad,
+    isCalcCellHeight,
     highlightCurrentRow,
     showOverflow: allColumnOverflow,
     isAllOverflow,
@@ -339,14 +340,15 @@ function renderColumn(h, _vm, $xeTable, seq, rowid, fixedType, rowLevel, row, ro
     }
   }
   let cellHeight = '';
+  const vnHeight = isCalcCellHeight ? rest.height : 0;
   if (hasEllipsis) {
     if (scrollYRHeight || rowHeight) {
       cellHeight = `${scrollYRHeight || rowHeight}px`;
     } else if (!isAllOverflow) {
-      cellHeight = `${rest.height || 18}px`;
+      cellHeight = `${vnHeight || rowHeight || 18}px`;
     }
   } else {
-    cellHeight = `${rest.height || 18}px`;
+    cellHeight = `${vnHeight || rowHeight || 18}px`;
   }
   if (mouseConfig && mouseOpts.area && selectCellToRow) {
     if (!$columnIndex && selectCellToRow === true || selectCellToRow === column.field) {

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

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_ui=require("../../ui"),_utils=require("../../ui/src/utils"),_util=require("./util"),_dom=require("../../ui/src/dom"),_vn=require("../../ui/src/vn");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let{getI18n,renderer,renderEmptyElement}=_ui.VxeUI,renderType="body";function isVMScrollProcess(e){return e._isResize||e.lastScrollTime&&Date.now()<e.lastScrollTime+e.delayHover}function renderLine(e,l,t,r){var{row:o,column:s}=r,{afterFullData:a,treeOpts:i,treeConfig:n,fullAllDataRowIdData:d}=t,{slots:s,treeNode:c}=s,d=d[(0,_util.getRowid)(t,o)];let p=0,u=0,g=[];return d&&(p=d.level,u=d._index,g=d.items),s&&s.line?t.callSlot(s.line,r,e):(d=t.eqRow(a[0],o),n&&c&&(i.showLine||i.line)?[e("div",{class:"vxe-tree--line-wrapper"},[e("div",{class:"vxe-tree--line",style:{height:`${d?1:(0,_util.calcTreeLine)(r,g,u)}px`,left:p*i.indent+(p?2-(0,_util.getOffsetSize)(t):0)+16+"px"}})])]:[])}function renderColumn(e,H,l,t,r,o,s,a,i,n,B,d,c,U,q){var{$listeners:p,fullAllDataRowIdData:u,afterFullData:A,tableData:g,height:h,columnKey:F,overflowX:m,sYOpts:v,scrollXLoad:N,scrollYLoad:W,highlightCurrentRow:V,showOverflow:X,isAllOverflow:z,align:P,currentColumn:j,cellClassName:K,cellStyle:G,mergeList:J,spanMethod:Q,radioOpts:Z,checkboxOpts:ee,expandOpts:le,treeOpts:te,tooltipOpts:w,mouseConfig:re,editConfig:x,editOpts:y,editRules:oe,validOpts:f,editStore:se,tooltipConfig:ae,rowOpts:b,columnOpts:ie,mouseOpts:ne,areaOpts:S,validErrorMaps:T}=l,de=l.computeRowDragOpts,ce=de.disabledMethod,S=S.selectCellToRow,{type:pe,cellRender:ue,editRender:_,align:ge,showOverflow:C,className:he,treeNode:me,slots:ve}=d,we=l.computeCellOpts.verticalAlign,se=se.actived,v=v.rHeight,$=b.height,E=_||ue,E=E?renderer.get(E.name):null,xe=E?E.tableCellClassName||E.cellClassName:"",ye=E?E.tableCellStyle||E.cellStyle:"";let O=w.showAll||w.enabled;var w=l.getColumnIndex(d),fe=l.getVTColumnIndex(d),be=(0,_utils.isEnableConf)(_);let R=o?d.fixed!==o:d.fixed&&m;m=_xeUtils.default.isUndefined(C)||_xeUtils.default.isNull(C)?X:C,C="ellipsis"===m;let D="title"===m,I=!0===m||"tooltip"===m;m=X||D||I||C;let Se;var M={},u=u[r],ge=ge||(E?E.tableCellAlign:"")||P,E=T[r+":"+d.id],P=oe&&f.showMessage&&("default"===f.message?h||1<g.length:"inline"===f.message),T={colid:d.id};let Te=p["cell-mouseenter"],_e=p["cell-mouseleave"];oe=_&&x&&"dblclick"===y.trigger;let L={$table:l,$grid:l.$xegrid,isEdit:!1,seq:t,rowid:r,row:a,rowIndex:i,$rowIndex:n,_rowIndex:B,column:d,columnIndex:w,$columnIndex:c,_columnIndex:fe,fixed:o,type:renderType,isHidden:R,level:s,visibleData:A,data:g,items:q},Y=!1,Ce=!1;if((Y=b.drag?"row"===de.trigger||d.dragSort&&"cell"===de.trigger:Y)&&(Ce=!(!ce||!ce(L))),(D||I||O||Te||ae)&&(M.mouseenter=e=>{isVMScrollProcess(l)||(D?(0,_dom.updateCellTitle)(e.currentTarget,d):(I||O)&&l.triggerBodyTooltipEvent(e,L),Te&&l.emitEvent("cell-mouseenter",Object.assign({cell:e.currentTarget},L),e))}),(I||O||_e||ae)&&(M.mouseleave=e=>{isVMScrollProcess(l)||((I||O)&&l.handleTargetLeaveEvent(e),_e&&l.emitEvent("cell-mouseleave",Object.assign({cell:e.currentTarget},L),e))}),(Y||ee.range||re)&&(M.mousedown=e=>{l.triggerCellMousedownEvent(e,L)}),Y&&(M.mouseup=l.triggerCellMouseupEvent),(b.isCurrent||V||p["cell-click"]||_&&x||"row"===le.trigger||"cell"===le.trigger||"row"===Z.trigger||"radio"===d.type&&"cell"===Z.trigger||"row"===ee.trigger||"checkbox"===d.type&&"cell"===ee.trigger||"row"===te.trigger||d.treeNode&&"cell"===te.trigger)&&(M.click=e=>{l.triggerCellClickEvent(e,L)}),(oe||p["cell-dblclick"])&&(M.dblclick=e=>{l.triggerCellDblclickEvent(e,L)}),J.length){h=(0,_util.mergeBodyMethod)(J,B,fe);if(h){var{rowspan:t,colspan:r}=h;if(!t||!r)return null;1<t&&(T.rowspan=t),1<r&&(T.colspan=r)}}else if(Q){var{rowspan:i=1,colspan:n=1}=Q(L)||{};if(!i||!n)return null;1<i&&(T.rowspan=i),1<n&&(T.colspan=n)}!(R=R&&J&&(1<T.colspan||1<T.rowspan)?!1:R)&&x&&(_||ue)&&(y.showStatus||y.showUpdateStatus)&&(Se=l.isUpdateByRow(a,d.field));w=[];R&&X&&z?w.push(e("div",{class:["vxe-cell",{"c--title":D,"c--tooltip":I,"c--ellipsis":C}],style:{maxHeight:m&&(v||$)?`${v||$}px`:""}})):(w.push(...renderLine(e,H,l,L),e("div",{class:["vxe-cell",{"c--title":D,"c--tooltip":I,"c--ellipsis":C}],style:{maxHeight:m&&(v||$)?`${v||$}px`:""},attrs:{title:D?l.getCellLabel(a,d):null}},d.renderCell(e,L))),P&&E&&(o=E.rule,s=ve?ve.valid:null,A=Object.assign(Object.assign(Object.assign({},L),E),{rule:E}),w.push(e("div",{class:["vxe-cell--valid-error-tip",(0,_utils.getClass)(f.className,E)],style:o&&o.maxWidth?{width:o.maxWidth+"px"}:null},[e("div",{class:"vxe-cell--valid-error-wrapper vxe-cell--valid-error-theme-"+(f.theme||"normal")},[s?l.callSlot(s,A,e):[e("span",{class:"vxe-cell--valid-error-msg"},E.content)]])]))));let k="";m?v||$?k=`${v||$}px`:z||(k=`${u.height||18}px`):k=`${u.height||18}px`,re&&ne.area&&S&&((c||!0!==S)&&S!==d.field||w.push(e("div",{class:"vxe-cell--area-status"})));g=!d.resizeWidth&&("auto"===d.minWidth||"auto"===d.width);return e("td",{class:["vxe-body--column",d.id,{["col--"+ge]:ge,["col--vertical-"+we]:we,["col--"+pe]:pe,"col--last":c===U.length-1,"col--tree-node":me,"col--edit":be,"col--ellipsis":m,"fixed--width":!g,"fixed--hidden":R,"is--drag-cell":Y,"is--drag-disabled":Ce,"col--dirty":Se,"col--active":x&&be&&se.row===a&&(se.column===d||"row"===y.mode),"col--valid-error":!!E,"col--current":j===d},(0,_utils.getClass)(xe,L),(0,_utils.getClass)(he,L),(0,_utils.getClass)(K,L)],key:F||N||W||ie.useKey||b.useKey||ie.drag?d.id:c,attrs:T,style:Object.assign({height:k},_xeUtils.default.isFunction(ye)?ye(L):ye,_xeUtils.default.isFunction(G)?G(L):G),on:M},w)}function renderRows(v,w,x,y,f,b){let S=x.computeColumnOpts,T=x.computeColumnDragOpts,{stripe:_,rowKey:C,highlightHoverRow:$,rowClassName:E,rowStyle:O,editConfig:R,showOverflow:D,treeConfig:I,treeOpts:M,expandOpts:L,editOpts:Y,treeExpandedMaps:k,scrollXLoad:H,scrollYLoad:B,rowExpandedMaps:U,radioOpts:q,checkboxOpts:A,expandColumn:F,hasFixedColumn:N,fullAllDataRowIdData:W,rowOpts:V,pendingRowMaps:X,isDragColMove:z}=x,{transform:P,seqMode:j}=M,K=M.children||M.childrenField,G=[];return f.forEach((t,r)=>{var e={};let o,s=(o=x.getRowIndex(t),(V.isHover||$)&&(e.mouseenter=e=>{isVMScrollProcess(x)||x.triggerHoverEvent(e,{row:t,rowIndex:o})},e.mouseleave=()=>{isVMScrollProcess(x)||x.clearHoverRow()}),(0,_util.getRowid)(x,t));var l=W[s];let a=0,i=-1,n=0;l&&(a=l.level,i=I&&P&&"increasing"===j?l._index+1:l.seq,n=l._index);var l={$table:x,seq:i,rowid:s,fixed:y,type:renderType,level:a,row:t,rowIndex:o,$rowIndex:r},d=F&&!!U[s];let c=!1,p=[],u=!1;R&&(u=x.isInsertByRow(t)),!I||B||P||(p=t[K],c=p&&p.length&&!!k[s]),!V.drag||I&&!P||(e.dragstart=x.handleRowDragDragstartEvent,e.dragend=x.handleRowDragDragendEvent,e.dragover=x.handleRowDragDragoverEvent);var g,h=["vxe-body--row",I?"row--level-"+a:"",{"row--stripe":_&&(n+1)%2==0,"is--new":u,"is--expand-row":d,"is--expand-tree":c,"row--new":u&&(Y.showStatus||Y.showInsertStatus),"row--radio":q.highlight&&x.selectRadioRow===t,"row--checked":A.highlight&&x.isCheckedByCheckboxRow(t),"row--pending":!!X[s]},E?_xeUtils.default.isFunction(E)?E(l):E:""],m=b.map((e,l)=>renderColumn(v,w,x,i,s,y,a,t,o,r,n,e,l,b,f));G.push(S.drag&&T.animation?v("transition-group",{props:{tag:"tr",name:"vxe-header--col-list"+(z?"":"-disabled")},class:h,attrs:{rowid:s},style:O?_xeUtils.default.isFunction(O)?O(l):O:null,key:C||H||B||V.useKey||V.drag||S.drag||I?s:r,nativeOn:e},m):v("tr",{class:h,attrs:{rowid:s},style:O?_xeUtils.default.isFunction(O)?O(l):O:null,key:C||H||B||V.useKey||V.drag||S.drag||I?s:r,on:e},m)),d&&({height:h,padding:l}=L,m={},d=(h&&(m.height=h+"px"),I&&(m.paddingLeft=a*M.indent+30+"px"),F).showOverflow,d=_xeUtils.default.isUndefined(d)||_xeUtils.default.isNull(d)?D:d,g={$table:x,seq:i,column:F,fixed:y,type:renderType,level:a,row:t,rowIndex:o,$rowIndex:r},G.push(v("tr",{class:["vxe-body--expanded-row",{"is--padding":l}],key:"expand_"+s,style:O?_xeUtils.default.isFunction(O)?O(g):O:null,on:e},[v("td",{class:{"vxe-body--expanded-column":1,"fixed--hidden":y&&!N,"col--ellipsis":d},attrs:{colspan:b.length}},[v("div",{class:{"vxe-body--expanded-cell":1,"is--ellipsis":h},style:m},[F.renderData(v,g)])])]))),c&&G.push(...renderRows(v,w,x,y,p,b))}),G}var _default=exports.default={name:"VxeTableBody",props:{tableData:Array,tableColumn:Array,fixedColumn:Array,size:String,fixedType:String},data(){return{wheelTime:null,wheelYSize:0,wheelYInterval:0,wheelYTotal:0}},mounted(){var{$parent:e,$el:l,$refs:t,fixedType:r}=this,e=e.elemStore,r=`${r||"main"}-body-`;e[r+"wrapper"]=l,e[r+"table"]=t.table,e[r+"colgroup"]=t.colgroup,e[r+"list"]=t.tbody,e[r+"xSpace"]=t.xSpace,e[r+"ySpace"]=t.ySpace,e[r+"emptyBlock"]=t.emptyBlock},beforeDestroy(){clearTimeout(this.wheelTime)},destroyed(){var{$parent:e,fixedType:l}=this,e=e.elemStore,l=`${l||"main"}-body-`;e[l+"wrapper"]=null,e[l+"table"]=null,e[l+"colgroup"]=null,e[l+"list"]=null,e[l+"xSpace"]=null,e[l+"ySpace"]=null,e[l+"emptyBlock"]=null},render(t){let l=this.$parent;var e=l,r=l,o=l,{tId:s,$scopedSlots:a}=l;let{fixedColumn:i,fixedType:n,tableColumn:d}=this;var{showOverflow:c,spanMethod:p,footerSpanMethod:u,mouseConfig:g}=e,{isGroup:r,tableData:h,scrollXLoad:m,scrollYLoad:v,isAllOverflow:w,isDragRowMove:x,expandColumn:y,dragRow:f,dragCol:b}=r,{visibleColumn:o,fullAllDataRowIdData:S,fullColumnIdData:T}=o,_=l.computeRowOpts,C=l.computeSYOpts,$=l.computeEmptyOpts,E=l.computeMouseOpts,O=l.computeRowDragOpts;let R=h,D=d;n&&(D=!(m||v||c&&w)||y||p||u?o:i||[]),v&&f&&2<R.length&&(h=S[(0,_util.getRowid)(l,f)])&&(c=h._index,w=R[0],y=R[R.length-1],p=S[(0,_util.getRowid)(l,w)],u=S[(0,_util.getRowid)(l,y)],p)&&u&&(o=p._index,v=u._index,c<o?R=[f].concat(R):v<c&&(R=R.concat([f]))),n||r||m&&b&&2<D.length&&(h=T[b.id])&&(w=h._index,S=D[0],y=D[D.length-1],p=T[S.id],u=T[y.id],p)&&u&&(o=p._index,v=u._index,w<o?D=[b].concat(D):v<w&&(D=D.concat([b])));let I;I=a.empty?a.empty.call(this,{$table:l,$grid:l.xegrid},t):(f=(c=$.name?renderer.get($.name):null)?c.renderTableEmpty||c.renderTableEmptyView||c.renderEmpty:null)?(0,_vn.getSlotVNs)(f.call(this,t,$,{$table:l})):e.emptyText||getI18n("vxe.table.emptyText");r={scroll:this.scrollEvent};return"wheel"===C.mode&&(r.wheel=this.wheelEvent),t("div",{ref:"refElem",class:["vxe-table--body-wrapper",n?`fixed-${n}--wrapper`:"body--wrapper"],attrs:{xid:s},on:r},[n?renderEmptyElement(l):t("div",{class:"vxe-body--x-space",ref:"xSpace"}),t("div",{class:"vxe-body--y-space",ref:"ySpace"}),t("table",{class:"vxe-table--body",attrs:{xid:s,cellspacing:0,cellpadding:0,border:0},ref:"table"},[t("colgroup",{ref:"colgroup"},D.map((e,l)=>t("col",{attrs:{name:e.id},key:l}))),_.drag&&O.animation?t("transition-group",{props:{tag:"tbody",name:"vxe-body--row-list"+(x?"":"-disabled")}},renderRows(t,this,l,n,R,D)):t("tbody",{ref:"tbody"},renderRows(t,this,l,n,R,D))]),t("div",{class:"vxe-table--checkbox-range"}),g&&E.area?t("div",{class:"vxe-table--cell-area"},[t("span",{class:"vxe-table--cell-main-area"},E.extension?[t("span",{class:"vxe-table--cell-main-area-btn",on:{mousedown(e){l.triggerCellAreaExtendMousedownEvent&&l.triggerCellAreaExtendMousedownEvent(e,{$table:l,fixed:n,type:renderType})}}})]:null),t("span",{class:"vxe-table--cell-copy-area"}),t("span",{class:"vxe-table--cell-extend-area"}),t("span",{class:"vxe-table--cell-multi-area"}),t("span",{class:"vxe-table--cell-active-area"})]):renderEmptyElement(l),n?renderEmptyElement(l):t("div",{class:"vxe-table--empty-block",ref:"emptyBlock"},[t("div",{class:"vxe-table--empty-content"},I)])])},methods:{scrollEvent(e){var l,t,r,o,s,a=this.$parent,i=a,n=this.fixedType,{lastScrollTop:d,lastScrollLeft:c,inVirtualScroll:p,inBodyScroll:u,bodyScrollType:g,inFooterScroll:h}=i;p||h||u&&g!==n||({tableHeader:p,tableBody:h,leftBody:u,rightBody:g,tableFooter:l}=a.$refs,o=this.$el,p=p?p.$el:null,l=l?l.$el:null,(h=h?h.$el:null)&&(u=u?u.$el:null,g=g?g.$el:null,t=a.$refs.refScrollXHandleElem,r=a.$refs.refScrollYHandleElem,o=o.scrollTop,c=(s=h.scrollLeft)!==c,d=o!==d,i.inBodyScroll=!0,i.bodyScrollType=n,d&&(u&&"left"===n?((0,_dom.setScrollTop)(h,o),(0,_dom.setScrollTop)(g,o)):g&&"right"===n?((0,_dom.setScrollTop)(h,o),(0,_dom.setScrollTop)(u,o)):((0,_dom.setScrollTop)(u,o),(0,_dom.setScrollTop)(g,o)),(0,_dom.setScrollTop)(r,o),a.triggerScrollYEvent(e)),c&&((0,_dom.setScrollLeft)(t,s),(0,_dom.setScrollLeft)(p,s),(0,_dom.setScrollLeft)(l,s),a.triggerScrollXEvent(e)),a.handleScrollEvent(e,d,c,o,s,{type:renderType,fixed:n})))},handleWheel(i,n,e,d,c){let p=this.$parent;var{$refs:l,elemStore:t,scrollYLoad:r,scrollXLoad:o}=p,{tableBody:l,leftBody:s,rightBody:a}=l;let u=l.$el,g=s?s.$el:null,h=a?a.$el:null;l=this.isPrevWheelTop===n?Math.max(0,this.wheelYSize-this.wheelYTotal):0,s=t["main-body-ySpace"],a=t["main-body-xSpace"];let m=(r&&s?s:u).clientHeight,v=(o&&a?a:u).clientWidth,w=(this.isPrevWheelTop=n,this.wheelYSize=Math.abs(n?e-l:e+l),this.wheelYInterval=0,this.wheelYTotal=0,clearTimeout(this.wheelTime),()=>{let{fixedType:e,wheelYTotal:l,wheelYSize:t,wheelYInterval:r}=this;var o,s,a;l<t&&(t<(l+=r=Math.max(5,Math.floor(1.5*r)))&&(r-=l-t),{scrollTop:a,clientHeight:o,scrollHeight:s}=u,a=a+r*(n?-1:1),u.scrollTop=a,g&&(g.scrollTop=a),h&&(h.scrollTop=a),(n?a<s-o:0<=a)&&(this.wheelTime=setTimeout(w,10)),this.wheelYTotal=l,this.wheelYInterval=r,p.emitEvent("scroll",{type:renderType,fixed:e,scrollTop:u.scrollTop,scrollLeft:u.scrollLeft,scrollHeight:u.scrollHeight,scrollWidth:u.scrollWidth,bodyHeight:m,bodyWidth:v,isX:d,isY:c},i))});w()},wheelEvent(e){var{deltaY:l,deltaX:t}=e,{$el:r,$parent:o}=this,{$refs:s,highlightHoverRow:a,scrollYLoad:i,lastScrollTop:n,lastScrollLeft:d,rowOpts:c}=o,s=s.tableBody,s=s.$el,p=l<0;(p?r.scrollTop<=0:r.scrollTop>=r.scrollHeight-r.clientHeight)||(r=r.scrollTop+l,t=(s=s.scrollLeft+t)!==d,(d=r!==n)&&(e.preventDefault(),o.lastScrollTop=r,o.lastScrollLeft=s,o.lastScrollTime=Date.now(),(c.isHover||a)&&o.clearHoverRow(),this.handleWheel(e,p,l,t,d),i)&&o.triggerScrollYEvent(e))}}};
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_ui=require("../../ui"),_utils=require("../../ui/src/utils"),_util=require("./util"),_dom=require("../../ui/src/dom"),_vn=require("../../ui/src/vn");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let{getI18n,renderer,renderEmptyElement}=_ui.VxeUI,renderType="body";function isVMScrollProcess(e){return e._isResize||e.lastScrollTime&&Date.now()<e.lastScrollTime+e.delayHover}function renderLine(e,l,t,r){var{row:o,column:s}=r,{afterFullData:a,treeOpts:i,treeConfig:n,fullAllDataRowIdData:d}=t,{slots:s,treeNode:c}=s,d=d[(0,_util.getRowid)(t,o)];let p=0,u=0,g=[];return d&&(p=d.level,u=d._index,g=d.items),s&&s.line?t.callSlot(s.line,r,e):(d=t.eqRow(a[0],o),n&&c&&(i.showLine||i.line)?[e("div",{class:"vxe-tree--line-wrapper"},[e("div",{class:"vxe-tree--line",style:{height:`${d?1:(0,_util.calcTreeLine)(r,g,u)}px`,left:p*i.indent+(p?2-(0,_util.getOffsetSize)(t):0)+16+"px"}})])]:[])}function renderColumn(e,H,l,t,r,o,s,a,i,n,B,d,c,U,p){var{$listeners:u,fullAllDataRowIdData:q,afterFullData:A,tableData:g,height:h,columnKey:F,overflowX:m,sYOpts:v,scrollXLoad:N,scrollYLoad:W,isCalcCellHeight:V,highlightCurrentRow:X,showOverflow:z,isAllOverflow:P,align:j,currentColumn:K,cellClassName:G,cellStyle:J,mergeList:Q,spanMethod:Z,radioOpts:ee,checkboxOpts:le,expandOpts:te,treeOpts:re,tooltipOpts:w,mouseConfig:oe,editConfig:x,editOpts:y,editRules:se,validOpts:f,editStore:ae,tooltipConfig:ie,rowOpts:b,columnOpts:ne,mouseOpts:de,areaOpts:S,validErrorMaps:T}=l,ce=l.computeRowDragOpts,pe=ce.disabledMethod,S=S.selectCellToRow,{type:ue,cellRender:ge,editRender:_,align:he,showOverflow:C,className:me,treeNode:ve,slots:we}=d,xe=l.computeCellOpts.verticalAlign,ae=ae.actived,v=v.rHeight,$=b.height,E=_||ge,E=E?renderer.get(E.name):null,ye=E?E.tableCellClassName||E.cellClassName:"",fe=E?E.tableCellStyle||E.cellStyle:"";let O=w.showAll||w.enabled;var w=l.getColumnIndex(d),be=l.getVTColumnIndex(d),Se=(0,_utils.isEnableConf)(_);let R=o?d.fixed!==o:d.fixed&&m;m=_xeUtils.default.isUndefined(C)||_xeUtils.default.isNull(C)?z:C,C="ellipsis"===m;let D="title"===m,I=!0===m||"tooltip"===m;m=z||D||I||C;let Te;var M={},q=q[r],he=he||(E?E.tableCellAlign:"")||j,E=T[r+":"+d.id],j=se&&f.showMessage&&("default"===f.message?h||1<g.length:"inline"===f.message),T={colid:d.id};let _e=u["cell-mouseenter"],Ce=u["cell-mouseleave"];se=_&&x&&"dblclick"===y.trigger;let L={$table:l,$grid:l.$xegrid,isEdit:!1,seq:t,rowid:r,row:a,rowIndex:i,$rowIndex:n,_rowIndex:B,column:d,columnIndex:w,$columnIndex:c,_columnIndex:be,fixed:o,type:renderType,isHidden:R,level:s,visibleData:A,data:g,items:p},Y=!1,$e=!1;if((Y=b.drag?"row"===ce.trigger||d.dragSort&&"cell"===ce.trigger:Y)&&($e=!(!pe||!pe(L))),(D||I||O||_e||ie)&&(M.mouseenter=e=>{isVMScrollProcess(l)||(D?(0,_dom.updateCellTitle)(e.currentTarget,d):(I||O)&&l.triggerBodyTooltipEvent(e,L),_e&&l.emitEvent("cell-mouseenter",Object.assign({cell:e.currentTarget},L),e))}),(I||O||Ce||ie)&&(M.mouseleave=e=>{isVMScrollProcess(l)||((I||O)&&l.handleTargetLeaveEvent(e),Ce&&l.emitEvent("cell-mouseleave",Object.assign({cell:e.currentTarget},L),e))}),(Y||le.range||oe)&&(M.mousedown=e=>{l.triggerCellMousedownEvent(e,L)}),Y&&(M.mouseup=l.triggerCellMouseupEvent),(b.isCurrent||X||u["cell-click"]||_&&x||"row"===te.trigger||"cell"===te.trigger||"row"===ee.trigger||"radio"===d.type&&"cell"===ee.trigger||"row"===le.trigger||"checkbox"===d.type&&"cell"===le.trigger||"row"===re.trigger||d.treeNode&&"cell"===re.trigger)&&(M.click=e=>{l.triggerCellClickEvent(e,L)}),(se||u["cell-dblclick"])&&(M.dblclick=e=>{l.triggerCellDblclickEvent(e,L)}),Q.length){h=(0,_util.mergeBodyMethod)(Q,B,be);if(h){var{rowspan:t,colspan:r}=h;if(!t||!r)return null;1<t&&(T.rowspan=t),1<r&&(T.colspan=r)}}else if(Z){var{rowspan:i=1,colspan:n=1}=Z(L)||{};if(!i||!n)return null;1<i&&(T.rowspan=i),1<n&&(T.colspan=n)}!(R=R&&Q&&(1<T.colspan||1<T.rowspan)?!1:R)&&x&&(_||ge)&&(y.showStatus||y.showUpdateStatus)&&(Te=l.isUpdateByRow(a,d.field));w=[];R&&z&&P?w.push(e("div",{class:["vxe-cell",{"c--title":D,"c--tooltip":I,"c--ellipsis":C}],style:{maxHeight:m&&(v||$)?`${v||$}px`:""}})):(w.push(...renderLine(e,H,l,L),e("div",{class:["vxe-cell",{"c--title":D,"c--tooltip":I,"c--ellipsis":C}],style:{maxHeight:m&&(v||$)?`${v||$}px`:""},attrs:{title:D?l.getCellLabel(a,d):null}},d.renderCell(e,L))),j&&E&&(o=E.rule,s=we?we.valid:null,A=Object.assign(Object.assign(Object.assign({},L),E),{rule:E}),w.push(e("div",{class:["vxe-cell--valid-error-tip",(0,_utils.getClass)(f.className,E)],style:o&&o.maxWidth?{width:o.maxWidth+"px"}:null},[e("div",{class:"vxe-cell--valid-error-wrapper vxe-cell--valid-error-theme-"+(f.theme||"normal")},[s?l.callSlot(s,A,e):[e("span",{class:"vxe-cell--valid-error-msg"},E.content)]])]))));let k="";g=V?q.height:0,m?v||$?k=`${v||$}px`:P||(k=`${g||$||18}px`):k=`${g||$||18}px`,oe&&de.area&&S&&((c||!0!==S)&&S!==d.field||w.push(e("div",{class:"vxe-cell--area-status"}))),p=!d.resizeWidth&&("auto"===d.minWidth||"auto"===d.width);return e("td",{class:["vxe-body--column",d.id,{["col--"+he]:he,["col--vertical-"+xe]:xe,["col--"+ue]:ue,"col--last":c===U.length-1,"col--tree-node":ve,"col--edit":Se,"col--ellipsis":m,"fixed--width":!p,"fixed--hidden":R,"is--drag-cell":Y,"is--drag-disabled":$e,"col--dirty":Te,"col--active":x&&Se&&ae.row===a&&(ae.column===d||"row"===y.mode),"col--valid-error":!!E,"col--current":K===d},(0,_utils.getClass)(ye,L),(0,_utils.getClass)(me,L),(0,_utils.getClass)(G,L)],key:F||N||W||ne.useKey||b.useKey||ne.drag?d.id:c,attrs:T,style:Object.assign({height:k},_xeUtils.default.isFunction(fe)?fe(L):fe,_xeUtils.default.isFunction(J)?J(L):J),on:M},w)}function renderRows(v,w,x,y,f,b){let S=x.computeColumnOpts,T=x.computeColumnDragOpts,{stripe:_,rowKey:C,highlightHoverRow:$,rowClassName:E,rowStyle:O,editConfig:R,showOverflow:D,treeConfig:I,treeOpts:M,expandOpts:L,editOpts:Y,treeExpandedMaps:k,scrollXLoad:H,scrollYLoad:B,rowExpandedMaps:U,radioOpts:q,checkboxOpts:A,expandColumn:F,hasFixedColumn:N,fullAllDataRowIdData:W,rowOpts:V,pendingRowMaps:X,isDragColMove:z}=x,{transform:P,seqMode:j}=M,K=M.children||M.childrenField,G=[];return f.forEach((t,r)=>{var e={};let o,s=(o=x.getRowIndex(t),(V.isHover||$)&&(e.mouseenter=e=>{isVMScrollProcess(x)||x.triggerHoverEvent(e,{row:t,rowIndex:o})},e.mouseleave=()=>{isVMScrollProcess(x)||x.clearHoverRow()}),(0,_util.getRowid)(x,t));var l=W[s];let a=0,i=-1,n=0;l&&(a=l.level,i=I&&P&&"increasing"===j?l._index+1:l.seq,n=l._index);var l={$table:x,seq:i,rowid:s,fixed:y,type:renderType,level:a,row:t,rowIndex:o,$rowIndex:r},d=F&&!!U[s];let c=!1,p=[],u=!1;R&&(u=x.isInsertByRow(t)),!I||B||P||(p=t[K],c=p&&p.length&&!!k[s]),!V.drag||I&&!P||(e.dragstart=x.handleRowDragDragstartEvent,e.dragend=x.handleRowDragDragendEvent,e.dragover=x.handleRowDragDragoverEvent);var g,h=["vxe-body--row",I?"row--level-"+a:"",{"row--stripe":_&&(n+1)%2==0,"is--new":u,"is--expand-row":d,"is--expand-tree":c,"row--new":u&&(Y.showStatus||Y.showInsertStatus),"row--radio":q.highlight&&x.selectRadioRow===t,"row--checked":A.highlight&&x.isCheckedByCheckboxRow(t),"row--pending":!!X[s]},E?_xeUtils.default.isFunction(E)?E(l):E:""],m=b.map((e,l)=>renderColumn(v,w,x,i,s,y,a,t,o,r,n,e,l,b,f));G.push(S.drag&&T.animation?v("transition-group",{props:{tag:"tr",name:"vxe-header--col-list"+(z?"":"-disabled")},class:h,attrs:{rowid:s},style:O?_xeUtils.default.isFunction(O)?O(l):O:null,key:C||H||B||V.useKey||V.drag||S.drag||I?s:r,nativeOn:e},m):v("tr",{class:h,attrs:{rowid:s},style:O?_xeUtils.default.isFunction(O)?O(l):O:null,key:C||H||B||V.useKey||V.drag||S.drag||I?s:r,on:e},m)),d&&({height:h,padding:l}=L,m={},d=(h&&(m.height=h+"px"),I&&(m.paddingLeft=a*M.indent+30+"px"),F).showOverflow,d=_xeUtils.default.isUndefined(d)||_xeUtils.default.isNull(d)?D:d,g={$table:x,seq:i,column:F,fixed:y,type:renderType,level:a,row:t,rowIndex:o,$rowIndex:r},G.push(v("tr",{class:["vxe-body--expanded-row",{"is--padding":l}],key:"expand_"+s,style:O?_xeUtils.default.isFunction(O)?O(g):O:null,on:e},[v("td",{class:{"vxe-body--expanded-column":1,"fixed--hidden":y&&!N,"col--ellipsis":d},attrs:{colspan:b.length}},[v("div",{class:{"vxe-body--expanded-cell":1,"is--ellipsis":h},style:m},[F.renderData(v,g)])])]))),c&&G.push(...renderRows(v,w,x,y,p,b))}),G}var _default=exports.default={name:"VxeTableBody",props:{tableData:Array,tableColumn:Array,fixedColumn:Array,size:String,fixedType:String},data(){return{wheelTime:null,wheelYSize:0,wheelYInterval:0,wheelYTotal:0}},mounted(){var{$parent:e,$el:l,$refs:t,fixedType:r}=this,e=e.elemStore,r=`${r||"main"}-body-`;e[r+"wrapper"]=l,e[r+"table"]=t.table,e[r+"colgroup"]=t.colgroup,e[r+"list"]=t.tbody,e[r+"xSpace"]=t.xSpace,e[r+"ySpace"]=t.ySpace,e[r+"emptyBlock"]=t.emptyBlock},beforeDestroy(){clearTimeout(this.wheelTime)},destroyed(){var{$parent:e,fixedType:l}=this,e=e.elemStore,l=`${l||"main"}-body-`;e[l+"wrapper"]=null,e[l+"table"]=null,e[l+"colgroup"]=null,e[l+"list"]=null,e[l+"xSpace"]=null,e[l+"ySpace"]=null,e[l+"emptyBlock"]=null},render(t){let l=this.$parent;var e=l,r=l,o=l,{tId:s,$scopedSlots:a}=l;let{fixedColumn:i,fixedType:n,tableColumn:d}=this;var{showOverflow:c,spanMethod:p,footerSpanMethod:u,mouseConfig:g}=e,{isGroup:r,tableData:h,scrollXLoad:m,scrollYLoad:v,isAllOverflow:w,isDragRowMove:x,expandColumn:y,dragRow:f,dragCol:b}=r,{visibleColumn:o,fullAllDataRowIdData:S,fullColumnIdData:T}=o,_=l.computeRowOpts,C=l.computeSYOpts,$=l.computeEmptyOpts,E=l.computeMouseOpts,O=l.computeRowDragOpts;let R=h,D=d;n&&(D=!(m||v||c&&w)||y||p||u?o:i||[]),v&&f&&2<R.length&&(h=S[(0,_util.getRowid)(l,f)])&&(c=h._index,w=R[0],y=R[R.length-1],p=S[(0,_util.getRowid)(l,w)],u=S[(0,_util.getRowid)(l,y)],p)&&u&&(o=p._index,v=u._index,c<o?R=[f].concat(R):v<c&&(R=R.concat([f]))),n||r||m&&b&&2<D.length&&(h=T[b.id])&&(w=h._index,S=D[0],y=D[D.length-1],p=T[S.id],u=T[y.id],p)&&u&&(o=p._index,v=u._index,w<o?D=[b].concat(D):v<w&&(D=D.concat([b])));let I;I=a.empty?a.empty.call(this,{$table:l,$grid:l.xegrid},t):(f=(c=$.name?renderer.get($.name):null)?c.renderTableEmpty||c.renderTableEmptyView||c.renderEmpty:null)?(0,_vn.getSlotVNs)(f.call(this,t,$,{$table:l})):e.emptyText||getI18n("vxe.table.emptyText");r={scroll:this.scrollEvent};return"wheel"===C.mode&&(r.wheel=this.wheelEvent),t("div",{ref:"refElem",class:["vxe-table--body-wrapper",n?`fixed-${n}--wrapper`:"body--wrapper"],attrs:{xid:s},on:r},[n?renderEmptyElement(l):t("div",{class:"vxe-body--x-space",ref:"xSpace"}),t("div",{class:"vxe-body--y-space",ref:"ySpace"}),t("table",{class:"vxe-table--body",attrs:{xid:s,cellspacing:0,cellpadding:0,border:0},ref:"table"},[t("colgroup",{ref:"colgroup"},D.map((e,l)=>t("col",{attrs:{name:e.id},key:l}))),_.drag&&O.animation?t("transition-group",{props:{tag:"tbody",name:"vxe-body--row-list"+(x?"":"-disabled")}},renderRows(t,this,l,n,R,D)):t("tbody",{ref:"tbody"},renderRows(t,this,l,n,R,D))]),t("div",{class:"vxe-table--checkbox-range"}),g&&E.area?t("div",{class:"vxe-table--cell-area"},[t("span",{class:"vxe-table--cell-main-area"},E.extension?[t("span",{class:"vxe-table--cell-main-area-btn",on:{mousedown(e){l.triggerCellAreaExtendMousedownEvent&&l.triggerCellAreaExtendMousedownEvent(e,{$table:l,fixed:n,type:renderType})}}})]:null),t("span",{class:"vxe-table--cell-copy-area"}),t("span",{class:"vxe-table--cell-extend-area"}),t("span",{class:"vxe-table--cell-multi-area"}),t("span",{class:"vxe-table--cell-active-area"})]):renderEmptyElement(l),n?renderEmptyElement(l):t("div",{class:"vxe-table--empty-block",ref:"emptyBlock"},[t("div",{class:"vxe-table--empty-content"},I)])])},methods:{scrollEvent(e){var l,t,r,o,s,a=this.$parent,i=a,n=this.fixedType,{lastScrollTop:d,lastScrollLeft:c,inVirtualScroll:p,inBodyScroll:u,bodyScrollType:g,inFooterScroll:h}=i;p||h||u&&g!==n||({tableHeader:p,tableBody:h,leftBody:u,rightBody:g,tableFooter:l}=a.$refs,o=this.$el,p=p?p.$el:null,l=l?l.$el:null,(h=h?h.$el:null)&&(u=u?u.$el:null,g=g?g.$el:null,t=a.$refs.refScrollXHandleElem,r=a.$refs.refScrollYHandleElem,o=o.scrollTop,c=(s=h.scrollLeft)!==c,d=o!==d,i.inBodyScroll=!0,i.bodyScrollType=n,d&&(u&&"left"===n?((0,_dom.setScrollTop)(h,o),(0,_dom.setScrollTop)(g,o)):g&&"right"===n?((0,_dom.setScrollTop)(h,o),(0,_dom.setScrollTop)(u,o)):((0,_dom.setScrollTop)(u,o),(0,_dom.setScrollTop)(g,o)),(0,_dom.setScrollTop)(r,o),a.triggerScrollYEvent(e)),c&&((0,_dom.setScrollLeft)(t,s),(0,_dom.setScrollLeft)(p,s),(0,_dom.setScrollLeft)(l,s),a.triggerScrollXEvent(e)),a.handleScrollEvent(e,d,c,o,s,{type:renderType,fixed:n})))},handleWheel(i,n,e,d,c){let p=this.$parent;var{$refs:l,elemStore:t,scrollYLoad:r,scrollXLoad:o}=p,{tableBody:l,leftBody:s,rightBody:a}=l;let u=l.$el,g=s?s.$el:null,h=a?a.$el:null;l=this.isPrevWheelTop===n?Math.max(0,this.wheelYSize-this.wheelYTotal):0,s=t["main-body-ySpace"],a=t["main-body-xSpace"];let m=(r&&s?s:u).clientHeight,v=(o&&a?a:u).clientWidth,w=(this.isPrevWheelTop=n,this.wheelYSize=Math.abs(n?e-l:e+l),this.wheelYInterval=0,this.wheelYTotal=0,clearTimeout(this.wheelTime),()=>{let{fixedType:e,wheelYTotal:l,wheelYSize:t,wheelYInterval:r}=this;var o,s,a;l<t&&(t<(l+=r=Math.max(5,Math.floor(1.5*r)))&&(r-=l-t),{scrollTop:a,clientHeight:o,scrollHeight:s}=u,a=a+r*(n?-1:1),u.scrollTop=a,g&&(g.scrollTop=a),h&&(h.scrollTop=a),(n?a<s-o:0<=a)&&(this.wheelTime=setTimeout(w,10)),this.wheelYTotal=l,this.wheelYInterval=r,p.emitEvent("scroll",{type:renderType,fixed:e,scrollTop:u.scrollTop,scrollLeft:u.scrollLeft,scrollHeight:u.scrollHeight,scrollWidth:u.scrollWidth,bodyHeight:m,bodyWidth:v,isX:d,isY:c},i))});w()},wheelEvent(e){var{deltaY:l,deltaX:t}=e,{$el:r,$parent:o}=this,{$refs:s,highlightHoverRow:a,scrollYLoad:i,lastScrollTop:n,lastScrollLeft:d,rowOpts:c}=o,s=s.tableBody,s=s.$el,p=l<0;(p?r.scrollTop<=0:r.scrollTop>=r.scrollHeight-r.clientHeight)||(r=r.scrollTop+l,t=(s=s.scrollLeft+t)!==d,(d=r!==n)&&(e.preventDefault(),o.lastScrollTop=r,o.lastScrollLeft=s,o.lastScrollTime=Date.now(),(c.isHover||a)&&o.clearHoverRow(),this.handleWheel(e,p,l,t,d),i)&&o.triggerScrollYEvent(e))}}};

package/lib/table/src/methods.js

@@ -1145,7 +1145,8 @@ const Methods = {
           items,
           parent: parentRow,
           level,
-          height: 0
+          height: 0,
+          oTop: 0
         };
       }
       cacheItem.row = row;
@@ -1248,7 +1249,8 @@ const Methods = {
           items,
           parent: parentRow,
           level: parentLevel + nodes.length,
-          height: 0
+          height: 0,
+          oTop: 0
         };
         fullDataRowIdData[rowid] = rest;
         fullAllDataRowIdData[rowid] = rest;
@@ -2307,7 +2309,8 @@ const Methods = {
               items: [],
               parent: null,
               level: 0,
-              height: 0
+              height: 0,
+              oTop: 0
             };
             fullAllDataRowIdData[rowid] = rest;
             fullDataRowIdData[rowid] = rest;
@@ -2355,7 +2358,8 @@ const Methods = {
             items: [],
             parent: null,
             level: 0,
-            height: 0
+            height: 0,
+            oTop: 0
           };
           fullAllDataRowIdData[rowid] = rest;
           fullDataRowIdData[rowid] = rest;
@@ -2384,7 +2388,8 @@ const Methods = {
             items: [],
             parent: null,
             level: 0,
-            height: 0
+            height: 0,
+            oTop: 0
           };
           fullAllDataRowIdData[rowid] = rest;
           fullDataRowIdData[rowid] = rest;
@@ -8077,7 +8082,7 @@ const Methods = {
       $xeTable.loadScrollXData();
     }
     internalData.lxTimeout = setTimeout(() => {
-      internalData.lxRunTime = undefined;
+      internalData.lxTimeout = undefined;
       internalData.lxRunTime = undefined;
       $xeTable.loadScrollXData();
     }, fpsTime);
@@ -8347,8 +8352,9 @@ const Methods = {
     const {
       showOverflow
     } = props;
+    $xeTable.handleTableColumn();
+    calcCellHeight($xeTable);
     return $xeTable.$nextTick().then(() => {
-      $xeTable.handleTableColumn();
       calcCellHeight($xeTable);
       $xeTable.updateScrollXSpace();
       if (!showOverflow) {
@@ -8412,8 +8418,9 @@ const Methods = {
   },
   updateScrollYData() {
     const $xeTable = this;
+    $xeTable.handleTableData();
+    calcCellHeight($xeTable);
     return $xeTable.$nextTick().then(() => {
-      $xeTable.handleTableData();
       calcCellHeight($xeTable);
       $xeTable.updateScrollYSpace();
     });