vxe-table 3.9.21 → 3.10.0-beta.0

package/lib/table/src/body.js

@@ -68,13 +68,13 @@ function renderLine(h, _vm, $xetable, params) {
 function renderColumn(h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, rowIndex, $rowIndex, _rowIndex, column, $columnIndex, columns, items) {
   const {
     $listeners: tableListeners,
+    fullAllDataRowIdData,
     afterFullData,
     tableData,
     height,
     columnKey,
     overflowX,
     sYOpts,
-    scrollXLoad,
     scrollYLoad,
     highlightCurrentRow,
     showOverflow: allColumnOverflow,
@@ -130,12 +130,13 @@ function renderColumn(h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, ro
   const isEdit = (0, _utils.isEnableConf)(editRender);
   let fixedHiddenColumn = fixedType ? column.fixed !== fixedType : column.fixed && overflowX;
   const cellOverflow = _xeUtils.default.isUndefined(showOverflow) || _xeUtils.default.isNull(showOverflow) ? allColumnOverflow : showOverflow;
-  let showEllipsis = cellOverflow === 'ellipsis';
+  const showEllipsis = cellOverflow === 'ellipsis';
   const showTitle = cellOverflow === 'title';
   const showTooltip = cellOverflow === true || cellOverflow === 'tooltip';
-  let hasEllipsis = showTitle || showTooltip || showEllipsis;
+  const hasEllipsis = showTitle || showTooltip || showEllipsis;
   let isDirty;
   const tdOns = {};
+  const rest = fullAllDataRowIdData[rowid];
   const cellAlign = align || (compConf ? compConf.tableCellAlign : '') || allAlign;
   const errorValidItem = validErrorMaps[`${rowid}:${column.id}`];
   const showValidTip = editRules && validOpts.showMessage && (validOpts.message === 'default' ? height || tableData.length > 1 : validOpts.message === 'inline');
@@ -167,10 +168,6 @@ function renderColumn(h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, ro
     data: tableData,
     items
   };
-  // 虚拟滚动不支持动态高度
-  if ((scrollXLoad || scrollYLoad) && !hasEllipsis) {
-    showEllipsis = hasEllipsis = true;
-  }
   // hover 进入事件
   if (showTitle || showTooltip || showAllTip || bindMouseenter || tooltipConfig) {
     tdOns.mouseenter = evnt => {
@@ -327,7 +324,7 @@ function renderColumn(h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, ro
     key: columnKey || columnOpts.useKey ? column.id : $columnIndex,
     attrs,
     style: Object.assign({
-      height: hasEllipsis && (scrollYRHeight || rowHeight) ? `${scrollYRHeight || rowHeight}px` : ''
+      height: hasEllipsis && (scrollYRHeight || rowHeight) ? `${scrollYRHeight || rowHeight}px` : scrollYLoad ? `${rest.height || scrollYRHeight || rowHeight}px` : ''
     }, _xeUtils.default.isFunction(compCellStyle) ? compCellStyle(params) : compCellStyle, _xeUtils.default.isFunction(cellStyle) ? cellStyle(params) : cellStyle),
     on: tdOns
   }, tdVNs);
@@ -491,45 +488,6 @@ function renderRows(h, _vm, $xetable, fixedType, tableData, tableColumn) {
   });
   return rows;
 }
-/**
- * 同步滚动条
- */
-let scrollProcessTimeout;
-function syncBodyScroll(_vm, fixedType, scrollTop, elem1, elem2) {
-  if (elem1 || elem2) {
-    if (elem1) {
-      (0, _util.removeScrollListener)(elem1);
-      elem1.scrollTop = scrollTop;
-    }
-    if (elem2) {
-      (0, _util.removeScrollListener)(elem2);
-      elem2.scrollTop = scrollTop;
-    }
-    clearTimeout(scrollProcessTimeout);
-    scrollProcessTimeout = setTimeout(() => {
-      // const { tableBody, leftBody, rightBody } = _vm.$refs
-      // const bodyElem = tableBody.$el
-      // const leftElem = leftBody ? leftBody.$el : null
-      // const rightElem = rightBody ? rightBody.$el : null
-      (0, _util.restoreScrollListener)(elem1);
-      (0, _util.restoreScrollListener)(elem2);
-      // 检查滚动条是的同步
-      // let targetTop = bodyElem.scrollTop
-      // if (fixedType === 'left') {
-      //   if (leftElem) {
-      //     targetTop = leftElem.scrollTop
-      //   }
-      // } else if (fixedType === 'right') {
-      //   if (rightElem) {
-      //     targetTop = rightElem.scrollTop
-      //   }
-      // }
-      // setScrollTop(bodyElem, targetTop)
-      // setScrollTop(leftElem, targetTop)
-      // setScrollTop(rightElem, targetTop)
-    }, 300);
-  }
-}
 var _default = exports.default = {
   name: 'VxeTableBody',
   props: {
@@ -565,17 +523,9 @@ var _default = exports.default = {
     elemStore[`${prefix}xSpace`] = $refs.xSpace;
     elemStore[`${prefix}ySpace`] = $refs.ySpace;
     elemStore[`${prefix}emptyBlock`] = $refs.emptyBlock;
-    if (this.$el) {
-      this.$el.onscroll = this.scrollEvent;
-      this.$el._onscroll = this.scrollEvent;
-    }
   },
   beforeDestroy() {
     clearTimeout(this.wheelTime);
-    if (this.$el) {
-      this.$el._onscroll = null;
-      this.$el.onscroll = null;
-    }
   },
   destroyed() {
     const {
@@ -663,9 +613,11 @@ var _default = exports.default = {
       attrs: {
         xid: tId
       },
-      on: scrollYLoad && sYOpts.mode === 'wheel' ? {
+      on: Object.assign({
+        scroll: this.scrollEvent
+      }, scrollYLoad && sYOpts.mode === 'wheel' ? {
         wheel: this.wheelEvent
-      } : {}
+      } : null)
     }, [fixedType ? _e() : h('div', {
       class: 'vxe-body--x-space',
       ref: 'xSpace'
@@ -741,89 +693,68 @@ var _default = exports.default = {
     scrollEvent(evnt) {
       const {
         $el: scrollBodyElem,
-        $parent: $xetable,
+        $parent: $xeTable,
         fixedType
       } = this;
       const {
         $refs,
-        elemStore,
-        highlightHoverRow,
-        scrollXLoad,
-        scrollYLoad,
         lastScrollTop,
-        lastScrollLeft,
-        rowOpts
-      } = $xetable;
+        lastScrollLeft
+      } = $xeTable;
       const {
         tableHeader,
         tableBody,
         leftBody,
         rightBody,
-        tableFooter,
-        validTip
+        tableFooter
       } = $refs;
       const headerElem = tableHeader ? tableHeader.$el : null;
       const footerElem = tableFooter ? tableFooter.$el : null;
       const bodyElem = tableBody.$el;
       const leftElem = leftBody ? leftBody.$el : null;
       const rightElem = rightBody ? rightBody.$el : null;
-      const bodyYElem = elemStore['main-body-ySpace'];
-      const bodyXElem = elemStore['main-body-xSpace'];
-      const bodyHeight = scrollYLoad && bodyYElem ? bodyYElem.clientHeight : bodyElem.clientHeight;
-      const bodyWidth = scrollXLoad && bodyXElem ? bodyXElem.clientWidth : bodyElem.clientWidth;
-      let scrollTop = scrollBodyElem.scrollTop;
+      const scrollTop = scrollBodyElem.scrollTop;
       const scrollLeft = bodyElem.scrollLeft;
       const isRollX = scrollLeft !== lastScrollLeft;
       const isRollY = scrollTop !== lastScrollTop;
-      $xetable.lastScrollTop = scrollTop;
-      $xetable.lastScrollLeft = scrollLeft;
-      $xetable.lastScrollTime = Date.now();
-      if (rowOpts.isHover || highlightHoverRow) {
-        $xetable.clearHoverRow();
-      }
-      if (leftElem && fixedType === 'left') {
-        scrollTop = leftElem.scrollTop;
-        syncBodyScroll($xetable, fixedType, scrollTop, bodyElem, rightElem);
-      } else if (rightElem && fixedType === 'right') {
-        scrollTop = rightElem.scrollTop;
-        syncBodyScroll($xetable, fixedType, scrollTop, bodyElem, leftElem);
-      } else {
-        if (isRollX) {
-          if (headerElem) {
-            headerElem.scrollLeft = bodyElem.scrollLeft;
-          }
-          if (footerElem) {
-            footerElem.scrollLeft = bodyElem.scrollLeft;
-          }
-        }
-        if (leftElem || rightElem) {
-          $xetable.checkScrolling();
-          if (isRollY) {
-            syncBodyScroll($xetable, fixedType, scrollTop, leftElem, rightElem);
-          }
+      const xHandleEl = $refs.refScrollXHandleElem;
+      const yHandleEl = $refs.refScrollYHandleElem;
+      if (yHandleEl) {
+        yHandleEl.scrollTop = scrollTop;
+      } else if (isRollY) {
+        $xeTable.lastScrollTop = scrollTop;
+        $xeTable.lastScrollLeft = scrollLeft;
+        if (leftElem && fixedType === 'left') {
+          (0, _dom.setScrollTop)(bodyElem, scrollTop);
+          (0, _dom.setScrollTop)(rightElem, scrollTop);
+        } else if (rightElem && fixedType === 'right') {
+          (0, _dom.setScrollTop)(bodyElem, scrollTop);
+          (0, _dom.setScrollTop)(leftElem, scrollTop);
+        } else {
+          (0, _dom.setScrollTop)(leftElem, scrollTop);
+          (0, _dom.setScrollTop)(rightElem, scrollTop);
         }
+        $xeTable.handleScrollEvent(evnt, isRollY, isRollX, {
+          type: renderType,
+          fixed: fixedType,
+          scrollTop,
+          scrollLeft
+        });
       }
-      if (scrollXLoad && isRollX) {
-        $xetable.triggerScrollXEvent(evnt);
-      }
-      if (scrollYLoad && isRollY) {
-        $xetable.triggerScrollYEvent(evnt);
-      }
-      if (isRollX && validTip && validTip.visible) {
-        validTip.updatePlacement();
+      if (xHandleEl) {
+        xHandleEl.scrollLeft = scrollLeft;
+      } else if (isRollX) {
+        $xeTable.lastScrollTop = scrollTop;
+        $xeTable.lastScrollLeft = scrollLeft;
+        (0, _dom.setScrollLeft)(headerElem, scrollLeft);
+        (0, _dom.setScrollLeft)(footerElem, scrollLeft);
+        $xeTable.handleScrollEvent(evnt, isRollY, isRollX, {
+          type: renderType,
+          fixed: fixedType,
+          scrollTop,
+          scrollLeft
+        });
       }
-      $xetable.emitEvent('scroll', {
-        type: renderType,
-        fixed: fixedType,
-        scrollTop,
-        scrollLeft,
-        scrollHeight: bodyElem.scrollHeight,
-        scrollWidth: bodyElem.scrollWidth,
-        bodyHeight,
-        bodyWidth,
-        isX: isRollX,
-        isY: isRollY
-      }, evnt);
     },
     handleWheel(evnt, isTopWheel, deltaTop, isRollX, isRollY) {
       const {

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

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

package/lib/table/src/footer.js

@@ -9,7 +9,7 @@ var _ui = require("../../ui");
 var _utils = require("../../ui/src/utils");
 var _dom = require("../../ui/src/dom");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-const cellType = 'footer';
+const renderType = 'footer';
 const {
   renderer
 } = _ui.VxeUI;
@@ -173,7 +173,7 @@ var _default = exports.default = {
         _rowIndex,
         $rowIndex,
         fixed: fixedType,
-        type: cellType
+        type: renderType
       };
       return h('tr', {
         class: ['vxe-footer--row', footerRowClassName ? _xeUtils.default.isFunction(footerRowClassName) ? footerRowClassName(rowParams) : footerRowClassName : ''],
@@ -219,7 +219,7 @@ var _default = exports.default = {
           itemIndex,
           items: list,
           fixed: fixedType,
-          type: cellType,
+          type: renderType,
           data: footerTableData
         };
         // 虚拟滚动不支持动态高度
@@ -323,48 +323,39 @@ var _default = exports.default = {
      */
     scrollEvent(evnt) {
       const {
-        $parent: $xetable,
+        $parent: $xeTable,
         fixedType
       } = this;
       const {
-        $refs,
-        scrollXLoad,
-        triggerScrollXEvent,
-        lastScrollLeft
-      } = $xetable;
+        $refs
+      } = $xeTable;
       const {
         tableHeader,
         tableBody,
-        tableFooter,
-        validTip
+        tableFooter
       } = $refs;
       const headerElem = tableHeader ? tableHeader.$el : null;
       const footerElem = tableFooter ? tableFooter.$el : null;
       const bodyElem = tableBody.$el;
       const scrollLeft = footerElem ? footerElem.scrollLeft : 0;
-      const isX = scrollLeft !== lastScrollLeft;
-      $xetable.lastScrollLeft = scrollLeft;
-      $xetable.lastScrollTime = Date.now();
-      if (headerElem) {
-        headerElem.scrollLeft = scrollLeft;
-      }
-      if (bodyElem) {
-        bodyElem.scrollLeft = scrollLeft;
-      }
-      if (scrollXLoad && isX) {
-        triggerScrollXEvent(evnt);
-      }
-      if (isX && validTip && validTip.visible) {
-        validTip.updatePlacement();
+      const xHandleEl = $refs.refScrollXHandleElem;
+      if (xHandleEl) {
+        xHandleEl.scrollLeft = scrollLeft;
+      } else {
+        const isRollX = true;
+        const isRollY = false;
+        const scrollTop = bodyElem.scrollTop;
+        $xeTable.lastScrollLeft = scrollLeft;
+        $xeTable.lastScrollTime = Date.now();
+        (0, _dom.setScrollLeft)(headerElem, scrollLeft);
+        (0, _dom.setScrollLeft)(bodyElem, scrollLeft);
+        $xeTable.handleScrollEvent(evnt, isRollY, isRollX, {
+          type: renderType,
+          fixed: fixedType,
+          scrollTop,
+          scrollLeft
+        });
       }
-      $xetable.emitEvent('scroll', {
-        type: cellType,
-        fixed: fixedType,
-        scrollTop: bodyElem.scrollTop,
-        scrollLeft,
-        isX,
-        isY: false
-      }, evnt);
     }
   }
 };

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

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_ui=require("../../ui"),_utils=require("../../ui/src/utils"),_dom=require("../../ui/src/dom");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let cellType="footer",renderer=_ui.VxeUI.renderer;function mergeFooterMethod(l,t,r){for(let e=0;e<l.length;e++){var{row:o,col:a,rowspan:n,colspan:i}=l[e];if(-1<a&&-1<o&&n&&i){if(o===t&&a===r)return{rowspan:n,colspan:i};if(o<=t&&t<o+n&&a<=r&&r<a+i)return{rowspan:0,colspan:0}}}}var _default=exports.default={name:"VxeTableFooter",props:{footerTableData:Array,tableColumn:Array,fixedColumn:Array,fixedType:String,size:String},mounted(){var{$parent:e,$el:l,$refs:t,fixedType:r}=this,e=e.elemStore,r=`${r||"main"}-footer-`;e[r+"wrapper"]=l,e[r+"table"]=t.table,e[r+"colgroup"]=t.colgroup,e[r+"list"]=t.tfoot,e[r+"xSpace"]=t.xSpace},destroyed(){var{$parent:e,fixedType:l}=this,e=e.elemStore,l=`${l||"main"}-footer-`;e[l+"wrapper"]=null,e[l+"table"]=null,e[l+"colgroup"]=null,e[l+"list"]=null,e[l+"xSpace"]=null},render(y){let{_e:e,$parent:_,fixedType:T,fixedColumn:l,tableColumn:h,footerTableData:$}=this,{$listeners:C,tId:t,footerRowClassName:r,footerCellClassName:S,footerRowStyle:o,footerCellStyle:F,footerAlign:I,mergeFooterList:L,footerSpanMethod:k,align:A,scrollXLoad:E,columnKey:U,columnOpts:O,showFooterOverflow:q,currentColumn:R,overflowX:D,scrollbarWidth:a,tooltipOpts:M,visibleColumn:n,expandColumn:i}=_;return T&&(h=i||!E&&!q||L.length&&k?n:l),y("div",{class:["vxe-table--footer-wrapper",T?`fixed-${T}--wrapper`:"body--wrapper"],attrs:{xid:t},on:{scroll:this.scrollEvent}},[T?e():y("div",{class:"vxe-body--x-space",ref:"xSpace"}),y("table",{class:"vxe-table--footer",attrs:{xid:t,cellspacing:0,cellpadding:0,border:0},ref:"table"},[y("colgroup",{ref:"colgroup"},h.map((e,l)=>y("col",{attrs:{name:e.id},key:l})).concat(a?[y("col",{attrs:{name:"col_gutter"}})]:[])),y("tfoot",{ref:"tfoot"},$.map((v,b)=>{let w=b;var e={$table:_,row:v,_rowIndex:b,$rowIndex:w,fixed:T,type:cellType};return y("tr",{class:["vxe-footer--row",r?_xeUtils.default.isFunction(r)?r(e):r:""],style:o?_xeUtils.default.isFunction(o)?o(e):o:null},h.map((l,e)=>{var{type:t,showFooterOverflow:r,footerAlign:o,align:a,footerClassName:n,editRender:i,cellRender:s}=l,i=i||s,s=i?renderer.get(i.name):null;let c=M.showAll||M.enabled;i=l.children&&l.children.length,i=T?l.fixed!==T&&!i:l.fixed&&D,r=_xeUtils.default.isUndefined(r)||_xeUtils.default.isNull(r)?q:r,o=o||(s?s.tableFooterCellAlign:"")||I||a||(s?s.tableCellAlign:"")||A;let d="ellipsis"===r,u="title"===r,p=!0===r||"tooltip"===r,f=u||p||d;var a={colid:l.id},s={},r=_.getColumnIndex(l),x=_.getVTColumnIndex(l),m=x;let g={$table:_,$grid:_.xegrid,row:v,_rowIndex:b,$rowIndex:w,column:l,columnIndex:r,$columnIndex:e,_columnIndex:x,itemIndex:m,items:v,fixed:T,type:cellType,data:$};if(E&&!f&&(d=f=!0),(u||p||c)&&(s.mouseenter=e=>{u?(0,_dom.updateCellTitle)(e.currentTarget,l):(p||c)&&_.triggerFooterTooltipEvent(e,g)}),(p||c)&&(s.mouseleave=e=>{(p||c)&&_.handleTargetLeaveEvent(e)}),C["footer-cell-click"]&&(s.click=e=>{_.emitEvent("footer-cell-click",Object.assign({cell:e.currentTarget},g),e)}),C["footer-cell-dblclick"]&&(s.dblclick=e=>{_.emitEvent("footer-cell-dblclick",Object.assign({cell:e.currentTarget},g),e)}),L.length){r=mergeFooterMethod(L,b,x);if(r){var{rowspan:m,colspan:x}=r;if(!m||!x)return null;1<m&&(a.rowspan=m),1<x&&(a.colspan=x)}}else if(k){var{rowspan:r=1,colspan:m=1}=k(g)||{};if(!r||!m)return null;1<r&&(a.rowspan=r),1<m&&(a.colspan=m)}return y("td",{class:["vxe-footer--column",l.id,{["col--"+o]:o,["col--"+t]:t,"col--last":e===h.length-1,"fixed--hidden":i,"col--ellipsis":f,"col--current":R===l},(0,_utils.getClass)(n,g),(0,_utils.getClass)(S,g)],attrs:a,style:F?_xeUtils.default.isFunction(F)?F(g):F:null,on:s,key:U||O.useKey?l.id:e},[y("div",{class:["vxe-cell",{"c--title":u,"c--tooltip":p,"c--ellipsis":d}]},l.renderFooter(y,g))])}).concat(a?[y("td",{class:"vxe-footer--gutter col--gutter"})]:[]))}))])])},methods:{scrollEvent(e){var{$parent:l,fixedType:t}=this,{$refs:r,scrollXLoad:o,triggerScrollXEvent:a,lastScrollLeft:n}=l,{tableHeader:r,tableBody:i,tableFooter:s,validTip:c}=r,r=r?r.$el:null,s=s?s.$el:null,i=i.$el,s=s?s.scrollLeft:0,n=s!==n;l.lastScrollLeft=s,l.lastScrollTime=Date.now(),r&&(r.scrollLeft=s),i&&(i.scrollLeft=s),o&&n&&a(e),n&&c&&c.visible&&c.updatePlacement(),l.emitEvent("scroll",{type:cellType,fixed:t,scrollTop:i.scrollTop,scrollLeft:s,isX:n,isY:!1},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"),_dom=require("../../ui/src/dom");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let renderType="footer",renderer=_ui.VxeUI.renderer;function mergeFooterMethod(l,t,r){for(let e=0;e<l.length;e++){var{row:o,col:n,rowspan:a,colspan:i}=l[e];if(-1<n&&-1<o&&a&&i){if(o===t&&n===r)return{rowspan:a,colspan:i};if(o<=t&&t<o+a&&n<=r&&r<n+i)return{rowspan:0,colspan:0}}}}var _default=exports.default={name:"VxeTableFooter",props:{footerTableData:Array,tableColumn:Array,fixedColumn:Array,fixedType:String,size:String},mounted(){var{$parent:e,$el:l,$refs:t,fixedType:r}=this,e=e.elemStore,r=`${r||"main"}-footer-`;e[r+"wrapper"]=l,e[r+"table"]=t.table,e[r+"colgroup"]=t.colgroup,e[r+"list"]=t.tfoot,e[r+"xSpace"]=t.xSpace},destroyed(){var{$parent:e,fixedType:l}=this,e=e.elemStore,l=`${l||"main"}-footer-`;e[l+"wrapper"]=null,e[l+"table"]=null,e[l+"colgroup"]=null,e[l+"list"]=null,e[l+"xSpace"]=null},render(y){let{_e:e,$parent:_,fixedType:h,fixedColumn:l,tableColumn:T,footerTableData:$}=this,{$listeners:C,tId:t,footerRowClassName:r,footerCellClassName:S,footerRowStyle:o,footerCellStyle:F,footerAlign:I,mergeFooterList:L,footerSpanMethod:k,align:A,scrollXLoad:E,columnKey:U,columnOpts:O,showFooterOverflow:q,currentColumn:R,overflowX:D,scrollbarWidth:n,tooltipOpts:M,visibleColumn:a,expandColumn:i}=_;return h&&(T=i||!E&&!q||L.length&&k?a:l),y("div",{class:["vxe-table--footer-wrapper",h?`fixed-${h}--wrapper`:"body--wrapper"],attrs:{xid:t},on:{scroll:this.scrollEvent}},[h?e():y("div",{class:"vxe-body--x-space",ref:"xSpace"}),y("table",{class:"vxe-table--footer",attrs:{xid:t,cellspacing:0,cellpadding:0,border:0},ref:"table"},[y("colgroup",{ref:"colgroup"},T.map((e,l)=>y("col",{attrs:{name:e.id},key:l})).concat(n?[y("col",{attrs:{name:"col_gutter"}})]:[])),y("tfoot",{ref:"tfoot"},$.map((v,b)=>{let w=b;var e={$table:_,row:v,_rowIndex:b,$rowIndex:w,fixed:h,type:renderType};return y("tr",{class:["vxe-footer--row",r?_xeUtils.default.isFunction(r)?r(e):r:""],style:o?_xeUtils.default.isFunction(o)?o(e):o:null},T.map((l,e)=>{var{type:t,showFooterOverflow:r,footerAlign:o,align:n,footerClassName:a,editRender:i,cellRender:s}=l,i=i||s,s=i?renderer.get(i.name):null;let c=M.showAll||M.enabled;i=l.children&&l.children.length,i=h?l.fixed!==h&&!i:l.fixed&&D,r=_xeUtils.default.isUndefined(r)||_xeUtils.default.isNull(r)?q:r,o=o||(s?s.tableFooterCellAlign:"")||I||n||(s?s.tableCellAlign:"")||A;let d="ellipsis"===r,u="title"===r,f=!0===r||"tooltip"===r,p=u||f||d;var n={colid:l.id},s={},r=_.getColumnIndex(l),x=_.getVTColumnIndex(l),m=x;let g={$table:_,$grid:_.xegrid,row:v,_rowIndex:b,$rowIndex:w,column:l,columnIndex:r,$columnIndex:e,_columnIndex:x,itemIndex:m,items:v,fixed:h,type:renderType,data:$};if(E&&!p&&(d=p=!0),(u||f||c)&&(s.mouseenter=e=>{u?(0,_dom.updateCellTitle)(e.currentTarget,l):(f||c)&&_.triggerFooterTooltipEvent(e,g)}),(f||c)&&(s.mouseleave=e=>{(f||c)&&_.handleTargetLeaveEvent(e)}),C["footer-cell-click"]&&(s.click=e=>{_.emitEvent("footer-cell-click",Object.assign({cell:e.currentTarget},g),e)}),C["footer-cell-dblclick"]&&(s.dblclick=e=>{_.emitEvent("footer-cell-dblclick",Object.assign({cell:e.currentTarget},g),e)}),L.length){r=mergeFooterMethod(L,b,x);if(r){var{rowspan:m,colspan:x}=r;if(!m||!x)return null;1<m&&(n.rowspan=m),1<x&&(n.colspan=x)}}else if(k){var{rowspan:r=1,colspan:m=1}=k(g)||{};if(!r||!m)return null;1<r&&(n.rowspan=r),1<m&&(n.colspan=m)}return y("td",{class:["vxe-footer--column",l.id,{["col--"+o]:o,["col--"+t]:t,"col--last":e===T.length-1,"fixed--hidden":i,"col--ellipsis":p,"col--current":R===l},(0,_utils.getClass)(a,g),(0,_utils.getClass)(S,g)],attrs:n,style:F?_xeUtils.default.isFunction(F)?F(g):F:null,on:s,key:U||O.useKey?l.id:e},[y("div",{class:["vxe-cell",{"c--title":u,"c--tooltip":f,"c--ellipsis":d}]},l.renderFooter(y,g))])}).concat(n?[y("td",{class:"vxe-footer--gutter col--gutter"})]:[]))}))])])},methods:{scrollEvent(e){var{$parent:l,fixedType:t}=this,r=l.$refs,{tableHeader:o,tableBody:n,tableFooter:a}=r,o=o?o.$el:null,a=a?a.$el:null,n=n.$el,a=a?a.scrollLeft:0,r=r.refScrollXHandleElem;r?r.scrollLeft=a:(r=n.scrollTop,l.lastScrollLeft=a,l.lastScrollTime=Date.now(),(0,_dom.setScrollLeft)(o,a),(0,_dom.setScrollLeft)(n,a),l.handleScrollEvent(e,!1,!0,{type:renderType,fixed:t,scrollTop:r,scrollLeft:a}))}}};