vxe-table - npm Package Compare versions

Comparing version 4.10.7 to 4.10.8

es/table/src/body.js

@@ -95,3 +95,3 @@ import { defineComponent, TransitionGroup, h, ref, inject, nextTick, onMounted, onUnmounted } from 'vue';
             const defaultRowHeight = computeDefaultRowHeight.value;
-            const customCellHeight = cellOpts.height || rowOpts.height;
+            const customCellHeight = calcCellHeightFlag ? (cellOpts.height || rowOpts.height) : 0;
             const { disabledMethod: dragDisabledMethod, isCrossDrag, isPeerDrag } = rowDragOpts;
@@ -249,3 +249,3 @@ const columnOpts = computeColumnOpts.value;
             const isVNAutoHeight = scrollYLoad && !hasEllipsis;
-            const cellHeight = calcCellHeightFlag ? (rowRest.resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight) : defaultRowHeight;
+            const cellHeight = rowRest.resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight;
             const isLastColumn = $columnIndex === columns.length - 1;
@@ -252,0 +252,0 @@ const isAutoCellWidth = !column.resizeWidth && (column.minWidth === 'auto' || column.width === 'auto');

es/ui/index.js

 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "4.10.7";
+export const version = "4.10.8";
 VxeUI.version = version;
@@ -5,0 +5,0 @@ VxeUI.tableVersion = version;

es/ui/src/log.js

 import { VxeUI } from '@vxe-ui/core';
 const { log } = VxeUI;
