vxe-table 4.4.4 → 4.4.6-beta.0

package/lib/table/src/body.js

@@ -62,8 +62,7 @@ var _default = (0, _vue.defineComponent)({
       refTableBody = _a.refTableBody,
       refTableFooter = _a.refTableFooter,
       refTableLeftBody = _a.refTableLeftBody,
-      refTableRightBody = _a.refTableRightBody,
-      refValidTooltip = _a.refValidTooltip;
+      refTableRightBody = _a.refTableRightBody;
     var _b = $xetable.getComputeMaps(),
       computeEditOpts = _b.computeEditOpts,
       computeMouseOpts = _b.computeMouseOpts,
@@ -162,7 +161,6 @@ var _default = (0, _vue.defineComponent)({
     var renderColumn = function (seq, rowid, fixedType, rowLevel, row, rowIndex, $rowIndex, _rowIndex, column, $columnIndex, columns, items) {
       var _a;
       var columnKey = tableProps.columnKey,
-        height = tableProps.height,
         allColumnOverflow = tableProps.showOverflow,
         allCellClassName = tableProps.cellClassName,
         cellStyle = tableProps.cellStyle,
@@ -216,7 +214,7 @@ var _default = (0, _vue.defineComponent)({
       var tdOns = {};
       var cellAlign = align || allAlign;
       var hasValidError = validStore.row === row && validStore.column === column;
-      var showValidTip = editRules && validOpts.showMessage && (validOpts.message === 'default' ? height || tableData.length > 1 : validOpts.message === 'inline');
+      var showValidTip = editRules && validOpts.showMessage;
       var attrs = {
         colid: column.id
       };
@@ -590,7 +588,6 @@ var _default = (0, _vue.defineComponent)({
       var tableFooter = refTableFooter.value;
       var leftBody = refTableLeftBody.value;
       var rightBody = refTableRightBody.value;
-      var validTip = refValidTooltip.value;
       var scrollBodyElem = refElem.value;
       var headerElem = tableHeader ? tableHeader.$el : null;
       var footerElem = tableFooter ? tableFooter.$el : null;
@@ -641,9 +638,6 @@ var _default = (0, _vue.defineComponent)({
       if (scrollYLoad && isRollY) {
         $xetable.triggerScrollYEvent(evnt);
       }
-      if (isRollX && validTip && validTip.reactData.visible) {
-        validTip.updatePlacement();
-      }
       $xetable.dispatchEvent('scroll', {
         type: renderType,
         fixed: fixedType,

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

package/lib/table/src/table.js

@@ -324,7 +324,6 @@ var _default = (0, _vue.defineComponent)({
     var refElem = (0, _vue.ref)();
     var refTooltip = (0, _vue.ref)();
     var refCommTooltip = (0, _vue.ref)();
-    var refValidTooltip = (0, _vue.ref)();
     var refTableFilter = (0, _vue.ref)();
     var refTableMenu = (0, _vue.ref)();
     var refTableHeader = (0, _vue.ref)();
@@ -391,12 +390,6 @@ var _default = (0, _vue.defineComponent)({
       var tooltipOpts = computeTooltipOpts.value;
       return __assign(__assign({}, tooltipOpts), tooltipStore.currOpts);
     });
-    var computeValidTipOpts = (0, _vue.computed)(function () {
-      var tooltipOpts = computeTooltipOpts.value;
-      return Object.assign({
-        isArrow: false
-      }, tooltipOpts);
-    });
     var computeEditOpts = (0, _vue.computed)(function () {
       return Object.assign({}, _conf.default.table.editConfig, props.editConfig);
     });
@@ -524,7 +517,6 @@ var _default = (0, _vue.defineComponent)({
     var refMaps = {
       refElem: refElem,
       refTooltip: refTooltip,
-      refValidTooltip: refValidTooltip,
       refTableFilter: refTableFilter,
       refTableMenu: refTableMenu,
       refTableHeader: refTableHeader,
@@ -3456,7 +3448,7 @@ var _default = (0, _vue.defineComponent)({
         return 0;
       },
       /**
-       * 手动重置列的显示隐藏、列宽拖动的状态；
+       * 手动重置列的显示隐藏、列宽拖动的状态、固定列、排序列；
        * 如果为 true 则重置所有状态
        * 如果已关联工具栏，则会同步更新
        */
@@ -3466,12 +3458,16 @@ var _default = (0, _vue.defineComponent)({
         var checkMethod = customOpts.checkMethod;
         var opts = Object.assign({
           visible: true,
-          resizable: options === true
+          resizable: options === true,
+          fixed: options === true
         }, options);
         tableFullColumn.forEach(function (column) {
           if (opts.resizable) {
             column.resizeWidth = 0;
           }
+          if (opts.fixed) {
+            column.fixed = column.defaultFixed;
+          }
           if (!checkMethod || checkMethod({
             column: column
           })) {
@@ -3481,6 +3477,9 @@ var _default = (0, _vue.defineComponent)({
         if (opts.resizable) {
           tablePrivateMethods.saveCustomResizable(true);
         }
+        if (opts.fixed) {
+          tablePrivateMethods.saveCustomFixed();
+        }
         return tablePrivateMethods.handleCustom();
       },
       /**
@@ -4608,7 +4607,6 @@ var _default = (0, _vue.defineComponent)({
       var el = refElem.value;
       var editOpts = computeEditOpts.value;
       var actived = editStore.actived;
-      var $validTooltip = refValidTooltip.value;
       var tableFilter = refTableFilter.value;
       var tableMenu = refTableMenu.value;
       if (tableFilter) {
@@ -4628,9 +4626,7 @@ var _default = (0, _vue.defineComponent)({
           // 如果是激活状态，点击了单元格之外
           var cell = actived.args.cell;
           if (!cell || !(0, _dom.getEventTargetNode)(evnt, cell).flag) {
-            if ($validTooltip && (0, _dom.getEventTargetNode)(evnt, $validTooltip.$el).flag) {
-              // 如果是激活状态，且点击了校验提示框
-            } else if (!internalData._lastCallTime || internalData._lastCallTime + 50 < Date.now()) {
+            if (!internalData._lastCallTime || internalData._lastCallTime + 50 < Date.now()) {
               // 如果是激活状态，点击了单元格之外
               if (!(0, _dom.getEventTargetNode)(evnt, document.body, 'vxe-table--ignore-clear').flag) {
                 // 如果手动调用了激活单元格，避免触发源被移除后导致重复关闭
@@ -6850,7 +6846,6 @@ var _default = (0, _vue.defineComponent)({
       var loading = props.loading,
         stripe = props.stripe,
         showHeader = props.showHeader,
-        height = props.height,
         treeConfig = props.treeConfig,
         mouseConfig = props.mouseConfig,
         showFooter = props.showFooter,
@@ -6881,8 +6876,6 @@ var _default = (0, _vue.defineComponent)({
       var vSize = computeSize.value;
       var tableBorder = computeTableBorder.value;
       var mouseOpts = computeMouseOpts.value;
-      var validOpts = computeValidOpts.value;
-      var validTipOpts = computeValidTipOpts.value;
       var loadingOpts = computeLoadingOpts.value;
       var isMenu = computeIsMenu.value;
       return (0, _vue.h)('div', {
@@ -7011,13 +7004,6 @@ var _default = (0, _vue.defineComponent)({
         isArrow: false,
         enterable: false
       }) : (0, _vue.createCommentVNode)(),
-      /**
-       * 校验提示
-       */
-      hasUseTooltip && props.editRules && validOpts.showMessage && (validOpts.message === 'default' ? !height : validOpts.message === 'tooltip') ? (0, _vue.h)((0, _vue.resolveComponent)('vxe-tooltip'), __assign({
-        ref: refValidTooltip,
-        class: 'vxe-table--valid-error'
-      }, validOpts.message === 'tooltip' || tableData.length === 1 ? validTipOpts : {})) : (0, _vue.createCommentVNode)(),
       /**
        * 工具提示
        */