vxe-table 3.17.8 → 3.17.10

package/lib/table/src/body.js

@@ -102,6 +102,7 @@ function renderTdColumn(h, $xeTable, seq, rowid, fixedType, isOptimizeMode, rowL
   } = tableProps;
   const {
     tableData,
+    tableColumn,
     dragRow,
     overflowX,
     overflowY,
@@ -344,9 +345,9 @@ function renderTdColumn(h, $xeTable, seq, rowid, fixedType, isOptimizeMode, rowL
   let isVNPreEmptyStatus = false;
   if (!isMergeCell) {
     if (!dragRow || (0, _util.getRowid)($xeTable, dragRow) !== rowid) {
-      if (overflowY && scrollYLoad && !treeConfig && !virtualYOpts.immediate && (_rowIndex < scrollYStore.visibleStartIndex - scrollYStore.preloadSize || _rowIndex > scrollYStore.visibleEndIndex + scrollYStore.preloadSize)) {
+      if (overflowY && scrollYLoad && !treeConfig && tableData.length > 16 && !virtualYOpts.immediate && (_rowIndex < scrollYStore.visibleStartIndex - scrollYStore.preloadSize || _rowIndex > scrollYStore.visibleEndIndex + scrollYStore.preloadSize)) {
         isVNPreEmptyStatus = true;
-      } else if (overflowX && scrollXLoad && !virtualXOpts.immediate && !column.fixed && (_columnIndex < scrollXStore.visibleStartIndex - scrollXStore.preloadSize || _columnIndex > scrollXStore.visibleEndIndex + scrollXStore.preloadSize)) {
+      } else if (overflowX && scrollXLoad && tableColumn.length > 10 && !virtualXOpts.immediate && !column.fixed && (_columnIndex < scrollXStore.visibleStartIndex - scrollXStore.preloadSize || _columnIndex > scrollXStore.visibleEndIndex + scrollXStore.preloadSize)) {
         isVNPreEmptyStatus = true;
       }
     }

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

package/lib/table/src/footer.js

@@ -175,7 +175,7 @@ function renderRows(h, _vm, isOptimizeMode, tableColumn, footerTableData, row, $
     const isAutoCellWidth = !column.resizeWidth && (column.minWidth === 'auto' || column.width === 'auto');
     let isVNPreEmptyStatus = false;
     if (isOptimizeMode && overflowX && !isMergeCell) {
-      if (scrollXLoad && !column.fixed && !virtualXOpts.immediate && (_columnIndex < scrollXStore.visibleStartIndex - scrollXStore.preloadSize || _columnIndex > scrollXStore.visibleEndIndex + scrollXStore.preloadSize)) {
+      if (scrollXLoad && tableColumn.length > 10 && !column.fixed && !virtualXOpts.immediate && (_columnIndex < scrollXStore.visibleStartIndex - scrollXStore.preloadSize || _columnIndex > scrollXStore.visibleEndIndex + scrollXStore.preloadSize)) {
         isVNPreEmptyStatus = true;
       }
     }

package/lib/table/src/footer.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"),_dom=require("../../ui/src/dom"),_util=require("./util");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let renderType="footer",{renderer,renderEmptyElement}=_ui.VxeUI;function renderRows(C,e,_,F,T,$,S,E){let I=e.$parent;var l=I,r=I,t=I;let O=I.$xeGrid,z=e.fixedType,{resizable:R,border:D,footerCellClassName:k,footerCellStyle:A,footerAlign:q,footerSpanMethod:U,align:X,columnKey:M,showFooterOverflow:L}=l,{scrollXLoad:H,scrollYLoad:N,overflowX:j,currentColumn:V,mergeFootFlag:W}=r,{fullColumnIdData:B,mergeFooterList:G,mergeFooterCellMaps:K,scrollXStore:P}=t,Y=I.computeVirtualXOpts,ee=I.computeTooltipOpts,le=I.resizableOpts.isAllColumnDrag,J=I.computeColumnOpts;e=I.computeDefaultRowHeight;let re=I.computeCellOpts,Q=I.computeFooterCellOpts,Z=(0,_util.getCellHeight)(Q.height)||e;return F.map((l,e)=>{var{type:r,showFooterOverflow:t,footerAlign:o,align:i,footerClassName:a,editRender:n,cellRender:s}=l,d=l.id,u=B[d]||{},n=n||s,s=n?renderer.get(n.name):null;let p=ee.showAll;var n=j&&(z?l.fixed!==z:!!l.fixed),c=(_xeUtils.default.isBoolean(Q.padding)?Q:re).padding,t=_xeUtils.default.eqNull(t)?L:t,o=o||(s?s.tableFooterCellAlign:"")||q||i||(s?s.tableCellAlign:"")||X,i="ellipsis"===t;let f="title"===t,x=!0===t||"tooltip"===t;var s=f||x||i,t=_xeUtils.default.isBoolean(l.resizable)?l.resizable:J.resizable||R,m={colid:d},v={},g=u.index,u=u._index,w=u;let b={$table:I,$grid:O,row:$,rowIndex:E,_rowIndex:E,$rowIndex:S,column:l,columnIndex:g,$columnIndex:e,_columnIndex:u,itemIndex:w,items:$,fixed:z,type:renderType,data:T},y=((f||x||p)&&(v.mouseenter=e=>{f?(0,_dom.updateCellTitle)(e.currentTarget,l):(x||p)&&I.triggerFooterTooltipEvent(e,b)}),(x||p)&&(v.mouseleave=e=>{(x||p)&&I.handleTargetLeaveEvent(e)}),v.click=e=>{I.dispatchEvent("footer-cell-click",Object.assign({cell:e.currentTarget},b),e)},!(v.dblclick=e=>{I.dispatchEvent("footer-cell-dblclick",Object.assign({cell:e.currentTarget},b),e)}));if(W&&G.length){g=K[E+":"+u];if(g){var{rowspan:w,colspan:g}=g;if(!w||!g)return null;1<w&&(y=!0,m.rowspan=w),1<g&&(y=!0,m.colspan=g)}}else if(U){var{rowspan:w=1,colspan:g=1}=U(b)||{};if(!w||!g)return null;1<w&&(m.rowspan=w),1<g&&(m.colspan=g)}w=e===F.length-1,g=!l.resizeWidth&&("auto"===l.minWidth||"auto"===l.width);let h=!1;_&&j&&!y&&H&&!l.fixed&&!Y.immediate&&(u<P.visibleStartIndex-P.preloadSize||u>P.visibleEndIndex+P.preloadSize)&&(h=!0);u={};return s?u.height=Z+"px":u.minHeight=Z+"px",C("td",{class:["vxe-table--column vxe-footer--column",l.id,{["col--"+o]:o,["col--"+r]:r,"col--last":w,"fixed--width":!g,"fixed--hidden":n,"is--padding":c,"col--ellipsis":s,"col--current":V===l},(0,_utils.getClass)(a,b),(0,_utils.getClass)(k,b)],attrs:m,style:A?_xeUtils.default.isFunction(A)?A(b):A:void 0,on:v,key:M||H||N||J.useKey||J.drag?l.id:e},[C("div",{class:["vxe-cell",{"c--title":f,"c--tooltip":x,"c--ellipsis":i}],style:u},h?[]:[C("div",{attrs:{colid:d},class:"vxe-cell--wrapper vxe-footer-cell--wrapper"},l.renderFooter(C,b))]),!n&&t&&le?C("div",{class:["vxe-cell--col-resizable",{"is--line":!D||"none"===D}],on:{mousedown:e=>I.handleColResizeMousedownEvent(e,z,b),dblclick:e=>I.handleColResizeDblclickEvent(e,b)}}):renderEmptyElement(I)])})}function renderHeads(o,i,a,n){let s=i.$parent;var e=s;let{fixedType:d,footerTableData:u}=i,{footerRowClassName:p,footerRowStyle:c}=e;return u.map((e,l)=>{var r=l,t={$table:s,row:e,_rowIndex:r,$rowIndex:l,fixed:d,type:renderType};return o("tr",{key:l,class:["vxe-footer--row",p?_xeUtils.default.isFunction(p)?p(t):p:""],style:c?_xeUtils.default.isFunction(c)?c(t):c:void 0},renderRows(o,i,a,n,u,e,l,r))})}var _default=exports.default={name:"VxeTableFooter",props:{footerTableData:{type:Array,default:()=>[]},tableColumn:{type:Array,default:()=>[]},fixedColumn:{type:Array,default:()=>[]},fixedType:{type:String,default:null}},mounted(){var e=this,l=e.fixedType,r=e.$parent.elemStore,l=`${l||"main"}-footer-`;r[l+"wrapper"]=e.$refs.refElem,r[l+"scroll"]=e.$refs.refFooterScroll,r[l+"table"]=e.$refs.refFooterTable,r[l+"colgroup"]=e.$refs.refFooterColgroup,r[l+"list"]=e.$refs.refFooterTFoot,r[l+"xSpace"]=e.$refs.refFooterXSpace},destroyed(){var e=this.fixedType,l=this.$parent.elemStore,e=`${e||"main"}-footer-`;l[e+"wrapper"]=null,l[e+"scroll"]=null,l[e+"table"]=null,l[e+"colgroup"]=null,l[e+"list"]=null,l[e+"xSpace"]=null},render(r){let l=this.$parent;var e=l,t=l,o=l,i=l.xID;let{fixedType:a,fixedColumn:n,tableColumn:s}=this;var{spanMethod:e,footerSpanMethod:d,showFooterOverflow:u}=e,{visibleColumn:o,fullColumnIdData:p}=o,{isGroup:t,isColLoading:c,overflowX:f,scrollXLoad:x,dragCol:m}=t;let v=s,g=!1;return x&&u&&(e||d||(g=!0)),g&&(c||!a&&f)||(v=o),a&&g&&(v=n||[]),a||t||x&&m&&2<v.length&&(u=p[m.id])&&(e=u._index,d=v[0],c=v[v.length-1],f=p[d.id],o=p[c.id],f)&&o&&(t=f._index,x=o._index,e<t?v=[m].concat(v):x<e&&(v=v.concat([m]))),r("div",{ref:"refElem",class:["vxe-table--footer-wrapper",a?`fixed-${a}--wrapper`:"body--wrapper"],attrs:{xid:i}},[r("div",{ref:"refFooterScroll",class:"vxe-table--footer-inner-wrapper",on:{scroll(e){l.triggerFooterScrollEvent(e,a)}}},[a?renderEmptyElement(l):r("div",{ref:"refFooterXSpace",class:"vxe-body--x-space"}),r("table",{ref:"refFooterTable",class:"vxe-table--footer",attrs:{xid:i,cellspacing:0,cellpadding:0,border:0,xvm:g?"1":null}},[r("colgroup",{ref:"refFooterColgroup"},v.map((e,l)=>r("col",{attrs:{name:e.id},key:l,style:{width:e.renderWidth+"px"}}))),r("tfoot",{ref:"refFooterTFoot"},renderHeads(r,this,g,v))])])])}};
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_ui=require("../../ui"),_utils=require("../../ui/src/utils"),_dom=require("../../ui/src/dom"),_util=require("./util");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let renderType="footer",{renderer,renderEmptyElement}=_ui.VxeUI;function renderRows(C,e,_,F,T,$,S,E){let I=e.$parent;var l=I,r=I,t=I;let O=I.$xeGrid,z=e.fixedType,{resizable:R,border:D,footerCellClassName:k,footerCellStyle:A,footerAlign:q,footerSpanMethod:U,align:X,columnKey:M,showFooterOverflow:L}=l,{scrollXLoad:H,scrollYLoad:N,overflowX:j,currentColumn:V,mergeFootFlag:W}=r,{fullColumnIdData:B,mergeFooterList:G,mergeFooterCellMaps:K,scrollXStore:P}=t,Y=I.computeVirtualXOpts,ee=I.computeTooltipOpts,le=I.resizableOpts.isAllColumnDrag,J=I.computeColumnOpts;e=I.computeDefaultRowHeight;let re=I.computeCellOpts,Q=I.computeFooterCellOpts,Z=(0,_util.getCellHeight)(Q.height)||e;return F.map((l,e)=>{var{type:r,showFooterOverflow:t,footerAlign:o,align:i,footerClassName:a,editRender:n,cellRender:s}=l,d=l.id,u=B[d]||{},n=n||s,s=n?renderer.get(n.name):null;let p=ee.showAll;var n=j&&(z?l.fixed!==z:!!l.fixed),c=(_xeUtils.default.isBoolean(Q.padding)?Q:re).padding,t=_xeUtils.default.eqNull(t)?L:t,o=o||(s?s.tableFooterCellAlign:"")||q||i||(s?s.tableCellAlign:"")||X,i="ellipsis"===t;let f="title"===t,x=!0===t||"tooltip"===t;var s=f||x||i,t=_xeUtils.default.isBoolean(l.resizable)?l.resizable:J.resizable||R,m={colid:d},v={},g=u.index,u=u._index,w=u;let b={$table:I,$grid:O,row:$,rowIndex:E,_rowIndex:E,$rowIndex:S,column:l,columnIndex:g,$columnIndex:e,_columnIndex:u,itemIndex:w,items:$,fixed:z,type:renderType,data:T},h=((f||x||p)&&(v.mouseenter=e=>{f?(0,_dom.updateCellTitle)(e.currentTarget,l):(x||p)&&I.triggerFooterTooltipEvent(e,b)}),(x||p)&&(v.mouseleave=e=>{(x||p)&&I.handleTargetLeaveEvent(e)}),v.click=e=>{I.dispatchEvent("footer-cell-click",Object.assign({cell:e.currentTarget},b),e)},!(v.dblclick=e=>{I.dispatchEvent("footer-cell-dblclick",Object.assign({cell:e.currentTarget},b),e)}));if(W&&G.length){g=K[E+":"+u];if(g){var{rowspan:w,colspan:g}=g;if(!w||!g)return null;1<w&&(h=!0,m.rowspan=w),1<g&&(h=!0,m.colspan=g)}}else if(U){var{rowspan:w=1,colspan:g=1}=U(b)||{};if(!w||!g)return null;1<w&&(m.rowspan=w),1<g&&(m.colspan=g)}w=e===F.length-1,g=!l.resizeWidth&&("auto"===l.minWidth||"auto"===l.width);let y=!1;_&&j&&!h&&H&&10<F.length&&!l.fixed&&!Y.immediate&&(u<P.visibleStartIndex-P.preloadSize||u>P.visibleEndIndex+P.preloadSize)&&(y=!0);u={};return s?u.height=Z+"px":u.minHeight=Z+"px",C("td",{class:["vxe-table--column vxe-footer--column",l.id,{["col--"+o]:o,["col--"+r]:r,"col--last":w,"fixed--width":!g,"fixed--hidden":n,"is--padding":c,"col--ellipsis":s,"col--current":V===l},(0,_utils.getClass)(a,b),(0,_utils.getClass)(k,b)],attrs:m,style:A?_xeUtils.default.isFunction(A)?A(b):A:void 0,on:v,key:M||H||N||J.useKey||J.drag?l.id:e},[C("div",{class:["vxe-cell",{"c--title":f,"c--tooltip":x,"c--ellipsis":i}],style:u},y?[]:[C("div",{attrs:{colid:d},class:"vxe-cell--wrapper vxe-footer-cell--wrapper"},l.renderFooter(C,b))]),!n&&t&&le?C("div",{class:["vxe-cell--col-resizable",{"is--line":!D||"none"===D}],on:{mousedown:e=>I.handleColResizeMousedownEvent(e,z,b),dblclick:e=>I.handleColResizeDblclickEvent(e,b)}}):renderEmptyElement(I)])})}function renderHeads(o,i,a,n){let s=i.$parent;var e=s;let{fixedType:d,footerTableData:u}=i,{footerRowClassName:p,footerRowStyle:c}=e;return u.map((e,l)=>{var r=l,t={$table:s,row:e,_rowIndex:r,$rowIndex:l,fixed:d,type:renderType};return o("tr",{key:l,class:["vxe-footer--row",p?_xeUtils.default.isFunction(p)?p(t):p:""],style:c?_xeUtils.default.isFunction(c)?c(t):c:void 0},renderRows(o,i,a,n,u,e,l,r))})}var _default=exports.default={name:"VxeTableFooter",props:{footerTableData:{type:Array,default:()=>[]},tableColumn:{type:Array,default:()=>[]},fixedColumn:{type:Array,default:()=>[]},fixedType:{type:String,default:null}},mounted(){var e=this,l=e.fixedType,r=e.$parent.elemStore,l=`${l||"main"}-footer-`;r[l+"wrapper"]=e.$refs.refElem,r[l+"scroll"]=e.$refs.refFooterScroll,r[l+"table"]=e.$refs.refFooterTable,r[l+"colgroup"]=e.$refs.refFooterColgroup,r[l+"list"]=e.$refs.refFooterTFoot,r[l+"xSpace"]=e.$refs.refFooterXSpace},destroyed(){var e=this.fixedType,l=this.$parent.elemStore,e=`${e||"main"}-footer-`;l[e+"wrapper"]=null,l[e+"scroll"]=null,l[e+"table"]=null,l[e+"colgroup"]=null,l[e+"list"]=null,l[e+"xSpace"]=null},render(r){let l=this.$parent;var e=l,t=l,o=l,i=l.xID;let{fixedType:a,fixedColumn:n,tableColumn:s}=this;var{spanMethod:e,footerSpanMethod:d,showFooterOverflow:u}=e,{visibleColumn:o,fullColumnIdData:p}=o,{isGroup:t,isColLoading:c,overflowX:f,scrollXLoad:x,dragCol:m}=t;let v=s,g=!1;return x&&u&&(e||d||(g=!0)),g&&(c||!a&&f)||(v=o),a&&g&&(v=n||[]),a||t||x&&m&&2<v.length&&(u=p[m.id])&&(e=u._index,d=v[0],c=v[v.length-1],f=p[d.id],o=p[c.id],f)&&o&&(t=f._index,x=o._index,e<t?v=[m].concat(v):x<e&&(v=v.concat([m]))),r("div",{ref:"refElem",class:["vxe-table--footer-wrapper",a?`fixed-${a}--wrapper`:"body--wrapper"],attrs:{xid:i}},[r("div",{ref:"refFooterScroll",class:"vxe-table--footer-inner-wrapper",on:{scroll(e){l.triggerFooterScrollEvent(e,a)}}},[a?renderEmptyElement(l):r("div",{ref:"refFooterXSpace",class:"vxe-body--x-space"}),r("table",{ref:"refFooterTable",class:"vxe-table--footer",attrs:{xid:i,cellspacing:0,cellpadding:0,border:0,xvm:g?"1":null}},[r("colgroup",{ref:"refFooterColgroup"},v.map((e,l)=>r("col",{attrs:{name:e.id},key:l,style:{width:e.renderWidth+"px"}}))),r("tfoot",{ref:"refFooterTFoot"},renderHeads(r,this,g,v))])])])}};

package/lib/table/src/header.js

@@ -39,7 +39,8 @@ const renderRows = (h, _vm, isGroup, isOptimizeMode, cols, $rowIndex) => {
     dragCol,
     scrollXLoad,
     scrollYLoad,
-    overflowX
+    overflowX,
+    tableColumn
   } = tableReactData;
   const {
     fullColumnIdData,
@@ -137,7 +138,7 @@ const renderRows = (h, _vm, isGroup, isOptimizeMode, cols, $rowIndex) => {
     let isVNPreEmptyStatus = false;
     if (isOptimizeMode && overflowX && !isGroup) {
       if (!dragCol || dragCol.id !== colid) {
-        if (scrollXLoad && !column.fixed && !virtualXOpts.immediate && (_columnIndex < scrollXStore.visibleStartIndex - scrollXStore.preloadSize || _columnIndex > scrollXStore.visibleEndIndex + scrollXStore.preloadSize)) {
+        if (scrollXLoad && tableColumn.length > 10 && !column.fixed && !virtualXOpts.immediate && (_columnIndex < scrollXStore.visibleStartIndex - scrollXStore.preloadSize || _columnIndex > scrollXStore.visibleEndIndex + scrollXStore.preloadSize)) {
           isVNPreEmptyStatus = true;
         }
       }

package/lib/table/src/header.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");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let{renderer,renderEmptyElement}=_ui.VxeUI,cellType="header",renderRows=($,e,E,S,D,T)=>{let R=e.$parent,I=R.$xeGrid;var l=R,r=R,a=R;let O=e.fixedType,{resizable:k,columnKey:z,headerCellClassName:U,headerCellStyle:M,showHeaderOverflow:A,headerAlign:X,align:q,mouseConfig:F}=l,{currentColumn:G,dragCol:L,scrollXLoad:N,scrollYLoad:B,overflowX:V}=r,{fullColumnIdData:W,scrollXStore:K}=a,P=R.computeVirtualXOpts,j=R.computeColumnOpts,Y=R.computeColumnDragOpts,J=R.computeCellOpts;e=R.computeDefaultRowHeight;let Q=R.computeHeaderCellOpts,Z=(0,_util.getCellHeight)(Q.height)||e,{disabledMethod:ee,isCrossDrag:le,isPeerDrag:re}=Y;return D.map((e,l)=>{var{type:r,showHeaderOverflow:a,headerAlign:t,align:d,filters:i,headerClassName:s,editRender:n,cellRender:o}=e,u=e.id,c=W[u]||{},n=n||o,o=n?renderer.get(n.name):null,n=e.children&&e.children.length,p=V&&!n&&(O?e.fixed!==O:!!e.fixed),f=(_xeUtils.default.isBoolean(Q.padding)?Q:J).padding,a=_xeUtils.default.isUndefined(a)||_xeUtils.default.isNull(a)?A:a,t=t||(o?o.tableHeaderCellAlign:"")||X||d||(o?o.tableCellAlign:"")||q,d="ellipsis"===a,o="title"===a,a=!0===a||"tooltip"===a,x=o||a||d;let m=!1,h=null;i&&(h=i[0],m=i.some(e=>e.checked));var v=c.index,c=c._index;let g={$table:R,$grid:I,$rowIndex:T,column:e,columnIndex:v,$columnIndex:l,_columnIndex:c,firstFilterOption:h,fixed:O,type:cellType,isHidden:p,hasFilter:m};var v={colid:u,colspan:1<e.colSpan?e.colSpan:null,rowspan:1<e.rowSpan?e.rowSpan:null},C={click:e=>R.triggerHeaderCellClickEvent(e,g),dblclick:e=>R.triggerHeaderCellDblclickEvent(e,g)},b=j.drag&&"cell"===Y.trigger;let w=!1;b&&(w=!(!ee||!ee(g))),(F||b)&&(C.mousedown=e=>R.triggerHeaderCellMousedownEvent(e,g)),j.drag&&(C.dragstart=R.handleHeaderCellDragDragstartEvent,C.dragend=R.handleHeaderCellDragDragendEvent,C.dragover=R.handleHeaderCellDragDragoverEvent,b)&&(C.mouseup=R.handleHeaderCellDragMouseupEvent);var b=l===D.length-1,y=_xeUtils.default.isBoolean(e.resizable)?e.resizable:j.resizable||k,H=!e.resizeWidth&&("auto"===e.minWidth||"auto"===e.width);let _=!1;!S||!V||E||L&&L.id===u||N&&!e.fixed&&!P.immediate&&(c<K.visibleStartIndex-K.preloadSize||c>K.visibleEndIndex+K.preloadSize)&&(_=!0);c={};return x?c.height=Z+"px":c.minHeight=Z+"px",$("th",{class:["vxe-table--column vxe-header--column",u,{["col--"+t]:t,["col--"+r]:r,"col--last":b,"col--fixed":e.fixed,"col--group":n,"col--ellipsis":x,"fixed--width":!H,"fixed--hidden":p,"is--padding":f,"is--sortable":e.sortable,"col--filter":!!i,"is--filter-active":m,"is--drag-active":j.drag&&!e.fixed&&!w&&(le||re||!e.parentId),"is--drag-disabled":j.drag&&w,"col--current":G===e},(0,_utils.getClass)(s,g),(0,_utils.getClass)(U,g)],attrs:v,style:M?_xeUtils.default.isFunction(M)?M(g):M:void 0,on:C,key:z||N||B||j.useKey||j.drag||n?u:l},[$("div",{class:["vxe-cell",{"c--title":o,"c--tooltip":a,"c--ellipsis":d}],style:c},_||S&&p?[]:[$("div",{attrs:{colid:u},class:"vxe-cell--wrapper vxe-header-cell--wrapper"},e.renderHeader($,g))]),!p&&y?$("div",{class:"vxe-cell--col-resizable",on:{mousedown:e=>R.handleColResizeMousedownEvent(e,O,g),dblclick:e=>R.handleColResizeDblclickEvent(e,g)}}):renderEmptyElement(R)])})};function renderHeads(a,t,d,i,e){let s=t.$parent;var l=s;let n=t.fixedType,{headerRowClassName:o,headerRowStyle:u}=l;return e.map((e,l)=>{var r={$table:s,$rowIndex:l,fixed:n,type:cellType};return a("tr",{key:l,class:["vxe-header--row",o?_xeUtils.default.isFunction(o)?o(r):o:""],style:u?_xeUtils.default.isFunction(u)?u(r):u:void 0},renderRows(a,t,d,i,e,l))})}var _default=exports.default={name:"VxeTableHeader",props:{tableData:Array,tableColumn:Array,tableGroupColumn:Array,fixedColumn:Array,fixedType:{type:String,default:null}},data(){return{headerColumn:[]}},watch:{tableColumn(){this.uploadColumn()}},created(){this.uploadColumn()},mounted(){var e=this,l=e.fixedType,r=e.$parent.elemStore,l=`${l||"main"}-header-`;r[l+"wrapper"]=e.$refs.refElem,r[l+"scroll"]=e.$refs.refHeaderScroll,r[l+"table"]=e.$refs.refHeaderTable,r[l+"colgroup"]=e.$refs.refHeaderColgroup,r[l+"list"]=e.$refs.refHeaderTHead,r[l+"xSpace"]=e.$refs.refHeaderXSpace,r[l+"repair"]=e.$refs.refHeaderBorderRepair},destroyed(){var e=this.fixedType,l=this.$parent.elemStore,e=`${e||"main"}-header-`;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+"repair"]=null},render(r){let l=this.$parent;var e=l,a=l,t=l,d=l.xID;let{fixedType:i,fixedColumn:s,tableColumn:n}=this;var o=this.headerColumn,{mouseConfig:e,showHeaderOverflow:u,spanMethod:c,footerSpanMethod:p}=e,{isGroup:a,isColLoading:f,overflowX:x,scrollXLoad:m,dragCol:h}=a,{visibleColumn:t,fullColumnIdData:v}=t,g=l.computeMouseOpts;let C=o,b=n,w=!1;return a?b=t:(m&&u&&(c||p||(w=!0)),w&&(f||!i&&x)||(b=t),i&&w&&(b=s||[]),C=[b]),i||a||m&&h&&2<b.length&&(o=v[h.id])&&(u=o._index,c=b[0],p=b[b.length-1],f=v[c.id],x=v[p.id],f)&&x&&(t=f._index,m=x._index,u<t?(b=[h].concat(b),C=[[h].concat(C[0])].concat(C.slice(1))):m<u&&(b=b.concat([h]),C=[C[0].concat([h])].concat(C.slice(1)))),r("div",{ref:"refElem",class:["vxe-table--header-wrapper",i?`fixed-${i}--wrapper`:"body--wrapper"],attrs:{xid:d}},[r("div",{ref:"refHeaderScroll",class:"vxe-table--header-inner-wrapper",on:{scroll(e){l.triggerHeaderScrollEvent(e,i)}}},[i?renderEmptyElement(l):r("div",{ref:"refHeaderXSpace",class:"vxe-body--x-space"}),r("table",{ref:"refHeaderTable",class:"vxe-table--header",attrs:{xid:d,cellspacing:0,cellpadding:0,border:0,xvm:w?"1":null}},[r("colgroup",{ref:"refHeaderColgroup"},b.map((e,l)=>r("col",{attrs:{name:e.id},key:l,style:{width:e.renderWidth+"px"}}))),r("thead",{ref:"refHeaderTHead"},renderHeads(r,this,a,w,C))]),e&&g.area?r("div",{class:"vxe-table--cell-area"},[r("span",{class:"vxe-table--cell-main-area"}),r("span",{class:"vxe-table--cell-clip-area"}),r("span",{class:"vxe-table--cell-extend-area"}),r("span",{class:"vxe-table--cell-multi-area"}),r("span",{class:"vxe-table--cell-active-area"}),r("span",{class:"vxe-table--cell-col-status-area"})]):renderEmptyElement(l)])])},methods:{uploadColumn(){var e=this.$parent.isGroup;this.headerColumn=e?(0,_util.convertHeaderColumnToRows)(this.tableGroupColumn):[]}}};
+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");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let{renderer,renderEmptyElement}=_ui.VxeUI,cellType="header",renderRows=($,e,E,S,D,T)=>{let R=e.$parent,I=R.$xeGrid;var l=R,r=R,a=R;let O=e.fixedType,{resizable:k,columnKey:z,headerCellClassName:U,headerCellStyle:M,showHeaderOverflow:A,headerAlign:X,align:q,mouseConfig:F}=l,{currentColumn:G,dragCol:L,scrollXLoad:N,scrollYLoad:B,overflowX:V,tableColumn:W}=r,{fullColumnIdData:K,scrollXStore:P}=a,j=R.computeVirtualXOpts,Y=R.computeColumnOpts,J=R.computeColumnDragOpts,Q=R.computeCellOpts;e=R.computeDefaultRowHeight;let Z=R.computeHeaderCellOpts,ee=(0,_util.getCellHeight)(Z.height)||e,{disabledMethod:le,isCrossDrag:re,isPeerDrag:ae}=J;return D.map((e,l)=>{var{type:r,showHeaderOverflow:a,headerAlign:t,align:d,filters:i,headerClassName:n,editRender:s,cellRender:o}=e,u=e.id,c=K[u]||{},s=s||o,o=s?renderer.get(s.name):null,s=e.children&&e.children.length,p=V&&!s&&(O?e.fixed!==O:!!e.fixed),f=(_xeUtils.default.isBoolean(Z.padding)?Z:Q).padding,a=_xeUtils.default.isUndefined(a)||_xeUtils.default.isNull(a)?A:a,t=t||(o?o.tableHeaderCellAlign:"")||X||d||(o?o.tableCellAlign:"")||q,d="ellipsis"===a,o="title"===a,a=!0===a||"tooltip"===a,x=o||a||d;let m=!1,h=null;i&&(h=i[0],m=i.some(e=>e.checked));var g=c.index,c=c._index;let v={$table:R,$grid:I,$rowIndex:T,column:e,columnIndex:g,$columnIndex:l,_columnIndex:c,firstFilterOption:h,fixed:O,type:cellType,isHidden:p,hasFilter:m};var g={colid:u,colspan:1<e.colSpan?e.colSpan:null,rowspan:1<e.rowSpan?e.rowSpan:null},C={click:e=>R.triggerHeaderCellClickEvent(e,v),dblclick:e=>R.triggerHeaderCellDblclickEvent(e,v)},b=Y.drag&&"cell"===J.trigger;let w=!1;b&&(w=!(!le||!le(v))),(F||b)&&(C.mousedown=e=>R.triggerHeaderCellMousedownEvent(e,v)),Y.drag&&(C.dragstart=R.handleHeaderCellDragDragstartEvent,C.dragend=R.handleHeaderCellDragDragendEvent,C.dragover=R.handleHeaderCellDragDragoverEvent,b)&&(C.mouseup=R.handleHeaderCellDragMouseupEvent);var b=l===D.length-1,y=_xeUtils.default.isBoolean(e.resizable)?e.resizable:Y.resizable||k,H=!e.resizeWidth&&("auto"===e.minWidth||"auto"===e.width);let _=!1;!S||!V||E||L&&L.id===u||N&&10<W.length&&!e.fixed&&!j.immediate&&(c<P.visibleStartIndex-P.preloadSize||c>P.visibleEndIndex+P.preloadSize)&&(_=!0);c={};return x?c.height=ee+"px":c.minHeight=ee+"px",$("th",{class:["vxe-table--column vxe-header--column",u,{["col--"+t]:t,["col--"+r]:r,"col--last":b,"col--fixed":e.fixed,"col--group":s,"col--ellipsis":x,"fixed--width":!H,"fixed--hidden":p,"is--padding":f,"is--sortable":e.sortable,"col--filter":!!i,"is--filter-active":m,"is--drag-active":Y.drag&&!e.fixed&&!w&&(re||ae||!e.parentId),"is--drag-disabled":Y.drag&&w,"col--current":G===e},(0,_utils.getClass)(n,v),(0,_utils.getClass)(U,v)],attrs:g,style:M?_xeUtils.default.isFunction(M)?M(v):M:void 0,on:C,key:z||N||B||Y.useKey||Y.drag||s?u:l},[$("div",{class:["vxe-cell",{"c--title":o,"c--tooltip":a,"c--ellipsis":d}],style:c},_||S&&p?[]:[$("div",{attrs:{colid:u},class:"vxe-cell--wrapper vxe-header-cell--wrapper"},e.renderHeader($,v))]),!p&&y?$("div",{class:"vxe-cell--col-resizable",on:{mousedown:e=>R.handleColResizeMousedownEvent(e,O,v),dblclick:e=>R.handleColResizeDblclickEvent(e,v)}}):renderEmptyElement(R)])})};function renderHeads(a,t,d,i,e){let n=t.$parent;var l=n;let s=t.fixedType,{headerRowClassName:o,headerRowStyle:u}=l;return e.map((e,l)=>{var r={$table:n,$rowIndex:l,fixed:s,type:cellType};return a("tr",{key:l,class:["vxe-header--row",o?_xeUtils.default.isFunction(o)?o(r):o:""],style:u?_xeUtils.default.isFunction(u)?u(r):u:void 0},renderRows(a,t,d,i,e,l))})}var _default=exports.default={name:"VxeTableHeader",props:{tableData:Array,tableColumn:Array,tableGroupColumn:Array,fixedColumn:Array,fixedType:{type:String,default:null}},data(){return{headerColumn:[]}},watch:{tableColumn(){this.uploadColumn()}},created(){this.uploadColumn()},mounted(){var e=this,l=e.fixedType,r=e.$parent.elemStore,l=`${l||"main"}-header-`;r[l+"wrapper"]=e.$refs.refElem,r[l+"scroll"]=e.$refs.refHeaderScroll,r[l+"table"]=e.$refs.refHeaderTable,r[l+"colgroup"]=e.$refs.refHeaderColgroup,r[l+"list"]=e.$refs.refHeaderTHead,r[l+"xSpace"]=e.$refs.refHeaderXSpace,r[l+"repair"]=e.$refs.refHeaderBorderRepair},destroyed(){var e=this.fixedType,l=this.$parent.elemStore,e=`${e||"main"}-header-`;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+"repair"]=null},render(r){let l=this.$parent;var e=l,a=l,t=l,d=l.xID;let{fixedType:i,fixedColumn:n,tableColumn:s}=this;var o=this.headerColumn,{mouseConfig:e,showHeaderOverflow:u,spanMethod:c,footerSpanMethod:p}=e,{isGroup:a,isColLoading:f,overflowX:x,scrollXLoad:m,dragCol:h}=a,{visibleColumn:t,fullColumnIdData:g}=t,v=l.computeMouseOpts;let C=o,b=s,w=!1;return a?b=t:(m&&u&&(c||p||(w=!0)),w&&(f||!i&&x)||(b=t),i&&w&&(b=n||[]),C=[b]),i||a||m&&h&&2<b.length&&(o=g[h.id])&&(u=o._index,c=b[0],p=b[b.length-1],f=g[c.id],x=g[p.id],f)&&x&&(t=f._index,m=x._index,u<t?(b=[h].concat(b),C=[[h].concat(C[0])].concat(C.slice(1))):m<u&&(b=b.concat([h]),C=[C[0].concat([h])].concat(C.slice(1)))),r("div",{ref:"refElem",class:["vxe-table--header-wrapper",i?`fixed-${i}--wrapper`:"body--wrapper"],attrs:{xid:d}},[r("div",{ref:"refHeaderScroll",class:"vxe-table--header-inner-wrapper",on:{scroll(e){l.triggerHeaderScrollEvent(e,i)}}},[i?renderEmptyElement(l):r("div",{ref:"refHeaderXSpace",class:"vxe-body--x-space"}),r("table",{ref:"refHeaderTable",class:"vxe-table--header",attrs:{xid:d,cellspacing:0,cellpadding:0,border:0,xvm:w?"1":null}},[r("colgroup",{ref:"refHeaderColgroup"},b.map((e,l)=>r("col",{attrs:{name:e.id},key:l,style:{width:e.renderWidth+"px"}}))),r("thead",{ref:"refHeaderTHead"},renderHeads(r,this,a,w,C))]),e&&v.area?r("div",{class:"vxe-table--cell-area"},[r("span",{class:"vxe-table--cell-main-area"}),r("span",{class:"vxe-table--cell-clip-area"}),r("span",{class:"vxe-table--cell-extend-area"}),r("span",{class:"vxe-table--cell-multi-area"}),r("span",{class:"vxe-table--cell-active-area"}),r("span",{class:"vxe-table--cell-col-status-area"})]):renderEmptyElement(l)])])},methods:{uploadColumn(){var e=this.$parent.isGroup;this.headerColumn=e?(0,_util.convertHeaderColumnToRows)(this.tableGroupColumn):[]}}};

package/lib/table/src/methods.js

@@ -458,6 +458,8 @@ function cacheColumnMap($xeTable) {
   reactData.rowGroupColumn = rowGroupColumn;
   reactData.treeNodeColumn = treeNodeColumn;
   reactData.expandColumn = expandColumn;
+  reactData.checkboxColumn = checkboxColumn;
+  reactData.radioColumn = radioColumn;
   reactData.isAllOverflow = isAllOverflow;
 }
 function updateScrollXStatus($xeTable, fullColumn) {
@@ -1235,9 +1237,7 @@ function updateStyle($xeTable) {
     editStore,
     isAllOverflow,
     expandColumn,
-    isColLoading,
-    tHeaderHeight,
-    tFooterHeight
+    isColLoading
   } = reactData;
   const {
     visibleColumn,
@@ -1245,7 +1245,9 @@ function updateStyle($xeTable) {
     elemStore,
     customHeight,
     customMinHeight,
-    customMaxHeight
+    customMaxHeight,
+    tHeaderHeight,
+    tFooterHeight
   } = internalData;
   const $xeGanttView = internalData.xeGanttView;
   const el = $xeTable.$refs.refElem;
@@ -1254,8 +1256,9 @@ function updateStyle($xeTable) {
   }
   const containerList = ['main', 'left', 'right'];
   let osbWidth = overflowY ? scrollbarWidth : 0;
-  const osbHeight = overflowX ? scrollbarHeight : 0;
+  let osbHeight = overflowX ? scrollbarHeight : 0;
   const emptyPlaceholderElem = $xeTable.$refs.refEmptyPlaceholder;
+  const scrollbarOpts = $xeTable.computeScrollbarOpts;
   const mouseOpts = $xeTable.computeMouseOpts;
   const expandOpts = $xeTable.computeExpandOpts;
   const bodyWrapperElem = (0, _util.getRefElem)(elemStore['main-body-wrapper']);
@@ -1266,13 +1269,18 @@ function updateStyle($xeTable) {
   }
   const scrollbarXToTop = $xeTable.computeScrollbarXToTop;
   const scrollbarYToLeft = $xeTable.computeScrollbarYToLeft;
-  const xScrollbarVisible = overflowX ? 'visible' : 'hidden';
-  let yScrollbarVisible = overflowY ? 'visible' : 'hidden';
+  let xScrollbarVisible = overflowX ? 'visible' : 'hidden';
   if ($xeGanttView) {
-    if (!scrollbarYToLeft) {
-      osbWidth = 0;
-      yScrollbarVisible = 'hidden';
-    }
+    osbHeight = scrollbarHeight;
+    xScrollbarVisible = 'visible';
+  } else if (scrollbarOpts.x && scrollbarOpts.x.visible === false) {
+    osbHeight = 0;
+    xScrollbarVisible = 'hidden';
+  }
+  let yScrollbarVisible = overflowY ? 'visible' : 'hidden';
+  if (scrollbarOpts.y && scrollbarOpts.y.visible === false || $xeGanttView && !scrollbarYToLeft) {
+    osbWidth = 0;
+    yScrollbarVisible = 'hidden';
   }
   let tbHeight = 0;
   let bodyMaxHeight = 0;
@@ -1341,7 +1349,7 @@ function updateStyle($xeTable) {
     rowExpandEl.style.height = `${tbHeight}px`;
     rowExpandEl.style.top = `${tHeaderHeight}px`;
   }
-  reactData.tBodyHeight = tbHeight;
+  internalData.tBodyHeight = tbHeight;
   containerList.forEach((name, index) => {
     const fixedType = index > 0 ? name : '';
     const layoutList = ['header', 'body', 'footer'];
@@ -3230,8 +3238,8 @@ function calcScrollbar($xeTable) {
     const hHeight = headerTableElem ? headerTableElem.clientHeight : 0;
     const fHeight = footerTableElem ? footerTableElem.clientHeight : 0;
     internalData.tableHeight = bodyWrapperElem.offsetHeight;
-    reactData.tHeaderHeight = hHeight;
-    reactData.tFooterHeight = fHeight;
+    internalData.tHeaderHeight = hHeight;
+    internalData.tFooterHeight = fHeight;
     reactData.overflowX = overflowX;
     reactData.parentHeight = Math.max(hHeight + fHeight + 20, $xeTable.getParentHeight());
   }
@@ -3321,6 +3329,9 @@ function handleLazyRecalculate($xeTable, reFull, reWidth, reHeight) {
     }, refreshDelay);
   });
 }
+function handleResizeEvent($xeTable) {
+  handleLazyRecalculate($xeTable, true, true, true);
+}
 function handleUpdateAggValues($xeTable) {
   const reactData = $xeTable;
   const internalData = $xeTable;
@@ -4123,11 +4134,6 @@ function lazyScrollYData($xeTable) {
 function checkLastSyncScroll($xeTable, isRollX, isRollY) {
   const reactData = $xeTable;
   const internalData = $xeTable;
-  const {
-    scrollXLoad,
-    scrollYLoad,
-    isAllOverflow
-  } = reactData;
   const {
     lcsTimeout
   } = internalData;
@@ -4135,6 +4141,11 @@ function checkLastSyncScroll($xeTable, isRollX, isRollY) {
     clearTimeout(lcsTimeout);
   }
   internalData.lcsTimeout = setTimeout(() => {
+    const {
+      scrollXLoad,
+      scrollYLoad,
+      isAllOverflow
+    } = reactData;
     internalData.lcsRunTime = Date.now();
     internalData.lcsTimeout = undefined;
     internalData.intoRunScroll = false;
@@ -6952,6 +6963,10 @@ const Methods = {
       }, 10);
     });
   },
+  handleResizeEvent() {
+    const $xeTable = this;
+    handleResizeEvent($xeTable);
+  },
   /**
    * 重新渲染布局
    * 刷新布局
@@ -7635,7 +7650,7 @@ const Methods = {
     const $xeTable = this;
     $xeTable.closeMenu();
     $xeTable.updateCellAreas();
-    handleLazyRecalculate($xeTable, true, true, true);
+    handleResizeEvent($xeTable);
     $xeTable.updateCellAreas();
   },
   /**
@@ -9063,13 +9078,19 @@ const Methods = {
     const props = $xeTable;
     const reactData = $xeTable;
     const {
+      treeConfig,
       highlightCurrentRow,
       highlightCurrentColumn,
-      editConfig
+      editConfig,
+      aggregateConfig,
+      rowGroupConfig
     } = props;
     const {
       editStore,
-      isDragResize
+      isDragResize,
+      expandColumn,
+      checkboxColumn,
+      radioColumn
     } = reactData;
     if (isDragResize) {
       return;
@@ -9115,15 +9136,15 @@ const Methods = {
     }, params);
     if (!triggerCheckbox && !triggerRadio) {
       // 如果是展开行
-      if (!triggerExpandNode && (expandOpts.trigger === 'row' || isExpandType && expandOpts.trigger === 'cell')) {
+      if (!triggerExpandNode && (expandColumn && expandOpts.trigger === 'row' || isExpandType && expandOpts.trigger === 'cell')) {
         $xeTable.triggerRowExpandEvent(evnt, params);
       }
       // 如果是树形表格
-      if (treeOpts.trigger === 'row' || treeNode && treeOpts.trigger === 'cell') {
+      if (treeConfig && (treeOpts.trigger === 'row' || treeNode && treeOpts.trigger === 'cell')) {
         $xeTable.triggerTreeExpandEvent(evnt, params);
       }
       // 如果是行分组
-      if (aggregateOpts.trigger === 'row' || rowGroupNode && aggregateOpts.trigger === 'cell') {
+      if ((aggregateConfig || rowGroupConfig) && (aggregateOpts.trigger === 'row' || rowGroupNode && aggregateOpts.trigger === 'cell')) {
         $xeTable.triggerRowGroupExpandEvent(evnt, params);
       }
     }
@@ -9143,11 +9164,11 @@ const Methods = {
           }
         }
         // 如果是单选框
-        if (!triggerRadio && (radioOpts.trigger === 'row' || isRadioType && radioOpts.trigger === 'cell')) {
+        if (!triggerRadio && (radioColumn && radioOpts.trigger === 'row' || isRadioType && radioOpts.trigger === 'cell')) {
           $xeTable.triggerRadioRowEvent(evnt, params);
         }
         // 如果是复选框
-        if (!triggerCheckbox && (checkboxOpts.trigger === 'row' || isCheckboxType && checkboxOpts.trigger === 'cell')) {
+        if (!triggerCheckbox && (checkboxColumn && checkboxOpts.trigger === 'row' || isCheckboxType && checkboxOpts.trigger === 'cell')) {
           $xeTable.handleToggleCheckRowEvent(evnt, params);
         }
       }