vxe-table 4.10.6 → 4.10.8

package/lib/table/src/body.js

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

package/lib/table/src/table.js

@@ -270,7 +270,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
         isFooter: false
       },
       scrollVMLoading: false,
-      calcCellHeightFlag: 0,
+      calcCellHeightFlag: 1,
       resizeHeightFlag: 0,
       isCustomStatus: false,
       isDragRowMove: false,
@@ -999,7 +999,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
             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;
             }
@@ -4818,7 +4818,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
           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;
             }
           }
@@ -4870,7 +4870,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
         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;
       },
@@ -7899,7 +7899,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
           return;
         }
         const defaultRowHeight = computeDefaultRowHeight.value;
-        const currCellHeight = rowRest.resizeHeight || rowRest.height || 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;
@@ -10290,13 +10290,13 @@ var _default = exports.default = (0, _vue.defineComponent)({
               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 {