vxe-table 3.11.38 → 3.12.0-beta.0

package/lib/index.umd.js

@@ -2220,7 +2220,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.11.38";
+const version = "3.12.0-beta.0";
 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.38"}`;
+const log_version = `table v${"3.12.0-beta.0"}`;
 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');
@@ -8365,11 +8337,8 @@ const Methods = {
       editStore,
       currentRow,
       mouseConfig,
-      keyboardConfig,
-      keyboardOpts,
       spanMethod,
-      mergeList,
-      mergeFooterList,
+      expandColumn,
       footerSpanMethod,
       isAllOverflow,
       visibleColumn
@@ -8426,10 +8395,17 @@ const Methods = {
           if (isGroup) {
             renderColumnList = visibleColumn;
           } else {
-            // 如果是使用优化模式
             if (fixedType) {
-              if (scrollXLoad || allColumnHeaderOverflow) {
-                renderColumnList = fixedColumn;
+              // 如果是使用优化模式
+              if (scrollXLoad || scrollYLoad || allColumnHeaderOverflow) {
+                // 如果不支持优化模式
+                if (spanMethod || footerSpanMethod) {
+                  renderColumnList = visibleColumn;
+                } else {
+                  renderColumnList = fixedColumn || [];
+                }
+              } else {
+                renderColumnList = visibleColumn;
               }
             }
           }
@@ -8516,14 +8492,14 @@ const Methods = {
           }
           let tWidth = tableWidth;
           let renderColumnList = tableColumn;
-          // 如果是使用优化模式
           if (fixedType) {
-            // 如果存在展开行使用全量渲染
-            if (!this.expandColumn && (scrollXLoad || scrollYLoad || (allColumnOverflow ? isAllOverflow : allColumnOverflow))) {
-              if (!mergeList.length && !spanMethod && !(keyboardConfig && keyboardOpts.isMerge)) {
-                renderColumnList = fixedColumn;
-              } else {
+            // 如果是使用优化模式
+            if (scrollXLoad || scrollYLoad || allColumnOverflow && isAllOverflow) {
+              // 如果不支持优化模式
+              if (expandColumn || spanMethod || footerSpanMethod) {
                 renderColumnList = visibleColumn;
+              } else {
+                renderColumnList = fixedColumn || [];
               }
             } else {
               renderColumnList = visibleColumn;
@@ -8541,14 +8517,14 @@ const Methods = {
         } else if (layout === 'footer') {
           let tWidth = tableWidth;
           let renderColumnList = tableColumn;
-          // 如果是使用优化模式
           if (fixedType) {
-            // 如果存在展开行使用全量渲染
-            if (!this.expandColumn && (scrollXLoad || allColumnFooterOverflow)) {
-              if (!mergeFooterList.length || !footerSpanMethod) {
-                renderColumnList = fixedColumn;
-              } else {
+            // 如果是使用优化模式
+            if (scrollXLoad || scrollYLoad || allColumnFooterOverflow) {
+              // 如果不支持优化模式
+              if (spanMethod || footerSpanMethod) {
                 renderColumnList = visibleColumn;
+              } else {
+                renderColumnList = fixedColumn || [];
               }
             } else {
               renderColumnList = visibleColumn;
@@ -10997,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);
       }
@@ -11373,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;
@@ -11389,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) {
@@ -11403,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,
@@ -11524,9 +11497,6 @@ const Methods = {
               $xeTable.clearCopyCellArea();
             }
           }
-          $xeTable.refreshColumn(true).then(() => {
-            $xeTable.updateCellAreas();
-          });
           $xeTable.dispatchEvent('column-dragend', {
             oldColumn,
             newColumn,
@@ -11537,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;
@@ -11548,6 +11539,9 @@ const Methods = {
     reactData.dragCol = null;
     setTimeout(() => {
       reactData.isDragColMove = false;
+      $xeTable.recalculate().then(() => {
+        $xeTable.loadScrollXData();
+      });
     }, 500);
   },
   handleHeaderCellDragDragoverEvent(evnt) {
@@ -11573,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;
       }
@@ -11590,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) {
@@ -13147,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;
@@ -14176,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,
@@ -14336,71 +14362,122 @@ function renderRows(h, _vm, $xeTable, fixedType, tableData, tableColumn) {
     elemStore[`${prefix}emptyBlock`] = null;
   },
   render(h) {
+    const props = this;
     const $xeTable = this.$parent;
+    const tableProps = $xeTable;
+    const tableReactData = $xeTable;
+    const tableInternalData = $xeTable;
     const {
-      _e,
-      $parent: $xetable,
-      fixedColumn,
-      fixedType
-    } = this;
-    const rowOpts = $xeTable.computeRowOpts;
-    const rowDragOpts = $xeTable.computeRowDragOpts;
-    let {
-      $scopedSlots,
       tId,
-      tableData,
-      tableColumn,
-      visibleColumn,
-      expandColumn,
+      $scopedSlots
+    } = $xeTable;
+    const {
+      fixedColumn,
+      fixedType,
+      tableColumn
+    } = props;
+    const {
       showOverflow: allColumnOverflow,
-      keyboardConfig,
-      keyboardOpts,
-      mergeList,
       spanMethod,
+      footerSpanMethod,
+      mouseConfig
+    } = tableProps;
+    const {
+      tableData,
       scrollXLoad,
       scrollYLoad,
       isAllOverflow,
-      emptyOpts,
-      mouseConfig,
-      mouseOpts,
-      sYOpts,
-      isDragRowMove
-    } = $xetable;
-    // 如果是使用优化模式
+      isDragRowMove,
+      expandColumn,
+      dragRow,
+      dragCol
+    } = tableReactData;
+    const {
+      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) {
-      // 如果存在展开行使用全量渲染
-      if (!expandColumn && (scrollXLoad || scrollYLoad || (allColumnOverflow ? isAllOverflow : allColumnOverflow))) {
-        if (!mergeList.length && !spanMethod && !(keyboardConfig && keyboardOpts.isMerge)) {
-          tableColumn = fixedColumn;
+      // 如果是使用优化模式
+      if (scrollXLoad || scrollYLoad || allColumnOverflow && isAllOverflow) {
+        // 如果不支持优化模式
+        if (expandColumn || spanMethod || footerSpanMethod) {
+          renderColumnList = visibleColumn;
         } else {
-          tableColumn = visibleColumn;
-          // 检查固定列是否被合并，合并范围是否超出固定列
-          // if (mergeList.length && !isMergeLeftFixedExceeded && fixedType === 'left') {
-          //   tableColumn = fixedColumn
-          // } else if (mergeList.length && !isMergeRightFixedExceeded && fixedType === 'right') {
-          //   tableColumn = fixedColumn
-          // } else {
-          //   tableColumn = visibleColumn
-          // }
+          renderColumnList = fixedColumn || [];
         }
       } else {
-        tableColumn = visibleColumn;
+        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, {
-        $table: $xetable
+        $table: $xeTable,
+        $grid: $xeTable.xegrid
       }, h);
     } else {
       const compConf = emptyOpts.name ? body_renderer.get(emptyOpts.name) : null;
       const rtEmptyView = compConf ? compConf.renderTableEmpty || compConf.renderTableEmptyView || compConf.renderEmpty : null;
       if (rtEmptyView) {
         emptyContent = getSlotVNs(rtEmptyView.call(this, h, emptyOpts, {
-          $table: $xetable
+          $table: $xeTable
         }));
       } else {
-        emptyContent = $xetable.emptyText || body_getI18n('vxe.table.emptyText');
+        emptyContent = tableProps.emptyText || body_getI18n('vxe.table.emptyText');
       }
     }
     const ons = {
@@ -14416,7 +14493,7 @@ function renderRows(h, _vm, $xeTable, fixedType, tableData, tableColumn) {
         xid: tId
       },
       on: ons
-    }, [fixedType ? _e() : h('div', {
+    }, [fixedType ? body_renderEmptyElement($xeTable) : h('div', {
       class: 'vxe-body--x-space',
       ref: 'xSpace'
     }), h('div', {
@@ -14437,7 +14514,7 @@ function renderRows(h, _vm, $xeTable, fixedType, tableData, tableColumn) {
      */
     h('colgroup', {
       ref: 'colgroup'
-    }, tableColumn.map((column, $columnIndex) => {
+    }, renderColumnList.map((column, $columnIndex) => {
       return h('col', {
         attrs: {
           name: column.id
@@ -14453,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, tableColumn)) : h('tbody', {
+    }, renderRows(h, this, $xeTable, fixedType, renderDataList, renderColumnList)) : h('tbody', {
       ref: 'tbody'
-    }, renderRows(h, this, $xetable, fixedType, tableData, tableColumn))]), 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'
@@ -14465,9 +14542,9 @@ function renderRows(h, _vm, $xeTable, fixedType, tableData, tableColumn) {
       class: 'vxe-table--cell-main-area-btn',
       on: {
         mousedown(evnt) {
-          if ($xetable.triggerCellAreaExtendMousedownEvent) {
-            $xetable.triggerCellAreaExtendMousedownEvent(evnt, {
-              $table: $xetable,
+          if ($xeTable.triggerCellAreaExtendMousedownEvent) {
+            $xeTable.triggerCellAreaExtendMousedownEvent(evnt, {
+              $table: $xeTable,
               fixed: fixedType,
               type: renderType
             });
@@ -14703,7 +14780,8 @@ function renderRows(h, _vm, $xeTable, fixedType, tableData, tableColumn) {
 
 
 const {
-  renderer: header_renderer
+  renderer: header_renderer,
+  renderEmptyElement: header_renderEmptyElement
 } = core_.VxeUI;
 const cellType = 'header';
 const header_renderRows = (h, _vm, cols, $rowIndex) => {
@@ -14816,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)],
@@ -14944,41 +15023,92 @@ function renderHeads(h, _vm, headerGroups) {
     elemStore[`${prefix}repair`] = null;
   },
   render(h) {
+    const props = this;
+    const $xeTable = this.$parent;
+    const tableProps = $xeTable;
+    const tableReactData = $xeTable;
+    const tableInternalData = $xeTable;
+    const {
+      tId
+    } = $xeTable;
     const {
-      _e,
-      $parent: $xetable,
       fixedType,
-      headerColumn,
-      tableColumn,
-      fixedColumn
+      fixedColumn,
+      tableColumn
+    } = props;
+    const {
+      headerColumn
     } = this;
     const {
-      tId,
-      isGroup,
-      visibleColumn,
       showHeaderOverflow: allColumnHeaderOverflow,
+      spanMethod,
+      footerSpanMethod
+    } = tableProps;
+    const {
+      isGroup,
       scrollXLoad,
-      scrollbarWidth
-    } = $xetable;
-    let headerGroups = headerColumn;
+      scrollYLoad,
+      scrollbarWidth,
+      dragCol
+    } = tableReactData;
+    const {
+      visibleColumn,
+      fullColumnIdData
+    } = tableInternalData;
+    let renderHeaderList = headerColumn;
     let renderColumnList = tableColumn;
     if (isGroup) {
       renderColumnList = visibleColumn;
     } else {
-      // 如果是使用优化模式
       if (fixedType) {
-        if (scrollXLoad || allColumnHeaderOverflow) {
-          renderColumnList = fixedColumn;
+        // 如果是使用优化模式
+        if (scrollXLoad || scrollYLoad || allColumnHeaderOverflow) {
+          // 如果不支持优化模式
+          if (spanMethod || footerSpanMethod) {
+            renderColumnList = visibleColumn;
+          } else {
+            renderColumnList = fixedColumn || [];
+          }
+        } else {
+          renderColumnList = visibleColumn;
+        }
+      }
+      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);
+            }
+          }
         }
       }
-      headerGroups = [renderColumnList];
     }
     return h('div', {
       class: ['vxe-table--header-wrapper', fixedType ? `fixed-${fixedType}--wrapper` : 'body--wrapper'],
       attrs: {
         xid: tId
       }
-    }, [fixedType ? _e() : h('div', {
+    }, [fixedType ? header_renderEmptyElement($xeTable) : h('div', {
       class: 'vxe-body--x-space',
       ref: 'xSpace'
     }), h('table', {
@@ -15013,7 +15143,7 @@ function renderHeads(h, _vm, headerGroups) {
      */
     h('thead', {
       ref: 'thead'
-    }, renderHeads(h, this, headerGroups))]),
+    }, renderHeads(h, this, renderHeaderList))]),
     /**
      * 其他
      */
@@ -15169,7 +15299,8 @@ function renderHeads(h, _vm, headerGroups) {
 
 const footer_renderType = 'footer';
 const {
-  renderer: footer_renderer
+  renderer: footer_renderer,
+  renderEmptyElement: footer_renderEmptyElement
 } = core_.VxeUI;
 function mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex) {
   for (let mIndex = 0; mIndex < mergeFooterList.length; mIndex++) {
@@ -15357,24 +15488,24 @@ function footer_renderRows(h, _vm, tableColumn, footerTableData, row, $rowIndex,
     class: 'vxe-footer--gutter col--gutter'
   })] : []);
 }
-function footer_renderHeads(h, _vm, footerTableData) {
+function footer_renderHeads(h, _vm, renderColumnList) {
   const $xeTable = _vm.$parent;
+  const props = _vm;
   const columnOpts = $xeTable.computeColumnOpts;
   const columnDragOpts = $xeTable.computeColumnDragOpts;
   const {
-    $parent: $xetable,
     fixedType,
-    tableColumn
-  } = _vm;
+    footerTableData
+  } = props;
   const {
     footerRowClassName,
     footerRowStyle,
     isDragColMove
-  } = $xetable;
+  } = $xeTable;
   return footerTableData.map((row, $rowIndex) => {
     const _rowIndex = $rowIndex;
     const rowParams = {
-      $table: $xetable,
+      $table: $xeTable,
       row,
       _rowIndex,
       $rowIndex,
@@ -15390,13 +15521,13 @@ function footer_renderHeads(h, _vm, footerTableData) {
           class: ['vxe-footer--row', footerRowClassName ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(footerRowClassName) ? footerRowClassName(rowParams) : footerRowClassName : ''],
           style: footerRowStyle ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(footerRowStyle) ? footerRowStyle(rowParams) : footerRowStyle : null
         }
-      }, footer_renderRows(h, _vm, tableColumn, footerTableData, row, $rowIndex, _rowIndex));
+      }, footer_renderRows(h, _vm, renderColumnList, footerTableData, row, $rowIndex, _rowIndex));
     }
     return h('tr', {
       key: $rowIndex,
       class: ['vxe-footer--row', footerRowClassName ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(footerRowClassName) ? footerRowClassName(rowParams) : footerRowClassName : ''],
       style: footerRowStyle ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(footerRowStyle) ? footerRowStyle(rowParams) : footerRowStyle : null
-    }, footer_renderRows(h, _vm, tableColumn, footerTableData, row, $rowIndex, _rowIndex));
+    }, footer_renderRows(h, _vm, renderColumnList, footerTableData, row, $rowIndex, _rowIndex));
   });
 }
 /* harmony default export */ var footer = ({
@@ -15441,35 +15572,71 @@ function footer_renderHeads(h, _vm, footerTableData) {
     elemStore[`${prefix}xSpace`] = null;
   },
   render(h) {
-    let {
-      _e,
-      $parent: $xetable,
+    const props = this;
+    const $xeTable = this.$parent;
+    const tableProps = $xeTable;
+    const tableReactData = $xeTable;
+    const tableInternalData = $xeTable;
+    const {
+      tId
+    } = $xeTable;
+    const {
       fixedType,
       fixedColumn,
-      tableColumn,
-      footerTableData
-    } = this;
+      tableColumn
+    } = props;
     const {
-      tId,
-      mergeFooterList,
+      spanMethod,
       footerSpanMethod,
+      showFooterOverflow: allColumnFooterOverflow
+    } = tableProps;
+    const {
+      visibleColumn,
+      fullColumnIdData
+    } = tableInternalData;
+    const {
       scrollXLoad,
-      showFooterOverflow: allColumnFooterOverflow,
+      scrollYLoad,
       scrollbarWidth,
-      visibleColumn,
-      expandColumn
-    } = $xetable;
+      dragCol
+    } = tableReactData;
+    let renderColumnList = tableColumn;
     // 如果是使用优化模式
     if (fixedType) {
-      // 如果存在展开行使用全量渲染
-      if (!expandColumn && (scrollXLoad || allColumnFooterOverflow)) {
-        if (!mergeFooterList.length || !footerSpanMethod) {
-          tableColumn = fixedColumn;
+      // 如果是使用优化模式
+      if (scrollXLoad || scrollYLoad || allColumnFooterOverflow) {
+        // 如果不支持优化模式
+        if (spanMethod || footerSpanMethod) {
+          renderColumnList = visibleColumn;
         } else {
-          tableColumn = visibleColumn;
+          renderColumnList = fixedColumn || [];
         }
       } else {
-        tableColumn = visibleColumn;
+        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 = {};
@@ -15482,7 +15649,7 @@ function footer_renderHeads(h, _vm, footerTableData) {
         xid: tId
       },
       on: ons
-    }, [fixedType ? _e() : h('div', {
+    }, [fixedType ? footer_renderEmptyElement($xeTable) : h('div', {
       class: 'vxe-body--x-space',
       ref: 'xSpace'
     }), h('table', {
@@ -15500,7 +15667,7 @@ function footer_renderHeads(h, _vm, footerTableData) {
      */
     h('colgroup', {
       ref: 'colgroup'
-    }, tableColumn.map((column, $columnIndex) => {
+    }, renderColumnList.map((column, $columnIndex) => {
       return h('col', {
         attrs: {
           name: column.id
@@ -15517,7 +15684,7 @@ function footer_renderHeads(h, _vm, footerTableData) {
      */
     h('tfoot', {
       ref: 'tfoot'
-    }, footer_renderHeads(h, this, footerTableData))])]);
+    }, footer_renderHeads(h, this, renderColumnList))])]);
   },
   methods: {
     /**
@@ -23889,19 +24056,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;
@@ -23957,6 +24111,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);
@@ -24376,7 +24535,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',
@@ -24411,7 +24569,6 @@ function handleUupdateResize(_vm) {
         'is--virtual-x': scrollXLoad,
         'is--virtual-y': scrollYLoad
       }],
-      style: tableStyle,
       attrs: {
         spellcheck: false
       },
@@ -26937,6 +27094,9 @@ const {
 } = core_.VxeUI;
 const componentDefaultModelProp = 'value';
 const defaultCompProps = {};
+function handleDefaultValue(value, defaultVal, initVal) {
+  return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(value) ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(defaultVal) ? initVal : defaultVal : value;
+}
 function parseDate(value, props) {
   return value && props.valueFormat ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toStringDate(value, props.valueFormat) : value;
 }
@@ -27634,15 +27794,27 @@ render_renderer.mixin({
       if (cellValue) {
         const numberInputConfig = render_getConfig().numberInput || {};
         if (type === 'float') {
-          const digits = props.digits || numberInputConfig.digits || 1;
+          const autoFill = handleDefaultValue(props.autoFill, numberInputConfig.autoFill, true);
+          const digits = handleDefaultValue(props.digits, numberInputConfig.digits, 1);
           cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toFixed(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().floor(cellValue, digits), digits);
+          if (!autoFill) {
+            cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(cellValue);
+          }
         } else if (type === 'amount') {
-          const digits = props.digits || numberInputConfig.digits || 2;
+          const autoFill = handleDefaultValue(props.autoFill, numberInputConfig.autoFill, true);
+          const digits = handleDefaultValue(props.digits, numberInputConfig.digits, 2);
+          const showCurrency = handleDefaultValue(props.showCurrency, numberInputConfig.showCurrency, false);
           cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().commafy(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(cellValue), {
             digits
           });
-          const showCurrency = props.showCurrency;
-          if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(showCurrency) ? showCurrency : numberInputConfig.showCurrency) {
+          if (!autoFill) {
+            const [iStr, dStr] = cellValue.split('.');
+            if (dStr) {
+              const dRest = dStr.replace(/0+$/, '');
+              cellValue = dRest ? [iStr, '.', dRest].join('') : iStr;
+            }
+          }
+          if (showCurrency) {
             cellValue = `${props.currencySymbol || numberInputConfig.currencySymbol || render_getI18n('vxe.numberInput.currencySymbol') || ''}${cellValue}`;
           }
         }
@@ -27662,20 +27834,38 @@ render_renderer.mixin({
         type
       } = props;
       // 兼容老模式
-      const cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(row) ? row[_columnIndex] : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, column.field);
-      if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(cellValue)) {
+      const itemValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(row) ? row[_columnIndex] : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, column.field);
+      if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(itemValue)) {
         const numberInputConfig = render_getConfig().numberInput || {};
         if (type === 'float') {
-          const digits = props.digits || numberInputConfig.digits || 1;
-          return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toFixed(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().floor(cellValue, digits), digits);
+          const autoFill = handleDefaultValue(props.autoFill, numberInputConfig.autoFill, true);
+          const digits = handleDefaultValue(props.digits, numberInputConfig.digits, 1);
+          let amountLabel = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toFixed(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().floor(itemValue, digits), digits);
+          if (!autoFill) {
+            amountLabel = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(amountLabel);
+          }
+          return amountLabel;
         } else if (type === 'amount') {
-          const digits = props.digits || numberInputConfig.digits || 2;
-          return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().commafy(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(cellValue), {
+          const autoFill = handleDefaultValue(props.autoFill, numberInputConfig.autoFill, true);
+          const digits = handleDefaultValue(props.digits, numberInputConfig.digits, 2);
+          const showCurrency = handleDefaultValue(props.showCurrency, numberInputConfig.showCurrency, false);
+          let amountLabel = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().commafy(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(itemValue), {
             digits
           });
+          if (!autoFill) {
+            const [iStr, dStr] = amountLabel.split('.');
+            if (dStr) {
+              const dRest = dStr.replace(/0+$/, '');
+              amountLabel = dRest ? [iStr, '.', dRest].join('') : iStr;
+            }
+          }
+          if (showCurrency) {
+            amountLabel = `${props.currencySymbol || numberInputConfig.currencySymbol || render_getI18n('vxe.numberInput.currencySymbol') || ''}${amountLabel}`;
+          }
+          return amountLabel;
         }
       }
-      return getFuncText(cellValue, 1);
+      return getFuncText(itemValue, 1);
     },
     renderTableDefault: defaultEditRender,
     renderTableFilter: defaultFilterRender,
@@ -27702,7 +27892,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);
     },