vxe-table 3.11.39 → 3.12.0-beta.0

package/lib/table/src/body.js

@@ -474,15 +474,9 @@ function renderRows(h, _vm, $xeTable, fixedType, tableData, tableColumn) {
     }
     // 拖拽行事件
     if (rowOpts.drag && (!treeConfig || transform)) {
-      trOn.dragstart = evnt => {
-        $xeTable.handleRowDragDragstartEvent(evnt);
-      };
-      trOn.dragover = evnt => {
-        $xeTable.handleRowDragDragoverEvent(evnt);
-      };
-      trOn.dragend = evnt => {
-        $xeTable.handleRowDragDragendEvent(evnt);
-      };
+      trOn.dragstart = $xeTable.handleRowDragDragstartEvent;
+      trOn.dragend = $xeTable.handleRowDragDragendEvent;
+      trOn.dragover = $xeTable.handleRowDragDragoverEvent;
     }
     const trClass = ['vxe-body--row', treeConfig ? `row--level-${rowLevel}` : '', {
       'row--stripe': stripe && (_rowIndex + 1) % 2 === 0,
@@ -660,16 +654,21 @@ var _default = exports.default = {
       scrollYLoad,
       isAllOverflow,
       isDragRowMove,
-      expandColumn
+      expandColumn,
+      dragRow,
+      dragCol
     } = tableReactData;
     const {
-      visibleColumn
+      visibleColumn,
+      fullAllDataRowIdData,
+      fullColumnIdData
     } = tableInternalData;
     const rowOpts = $xeTable.computeRowOpts;
     const sYOpts = $xeTable.computeSYOpts;
     const emptyOpts = $xeTable.computeEmptyOpts;
     const mouseOpts = $xeTable.computeMouseOpts;
     const rowDragOpts = $xeTable.computeRowDragOpts;
+    let renderDataList = tableData;
     let renderColumnList = tableColumn;
     if (fixedType) {
       // 如果是使用优化模式
@@ -684,6 +683,52 @@ var _default = exports.default = {
         renderColumnList = visibleColumn;
       }
     }
+    // 行拖拽
+    if (scrollYLoad && dragRow) {
+      if (renderDataList.length > 2) {
+        const dRowRest = fullAllDataRowIdData[(0, _util.getRowid)($xeTable, dragRow)];
+        if (dRowRest) {
+          const drIndex = dRowRest._index;
+          const firstRow = renderDataList[0];
+          const lastRow = renderDataList[renderDataList.length - 1];
+          const firstRowRest = fullAllDataRowIdData[(0, _util.getRowid)($xeTable, firstRow)];
+          const lastRowRest = fullAllDataRowIdData[(0, _util.getRowid)($xeTable, lastRow)];
+          if (firstRowRest && lastRowRest) {
+            const frIndex = firstRowRest._index;
+            const lrIndex = lastRowRest._index;
+            if (drIndex < frIndex) {
+              renderDataList = [dragRow].concat(renderDataList);
+            } else if (drIndex > lrIndex) {
+              renderDataList = renderDataList.concat([dragRow]);
+            }
+          }
+        }
+      }
+    }
+    if (!fixedType) {
+      // 列拖拽
+      if (scrollXLoad && dragCol) {
+        if (renderColumnList.length > 2) {
+          const dCowRest = fullColumnIdData[dragCol.id];
+          if (dCowRest) {
+            const dcIndex = dCowRest._index;
+            const firstCol = renderColumnList[0];
+            const lastCol = renderColumnList[renderColumnList.length - 1];
+            const firstColRest = fullColumnIdData[firstCol.id];
+            const lastColRest = fullColumnIdData[lastCol.id];
+            if (firstColRest && lastColRest) {
+              const fcIndex = firstColRest._index;
+              const lcIndex = lastColRest._index;
+              if (dcIndex < fcIndex) {
+                renderColumnList = [dragCol].concat(renderColumnList);
+              } else if (dcIndex > lcIndex) {
+                renderColumnList = renderColumnList.concat([dragCol]);
+              }
+            }
+          }
+        }
+      }
+    }
     let emptyContent;
     if ($scopedSlots.empty) {
       emptyContent = $scopedSlots.empty.call(this, {
@@ -751,9 +796,9 @@ var _default = exports.default = {
         tag: 'tbody',
         name: `vxe-body--row-list${isDragRowMove ? '' : '-disabled'}`
       }
-    }, renderRows(h, this, $xeTable, fixedType, tableData, renderColumnList)) : h('tbody', {
+    }, renderRows(h, this, $xeTable, fixedType, renderDataList, renderColumnList)) : h('tbody', {
       ref: 'tbody'
-    }, renderRows(h, this, $xeTable, fixedType, tableData, renderColumnList))]), h('div', {
+    }, renderRows(h, this, $xeTable, fixedType, renderDataList, renderColumnList))]), h('div', {
       class: 'vxe-table--checkbox-range'
     }), mouseConfig && mouseOpts.area ? h('div', {
       class: 'vxe-table--cell-area'

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,renderEmptyElement}=_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:a,treeOpts:i,treeConfig:n,fullAllDataRowIdData:d}=t,{slots:s,treeNode:c}=s,d=d[(0,_util.getRowid)(t,o)];let p=0,u=0,g=[];return d&&(p=d.level,u=d._index,g=d.items),s&&s.line?t.callSlot(s.line,r,e):(d=t.eqRow(a[0],o),n&&c&&(i.showLine||i.line)?[e("div",{class:"vxe-tree--line-wrapper"},[e("div",{class:"vxe-tree--line",style:{height:`${d?1:(0,_util.calcTreeLine)(r,g,u)}px`,left:p*i.indent+(p?2-(0,_util.getOffsetSize)(t):0)+16+"px"}})])]:[])}function renderColumn(e,H,l,t,r,o,s,a,i,n,B,d,c,U,q){var{$listeners:p,fullAllDataRowIdData:A,afterFullData:u,tableData:g,height:h,columnKey:F,overflowX:m,sYOpts:v,scrollXLoad:N,scrollYLoad:W,highlightCurrentRow:V,showOverflow:w,isAllOverflow:X,align:z,currentColumn:P,cellClassName:j,cellStyle:K,mergeList:G,spanMethod:J,radioOpts:Q,checkboxOpts:Z,expandOpts:ee,treeOpts:le,tooltipOpts:x,mouseConfig:te,editConfig:y,editOpts:f,editRules:re,validOpts:b,editStore:oe,tooltipConfig:se,rowOpts:S,columnOpts:ae,mouseOpts:ie,areaOpts:T,validErrorMaps:_}=l,ne=l.computeRowDragOpts,de=ne.disabledMethod,T=T.selectCellToRow,{type:ce,cellRender:pe,editRender:C,align:ue,showOverflow:$,className:ge,treeNode:he,slots:me}=d,ve=l.computeCellOpts.verticalAlign,oe=oe.actived,v=v.rHeight,E=S.height,O=C||pe,O=O?renderer.get(O.name):null,we=O?O.tableCellClassName||O.cellClassName:"",xe=O?O.tableCellStyle||O.cellStyle:"";let R=x.showAll||x.enabled;var x=l.getColumnIndex(d),ye=l.getVTColumnIndex(d),fe=(0,_utils.isEnableConf)(C);let D=o?d.fixed!==o:d.fixed&&m;m=_xeUtils.default.isUndefined($)||_xeUtils.default.isNull($)?w:$,$="ellipsis"===m;let M="title"===m,I=!0===m||"tooltip"===m;m=w||M||I||$;let be;var L={},A=A[r],ue=ue||(O?O.tableCellAlign:"")||z,O=_[r+":"+d.id],z=re&&b.showMessage&&("default"===b.message?h||1<g.length:"inline"===b.message),_={colid:d.id};let Se=p["cell-mouseenter"],Te=p["cell-mouseleave"];re=C&&y&&"dblclick"===f.trigger;let Y={$table:l,$grid:l.$xegrid,isEdit:!1,seq:t,rowid:r,row:a,rowIndex:i,$rowIndex:n,_rowIndex:B,column:d,columnIndex:x,$columnIndex:c,_columnIndex:ye,fixed:o,type:renderType,isHidden:D,level:s,visibleData:u,data:g,items:q},k=!1,_e=!1;if((k=S.drag?"row"===ne.trigger||d.dragSort&&"cell"===ne.trigger:k)&&(_e=!(!de||!de(Y))),(M||I||R||Se||se)&&(L.mouseenter=e=>{isVMScrollProcess(l)||(M?(0,_dom.updateCellTitle)(e.currentTarget,d):(I||R)&&l.triggerBodyTooltipEvent(e,Y),Se&&l.emitEvent("cell-mouseenter",Object.assign({cell:e.currentTarget},Y),e))}),(I||R||Te||se)&&(L.mouseleave=e=>{isVMScrollProcess(l)||((I||R)&&l.handleTargetLeaveEvent(e),Te&&l.emitEvent("cell-mouseleave",Object.assign({cell:e.currentTarget},Y),e))}),(k||Z.range||te)&&(L.mousedown=e=>{l.triggerCellMousedownEvent(e,Y)}),(S.isCurrent||V||p["cell-click"]||C&&y||"row"===ee.trigger||"cell"===ee.trigger||"row"===Q.trigger||"radio"===d.type&&"cell"===Q.trigger||"row"===Z.trigger||"checkbox"===d.type&&"cell"===Z.trigger||"row"===le.trigger||d.treeNode&&"cell"===le.trigger)&&(L.click=e=>{l.triggerCellClickEvent(e,Y)}),(re||p["cell-dblclick"])&&(L.dblclick=e=>{l.triggerCellDblclickEvent(e,Y)}),G.length){h=(0,_util.mergeBodyMethod)(G,B,ye);if(h){var{rowspan:t,colspan:r}=h;if(!t||!r)return null;1<t&&(_.rowspan=t),1<r&&(_.colspan=r)}}else if(J){var{rowspan:i=1,colspan:n=1}=J(Y)||{};if(!i||!n)return null;1<i&&(_.rowspan=i),1<n&&(_.colspan=n)}!(D=D&&G&&(1<_.colspan||1<_.rowspan)?!1:D)&&y&&(C||pe)&&(f.showStatus||f.showUpdateStatus)&&(be=l.isUpdateByRow(a,d.field));x=[];D&&w&&X?x.push(e("div",{class:["vxe-cell",{"c--title":M,"c--tooltip":I,"c--ellipsis":$}],style:{maxHeight:m&&(v||E)?`${v||E}px`:""}})):(x.push(...renderLine(e,H,l,Y),e("div",{class:["vxe-cell",{"c--title":M,"c--tooltip":I,"c--ellipsis":$}],style:{maxHeight:m&&(v||E)?`${v||E}px`:""},attrs:{title:M?l.getCellLabel(a,d):null}},d.renderCell(e,Y))),z&&O&&(o=O.rule,s=me?me.valid:null,u=Object.assign(Object.assign(Object.assign({},Y),O),{rule:O}),x.push(e("div",{class:["vxe-cell--valid-error-tip",(0,_utils.getClass)(b.className,O)],style:o&&o.maxWidth?{width:o.maxWidth+"px"}:null},[e("div",{class:"vxe-cell--valid-error-wrapper vxe-cell--valid-error-theme-"+(b.theme||"normal")},[s?l.callSlot(s,u,e):[e("span",{class:"vxe-cell--valid-error-msg"},O.content)]])]))));let Ce="";m&&(v||E)?Ce=`${v||E}px`:!N&&!W||m||(Ce=`${A.height||24}px`),te&&ie.area&&T&&((c||!0!==T)&&T!==d.field||x.push(e("div",{class:"vxe-cell--area-status"})));g=!d.resizeWidth&&("auto"===d.minWidth||"auto"===d.width);return e("td",{class:["vxe-body--column",d.id,{["col--"+ue]:ue,["col--vertical-"+ve]:ve,["col--"+ce]:ce,"col--last":c===U.length-1,"col--tree-node":he,"col--edit":fe,"col--ellipsis":m,"fixed--width":!g,"fixed--hidden":D,"is--drag-cell":k,"is--drag-disabled":_e,"col--dirty":be,"col--active":y&&fe&&oe.row===a&&(oe.column===d||"row"===f.mode),"col--valid-error":!!O,"col--current":P===d},(0,_utils.getClass)(we,Y),(0,_utils.getClass)(ge,Y),(0,_utils.getClass)(j,Y)],key:F||N||W||ae.useKey||S.useKey||ae.drag?d.id:c,attrs:_,style:Object.assign({height:Ce},_xeUtils.default.isFunction(xe)?xe(Y):xe,_xeUtils.default.isFunction(K)?K(Y):K),on:L},x)}function renderRows(v,w,x,y,f,b){let S=x.computeColumnOpts,T=x.computeColumnDragOpts,{stripe:_,rowKey:C,highlightHoverRow:$,rowClassName:E,rowStyle:O,editConfig:R,showOverflow:D,treeConfig:M,treeOpts:I,expandOpts:L,editOpts:Y,treeExpandedMaps:k,scrollXLoad:H,scrollYLoad:B,rowExpandedMaps:U,radioOpts:q,checkboxOpts:A,expandColumn:F,hasFixedColumn:N,fullAllDataRowIdData:W,rowOpts:V,pendingRowMaps:X,isDragColMove:z}=x,{transform:P,seqMode:j}=I,K=I.children||I.childrenField,G=[];return f.forEach((t,r)=>{var e={};let o,s=(o=x.getRowIndex(t),(V.isHover||$)&&(e.mouseenter=e=>{isVMScrollProcess(x)||x.triggerHoverEvent(e,{row:t,rowIndex:o})},e.mouseleave=()=>{isVMScrollProcess(x)||x.clearHoverRow()}),(0,_util.getRowid)(x,t));var l=W[s];let a=0,i=-1,n=0;l&&(a=l.level,i=M&&P&&"increasing"===j?l._index+1:l.seq,n=l._index);var l={$table:x,seq:i,rowid:s,fixed:y,type:renderType,level:a,row:t,rowIndex:o,$rowIndex:r},d=F&&!!U[s];let c=!1,p=[],u=!1;R&&(u=x.isInsertByRow(t)),!M||B||P||(p=t[K],c=p&&p.length&&!!k[s]),!V.drag||M&&!P||(e.dragstart=e=>{x.handleRowDragDragstartEvent(e)},e.dragover=e=>{x.handleRowDragDragoverEvent(e)},e.dragend=e=>{x.handleRowDragDragendEvent(e)});var g,h=["vxe-body--row",M?"row--level-"+a:"",{"row--stripe":_&&(n+1)%2==0,"is--new":u,"is--expand-row":d,"is--expand-tree":c,"row--new":u&&(Y.showStatus||Y.showInsertStatus),"row--radio":q.highlight&&x.selectRadioRow===t,"row--checked":A.highlight&&x.isCheckedByCheckboxRow(t),"row--pending":!!X[s]},E?_xeUtils.default.isFunction(E)?E(l):E:""],m=b.map((e,l)=>renderColumn(v,w,x,i,s,y,a,t,o,r,n,e,l,b,f));G.push(S.drag&&T.animation?v("transition-group",{props:{tag:"tr",name:"vxe-header--col-list"+(z?"":"-disabled")},class:h,attrs:{rowid:s},style:O?_xeUtils.default.isFunction(O)?O(l):O:null,key:C||H||B||V.useKey||V.drag||S.drag||M?s:r,nativeOn:e},m):v("tr",{class:h,attrs:{rowid:s},style:O?_xeUtils.default.isFunction(O)?O(l):O:null,key:C||H||B||V.useKey||V.drag||S.drag||M?s:r,on:e},m)),d&&({height:h,padding:l}=L,m={},d=(h&&(m.height=h+"px"),M&&(m.paddingLeft=a*I.indent+30+"px"),F).showOverflow,d=_xeUtils.default.isUndefined(d)||_xeUtils.default.isNull(d)?D:d,g={$table:x,seq:i,column:F,fixed:y,type:renderType,level:a,row:t,rowIndex:o,$rowIndex:r},G.push(v("tr",{class:["vxe-body--expanded-row",{"is--padding":l}],key:"expand_"+s,style:O?_xeUtils.default.isFunction(O)?O(g):O:null,on:e},[v("td",{class:{"vxe-body--expanded-column":1,"fixed--hidden":y&&!N,"col--ellipsis":d},attrs:{colspan:b.length}},[v("div",{class:{"vxe-body--expanded-cell":1,"is--ellipsis":h},style:m},[F.renderData(v,g)])])]))),c&&G.push(...renderRows(v,w,x,y,p,b))}),G}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 l=this.$parent;var e=l,r=l,o=l,{tId:s,$scopedSlots:a}=l;let{fixedColumn:i,fixedType:n,tableColumn:d}=this;var{showOverflow:c,spanMethod:p,footerSpanMethod:u,mouseConfig:g}=e,{tableData:r,scrollXLoad:h,scrollYLoad:m,isAllOverflow:v,isDragRowMove:w,expandColumn:x}=r,o=o.visibleColumn,y=l.computeRowOpts,f=l.computeSYOpts,b=l.computeEmptyOpts,S=l.computeMouseOpts,T=l.computeRowDragOpts;let _=d;n&&(_=!(h||m||c&&v)||x||p||u?o:i||[]);let C;C=a.empty?a.empty.call(this,{$table:l,$grid:l.xegrid},t):(m=(h=b.name?renderer.get(b.name):null)?h.renderTableEmpty||h.renderTableEmptyView||h.renderEmpty:null)?(0,_vn.getSlotVNs)(m.call(this,t,b,{$table:l})):e.emptyText||getI18n("vxe.table.emptyText");c={scroll:this.scrollEvent};return"wheel"===f.mode&&(c.wheel=this.wheelEvent),t("div",{ref:"refElem",class:["vxe-table--body-wrapper",n?`fixed-${n}--wrapper`:"body--wrapper"],attrs:{xid:s},on:c},[n?renderEmptyElement(l):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:s,cellspacing:0,cellpadding:0,border:0},ref:"table"},[t("colgroup",{ref:"colgroup"},_.map((e,l)=>t("col",{attrs:{name:e.id},key:l}))),y.drag&&T.animation?t("transition-group",{props:{tag:"tbody",name:"vxe-body--row-list"+(w?"":"-disabled")}},renderRows(t,this,l,n,r,_)):t("tbody",{ref:"tbody"},renderRows(t,this,l,n,r,_))]),t("div",{class:"vxe-table--checkbox-range"}),g&&S.area?t("div",{class:"vxe-table--cell-area"},[t("span",{class:"vxe-table--cell-main-area"},S.extension?[t("span",{class:"vxe-table--cell-main-area-btn",on:{mousedown(e){l.triggerCellAreaExtendMousedownEvent&&l.triggerCellAreaExtendMousedownEvent(e,{$table:l,fixed:n,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"})]):renderEmptyElement(l),n?renderEmptyElement(l):t("div",{class:"vxe-table--empty-block",ref:"emptyBlock"},[t("div",{class:"vxe-table--empty-content"},C)])])},methods:{scrollEvent(e){var l,t,r,o,s,a=this.$parent,i=a,n=this.fixedType,{lastScrollTop:d,lastScrollLeft:c,inVirtualScroll:p,inBodyScroll:u,bodyScrollType:g,inFooterScroll:h}=i;p||h||u&&g!==n||({tableHeader:p,tableBody:h,leftBody:u,rightBody:g,tableFooter:l}=a.$refs,o=this.$el,p=p?p.$el:null,l=l?l.$el:null,(h=h?h.$el:null)&&(u=u?u.$el:null,g=g?g.$el:null,t=a.$refs.refScrollXHandleElem,r=a.$refs.refScrollYHandleElem,o=o.scrollTop,c=(s=h.scrollLeft)!==c,d=o!==d,i.inBodyScroll=!0,i.bodyScrollType=n,d&&(u&&"left"===n?((0,_dom.setScrollTop)(h,o),(0,_dom.setScrollTop)(g,o)):g&&"right"===n?((0,_dom.setScrollTop)(h,o),(0,_dom.setScrollTop)(u,o)):((0,_dom.setScrollTop)(u,o),(0,_dom.setScrollTop)(g,o)),(0,_dom.setScrollTop)(r,o),a.triggerScrollYEvent(e)),c&&((0,_dom.setScrollLeft)(t,s),(0,_dom.setScrollLeft)(p,s),(0,_dom.setScrollLeft)(l,s),a.triggerScrollXEvent(e)),a.handleScrollEvent(e,d,c,o,s,{type:renderType,fixed:n})))},handleWheel(i,n,e,d,c){let p=this.$parent;var{$refs:l,elemStore:t,scrollYLoad:r,scrollXLoad:o}=p,{tableBody:l,leftBody:s,rightBody:a}=l;let u=l.$el,g=s?s.$el:null,h=a?a.$el:null;l=this.isPrevWheelTop===n?Math.max(0,this.wheelYSize-this.wheelYTotal):0,s=t["main-body-ySpace"],a=t["main-body-xSpace"];let m=(r&&s?s:u).clientHeight,v=(o&&a?a: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,a;l<t&&(t<(l+=r=Math.max(5,Math.floor(1.5*r)))&&(r-=l-t),{scrollTop:a,clientHeight:o,scrollHeight:s}=u,a=a+r*(n?-1:1),u.scrollTop=a,g&&(g.scrollTop=a),h&&(h.scrollTop=a),(n?a<s-o:0<=a)&&(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:m,bodyWidth:v,isX:d,isY:c},i))});w()},wheelEvent(e){var{deltaY:l,deltaX:t}=e,{$el:r,$parent:o}=this,{$refs:s,highlightHoverRow:a,scrollYLoad:i,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||a)&&o.clearHoverRow(),this.handleWheel(e,p,l,t,d),i)&&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,renderEmptyElement}=_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:a,treeOpts:i,treeConfig:n,fullAllDataRowIdData:d}=t,{slots:s,treeNode:c}=s,d=d[(0,_util.getRowid)(t,o)];let p=0,u=0,g=[];return d&&(p=d.level,u=d._index,g=d.items),s&&s.line?t.callSlot(s.line,r,e):(d=t.eqRow(a[0],o),n&&c&&(i.showLine||i.line)?[e("div",{class:"vxe-tree--line-wrapper"},[e("div",{class:"vxe-tree--line",style:{height:`${d?1:(0,_util.calcTreeLine)(r,g,u)}px`,left:p*i.indent+(p?2-(0,_util.getOffsetSize)(t):0)+16+"px"}})])]:[])}function renderColumn(e,H,l,t,r,o,s,a,i,n,B,d,c,U,q){var{$listeners:p,fullAllDataRowIdData:A,afterFullData:u,tableData:g,height:h,columnKey:F,overflowX:m,sYOpts:v,scrollXLoad:N,scrollYLoad:W,highlightCurrentRow:V,showOverflow:w,isAllOverflow:X,align:z,currentColumn:P,cellClassName:j,cellStyle:K,mergeList:G,spanMethod:J,radioOpts:Q,checkboxOpts:Z,expandOpts:ee,treeOpts:le,tooltipOpts:x,mouseConfig:te,editConfig:y,editOpts:f,editRules:re,validOpts:b,editStore:oe,tooltipConfig:se,rowOpts:S,columnOpts:ae,mouseOpts:ie,areaOpts:T,validErrorMaps:_}=l,ne=l.computeRowDragOpts,de=ne.disabledMethod,T=T.selectCellToRow,{type:ce,cellRender:pe,editRender:C,align:ue,showOverflow:$,className:ge,treeNode:he,slots:me}=d,ve=l.computeCellOpts.verticalAlign,oe=oe.actived,v=v.rHeight,E=S.height,O=C||pe,O=O?renderer.get(O.name):null,we=O?O.tableCellClassName||O.cellClassName:"",xe=O?O.tableCellStyle||O.cellStyle:"";let R=x.showAll||x.enabled;var x=l.getColumnIndex(d),ye=l.getVTColumnIndex(d),fe=(0,_utils.isEnableConf)(C);let D=o?d.fixed!==o:d.fixed&&m;m=_xeUtils.default.isUndefined($)||_xeUtils.default.isNull($)?w:$,$="ellipsis"===m;let I="title"===m,M=!0===m||"tooltip"===m;m=w||I||M||$;let be;var L={},A=A[r],ue=ue||(O?O.tableCellAlign:"")||z,O=_[r+":"+d.id],z=re&&b.showMessage&&("default"===b.message?h||1<g.length:"inline"===b.message),_={colid:d.id};let Se=p["cell-mouseenter"],Te=p["cell-mouseleave"];re=C&&y&&"dblclick"===f.trigger;let Y={$table:l,$grid:l.$xegrid,isEdit:!1,seq:t,rowid:r,row:a,rowIndex:i,$rowIndex:n,_rowIndex:B,column:d,columnIndex:x,$columnIndex:c,_columnIndex:ye,fixed:o,type:renderType,isHidden:D,level:s,visibleData:u,data:g,items:q},k=!1,_e=!1;if((k=S.drag?"row"===ne.trigger||d.dragSort&&"cell"===ne.trigger:k)&&(_e=!(!de||!de(Y))),(I||M||R||Se||se)&&(L.mouseenter=e=>{isVMScrollProcess(l)||(I?(0,_dom.updateCellTitle)(e.currentTarget,d):(M||R)&&l.triggerBodyTooltipEvent(e,Y),Se&&l.emitEvent("cell-mouseenter",Object.assign({cell:e.currentTarget},Y),e))}),(M||R||Te||se)&&(L.mouseleave=e=>{isVMScrollProcess(l)||((M||R)&&l.handleTargetLeaveEvent(e),Te&&l.emitEvent("cell-mouseleave",Object.assign({cell:e.currentTarget},Y),e))}),(k||Z.range||te)&&(L.mousedown=e=>{l.triggerCellMousedownEvent(e,Y)}),(S.isCurrent||V||p["cell-click"]||C&&y||"row"===ee.trigger||"cell"===ee.trigger||"row"===Q.trigger||"radio"===d.type&&"cell"===Q.trigger||"row"===Z.trigger||"checkbox"===d.type&&"cell"===Z.trigger||"row"===le.trigger||d.treeNode&&"cell"===le.trigger)&&(L.click=e=>{l.triggerCellClickEvent(e,Y)}),(re||p["cell-dblclick"])&&(L.dblclick=e=>{l.triggerCellDblclickEvent(e,Y)}),G.length){h=(0,_util.mergeBodyMethod)(G,B,ye);if(h){var{rowspan:t,colspan:r}=h;if(!t||!r)return null;1<t&&(_.rowspan=t),1<r&&(_.colspan=r)}}else if(J){var{rowspan:i=1,colspan:n=1}=J(Y)||{};if(!i||!n)return null;1<i&&(_.rowspan=i),1<n&&(_.colspan=n)}!(D=D&&G&&(1<_.colspan||1<_.rowspan)?!1:D)&&y&&(C||pe)&&(f.showStatus||f.showUpdateStatus)&&(be=l.isUpdateByRow(a,d.field));x=[];D&&w&&X?x.push(e("div",{class:["vxe-cell",{"c--title":I,"c--tooltip":M,"c--ellipsis":$}],style:{maxHeight:m&&(v||E)?`${v||E}px`:""}})):(x.push(...renderLine(e,H,l,Y),e("div",{class:["vxe-cell",{"c--title":I,"c--tooltip":M,"c--ellipsis":$}],style:{maxHeight:m&&(v||E)?`${v||E}px`:""},attrs:{title:I?l.getCellLabel(a,d):null}},d.renderCell(e,Y))),z&&O&&(o=O.rule,s=me?me.valid:null,u=Object.assign(Object.assign(Object.assign({},Y),O),{rule:O}),x.push(e("div",{class:["vxe-cell--valid-error-tip",(0,_utils.getClass)(b.className,O)],style:o&&o.maxWidth?{width:o.maxWidth+"px"}:null},[e("div",{class:"vxe-cell--valid-error-wrapper vxe-cell--valid-error-theme-"+(b.theme||"normal")},[s?l.callSlot(s,u,e):[e("span",{class:"vxe-cell--valid-error-msg"},O.content)]])]))));let Ce="";m&&(v||E)?Ce=`${v||E}px`:!N&&!W||m||(Ce=`${A.height||24}px`),te&&ie.area&&T&&((c||!0!==T)&&T!==d.field||x.push(e("div",{class:"vxe-cell--area-status"})));g=!d.resizeWidth&&("auto"===d.minWidth||"auto"===d.width);return e("td",{class:["vxe-body--column",d.id,{["col--"+ue]:ue,["col--vertical-"+ve]:ve,["col--"+ce]:ce,"col--last":c===U.length-1,"col--tree-node":he,"col--edit":fe,"col--ellipsis":m,"fixed--width":!g,"fixed--hidden":D,"is--drag-cell":k,"is--drag-disabled":_e,"col--dirty":be,"col--active":y&&fe&&oe.row===a&&(oe.column===d||"row"===f.mode),"col--valid-error":!!O,"col--current":P===d},(0,_utils.getClass)(we,Y),(0,_utils.getClass)(ge,Y),(0,_utils.getClass)(j,Y)],key:F||N||W||ae.useKey||S.useKey||ae.drag?d.id:c,attrs:_,style:Object.assign({height:Ce},_xeUtils.default.isFunction(xe)?xe(Y):xe,_xeUtils.default.isFunction(K)?K(Y):K),on:L},x)}function renderRows(v,w,x,y,f,b){let S=x.computeColumnOpts,T=x.computeColumnDragOpts,{stripe:_,rowKey:C,highlightHoverRow:$,rowClassName:E,rowStyle:O,editConfig:R,showOverflow:D,treeConfig:I,treeOpts:M,expandOpts:L,editOpts:Y,treeExpandedMaps:k,scrollXLoad:H,scrollYLoad:B,rowExpandedMaps:U,radioOpts:q,checkboxOpts:A,expandColumn:F,hasFixedColumn:N,fullAllDataRowIdData:W,rowOpts:V,pendingRowMaps:X,isDragColMove:z}=x,{transform:P,seqMode:j}=M,K=M.children||M.childrenField,G=[];return f.forEach((t,r)=>{var e={};let o,s=(o=x.getRowIndex(t),(V.isHover||$)&&(e.mouseenter=e=>{isVMScrollProcess(x)||x.triggerHoverEvent(e,{row:t,rowIndex:o})},e.mouseleave=()=>{isVMScrollProcess(x)||x.clearHoverRow()}),(0,_util.getRowid)(x,t));var l=W[s];let a=0,i=-1,n=0;l&&(a=l.level,i=I&&P&&"increasing"===j?l._index+1:l.seq,n=l._index);var l={$table:x,seq:i,rowid:s,fixed:y,type:renderType,level:a,row:t,rowIndex:o,$rowIndex:r},d=F&&!!U[s];let c=!1,p=[],u=!1;R&&(u=x.isInsertByRow(t)),!I||B||P||(p=t[K],c=p&&p.length&&!!k[s]),!V.drag||I&&!P||(e.dragstart=x.handleRowDragDragstartEvent,e.dragend=x.handleRowDragDragendEvent,e.dragover=x.handleRowDragDragoverEvent);var g,h=["vxe-body--row",I?"row--level-"+a:"",{"row--stripe":_&&(n+1)%2==0,"is--new":u,"is--expand-row":d,"is--expand-tree":c,"row--new":u&&(Y.showStatus||Y.showInsertStatus),"row--radio":q.highlight&&x.selectRadioRow===t,"row--checked":A.highlight&&x.isCheckedByCheckboxRow(t),"row--pending":!!X[s]},E?_xeUtils.default.isFunction(E)?E(l):E:""],m=b.map((e,l)=>renderColumn(v,w,x,i,s,y,a,t,o,r,n,e,l,b,f));G.push(S.drag&&T.animation?v("transition-group",{props:{tag:"tr",name:"vxe-header--col-list"+(z?"":"-disabled")},class:h,attrs:{rowid:s},style:O?_xeUtils.default.isFunction(O)?O(l):O:null,key:C||H||B||V.useKey||V.drag||S.drag||I?s:r,nativeOn:e},m):v("tr",{class:h,attrs:{rowid:s},style:O?_xeUtils.default.isFunction(O)?O(l):O:null,key:C||H||B||V.useKey||V.drag||S.drag||I?s:r,on:e},m)),d&&({height:h,padding:l}=L,m={},d=(h&&(m.height=h+"px"),I&&(m.paddingLeft=a*M.indent+30+"px"),F).showOverflow,d=_xeUtils.default.isUndefined(d)||_xeUtils.default.isNull(d)?D:d,g={$table:x,seq:i,column:F,fixed:y,type:renderType,level:a,row:t,rowIndex:o,$rowIndex:r},G.push(v("tr",{class:["vxe-body--expanded-row",{"is--padding":l}],key:"expand_"+s,style:O?_xeUtils.default.isFunction(O)?O(g):O:null,on:e},[v("td",{class:{"vxe-body--expanded-column":1,"fixed--hidden":y&&!N,"col--ellipsis":d},attrs:{colspan:b.length}},[v("div",{class:{"vxe-body--expanded-cell":1,"is--ellipsis":h},style:m},[F.renderData(v,g)])])]))),c&&G.push(...renderRows(v,w,x,y,p,b))}),G}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 l=this.$parent;var e=l,r=l,o=l,{tId:s,$scopedSlots:a}=l;let{fixedColumn:i,fixedType:n,tableColumn:d}=this;var{showOverflow:c,spanMethod:p,footerSpanMethod:u,mouseConfig:g}=e,{tableData:r,scrollXLoad:h,scrollYLoad:m,isAllOverflow:v,isDragRowMove:w,expandColumn:x,dragRow:y,dragCol:f}=r,{visibleColumn:o,fullAllDataRowIdData:b,fullColumnIdData:S}=o,T=l.computeRowOpts,_=l.computeSYOpts,C=l.computeEmptyOpts,$=l.computeMouseOpts,E=l.computeRowDragOpts;let O=r,R=d;n&&(R=!(h||m||c&&v)||x||p||u?o:i||[]),m&&y&&2<O.length&&(r=b[(0,_util.getRowid)(l,y)])&&(c=r._index,v=O[0],x=O[O.length-1],p=b[(0,_util.getRowid)(l,v)],u=b[(0,_util.getRowid)(l,x)],p)&&u&&(o=p._index,m=u._index,c<o?O=[y].concat(O):m<c&&(O=O.concat([y]))),n||h&&f&&2<R.length&&(r=S[f.id])&&(v=r._index,b=R[0],x=R[R.length-1],p=S[b.id],u=S[x.id],p)&&u&&(o=p._index,m=u._index,v<o?R=[f].concat(R):m<v&&(R=R.concat([f])));let D;D=a.empty?a.empty.call(this,{$table:l,$grid:l.xegrid},t):(y=(c=C.name?renderer.get(C.name):null)?c.renderTableEmpty||c.renderTableEmptyView||c.renderEmpty:null)?(0,_vn.getSlotVNs)(y.call(this,t,C,{$table:l})):e.emptyText||getI18n("vxe.table.emptyText");h={scroll:this.scrollEvent};return"wheel"===_.mode&&(h.wheel=this.wheelEvent),t("div",{ref:"refElem",class:["vxe-table--body-wrapper",n?`fixed-${n}--wrapper`:"body--wrapper"],attrs:{xid:s},on:h},[n?renderEmptyElement(l):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:s,cellspacing:0,cellpadding:0,border:0},ref:"table"},[t("colgroup",{ref:"colgroup"},R.map((e,l)=>t("col",{attrs:{name:e.id},key:l}))),T.drag&&E.animation?t("transition-group",{props:{tag:"tbody",name:"vxe-body--row-list"+(w?"":"-disabled")}},renderRows(t,this,l,n,O,R)):t("tbody",{ref:"tbody"},renderRows(t,this,l,n,O,R))]),t("div",{class:"vxe-table--checkbox-range"}),g&&$.area?t("div",{class:"vxe-table--cell-area"},[t("span",{class:"vxe-table--cell-main-area"},$.extension?[t("span",{class:"vxe-table--cell-main-area-btn",on:{mousedown(e){l.triggerCellAreaExtendMousedownEvent&&l.triggerCellAreaExtendMousedownEvent(e,{$table:l,fixed:n,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"})]):renderEmptyElement(l),n?renderEmptyElement(l):t("div",{class:"vxe-table--empty-block",ref:"emptyBlock"},[t("div",{class:"vxe-table--empty-content"},D)])])},methods:{scrollEvent(e){var l,t,r,o,s,a=this.$parent,i=a,n=this.fixedType,{lastScrollTop:d,lastScrollLeft:c,inVirtualScroll:p,inBodyScroll:u,bodyScrollType:g,inFooterScroll:h}=i;p||h||u&&g!==n||({tableHeader:p,tableBody:h,leftBody:u,rightBody:g,tableFooter:l}=a.$refs,o=this.$el,p=p?p.$el:null,l=l?l.$el:null,(h=h?h.$el:null)&&(u=u?u.$el:null,g=g?g.$el:null,t=a.$refs.refScrollXHandleElem,r=a.$refs.refScrollYHandleElem,o=o.scrollTop,c=(s=h.scrollLeft)!==c,d=o!==d,i.inBodyScroll=!0,i.bodyScrollType=n,d&&(u&&"left"===n?((0,_dom.setScrollTop)(h,o),(0,_dom.setScrollTop)(g,o)):g&&"right"===n?((0,_dom.setScrollTop)(h,o),(0,_dom.setScrollTop)(u,o)):((0,_dom.setScrollTop)(u,o),(0,_dom.setScrollTop)(g,o)),(0,_dom.setScrollTop)(r,o),a.triggerScrollYEvent(e)),c&&((0,_dom.setScrollLeft)(t,s),(0,_dom.setScrollLeft)(p,s),(0,_dom.setScrollLeft)(l,s),a.triggerScrollXEvent(e)),a.handleScrollEvent(e,d,c,o,s,{type:renderType,fixed:n})))},handleWheel(i,n,e,d,c){let p=this.$parent;var{$refs:l,elemStore:t,scrollYLoad:r,scrollXLoad:o}=p,{tableBody:l,leftBody:s,rightBody:a}=l;let u=l.$el,g=s?s.$el:null,h=a?a.$el:null;l=this.isPrevWheelTop===n?Math.max(0,this.wheelYSize-this.wheelYTotal):0,s=t["main-body-ySpace"],a=t["main-body-xSpace"];let m=(r&&s?s:u).clientHeight,v=(o&&a?a: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,a;l<t&&(t<(l+=r=Math.max(5,Math.floor(1.5*r)))&&(r-=l-t),{scrollTop:a,clientHeight:o,scrollHeight:s}=u,a=a+r*(n?-1:1),u.scrollTop=a,g&&(g.scrollTop=a),h&&(h.scrollTop=a),(n?a<s-o:0<=a)&&(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:m,bodyWidth:v,isX:d,isY:c},i))});w()},wheelEvent(e){var{deltaY:l,deltaX:t}=e,{$el:r,$parent:o}=this,{$refs:s,highlightHoverRow:a,scrollYLoad:i,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||a)&&o.clearHoverRow(),this.handleWheel(e,p,l,t,d),i)&&o.triggerScrollYEvent(e))}}};