-const version = `table v${"4.10.7"}`;
+const version = `table v${"4.10.8"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);

lib/table/src/body.js

@@ -180,3 +180,3 @@ "use strict";
       const defaultRowHeight = computeDefaultRowHeight.value;
-      const customCellHeight = cellOpts.height || rowOpts.height;
+      const customCellHeight = calcCellHeightFlag ? cellOpts.height || rowOpts.height : 0;
       const {
@@ -366,3 +366,3 @@ disabledMethod: dragDisabledMethod,
       const isVNAutoHeight = scrollYLoad && !hasEllipsis;
-      const cellHeight = calcCellHeightFlag ? rowRest.resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight : defaultRowHeight;
+      const cellHeight = rowRest.resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight;
       const isLastColumn = $columnIndex === columns.length - 1;
@@ -369,0 +369,0 @@ const isAutoCellWidth = !column.resizeWidth && (column.minWidth === 'auto' || column.width === 'auto');

lib/table/src/body.min.js

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

lib/ui/index.js

@@ -16,3 +16,3 @@ "use strict";
 var _utils = require("./src/utils");
-const version = exports.version = "4.10.7";
+const version = exports.version = "4.10.8";
 _core.VxeUI.version = version;
@@ -19,0 +19,0 @@ _core.VxeUI.tableVersion = version;

lib/ui/index.min.js

@@ -1,1 +0,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.hooks=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="4.10.7",iconPrefix=(_core.VxeUI.version=version,_core.VxeUI.tableVersion=version,_core.VxeUI.setConfig({emptyCell:"　",table:{fit:!0,showHeader:!0,animat:!0,delayHover:250,autoResize:!0,minHeight:144,resizeConfig:{},resizableConfig:{dragMode:"auto",showDragTip:!0,isSyncAutoHeight:!0,isSyncAutoWidth:!0,minHeight:18},radioConfig:{strict:!0},rowDragConfig:{showIcon:!0,animation:!0,showGuidesStatus:!0},columnDragConfig:{showIcon:!0,animation:!0,showGuidesStatus:!0},checkboxConfig:{strict:!0},tooltipConfig:{enterable:!0},validConfig:{showMessage:!0,autoClear:!0,autoPos:!0,message:"inline",msgMode:"single",theme:"beautify"},columnConfig:{maxFixedSize:4},cellConfig:{padding:!0},headerCellConfig:{height:"unset"},footerCellConfig:{height:"unset"},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},drawerOptions:{mask:!0,lockView:!0,escClosable:!0,resize:!0}},sortConfig:{showIcon:!0,allowClear:!0,allowBtn:!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,selectCellByBody:!0,extendDirection:{top:!0,left:!0,bottom:!0,right:!0}},clipConfig:{isCopy:!0,isCut:!0,isPaste:!0},fnrConfig:{isFind:!0,isReplace:!0},virtualXConfig:{enabled:!0,gt:60,preSize:0,oSize:1},virtualYConfig:{enabled:!0,gt:100,preSize:1,oSize:2},scrollbarConfig:{}},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",TABLE_DRAG_ROW:iconPrefix+"drag-handle",TABLE_DRAG_COLUMN:iconPrefix+"drag-handle",TABLE_DRAG_STATUS_ROW:iconPrefix+"sort",TABLE_DRAG_STATUS_SUB_ROW:iconPrefix+"add-sub",TABLE_DRAG_STATUS_COLUMN:iconPrefix+"swap",TABLE_DRAG_DISABLED:iconPrefix+"no-drop",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,hooks=exports.hooks=_core.VxeUI.hooks,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.hooks=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="4.10.8",iconPrefix=(_core.VxeUI.version=version,_core.VxeUI.tableVersion=version,_core.VxeUI.setConfig({emptyCell:"　",table:{fit:!0,showHeader:!0,animat:!0,delayHover:250,autoResize:!0,minHeight:144,resizeConfig:{},resizableConfig:{dragMode:"auto",showDragTip:!0,isSyncAutoHeight:!0,isSyncAutoWidth:!0,minHeight:18},radioConfig:{strict:!0},rowDragConfig:{showIcon:!0,animation:!0,showGuidesStatus:!0},columnDragConfig:{showIcon:!0,animation:!0,showGuidesStatus:!0},checkboxConfig:{strict:!0},tooltipConfig:{enterable:!0},validConfig:{showMessage:!0,autoClear:!0,autoPos:!0,message:"inline",msgMode:"single",theme:"beautify"},columnConfig:{maxFixedSize:4},cellConfig:{padding:!0},headerCellConfig:{height:"unset"},footerCellConfig:{height:"unset"},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},drawerOptions:{mask:!0,lockView:!0,escClosable:!0,resize:!0}},sortConfig:{showIcon:!0,allowClear:!0,allowBtn:!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,selectCellByBody:!0,extendDirection:{top:!0,left:!0,bottom:!0,right:!0}},clipConfig:{isCopy:!0,isCut:!0,isPaste:!0},fnrConfig:{isFind:!0,isReplace:!0},virtualXConfig:{enabled:!0,gt:60,preSize:0,oSize:1},virtualYConfig:{enabled:!0,gt:100,preSize:1,oSize:2},scrollbarConfig:{}},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",TABLE_DRAG_ROW:iconPrefix+"drag-handle",TABLE_DRAG_COLUMN:iconPrefix+"drag-handle",TABLE_DRAG_STATUS_ROW:iconPrefix+"sort",TABLE_DRAG_STATUS_SUB_ROW:iconPrefix+"add-sub",TABLE_DRAG_STATUS_COLUMN:iconPrefix+"swap",TABLE_DRAG_DISABLED:iconPrefix+"no-drop",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,hooks=exports.hooks=_core.VxeUI.hooks,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;

lib/ui/src/log.js

@@ -11,4 +11,4 @@ "use strict";
 } = _core.VxeUI;
-const version = `table v${"4.10.7"}`;
+const version = `table v${"4.10.8"}`;
 const warnLog = exports.warnLog = log.create('warn', version);
 const errLog = exports.errLog = log.create('error', version);

lib/ui/src/log.min.js

@@ -1,1 +0,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 v4.10.7",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 v4.10.8",warnLog=exports.warnLog=log.create("warn",version),errLog=exports.errLog=log.create("error",version);

package.json

 {
   "name": "vxe-table",
-  "version": "4.10.7",
+  "version": "4.10.8",
   "description": "一个基于 vue 的 PC 端表格组件，支持增删改查、虚拟树、拖拽排序，懒加载、快捷菜单、数据校验、树形结构、打印、导入导出、自定义模板、渲染器、JSON 配置式...",
@@ -5,0 +5,0 @@ "scripts": {

packages/table/src/body.ts

@@ -119,3 +119,3 @@ import { defineComponent, TransitionGroup, h, ref, Ref, PropType, inject, nextTick, onMounted, onUnmounted } from 'vue'
       const defaultRowHeight = computeDefaultRowHeight.value
-      const customCellHeight = cellOpts.height || rowOpts.height
+      const customCellHeight = calcCellHeightFlag ? (cellOpts.height || rowOpts.height) : 0
       const { disabledMethod: dragDisabledMethod, isCrossDrag, isPeerDrag } = rowDragOpts
@@ -274,3 +274,3 @@ const columnOpts = computeColumnOpts.value
       const isVNAutoHeight = scrollYLoad && !hasEllipsis
-      const cellHeight = calcCellHeightFlag ? (rowRest.resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight) : defaultRowHeight
+      const cellHeight = rowRest.resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight
 
@@ -277,0 +277,0 @@ const isLastColumn = $columnIndex === columns.length - 1

No alert changes

Worsened metrics

Total package byte prevSize

9293482

No dependency changes