vxe-table 3.10.0-beta.4 → 3.10.0-beta.6

package/lib/table/src/body.js

@@ -310,6 +310,14 @@ function renderColumn(h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, ro
       }, errorValidItem.content)]));
     }
   }
+  let cellHeight = '';
+  if (hasEllipsis && (scrollYRHeight || rowHeight)) {
+    cellHeight = `${scrollYRHeight || rowHeight}px`;
+  } else if (scrollYLoad) {
+    if (!hasEllipsis) {
+      cellHeight = `${rest.height || 24}px`;
+    }
+  }
   return h('td', {
     class: ['vxe-body--column', column.id, {
       [`col--${cellAlign}`]: cellAlign,
@@ -328,7 +336,7 @@ function renderColumn(h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, ro
     key: columnKey || columnOpts.useKey ? column.id : $columnIndex,
     attrs,
     style: Object.assign({
-      height: hasEllipsis && (scrollYRHeight || rowHeight) ? `${scrollYRHeight || rowHeight}px` : scrollYLoad ? `${rest.height || 24}px` : ''
+      height: cellHeight
     }, _xeUtils.default.isFunction(compCellStyle) ? compCellStyle(params) : compCellStyle, _xeUtils.default.isFunction(cellStyle) ? cellStyle(params) : cellStyle),
     on: tdOns
   }, tdVNs);

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

package/lib/ui/index.js

@@ -13,7 +13,7 @@ Object.defineProperty(exports, "VxeUI", {
 exports.version = exports.validators = exports.use = exports.t = exports.setup = exports.setTheme = exports.setLanguage = exports.setIcon = exports.setI18n = exports.setConfig = exports.saveFile = exports.renderer = exports.readFile = exports.print = exports.modal = exports.menus = exports.log = exports.interceptor = exports.globalResize = exports.globalEvents = exports.getTheme = exports.getIcon = exports.getI18n = exports.getConfig = exports.formats = exports.default = exports.config = exports.commands = exports.clipboard = exports._t = void 0;
 var _core = require("@vxe-ui/core");
 var _utils = require("./src/utils");
-const version = exports.version = "3.10.0-beta.4";
+const version = exports.version = "3.10.0-beta.6";
 _core.VxeUI.version = version;
 _core.VxeUI.tableVersion = version;
 _core.VxeUI.setConfig({

package/lib/ui/index.min.js

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),exports.VXETable=void 0,Object.defineProperty(exports,"VxeUI",{enumerable:!0,get:function(){return _core.VxeUI}}),exports.version=exports.validators=exports.use=exports.t=exports.setup=exports.setTheme=exports.setLanguage=exports.setIcon=exports.setI18n=exports.setConfig=exports.saveFile=exports.renderer=exports.readFile=exports.print=exports.modal=exports.menus=exports.log=exports.interceptor=exports.globalResize=exports.globalEvents=exports.getTheme=exports.getIcon=exports.getI18n=exports.getConfig=exports.formats=exports.default=exports.config=exports.commands=exports.clipboard=exports._t=void 0;var _core=require("@vxe-ui/core"),_utils=require("./src/utils");let version=exports.version="3.10.0-beta.4",iconPrefix=(_core.VxeUI.version=version,_core.VxeUI.tableVersion=version,_core.VxeUI.setConfig({emptyCell:"　",table:{fit:!0,showHeader:!0,animat:!0,delayHover:250,autoResize:!0,padding:!0,minHeight:144,resizeConfig:{refreshDelay:250},radioConfig:{strict:!0},checkboxConfig:{strict:!0},tooltipConfig:{enterable:!0},validConfig:{showMessage:!0,autoClear:!0,autoPos:!0,message:"inline",msgMode:"single"},columnConfig:{maxFixedSize:4},customConfig:{allowVisible:!0,allowResizable:!0,allowFixed:!0,allowSort:!0,showFooter:!0,placement:"top-right",modalOptions:{showMaximize:!0,mask:!0,lockView:!0,resize:!0,escClosable:!0}},sortConfig:{showIcon:!0,iconLayout:"vertical"},filterConfig:{showIcon:!0},treeConfig:{rowField:"id",parentField:"parentId",childrenField:"children",hasChildField:"hasChild",mapChildrenField:"_X_ROW_CHILD",indent:20,showIcon:!0},expandConfig:{showIcon:!0},editConfig:{showIcon:!0,showAsterisk:!0,autoFocus:!0},importConfig:{_typeMaps:{csv:1,html:1,xml:1,txt:1}},exportConfig:{_typeMaps:{csv:1,html:1,xml:1,txt:1}},printConfig:{},mouseConfig:{extension:!0},keyboardConfig:{isEsc:!0},areaConfig:{autoClear:!0,selectCellByHeader:!0},clipConfig:{isCopy:!0,isCut:!0,isPaste:!0},fnrConfig:{isFind:!0,isReplace:!0},scrollX:{gt:60},scrollY:{gt:100}},grid:{formConfig:{enabled:!0},pagerConfig:{enabled:!0},toolbarConfig:{enabled:!0},proxyConfig:{enabled:!0,autoLoad:!0,showResponseMsg:!0,showActiveMsg:!0,props:{list:null,result:"result",total:"page.total",message:"message"}}},toolbar:{}}),"vxe-table-icon-"),setTheme=(_core.VxeUI.setIcon({TABLE_SORT_ASC:iconPrefix+"caret-up",TABLE_SORT_DESC:iconPrefix+"caret-down",TABLE_FILTER_NONE:iconPrefix+"funnel",TABLE_FILTER_MATCH:iconPrefix+"funnel",TABLE_EDIT:iconPrefix+"edit",TABLE_TITLE_PREFIX:iconPrefix+"question-circle-fill",TABLE_TITLE_SUFFIX:iconPrefix+"question-circle-fill",TABLE_TREE_LOADED:iconPrefix+"spinner roll",TABLE_TREE_OPEN:iconPrefix+"caret-right rotate90",TABLE_TREE_CLOSE:iconPrefix+"caret-right",TABLE_EXPAND_LOADED:iconPrefix+"spinner roll",TABLE_EXPAND_OPEN:iconPrefix+"arrow-right rotate90",TABLE_EXPAND_CLOSE:iconPrefix+"arrow-right",TABLE_CHECKBOX_CHECKED:iconPrefix+"checkbox-checked-fill",TABLE_CHECKBOX_UNCHECKED:iconPrefix+"checkbox-unchecked",TABLE_CHECKBOX_INDETERMINATE:iconPrefix+"checkbox-indeterminate-fill",TABLE_RADIO_CHECKED:iconPrefix+"radio-checked-fill",TABLE_RADIO_UNCHECKED:iconPrefix+"radio-unchecked",TABLE_CUSTOM_SORT:iconPrefix+"drag-handle",TABLE_MENU_OPTIONS:iconPrefix+"arrow-right",TOOLBAR_TOOLS_REFRESH:iconPrefix+"repeat",TOOLBAR_TOOLS_REFRESH_LOADING:iconPrefix+"repeat roll",TOOLBAR_TOOLS_IMPORT:iconPrefix+"upload",TOOLBAR_TOOLS_EXPORT:iconPrefix+"download",TOOLBAR_TOOLS_PRINT:iconPrefix+"print",TOOLBAR_TOOLS_FULLSCREEN:iconPrefix+"fullscreen",TOOLBAR_TOOLS_MINIMIZE:iconPrefix+"minimize",TOOLBAR_TOOLS_CUSTOM:iconPrefix+"custom-column",TOOLBAR_TOOLS_FIXED_LEFT:iconPrefix+"fixed-left",TOOLBAR_TOOLS_FIXED_LEFT_ACTIVE:iconPrefix+"fixed-left-fill",TOOLBAR_TOOLS_FIXED_RIGHT:iconPrefix+"fixed-right",TOOLBAR_TOOLS_FIXED_RIGHT_ACTIVE:iconPrefix+"fixed-right-fill"}),exports.setTheme=_core.VxeUI.setTheme),getTheme=exports.getTheme=_core.VxeUI.getTheme,setConfig=exports.setConfig=_core.VxeUI.setConfig,getConfig=exports.getConfig=_core.VxeUI.getConfig,setIcon=exports.setIcon=_core.VxeUI.setIcon,getIcon=exports.getIcon=_core.VxeUI.getIcon,setLanguage=exports.setLanguage=_core.VxeUI.setLanguage,setI18n=exports.setI18n=_core.VxeUI.setI18n,getI18n=exports.getI18n=_core.VxeUI.getI18n,globalEvents=exports.globalEvents=_core.VxeUI.globalEvents,globalResize=exports.globalResize=_core.VxeUI.globalResize,renderer=exports.renderer=_core.VxeUI.renderer,validators=exports.validators=_core.VxeUI.validators,menus=exports.menus=_core.VxeUI.menus,formats=exports.formats=_core.VxeUI.formats,commands=exports.commands=_core.VxeUI.commands,interceptor=exports.interceptor=_core.VxeUI.interceptor,clipboard=exports.clipboard=_core.VxeUI.clipboard,log=exports.log=_core.VxeUI.log,use=exports.use=_core.VxeUI.use,setup=e=>_core.VxeUI.setConfig(e),config=(exports.setup=setup,_core.VxeUI.setup=setup,e=>_core.VxeUI.setConfig(e)),t=(exports.config=config,_core.VxeUI.config=config,(e,o)=>_core.VxeUI.getI18n(e,o)),_t=(exports.t=t,_core.VxeUI.t=t,(e,o)=>(0,_utils.getFuncText)(e,o)),VXETable=(exports._t=_t,_core.VxeUI._t=_t,exports.VXETable=_core.VxeUI),saveFile=e=>_core.VxeUI.saveFile(e),readFile=(exports.saveFile=saveFile,e=>_core.VxeUI.readFile(e)),print=(exports.readFile=readFile,e=>_core.VxeUI.print(e)),modal=(exports.print=print,exports.modal={get(e){return _core.VxeUI.modal.get(e)},close(e){return _core.VxeUI.modal.close(e)},open(e){return _core.VxeUI.modal.open(e)},alert(e,o,r){return _core.VxeUI.modal.alert(e,o,r)},confirm(e,o,r){return _core.VxeUI.modal.confirm(e,o,r)},message(e,o){return _core.VxeUI.modal.message(e,o)},notification(e,o,r){return _core.VxeUI.modal.notification(e,o,r)}});var _default=exports.default=_core.VxeUI;
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.VXETable=void 0,Object.defineProperty(exports,"VxeUI",{enumerable:!0,get:function(){return _core.VxeUI}}),exports.version=exports.validators=exports.use=exports.t=exports.setup=exports.setTheme=exports.setLanguage=exports.setIcon=exports.setI18n=exports.setConfig=exports.saveFile=exports.renderer=exports.readFile=exports.print=exports.modal=exports.menus=exports.log=exports.interceptor=exports.globalResize=exports.globalEvents=exports.getTheme=exports.getIcon=exports.getI18n=exports.getConfig=exports.formats=exports.default=exports.config=exports.commands=exports.clipboard=exports._t=void 0;var _core=require("@vxe-ui/core"),_utils=require("./src/utils");let version=exports.version="3.10.0-beta.6",iconPrefix=(_core.VxeUI.version=version,_core.VxeUI.tableVersion=version,_core.VxeUI.setConfig({emptyCell:"　",table:{fit:!0,showHeader:!0,animat:!0,delayHover:250,autoResize:!0,padding:!0,minHeight:144,resizeConfig:{refreshDelay:250},radioConfig:{strict:!0},checkboxConfig:{strict:!0},tooltipConfig:{enterable:!0},validConfig:{showMessage:!0,autoClear:!0,autoPos:!0,message:"inline",msgMode:"single"},columnConfig:{maxFixedSize:4},customConfig:{allowVisible:!0,allowResizable:!0,allowFixed:!0,allowSort:!0,showFooter:!0,placement:"top-right",modalOptions:{showMaximize:!0,mask:!0,lockView:!0,resize:!0,escClosable:!0}},sortConfig:{showIcon:!0,iconLayout:"vertical"},filterConfig:{showIcon:!0},treeConfig:{rowField:"id",parentField:"parentId",childrenField:"children",hasChildField:"hasChild",mapChildrenField:"_X_ROW_CHILD",indent:20,showIcon:!0},expandConfig:{showIcon:!0},editConfig:{showIcon:!0,showAsterisk:!0,autoFocus:!0},importConfig:{_typeMaps:{csv:1,html:1,xml:1,txt:1}},exportConfig:{_typeMaps:{csv:1,html:1,xml:1,txt:1}},printConfig:{},mouseConfig:{extension:!0},keyboardConfig:{isEsc:!0},areaConfig:{autoClear:!0,selectCellByHeader:!0},clipConfig:{isCopy:!0,isCut:!0,isPaste:!0},fnrConfig:{isFind:!0,isReplace:!0},scrollX:{gt:60},scrollY:{gt:100}},grid:{formConfig:{enabled:!0},pagerConfig:{enabled:!0},toolbarConfig:{enabled:!0},proxyConfig:{enabled:!0,autoLoad:!0,showResponseMsg:!0,showActiveMsg:!0,props:{list:null,result:"result",total:"page.total",message:"message"}}},toolbar:{}}),"vxe-table-icon-"),setTheme=(_core.VxeUI.setIcon({TABLE_SORT_ASC:iconPrefix+"caret-up",TABLE_SORT_DESC:iconPrefix+"caret-down",TABLE_FILTER_NONE:iconPrefix+"funnel",TABLE_FILTER_MATCH:iconPrefix+"funnel",TABLE_EDIT:iconPrefix+"edit",TABLE_TITLE_PREFIX:iconPrefix+"question-circle-fill",TABLE_TITLE_SUFFIX:iconPrefix+"question-circle-fill",TABLE_TREE_LOADED:iconPrefix+"spinner roll",TABLE_TREE_OPEN:iconPrefix+"caret-right rotate90",TABLE_TREE_CLOSE:iconPrefix+"caret-right",TABLE_EXPAND_LOADED:iconPrefix+"spinner roll",TABLE_EXPAND_OPEN:iconPrefix+"arrow-right rotate90",TABLE_EXPAND_CLOSE:iconPrefix+"arrow-right",TABLE_CHECKBOX_CHECKED:iconPrefix+"checkbox-checked-fill",TABLE_CHECKBOX_UNCHECKED:iconPrefix+"checkbox-unchecked",TABLE_CHECKBOX_INDETERMINATE:iconPrefix+"checkbox-indeterminate-fill",TABLE_RADIO_CHECKED:iconPrefix+"radio-checked-fill",TABLE_RADIO_UNCHECKED:iconPrefix+"radio-unchecked",TABLE_CUSTOM_SORT:iconPrefix+"drag-handle",TABLE_MENU_OPTIONS:iconPrefix+"arrow-right",TOOLBAR_TOOLS_REFRESH:iconPrefix+"repeat",TOOLBAR_TOOLS_REFRESH_LOADING:iconPrefix+"repeat roll",TOOLBAR_TOOLS_IMPORT:iconPrefix+"upload",TOOLBAR_TOOLS_EXPORT:iconPrefix+"download",TOOLBAR_TOOLS_PRINT:iconPrefix+"print",TOOLBAR_TOOLS_FULLSCREEN:iconPrefix+"fullscreen",TOOLBAR_TOOLS_MINIMIZE:iconPrefix+"minimize",TOOLBAR_TOOLS_CUSTOM:iconPrefix+"custom-column",TOOLBAR_TOOLS_FIXED_LEFT:iconPrefix+"fixed-left",TOOLBAR_TOOLS_FIXED_LEFT_ACTIVE:iconPrefix+"fixed-left-fill",TOOLBAR_TOOLS_FIXED_RIGHT:iconPrefix+"fixed-right",TOOLBAR_TOOLS_FIXED_RIGHT_ACTIVE:iconPrefix+"fixed-right-fill"}),exports.setTheme=_core.VxeUI.setTheme),getTheme=exports.getTheme=_core.VxeUI.getTheme,setConfig=exports.setConfig=_core.VxeUI.setConfig,getConfig=exports.getConfig=_core.VxeUI.getConfig,setIcon=exports.setIcon=_core.VxeUI.setIcon,getIcon=exports.getIcon=_core.VxeUI.getIcon,setLanguage=exports.setLanguage=_core.VxeUI.setLanguage,setI18n=exports.setI18n=_core.VxeUI.setI18n,getI18n=exports.getI18n=_core.VxeUI.getI18n,globalEvents=exports.globalEvents=_core.VxeUI.globalEvents,globalResize=exports.globalResize=_core.VxeUI.globalResize,renderer=exports.renderer=_core.VxeUI.renderer,validators=exports.validators=_core.VxeUI.validators,menus=exports.menus=_core.VxeUI.menus,formats=exports.formats=_core.VxeUI.formats,commands=exports.commands=_core.VxeUI.commands,interceptor=exports.interceptor=_core.VxeUI.interceptor,clipboard=exports.clipboard=_core.VxeUI.clipboard,log=exports.log=_core.VxeUI.log,use=exports.use=_core.VxeUI.use,setup=e=>_core.VxeUI.setConfig(e),config=(exports.setup=setup,_core.VxeUI.setup=setup,e=>_core.VxeUI.setConfig(e)),t=(exports.config=config,_core.VxeUI.config=config,(e,o)=>_core.VxeUI.getI18n(e,o)),_t=(exports.t=t,_core.VxeUI.t=t,(e,o)=>(0,_utils.getFuncText)(e,o)),VXETable=(exports._t=_t,_core.VxeUI._t=_t,exports.VXETable=_core.VxeUI),saveFile=e=>_core.VxeUI.saveFile(e),readFile=(exports.saveFile=saveFile,e=>_core.VxeUI.readFile(e)),print=(exports.readFile=readFile,e=>_core.VxeUI.print(e)),modal=(exports.print=print,exports.modal={get(e){return _core.VxeUI.modal.get(e)},close(e){return _core.VxeUI.modal.close(e)},open(e){return _core.VxeUI.modal.open(e)},alert(e,o,r){return _core.VxeUI.modal.alert(e,o,r)},confirm(e,o,r){return _core.VxeUI.modal.confirm(e,o,r)},message(e,o){return _core.VxeUI.modal.message(e,o)},notification(e,o,r){return _core.VxeUI.modal.notification(e,o,r)}});var _default=exports.default=_core.VxeUI;

package/lib/ui/src/log.js

@@ -8,6 +8,6 @@ var _core = require("@vxe-ui/core");
 const {
   log
 } = _core.VxeUI;
-const version = `table v${"3.10.0-beta.4"}`;
+const version = `table v${"3.10.0-beta.6"}`;
 const warnLog = exports.warnLog = log.create('warn', version);
 const errLog = exports.errLog = log.create('error', version);

package/lib/ui/src/log.min.js

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),exports.warnLog=exports.errLog=void 0;var _core=require("@vxe-ui/core");let log=_core.VxeUI.log,version="table v3.10.0-beta.4",warnLog=exports.warnLog=log.create("warn",version),errLog=exports.errLog=log.create("error",version);
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.warnLog=exports.errLog=void 0;var _core=require("@vxe-ui/core");let log=_core.VxeUI.log,version="table v3.10.0-beta.6",warnLog=exports.warnLog=log.create("warn",version),errLog=exports.errLog=log.create("error",version);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vxe-table",
-  "version": "3.10.0-beta.4",
+  "version": "3.10.0-beta.6",
   "description": "一个基于 vue 的 PC 端表格组件，支持增删改查、虚拟树、列拖拽，懒加载、快捷菜单、数据校验、树形结构、打印、导入导出、自定义模板、渲染器、JSON 配置式...",
   "scripts": {
     "update": "npm install --legacy-peer-deps",
@@ -28,7 +28,7 @@
   "style": "lib/style.css",
   "typings": "types/index.d.ts",
   "dependencies": {
-    "vxe-pc-ui": "^3.2.5"
+    "vxe-pc-ui": "^3.2.6"
   },
   "devDependencies": {
     "@babel/plugin-transform-modules-commonjs": "^7.25.7",

package/packages/table/module/export/export-panel.ts

@@ -84,11 +84,10 @@ export default {
   render (this: any, h: CreateElement) {
     const $xeTable = this.$xeTable
 
-    const exportOpts = $xeTable.exportOpts
     const { _e, checkedAll, isAll: isAllChecked, isIndeterminate: isAllIndeterminate, showSheet, supportMerge, supportStyle, defaultOptions, storeData } = this
     const { hasTree, hasMerge, isPrint, hasColgroup, columns } = storeData
     const { isHeader } = defaultOptions
-    const slots = exportOpts.slots || {}
+    const slots = defaultOptions.slots || {}
     const topSlot = slots.top
     const bottomSlot = slots.bottom
     const defaultSlot = slots.default
@@ -167,9 +166,9 @@ export default {
           const params = {
             $table: $xeTable,
             $grid: $xeTable.xegrid,
-            options: exportOpts,
+            options: defaultOptions,
             columns,
-            params: exportOpts.params as any
+            params: defaultOptions.params as any
           }
 
           return h('div', {
@@ -431,9 +430,9 @@ export default {
           const params = {
             $table: $xeTable,
             $grid: $xeTable.xegrid,
-            options: exportOpts,
+            options: defaultOptions,
             columns,
-            params: exportOpts.params as any
+            params: defaultOptions.params as any
           }
           return h('div', {
             class: 'vxe-table-export--panel-footer'

package/packages/table/module/export/import-panel.ts

@@ -72,9 +72,8 @@ export default {
   render (this: any, h: CreateElement) {
     const $xeTable = this.$xeTable
 
-    const importOpts = $xeTable.importOpts
     const { hasFile, parseTypeLabel, defaultOptions, storeData, selectName } = this
-    const slots = importOpts.slots || {}
+    const slots = defaultOptions.slots || {}
     const topSlot = slots.top
     const bottomSlot = slots.bottom
     const defaultSlot = slots.default
@@ -109,8 +108,8 @@ export default {
           const params = {
             $table: $xeTable,
             $grid: $xeTable.xegrid,
-            options: importOpts,
-            params: importOpts.params as any
+            options: defaultOptions,
+            params: defaultOptions.params as any
           }
 
           return h('div', {
@@ -200,8 +199,8 @@ export default {
           const params = {
             $table: $xeTable,
             $grid: $xeTable.xegrid,
-            options: importOpts,
-            params: importOpts.params as any
+            options: defaultOptions,
+            params: defaultOptions.params as any
           }
           return h('div', {
             class: 'vxe-table-export--panel-footer'

package/packages/table/src/body.ts

@@ -268,6 +268,15 @@ function renderColumn (h: any, _vm: any, $xetable: any, seq: any, rowid: any, fi
       )
     }
   }
+  let cellHeight = ''
+  if (hasEllipsis && (scrollYRHeight || rowHeight)) {
+    cellHeight = `${scrollYRHeight || rowHeight}px`
+  } else if (scrollYLoad) {
+    if (!hasEllipsis) {
+      cellHeight = `${rest.height || 24}px`
+    }
+  }
+
   return h('td', {
     class: [
       'vxe-body--column',
@@ -293,7 +302,7 @@ function renderColumn (h: any, _vm: any, $xetable: any, seq: any, rowid: any, fi
     key: columnKey || columnOpts.useKey ? column.id : $columnIndex,
     attrs,
     style: Object.assign({
-      height: hasEllipsis && (scrollYRHeight || rowHeight) ? `${scrollYRHeight || rowHeight}px` : (scrollYLoad ? `${rest.height || 24}px` : '')
+      height: cellHeight
     }, XEUtils.isFunction(compCellStyle) ? compCellStyle(params) : compCellStyle, XEUtils.isFunction(cellStyle) ? cellStyle(params) : cellStyle),
     on: tdOns
   }, tdVNs)