vxe-table 4.3.13 → 4.4.0-beta.0

package/lib/table/src/body.js

@@ -200,7 +200,8 @@ var _default = (0, _vue.defineComponent)({
       var rowHeight = rowOpts.height;
       var renderOpts = editRender || cellRender;
       var compConf = renderOpts ? _vXETable.VXETable.renderer.get(renderOpts.name) : null;
-      var cellClassName = compConf ? compConf.cellClassName : '';
+      var compCellClassName = compConf ? compConf.cellClassName : '';
+      var compCellStyle = compConf ? compConf.cellStyle : '';
       var showAllTip = tooltipOpts.showAll;
       var columnIndex = $xetable.getColumnIndex(column);
       var _columnIndex = $xetable.getVTColumnIndex(column);
@@ -369,12 +370,12 @@ var _default = (0, _vue.defineComponent)({
         }
       }
       return (0, _vue.h)('td', __assign(__assign(__assign({
-        class: ['vxe-body--column', column.id, (_a = {}, _a["col--".concat(cellAlign)] = cellAlign, _a["col--".concat(type)] = type, _a['col--last'] = $columnIndex === columns.length - 1, _a['col--tree-node'] = treeNode, _a['col--edit'] = isEdit, _a['col--ellipsis'] = hasEllipsis, _a['fixed--hidden'] = fixedHiddenColumn, _a['col--dirty'] = isDirty, _a['col--actived'] = editConfig && isEdit && actived.row === row && (actived.column === column || editOpts.mode === 'row'), _a['col--valid-error'] = hasValidError, _a['col--current'] = currentColumn === column, _a), (0, _dom.getPropClass)(cellClassName, params), (0, _dom.getPropClass)(className, params), (0, _dom.getPropClass)(allCellClassName, params)],
+        class: ['vxe-body--column', column.id, (_a = {}, _a["col--".concat(cellAlign)] = cellAlign, _a["col--".concat(type)] = type, _a['col--last'] = $columnIndex === columns.length - 1, _a['col--tree-node'] = treeNode, _a['col--edit'] = isEdit, _a['col--ellipsis'] = hasEllipsis, _a['fixed--hidden'] = fixedHiddenColumn, _a['col--dirty'] = isDirty, _a['col--actived'] = editConfig && isEdit && actived.row === row && (actived.column === column || editOpts.mode === 'row'), _a['col--valid-error'] = hasValidError, _a['col--current'] = currentColumn === column, _a), (0, _dom.getPropClass)(compCellClassName, params), (0, _dom.getPropClass)(className, params), (0, _dom.getPropClass)(allCellClassName, params)],
         key: columnKey || columnOpts.useKey ? column.id : $columnIndex
       }, attrs), {
         style: Object.assign({
           height: hasEllipsis && (scrollYRHeight || rowHeight) ? "".concat(scrollYRHeight || rowHeight, "px") : ''
-        }, cellStyle ? _xeUtils.default.isFunction(cellStyle) ? cellStyle(params) : cellStyle : null)
+        }, _xeUtils.default.isFunction(compCellStyle) ? compCellStyle(params) : compCellStyle, _xeUtils.default.isFunction(cellStyle) ? cellStyle(params) : cellStyle)
       }), tdOns), tdVNs);
     };
     var renderRows = function (fixedType, tableData, tableColumn) {

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

package/lib/table/src/table.js

@@ -3432,7 +3432,7 @@ var _default = (0, _vue.defineComponent)({
         return new Promise(function (resolve) {
           // 还原滚动条位置
           if (lastScrollLeft || lastScrollTop) {
-            return (0, _util.restoreScrollLocation)($xetable, lastScrollLeft, lastScrollTop).then(resolve).then(function () {
+            return (0, _util.restoreScrollLocation)($xetable, lastScrollLeft, lastScrollTop).then().then(function () {
               // 存在滚动行为未结束情况
               setTimeout(resolve, 30);
             });
@@ -3919,7 +3919,7 @@ var _default = (0, _vue.defineComponent)({
        * 判断指定列是否为筛选状态，如果为空则判断所有列
        * @param {String} fieldOrColumn 字段名
        */
-      isFilter: function (fieldOrColumn) {
+      isActiveFilterByColumn: function (fieldOrColumn) {
         var column = (0, _util.handleFieldOrColumn)($xetable, fieldOrColumn);
         if (column) {
           return column.filters && column.filters.some(function (option) {
@@ -3928,6 +3928,9 @@ var _default = (0, _vue.defineComponent)({
         }
         return $xetable.getCheckedFilters().length > 0;
       },
+      isFilter: function (fieldOrColumn) {
+        return tableMethods.isActiveFilterByColumn(fieldOrColumn);
+      },
       /**
        * 判断展开行是否懒加载完成
        * @param {Row} row 行对象
@@ -5650,7 +5653,7 @@ var _default = (0, _vue.defineComponent)({
         var column = params.column;
         var tooltipStore = reactData.tooltipStore;
         var cell = evnt.currentTarget;
-        handleTargetEnterEvent(tooltipStore.column !== column || tooltipStore.row);
+        handleTargetEnterEvent(tooltipStore.column !== column || !!tooltipStore.row);
         if (tooltipStore.column !== column || !tooltipStore.visible) {
           handleTooltip(evnt, cell, cell.querySelector('.vxe-cell--item') || cell.children[0], null, params);
         }