vxe-table 3.17.2 → 3.17.3

package/lib/table/src/body.js

@@ -104,6 +104,7 @@ function renderTdColumn(h, $xeTable, seq, rowid, fixedType, isOptimizeMode, rowL
     tableData,
     dragRow,
     overflowX,
+    overflowY,
     currentColumn,
     scrollXLoad,
     scrollYLoad,
@@ -341,11 +342,11 @@ function renderTdColumn(h, $xeTable, seq, rowid, fixedType, isOptimizeMode, rowL
   const isLastColumn = $columnIndex === columns.length - 1;
   const isAutoCellWidth = !column.resizeWidth && (column.minWidth === 'auto' || column.width === 'auto');
   let isVNPreEmptyStatus = false;
-  if (overflowX && !isMergeCell) {
+  if (!isMergeCell) {
     if (!dragRow || (0, _util.getRowid)($xeTable, dragRow) !== rowid) {
-      if (scrollYLoad && !treeConfig && !virtualYOpts.immediate && (_rowIndex < scrollYStore.visibleStartIndex - scrollYStore.preloadSize || _rowIndex > scrollYStore.visibleEndIndex + scrollYStore.preloadSize)) {
+      if (overflowY && scrollYLoad && !treeConfig && !virtualYOpts.immediate && (_rowIndex < scrollYStore.visibleStartIndex - scrollYStore.preloadSize || _rowIndex > scrollYStore.visibleEndIndex + scrollYStore.preloadSize)) {
         isVNPreEmptyStatus = true;
-      } else if (scrollXLoad && !virtualXOpts.immediate && !column.fixed && (_columnIndex < scrollXStore.visibleStartIndex - scrollXStore.preloadSize || _columnIndex > scrollXStore.visibleEndIndex + scrollXStore.preloadSize)) {
+      } else if (overflowX && scrollXLoad && !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,a){var o=r.column,i=l.afterFullData,s=l.treeConfig,d=l.computeTreeOpts,{slots:o,treeNode:n}=o,c=l.fullAllDataRowIdData;if(o&&o.line)return l.callSlot(o.line,r,e);o=c[t];let p=0,u=null;return o&&(p=o.level,u=o.items[o.treeIndex-1]),s&&n&&(d.showLine||d.line)?[e("div",{key:"tl",class:"vxe-tree--line-wrapper"},[e("div",{class:"vxe-tree--line",style:{height:`${(0,_util.getRowid)(l,i[0])===t?1:(0,_util.calcTreeLine)(r,u)}px`,bottom:`-${Math.floor(a/2)}px`,left:p*d.indent+(p?2-(0,_util.getOffsetSize)(l):0)+16+"px"}})])]:[]}function renderTdColumn(e,l,t,r,a,A,H,o,q,F,i,s,L,N,U){var d=l.$xeGrid,{columnKey:V,resizable:n,showOverflow:c,border:W,height:p,treeConfig:X,cellClassName:j,cellStyle:G,align:u,spanMethod:P,mouseConfig:Y,editConfig:K,editRules:g,tooltipConfig:x,padding:J}=l,{tableData:Q,dragRow:Z,overflowX:ee,currentColumn:le,scrollXLoad:te,scrollYLoad:re,mergeBodyFlag:ae,calcCellHeightFlag:m,resizeHeightFlag:v,resizeWidthFlag:oe,editStore:ie,isAllOverflow:se,validErrorMaps:de}=l,{fullAllDataRowIdData:ne,fullColumnIdData:w,mergeBodyCellMaps:ce,visibleColumn:pe,afterFullData:ue,mergeBodyList:ge,scrollXStore:xe,scrollYStore:me}=l,f=l.computeCellOpts,h=l.computeValidOpts,y=l.computeCheckboxOpts,ve=l.computeEditOpts,b=l.computeTooltipOpts,we=l.computeVirtualXOpts,fe=l.computeVirtualYOpts,{isAllColumnDrag:he,isAllRowDrag:ye}=l.resizableOpts,C=l.computeRowOpts,_=l.computeRowDragOpts,be=l.computeDefaultRowHeight,m=m?f.height||C.height:0,{disabledMethod:E,isCrossDrag:Ce,isPeerDrag:_e}=_,Ee=l.computeColumnOpts,Re=l.computeMouseOpts,Se=l.computeCellOffsetWidth,De=l.computeAreaOpts.selectCellToRow,{type:Oe,cellRender:Ie,editRender:$e,align:Te,showOverflow:R,className:ke,treeNode:Be,rowResize:Me,padding:S,verticalAlign:D,slots:ze}=s,Ae=f.verticalAlign,ie=ie.actived,He=ne[r]||{},O=s.id,w=w[O]||{},I=$e||Ie,I=I?renderer.get(I.name):null,qe=I?I.tableCellClassName||I.cellClassName:null,Fe=I?I.tableCellStyle||I.cellStyle:"";let Le=b.showAll;var Ne=w.index,b=w._index,w=(0,_utils.isEnableConf)($e),v=v?He.resizeHeight:0;let $=ee&&(a?s.fixed!==a:!!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=se||T||k||c,S=_xeUtils.default.isBoolean(s.resizable)?s.resizable:Ee.resizable||n,n=!!m,m=0<v;let Ue;v={},Te=Te||(I?I.tableCellAlign:"")||u,I=_xeUtils.default.eqNull(D)?Ae:D,u=de[r+":"+O],Ae=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:o,rowIndex:q,$rowIndex:F,_rowIndex:i,column:s,columnIndex:Ne,$columnIndex:L,_columnIndex:b,fixed:a,type:renderType,isHidden:!!$,level:H,visibleData:ue,data:Q,items:U},M=!1,Ve=!1,z=((M=C.drag?"row"===_.trigger||s.dragSort&&"cell"===_.trigger:M)&&(Ve=!(!E||!E(B))),(T||k||Le||x)&&(v.mouseenter=e=>{isVMScrollProcess(l)||(T?(0,_dom.updateCellTitle)(e.currentTarget,s):(k||Le)&&l.triggerBodyTooltipEvent(e,B),l.dispatchEvent("cell-mouseenter",Object.assign({cell:e.currentTarget},B),e))}),(k||Le||x)&&(v.mouseleave=e=>{isVMScrollProcess(l)||((k||Le)&&l.handleTargetLeaveEvent(e),l.dispatchEvent("cell-mouseleave",Object.assign({cell:e.currentTarget},B),e))}),(M||y.range||Y)&&(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)})),We=1,Xe=1;if(ae&&ge.length){de=ce[i+":"+b];if(de){var{rowspan:g,colspan:p}=de;if(!g||!p)return renderEmptyElement(l);1<g&&(z=!0,Xe=g,D.rowspan=g),1<p&&(z=!0,We=p,D.colspan=p)}}else if(P){var{rowspan:d=1,colspan:t=1}=P(B)||{};if(!d||!t)return renderEmptyElement(l);1<d&&(z=!0,Xe=d,D.rowspan=d),1<t&&(z=!0,We=t,D.colspan=t)}!($=$&&z&&(1<D.colspan||1<D.rowspan)?!1:$)&&K&&($e||Ie)&&(ve.showStatus||ve.showUpdateStatus)&&(Ue=l.isUpdateByRow(o,s.field));q=!R&&(re||te);let je=(0,_util.getCellRestHeight)(He,f,C,be);F=L===N.length-1,Q=!s.resizeWidth&&("auto"===s.minWidth||"auto"===s.width);let Ge=!1;!ee||z||Z&&(0,_util.getRowid)(l,Z)===r||(re&&!X&&!fe.immediate&&(i<me.visibleStartIndex-me.preloadSize||i>me.visibleEndIndex+me.preloadSize)||te&&!we.immediate&&!s.fixed&&(b<xe.visibleStartIndex-xe.preloadSize||b>xe.visibleEndIndex+xe.preloadSize))&&(Ge=!0),1<Xe&&(U=ue[i+Xe-1])&&(_=ne[(0,_util.getRowid)(l,U)])&&(je+=_.oTop+(0,_util.getCellRestHeight)(_,f,C,be)-He.oTop-(0,_util.getCellRestHeight)(He,f,C,be));E={};if(R&&oe){let l=0;if(1<We)for(let e=1;e<We;e++){var Pe=pe[Ne+e];Pe&&(l+=Pe.renderWidth)}E.width=s.renderWidth+l-Se+"px"}re||te||R||n||m?E.height=je+"px":E.minHeight=je+"px";x=[];$&&se?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(o,s):null}},Ge?[]:[e("div",{attrs:{colid:O,rowid:r},class:"vxe-cell--wrapper vxe-body-cell--wrapper"},s.renderCell(e,B))])),Ae&&u&&(y=u.rule,ae=ze?ze.valid:null,ge=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,ge,e):[e("span",{class:"vxe-cell--valid-error-msg"},u.content)]])]))));let Ye=!1;return Y&&Re.area&&!b&&De&&(Ye=!0),!$&&S&&he&&x.push(e("div",{key:"tcc",class:["vxe-cell--col-resizable",{"is--line":!W||"none"===W}],on:{mousedown:e=>l.handleColResizeMousedownEvent(e,a,B),dblclick:e=>l.handleColResizeDblclickEvent(e,B)}})),(Me||ye)&&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:"",Te?"col--"+Te:"",Oe?"col--"+Oe:"",{"col--last":F,"col--tree-node":Be,"col--edit":w,"col--ellipsis":R,"col--cs-height":n,"col--rs-height":m,"col--to-row":Ye,"col--auto-height":q,"fixed--width":!Q,"fixed--hidden":$,"is--padding":J,"is--progress":$&&se||Ge,"is--drag-cell":M&&(Ce||_e||!H),"is--drag-disabled":Ve,"col--dirty":Ue,"col--active":K&&w&&ie.row===o&&(ie.column===s||"row"===ve.mode),"col--valid-error":!!u,"col--current":le===s},(0,_utils.getClass)(qe,B),(0,_utils.getClass)(ke,B),(0,_utils.getClass)(j,B)],key:V||te||re||Ee.useKey||C.useKey||Ee.drag?s.id:L,attrs:D,style:Object.assign({},_xeUtils.default.isFunction(Fe)?Fe(B):Fe,_xeUtils.default.isFunction(G)?G(B):G),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:Y,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:j,seqMode:G}=V,te=V.children||V.childrenField,P=[],re=(0,_util.createHandleGetRowId)(C).handleGetRowId,ae=$||N;return y.forEach((r,a)=>{var o={};let i=re(r);var s=U[i]||{};let d=a,n=0,c=-1,p=-1;var u=N&&r.isAggregate,g=((X.isHover||S)&&(o.mouseenter=e=>{isVMScrollProcess(C)||C.triggerHoverEvent(e,{row:r,rowIndex:d})},o.mouseleave=()=>{isVMScrollProcess(C)||C.clearHoverRow()}),s&&(d=s.index,p=s._index,n=s.level,c=s.seq,u||$&&j&&"increasing"===G?c=s._index+1:$&&"fixed"===G&&(c=s._tIndex+1)),{$table:C,seq:c,rowid:i,fixed:f,type:renderType,level:n,row:r,rowIndex:d,$rowIndex:a,_rowIndex:p}),x=H&&!!A&&!!Q[i];let e=!1,l=[],t=!1;I&&(t=C.isInsertByRow(r)),!$||M||j||(l=r[te],e=!!k&&l&&0<l.length&&!!K[i]),!X.drag||N||$&&!j||(o.dragstart=C.handleRowDragDragstartEvent,o.dragend=C.handleRowDragDragendEvent,o.dragover=C.handleRowDragDragoverEvent);var u=["vxe-body--row",ae?"row--level-"+n:"",{"row--stripe":E&&(p+1)%2==0,"is--new":t,"is--expand-row":x,"is--expand-tree":e,"row--new":t&&(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,a,p,e,l,b,y));if(P.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:a,on:o},m)),x){var{height:u,padding:g,mode:o}=C.computeExpandOpts;if("fixed"===o)P.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,o=H.id,s=Y[o]||{},o=_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:a,_rowIndex:p,isHidden:!1,isEdit:!1,visibleData:[],data:[],items:[]};P.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":o}],attrs:{colspan:b.length}},[v("div",{class:["vxe-body--expanded-cell",{"is--ellipsis":u}],style:m},[H.renderData(v,x)])])]))}}e&&P.push(...renderRows(v,w,f,h,l,b))}),P}var _default=exports.default={name:"VxeTableBody",props:{tableData:Array,tableColumn:Array,fixedColumn:Array,fixedType:{type:String,default:""}},mounted(){var e=this,l=e.fixedType,t=e.$parent.elemStore,l=`${l||"main"}-body-`;t[l+"wrapper"]=e.$refs.refElem,t[l+"scroll"]=e.$refs.refBodyScroll,t[l+"table"]=e.$refs.refBodyTable,t[l+"colgroup"]=e.$refs.refBodyColgroup,t[l+"list"]=e.$refs.refBodyTBody,t[l+"xSpace"]=e.$refs.refBodyXSpace,t[l+"ySpace"]=e.$refs.refBodyYSpace,t[l+"emptyBlock"]=e.$refs.refBodyEmptyBlock},destroyed(){var e=this.fixedType,l=this.$parent.elemStore,e=`${e||"main"}-body-`;l[e+"wrapper"]=null,l[e+"scroll"]=null,l[e+"table"]=null,l[e+"colgroup"]=null,l[e+"list"]=null,l[e+"xSpace"]=null,l[e+"ySpace"]=null,l[e+"emptyBlock"]=null},render(t){let l=this.$parent;var e=l,r=l,a=l,o=l.$xeGrid,i=l.$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:a,fullAllDataRowIdData:_,fullColumnIdData:E}=a,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=a),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&&(a=E[C.id])&&(f=a._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:o},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: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)])])])}};