package/lib/table/src/footer.js

@@ -303,16 +303,20 @@ var _default = exports.default = {
       showFooterOverflow: allColumnFooterOverflow
     } = tableProps;
     const {
-      visibleColumn
+      visibleColumn,
+      fullColumnIdData
     } = tableInternalData;
     const {
-      scrollbarWidth
+      scrollXLoad,
+      scrollYLoad,
+      scrollbarWidth,
+      dragCol
     } = tableReactData;
     let renderColumnList = tableColumn;
     // 如果是使用优化模式
     if (fixedType) {
       // 如果是使用优化模式
-      if (allColumnFooterOverflow) {
+      if (scrollXLoad || scrollYLoad || allColumnFooterOverflow) {
         // 如果不支持优化模式
         if (spanMethod || footerSpanMethod) {
           renderColumnList = visibleColumn;
@@ -323,6 +327,30 @@ var _default = exports.default = {
         renderColumnList = visibleColumn;
       }
     }
+    if (!fixedType) {
+      // 列拖拽
+      if (scrollXLoad && dragCol) {
+        if (renderColumnList.length > 2) {
+          const dCowRest = fullColumnIdData[dragCol.id];
+          if (dCowRest) {
+            const dcIndex = dCowRest._index;
+            const firstCol = renderColumnList[0];
+            const lastCol = renderColumnList[renderColumnList.length - 1];
+            const firstColRest = fullColumnIdData[firstCol.id];
+            const lastColRest = fullColumnIdData[lastCol.id];
+            if (firstColRest && lastColRest) {
+              const fcIndex = firstColRest._index;
+              const lcIndex = lastColRest._index;
+              if (dcIndex < fcIndex) {
+                renderColumnList = [dragCol].concat(renderColumnList);
+              } else if (dcIndex > lcIndex) {
+                renderColumnList = renderColumnList.concat([dragCol]);
+              }
+            }
+          }
+        }
+      }
+    }
     const ons = {};
     if (!fixedType) {
       ons.scroll = this.scrollEvent;

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 renderType="footer",{renderer,renderEmptyElement}=_ui.VxeUI;function mergeFooterMethod(l,t,r){for(let e=0;e<l.length;e++){var{row:o,col:n,rowspan:i,colspan:a}=l[e];if(-1<n&&-1<o&&i&&a){if(o===t&&n===r)return{rowspan:i,colspan:a};if(o<=t&&t<o+i&&n<=r&&r<n+a)return{rowspan:0,colspan:0}}}}function renderRows(v,e,y,w,h,b,_){let{$parent:$,fixedType:T}=e,{$listeners:C,footerCellClassName:S,footerCellStyle:F,footerAlign:E,mergeFooterList:I,footerSpanMethod:k,align:O,scrollXLoad:U,columnKey:R,columnOpts:A,showFooterOverflow:L,currentColumn:M,overflowX:q,scrollYLoad:D,scrollbarWidth:l,tooltipOpts:H}=$;return y.map((l,e)=>{var{type:t,showFooterOverflow:r,footerAlign:o,align:n,footerClassName:i,editRender:a,cellRender:s}=l,a=a||s,s=a?renderer.get(a.name):null;let d=H.showAll||H.enabled;a=l.children&&l.children.length,a=T?l.fixed!==T&&!a:l.fixed&&q,r=_xeUtils.default.isUndefined(r)||_xeUtils.default.isNull(r)?L:r,o=o||(s?s.tableFooterCellAlign:"")||E||n||(s?s.tableCellAlign:"")||O;let c="ellipsis"===r,u="title"===r,p=!0===r||"tooltip"===r,f=u||p||c;var n={colid:l.id},s={},r=$.getColumnIndex(l),m=$.getVTColumnIndex(l),x=m;let g={$table:$,$grid:$.xegrid,row:h,_rowIndex:_,$rowIndex:b,column:l,columnIndex:r,$columnIndex:e,_columnIndex:m,itemIndex:x,items:h,fixed:T,type:renderType,data:w};if(U&&!f&&(c=f=!0),(u||p||d)&&(s.mouseenter=e=>{u?(0,_dom.updateCellTitle)(e.currentTarget,l):(p||d)&&$.triggerFooterTooltipEvent(e,g)}),(p||d)&&(s.mouseleave=e=>{(p||d)&&$.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)}),I.length){r=mergeFooterMethod(I,_,m);if(r){var{rowspan:x,colspan:m}=r;if(!x||!m)return null;1<x&&(n.rowspan=x),1<m&&(n.colspan=m)}}else if(k){var{rowspan:r=1,colspan:x=1}=k(g)||{};if(!r||!x)return null;1<r&&(n.rowspan=r),1<x&&(n.colspan=x)}m=!l.resizeWidth&&("auto"===l.minWidth||"auto"===l.width);return v("td",{class:["vxe-footer--column",l.id,{["col--"+o]:o,["col--"+t]:t,"col--last":e===y.length-1,"fixed--width":!m,"fixed--hidden":a,"col--ellipsis":f,"col--current":M===l},(0,_utils.getClass)(i,g),(0,_utils.getClass)(S,g)],attrs:n,style:F?_xeUtils.default.isFunction(F)?F(g):F:null,on:s,key:R||U||D||A.useKey||A.drag?l.id:e},[v("div",{class:["vxe-cell",{"c--title":u,"c--tooltip":p,"c--ellipsis":c}]},l.renderFooter(v,g))])}).concat(l?[v("td",{key:"gr"+b,class:"vxe-footer--gutter col--gutter"})]:[])}function renderHeads(o,n,i){let a=n.$parent;let s=a.computeColumnOpts,d=a.computeColumnDragOpts,{fixedType:c,footerTableData:u}=n,{footerRowClassName:p,footerRowStyle:f,isDragColMove:m}=a;return u.map((e,l)=>{var t=l,r={$table:a,row:e,_rowIndex:t,$rowIndex:l,fixed:c,type:renderType};return s.drag&&d.animation?o("transition-group",{key:l,props:{tag:"tr",name:"vxe-header--col-list"+(m?"":"-disabled"),class:["vxe-footer--row",p?_xeUtils.default.isFunction(p)?p(r):p:""],style:f?_xeUtils.default.isFunction(f)?f(r):f:null}},renderRows(o,n,i,u,e,l,t)):o("tr",{key:l,class:["vxe-footer--row",p?_xeUtils.default.isFunction(p)?p(r):p:""],style:f?_xeUtils.default.isFunction(f)?f(r):f:null},renderRows(o,n,i,u,e,l,t))})}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(t){var e=this.$parent,l=e.tId,{fixedType:r,fixedColumn:o,tableColumn:n}=this,{spanMethod:i,footerSpanMethod:a,showFooterOverflow:s}=e,d=e.visibleColumn,c=e.scrollbarWidth;let u=n;r&&(u=!s||i||a?d:o||[]);n={};return r||(n.scroll=this.scrollEvent),t("div",{class:["vxe-table--footer-wrapper",r?`fixed-${r}--wrapper`:"body--wrapper"],attrs:{xid:l},on:n},[r?renderEmptyElement(e):t("div",{class:"vxe-body--x-space",ref:"xSpace"}),t("table",{class:"vxe-table--footer",attrs:{xid:l,cellspacing:0,cellpadding:0,border:0},ref:"table"},[t("colgroup",{ref:"colgroup"},u.map((e,l)=>t("col",{attrs:{name:e.id},key:l})).concat(c?[t("col",{attrs:{name:"col_gutter"}})]:[])),t("tfoot",{ref:"tfoot"},renderHeads(t,this,u))])])},methods:{scrollEvent(e){var l,t,r,o,n=this.$parent,i=n,{inVirtualScroll:a,inBodyScroll:s}=i;a||s||(a=this.fixedType,{tableHeader:s,tableBody:l,tableFooter:r}=n.$refs,s=s?s.$el:null,(r=r?r.$el:null)&&(l=l?l.$el:null)&&(t=n.$refs.refScrollXHandleElem,r=r.scrollLeft,o=l.scrollTop,i.inFooterScroll=!0,(0,_dom.setScrollLeft)(t,r),(0,_dom.setScrollLeft)(s,r),(0,_dom.setScrollLeft)(l,r),n.triggerScrollXEvent(e),n.handleScrollEvent(e,!1,!0,o,r,{type:renderType,fixed:a})))}}};
+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,renderEmptyElement}=_ui.VxeUI;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}}}}function renderRows(v,e,y,h,w,b,_){let{$parent:C,fixedType:$}=e,{$listeners:T,footerCellClassName:S,footerCellStyle:F,footerAlign:E,mergeFooterList:I,footerSpanMethod:k,align:L,scrollXLoad:O,columnKey:U,columnOpts:R,showFooterOverflow:A,currentColumn:M,overflowX:D,scrollYLoad:q,scrollbarWidth:l,tooltipOpts:X}=C;return y.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 d=X.showAll||X.enabled;i=l.children&&l.children.length,i=$?l.fixed!==$&&!i:l.fixed&&D,r=_xeUtils.default.isUndefined(r)||_xeUtils.default.isNull(r)?A:r,o=o||(s?s.tableFooterCellAlign:"")||E||n||(s?s.tableCellAlign:"")||L;let c="ellipsis"===r,u="title"===r,p=!0===r||"tooltip"===r,f=u||p||c;var n={colid:l.id},s={},r=C.getColumnIndex(l),x=C.getVTColumnIndex(l),m=x;let g={$table:C,$grid:C.xegrid,row:w,_rowIndex:_,$rowIndex:b,column:l,columnIndex:r,$columnIndex:e,_columnIndex:x,itemIndex:m,items:w,fixed:$,type:renderType,data:h};if(O&&!f&&(c=f=!0),(u||p||d)&&(s.mouseenter=e=>{u?(0,_dom.updateCellTitle)(e.currentTarget,l):(p||d)&&C.triggerFooterTooltipEvent(e,g)}),(p||d)&&(s.mouseleave=e=>{(p||d)&&C.handleTargetLeaveEvent(e)}),T["footer-cell-click"]&&(s.click=e=>{C.emitEvent("footer-cell-click",Object.assign({cell:e.currentTarget},g),e)}),T["footer-cell-dblclick"]&&(s.dblclick=e=>{C.emitEvent("footer-cell-dblclick",Object.assign({cell:e.currentTarget},g),e)}),I.length){r=mergeFooterMethod(I,_,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)}x=!l.resizeWidth&&("auto"===l.minWidth||"auto"===l.width);return v("td",{class:["vxe-footer--column",l.id,{["col--"+o]:o,["col--"+t]:t,"col--last":e===y.length-1,"fixed--width":!x,"fixed--hidden":i,"col--ellipsis":f,"col--current":M===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||q||R.useKey||R.drag?l.id:e},[v("div",{class:["vxe-cell",{"c--title":u,"c--tooltip":p,"c--ellipsis":c}]},l.renderFooter(v,g))])}).concat(l?[v("td",{key:"gr"+b,class:"vxe-footer--gutter col--gutter"})]:[])}function renderHeads(o,n,a){let i=n.$parent;let s=i.computeColumnOpts,d=i.computeColumnDragOpts,{fixedType:c,footerTableData:u}=n,{footerRowClassName:p,footerRowStyle:f,isDragColMove:x}=i;return u.map((e,l)=>{var t=l,r={$table:i,row:e,_rowIndex:t,$rowIndex:l,fixed:c,type:renderType};return s.drag&&d.animation?o("transition-group",{key:l,props:{tag:"tr",name:"vxe-header--col-list"+(x?"":"-disabled"),class:["vxe-footer--row",p?_xeUtils.default.isFunction(p)?p(r):p:""],style:f?_xeUtils.default.isFunction(f)?f(r):f:null}},renderRows(o,n,a,u,e,l,t)):o("tr",{key:l,class:["vxe-footer--row",p?_xeUtils.default.isFunction(p)?p(r):p:""],style:f?_xeUtils.default.isFunction(f)?f(r):f:null},renderRows(o,n,a,u,e,l,t))})}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(t){var e=this.$parent,l=e.tId,{fixedType:r,fixedColumn:o,tableColumn:n}=this,{spanMethod:a,footerSpanMethod:i,showFooterOverflow:s}=e,{visibleColumn:d,fullColumnIdData:c}=e,{scrollXLoad:u,scrollYLoad:p,scrollbarWidth:f,dragCol:x}=e;let m=r?!(u||p||s)||a||i?d:o||[]:n;r||u&&x&&2<m.length&&(p=c[x.id])&&(s=p._index,a=m[0],i=m[m.length-1],d=c[a.id],o=c[i.id],d)&&o&&(n=d._index,u=o._index,s<n?m=[x].concat(m):u<s&&(m=m.concat([x])));p={};return r||(p.scroll=this.scrollEvent),t("div",{class:["vxe-table--footer-wrapper",r?`fixed-${r}--wrapper`:"body--wrapper"],attrs:{xid:l},on:p},[r?renderEmptyElement(e):t("div",{class:"vxe-body--x-space",ref:"xSpace"}),t("table",{class:"vxe-table--footer",attrs:{xid:l,cellspacing:0,cellpadding:0,border:0},ref:"table"},[t("colgroup",{ref:"colgroup"},m.map((e,l)=>t("col",{attrs:{name:e.id},key:l})).concat(f?[t("col",{attrs:{name:"col_gutter"}})]:[])),t("tfoot",{ref:"tfoot"},renderHeads(t,this,m))])])},methods:{scrollEvent(e){var l,t,r,o,n=this.$parent,a=n,{inVirtualScroll:i,inBodyScroll:s}=a;i||s||(i=this.fixedType,{tableHeader:s,tableBody:l,tableFooter:r}=n.$refs,s=s?s.$el:null,(r=r?r.$el:null)&&(l=l?l.$el:null)&&(t=n.$refs.refScrollXHandleElem,r=r.scrollLeft,o=l.scrollTop,a.inFooterScroll=!0,(0,_dom.setScrollLeft)(t,r),(0,_dom.setScrollLeft)(s,r),(0,_dom.setScrollLeft)(l,r),n.triggerScrollXEvent(e),n.handleScrollEvent(e,!1,!0,o,r,{type:renderType,fixed:i})))}}};

