vxe-table 3.12.0-beta.0 → 3.12.0-beta.10

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 _=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()}}};
+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||u||c&&m&&2<v.length&&(o=g[m.id])&&(i=o._index,p=v[0],n=v[v.length-1],d=g[p.id],s=g[n.id],d)&&s&&(f=d._index,a=s._index,console.log(m.id,i,f,a,v.length),i<f?(v=[m].concat(v),x=[[m].concat(x[0])].concat(x.slice(1))):a<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()}}};

package/lib/table/src/methods.js

@@ -86,14 +86,12 @@ function handleReserveRow(_vm, reserveRowMap) {
   });
   return reserveList;
 }
-function handleVirtualXVisible(_vm) {
+function handleVirtualXVisible($xeTable) {
+  const internalData = $xeTable;
   const {
-    $refs,
     visibleColumn
-  } = _vm;
-  const {
-    tableBody
-  } = $refs;
+  } = internalData;
+  const tableBody = $xeTable.$refs.tableBody;
   const tableBodyElem = tableBody ? tableBody.$el : null;
   if (tableBodyElem) {
     const {
@@ -135,8 +133,8 @@ const computeRowHeight = $xeTable => {
   const tableBody = $xeTable.$refs.tableBody;
   const tableBodyElem = tableBody ? tableBody.$el : null;
   const vSize = $xeTable.computeSize;
-  const rowHeightMaps = $xeTable.rowHeightMaps;
-  let rowHeight = 0;
+  const rowHeightMaps = $xeTable.computeRowHeightMaps;
+  let rowHeight = 24;
   if (showOverflow) {
     if (tableBodyElem) {
       const tableHeaderElem = tableHeader ? tableHeader.$el : null;
@@ -156,13 +154,13 @@ const computeRowHeight = $xeTable => {
   return rowHeight;
 };
 function handleVirtualYVisible($xeTable) {
+  const internalData = $xeTable;
   const {
-    $refs,
     scrollYStore,
     afterFullData,
     fullAllDataRowIdData
-  } = $xeTable;
-  const tableBody = $refs.tableBody;
+  } = internalData;
+  const tableBody = $xeTable.$refs.tableBody;
   const tableBodyElem = tableBody ? tableBody.$el : null;
   const {
     rowHeight
@@ -179,11 +177,11 @@ function handleVirtualYVisible($xeTable) {
     for (let rIndex = 0, rLen = afterFullData.length; rIndex < rLen; rIndex++) {
       const row = afterFullData[rIndex];
       const rowid = (0, _util.getRowid)($xeTable, row);
-      const rest = fullAllDataRowIdData[rowid];
-      if (!rest) {
+      const rowRest = fullAllDataRowIdData[rowid];
+      if (!rowRest) {
         break;
       }
-      offsetTop += rest.height || rowHeight;
+      offsetTop += rowRest.height || rowHeight;
       if (toVisibleIndex === -1 && scrollTop < offsetTop) {
         toVisibleIndex = rIndex;
       }
@@ -412,6 +410,22 @@ function getOrderField(_vm, column) {
     return cellValue;
   };
 }
+function clearDragStatus($xeTable) {
+  const reactData = $xeTable;
+  const {
+    dragRow,
+    dragCol
+  } = reactData;
+  if (dragRow || dragCol) {
+    clearColDropOrigin($xeTable);
+    clearRowDropOrigin($xeTable);
+    hideDropTip($xeTable);
+    reactData.dragRow = null;
+    reactData.dragCol = null;
+    reactData.isDragColMove = false;
+    reactData.isDragRowMove = false;
+  }
+}
 function clearRowDropOrigin($xeTable) {
   const el = $xeTable.$el;
   if (el) {
@@ -854,7 +868,6 @@ const Methods = {
     editStore.removeList = [];
     editStore.removeMaps = {};
     const sYLoad = this.updateScrollYStatus(fullData);
-    this.scrollYLoad = sYLoad;
     this.isDragRowMove = false;
     // 全量数据
     this.tableFullData = fullData;
@@ -3195,7 +3208,7 @@ const Methods = {
       internalData.rceTimeout = setTimeout(() => {
         internalData.rceTimeout = undefined;
         resolve(handleRecalculateLayout($xeTable, !!reFull));
-      }, 20);
+      }, 15);
     });
   },
   calcCellWidth() {
@@ -6139,14 +6152,16 @@ const Methods = {
       $xeTable.closeMenu();
     }
   },
+  triggerCellMouseupEvent() {
+    const $xeTable = this;
+    clearDragStatus($xeTable);
+  },
   /**
    * 行拖拽
    */
   handleRowDragDragstartEvent(evnt) {
     if (evnt.dataTransfer) {
-      const img = new Image();
-      img.src = _dom.tpImg;
-      evnt.dataTransfer.setDragImage(img, 0, 0);
+      evnt.dataTransfer.setDragImage((0, _dom.getTpImg)(), 0, 0);
     }
   },
   handleRowDragDragendEvent(evnt) {
@@ -6434,23 +6449,24 @@ const Methods = {
   },
   handleCellDragMouseupEvent() {
     const $xeTable = this;
-    const reactData = $xeTable;
-    clearRowDropOrigin($xeTable);
-    hideDropTip($xeTable);
-    reactData.dragRow = null;
-    reactData.dragCol = null;
-    reactData.isDragRowMove = false;
+    clearDragStatus($xeTable);
   },
   /**
    * 列拖拽
    */
   handleHeaderCellDragDragstartEvent(evnt) {
     if (evnt.dataTransfer) {
-      const img = new Image();
-      img.src = _dom.tpImg;
-      evnt.dataTransfer.setDragImage(img, 0, 0);
+      evnt.dataTransfer.setDragImage((0, _dom.getTpImg)(), 0, 0);
     }
   },
+  handleColDragSwapColumn() {
+    const $xeTable = this;
+    $xeTable.handleUpdateColumn();
+    $xeTable.parseColumns(false).then(() => {
+      $xeTable.updateCellAreas();
+      $xeTable.saveCustomStore('update:sort');
+    });
+  },
   handleColDragSwapEvent(evnt, isSyncColumn, dragCol, prevDragCol, prevDragPos, prevDragToChild) {
     const $xeTable = this;
     const props = $xeTable;
@@ -6607,11 +6623,7 @@ const Methods = {
             }
           }, evnt);
           if (isSyncColumn) {
-            $xeTable.handleUpdateColumn();
-            $xeTable.parseColumns(false).then(() => {
-              $xeTable.updateCellAreas();
-              return $xeTable.saveCustomStore('update:sort');
-            });
+            $xeTable.handleColDragSwapColumn();
           }
         }).catch(() => {});
       }
@@ -8076,15 +8088,18 @@ const Methods = {
     const $xeTable = this;
     const internalData = $xeTable;
     const {
+      intoRunScroll,
       inFooterScroll,
       inBodyScroll,
       lastScrollTop
     } = internalData;
-    if (inFooterScroll) {
-      return;
-    }
-    if (inBodyScroll) {
-      return;
+    if (!intoRunScroll) {
+      if (inFooterScroll) {
+        return;
+      }
+      if (inBodyScroll) {
+        return;
+      }
     }
     const tableHeader = $xeTable.$refs.tableHeader;
     const tableBody = $xeTable.$refs.tableBody;
@@ -8118,15 +8133,18 @@ const Methods = {
     const $xeTable = this;
     const internalData = $xeTable;
     const {
+      intoRunScroll,
       inFooterScroll,
       inBodyScroll,
       lastScrollLeft
     } = internalData;
-    if (inFooterScroll) {
-      return;
-    }
-    if (inBodyScroll) {
-      return;
+    if (!intoRunScroll) {
+      if (inFooterScroll) {
+        return;
+      }
+      if (inBodyScroll) {
+        return;
+      }
     }
     const tableBody = $xeTable.$refs.tableBody;
     const leftBody = $xeTable.$refs.leftBody;
@@ -8278,7 +8296,6 @@ const Methods = {
     const {
       showOverflow
     } = props;
-    // this.tableColumn = []
     return $xeTable.$nextTick().then(() => {
       $xeTable.handleTableColumn();
       calcCellHeight($xeTable);
@@ -8344,7 +8361,6 @@ const Methods = {
   },
   updateScrollYData() {
     const $xeTable = this;
-    // this.tableData = []
     return $xeTable.$nextTick().then(() => {
       $xeTable.handleTableData();
       calcCellHeight($xeTable);
@@ -8422,6 +8438,7 @@ const Methods = {
    */
   scrollTo(scrollLeft, scrollTop) {
     const $xeTable = this;
+    const internalData = $xeTable;
     const {
       $refs
     } = this;
@@ -8437,6 +8454,7 @@ const Methods = {
     const rightBodyElem = rightBody ? rightBody.$el : null;
     const tableHeaderElem = tableHeader ? tableHeader.$el : null;
     const tableFooterElem = tableFooter ? tableFooter.$el : null;
+    internalData.intoRunScroll = true;
     if (_xeUtils.default.isNumber(scrollLeft)) {
       const xHandleEl = $xeTable.$refs.refScrollXHandleElem;
       if (xHandleEl) {
@@ -8458,7 +8476,14 @@ const Methods = {
       }
     }
     if (this.scrollXLoad || this.scrollYLoad) {
-      return new Promise(resolve => setTimeout(() => resolve(this.$nextTick()), 30));
+      return new Promise(resolve => {
+        setTimeout(() => {
+          $xeTable.$nextTick(() => {
+            internalData.intoRunScroll = false;
+            resolve();
+          });
+        });
+      });
     }
     return this.$nextTick();
   },
@@ -8523,20 +8548,18 @@ const Methods = {
    */
   clearScroll() {
     const $xeTable = this;
+    const internalData = $xeTable;
     const {
-      $refs,
       scrollXStore,
       scrollYStore
-    } = $xeTable;
-    const {
-      tableBody,
-      tableHeader,
-      leftBody,
-      rightBody,
-      tableFooter
-    } = $refs;
-    const tableBodyElem = tableBody ? tableBody.$el : null;
+    } = internalData;
+    const tableBody = $xeTable.$refs.tableBody;
+    const tableHeader = $xeTable.$refs.tableHeader;
+    const tableFooter = $xeTable.$refs.tableFooter;
+    const leftBody = $xeTable.$refs.leftBody;
+    const rightBody = $xeTable.$refs.rightBody;
     const leftBodyElem = leftBody ? leftBody.$el : null;
+    const tableBodyElem = tableBody ? tableBody.$el : null;
     const rightBodyElem = rightBody ? rightBody.$el : null;
     const tableHeaderElem = tableHeader ? tableHeader.$el : null;
     const tableFooterElem = tableFooter ? tableFooter.$el : null;