vxe-table 3.9.0-rc.2 → 3.9.0-rc.21

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

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

package/lib/table/src/columnInfo.js

@@ -31,7 +31,7 @@ var ColumnInfo = exports.ColumnInfo = /*#__PURE__*/function () {
     var proxyOpts = $xegrid ? $xegrid.proxyOpts : null;
     var formatter = _vm.formatter;
     var visible = _xeUtils.default.isBoolean(_vm.visible) ? _vm.visible : true;
-    if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+    if (process.env.NODE_ENV === 'development') {
       var types = ['seq', 'checkbox', 'radio', 'expand', 'html'];
       if (_vm.type && types.indexOf(_vm.type) === -1) {
         (0, _log.warnLog)('vxe.error.errProp', ["type=".concat(_vm.type), types.join(', ')]);
@@ -59,12 +59,12 @@ var ColumnInfo = exports.ColumnInfo = /*#__PURE__*/function () {
       if (formatter) {
         if (_xeUtils.default.isString(formatter)) {
           var gFormatOpts = formats.get(formatter) || _xeUtils.default[formatter];
-          if (!gFormatOpts || !_xeUtils.default.isFunction(gFormatOpts.cellFormatMethod)) {
+          if (!gFormatOpts || !_xeUtils.default.isFunction(gFormatOpts.tableCellFormatMethod || gFormatOpts.cellFormatMethod)) {
             (0, _log.errLog)('vxe.error.notFormats', [formatter]);
           }
         } else if (_xeUtils.default.isArray(formatter)) {
           var _gFormatOpts = formats.get(formatter[0]) || _xeUtils.default[formatter[0]];
-          if (!_gFormatOpts || !_xeUtils.default.isFunction(_gFormatOpts.cellFormatMethod)) {
+          if (!_gFormatOpts || !_xeUtils.default.isFunction(_gFormatOpts.tableCellFormatMethod || _gFormatOpts.cellFormatMethod)) {
             (0, _log.errLog)('vxe.error.notFormats', [formatter[0]]);
           }
         }

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

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),exports.ColumnInfo=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_ui=require("../../ui"),_util=require("./util"),_utils=require("../../ui/src/utils"),_log=require("../../ui/src/log");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function _typeof(e){return(_typeof="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}function _classCallCheck(e,r){if(!(e instanceof r))throw new TypeError("Cannot call a class as a function")}function _defineProperties(e,r){for(var t=0;t<r.length;t++){var o=r[t];o.enumerable=o.enumerable||!1,o.configurable=!0,"value"in o&&(o.writable=!0),Object.defineProperty(e,_toPropertyKey(o.key),o)}}function _createClass(e,r,t){return r&&_defineProperties(e.prototype,r),t&&_defineProperties(e,t),Object.defineProperty(e,"prototype",{writable:!1}),e}function _toPropertyKey(e){e=_toPrimitive(e,"string");return"symbol"==_typeof(e)?e:e+""}function _toPrimitive(e,r){if("object"!=_typeof(e)||!e)return e;var t=e[Symbol.toPrimitive];if(void 0===t)return("string"===r?String:Number)(e);t=t.call(e,r||"default");if("object"!=_typeof(t))return t;throw new TypeError("@@toPrimitive must return a primitive value.")}var getI18n=_ui.VxeUI.getI18n,formats=_ui.VxeUI.formats,ColumnInfo=exports.ColumnInfo=(()=>_createClass(function e(r,t){var o,l=2<arguments.length&&void 0!==arguments[2]?arguments[2]:{},i=l.renderHeader,n=l.renderCell,d=l.renderFooter,l=l.renderData,s=(_classCallCheck(this,e),r.$xegrid),a=s?s.proxyOpts:null,f=t.formatter,u=!_xeUtils.default.isBoolean(t.visible)||t.visible;"development"===process.env.VUE_APP_VXE_TABLE_ENV&&(o=["seq","checkbox","radio","expand","html"],t.type&&-1===o.indexOf(t.type)&&(0,_log.warnLog)("vxe.error.errProp",["type=".concat(t.type),o.join(", ")]),(_xeUtils.default.isBoolean(t.cellRender)||t.cellRender&&!_xeUtils.default.isObject(t.cellRender))&&(0,_log.warnLog)("vxe.error.errProp",["column.cell-render=".concat(t.cellRender),"column.cell-render={}"]),(_xeUtils.default.isBoolean(t.editRender)||t.editRender&&!_xeUtils.default.isObject(t.editRender))&&(0,_log.warnLog)("vxe.error.errProp",["column.edit-render=".concat(t.editRender),"column.edit-render={}"]),t.cellRender&&t.editRender&&(0,_log.warnLog)("vxe.error.errConflicts",["column.cell-render","column.edit-render"]),"expand"===t.type&&r.treeConfig&&(r.treeOpts.showLine||r.treeOpts.line)&&(0,_log.errLog)("vxe.error.errConflicts",["tree-config.line","column.type=expand"]),t.remoteSort&&(0,_log.warnLog)("vxe.error.delProp",["column.remote-sort","sort-config.remote"]),t.sortMethod&&(0,_log.warnLog)("vxe.error.delProp",["column.sort-method","sort-config.sortMethod"]),f)&&(_xeUtils.default.isString(f)?(o=formats.get(f)||_xeUtils.default[f])&&_xeUtils.default.isFunction(o.cellFormatMethod)||(0,_log.errLog)("vxe.error.notFormats",[f]):!_xeUtils.default.isArray(f)||(r=formats.get(f[0])||_xeUtils.default[f[0]])&&_xeUtils.default.isFunction(r.cellFormatMethod)||(0,_log.errLog)("vxe.error.notFormats",[f[0]])),Object.assign(this,{type:t.type,property:t.field,field:t.field,title:t.title,width:t.width,minWidth:t.minWidth,maxWidth:t.maxWidth,resizable:t.resizable,fixed:t.fixed,align:t.align,headerAlign:t.headerAlign,footerAlign:t.footerAlign,showOverflow:t.showOverflow,showHeaderOverflow:t.showHeaderOverflow,showFooterOverflow:t.showFooterOverflow,className:t.className,headerClassName:t.headerClassName,footerClassName:t.footerClassName,formatter:f,footerFormatter:t.footerFormatter,sortable:t.sortable,sortBy:t.sortBy,sortType:t.sortType,sortMethod:t.sortMethod,remoteSort:t.remoteSort,filters:(0,_util.toFilters)(t.filters),filterMultiple:!_xeUtils.default.isBoolean(t.filterMultiple)||t.filterMultiple,filterMethod:t.filterMethod,filterResetMethod:t.filterResetMethod,filterRecoverMethod:t.filterRecoverMethod,filterRender:t.filterRender,treeNode:t.treeNode,cellType:t.cellType,cellRender:t.cellRender,editRender:t.editRender,contentRender:t.contentRender,headerExportMethod:t.headerExportMethod,exportMethod:t.exportMethod,footerExportMethod:t.footerExportMethod,titleHelp:t.titleHelp,titlePrefix:t.titlePrefix,titleSuffix:t.titleSuffix,params:t.params,id:t.colId||_xeUtils.default.uniqueId("col_"),parentId:null,visible:u,halfVisible:!1,defaultVisible:u,defaultFixed:t.fixed,checked:!1,halfChecked:!1,disabled:!1,level:1,rowSpan:1,colSpan:1,order:null,sortTime:0,sortNumber:0,renderSortNumber:0,renderFixed:"",renderVisible:!1,renderWidth:0,renderHeight:0,renderResizeWidth:0,renderAutoWidth:0,resizeWidth:0,renderLeft:0,renderArgs:[],model:{},renderHeader:i||t.renderHeader,renderCell:n||t.renderCell,renderFooter:d||t.renderFooter,renderData:l,slots:t.slots}),a&&a.beforeColumn&&a.beforeColumn({$grid:s,column:this})},[{key:"getTitle",value:function(){return(0,_utils.getFuncText)(this.title||("seq"===this.type?getI18n("vxe.table.seqTitle"):""))}},{key:"getKey",value:function(){var e=this.type;return this.field||(e?"type=".concat(e):null)}},{key:"update",value:function(e,r){"filters"!==e&&("field"===e&&(this.property=r),this[e]=r)}}]))();
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.ColumnInfo=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_ui=require("../../ui"),_util=require("./util"),_utils=require("../../ui/src/utils"),_log=require("../../ui/src/log");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function _typeof(e){return(_typeof="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}function _classCallCheck(e,r){if(!(e instanceof r))throw new TypeError("Cannot call a class as a function")}function _defineProperties(e,r){for(var t=0;t<r.length;t++){var o=r[t];o.enumerable=o.enumerable||!1,o.configurable=!0,"value"in o&&(o.writable=!0),Object.defineProperty(e,_toPropertyKey(o.key),o)}}function _createClass(e,r,t){return r&&_defineProperties(e.prototype,r),t&&_defineProperties(e,t),Object.defineProperty(e,"prototype",{writable:!1}),e}function _toPropertyKey(e){e=_toPrimitive(e,"string");return"symbol"==_typeof(e)?e:e+""}function _toPrimitive(e,r){if("object"!=_typeof(e)||!e)return e;var t=e[Symbol.toPrimitive];if(void 0===t)return("string"===r?String:Number)(e);t=t.call(e,r||"default");if("object"!=_typeof(t))return t;throw new TypeError("@@toPrimitive must return a primitive value.")}var getI18n=_ui.VxeUI.getI18n,formats=_ui.VxeUI.formats,ColumnInfo=exports.ColumnInfo=(()=>_createClass(function e(r,t){var o,l=2<arguments.length&&void 0!==arguments[2]?arguments[2]:{},i=l.renderHeader,n=l.renderCell,d=l.renderFooter,l=l.renderData,s=(_classCallCheck(this,e),r.$xegrid),a=s?s.proxyOpts:null,f=t.formatter,u=!_xeUtils.default.isBoolean(t.visible)||t.visible;"development"===process.env.NODE_ENV&&(o=["seq","checkbox","radio","expand","html"],t.type&&-1===o.indexOf(t.type)&&(0,_log.warnLog)("vxe.error.errProp",["type=".concat(t.type),o.join(", ")]),(_xeUtils.default.isBoolean(t.cellRender)||t.cellRender&&!_xeUtils.default.isObject(t.cellRender))&&(0,_log.warnLog)("vxe.error.errProp",["column.cell-render=".concat(t.cellRender),"column.cell-render={}"]),(_xeUtils.default.isBoolean(t.editRender)||t.editRender&&!_xeUtils.default.isObject(t.editRender))&&(0,_log.warnLog)("vxe.error.errProp",["column.edit-render=".concat(t.editRender),"column.edit-render={}"]),t.cellRender&&t.editRender&&(0,_log.warnLog)("vxe.error.errConflicts",["column.cell-render","column.edit-render"]),"expand"===t.type&&r.treeConfig&&(r.treeOpts.showLine||r.treeOpts.line)&&(0,_log.errLog)("vxe.error.errConflicts",["tree-config.line","column.type=expand"]),t.remoteSort&&(0,_log.warnLog)("vxe.error.delProp",["column.remote-sort","sort-config.remote"]),t.sortMethod&&(0,_log.warnLog)("vxe.error.delProp",["column.sort-method","sort-config.sortMethod"]),f)&&(_xeUtils.default.isString(f)?(o=formats.get(f)||_xeUtils.default[f])&&_xeUtils.default.isFunction(o.tableCellFormatMethod||o.cellFormatMethod)||(0,_log.errLog)("vxe.error.notFormats",[f]):!_xeUtils.default.isArray(f)||(r=formats.get(f[0])||_xeUtils.default[f[0]])&&_xeUtils.default.isFunction(r.tableCellFormatMethod||r.cellFormatMethod)||(0,_log.errLog)("vxe.error.notFormats",[f[0]])),Object.assign(this,{type:t.type,property:t.field,field:t.field,title:t.title,width:t.width,minWidth:t.minWidth,maxWidth:t.maxWidth,resizable:t.resizable,fixed:t.fixed,align:t.align,headerAlign:t.headerAlign,footerAlign:t.footerAlign,showOverflow:t.showOverflow,showHeaderOverflow:t.showHeaderOverflow,showFooterOverflow:t.showFooterOverflow,className:t.className,headerClassName:t.headerClassName,footerClassName:t.footerClassName,formatter:f,footerFormatter:t.footerFormatter,sortable:t.sortable,sortBy:t.sortBy,sortType:t.sortType,sortMethod:t.sortMethod,remoteSort:t.remoteSort,filters:(0,_util.toFilters)(t.filters),filterMultiple:!_xeUtils.default.isBoolean(t.filterMultiple)||t.filterMultiple,filterMethod:t.filterMethod,filterResetMethod:t.filterResetMethod,filterRecoverMethod:t.filterRecoverMethod,filterRender:t.filterRender,treeNode:t.treeNode,cellType:t.cellType,cellRender:t.cellRender,editRender:t.editRender,contentRender:t.contentRender,headerExportMethod:t.headerExportMethod,exportMethod:t.exportMethod,footerExportMethod:t.footerExportMethod,titleHelp:t.titleHelp,titlePrefix:t.titlePrefix,titleSuffix:t.titleSuffix,params:t.params,id:t.colId||_xeUtils.default.uniqueId("col_"),parentId:null,visible:u,halfVisible:!1,defaultVisible:u,defaultFixed:t.fixed,checked:!1,halfChecked:!1,disabled:!1,level:1,rowSpan:1,colSpan:1,order:null,sortTime:0,sortNumber:0,renderSortNumber:0,renderFixed:"",renderVisible:!1,renderWidth:0,renderHeight:0,renderResizeWidth:0,renderAutoWidth:0,resizeWidth:0,renderLeft:0,renderArgs:[],model:{},renderHeader:i||t.renderHeader,renderCell:n||t.renderCell,renderFooter:d||t.renderFooter,renderData:l,slots:t.slots}),a&&a.beforeColumn&&a.beforeColumn({$grid:s,column:this})},[{key:"getTitle",value:function(){return(0,_utils.getFuncText)(this.title||("seq"===this.type?getI18n("vxe.table.seqTitle"):""))}},{key:"getKey",value:function(){var e=this.type;return this.field||(e?"type=".concat(e):null)}},{key:"update",value:function(e,r){"filters"!==e&&("field"===e&&(this.property=r),this[e]=r)}}]))();

package/lib/table/src/methods.js

@@ -127,11 +127,12 @@ function computeVirtualX(_vm) {
 }
 function computeVirtualY(_vm) {
   var $refs = _vm.$refs,
-    vSize = _vm.vSize,
+    computeSize = _vm.computeSize,
     rowHeightMaps = _vm.rowHeightMaps;
   var tableHeader = $refs.tableHeader,
     tableBody = $refs.tableBody;
   var tableBodyElem = tableBody ? tableBody.$el : null;
+  var vSize = computeSize;
   if (tableBodyElem) {
     var tableHeaderElem = tableHeader ? tableHeader.$el : null;
     var rowHeight = 0;
@@ -458,7 +459,7 @@ var Methods = {
     if (treeConfig) {
       // 树结构自动转换
       if (treeOpts.transform) {
-        if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+        if (process.env.NODE_ENV === 'development') {
           if (!treeOpts.rowField) {
             (0, _log.errLog)('vxe.error.reqProp', ['table.tree-config.rowField']);
           }
@@ -512,7 +513,7 @@ var Methods = {
     if (keepSource) {
       this.cacheSourceMap(fullData);
     }
-    if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+    if (process.env.NODE_ENV === 'development') {
       if (sYLoad) {
         if (!(this.height || this.maxHeight)) {
           (0, _log.errLog)('vxe.error.reqProp', ['table.height | table.max-height | table.scroll-y={enabled: false}']);
@@ -650,7 +651,7 @@ var Methods = {
       }
       this.tableData = tableData.slice(0);
     } else {
-      if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+      if (process.env.NODE_ENV === 'development') {
         (0, _log.warnLog)('vxe.error.reqProp', ['keep-source']);
       }
     }
@@ -707,7 +708,7 @@ var Methods = {
       _this9.clearMergeCells();
       _this9.clearMergeFooterItems();
       _this9.handleTableData(true);
-      if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+      if (process.env.NODE_ENV === 'development') {
         if ((_this9.scrollXLoad || _this9.scrollYLoad) && _this9.expandColumn) {
           (0, _log.warnLog)('vxe.error.scrollErrProp', ['column.type=expand']);
         }
@@ -913,7 +914,7 @@ var Methods = {
         parent: parent
       };
       if (field) {
-        if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+        if (process.env.NODE_ENV === 'development') {
           if (fullColumnFieldData[field]) {
             (0, _log.warnLog)('vxe.error.colRepet', ['field', field]);
           }
@@ -927,7 +928,7 @@ var Methods = {
         htmlColumn = column;
       }
       if (treeNode) {
-        if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+        if (process.env.NODE_ENV === 'development') {
           if (treeNodeColumn) {
             (0, _log.warnLog)('vxe.error.colRepet', ['tree-node', treeNode]);
           }
@@ -936,7 +937,7 @@ var Methods = {
           treeNodeColumn = column;
         }
       } else if (type === 'expand') {
-        if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+        if (process.env.NODE_ENV === 'development') {
           if (expandColumn) {
             (0, _log.warnLog)('vxe.error.colRepet', ['type', type]);
           }
@@ -945,7 +946,7 @@ var Methods = {
           expandColumn = column;
         }
       }
-      if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+      if (process.env.NODE_ENV === 'development') {
         if (type === 'checkbox') {
           if (checkboxColumn) {
             (0, _log.warnLog)('vxe.error.colRepet', ['type', type]);
@@ -962,7 +963,7 @@ var Methods = {
           }
         }
       }
-      if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+      if (process.env.NODE_ENV === 'development') {
         if (_this13.showOverflow && column.showOverflow === false) {
           (0, _log.warnLog)('vxe.error.errConflicts', ["table.show-overflow=".concat(_this13.showOverflow), "column.show-overflow=".concat(column.showOverflow)]);
         }
@@ -973,7 +974,7 @@ var Methods = {
           (0, _log.warnLog)('vxe.error.errConflicts', ["table.show-footer-overflow=".concat(_this13.showFooterOverflow), "column.show-footer-overflow=".concat(column.showFooterOverflow)]);
         }
       }
-      if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+      if (process.env.NODE_ENV === 'development') {
         if (htmlColumn) {
           if (!columnOpts.useKey) {
             (0, _log.errLog)('vxe.error.reqProp', ['column-config.useKey', 'column.type=html']);
@@ -1001,7 +1002,7 @@ var Methods = {
     } else {
       tableFullColumn.forEach(handleFunc);
     }
-    if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+    if (process.env.NODE_ENV === 'development') {
       if (expandColumn && this.mouseOpts.area) {
         (0, _log.errLog)('vxe.error.errConflicts', ['mouse-config.area', 'column.type=expand']);
       }
@@ -1084,7 +1085,7 @@ var Methods = {
   },
   // 在 v3 中废弃
   _getRowIndex: function _getRowIndex(row) {
-    if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+    if (process.env.NODE_ENV === 'development') {
       (0, _log.warnLog)('vxe.error.delFunc', ['_getRowIndex', 'getVTRowIndex']);
     }
     return this.getVTRowIndex(row);
@@ -1098,7 +1099,7 @@ var Methods = {
   },
   // 在 v3 中废弃
   $getRowIndex: function $getRowIndex(row) {
-    if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+    if (process.env.NODE_ENV === 'development') {
       (0, _log.warnLog)('vxe.error.delFunc', ['$getRowIndex', 'getVMRowIndex']);
     }
     return this.getVMRowIndex(row);
@@ -1119,7 +1120,7 @@ var Methods = {
   },
   // 在 v3 中废弃
   _getColumnIndex: function _getColumnIndex(column) {
-    if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+    if (process.env.NODE_ENV === 'development') {
       (0, _log.warnLog)('vxe.error.delFunc', ['_getColumnIndex', 'getVTColumnIndex']);
     }
     return this.getVTColumnIndex(column);
@@ -1133,7 +1134,7 @@ var Methods = {
   },
   // 在 v3 中废弃
   $getColumnIndex: function $getColumnIndex(column) {
-    if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+    if (process.env.NODE_ENV === 'development') {
       (0, _log.warnLog)('vxe.error.delFunc', ['$getColumnIndex', 'getVMColumnIndex']);
     }
     return this.getVMColumnIndex(column);
@@ -1234,7 +1235,7 @@ var Methods = {
       tableSourceData = this.tableSourceData,
       treeConfig = this.treeConfig;
     if (!keepSource) {
-      if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+      if (process.env.NODE_ENV === 'development') {
         (0, _log.warnLog)('vxe.error.reqProp', ['keep-source']);
       }
       return this.$nextTick();
@@ -1352,10 +1353,12 @@ var Methods = {
       };
       if (_xeUtils.default.isString(formatter)) {
         var gFormatOpts = formats.get(formatter);
-        cellLabel = gFormatOpts && gFormatOpts.cellFormatMethod ? gFormatOpts.cellFormatMethod(formatParams) : '';
+        var tcFormatMethod = gFormatOpts ? gFormatOpts.tableCellFormatMethod || gFormatOpts.cellFormatMethod : null;
+        cellLabel = tcFormatMethod ? tcFormatMethod(formatParams) : '';
       } else if (_xeUtils.default.isArray(formatter)) {
         var _gFormatOpts = formats.get(formatter[0]);
-        cellLabel = _gFormatOpts && _gFormatOpts.cellFormatMethod ? _gFormatOpts.cellFormatMethod.apply(_gFormatOpts, [formatParams].concat(_toConsumableArray(formatter.slice(1)))) : '';
+        var _tcFormatMethod = _gFormatOpts ? _gFormatOpts.tableCellFormatMethod || _gFormatOpts.cellFormatMethod : null;
+        cellLabel = _tcFormatMethod ? _tcFormatMethod.apply(void 0, [formatParams].concat(_toConsumableArray(formatter.slice(1)))) : '';
       } else {
         cellLabel = formatter(formatParams);
       }
@@ -1618,8 +1621,8 @@ var Methods = {
               filterRender = column.filterRender,
               field = column.field;
             var compConf = (0, _utils.isEnableConf)(filterRender) ? renderer.get(filterRender.name) : null;
-            var compFilterMethod = compConf && compConf.renderFilter ? compConf.tableFilterMethod || compConf.filterMethod : null;
-            var defaultFilterMethod = compConf ? compConf.tableFilterDefaultMethod || compConf.defaultTableFilterMethod || compConf.defaultFilterMethod : null;
+            var compFilterMethod = compConf ? compConf.tableFilterMethod || compConf.filterMethod : null;
+            var tdFilterMethod = compConf ? compConf.tableFilterDefaultMethod || compConf.defaultTableFilterMethod || compConf.defaultFilterMethod : null;
             var cellValue = (0, _util.getCellValue)(row, column);
             if (filterMethod) {
               return itemList.some(function (item) {
@@ -1651,9 +1654,9 @@ var Methods = {
                 row: row,
                 column: column
               });
-            } else if (defaultFilterMethod) {
+            } else if (tdFilterMethod) {
               return itemList.some(function (item) {
-                return defaultFilterMethod({
+                return tdFilterMethod({
                   value: item.value,
                   option: item,
                   cellValue: cellValue,
@@ -2347,7 +2350,7 @@ var Methods = {
       rightList: rightList
     });
     if (scrollXLoad) {
-      if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+      if (process.env.NODE_ENV === 'development') {
         // if (this.showHeader && !this.showHeaderOverflow) {
         //   warnLog('vxe.error.reqProp', ['show-header-overflow'])
         // }
@@ -2518,10 +2521,20 @@ var Methods = {
             paddingSize = Math.floor(_xeUtils.default.toNumber(cellStyle.paddingLeft) + _xeUtils.default.toNumber(cellStyle.paddingRight)) + 2;
           }
           var colWidth = column.renderAutoWidth - paddingSize;
-          _xeUtils.default.arrayEach(cellElList, function (cellEl) {
-            var labelEl = cellEl.firstChild;
-            if (labelEl) {
-              colWidth = Math.max(colWidth, Math.ceil(labelEl.offsetWidth) + 4);
+          _xeUtils.default.arrayEach(cellElList, function (itemEl) {
+            var cellEl = itemEl;
+            var thElem = cellEl.parentNode;
+            var titleWidth = 0;
+            if ("".concat(thElem.tagName).toLowerCase() === 'th') {
+              _xeUtils.default.arrayEach(cellEl.children, function (btnEl) {
+                titleWidth += btnEl.offsetWidth + 1;
+              });
+            } else {
+              var labelEl = cellEl.firstChild;
+              titleWidth = labelEl.offsetWidth;
+            }
+            if (titleWidth) {
+              colWidth = Math.max(colWidth, Math.ceil(titleWidth) + 4);
             }
           });
           column.renderAutoWidth = colWidth + paddingSize;
@@ -2987,7 +3000,7 @@ var Methods = {
     // 兼容老版本
     if (!evntList.length && type === 'event.clearEdit') {
       evntList = interceptor.get('event.clearActived');
-      if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+      if (process.env.NODE_ENV === 'development') {
         if (evntList.length) {
           (0, _log.warnLog)('vxe.error.delEvent', ['event.clearActived', 'event.clearEdit']);
         }
@@ -3450,12 +3463,6 @@ var Methods = {
                 (0, _util.setCellValue)(selected.row, selected.column, null);
                 _this31.handleEdit(selected.args, evnt);
               }
-              var afterEditMethod = editOpts.afterEditMethod;
-              if (afterEditMethod) {
-                _this31.$nextTick(function () {
-                  afterEditMethod(_params5);
-                });
-              }
             }
           }
         }
@@ -5125,7 +5132,7 @@ var Methods = {
   },
   // 在 v3 中废弃
   getSortColumn: function getSortColumn() {
-    if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+    if (process.env.NODE_ENV === 'development') {
       (0, _log.warnLog)('vxe.error.delFunc', ['getSortColumn', 'getSortColumns']);
     }
     return _xeUtils.default.find(this.tableFullColumn, function (column) {
@@ -5247,7 +5254,7 @@ var Methods = {
     return this.$nextTick();
   },
   reloadExpandContent: function reloadExpandContent(row) {
-    if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+    if (process.env.NODE_ENV === 'development') {
       (0, _log.warnLog)('vxe.error.delFunc', ['reloadExpandContent', 'reloadRowExpand']);
     }
     // 即将废弃
@@ -5454,7 +5461,7 @@ var Methods = {
     return !!rowExpandedMaps[rowid];
   },
   isExpandByRow: function isExpandByRow(row) {
-    if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+    if (process.env.NODE_ENV === 'development') {
       (0, _log.warnLog)('vxe.error.delFunc', ['isExpandByRow', 'isRowExpandByRow']);
     }
     // 即将废弃
@@ -5582,7 +5589,7 @@ var Methods = {
     return this.$nextTick();
   },
   reloadTreeChilds: function reloadTreeChilds(row) {
-    if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+    if (process.env.NODE_ENV === 'development') {
       (0, _log.warnLog)('vxe.error.delFunc', ['reloadTreeChilds', 'reloadTreeExpand']);
     }
     // 即将废弃
@@ -6507,7 +6514,7 @@ var Methods = {
 var funcs = 'setFilter,openFilter,clearFilter,getCheckedFilters,updateFilterOptionStatus,closeMenu,setActiveCellArea,getActiveCellArea,getCellAreas,clearCellAreas,copyCellArea,cutCellArea,pasteCellArea,getCopyCellArea,getCopyCellAreas,clearCopyCellArea,setCellAreas,openFNR,openFind,openReplace,closeFNR,getSelectedCell,clearSelected,insert,insertAt,insertNextAt,remove,removeCheckboxRow,removeRadioRow,removeCurrentRow,getRecordset,getInsertRecords,getRemoveRecords,getUpdateRecords,clearEdit,clearActived,getEditRecord,getActiveRecord,isEditByRow,isActiveByRow,setEditRow,setActiveRow,setEditCell,setActiveCell,setSelectCell,clearValidate,fullValidate,validate,openExport,openPrint,getPrintHtml,exportData,openImport,importData,saveFile,readFile,importByFile,print,openCustom,closeCustom'.split(',');
 funcs.forEach(function (name) {
   Methods[name] = function () {
-    if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+    if (process.env.NODE_ENV === 'development') {
       if (!this["_".concat(name)]) {
         if ('openExport,openPrint,exportData,openImport,importData,saveFile,readFile,importByFile,print'.split(',').includes(name)) {
           (0, _log.errLog)('vxe.error.reqModule', ['VxeTableExportModule']);