vxe-table 3.19.3 → 3.19.4

package/lib/table/src/body.js

@@ -37,12 +37,12 @@ function renderLine(h, $xeTable, rowid, params, cellHeight) {
   const {
     column
   } = params;
-  const {
-    afterFullData
-  } = tableInternalData;
   const {
     treeConfig
   } = tableProps;
+  const cellOpts = $xeTable.computeCellOpts;
+  const rowOpts = $xeTable.computeRowOpts;
+  const defaultRowHeight = $xeTable.computeDefaultRowHeight;
   const treeOpts = $xeTable.computeTreeOpts;
   const {
     slots,
@@ -51,26 +51,39 @@ function renderLine(h, $xeTable, rowid, params, cellHeight) {
   const {
     fullAllDataRowIdData
   } = tableInternalData;
-  if (slots && slots.line) {
-    return $xeTable.callSlot(slots.line, params, h);
-  }
-  const rowRest = fullAllDataRowIdData[rowid];
-  let rLevel = 0;
-  let prevRow = null;
-  if (rowRest) {
-    rLevel = rowRest.level;
-    prevRow = rowRest.items[rowRest.treeIndex - 1];
-  }
   if (treeConfig && treeNode && (treeOpts.showLine || treeOpts.line)) {
+    if (slots && slots.line) {
+      return $xeTable.callSlot(slots.line, params, h);
+    }
+    const rowRest = fullAllDataRowIdData[rowid];
+    let rLevel = 0;
+    let prevRow = null;
+    let parentRow = null;
+    let lineHeight = '';
+    if (rowRest) {
+      rLevel = rowRest.level;
+      prevRow = rowRest.items[rowRest.treeIndex - 1];
+      parentRow = rowRest.parent;
+    }
+    if (!rLevel && !treeOpts.showRootLine) {
+      return [];
+    }
+    if (prevRow) {
+      const prevRowRest = fullAllDataRowIdData[(0, _util.getRowid)($xeTable, prevRow)] || {};
+      lineHeight = `${prevRowRest.lineHeight || 0}px`;
+    } else if (rLevel && parentRow) {
+      const parentRowRest = fullAllDataRowIdData[(0, _util.getRowid)($xeTable, parentRow)] || {};
+      lineHeight = `calc(-1em + ${Math.floor(cellHeight / 2 + (0, _util.getCellRestHeight)(parentRowRest, cellOpts, rowOpts, defaultRowHeight) / 2)}px)`;
+    }
     return [h('div', {
       key: 'tl',
       class: 'vxe-tree--line-wrapper'
     }, [h('div', {
       class: 'vxe-tree--line',
       style: {
-        height: `${(0, _util.getRowid)($xeTable, afterFullData[0]) === rowid ? 1 : (0, _util.calcTreeLine)(params, prevRow)}px`,
+        height: lineHeight,
         bottom: `-${Math.floor(cellHeight / 2)}px`,
-        left: `${rLevel * treeOpts.indent + (rLevel ? 2 - (0, _util.getOffsetSize)($xeTable) : 0) + 16}px`
+        left: `calc(${rLevel * treeOpts.indent}px + 1em)`
       }
     })])];
   }

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

package/lib/table/src/methods.js

@@ -2945,6 +2945,9 @@ function autoCellWidth($xeTable) {
   updateColumnOffsetLeft($xeTable);
   updateHeight($xeTable);
 }
+/**
+ * 计算自适应行高
+ */
 const calcCellAutoHeight = (rowRest, wrapperEl) => {
   const cellElemList = wrapperEl.querySelectorAll(`.vxe-cell--wrapper[rowid="${rowRest.rowid}"]`);
   let colHeight = rowRest.height;
@@ -2962,9 +2965,16 @@ const calcCellAutoHeight = (rowRest, wrapperEl) => {
   }
   return colHeight;
 };
+/**
+ * 自适应行高
+ */
 const calcCellHeight = $xeTable => {
+  const props = $xeTable;
   const reactData = $xeTable;
   const internalData = $xeTable;
+  const {
+    treeConfig
+  } = props;
   const {
     tableData,
     isAllOverflow,
@@ -2974,9 +2984,10 @@ const calcCellHeight = $xeTable => {
   const {
     fullAllDataRowIdData
   } = internalData;
+  const treeOpts = $xeTable.computeTreeOpts;
   const defaultRowHeight = $xeTable.computeDefaultRowHeight;
   const el = $xeTable.$refs.refElem;
-  if (!isAllOverflow && (scrollYLoad || scrollXLoad) && el) {
+  if (!isAllOverflow && (scrollYLoad || scrollXLoad || treeConfig && treeOpts.showLine) && el) {
     const {
       handleGetRowId
     } = (0, _util.createHandleGetRowId)($xeTable);
@@ -3900,6 +3911,7 @@ function loadTableData($xeTable, datas, isReset) {
         }
         reactData.isRowLoading = false;
         handleRecalculateStyle($xeTable, false, false, false);
+        updateTreeLineStyle($xeTable);
         // 如果是自动行高，特殊情况需调用 recalculate 手动刷新
         if (!props.showOverflow) {
           setTimeout(() => {
@@ -3912,6 +3924,7 @@ function loadTableData($xeTable, datas, isReset) {
           (0, _util.restoreScrollLocation)($xeTable, targetScrollLeft, targetScrollTop).then(() => {
             handleRecalculateStyle($xeTable, false, true, true);
             updateRowOffsetTop($xeTable);
+            updateTreeLineStyle($xeTable);
             resolve();
           });
         } else {
@@ -3919,6 +3932,7 @@ function loadTableData($xeTable, datas, isReset) {
             (0, _util.restoreScrollLocation)($xeTable, targetScrollLeft, targetScrollTop).then(() => {
               handleRecalculateStyle($xeTable, false, true, true);
               updateRowOffsetTop($xeTable);
+              updateTreeLineStyle($xeTable);
               resolve();
             });
           });
@@ -4484,6 +4498,9 @@ function updateHeight($xeTable) {
     internalData.customHeight = 300;
   }
 }
+/**
+ * 计算自适应列宽
+ */
 function calcColumnAutoWidth($xeTable, column, wrapperEl) {
   const columnOpts = $xeTable.computeColumnOpts;
   const {
@@ -4518,6 +4535,9 @@ function calcColumnAutoWidth($xeTable, column, wrapperEl) {
   }
   return colWidth + leftRightPadding;
 }
+/**
+ * 自适应列宽
+ */
 function calcCellWidth($xeTable) {
   const internalData = $xeTable;
   const autoWidthColumnList = $xeTable.computeAutoWidthColumnList;
@@ -4679,9 +4699,109 @@ function updateRowExpandStyle($xeTable) {
 /**
  * 更新树连接线样式
  */
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
 function updateTreeLineStyle($xeTable) {
-  // 待优化
+  const props = $xeTable;
+  const reactData = $xeTable;
+  const internalData = $xeTable;
+  const {
+    treeConfig
+  } = props;
+  if (!treeConfig) {
+    return;
+  }
+  const {
+    tableData
+  } = reactData;
+  const {
+    fullAllDataRowIdData,
+    treeExpandedMaps
+  } = internalData;
+  const cellOpts = $xeTable.computeCellOpts;
+  const rowOpts = $xeTable.computeRowOpts;
+  const defaultRowHeight = $xeTable.computeDefaultRowHeight;
+  const treeOpts = $xeTable.computeTreeOpts;
+  const {
+    transform,
+    mapChildrenField
+  } = treeOpts;
+  const childrenField = treeOpts.children || treeOpts.childrenField;
+  const {
+    handleGetRowId
+  } = (0, _util.createHandleGetRowId)($xeTable);
+  const expParentList = [];
+  const handleNodeRow = (row, rIndex, rows) => {
+    const rowid = handleGetRowId(row);
+    const rowRest = fullAllDataRowIdData[rowid] || {};
+    const childList = row[transform ? mapChildrenField : childrenField];
+    const prevRow = rows[rIndex - 1] || null;
+    const nextRow = rows[rIndex + 1] || null;
+    if (childList && childList.length && treeExpandedMaps[rowid]) {
+      expParentList.push({
+        row,
+        prevRow,
+        nextRow
+      });
+      childList.forEach((childRow, crIndex) => {
+        const childRowid = handleGetRowId(childRow);
+        if (treeExpandedMaps[childRowid]) {
+          handleNodeRow(childRow, crIndex, childList);
+        }
+      });
+    } else {
+      if (nextRow) {
+        const nextRowid = handleGetRowId(nextRow);
+        const nextRowRest = fullAllDataRowIdData[nextRowid] || {};
+        const currCellHeight = (0, _util.getCellRestHeight)(rowRest, cellOpts, rowOpts, defaultRowHeight);
+        const nextCellHeight = (0, _util.getCellRestHeight)(nextRowRest, cellOpts, rowOpts, defaultRowHeight);
+        rowRest.oHeight = currCellHeight;
+        rowRest.lineHeight = Math.floor(currCellHeight / 2 + nextCellHeight / 2);
+      } else {
+        rowRest.oHeight = 0;
+        rowRest.lineHeight = 0;
+      }
+    }
+  };
+  tableData.forEach((row, rIndex) => {
+    handleNodeRow(row, rIndex, tableData);
+  });
+  _xeUtils.default.lastArrayEach(expParentList, ({
+    row,
+    nextRow
+  }) => {
+    const rowid = handleGetRowId(row);
+    const childList = row[transform ? mapChildrenField : childrenField];
+    const rowRest = fullAllDataRowIdData[rowid];
+    if (rowRest) {
+      const currCellHeight = (0, _util.getCellRestHeight)(rowRest, cellOpts, rowOpts, defaultRowHeight);
+      let countOffsetHeight = currCellHeight;
+      let countLineHeight = 0;
+      childList.forEach(childRow => {
+        const childRowid = handleGetRowId(childRow);
+        const childRowRest = fullAllDataRowIdData[childRowid] || {};
+        const childList = childRow[transform ? mapChildrenField : childrenField];
+        if (treeExpandedMaps[childRowid] && childList && childList.length) {
+          countOffsetHeight += childRowRest.oHeight || 0;
+          countLineHeight += childRowRest.oHeight || 0;
+        } else {
+          const cellHeight = (0, _util.getCellRestHeight)(childRowRest, cellOpts, rowOpts, defaultRowHeight);
+          childRowRest.oHeight = cellHeight;
+          childRowRest.lineHeight = cellHeight;
+          countOffsetHeight += cellHeight;
+          countLineHeight += cellHeight;
+        }
+      });
+      if (nextRow) {
+        const nextRowid = handleGetRowId(nextRow);
+        const nextRowRest = fullAllDataRowIdData[nextRowid] || {};
+        const currCellHeight = (0, _util.getCellRestHeight)(rowRest, cellOpts, rowOpts, defaultRowHeight);
+        const nextCellHeight = (0, _util.getCellRestHeight)(nextRowRest, cellOpts, rowOpts, defaultRowHeight);
+        countOffsetHeight += currCellHeight;
+        countLineHeight += Math.floor(currCellHeight / 2 + nextCellHeight / 2);
+      }
+      rowRest.lineHeight = countLineHeight;
+      rowRest.oHeight = countOffsetHeight;
+    }
+  });
 }
 function handleRowExpandScroll($xeTable) {
   const internalData = $xeTable;