package/lib/table/src/header.js

@@ -125,6 +125,7 @@ const renderRows = (h, _vm, cols, $rowIndex) => {
         'is--sortable': column.sortable,
         'col--filter': !!column.filters,
         'is--filter-active': hasFilter,
+        'is--drag-active': !column.fixed && !isDisabledDrag,
         'is--drag-disabled': isDisabledDrag,
         'col--current': currentColumn === column
       }, (0, _utils.getClass)(headerClassName, params), (0, _utils.getClass)(headerCellClassName, params)],
@@ -276,19 +277,23 @@ var _default = exports.default = {
     } = tableProps;
     const {
       isGroup,
-      scrollbarWidth
+      scrollXLoad,
+      scrollYLoad,
+      scrollbarWidth,
+      dragCol
     } = tableReactData;
     const {
-      visibleColumn
+      visibleColumn,
+      fullColumnIdData
     } = tableInternalData;
-    let headerGroups = headerColumn;
+    let renderHeaderList = headerColumn;
     let renderColumnList = tableColumn;
     if (isGroup) {
       renderColumnList = visibleColumn;
     } else {
       if (fixedType) {
         // 如果是使用优化模式
-        if (allColumnHeaderOverflow) {
+        if (scrollXLoad || scrollYLoad || allColumnHeaderOverflow) {
           // 如果不支持优化模式
           if (spanMethod || footerSpanMethod) {
             renderColumnList = visibleColumn;
@@ -299,7 +304,35 @@ var _default = exports.default = {
           renderColumnList = visibleColumn;
         }
       }
-      headerGroups = [renderColumnList];
+      renderHeaderList = [renderColumnList];
+    }
+    if (!fixedType) {
+      // 列拖拽
+      if (scrollXLoad && dragCol) {
+        if (renderColumnList.length > 2) {
+          const dCowRest = fullColumnIdData[dragCol.id];
+          if (dCowRest) {
+            const dcIndex = dCowRest._index;
+            const firstCol = renderColumnList[0];
+            const lastCol = renderColumnList[renderColumnList.length - 1];
+            const firstColRest = fullColumnIdData[firstCol.id];
+            const lastColRest = fullColumnIdData[lastCol.id];
+            if (firstColRest && lastColRest) {
+              const fcIndex = firstColRest._index;
+              const lcIndex = lastColRest._index;
+              console.log(dragCol.id, dcIndex, fcIndex, lcIndex, renderColumnList.length);
+              if (dcIndex < fcIndex) {
+                renderColumnList = [dragCol].concat(renderColumnList);
+                renderHeaderList = [[dragCol].concat(renderHeaderList[0])].concat(renderHeaderList.slice(1));
+              } else if (dcIndex > lcIndex) {
+                renderColumnList = renderColumnList.concat([dragCol]);
+                renderHeaderList = [renderHeaderList[0].concat([dragCol])].concat(renderHeaderList.slice(1));
+              }
+              console.log(renderColumnList.length);
+            }
+          }
+        }
+      }
     }
     return h('div', {
       class: ['vxe-table--header-wrapper', fixedType ? `fixed-${fixedType}--wrapper` : 'body--wrapper'],
@@ -341,7 +374,7 @@ var _default = exports.default = {
      */
     h('thead', {
       ref: 'thead'
-    }, renderHeads(h, this, headerGroups))]),
+    }, renderHeads(h, this, renderHeaderList))]),
     /**
      * 其他
      */

