vxe-table 4.1.10 → 4.1.13

package/lib/table/src/body.js

@@ -432,7 +432,7 @@ var _default = (0, _vue.defineComponent)({
           rowExpandeds = tableReactData.rowExpandeds,
           expandColumn = tableReactData.expandColumn,
           selectRow = tableReactData.selectRow;
-      var fullDataRowIdData = tableInternalData.fullDataRowIdData;
+      var fullAllDataRowIdData = tableInternalData.fullAllDataRowIdData;
       var checkboxOpts = computeCheckboxOpts.value;
       var radioOpts = computeRadioOpts.value;
       var treeOpts = computeTreeOpts.value;
@@ -471,7 +471,7 @@ var _default = (0, _vue.defineComponent)({
         }
 
         var rowid = (0, _util.getRowid)($xetable, row);
-        var rest = fullDataRowIdData[rowid];
+        var rest = fullAllDataRowIdData[rowid];
         var rowLevel = 0;
         var seq = -1;
 

package/lib/table/src/body.min.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _vue=require("vue"),_xeUtils=_interopRequireDefault(require("xe-utils")),_conf=_interopRequireDefault(require("../../v-x-e-table/src/conf")),_vXETable=require("../../v-x-e-table"),_util=require("./util"),_dom=require("../../tools/dom"),_utils=require("../../tools/utils");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var __assign=function(){return(__assign=Object.assign||function(e){for(var l,t=1,o=arguments.length;t<o;t++)for(var r in l=arguments[t])Object.prototype.hasOwnProperty.call(l,r)&&(e[r]=l[r]);return e}).apply(this,arguments)},__spreadArray=function(e,l){for(var t=0,o=l.length,r=e.length;t<o;t++,r++)e[r]=l[t];return e},renderType="body",lineOffsetSizes={mini:3,small:2,medium:1},_default=(0,_vue.defineComponent)({name:"VxeTableBody",props:{tableData:Array,tableColumn:Array,fixedColumn:Array,fixedType:{type:String,default:null}},setup:function(_){function i(){if(l){var e=l.value;if(e)return lineOffsetSizes[e]||0}return 0}function s(e,l){var t=e[u.value.children],o=1;if(re.isTreeExpandByRow(e))for(var r=0;r<t.length;r++)o+=s(t[r],l);return o}function oe(e,l,t){var o=t.column,r=ae.treeConfig,a=u.value,n=o.slots,o=o.treeNode;return n&&n.line?re.callSlot(n.line,t):r&&o&&a.line?[(0,_vue.h)("div",{class:"vxe-tree--line-wrapper"},[(0,_vue.h)("div",{class:"vxe-tree--line",style:{height:(r=l,l=(o=t).$rowIndex,t=1,l&&(t=s(r[l-1],o)),ne.rowHeight*t-(l?1:12-i())+"px"),left:e*a.indent+(e?2-i():0)+16+"px"}})])]:[]}function U(d,v,p){var f=ae.stripe,h=ae.rowKey,x=ae.highlightHoverRow,g=ae.rowClassName,_=ae.rowStyle,m=ae.showOverflow,y=ae.editConfig,w=ae.treeConfig,b=ne.hasFixedColumn,T=ne.treeExpandeds,S=ne.scrollYLoad,C=ne.editStore,L=ne.rowExpandeds,O=ne.expandColumn,R=ne.selectRow,E=ie.fullDataRowIdData,H=de.value,I=t.value,M=u.value,D=se.value,$=pe.value,k=M.transform,q=[];return v.forEach(function(t,o){var e={},r=re.getVTRowIndex(t),a=re.getRowIndex(t);($.isHover||x)&&(e.onMouseenter=function(e){fe()||re.triggerHoverEvent(e,{row:t,rowIndex:a})},e.onMouseleave=function(){fe()||re.clearHoverRow()});var n=(0,_util.getRowid)(re,t),l=E[n],i=0,s=-1;l&&(i=l.level,s=l.seq);var u,c={$table:re,seq:s,rowid:n,fixed:d,type:renderType,level:i,row:t,rowIndex:a,$rowIndex:o,_rowIndex:r},l=!1;y&&(l=-1<re.findRowIndexOf(C.insertList,t)),q.push((0,_vue.h)("tr",__assign({class:["vxe-body--row",{"row--stripe":f&&(re.getVTRowIndex(t)+1)%2==0,"is--new":l,"row--new":l&&(D.showStatus||D.showInsertStatus),"row--radio":I.highlight&&R===t,"row--checked":H.highlight&&re.isCheckedByCheckboxRow(t)},g?_xeUtils.default.isFunction(g)?g(c):g:""],rowid:n,style:_?_xeUtils.default.isFunction(_)?_(c):_:null,key:h||w?n:o},e),p.map(function(e,l){return Y(s,n,d,i,t,a,o,r,e,l,p,v)}))),O&&L.length&&-1<re.findRowIndexOf(L,t)&&(l=void 0,w&&(l={paddingLeft:i*M.indent+30+"px"}),u=O.showOverflow,c=_xeUtils.default.isUndefined(u)||_xeUtils.default.isNull(u)?m:u,u={$table:re,seq:s,column:O,fixed:d,type:renderType,level:i,row:t,rowIndex:a,$rowIndex:o,_rowIndex:r},q.push((0,_vue.h)("tr",__assign({class:"vxe-body--expanded-row",key:"expand_"+n,style:_?_xeUtils.default.isFunction(_)?_(u):_:null},e),[(0,_vue.h)("td",{class:["vxe-body--expanded-column",{"fixed--hidden":d&&!b,"col--ellipsis":c}],colspan:p.length},[(0,_vue.h)("div",{class:"vxe-body--expanded-cell",style:l},[O.renderData(u)])])]))),!w||S||k||!T.length||(u=t[M.children])&&u.length&&-1<re.findRowIndexOf(T,t)&&q.push.apply(q,U(d,u,p))}),q}function m(e,l,t){(l||t)&&(l&&((0,_util.removeScrollListener)(l),l.scrollTop=e),t&&((0,_util.removeScrollListener)(t),t.scrollTop=e),clearTimeout(r),r=setTimeout(function(){(0,_util.restoreScrollListener)(l),(0,_util.restoreScrollListener)(t)},300))}function o(e){var l=_.fixedType,t=ae.highlightHoverRow,o=ne.scrollXLoad,r=ne.scrollYLoad,a=ie.elemStore,n=ie.lastScrollTop,i=ie.lastScrollLeft,s=pe.value,u=b.value,c=T.value,d=S.value,v=C.value,p=L.value,f=O.value,h=I.value,x=u?u.$el:null,g=d?d.$el:null,u=c.$el,d=v?v.$el:null,c=p?p.$el:null,v=a["main-body-ySpace"],p=a["main-body-xSpace"],a=v?v.clientHeight:0,v=p?p.clientWidth:0,p=h.scrollTop,i=(h=u.scrollLeft)!==i,n=p!==n;ie.lastScrollTop=p,ie.lastScrollLeft=h,ie.lastScrollTime=Date.now(),(s.isHover||t)&&re.clearHoverRow(),d&&"left"===l?(p=d.scrollTop,m(p,u,c)):c&&"right"===l?(p=c.scrollTop,m(p,u,d)):(i&&(x&&(x.scrollLeft=u.scrollLeft),g&&(g.scrollLeft=u.scrollLeft)),(d||c)&&(re.checkScrolling(),n&&m(p,d,c))),o&&i&&re.triggerScrollXEvent(e),r&&n&&re.triggerScrollYEvent(e),i&&f&&f.reactData.visible&&f.updatePlacement(),re.dispatchEvent("scroll",{type:renderType,fixed:l,scrollTop:p,scrollLeft:h,bodyHeight:a,bodyWidth:v,isX:i,isY:n},e)}function g(e){var l=e.deltaY,t=e.deltaX,o=ae.highlightHoverRow,r=ne.scrollYLoad,a=ie.lastScrollTop,n=ie.lastScrollLeft,i=pe.value,s=T.value,u=I.value,c=s.$el,s=_dom.browse.firefox?40*l:l,l=_dom.browse.firefox?40*t:t;((t=s<0)?u.scrollTop<=0:u.scrollTop>=u.scrollHeight-u.clientHeight)||(u=u.scrollTop+s,n=(l=c.scrollLeft+l)!==n,(a=u!==a)&&(e.preventDefault(),ie.lastScrollTop=u,ie.lastScrollLeft=l,ie.lastScrollTime=Date.now(),(i.isHover||o)&&re.clearHoverRow(),d(e,t,s,n,a),r&&re.triggerScrollYEvent(e)))}var r,f,re=(0,_vue.inject)("$xetable",{}),l=(0,_vue.inject)("xesize",null),y=re.xID,ae=re.props,w=re.context,ne=re.reactData,ie=re.internalData,e=re.getRefMaps(),b=e.refTableHeader,T=e.refTableBody,S=e.refTableFooter,C=e.refTableLeftBody,L=e.refTableRightBody,O=e.refValidTooltip,e=re.getComputeMaps(),se=e.computeEditOpts,R=e.computeMouseOpts,ue=e.computeSYOpts,E=e.computeEmptyOpts,H=e.computeKeyboardOpts,ce=e.computeTooltipOpts,t=e.computeRadioOpts,u=e.computeTreeOpts,de=e.computeCheckboxOpts,ve=e.computeValidOpts,pe=e.computeRowOpts,I=(0,_vue.ref)(),M=(0,_vue.ref)(),D=(0,_vue.ref)(),$=(0,_vue.ref)(),k=(0,_vue.ref)(),q=(0,_vue.ref)(),B=(0,_vue.ref)(),fe=function(){var e=ae.delayHover,l=ie.lastScrollTime;return ie._isResize||l&&Date.now()<l+e},Y=function(e,l,t,o,r,a,n,i,s,u,c,d){var v,p=ae.columnKey,f=ae.height,h=ae.showOverflow,x=ae.cellClassName,g=ae.cellStyle,_=ae.align,m=ae.spanMethod,y=ae.mouseConfig,w=ae.editConfig,b=ae.editRules,T=ae.tooltipConfig,S=ne.tableData,C=ne.overflowX,L=ne.scrollYLoad,O=ne.currentColumn,R=ne.mergeList,E=ne.editStore,H=ne.validStore,I=ne.isAllOverflow,M=ie.afterFullData,D=ve.value,$=de.value,k=se.value,q=ce.value,U=pe.value,B=ue.value,Y=s.type,A=s.cellRender,X=s.editRender,j=s.align,N=s.showOverflow,V=s.className,F=s.treeNode,W=E.actived,P=B.rHeight,z=U.height,K=q.showAll,G=re.getColumnIndex(s),E=re.getVTColumnIndex(s),B=(0,_utils.isEnableConf)(X),U=t?s.fixed!==t:s.fixed&&C,q=_xeUtils.default.isUndefined(N)||_xeUtils.default.isNull(N)?h:N,C="ellipsis"===q,J="title"===q,Q=!0===q||"tooltip"===q,N=J||Q||C,q={},j=j||_,_=H.row===r&&H.column===s,f=b&&D.showMessage&&("default"===D.message?f||1<S.length:"inline"===D.message),D={colid:s.id},Z={$table:re,seq:e,rowid:l,row:r,rowIndex:a,$rowIndex:n,_rowIndex:i,column:s,columnIndex:G,$columnIndex:u,_columnIndex:E,fixed:t,type:renderType,isHidden:U,level:o,visibleData:M,data:S,items:d};if(L&&!N&&(C=N=!0),(J||Q||K||T)&&(q.onMouseenter=function(e){fe()||(J?(0,_dom.updateCellTitle)(e.currentTarget,s):(Q||K)&&re.triggerBodyTooltipEvent(e,Z),re.dispatchEvent("cell-mouseenter",Object.assign({cell:e.currentTarget},Z),e))}),(Q||K||T)&&(q.onMouseleave=function(e){fe()||((Q||K)&&re.handleTargetLeaveEvent(e),re.dispatchEvent("cell-mouseleave",Object.assign({cell:e.currentTarget},Z),e))}),($.range||y)&&(q.onMousedown=function(e){re.triggerCellMousedownEvent(e,Z)}),q.onClick=function(e){re.triggerCellClickEvent(e,Z)},q.onDblclick=function(e){re.triggerCellDblclickEvent(e,Z)},R.length){var ee=(0,_util.mergeBodyMethod)(R,i,E);if(ee){var le=ee.rowspan,te=ee.colspan;if(!le||!te)return null;1<le&&(D.rowspan=le),1<te&&(D.colspan=te)}}else if(m){ee=m(Z)||{},m=ee.rowspan,le=void 0===m?1:m,ee=ee.colspan,te=void 0===ee?1:ee;if(!le||!te)return null;1<le&&(D.rowspan=le),1<te&&(D.colspan=te)}!(U=U&&R&&(1<D.colspan||1<D.rowspan)?!1:U)&&w&&(X||A)&&(k.showStatus||k.showUpdateStatus)&&(v=re.isUpdateByRow(r,s.property));A=[];return U&&h&&I?A.push((0,_vue.h)("div",{class:["vxe-cell",{"c--title":J,"c--tooltip":Q,"c--ellipsis":C}],style:{maxHeight:N&&(P||z)?(P||z)+"px":""}})):(A.push.apply(A,__spreadArray(__spreadArray([],oe(o,d,Z)),[(0,_vue.h)("div",{class:["vxe-cell",{"c--title":J,"c--tooltip":Q,"c--ellipsis":C}],style:{maxHeight:N&&(P||z)?(P||z)+"px":""},title:J?re.getCellLabel(r,s):null},s.renderCell(Z))])),f&&_&&A.push((0,_vue.h)("div",{class:"vxe-cell--valid",style:H.rule&&H.rule.maxWidth?{width:H.rule.maxWidth+"px"}:null},[(0,_vue.h)("span",{class:"vxe-cell--valid-msg"},H.content)]))),(0,_vue.h)("td",__assign(__assign(__assign({class:["vxe-body--column",s.id,((H={})["col--"+j]=j,H["col--"+Y]=Y,H["col--last"]=u===c.length-1,H["col--tree-node"]=F,H["col--edit"]=B,H["col--ellipsis"]=N,H["fixed--hidden"]=U,H["col--dirty"]=v,H["col--actived"]=w&&B&&W.row===r&&(W.column===s||"row"===k.mode),H["col--valid-error"]=_,H["col--current"]=O===s,H),(0,_util.getPropClass)(V,Z),(0,_util.getPropClass)(x,Z)],key:p?s.id:u},D),{style:Object.assign({height:N&&(P||z)?(P||z)+"px":""},g?_xeUtils.default.isFunction(g)?g(Z):g:null)}),q),A)},h=0,x=0,A=0,X=!1,d=function(a,n,e,i,s){var l=ie.elemStore,t=T.value,o=C.value,r=L.value,u=o?o.$el:null,c=r?r.$el:null,d=t.$el,t=l["main-body-ySpace"],l=l["main-body-xSpace"],v=t?t.clientHeight:0,p=l?l.clientWidth:0,l=X===n?Math.max(0,h-A):0;X=n,h=Math.abs(n?e-l:e+l),A=x=0,clearTimeout(f),function e(){var l,t,o,r;A<h&&(l=_.fixedType,x=Math.max(5,Math.floor(1.5*x)),h<(A+=x)&&(x-=A-h),r=d.scrollTop,t=d.clientHeight,o=d.scrollHeight,r=r+x*(n?-1:1),d.scrollTop=r,u&&(u.scrollTop=r),c&&(c.scrollTop=r),(n?r<o-t:0<=r)&&(f=setTimeout(e,10)),re.dispatchEvent("scroll",{type:renderType,fixed:l,scrollTop:d.scrollTop,scrollLeft:d.scrollLeft,bodyHeight:v,bodyWidth:p,isX:i,isY:s},a))}()};(0,_vue.onMounted)(function(){(0,_vue.nextTick)(function(){var e=_.fixedType,l=ie.elemStore,t=(e||"main")+"-body-",e=I.value;l[t+"wrapper"]=I.value,l[t+"table"]=M.value,l[t+"colgroup"]=D.value,l[t+"list"]=$.value,l[t+"xSpace"]=k.value,l[t+"ySpace"]=q.value,l[t+"emptyBlock"]=B.value,e.onscroll=o,e._onscroll=o})}),(0,_vue.onBeforeUnmount)(function(){var e=I.value;clearTimeout(f),e._onscroll=null,e.onscroll=null});return function(){var e=_.fixedColumn,l=_.fixedType,t=_.tableColumn,o=ae.keyboardConfig,r=ae.showOverflow,a=ae.spanMethod,n=ae.mouseConfig,i=ne.tableData,s=ne.mergeList,u=ne.scrollYLoad,c=ne.isAllOverflow,d=ie.visibleColumn,v=w.slots,p=ue.value,f=E.value,h=H.value,x=R.value;return l&&(t=!(u||r&&c)||s.length||a||o&&h.isMerge?d:e),f=v.empty?re.callSlot(v.empty,{$table:re}):(v=(v=f.name?_vXETable.VXETable.renderer.get(f.name):null)?v.renderEmpty:null)?v(f,{$table:re}):ae.emptyText||_conf.default.i18n("vxe.table.emptyText"),(0,_vue.h)("div",__assign({ref:I,class:["vxe-table--body-wrapper",l?"fixed-"+l+"--wrapper":"body--wrapper"],xid:y},u&&"wheel"===p.mode?{onWheel:g}:{}),[l?(0,_vue.createCommentVNode)():(0,_vue.h)("div",{ref:k,class:"vxe-body--x-space"}),(0,_vue.h)("div",{ref:q,class:"vxe-body--y-space"}),(0,_vue.h)("table",{ref:M,class:"vxe-table--body",xid:y,cellspacing:0,cellpadding:0,border:0},[(0,_vue.h)("colgroup",{ref:D},t.map(function(e,l){return(0,_vue.h)("col",{name:e.id,key:l})})),(0,_vue.h)("tbody",{ref:$},U(l,i,t))]),(0,_vue.h)("div",{class:"vxe-table--checkbox-range"}),n&&x.area?(0,_vue.h)("div",{class:"vxe-table--cell-area"},[(0,_vue.h)("span",{class:"vxe-table--cell-main-area"},x.extension?[(0,_vue.h)("span",{class:"vxe-table--cell-main-area-btn",onMousedown:function(e){re.triggerCellExtendMousedownEvent(e,{$table:re,fixed:l,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"})]):null,l?null:(0,_vue.h)("div",{class:"vxe-table--empty-block",ref:B},[(0,_vue.h)("div",{class:"vxe-table--empty-content"},f)])])}}});exports.default=_default;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _vue=require("vue"),_xeUtils=_interopRequireDefault(require("xe-utils")),_conf=_interopRequireDefault(require("../../v-x-e-table/src/conf")),_vXETable=require("../../v-x-e-table"),_util=require("./util"),_dom=require("../../tools/dom"),_utils=require("../../tools/utils");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var __assign=function(){return(__assign=Object.assign||function(e){for(var l,t=1,o=arguments.length;t<o;t++)for(var r in l=arguments[t])Object.prototype.hasOwnProperty.call(l,r)&&(e[r]=l[r]);return e}).apply(this,arguments)},__spreadArray=function(e,l){for(var t=0,o=l.length,r=e.length;t<o;t++,r++)e[r]=l[t];return e},renderType="body",lineOffsetSizes={mini:3,small:2,medium:1},_default=(0,_vue.defineComponent)({name:"VxeTableBody",props:{tableData:Array,tableColumn:Array,fixedColumn:Array,fixedType:{type:String,default:null}},setup:function(_){function i(){if(l){var e=l.value;if(e)return lineOffsetSizes[e]||0}return 0}function s(e,l){var t=e[u.value.children],o=1;if(re.isTreeExpandByRow(e))for(var r=0;r<t.length;r++)o+=s(t[r],l);return o}function oe(e,l,t){var o=t.column,r=ae.treeConfig,a=u.value,n=o.slots,o=o.treeNode;return n&&n.line?re.callSlot(n.line,t):r&&o&&a.line?[(0,_vue.h)("div",{class:"vxe-tree--line-wrapper"},[(0,_vue.h)("div",{class:"vxe-tree--line",style:{height:(r=l,l=(o=t).$rowIndex,t=1,l&&(t=s(r[l-1],o)),ne.rowHeight*t-(l?1:12-i())+"px"),left:e*a.indent+(e?2-i():0)+16+"px"}})])]:[]}function U(d,v,p){var f=ae.stripe,h=ae.rowKey,x=ae.highlightHoverRow,g=ae.rowClassName,_=ae.rowStyle,m=ae.showOverflow,y=ae.editConfig,w=ae.treeConfig,b=ne.hasFixedColumn,T=ne.treeExpandeds,S=ne.scrollYLoad,C=ne.editStore,L=ne.rowExpandeds,O=ne.expandColumn,R=ne.selectRow,E=ie.fullAllDataRowIdData,H=de.value,I=t.value,M=u.value,D=se.value,$=pe.value,k=M.transform,q=[];return v.forEach(function(t,o){var e={},r=re.getVTRowIndex(t),a=re.getRowIndex(t);($.isHover||x)&&(e.onMouseenter=function(e){fe()||re.triggerHoverEvent(e,{row:t,rowIndex:a})},e.onMouseleave=function(){fe()||re.clearHoverRow()});var n=(0,_util.getRowid)(re,t),l=E[n],i=0,s=-1;l&&(i=l.level,s=l.seq);var u,c={$table:re,seq:s,rowid:n,fixed:d,type:renderType,level:i,row:t,rowIndex:a,$rowIndex:o,_rowIndex:r},l=!1;y&&(l=-1<re.findRowIndexOf(C.insertList,t)),q.push((0,_vue.h)("tr",__assign({class:["vxe-body--row",{"row--stripe":f&&(re.getVTRowIndex(t)+1)%2==0,"is--new":l,"row--new":l&&(D.showStatus||D.showInsertStatus),"row--radio":I.highlight&&R===t,"row--checked":H.highlight&&re.isCheckedByCheckboxRow(t)},g?_xeUtils.default.isFunction(g)?g(c):g:""],rowid:n,style:_?_xeUtils.default.isFunction(_)?_(c):_:null,key:h||w?n:o},e),p.map(function(e,l){return Y(s,n,d,i,t,a,o,r,e,l,p,v)}))),O&&L.length&&-1<re.findRowIndexOf(L,t)&&(l=void 0,w&&(l={paddingLeft:i*M.indent+30+"px"}),u=O.showOverflow,c=_xeUtils.default.isUndefined(u)||_xeUtils.default.isNull(u)?m:u,u={$table:re,seq:s,column:O,fixed:d,type:renderType,level:i,row:t,rowIndex:a,$rowIndex:o,_rowIndex:r},q.push((0,_vue.h)("tr",__assign({class:"vxe-body--expanded-row",key:"expand_"+n,style:_?_xeUtils.default.isFunction(_)?_(u):_:null},e),[(0,_vue.h)("td",{class:["vxe-body--expanded-column",{"fixed--hidden":d&&!b,"col--ellipsis":c}],colspan:p.length},[(0,_vue.h)("div",{class:"vxe-body--expanded-cell",style:l},[O.renderData(u)])])]))),!w||S||k||!T.length||(u=t[M.children])&&u.length&&-1<re.findRowIndexOf(T,t)&&q.push.apply(q,U(d,u,p))}),q}function m(e,l,t){(l||t)&&(l&&((0,_util.removeScrollListener)(l),l.scrollTop=e),t&&((0,_util.removeScrollListener)(t),t.scrollTop=e),clearTimeout(r),r=setTimeout(function(){(0,_util.restoreScrollListener)(l),(0,_util.restoreScrollListener)(t)},300))}function o(e){var l=_.fixedType,t=ae.highlightHoverRow,o=ne.scrollXLoad,r=ne.scrollYLoad,a=ie.elemStore,n=ie.lastScrollTop,i=ie.lastScrollLeft,s=pe.value,u=b.value,c=T.value,d=S.value,v=C.value,p=L.value,f=O.value,h=I.value,x=u?u.$el:null,g=d?d.$el:null,u=c.$el,d=v?v.$el:null,c=p?p.$el:null,v=a["main-body-ySpace"],p=a["main-body-xSpace"],a=v?v.clientHeight:0,v=p?p.clientWidth:0,p=h.scrollTop,i=(h=u.scrollLeft)!==i,n=p!==n;ie.lastScrollTop=p,ie.lastScrollLeft=h,ie.lastScrollTime=Date.now(),(s.isHover||t)&&re.clearHoverRow(),d&&"left"===l?(p=d.scrollTop,m(p,u,c)):c&&"right"===l?(p=c.scrollTop,m(p,u,d)):(i&&(x&&(x.scrollLeft=u.scrollLeft),g&&(g.scrollLeft=u.scrollLeft)),(d||c)&&(re.checkScrolling(),n&&m(p,d,c))),o&&i&&re.triggerScrollXEvent(e),r&&n&&re.triggerScrollYEvent(e),i&&f&&f.reactData.visible&&f.updatePlacement(),re.dispatchEvent("scroll",{type:renderType,fixed:l,scrollTop:p,scrollLeft:h,bodyHeight:a,bodyWidth:v,isX:i,isY:n},e)}function g(e){var l=e.deltaY,t=e.deltaX,o=ae.highlightHoverRow,r=ne.scrollYLoad,a=ie.lastScrollTop,n=ie.lastScrollLeft,i=pe.value,s=T.value,u=I.value,c=s.$el,s=_dom.browse.firefox?40*l:l,l=_dom.browse.firefox?40*t:t;((t=s<0)?u.scrollTop<=0:u.scrollTop>=u.scrollHeight-u.clientHeight)||(u=u.scrollTop+s,n=(l=c.scrollLeft+l)!==n,(a=u!==a)&&(e.preventDefault(),ie.lastScrollTop=u,ie.lastScrollLeft=l,ie.lastScrollTime=Date.now(),(i.isHover||o)&&re.clearHoverRow(),d(e,t,s,n,a),r&&re.triggerScrollYEvent(e)))}var r,f,re=(0,_vue.inject)("$xetable",{}),l=(0,_vue.inject)("xesize",null),y=re.xID,ae=re.props,w=re.context,ne=re.reactData,ie=re.internalData,e=re.getRefMaps(),b=e.refTableHeader,T=e.refTableBody,S=e.refTableFooter,C=e.refTableLeftBody,L=e.refTableRightBody,O=e.refValidTooltip,e=re.getComputeMaps(),se=e.computeEditOpts,R=e.computeMouseOpts,ue=e.computeSYOpts,E=e.computeEmptyOpts,H=e.computeKeyboardOpts,ce=e.computeTooltipOpts,t=e.computeRadioOpts,u=e.computeTreeOpts,de=e.computeCheckboxOpts,ve=e.computeValidOpts,pe=e.computeRowOpts,I=(0,_vue.ref)(),M=(0,_vue.ref)(),D=(0,_vue.ref)(),$=(0,_vue.ref)(),k=(0,_vue.ref)(),q=(0,_vue.ref)(),B=(0,_vue.ref)(),fe=function(){var e=ae.delayHover,l=ie.lastScrollTime;return ie._isResize||l&&Date.now()<l+e},Y=function(e,l,t,o,r,a,n,i,s,u,c,d){var v,p=ae.columnKey,f=ae.height,h=ae.showOverflow,x=ae.cellClassName,g=ae.cellStyle,_=ae.align,m=ae.spanMethod,y=ae.mouseConfig,w=ae.editConfig,b=ae.editRules,T=ae.tooltipConfig,S=ne.tableData,C=ne.overflowX,L=ne.scrollYLoad,O=ne.currentColumn,R=ne.mergeList,E=ne.editStore,H=ne.validStore,I=ne.isAllOverflow,M=ie.afterFullData,D=ve.value,$=de.value,k=se.value,q=ce.value,U=pe.value,B=ue.value,Y=s.type,A=s.cellRender,X=s.editRender,j=s.align,N=s.showOverflow,V=s.className,F=s.treeNode,W=E.actived,P=B.rHeight,z=U.height,K=q.showAll,G=re.getColumnIndex(s),E=re.getVTColumnIndex(s),B=(0,_utils.isEnableConf)(X),U=t?s.fixed!==t:s.fixed&&C,q=_xeUtils.default.isUndefined(N)||_xeUtils.default.isNull(N)?h:N,C="ellipsis"===q,J="title"===q,Q=!0===q||"tooltip"===q,N=J||Q||C,q={},j=j||_,_=H.row===r&&H.column===s,f=b&&D.showMessage&&("default"===D.message?f||1<S.length:"inline"===D.message),D={colid:s.id},Z={$table:re,seq:e,rowid:l,row:r,rowIndex:a,$rowIndex:n,_rowIndex:i,column:s,columnIndex:G,$columnIndex:u,_columnIndex:E,fixed:t,type:renderType,isHidden:U,level:o,visibleData:M,data:S,items:d};if(L&&!N&&(C=N=!0),(J||Q||K||T)&&(q.onMouseenter=function(e){fe()||(J?(0,_dom.updateCellTitle)(e.currentTarget,s):(Q||K)&&re.triggerBodyTooltipEvent(e,Z),re.dispatchEvent("cell-mouseenter",Object.assign({cell:e.currentTarget},Z),e))}),(Q||K||T)&&(q.onMouseleave=function(e){fe()||((Q||K)&&re.handleTargetLeaveEvent(e),re.dispatchEvent("cell-mouseleave",Object.assign({cell:e.currentTarget},Z),e))}),($.range||y)&&(q.onMousedown=function(e){re.triggerCellMousedownEvent(e,Z)}),q.onClick=function(e){re.triggerCellClickEvent(e,Z)},q.onDblclick=function(e){re.triggerCellDblclickEvent(e,Z)},R.length){var ee=(0,_util.mergeBodyMethod)(R,i,E);if(ee){var le=ee.rowspan,te=ee.colspan;if(!le||!te)return null;1<le&&(D.rowspan=le),1<te&&(D.colspan=te)}}else if(m){ee=m(Z)||{},m=ee.rowspan,le=void 0===m?1:m,ee=ee.colspan,te=void 0===ee?1:ee;if(!le||!te)return null;1<le&&(D.rowspan=le),1<te&&(D.colspan=te)}!(U=U&&R&&(1<D.colspan||1<D.rowspan)?!1:U)&&w&&(X||A)&&(k.showStatus||k.showUpdateStatus)&&(v=re.isUpdateByRow(r,s.property));A=[];return U&&h&&I?A.push((0,_vue.h)("div",{class:["vxe-cell",{"c--title":J,"c--tooltip":Q,"c--ellipsis":C}],style:{maxHeight:N&&(P||z)?(P||z)+"px":""}})):(A.push.apply(A,__spreadArray(__spreadArray([],oe(o,d,Z)),[(0,_vue.h)("div",{class:["vxe-cell",{"c--title":J,"c--tooltip":Q,"c--ellipsis":C}],style:{maxHeight:N&&(P||z)?(P||z)+"px":""},title:J?re.getCellLabel(r,s):null},s.renderCell(Z))])),f&&_&&A.push((0,_vue.h)("div",{class:"vxe-cell--valid",style:H.rule&&H.rule.maxWidth?{width:H.rule.maxWidth+"px"}:null},[(0,_vue.h)("span",{class:"vxe-cell--valid-msg"},H.content)]))),(0,_vue.h)("td",__assign(__assign(__assign({class:["vxe-body--column",s.id,((H={})["col--"+j]=j,H["col--"+Y]=Y,H["col--last"]=u===c.length-1,H["col--tree-node"]=F,H["col--edit"]=B,H["col--ellipsis"]=N,H["fixed--hidden"]=U,H["col--dirty"]=v,H["col--actived"]=w&&B&&W.row===r&&(W.column===s||"row"===k.mode),H["col--valid-error"]=_,H["col--current"]=O===s,H),(0,_util.getPropClass)(V,Z),(0,_util.getPropClass)(x,Z)],key:p?s.id:u},D),{style:Object.assign({height:N&&(P||z)?(P||z)+"px":""},g?_xeUtils.default.isFunction(g)?g(Z):g:null)}),q),A)},h=0,x=0,A=0,X=!1,d=function(a,n,e,i,s){var l=ie.elemStore,t=T.value,o=C.value,r=L.value,u=o?o.$el:null,c=r?r.$el:null,d=t.$el,t=l["main-body-ySpace"],l=l["main-body-xSpace"],v=t?t.clientHeight:0,p=l?l.clientWidth:0,l=X===n?Math.max(0,h-A):0;X=n,h=Math.abs(n?e-l:e+l),A=x=0,clearTimeout(f),function e(){var l,t,o,r;A<h&&(l=_.fixedType,x=Math.max(5,Math.floor(1.5*x)),h<(A+=x)&&(x-=A-h),r=d.scrollTop,t=d.clientHeight,o=d.scrollHeight,r=r+x*(n?-1:1),d.scrollTop=r,u&&(u.scrollTop=r),c&&(c.scrollTop=r),(n?r<o-t:0<=r)&&(f=setTimeout(e,10)),re.dispatchEvent("scroll",{type:renderType,fixed:l,scrollTop:d.scrollTop,scrollLeft:d.scrollLeft,bodyHeight:v,bodyWidth:p,isX:i,isY:s},a))}()};(0,_vue.onMounted)(function(){(0,_vue.nextTick)(function(){var e=_.fixedType,l=ie.elemStore,t=(e||"main")+"-body-",e=I.value;l[t+"wrapper"]=I.value,l[t+"table"]=M.value,l[t+"colgroup"]=D.value,l[t+"list"]=$.value,l[t+"xSpace"]=k.value,l[t+"ySpace"]=q.value,l[t+"emptyBlock"]=B.value,e.onscroll=o,e._onscroll=o})}),(0,_vue.onBeforeUnmount)(function(){var e=I.value;clearTimeout(f),e._onscroll=null,e.onscroll=null});return function(){var e=_.fixedColumn,l=_.fixedType,t=_.tableColumn,o=ae.keyboardConfig,r=ae.showOverflow,a=ae.spanMethod,n=ae.mouseConfig,i=ne.tableData,s=ne.mergeList,u=ne.scrollYLoad,c=ne.isAllOverflow,d=ie.visibleColumn,v=w.slots,p=ue.value,f=E.value,h=H.value,x=R.value;return l&&(t=!(u||r&&c)||s.length||a||o&&h.isMerge?d:e),f=v.empty?re.callSlot(v.empty,{$table:re}):(v=(v=f.name?_vXETable.VXETable.renderer.get(f.name):null)?v.renderEmpty:null)?v(f,{$table:re}):ae.emptyText||_conf.default.i18n("vxe.table.emptyText"),(0,_vue.h)("div",__assign({ref:I,class:["vxe-table--body-wrapper",l?"fixed-"+l+"--wrapper":"body--wrapper"],xid:y},u&&"wheel"===p.mode?{onWheel:g}:{}),[l?(0,_vue.createCommentVNode)():(0,_vue.h)("div",{ref:k,class:"vxe-body--x-space"}),(0,_vue.h)("div",{ref:q,class:"vxe-body--y-space"}),(0,_vue.h)("table",{ref:M,class:"vxe-table--body",xid:y,cellspacing:0,cellpadding:0,border:0},[(0,_vue.h)("colgroup",{ref:D},t.map(function(e,l){return(0,_vue.h)("col",{name:e.id,key:l})})),(0,_vue.h)("tbody",{ref:$},U(l,i,t))]),(0,_vue.h)("div",{class:"vxe-table--checkbox-range"}),n&&x.area?(0,_vue.h)("div",{class:"vxe-table--cell-area"},[(0,_vue.h)("span",{class:"vxe-table--cell-main-area"},x.extension?[(0,_vue.h)("span",{class:"vxe-table--cell-main-area-btn",onMousedown:function(e){re.triggerCellExtendMousedownEvent(e,{$table:re,fixed:l,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"})]):null,l?null:(0,_vue.h)("div",{class:"vxe-table--empty-block",ref:B},[(0,_vue.h)("div",{class:"vxe-table--empty-content"},f)])])}}});exports.default=_default;

package/lib/table/src/table.js

@@ -1321,7 +1321,6 @@ var _default = (0, _vue.defineComponent)({
         _xeUtils.default.eachTree(afterTreeFullData, function (row, index, items, path) {
           var rowid = (0, _util.getRowid)($xetable, row);
           var allrest = fullAllDataRowIdData[rowid];
-          var fullrest = fullDataRowIdData[rowid];
           var seq = path.map(function (num, i) {
             return i % 2 === 0 ? Number(num) + 1 : '.';
           }).join('');
@@ -1329,24 +1328,8 @@ var _default = (0, _vue.defineComponent)({
           if (allrest) {
             allrest.seq = seq;
             allrest._index = index;
-          }
-
-          if (fullrest) {
-            fullrest.seq = seq;
-            fullrest._index = index;
           } else {
-            fullAllDataRowIdData[rowid] = {
-              row: row,
-              rowid: rowid,
-              seq: seq,
-              index: -1,
-              $index: -1,
-              _index: index,
-              items: [],
-              parent: null,
-              level: 0
-            };
-            fullDataRowIdData[rowid] = {
+            var rest = {
               row: row,
               rowid: rowid,
               seq: seq,
@@ -1357,36 +1340,23 @@ var _default = (0, _vue.defineComponent)({
               parent: null,
               level: 0
             };
+            fullAllDataRowIdData[rowid] = rest;
+            fullDataRowIdData[rowid] = rest;
           }
-        }, treeOpts);
+        }, {
+          children: treeOpts.mapChildren
+        });
       } else {
         afterFullData.forEach(function (row, index) {
           var rowid = (0, _util.getRowid)($xetable, row);
           var allrest = fullAllDataRowIdData[rowid];
-          var fullrest = fullDataRowIdData[rowid];
           var seq = index + 1;
 
           if (allrest) {
             allrest.seq = seq;
             allrest._index = index;
-          }
-
-          if (fullrest) {
-            fullrest.seq = seq;
-            fullrest._index = index;
           } else {
-            fullAllDataRowIdData[rowid] = {
-              row: row,
-              rowid: rowid,
-              seq: seq,
-              index: -1,
-              $index: -1,
-              _index: index,
-              items: [],
-              parent: null,
-              level: 0
-            };
-            fullDataRowIdData[rowid] = {
+            var rest = {
               row: row,
               rowid: rowid,
               seq: seq,
@@ -1397,10 +1367,43 @@ var _default = (0, _vue.defineComponent)({
               parent: null,
               level: 0
             };
+            fullAllDataRowIdData[rowid] = rest;
+            fullDataRowIdData[rowid] = rest;
           }
         });
       }
     };
+    /**
+     * 如果为虚拟树，将树结构拍平
+     * @returns
+     */
+
+
+    var handleVirtualTreeToList = function handleVirtualTreeToList() {
+      var treeConfig = props.treeConfig;
+      var treeExpandeds = reactData.treeExpandeds;
+      var treeOpts = computeTreeOpts.value;
+
+      if (treeConfig && treeOpts.transform) {
+        var fullData_1 = [];
+        var expandMaps_1 = new Map();
+
+        _xeUtils.default.eachTree(internalData.afterTreeFullData, function (row, index, items, path, parent) {
+          if (!parent || expandMaps_1.has(parent) && $xetable.findRowIndexOf(treeExpandeds, parent) > -1) {
+            expandMaps_1.set(row, 1);
+            fullData_1.push(row);
+          }
+        }, {
+          children: treeOpts.mapChildren
+        });
+
+        internalData.afterFullData = fullData_1;
+        updateScrollYStatus(fullData_1);
+        return fullData_1;
+      }
+
+      return internalData.afterFullData;
+    };
     /**
      * 获取处理后全量的表格数据
      * 如果存在筛选条件，继续处理
@@ -1521,6 +1524,7 @@ var _default = (0, _vue.defineComponent)({
           };
 
           if (treeConfig && transform) {
+            // 筛选虚拟树
             tableTree = _xeUtils.default.searchTree(tableFullTreeData, handleFilter, __assign(__assign({}, treeOpts), {
               original: true
             }));
@@ -1530,8 +1534,18 @@ var _default = (0, _vue.defineComponent)({
             tableTree = tableData;
           }
         } else {
-          tableData = treeConfig ? tableFullTreeData.slice(0) : tableFullData.slice(0);
-          tableTree = tableData;
+          if (treeConfig && transform) {
+            // 还原虚拟树
+            tableTree = _xeUtils.default.searchTree(tableFullTreeData, function () {
+              return true;
+            }, __assign(__assign({}, treeOpts), {
+              original: true
+            }));
+            tableData = tableTree;
+          } else {
+            tableData = treeConfig ? tableFullTreeData.slice(0) : tableFullData.slice(0);
+            tableTree = tableData;
+          }
         } // 处理排序（不能用于树形结构）
         // 支持单列、多列、组合排序
 
@@ -2834,6 +2848,7 @@ var _default = (0, _vue.defineComponent)({
 
     var handleVirtualTreeExpand = function handleVirtualTreeExpand(rows, expanded) {
       return handleBaseTreeExpand(rows, expanded).then(function () {
+        handleVirtualTreeToList();
         return tablePrivateMethods.handleTableData();
       }).then(function () {
         return tableMethods.recalculate();
@@ -2874,11 +2889,11 @@ var _default = (0, _vue.defineComponent)({
 
     var createGetRowCacheProp = function createGetRowCacheProp(prop) {
       return function (row) {
-        var fullDataRowIdData = internalData.fullDataRowIdData;
+        var fullAllDataRowIdData = internalData.fullAllDataRowIdData;
 
         if (row) {
           var rowid = (0, _util.getRowid)($xetable, row);
-          var rest = fullDataRowIdData[rowid];
+          var rest = fullAllDataRowIdData[rowid];
 
           if (rest) {
             return rest[prop];
@@ -4534,7 +4549,8 @@ var _default = (0, _vue.defineComponent)({
         var treeExpandeds = reactData.treeExpandeds;
         var fullAllDataRowIdData = internalData.fullAllDataRowIdData;
         var treeOpts = computeTreeOpts.value;
-        var lazy = treeOpts.lazy;
+        var transform = treeOpts.transform,
+            lazy = treeOpts.lazy;
         var rest = fullAllDataRowIdData[(0, _util.getRowid)($xetable, row)];
 
         if (lazy && rest) {
@@ -4545,6 +4561,11 @@ var _default = (0, _vue.defineComponent)({
           });
         }
 
+        if (transform) {
+          handleVirtualTreeToList();
+          return tablePrivateMethods.handleTableData();
+        }
+
         return (0, _vue.nextTick)();
       },
 
@@ -4596,7 +4617,8 @@ var _default = (0, _vue.defineComponent)({
       setAllTreeExpand: function setAllTreeExpand(expanded) {
         var tableFullData = internalData.tableFullData;
         var treeOpts = computeTreeOpts.value;
-        var lazy = treeOpts.lazy,
+        var transform = treeOpts.transform,
+            lazy = treeOpts.lazy,
             children = treeOpts.children;
         var expandeds = [];
 
@@ -4608,7 +4630,12 @@ var _default = (0, _vue.defineComponent)({
           }
         }, treeOpts);
 
-        return tableMethods.setTreeExpand(expandeds, expanded);
+        return tableMethods.setTreeExpand(expandeds, expanded).then(function () {
+          if (transform) {
+            handleVirtualTreeToList();
+            return tableMethods.recalculate();
+          }
+        });
       },
 
       /**
@@ -4656,7 +4683,8 @@ var _default = (0, _vue.defineComponent)({
         var treeExpandeds = reactData.treeExpandeds;
         var tableFullTreeData = internalData.tableFullTreeData;
         var treeOpts = computeTreeOpts.value;
-        var reserve = treeOpts.reserve;
+        var transform = treeOpts.transform,
+            reserve = treeOpts.reserve;
         var isExists = treeExpandeds.length;
         reactData.treeExpandeds = [];
 
@@ -4667,6 +4695,10 @@ var _default = (0, _vue.defineComponent)({
         }
 
         return tablePrivateMethods.handleTableData().then(function () {
+          if (transform) {
+            handleVirtualTreeToList();
+          }
+
           if (isExists) {
             tableMethods.recalculate();
           }
@@ -5637,32 +5669,16 @@ var _default = (0, _vue.defineComponent)({
         return record;
       },
       handleTableData: function handleTableData(force) {
-        var treeConfig = props.treeConfig;
         var scrollYLoad = reactData.scrollYLoad;
         var scrollYStore = internalData.scrollYStore,
             fullDataRowIdData = internalData.fullDataRowIdData;
-        var treeExpandeds = reactData.treeExpandeds;
-        var treeOpts = computeTreeOpts.value;
-        var fullList = []; // 是否进行数据处理
+        var fullList = internalData.afterFullData; // 是否进行数据处理
 
         if (force) {
-          updateAfterFullData();
-        } // 如果为虚拟树，将树结构拍平
+          // 更新数据，处理筛选和排序
+          updateAfterFullData(); // 如果为虚拟树，将树结构拍平
 
-
-        if (treeConfig && treeOpts.transform) {
-          var expandMaps_1 = new Map();
-
-          _xeUtils.default.eachTree(internalData.afterTreeFullData, function (row, index, items, path, parent) {
-            if (!parent || expandMaps_1.has(parent) && $xetable.findRowIndexOf(treeExpandeds, parent) > -1) {
-              expandMaps_1.set(row, 1);
-              fullList.push(row);
-            }
-          }, {
-            children: treeOpts.mapChildren
-          });
-        } else {
-          fullList = internalData.afterFullData;
+          fullList = handleVirtualTreeToList();
         }
 
         var tableData = scrollYLoad ? fullList.slice(scrollYStore.startIndex, scrollYStore.endIndex) : fullList.slice(0);