vxe-table 3.12.10 → 3.12.11

package/lib/table/src/body.js

@@ -136,7 +136,6 @@ function renderTdColumn(h, _vm, seq, rowid, fixedType, isOptimizeMode, rowLevel,
   const rowDragOpts = $xeTable.computeRowDragOpts;
   const defaultRowHeight = $xeTable.computeDefaultRowHeight;
   const customCellHeight = cellOpts.height || rowOpts.height;
-  const currCellHeight = customCellHeight || defaultRowHeight;
   const {
     disabledMethod: dragDisabledMethod,
     isCrossDrag,
@@ -321,17 +320,7 @@ function renderTdColumn(h, _vm, seq, rowid, fixedType, isOptimizeMode, rowLevel,
     isDirty = $xeTable.isUpdateByRow(row, column.field);
   }
   const isVNAutoHeight = scrollYLoad && !hasEllipsis;
-  let cellHeight = currCellHeight;
-  const vnHeight = calcCellHeightFlag ? rowRest.height : 0;
-  if (resizeHeight) {
-    cellHeight = resizeHeight;
-  } else {
-    if (scrollYLoad) {
-      if (!hasEllipsis) {
-        cellHeight = vnHeight || currCellHeight;
-      }
-    }
-  }
+  const cellHeight = calcCellHeightFlag ? rowRest.resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight : defaultRowHeight;
   const isLastColumn = $columnIndex === columns.length - 1;
   const isAutoCellWidth = !column.resizeWidth && (column.minWidth === 'auto' || column.width === 'auto');
   let isVNPreEmptyStatus = false;

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

package/lib/table/src/methods.js

@@ -918,7 +918,7 @@ function handleVirtualYVisible($xeTable, currScrollTop) {
         const row = afterFullData[rIndex];
         const rowid = (0, _util.getRowid)($xeTable, row);
         const rowRest = fullAllDataRowIdData[rowid] || {};
-        offsetTop += rowRest.resizeHeight || rowRest.height || cellOpts.height || rowOpts.height || defaultRowHeight;
+        offsetTop += rowRest.resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight;
         if (toVisibleIndex === -1 && scrollTop < offsetTop) {
           toVisibleIndex = rIndex;
         }
@@ -4456,7 +4456,7 @@ const Methods = {
       return;
     }
     const defaultRowHeight = $xeTable.computeDefaultRowHeight;
-    const currCellHeight = rowRest.resizeHeight || cellOpts.height || rowOpts.height || defaultRowHeight;
+    const currCellHeight = rowRest.resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight;
     const tableRect = tableEl.getBoundingClientRect();
     const trRect = trEl.getBoundingClientRect();
     const targetOffsetY = dragClientY - trRect.y - trEl.clientHeight;
@@ -4629,7 +4629,7 @@ const Methods = {
       if (rowRest) {
         const resizeHeight = rowRest.resizeHeight;
         if (resizeHeight || isFull) {
-          const currCellHeight = resizeHeight || rowRest.height || cellOpts.height || rowOpts.height || defaultRowHeight;
+          const currCellHeight = resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight;
           rest[rowid] = currCellHeight;
         }
       }
@@ -4682,7 +4682,7 @@ const Methods = {
     const rowid = _xeUtils.default.isString(rowOrId) || _xeUtils.default.isNumber(rowOrId) ? rowOrId : (0, _util.getRowid)($xeTable, rowOrId);
     const rowRest = fullAllDataRowIdData[rowid];
     if (rowRest) {
-      return rowRest.resizeHeight || rowRest.height || cellOpts.height || rowOpts.height || defaultRowHeight;
+      return rowRest.resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight;
     }
     return 0;
   },
@@ -9571,13 +9571,13 @@ const Methods = {
           const row = afterFullData[i];
           const rowid = (0, _util.getRowid)($xeTable, row);
           const rowRest = fullAllDataRowIdData[rowid] || {};
-          ySpaceHeight += rowRest.resizeHeight || rowRest.height || cellOpts.height || rowOpts.height || defaultRowHeight;
+          ySpaceHeight += rowRest.resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight;
         }
         for (let i = 0; i < startIndex; i++) {
           const row = afterFullData[i];
           const rowid = (0, _util.getRowid)($xeTable, row);
           const rowRest = fullAllDataRowIdData[rowid] || {};
-          topSpaceHeight += rowRest.resizeHeight || rowRest.height || cellOpts.height || rowOpts.height || defaultRowHeight;
+          topSpaceHeight += rowRest.resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight;
         }
       }
     } else {