package/lib/table/src/header.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"),_util=require("./util");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let{renderer,renderEmptyElement}=_ui.VxeUI,cellType="header",renderRows=(v,C,b,y)=>{let w=C.$parent,_=w.xegrid,$=C.fixedType,{resizable:z,border:W,columnKey:M,headerCellClassName:H,headerCellStyle:S,showHeaderOverflow:D,headerAlign:R,align:T,currentColumn:E,scrollXLoad:O,scrollYLoad:k,overflowX:U,scrollbarWidth:e,mouseConfig:A,columnOpts:I}=w,q=w.computeColumnDragOpts,F=q.disabledMethod;return b.map((e,l)=>{var{type:t,showHeaderOverflow:r,headerAlign:a,align:i,headerClassName:o,editRender:n,cellRender:d}=e,s=e.id,n=n||d,d=n?renderer.get(n.name):null,n=e.children&&e.children.length,u=$?e.fixed!==$&&!n:e.fixed&&U,r=_xeUtils.default.isUndefined(r)||_xeUtils.default.isNull(r)?D:r,a=a||(d?d.tableHeaderCellAlign:"")||R||i||(d?d.tableCellAlign:"")||T;let c="ellipsis"===r;i="title"===r,d=!0===r||"tooltip"===r;let p=i||d||c;var r=e.filters&&e.filters.some(e=>e.checked),h=w.getColumnIndex(e),m=w.getVTColumnIndex(e);let f={$table:w,$grid:_,$rowIndex:y,column:e,columnIndex:h,$columnIndex:l,_columnIndex:m,fixed:$,type:cellType,isHidden:u,hasFilter:r};var h={colid:s,colspan:1<e.colSpan?e.colSpan:null,rowspan:1<e.rowSpan?e.rowSpan:null},m={click:e=>w.triggerHeaderCellClickEvent(e,f),dblclick:e=>w.triggerHeaderCellDblclickEvent(e,f)},g=(O&&!p&&(c=p=!0),I.drag&&"cell"===q.trigger);let x=!1;g&&(x=!(!F||!F(f))),(A||g)&&(m.mousedown=e=>w.triggerHeaderCellMousedownEvent(e,f)),I.drag&&(m.dragstart=w.handleHeaderCellDragDragstartEvent,m.dragend=w.handleHeaderCellDragDragendEvent,m.dragover=w.handleHeaderCellDragDragoverEvent,g)&&(m.mouseup=w.handleHeaderCellDragMouseupEvent);g=!e.resizeWidth&&("auto"===e.minWidth||"auto"===e.width);return v("th",{class:["vxe-header--column",s,{["col--"+a]:a,["col--"+t]:t,"col--last":l===b.length-1,"col--fixed":e.fixed,"col--group":n,"col--ellipsis":p,"fixed--width":!g,"fixed--hidden":u,"is--sortable":e.sortable,"col--filter":!!e.filters,"is--filter-active":r,"is--drag-disabled":x,"col--current":E===e},(0,_utils.getClass)(o,f),(0,_utils.getClass)(H,f)],attrs:h,style:S?_xeUtils.default.isFunction(S)?S(f):S:null,on:m,key:M||O||k||I.useKey||I.drag||n?s:l},[v("div",{class:["vxe-cell",{"c--title":i,"c--tooltip":d,"c--ellipsis":c}]},e.renderHeader(v,f)),u||n||!(_xeUtils.default.isBoolean(e.resizable)?e.resizable:I.resizable||z)?null:v("div",{class:["vxe-resizable",{"is--line":!W||"none"===W}],on:{mousedown:e=>C.resizeMousedown(e,f)}})])}).concat(e?[v("th",{key:"gr"+y,class:"vxe-header--gutter col--gutter"})]:[])};function renderHeads(r,a,e){let i=a.$parent;var l=i;let o=a.fixedType,n=i.computeColumnOpts,d=i.computeColumnDragOpts,{headerRowClassName:s,headerRowStyle:u}=l,c=i.isDragColMove;return e.map((e,l)=>{var t={$table:i,$rowIndex:l,fixed:o,type:cellType};return n.drag&&d.animation?r("transition-group",{key:l,props:{tag:"tr",name:"vxe-header--col-list"+(c?"":"-disabled"),class:["vxe-header--row",s?_xeUtils.default.isFunction(s)?s(t):s:""],style:u?_xeUtils.default.isFunction(u)?u(t):u:null}},renderRows(r,a,e,l)):r("tr",{key:l,class:["vxe-header--row",s?_xeUtils.default.isFunction(s)?s(t):s:""],style:u?_xeUtils.default.isFunction(u)?u(t):u:null},renderRows(r,a,e,l))})}var _default=exports.default={name:"VxeTableHeader",props:{tableData:Array,tableColumn:Array,tableGroupColumn:Array,fixedColumn:Array,size:String,fixedType:String},data(){return{headerColumn:[]}},watch:{tableColumn(){this.uploadColumn()}},created(){this.uploadColumn()},mounted(){var{$parent:e,$el:l,$refs:t,fixedType:r}=this,e=e.elemStore,r=`${r||"main"}-header-`;e[r+"wrapper"]=l,e[r+"table"]=t.table,e[r+"colgroup"]=t.colgroup,e[r+"list"]=t.thead,e[r+"xSpace"]=t.xSpace,e[r+"repair"]=t.repair},destroyed(){var{$parent:e,fixedType:l}=this,e=e.elemStore,l=`${l||"main"}-header-`;e[l+"wrapper"]=null,e[l+"table"]=null,e[l+"colgroup"]=null,e[l+"list"]=null,e[l+"xSpace"]=null,e[l+"repair"]=null},render(t){var e=this.$parent,l=e.tId,{fixedType:r,fixedColumn:a,tableColumn:i}=this,o=this.headerColumn,{showHeaderOverflow:n,spanMethod:d,footerSpanMethod:s}=e,{isGroup:u,scrollbarWidth:c}=e,p=e.visibleColumn;let h=o,m=i;return u?m=p:(r&&(m=!n||d||s?p:a||[]),h=[m]),t("div",{class:["vxe-table--header-wrapper",r?`fixed-${r}--wrapper`:"body--wrapper"],attrs:{xid:l}},[r?renderEmptyElement(e):t("div",{class:"vxe-body--x-space",ref:"xSpace"}),t("table",{class:"vxe-table--header",attrs:{xid:l,cellspacing:0,cellpadding:0,border:0},ref:"table"},[t("colgroup",{ref:"colgroup"},m.map((e,l)=>t("col",{attrs:{name:e.id},key:l})).concat(c?[t("col",{attrs:{name:"col_gutter"}})]:[])),t("thead",{ref:"thead"},renderHeads(t,this,h))]),t("div",{class:"vxe-table--header-border-line",ref:"repair"})])},methods:{uploadColumn(){var e=this.$parent;this.headerColumn=e.isGroup?(0,_util.convertHeaderColumnToRows)(this.tableGroupColumn):[]},resizeMousedown(e,t){var l=this.$parent;let d=t.column,{$parent:r,fixedType:s}=this,a=l.visibleColumn,{tableBody:i,leftContainer:u,rightContainer:c}=r.$refs,p=l.$el,h=r.$refs.resizeBar,m=r.$refs.refCellResizeTip,f=this.$el,{target:o,clientX:g}=e,x=t.cell=o.parentNode,v=l.computeResizableOpts,C=0,b=i.$el;var l=(0,_dom.getOffsetPos)(o,p),n=o.clientWidth,y=Math.floor(n/2);let w=(0,_util.getColReMinWidth)(t)-y,_=l.left-x.clientWidth+n+w,$=l.left+y,z=document.onmousemove,W=document.onmouseup,M="left"===s,H="right"===s,S=0;if(M||H){var D=M?"nextElementSibling":"previousElementSibling";let e=x[D];for(;e&&!(0,_dom.hasClass)(e,"fixed--hidden");)(0,_dom.hasClass)(e,"col--group")||(S+=e.offsetWidth),e=e[D];H&&c&&($=c.offsetLeft+S)}function R(l){l.stopPropagation(),l.preventDefault();var t=l.clientX-g;let e=$+t;if(t=s?0:b.scrollLeft,M?e=Math.min(e,(c?c.offsetLeft:b.clientWidth)-S-w):H?(_=(u?u.clientWidth:0)+S+w,e=Math.min(e,$+x.clientWidth-w)):_=Math.max(b.scrollLeft,_),t=(C=Math.max(e,_))-t,h.style.left=t+"px",v.showDragTip&&m){var r=p.clientWidth,a=f.getBoundingClientRect(),i=h.clientWidth,o=m.clientWidth,n=m.clientHeight;let e=-o;t<o+i?e=o+i-t:r<t&&(e+=r-t),m.style.left=e+"px",m.style.top=Math.min(p.clientHeight-n,Math.max(0,l.clientY-a.y-n/2))+"px",m.textContent=d.renderWidth+(H?$-C:C-$)+"px"}}r._isResize=!0,(0,_dom.addClass)(r.$el,"drag--resize"),h.style.display="block",document.onmousemove=R,document.onmouseup=function(e){document.onmousemove=z,document.onmouseup=W;let l=d.renderWidth+(H?$-C:C-$);d.resizeWidth=l,"fixed"===v.dragMode&&a.forEach(e=>{e.id===d.id||e.resizeWidth||(e.resizeWidth=e.renderWidth)}),h.style.display="none",r._isResize=!1,r._lastResizeTime=Date.now(),r.analyColumnWidth(),r.recalculate(!0).then(()=>{r.saveCustomStore("update:visible"),r.updateCellAreas(),r.emitEvent("resizable-change",Object.assign(Object.assign({},t),{resizeWidth:l}),e),setTimeout(()=>r.recalculate(!0),300)}),(0,_dom.removeClass)(r.$el,"drag--resize")},R(e),r.closeMenu()}}};
+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"),_util=require("./util");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let{renderer,renderEmptyElement}=_ui.VxeUI,cellType="header",renderRows=(v,C,b,y)=>{let _=C.$parent,w=_.xegrid,$=C.fixedType,{resizable:z,border:W,columnKey:M,headerCellClassName:H,headerCellStyle:D,showHeaderOverflow:S,headerAlign:R,align:T,currentColumn:E,scrollXLoad:O,scrollYLoad:k,overflowX:U,scrollbarWidth:e,mouseConfig:I,columnOpts:A}=_,L=_.computeColumnDragOpts,q=L.disabledMethod;return b.map((e,l)=>{var{type:t,showHeaderOverflow:r,headerAlign:a,align:i,headerClassName:o,editRender:n,cellRender:d}=e,s=e.id,n=n||d,d=n?renderer.get(n.name):null,n=e.children&&e.children.length,u=$?e.fixed!==$&&!n:e.fixed&&U,r=_xeUtils.default.isUndefined(r)||_xeUtils.default.isNull(r)?S:r,a=a||(d?d.tableHeaderCellAlign:"")||R||i||(d?d.tableCellAlign:"")||T;let c="ellipsis"===r;i="title"===r,d=!0===r||"tooltip"===r;let p=i||d||c;var r=e.filters&&e.filters.some(e=>e.checked),h=_.getColumnIndex(e),m=_.getVTColumnIndex(e);let f={$table:_,$grid:w,$rowIndex:y,column:e,columnIndex:h,$columnIndex:l,_columnIndex:m,fixed:$,type:cellType,isHidden:u,hasFilter:r};var h={colid:s,colspan:1<e.colSpan?e.colSpan:null,rowspan:1<e.rowSpan?e.rowSpan:null},m={click:e=>_.triggerHeaderCellClickEvent(e,f),dblclick:e=>_.triggerHeaderCellDblclickEvent(e,f)},g=(O&&!p&&(c=p=!0),A.drag&&"cell"===L.trigger);let x=!1;g&&(x=!(!q||!q(f))),(I||g)&&(m.mousedown=e=>_.triggerHeaderCellMousedownEvent(e,f)),A.drag&&(m.dragstart=_.handleHeaderCellDragDragstartEvent,m.dragend=_.handleHeaderCellDragDragendEvent,m.dragover=_.handleHeaderCellDragDragoverEvent,g)&&(m.mouseup=_.handleHeaderCellDragMouseupEvent);g=!e.resizeWidth&&("auto"===e.minWidth||"auto"===e.width);return v("th",{class:["vxe-header--column",s,{["col--"+a]:a,["col--"+t]:t,"col--last":l===b.length-1,"col--fixed":e.fixed,"col--group":n,"col--ellipsis":p,"fixed--width":!g,"fixed--hidden":u,"is--sortable":e.sortable,"col--filter":!!e.filters,"is--filter-active":r,"is--drag-active":!e.fixed&&!x,"is--drag-disabled":x,"col--current":E===e},(0,_utils.getClass)(o,f),(0,_utils.getClass)(H,f)],attrs:h,style:D?_xeUtils.default.isFunction(D)?D(f):D:null,on:m,key:M||O||k||A.useKey||A.drag||n?s:l},[v("div",{class:["vxe-cell",{"c--title":i,"c--tooltip":d,"c--ellipsis":c}]},e.renderHeader(v,f)),u||n||!(_xeUtils.default.isBoolean(e.resizable)?e.resizable:A.resizable||z)?null:v("div",{class:["vxe-resizable",{"is--line":!W||"none"===W}],on:{mousedown:e=>C.resizeMousedown(e,f)}})])}).concat(e?[v("th",{key:"gr"+y,class:"vxe-header--gutter col--gutter"})]:[])};function renderHeads(r,a,e){let i=a.$parent;var l=i;let o=a.fixedType,n=i.computeColumnOpts,d=i.computeColumnDragOpts,{headerRowClassName:s,headerRowStyle:u}=l,c=i.isDragColMove;return e.map((e,l)=>{var t={$table:i,$rowIndex:l,fixed:o,type:cellType};return n.drag&&d.animation?r("transition-group",{key:l,props:{tag:"tr",name:"vxe-header--col-list"+(c?"":"-disabled"),class:["vxe-header--row",s?_xeUtils.default.isFunction(s)?s(t):s:""],style:u?_xeUtils.default.isFunction(u)?u(t):u:null}},renderRows(r,a,e,l)):r("tr",{key:l,class:["vxe-header--row",s?_xeUtils.default.isFunction(s)?s(t):s:""],style:u?_xeUtils.default.isFunction(u)?u(t):u:null},renderRows(r,a,e,l))})}var _default=exports.default={name:"VxeTableHeader",props:{tableData:Array,tableColumn:Array,tableGroupColumn:Array,fixedColumn:Array,size:String,fixedType:String},data(){return{headerColumn:[]}},watch:{tableColumn(){this.uploadColumn()}},created(){this.uploadColumn()},mounted(){var{$parent:e,$el:l,$refs:t,fixedType:r}=this,e=e.elemStore,r=`${r||"main"}-header-`;e[r+"wrapper"]=l,e[r+"table"]=t.table,e[r+"colgroup"]=t.colgroup,e[r+"list"]=t.thead,e[r+"xSpace"]=t.xSpace,e[r+"repair"]=t.repair},destroyed(){var{$parent:e,fixedType:l}=this,e=e.elemStore,l=`${l||"main"}-header-`;e[l+"wrapper"]=null,e[l+"table"]=null,e[l+"colgroup"]=null,e[l+"list"]=null,e[l+"xSpace"]=null,e[l+"repair"]=null},render(t){var e=this.$parent,l=e.tId,{fixedType:r,fixedColumn:a,tableColumn:i}=this,o=this.headerColumn,{showHeaderOverflow:n,spanMethod:d,footerSpanMethod:s}=e,{isGroup:u,scrollXLoad:c,scrollYLoad:p,scrollbarWidth:h,dragCol:m}=e,{visibleColumn:f,fullColumnIdData:g}=e;let x=o,v=i;return u?v=f:(r&&(v=!(c||p||n)||d||s?f:a||[]),x=[v]),r||c&&m&&2<v.length&&(o=g[m.id])&&(i=o._index,u=v[0],p=v[v.length-1],n=g[u.id],d=g[p.id],n)&&d&&(s=n._index,f=d._index,console.log(m.id,i,s,f,v.length),i<s?(v=[m].concat(v),x=[[m].concat(x[0])].concat(x.slice(1))):f<i&&(v=v.concat([m]),x=[x[0].concat([m])].concat(x.slice(1))),console.log(v.length)),t("div",{class:["vxe-table--header-wrapper",r?`fixed-${r}--wrapper`:"body--wrapper"],attrs:{xid:l}},[r?renderEmptyElement(e):t("div",{class:"vxe-body--x-space",ref:"xSpace"}),t("table",{class:"vxe-table--header",attrs:{xid:l,cellspacing:0,cellpadding:0,border:0},ref:"table"},[t("colgroup",{ref:"colgroup"},v.map((e,l)=>t("col",{attrs:{name:e.id},key:l})).concat(h?[t("col",{attrs:{name:"col_gutter"}})]:[])),t("thead",{ref:"thead"},renderHeads(t,this,x))]),t("div",{class:"vxe-table--header-border-line",ref:"repair"})])},methods:{uploadColumn(){var e=this.$parent;this.headerColumn=e.isGroup?(0,_util.convertHeaderColumnToRows)(this.tableGroupColumn):[]},resizeMousedown(e,t){var l=this.$parent;let d=t.column,{$parent:r,fixedType:s}=this,a=l.visibleColumn,{tableBody:i,leftContainer:u,rightContainer:c}=r.$refs,p=l.$el,h=r.$refs.resizeBar,m=r.$refs.refCellResizeTip,f=this.$el,{target:o,clientX:g}=e,x=t.cell=o.parentNode,v=l.computeResizableOpts,C=0,b=i.$el;var l=(0,_dom.getOffsetPos)(o,p),n=o.clientWidth,y=Math.floor(n/2);let _=(0,_util.getColReMinWidth)(t)-y,w=l.left-x.clientWidth+n+_,$=l.left+y,z=document.onmousemove,W=document.onmouseup,M="left"===s,H="right"===s,D=0;if(M||H){var S=M?"nextElementSibling":"previousElementSibling";let e=x[S];for(;e&&!(0,_dom.hasClass)(e,"fixed--hidden");)(0,_dom.hasClass)(e,"col--group")||(D+=e.offsetWidth),e=e[S];H&&c&&($=c.offsetLeft+D)}function R(l){l.stopPropagation(),l.preventDefault();var t=l.clientX-g;let e=$+t;if(t=s?0:b.scrollLeft,M?e=Math.min(e,(c?c.offsetLeft:b.clientWidth)-D-_):H?(w=(u?u.clientWidth:0)+D+_,e=Math.min(e,$+x.clientWidth-_)):w=Math.max(b.scrollLeft,w),t=(C=Math.max(e,w))-t,h.style.left=t+"px",v.showDragTip&&m){var r=p.clientWidth,a=f.getBoundingClientRect(),i=h.clientWidth,o=m.clientWidth,n=m.clientHeight;let e=-o;t<o+i?e=o+i-t:r<t&&(e+=r-t),m.style.left=e+"px",m.style.top=Math.min(p.clientHeight-n,Math.max(0,l.clientY-a.y-n/2))+"px",m.textContent=d.renderWidth+(H?$-C:C-$)+"px"}}r._isResize=!0,(0,_dom.addClass)(r.$el,"drag--resize"),h.style.display="block",document.onmousemove=R,document.onmouseup=function(e){document.onmousemove=z,document.onmouseup=W;let l=d.renderWidth+(H?$-C:C-$);d.resizeWidth=l,"fixed"===v.dragMode&&a.forEach(e=>{e.id===d.id||e.resizeWidth||(e.resizeWidth=e.renderWidth)}),h.style.display="none",r._isResize=!1,r._lastResizeTime=Date.now(),r.analyColumnWidth(),r.recalculate(!0).then(()=>{r.saveCustomStore("update:visible"),r.updateCellAreas(),r.emitEvent("resizable-change",Object.assign(Object.assign({},t),{resizeWidth:l}),e),setTimeout(()=>r.recalculate(!0),300)}),(0,_dom.removeClass)(r.$el,"drag--resize")},R(e),r.closeMenu()}}};