package/lib/table/src/methods.js

@@ -4709,6 +4709,7 @@ const Methods = {
       isRowGroupStatus
     } = reactData;
     const {
+      currKeyField,
       fullAllDataRowIdData,
       tableFullData,
       tableFullTreeData,
@@ -4717,11 +4718,15 @@ const Methods = {
     } = internalData;
     const fullAllDataRowIdMaps = isReset ? {} : Object.assign({}, fullAllDataRowIdData); // 存在已删除数据
     const fullDataRowIdMaps = {};
+    const idMaps = {};
     const {
       handleUpdateRowId
     } = (0, _util.createHandleUpdateRowId)($xeTable);
     const handleRowCache = (row, index, items, currIndex, parentRow, rowid, level, seq) => {
       let rowRest = fullAllDataRowIdMaps[rowid];
+      if (idMaps[rowid]) {
+        (0, _log.errLog)('vxe.error.repeatKey', [currKeyField, rowid]);
+      }
       if (!rowRest) {
         rowRest = {
           row,
@@ -4749,6 +4754,7 @@ const Methods = {
       rowRest.level = level;
       rowRest.index = currIndex;
       rowRest.treeIndex = index;
+      idMaps[rowid] = true;
       fullDataRowIdMaps[rowid] = rowRest;
       fullAllDataRowIdMaps[rowid] = rowRest;
     };
@@ -8825,8 +8831,32 @@ const Methods = {
   /**
    * 用于当前行，获取当前行的数据
    */
-  getCurrentRecord() {
-    return this.rowOpts.isCurrent || this.highlightCurrentRow ? this.currentRow : null;
+  getCurrentRecord(isFull) {
+    const $xeTable = this;
+    const props = $xeTable;
+    const reactData = $xeTable;
+    const internalData = $xeTable;
+    const {
+      currentRow
+    } = reactData;
+    const {
+      fullDataRowIdData,
+      afterFullRowMaps
+    } = internalData;
+    const rowOpts = $xeTable.computeRowOpts;
+    if (rowOpts.isCurrent || props.highlightCurrentRow) {
+      const rowid = (0, _util.getRowid)($xeTable, currentRow);
+      if (isFull) {
+        if (fullDataRowIdData[rowid]) {
+          return currentRow;
+        }
+      } else {
+        if (afterFullRowMaps[rowid]) {
+          return currentRow;
+        }
+      }
+    }
+    return null;
   },
   /**
    * 用于单选行，获取当已选中的数据