vxe-table 3.11.39 → 3.12.0-beta.1

package/lib/index.umd.js

@@ -2220,7 +2220,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.11.39";
+const version = "3.12.0-beta.1";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2263,11 +2263,13 @@ core_.VxeUI.setConfig({
     },
     rowDragConfig: {
       showIcon: true,
-      animation: true
+      animation: true,
+      showGuidesStatus: true
     },
     columnDragConfig: {
       showIcon: true,
-      animation: true
+      animation: true,
+      showGuidesStatus: true
     },
     checkboxConfig: {
       // trigger: 'default',
@@ -2793,7 +2795,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.11.39"}`;
+const log_version = `table v${"3.12.0-beta.1"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -4916,8 +4918,6 @@ const {
   interceptor: methods_interceptor,
   createEvent
 } = core_.VxeUI;
-// const isWebkit = browse['-webkit'] && !browse.edge
-// const debounceScrollYDuration = browse.msie ? 80 : 20
 const customStorageKey = 'VXE_CUSTOM_STORE';
 // 获取所有的列，排除分组
 const getColumnList = columns => {
@@ -5251,7 +5251,7 @@ const calcCellHeight = $xeTable => {
   const {
     fullAllDataRowIdData
   } = internalData;
-  const el = $xeTable.$el;
+  const el = $xeTable.$refs.refElem;
   if (!showOverflow && (scrollXLoad || scrollYLoad) && el) {
     let paddingTop = 0;
     let paddingBottom = 0;
@@ -5259,28 +5259,27 @@ const calcCellHeight = $xeTable => {
     tableData.forEach(row => {
       const rowid = getRowid($xeTable, row);
       const rowRest = fullAllDataRowIdData[rowid];
-      const trList = el.querySelectorAll(`.vxe-body--row[rowid="${rowid}"]`);
-      if (rowRest && trList.length) {
+      const cellList = el.querySelectorAll(`.vxe-body--row[rowid="${rowid}"]>.vxe-body--column>.vxe-cell`);
+      if (rowRest && cellList.length) {
         let height = 0;
-        for (let i = 0; i < trList.length; i++) {
-          const trEl = trList[i];
-          const tdList = trEl.children;
-          for (let j = 0; j < tdList.length; j++) {
-            const tdEl = tdList[j];
-            const cellElem = tdEl.querySelector('.vxe-cell');
-            if (!calcPadding) {
-              paddingTop = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(getComputedStyle(tdEl).paddingTop);
-              paddingBottom = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(getComputedStyle(tdEl).paddingBottom);
-              calcPadding = true;
-            }
-            let cellHeight = paddingTop + paddingBottom;
-            if (cellElem) {
-              cellHeight += cellElem.offsetHeight;
-            }
-            height = Math.max(height, cellHeight);
+        for (let i = 0; i < cellList.length; i++) {
+          const cellElem = cellList[i];
+          const tdEl = cellElem.parentElement;
+          if (!tdEl || !tdEl.clientWidth) {
+            break;
+          }
+          if (!calcPadding) {
+            paddingTop = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(getComputedStyle(tdEl).paddingTop);
+            paddingBottom = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(getComputedStyle(tdEl).paddingBottom);
+            calcPadding = true;
           }
+          let cellHeight = paddingTop + paddingBottom;
+          if (cellElem) {
+            cellHeight += cellElem.clientHeight;
+          }
+          height = Math.max(height, cellHeight);
         }
-        rowRest.height = height;
+        rowRest.height = scrollXLoad ? Math.max(rowRest.height, height) : height;
       }
     });
   }
@@ -5411,15 +5410,22 @@ function showDropTip($xeTable, evnt, trEl, thEl, showLine, dragPos) {
     prevDragToChild
   } = internalData;
   const wrapperRect = el.getBoundingClientRect();
+  const tableWidth = el.clientWidth;
+  const tableHeight = el.clientHeight;
   if (trEl) {
     const rdLineEl = $xeTable.$refs.refDragRowLineElem;
     if (rdLineEl) {
       if (showLine) {
         const trRect = trEl.getBoundingClientRect();
+        let trHeight = trEl.clientHeight;
+        const offsetTop = Math.max(1, trRect.y - wrapperRect.y);
+        if (offsetTop + trHeight > tableHeight - scrollbarHeight) {
+          trHeight = tableHeight - offsetTop - scrollbarHeight;
+        }
         rdLineEl.style.display = 'block';
-        rdLineEl.style.top = `${Math.max(1, trRect.y - wrapperRect.y)}px`;
-        rdLineEl.style.height = `${trRect.height}px`;
-        rdLineEl.style.width = `${wrapperRect.width - scrollbarWidth}px`;
+        rdLineEl.style.top = `${offsetTop}px`;
+        rdLineEl.style.height = `${trHeight}px`;
+        rdLineEl.style.width = `${tableWidth - scrollbarWidth}px`;
         rdLineEl.setAttribute('drag-pos', dragPos);
         rdLineEl.setAttribute('drag-to-child', prevDragToChild ? 'y' : 'n');
       } else {
@@ -5430,16 +5436,31 @@ function showDropTip($xeTable, evnt, trEl, thEl, showLine, dragPos) {
     const cdLineEl = $xeTable.$refs.refDragColLineElem;
     if (cdLineEl) {
       if (showLine) {
+        const leftContainerElem = $xeTable.$refs.leftContainer;
+        const leftContainerWidth = leftContainerElem ? leftContainerElem.clientWidth : 0;
+        const rightContainerElem = $xeTable.$refs.rightContainer;
+        const rightContainerWidth = rightContainerElem ? rightContainerElem.clientWidth : 0;
         const thRect = thEl.getBoundingClientRect();
+        let thWidth = thEl.clientWidth;
         const offsetTop = Math.max(0, thRect.y - wrapperRect.y);
+        const startX = leftContainerWidth;
+        let offsetLeft = thRect.x - wrapperRect.x;
+        if (offsetLeft < startX) {
+          thWidth -= startX - offsetLeft;
+          offsetLeft = startX;
+        }
+        const endX = tableWidth - rightContainerWidth - (rightContainerWidth ? 0 : scrollbarWidth);
+        if (offsetLeft + thWidth > endX) {
+          thWidth = endX - offsetLeft;
+        }
         cdLineEl.style.display = 'block';
         cdLineEl.style.top = `${offsetTop}px`;
-        cdLineEl.style.left = `${Math.max(1, thRect.x - wrapperRect.x)}px`;
-        cdLineEl.style.width = `${thRect.width}px`;
+        cdLineEl.style.left = `${offsetLeft}px`;
+        cdLineEl.style.width = `${thWidth}px`;
         if (prevDragToChild) {
           cdLineEl.style.height = `${thRect.height}px`;
         } else {
-          cdLineEl.style.height = `${wrapperRect.height - offsetTop - scrollbarHeight}px`;
+          cdLineEl.style.height = `${tableHeight - offsetTop - scrollbarHeight}px`;
         }
         cdLineEl.setAttribute('drag-pos', dragPos);
         cdLineEl.setAttribute('drag-to-child', prevDragToChild ? 'y' : 'n');
@@ -5927,7 +5948,7 @@ const Methods = {
     return Promise.resolve(this.restoreCustomStorage()).then(() => {
       this._isLoading = false;
       this.cacheColumnMap();
-      this.parseColumns().then(() => {
+      this.parseColumns(true).then(() => {
         if (this.scrollXLoad) {
           this.loadScrollXData(true);
         }
@@ -7799,15 +7820,11 @@ const Methods = {
   /**
    * 刷新列配置
    */
-  refreshColumn(initOrder) {
-    if (initOrder) {
-      const columnList = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().orderBy(this.collectColumn, 'renderSortNumber');
-      this.collectColumn = columnList;
-      const tableFullColumn = getColumnList(columnList);
-      this.tableFullColumn = tableFullColumn;
-      this.cacheColumnMap();
+  refreshColumn(initSort) {
+    if (initSort) {
+      this.handleUpdateColumn();
     }
-    return this.parseColumns().then(() => {
+    return this.parseColumns(true).then(() => {
       return this.refreshScroll();
     }).then(() => {
       return this.recalculate();
@@ -7817,7 +7834,7 @@ const Methods = {
    * 刷新列信息
    * 将固定的列左边、右边分别靠边
    */
-  parseColumns() {
+  parseColumns(isReset) {
     const $xeTable = this;
     const props = $xeTable;
     const internalData = $xeTable;
@@ -7921,12 +7938,14 @@ const Methods = {
           warnLog('vxe.error.scrollErrProp', ['footer-span-method']);
         }
       }
-      const {
-        visibleSize
-      } = handleVirtualXVisible(this);
-      scrollXStore.startIndex = 0;
-      scrollXStore.endIndex = visibleSize;
-      scrollXStore.visibleSize = visibleSize;
+      if (isReset) {
+        const {
+          visibleSize
+        } = handleVirtualXVisible(this);
+        scrollXStore.startIndex = 0;
+        scrollXStore.endIndex = visibleSize;
+        scrollXStore.visibleSize = visibleSize;
+      }
     }
     // 如果列被显示/隐藏，则清除合并状态
     // 如果列被设置为固定，则清除合并状态
@@ -7944,12 +7963,15 @@ const Methods = {
     });
     this.visibleColumn = visibleColumn;
     this.handleTableColumn();
-    return this.updateFooter().then(() => {
-      return this.recalculate();
-    }).then(() => {
-      this.updateCellAreas();
-      return this.recalculate();
-    });
+    if (isReset) {
+      return this.updateFooter().then(() => {
+        return this.recalculate();
+      }).then(() => {
+        this.updateCellAreas();
+        return this.recalculate();
+      });
+    }
+    return this.updateFooter();
   },
   /**
    * 指定列宽的列进行拆分
@@ -8280,56 +8302,6 @@ const Methods = {
       this.checkScrolling();
     }
   },
-  calcCellHeight() {
-    const $xeTable = this;
-    const props = $xeTable;
-    const reactData = $xeTable;
-    const internalData = $xeTable;
-    const {
-      showOverflow
-    } = props;
-    const {
-      tableData,
-      scrollXLoad,
-      scrollYLoad
-    } = reactData;
-    const {
-      fullAllDataRowIdData
-    } = internalData;
-    const el = $xeTable.$el;
-    if (!showOverflow && (scrollXLoad || scrollYLoad) && el) {
-      let paddingTop = 0;
-      let paddingBottom = 0;
-      let calcPadding = false;
-      tableData.forEach(row => {
-        const rowid = getRowid($xeTable, row);
-        const rowRest = fullAllDataRowIdData[rowid];
-        const trList = el.querySelectorAll(`.vxe-body--row[rowid="${rowid}"]`);
-        if (rowRest && trList.length) {
-          let height = 0;
-          for (let i = 0; i < trList.length; i++) {
-            const trEl = trList[i];
-            const tdList = trEl.children;
-            for (let j = 0; j < tdList.length; j++) {
-              const tdEl = tdList[j];
-              const cellElem = tdEl.querySelector('.vxe-cell');
-              if (!calcPadding) {
-                paddingTop = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(getComputedStyle(tdEl).paddingTop);
-                paddingBottom = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(getComputedStyle(tdEl).paddingBottom);
-                calcPadding = true;
-              }
-              let cellHeight = paddingTop + paddingBottom;
-              if (cellElem) {
-                cellHeight += cellElem.offsetHeight;
-              }
-              height = Math.max(height, cellHeight);
-            }
-          }
-          rowRest.height = scrollXLoad ? Math.max(rowRest.height, height) : height;
-        }
-      });
-    }
-  },
   updateHeight() {
     this.customHeight = calcTableHeight(this, 'height');
     this.customMinHeight = calcTableHeight(this, 'minHeight');
@@ -8425,7 +8397,7 @@ const Methods = {
           } else {
             if (fixedType) {
               // 如果是使用优化模式
-              if (allColumnHeaderOverflow) {
+              if (scrollXLoad || scrollYLoad || allColumnHeaderOverflow) {
                 // 如果不支持优化模式
                 if (spanMethod || footerSpanMethod) {
                   renderColumnList = visibleColumn;
@@ -8547,7 +8519,7 @@ const Methods = {
           let renderColumnList = tableColumn;
           if (fixedType) {
             // 如果是使用优化模式
-            if (allColumnFooterOverflow) {
+            if (scrollXLoad || scrollYLoad || allColumnFooterOverflow) {
               // 如果不支持优化模式
               if (spanMethod || footerSpanMethod) {
                 renderColumnList = visibleColumn;
@@ -11001,7 +10973,10 @@ const Methods = {
     const triggerFilter = getEventTargetNode(evnt, cell, 'vxe-cell--filter').flag;
     let triggerDrag = false;
     if (!(triggerInput || triggerCheckbox || triggerSort || triggerFilter)) {
-      if (columnOpts.drag && trigger === 'cell' && !(disabledMethod && disabledMethod(params))) {
+      const {
+        column
+      } = params;
+      if (columnOpts.drag && !column.fixed && trigger === 'cell' && !(disabledMethod && disabledMethod(params))) {
         triggerDrag = true;
         $xeTable.handleHeaderCellDragMousedownEvent(evnt, params);
       }
@@ -11377,7 +11352,7 @@ const Methods = {
       evnt.dataTransfer.setDragImage(img, 0, 0);
     }
   },
-  handleHeaderCellDragDragendEvent(evnt) {
+  handleColDragSwapEvent(evnt, isSyncColumn, dragCol, prevDragCol, prevDragPos, prevDragToChild) {
     const $xeTable = this;
     const props = $xeTable;
     const reactData = $xeTable;
@@ -11393,13 +11368,7 @@ const Methods = {
       dragEndMethod
     } = columnDragOpts;
     const {
-      dragCol
-    } = reactData;
-    const {
-      collectColumn,
-      prevDragCol,
-      prevDragPos,
-      prevDragToChild
+      collectColumn
     } = internalData;
     const dragOffsetIndex = prevDragPos === 'right' ? 1 : 0;
     if (prevDragCol && dragCol) {
@@ -11407,7 +11376,7 @@ const Methods = {
       if (prevDragCol !== dragCol) {
         const oldColumn = dragCol;
         const newColumn = prevDragCol;
-        Promise.resolve(dragEndMethod ? dragEndMethod({
+        return Promise.resolve(dragEndMethod ? dragEndMethod({
           oldColumn,
           newColumn,
           dragPos: prevDragPos,
@@ -11528,9 +11497,6 @@ const Methods = {
               $xeTable.clearCopyCellArea();
             }
           }
-          $xeTable.refreshColumn(true).then(() => {
-            $xeTable.updateCellAreas();
-          });
           $xeTable.dispatchEvent('column-dragend', {
             oldColumn,
             newColumn,
@@ -11541,10 +11507,31 @@ const Methods = {
               oldIndex: oafIndex
             }
           }, evnt);
-          $xeTable.saveCustomStore('update:sort');
+          if (isSyncColumn) {
+            $xeTable.handleUpdateColumn();
+            $xeTable.parseColumns(false).then(() => {
+              $xeTable.updateCellAreas();
+              return $xeTable.saveCustomStore('update:sort');
+            });
+          }
         }).catch(() => {});
       }
     }
+    return Promise.resolve();
+  },
+  handleHeaderCellDragDragendEvent(evnt) {
+    const $xeTable = this;
+    const reactData = $xeTable;
+    const internalData = $xeTable;
+    const {
+      dragCol
+    } = reactData;
+    const {
+      prevDragCol,
+      prevDragPos,
+      prevDragToChild
+    } = internalData;
+    $xeTable.handleColDragSwapEvent(evnt, true, dragCol, prevDragCol, prevDragPos, prevDragToChild);
     hideDropTip($xeTable);
     clearColDropOrigin($xeTable);
     internalData.prevDragToChild = false;
@@ -11552,6 +11539,9 @@ const Methods = {
     reactData.dragCol = null;
     setTimeout(() => {
       reactData.isDragColMove = false;
+      $xeTable.recalculate().then(() => {
+        $xeTable.loadScrollXData();
+      });
     }, 500);
   },
   handleHeaderCellDragDragoverEvent(evnt) {
@@ -11577,11 +11567,11 @@ const Methods = {
     if (column) {
       evnt.preventDefault();
       const {
-        dragCol
-      } = reactData;
-      const offsetX = evnt.clientX - thEl.getBoundingClientRect().x;
+        clientX
+      } = evnt;
+      const offsetX = clientX - thEl.getBoundingClientRect().x;
       const dragPos = offsetX < thEl.clientWidth / 2 ? 'left' : 'right';
-      if (dragCol && dragCol.id === column.id || !isCrossDrag && column.parentId) {
+      if (column.fixed || dragCol && dragCol.id === column.id || !isCrossDrag && column.parentId) {
         showDropTip($xeTable, evnt, null, thEl, false, dragPos);
         return;
       }
@@ -11594,6 +11584,35 @@ const Methods = {
         targetColumn: column,
         dragPos
       }, evnt);
+      // 边缘滚动
+      const el = $xeTable.$refs.refElem;
+      if (!el) {
+        return;
+      }
+      const xHandleEl = $xeTable.$refs.refScrollXHandleElem;
+      const tableBody = $xeTable.$refs.tableBody;
+      const tableBodyElem = tableBody ? tableBody.$el : null;
+      const scrollTargetEl = xHandleEl || tableBodyElem;
+      if (scrollTargetEl) {
+        const wrapperRect = el.getBoundingClientRect();
+        const tableWidth = el.clientWidth;
+        const leftContainerElem = $xeTable.$refs.leftContainer;
+        const leftContainerWidth = leftContainerElem ? leftContainerElem.clientWidth : 0;
+        const rightContainerElem = $xeTable.$refs.rightContainer;
+        const rightContainerWidth = rightContainerElem ? rightContainerElem.clientWidth : 0;
+        const srartX = wrapperRect.x + leftContainerWidth;
+        const endX = wrapperRect.x + tableWidth - rightContainerWidth;
+        const distSize = 28;
+        const startDistSize = clientX - srartX;
+        const endDistSize = endX - clientX;
+        if (startDistSize > 0 && startDistSize <= distSize) {
+          const scrollRatio = Math.floor(tableWidth / (startDistSize > distSize / 2 ? 240 : 120));
+          scrollTargetEl.scrollLeft -= scrollRatio * (distSize - startDistSize);
+        } else if (endDistSize > 0 && endDistSize <= distSize) {
+          const scrollRatio = Math.floor(tableWidth / (endDistSize > distSize / 2 ? 240 : 120));
+          scrollTargetEl.scrollLeft += scrollRatio * (distSize - endDistSize);
+        }
+      }
     }
   },
   handleHeaderCellDragMousedownEvent(evnt, params) {
@@ -13151,6 +13170,15 @@ const Methods = {
     });
     this.tableColumn = tableColumn;
   },
+  handleUpdateColumn() {
+    const $xeTable = this;
+    const internalData = $xeTable;
+    const columnList = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().orderBy(internalData.collectColumn, 'renderSortNumber');
+    internalData.collectColumn = columnList;
+    const tableFullColumn = getColumnList(columnList);
+    internalData.tableFullColumn = tableFullColumn;
+    $xeTable.cacheColumnMap();
+  },
   updateScrollXData() {
     const $xeTable = this;
     const props = $xeTable;
@@ -14180,15 +14208,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,
@@ -14366,16 +14388,21 @@ function renderRows(h, _vm, $xeTable, fixedType, tableData, tableColumn) {
       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) {
       // 如果是使用优化模式
@@ -14390,6 +14417,52 @@ function renderRows(h, _vm, $xeTable, fixedType, tableData, tableColumn) {
         renderColumnList = visibleColumn;
       }
     }
+    // 行拖拽
+    if (scrollYLoad && dragRow) {
+      if (renderDataList.length > 2) {
+        const dRowRest = fullAllDataRowIdData[getRowid($xeTable, dragRow)];
+        if (dRowRest) {
+          const drIndex = dRowRest._index;
+          const firstRow = renderDataList[0];
+          const lastRow = renderDataList[renderDataList.length - 1];
+          const firstRowRest = fullAllDataRowIdData[getRowid($xeTable, firstRow)];
+          const lastRowRest = fullAllDataRowIdData[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, {
@@ -14457,9 +14530,9 @@ function renderRows(h, _vm, $xeTable, fixedType, tableData, tableColumn) {
         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'
@@ -14821,6 +14894,7 @@ const header_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
       }, getClass(headerClassName, params), getClass(headerCellClassName, params)],
@@ -14972,19 +15046,23 @@ function renderHeads(h, _vm, headerGroups) {
     } = 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;
@@ -14995,7 +15073,35 @@ function renderHeads(h, _vm, headerGroups) {
           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'],
@@ -15037,7 +15143,7 @@ function renderHeads(h, _vm, headerGroups) {
      */
     h('thead', {
       ref: 'thead'
-    }, renderHeads(h, this, headerGroups))]),
+    }, renderHeads(h, this, renderHeaderList))]),
     /**
      * 其他
      */
@@ -15485,16 +15591,20 @@ function footer_renderHeads(h, _vm, renderColumnList) {
       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;
@@ -15505,6 +15615,30 @@ function footer_renderHeads(h, _vm, renderColumnList) {
         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;
@@ -15919,12 +16053,14 @@ function panel_hideDropTip(_vm) {
   }
 }
 const renderDragTip = (h, _vm) => {
-  const {
-    dragCol
-  } = _vm;
+  const $xeTable = _vm.$xeTable;
+  const dragCol = $xeTable.dragColumnRef;
+  const columnDragOpts = $xeTable.computeColumnDragOpts;
   return h('div', {}, [h('div', {
     ref: 'refDragLineElem',
-    class: 'vxe-table-custom-popup--drag-line'
+    class: ['vxe-table-custom-popup--drag-line', {
+      'is--guides': columnDragOpts.showGuidesStatus
+    }]
   }), h('div', {
     ref: 'refDragTipElem',
     class: 'vxe-table-custom-popup--drag-tip'
@@ -23922,19 +24058,6 @@ function handleUupdateResize(_vm) {
         y: overflowY && scrollYLoad
       };
     },
-    computeTableStyle() {
-      const $xeTable = this;
-      const reactData = $xeTable;
-      const {
-        tableData
-      } = reactData;
-      const columnOpts = $xeTable.computeColumnOpts;
-      const stys = {};
-      if (columnOpts.drag) {
-        stys['--vxe-ui-table-drag-column-move-delay'] = `${Math.max(0.06, Math.min(0.3, tableData.length / 800))}s`;
-      }
-      return stys;
-    },
     tabsResizeFlag() {
       const $xeTable = this;
       const $xeTabs = $xeTable.$xeTabs;
@@ -23990,6 +24113,11 @@ function handleUupdateResize(_vm) {
     maxHeight() {
       this.$nextTick(() => this.recalculate(true));
     },
+    computeSize() {
+      this.$nextTick(() => {
+        this.recalculate(true).then(() => this.refreshScroll());
+      });
+    },
     syncResize(value) {
       if (value) {
         handleUupdateResize(this);
@@ -24409,7 +24537,6 @@ function handleUupdateResize(_vm) {
     const tableBorder = $xeTable.computeTableBorder;
     const virtualScrollBars = $xeTable.computeVirtualScrollBars;
     const isArea = mouseConfig && mouseOpts.area;
-    const tableStyle = $xeTable.computeTableStyle;
     const columnDragOpts = $xeTable.computeColumnDragOpts;
     return h('div', {
       ref: 'refElem',
@@ -24444,7 +24571,6 @@ function handleUupdateResize(_vm) {
         'is--virtual-x': scrollXLoad,
         'is--virtual-y': scrollYLoad
       }],
-      style: tableStyle,
       attrs: {
         spellcheck: false
       },
@@ -27768,7 +27894,9 @@ render_renderer.mixin({
       } = params;
       let cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, column.field);
       if (cellValue) {
-        cellValue = getLabelFormatDate(cellValue, props);
+        if (props.type !== 'time') {
+          cellValue = getLabelFormatDate(cellValue, props);
+        }
       }
       return getCellLabelVNs(h, renderOpts, params, cellValue);
     },