vxe-table 3.13.18 → 3.13.20

package/lib/index.umd.js

@@ -3201,7 +3201,7 @@ function getClass(property, params) {
 ;// ./packages/ui/index.ts
 
 
-const version = "3.13.18";
+const version = "3.13.20";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -3828,7 +3828,7 @@ var es_iterator_map = __webpack_require__(1701);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.13.18"}`;
+const log_version = `table v${"3.13.20"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// ./packages/table/src/columnInfo.ts
@@ -4100,13 +4100,19 @@ function getRowUniqueId() {
   return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().uniqueId('row_');
 }
 // 行主键 key
-function getRowkey($xetable) {
-  return $xetable.rowOpts.keyField || $xetable.rowId || '_X_ROW_KEY';
+function getRowkey($xeTable) {
+  const props = $xeTable;
+  const rowOpts = $xeTable.computeRowOpts;
+  return `${props.rowId || rowOpts.keyField || '_X_ROW_KEY'}`;
 }
 // 行主键 value
 function getRowid($xetable, row) {
   const rowid = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, getRowkey($xetable));
-  return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(rowid) ? '' : encodeURIComponent(rowid);
+  return encodeRowid(rowid);
+}
+// 编码行主键
+function encodeRowid(rowVal) {
+  return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(rowVal) ? '' : encodeURIComponent(rowVal);
 }
 function getPaddingLeftRightSize(elem) {
   if (elem) {
@@ -4132,12 +4138,19 @@ function getCellHeight(height) {
   }
   return height || 0;
 }
-function handleFieldOrColumn(_vm, fieldOrColumn) {
+function handleFieldOrColumn($xeTable, fieldOrColumn) {
   if (fieldOrColumn) {
-    return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(fieldOrColumn) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(fieldOrColumn) ? _vm.getColumnByField(`${fieldOrColumn}`) : fieldOrColumn;
+    return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(fieldOrColumn) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(fieldOrColumn) ? $xeTable.getColumnByField(`${fieldOrColumn}`) : fieldOrColumn;
   }
   return null;
 }
+const handleRowidOrRow = ($xeTable, rowidOrRow) => {
+  if (rowidOrRow) {
+    const rowid = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(rowidOrRow) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(rowidOrRow) ? rowidOrRow : getRowid($xeTable, rowidOrRow);
+    return $xeTable.getRowById(rowid);
+  }
+  return null;
+};
 // 组装列配置
 function assembleColumn(_vm) {
   const {
@@ -8613,6 +8626,10 @@ const Methods = {
     }
     return [];
   },
+  getEl() {
+    const $xeTable = this;
+    return $xeTable.$refs.refElem;
+  },
   /**
    * 获取父容器元素
    */
@@ -8627,14 +8644,27 @@ const Methods = {
    * 获取父容器的高度
    */
   getParentHeight() {
+    const $xeTable = this;
+    const $xeGrid = $xeTable.$xeGrid;
+    const props = $xeTable;
     const {
-      $el,
-      $xegrid,
       height
-    } = this;
-    const parentElem = $el.parentNode;
-    const parentPaddingSize = height === '100%' || height === 'auto' ? getPaddingTopBottomSize(parentElem) : 0;
-    return Math.floor($xegrid ? $xegrid.getParentHeight() : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(getComputedStyle(parentElem).height) - parentPaddingSize);
+    } = props;
+    const el = $xeTable.$refs.refElem;
+    if (el) {
+      const parentElem = el.parentNode;
+      const parentPaddingSize = height === '100%' || height === 'auto' ? getPaddingTopBottomSize(parentElem) : 0;
+      let parentWrapperHeight = 0;
+      if (parentElem) {
+        if ($xeGrid && hasClass(parentElem, 'vxe-grid--table-wrapper')) {
+          parentWrapperHeight = $xeGrid.getParentHeight();
+        } else {
+          parentWrapperHeight = parentElem.clientHeight;
+        }
+      }
+      return Math.floor(parentWrapperHeight - parentPaddingSize);
+    }
+    return 0;
   },
   /**
    * 获取需要排除的高度
@@ -8837,7 +8867,7 @@ const Methods = {
         //   warnLog('vxe.error.reqProp', ['table.show-overflow'])
         // }
         if (this.spanMethod) {
-          warnLog('vxe.error.scrollErrProp', ['table.span-method']);
+          errLog('vxe.error.scrollErrProp', ['table.span-method']);
         }
       }
       handleReserveStatus($xeTable);
@@ -9475,6 +9505,7 @@ const Methods = {
     } = props;
     const {
       fullAllDataRowIdData,
+      fullDataRowIdData,
       tableSourceData,
       sourceDataRowIdData,
       tableFullData,
@@ -9486,7 +9517,7 @@ const Methods = {
     } = treeOpts;
     if (!keepSource) {
       if (true) {
-        warnLog('vxe.error.reqProp', ['keep-source']);
+        errLog('vxe.error.reqProp', ['keep-source']);
       }
       return $xeTable.$nextTick();
     }
@@ -9500,22 +9531,22 @@ const Methods = {
     }
     let reDelFlag = false;
     if (targetRows.length) {
-      targetRows.forEach(row => {
-        if (!$xeTable.isInsertByRow(row)) {
-          const rowid = getRowid($xeTable, row);
-          const oRow = sourceDataRowIdData[rowid];
-          if (oRow && row) {
-            if (field) {
-              external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(row, field, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(oRow, field), true));
-            } else {
-              external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().destructuring(row, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(oRow, true));
-            }
-            if ($xeTable.isRemoveByRow(row)) {
-              const rowRest = fullAllDataRowIdData[rowid];
-              if (rowRest) {
-                const reRow = rowRest.row;
-                tableFullData.unshift(reRow);
-                afterFullData.unshift(reRow);
+      targetRows.forEach(item => {
+        const rowid = getRowid($xeTable, item);
+        const rowRest = fullAllDataRowIdData[rowid];
+        if (rowRest) {
+          const row = rowRest.row;
+          if (!$xeTable.isInsertByRow(row)) {
+            const oRow = sourceDataRowIdData[rowid];
+            if (oRow && row) {
+              if (field) {
+                external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(row, field, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(oRow, field), true));
+              } else {
+                external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().destructuring(row, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(oRow, true));
+              }
+              if (!fullDataRowIdData[rowid] && $xeTable.isRemoveByRow(row)) {
+                tableFullData.unshift(row);
+                afterFullData.unshift(row);
                 reDelFlag = true;
               }
             }
@@ -9703,25 +9734,31 @@ const Methods = {
   },
   /**
    * 检查行或列数据是否发生改变
-   * @param {Row} row 行对象
+   * @param {Row} rowOrId 行对象
    * @param {String} field 字段名
    */
-  isUpdateByRow(row, field) {
+  isUpdateByRow(rowOrId, field) {
+    const $xeTable = this;
+    const props = $xeTable;
+    const internalData = $xeTable;
+    const {
+      keepSource
+    } = props;
     const {
       tableFullColumn,
-      keepSource,
-      sourceDataRowIdData,
-      fullDataRowIdData
-    } = this;
+      fullDataRowIdData,
+      sourceDataRowIdData
+    } = internalData;
     if (keepSource) {
-      const rowid = getRowid(this, row);
+      const rowid = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(rowOrId) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(rowOrId) ? rowOrId : getRowid($xeTable, rowOrId);
+      const rowRest = fullDataRowIdData[rowid];
       // 新增的数据不需要检测
-      if (!fullDataRowIdData[rowid]) {
+      if (!rowRest) {
         return false;
       }
-      const oldRest = sourceDataRowIdData[rowid];
-      if (oldRest) {
-        const oRow = oldRest.row;
+      const row = rowRest.row;
+      const oRow = sourceDataRowIdData[rowid];
+      if (oRow) {
         if (arguments.length > 1) {
           return !eqCellValue(oRow, row, field);
         }
@@ -9783,6 +9820,113 @@ const Methods = {
       tableColumn: this.tableColumn.slice(0)
     };
   },
+  /**
+   * 移动列到指定列的位置
+   * @param fieldOrColumn
+   * @param targetFieldOrColumn
+   * @param options
+   */
+  moveColumnTo(fieldOrColumn, targetFieldOrColumn, options) {
+    const $xeTable = this;
+    const internalData = $xeTable;
+    const {
+      fullColumnIdData,
+      visibleColumn
+    } = internalData;
+    const {
+      dragToChild,
+      dragPos,
+      isCrossDrag
+    } = Object.assign({}, options);
+    const dragCol = handleFieldOrColumn($xeTable, fieldOrColumn);
+    let prevDragCol = null;
+    const colRest = dragCol ? fullColumnIdData[dragCol.id] : null;
+    let defPos = 'left';
+    if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(targetFieldOrColumn)) {
+      if (colRest && targetFieldOrColumn) {
+        let currList = colRest.items;
+        let offsetIndex = colRest._index + targetFieldOrColumn;
+        if (isCrossDrag) {
+          currList = visibleColumn;
+          offsetIndex = colRest._index + targetFieldOrColumn;
+        }
+        if (offsetIndex > 0 && offsetIndex < currList.length - 1) {
+          prevDragCol = currList[offsetIndex];
+        }
+        if (targetFieldOrColumn > 0) {
+          defPos = 'right';
+        }
+      }
+    } else {
+      prevDragCol = handleFieldOrColumn($xeTable, targetFieldOrColumn);
+      const targetColRest = prevDragCol ? fullColumnIdData[prevDragCol.id] : null;
+      if (colRest && targetColRest) {
+        if (targetColRest._index > colRest._index) {
+          defPos = 'right';
+        }
+      }
+    }
+    return $xeTable.handleColDragSwapEvent(null, true, dragCol, prevDragCol, dragPos || defPos, dragToChild === true);
+  },
+  /**
+   * 移动行到指定行的位置
+   * @param rowidOrRow
+   * @param targetRowidOrRow
+   * @param options
+   */
+  moveRowTo(rowidOrRow, targetRowidOrRow, options) {
+    const $xeTable = this;
+    const props = $xeTable;
+    const internalData = $xeTable;
+    const {
+      treeConfig
+    } = props;
+    const {
+      fullAllDataRowIdData,
+      afterFullData
+    } = internalData;
+    const {
+      dragToChild,
+      dragPos,
+      isCrossDrag
+    } = Object.assign({}, options);
+    const treeOpts = $xeTable.computeTreeOpts;
+    const dragRow = handleRowidOrRow($xeTable, rowidOrRow);
+    let prevDragRow = null;
+    let defPos = 'top';
+    const rowRest = dragRow ? fullAllDataRowIdData[getRowid($xeTable, dragRow)] : null;
+    if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(targetRowidOrRow)) {
+      if (rowRest && targetRowidOrRow) {
+        let currList = afterFullData;
+        let offsetIndex = rowRest._index + targetRowidOrRow;
+        if (treeConfig) {
+          currList = rowRest.items;
+          if (treeOpts.transform) {
+            offsetIndex = rowRest.treeIndex + targetRowidOrRow;
+            if (isCrossDrag) {
+              currList = afterFullData;
+              offsetIndex = rowRest._index + targetRowidOrRow;
+            }
+          }
+        }
+        if (offsetIndex >= 0 && offsetIndex <= currList.length - 1) {
+          prevDragRow = currList[offsetIndex];
+        }
+        if (targetRowidOrRow > 0) {
+          defPos = 'bottom';
+        }
+      }
+    } else {
+      prevDragRow = handleRowidOrRow($xeTable, targetRowidOrRow);
+      const targetRowRest = prevDragRow ? fullAllDataRowIdData[getRowid($xeTable, prevDragRow)] : null;
+      if (rowRest && targetRowRest) {
+        if (targetRowRest._index > rowRest._index) {
+          defPos = 'bottom';
+        }
+      }
+    }
+    return $xeTable.handleRowDragSwapEvent(null, true, dragRow, prevDragRow, dragPos || defPos, dragToChild === true);
+  },
   /**
    * 获取表格的全量列
    */
@@ -9805,16 +9949,26 @@ const Methods = {
    * 用于多选行，获取已选中的数据
    */
   getCheckboxRecords(isFull) {
+    const $xeTable = this;
+    const props = $xeTable;
+    const reactData = $xeTable;
+    const internalData = $xeTable;
+    const {
+      treeConfig
+    } = props;
+    const {
+      selectCheckboxMaps
+    } = reactData;
     const {
       tableFullData,
       afterFullData,
-      treeConfig,
-      treeOpts,
-      checkboxOpts,
-      tableFullTreeData,
       afterTreeFullData,
+      tableFullTreeData,
+      fullDataRowIdData,
       afterFullRowMaps
-    } = this;
+    } = internalData;
+    const treeOpts = $xeTable.computeTreeOpts;
+    const checkboxOpts = $xeTable.computeCheckboxOpts;
     const {
       transform,
       mapChildrenField
@@ -9823,21 +9977,18 @@ const Methods = {
       checkField
     } = checkboxOpts;
     const childrenField = treeOpts.children || treeOpts.childrenField;
-    const currTableData = isFull ? transform ? tableFullTreeData : tableFullData : transform ? afterTreeFullData : afterFullData;
     let rowList = [];
     if (checkField) {
       if (treeConfig) {
+        const currTableData = isFull ? transform ? tableFullTreeData : tableFullData : transform ? afterTreeFullData : afterFullData;
         rowList = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().filterTree(currTableData, row => external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, checkField), {
           children: transform ? mapChildrenField : childrenField
         });
       } else {
+        const currTableData = isFull ? tableFullData : afterFullData;
         rowList = currTableData.filter(row => external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, checkField));
       }
     } else {
-      const {
-        selectCheckboxMaps,
-        fullDataRowIdData
-      } = this;
       external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(selectCheckboxMaps, (row, rowid) => {
         if (isFull) {
           if (fullDataRowIdData[rowid]) {
@@ -13609,6 +13760,9 @@ const Methods = {
     } = internalData;
     const dEndMethod = dragEndMethod || (dragConfig ? dragConfig.dragEndMethod : null);
     const dragOffsetIndex = prevDragPos === 'bottom' ? 1 : 0;
+    const errRest = {
+      status: false
+    };
     if (prevDragRow && dragRow) {
       // 判断是否有拖动
       if (prevDragRow !== dragRow) {
@@ -13623,7 +13777,7 @@ const Methods = {
         const isDragToChildFlag = isSelfToChildDrag && dragToChildMethod ? dragToChildMethod(dragParams) : prevDragToChild;
         return Promise.resolve(dEndMethod ? dEndMethod(dragParams) : true).then(status => {
           if (!status) {
-            return;
+            return errRest;
           }
           let oafIndex = -1;
           let nafIndex = -1;
@@ -13654,11 +13808,11 @@ const Methods = {
                   if (isPeerDrag && !isCrossDrag) {
                     if (oldRest.row[parentField] !== newRest.row[parentField]) {
                       // 非同级
-                      return;
+                      return errRest;
                     }
                   } else {
                     if (!isCrossDrag) {
-                      return;
+                      return errRest;
                     }
                     if (oldAllMaps[newRowid]) {
                       isSelfToChildStatus = true;
@@ -13669,19 +13823,19 @@ const Methods = {
                             content: methods_getI18n('vxe.error.treeDragChild')
                           });
                         }
-                        return;
+                        return errRest;
                       }
                     }
                   }
                 } else if (oldLevel) {
                   // 子到根
                   if (!isCrossDrag) {
-                    return;
+                    return errRest;
                   }
                 } else if (newLevel) {
                   // 根到子
                   if (!isCrossDrag) {
-                    return;
+                    return errRest;
                   }
                   if (oldAllMaps[newRowid]) {
                     isSelfToChildStatus = true;
@@ -13692,7 +13846,7 @@ const Methods = {
                           content: methods_getI18n('vxe.error.treeDragChild')
                         });
                       }
-                      return;
+                      return errRest;
                     }
                   }
                 } else {
@@ -13750,26 +13904,34 @@ const Methods = {
           if (reactData.scrollYLoad) {
             $xeTable.updateScrollYSpace();
           }
-          $xeTable.$nextTick().then(() => {
+          if (evnt) {
+            $xeTable.dispatchEvent('row-dragend', {
+              oldRow: dragRow,
+              newRow: prevDragRow,
+              dragRow,
+              dragPos: prevDragPos,
+              dragToChild: isDragToChildFlag,
+              offsetIndex: dragOffsetIndex,
+              _index: {
+                newIndex: nafIndex,
+                oldIndex: oafIndex
+              }
+            }, evnt);
+          }
+          return $xeTable.$nextTick().then(() => {
             $xeTable.updateCellAreas();
             $xeTable.recalculate();
+          }).then(() => {
+            return {
+              status: true
+            };
           });
-          $xeTable.dispatchEvent('row-dragend', {
-            oldRow: dragRow,
-            newRow: prevDragRow,
-            dragRow,
-            dragPos: prevDragPos,
-            dragToChild: isDragToChildFlag,
-            offsetIndex: dragOffsetIndex,
-            _index: {
-              newIndex: nafIndex,
-              oldIndex: oafIndex
-            }
-          }, evnt);
-        }).catch(() => {});
+        }).catch(() => {
+          return errRest;
+        });
       }
     }
-    return Promise.resolve();
+    return Promise.resolve(errRest);
   },
   handleRowDragDragendEvent(evnt) {
     const $xeTable = this;
@@ -13955,6 +14117,9 @@ const Methods = {
       collectColumn
     } = internalData;
     const dragOffsetIndex = prevDragPos === 'right' ? 1 : 0;
+    const errRest = {
+      status: false
+    };
     if (prevDragCol && dragCol) {
       // 判断是否有拖动
       if (prevDragCol !== dragCol) {
@@ -13971,7 +14136,7 @@ const Methods = {
         const isDragToChildFlag = isSelfToChildDrag && dragToChildMethod ? dragToChildMethod(dragParams) : prevDragToChild;
         return Promise.resolve(dragEndMethod ? dragEndMethod(dragParams) : true).then(status => {
           if (!status) {
-            return;
+            return errRest;
           }
           let oafIndex = -1;
           let nafIndex = -1;
@@ -13985,11 +14150,11 @@ const Methods = {
             if (isPeerDrag && !isCrossDrag) {
               if (dragColumn.parentId !== newColumn.parentId) {
                 // 非同级
-                return;
+                return errRest;
               }
             } else {
               if (!isCrossDrag) {
-                return;
+                return errRest;
               }
               if (oldAllMaps[newColumn.id]) {
                 isSelfToChildStatus = true;
@@ -14000,19 +14165,19 @@ const Methods = {
                       content: methods_getI18n('vxe.error.treeDragChild')
                     });
                   }
-                  return;
+                  return errRest;
                 }
               }
             }
           } else if (dragColumn.parentId) {
             // 子到根
             if (!isCrossDrag) {
-              return;
+              return errRest;
             }
           } else if (newColumn.parentId) {
             // 根到子
             if (!isCrossDrag) {
-              return;
+              return errRest;
             }
             if (oldAllMaps[newColumn.id]) {
               isSelfToChildStatus = true;
@@ -14023,7 +14188,7 @@ const Methods = {
                     content: methods_getI18n('vxe.error.treeDragChild')
                   });
                 }
-                return;
+                return errRest;
               }
             }
           } else {
@@ -14092,25 +14257,32 @@ const Methods = {
               $xeTable.clearCopyCellArea();
             }
           }
-          $xeTable.dispatchEvent('column-dragend', {
-            oldColumn: dragColumn,
-            newColumn,
-            dragColumn,
-            dragPos: prevDragPos,
-            dragToChild: isDragToChildFlag,
-            offsetIndex: dragOffsetIndex,
-            _index: {
-              newIndex: nafIndex,
-              oldIndex: oafIndex
-            }
-          }, evnt);
+          if (evnt) {
+            $xeTable.dispatchEvent('column-dragend', {
+              oldColumn: dragColumn,
+              newColumn,
+              dragColumn,
+              dragPos: prevDragPos,
+              dragToChild: isDragToChildFlag,
+              offsetIndex: dragOffsetIndex,
+              _index: {
+                newIndex: nafIndex,
+                oldIndex: oafIndex
+              }
+            }, evnt);
+          }
           if (isSyncColumn) {
             $xeTable.handleColDragSwapColumn();
           }
-        }).catch(() => {});
+          return {
+            status: true
+          };
+        }).catch(() => {
+          return errRest;
+        });
       }
     }
-    return Promise.resolve();
+    return Promise.resolve(errRest);
   },
   handleHeaderCellDragDragendEvent(evnt) {
     const $xeTable = this;
@@ -16776,6 +16948,7 @@ function renderTdColumn(h, _vm, seq, rowid, fixedType, isOptimizeMode, rowLevel,
   tdOns.dblclick = evnt => {
     $xeTable.triggerCellDblclickEvent(evnt, cellParams);
   };
+  let isMergeCell = false;
   // 合并行或列
   if (mergeList.length) {
     const spanRest = mergeBodyMethod(mergeList, _rowIndex, _columnIndex);
@@ -16788,9 +16961,11 @@ function renderTdColumn(h, _vm, seq, rowid, fixedType, isOptimizeMode, rowLevel,
         return null;
       }
       if (rowspan > 1) {
+        isMergeCell = true;
         tdAttrs.rowspan = rowspan;
       }
       if (colspan > 1) {
+        isMergeCell = true;
         tdAttrs.colspan = colspan;
       }
     }
@@ -16825,11 +17000,13 @@ function renderTdColumn(h, _vm, seq, rowid, fixedType, isOptimizeMode, rowLevel,
   const isLastColumn = $columnIndex === columns.length - 1;
   const isAutoCellWidth = !column.resizeWidth && (column.minWidth === 'auto' || column.width === 'auto');
   let isVNPreEmptyStatus = false;
-  if (!dragRow || getRowid($xeTable, dragRow) !== rowid) {
-    if (scrollYLoad && (_rowIndex < scrollYStore.visibleStartIndex - scrollYStore.preloadSize || _rowIndex > scrollYStore.visibleEndIndex + scrollYStore.preloadSize)) {
-      isVNPreEmptyStatus = true;
-    } else if (scrollXLoad && !column.fixed && (_columnIndex < scrollXStore.visibleStartIndex - scrollXStore.preloadSize || _columnIndex > scrollXStore.visibleEndIndex + scrollXStore.preloadSize)) {
-      isVNPreEmptyStatus = true;
+  if (!isMergeCell) {
+    if (!dragRow || getRowid($xeTable, dragRow) !== rowid) {
+      if (scrollYLoad && (_rowIndex < scrollYStore.visibleStartIndex - scrollYStore.preloadSize || _rowIndex > scrollYStore.visibleEndIndex + scrollYStore.preloadSize)) {
+        isVNPreEmptyStatus = true;
+      } else if (scrollXLoad && !column.fixed && (_columnIndex < scrollXStore.visibleStartIndex - scrollXStore.preloadSize || _columnIndex > scrollXStore.visibleEndIndex + scrollXStore.preloadSize)) {
+        isVNPreEmptyStatus = true;
+      }
     }
   }
   const tcStyle = {};
@@ -18050,6 +18227,7 @@ function footer_renderRows(h, _vm, tableColumn, footerTableData, row, $rowIndex,
         cell: evnt.currentTarget
       }, cellParams), evnt);
     };
+    let isMergeCell = false;
     // 合并行或列
     if (mergeFooterList.length) {
       const spanRest = mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex);
@@ -18062,9 +18240,11 @@ function footer_renderRows(h, _vm, tableColumn, footerTableData, row, $rowIndex,
           return null;
         }
         if (rowspan > 1) {
+          isMergeCell = true;
           attrs.rowspan = rowspan;
         }
         if (colspan > 1) {
+          isMergeCell = true;
           attrs.colspan = colspan;
         }
       }
@@ -18087,8 +18267,10 @@ function footer_renderRows(h, _vm, tableColumn, footerTableData, row, $rowIndex,
     const isLastColumn = $columnIndex === tableColumn.length - 1;
     const isAutoCellWidth = !column.resizeWidth && (column.minWidth === 'auto' || column.width === 'auto');
     let isVNPreEmptyStatus = false;
-    if (scrollXLoad && !column.fixed && (_columnIndex < scrollXStore.visibleStartIndex - scrollXStore.preloadSize || _columnIndex > scrollXStore.visibleEndIndex + scrollXStore.preloadSize)) {
-      isVNPreEmptyStatus = true;
+    if (!isMergeCell) {
+      if (scrollXLoad && !column.fixed && (_columnIndex < scrollXStore.visibleStartIndex - scrollXStore.preloadSize || _columnIndex > scrollXStore.visibleEndIndex + scrollXStore.preloadSize)) {
+        isVNPreEmptyStatus = true;
+      }
     }
     const tcStyle = {};
     if (hasEllipsis) {
@@ -29659,6 +29841,10 @@ Object.keys(table.methods).forEach(name => {
       }
       return [];
     },
+    getEl() {
+      const $xeGrid = this;
+      return $xeGrid.$refs.refElem;
+    },
     /**
      * 获取需要排除的高度
      */
@@ -31240,6 +31426,69 @@ function handleExportTreeSelectMethod(params) {
   } = params;
   return options.original ? getCellValue(row, column) : getTreeSelectCellValue(column.editRender || column.cellRender, params);
 }
+function handleNumberCell(h, renderOpts, params) {
+  const {
+    props = {},
+    showNegativeStatus
+  } = renderOpts;
+  const {
+    row,
+    column
+  } = params;
+  const {
+    type
+  } = props;
+  let cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, column.field);
+  let isNegative = false;
+  if (!isEmptyValue(cellValue)) {
+    const numberInputConfig = render_getConfig().numberInput || {};
+    if (type === 'float') {
+      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);
+      }
+      if (showNegativeStatus) {
+        if (cellValue < 0) {
+          isNegative = true;
+        }
+      }
+    } else if (type === 'amount') {
+      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().toNumber(cellValue);
+      if (showNegativeStatus) {
+        if (cellValue < 0) {
+          isNegative = true;
+        }
+      }
+      cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().commafy(cellValue, {
+        digits
+      });
+      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}`;
+      }
+    } else {
+      if (showNegativeStatus) {
+        if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(cellValue) < 0) {
+          isNegative = true;
+        }
+      }
+    }
+  }
+  return getCellLabelVNs(h, renderOpts, params, cellValue, isNegative ? {
+    class: 'is--negative'
+  } : {});
+}
 /**
  * 表格 - 渲染器
  */
@@ -31311,72 +31560,22 @@ render_renderer.mixin({
     renderTableFilter: defaultFilterRender,
     tableFilterDefaultMethod: handleInputFilterMethod
   },
-  VxeNumberInput: {
-    tableAutoFocus: 'input',
-    renderTableEdit: defaultEditRender,
-    renderTableCell(h, renderOpts, params) {
-      const {
-        props = {},
-        showNegativeStatus
-      } = renderOpts;
+  FormatNumberInput: {
+    renderTableDefault: handleNumberCell,
+    tableFilterDefaultMethod: handleInputFilterMethod,
+    tableExportMethod(params) {
       const {
         row,
         column
       } = params;
-      const {
-        type
-      } = props;
-      let cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, column.field);
-      let isNegative = false;
-      if (!isEmptyValue(cellValue)) {
-        const numberInputConfig = render_getConfig().numberInput || {};
-        if (type === 'float') {
-          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);
-          }
-          if (showNegativeStatus) {
-            if (cellValue < 0) {
-              isNegative = true;
-            }
-          }
-        } else if (type === 'amount') {
-          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().toNumber(cellValue);
-          if (showNegativeStatus) {
-            if (cellValue < 0) {
-              isNegative = true;
-            }
-          }
-          cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().commafy(cellValue, {
-            digits
-          });
-          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}`;
-          }
-        } else {
-          if (showNegativeStatus) {
-            if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(cellValue) < 0) {
-              isNegative = true;
-            }
-          }
-        }
-      }
-      return getCellLabelVNs(h, renderOpts, params, cellValue, isNegative ? {
-        class: 'is--negative'
-      } : {});
-    },
+      const cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, column.field);
+      return cellValue;
+    }
+  },
+  VxeNumberInput: {
+    tableAutoFocus: 'input',
+    renderTableEdit: defaultEditRender,
+    renderTableCell: handleNumberCell,
     renderTableFooter(h, renderOpts, params) {
       const {
         props = {}
@@ -31513,11 +31712,22 @@ render_renderer.mixin({
     tableFilterDefaultMethod: handleFilterMethod,
     tableExportMethod: handleExportSelectMethod
   },
+  /**
+   * 已废弃，被 FormatSelect 替换
+   * @deprecated
+   */
   formatOption: {
     renderTableDefault(h, renderOpts, params) {
       return getCellLabelVNs(h, renderOpts, params, getSelectCellValue(renderOpts, params));
     }
   },
+  FormatSelect: {
+    renderTableDefault(h, renderOpts, params) {
+      return getCellLabelVNs(h, renderOpts, params, getSelectCellValue(renderOpts, params));
+    },
+    tableFilterDefaultMethod: handleFilterMethod,
+    tableExportMethod: handleExportSelectMethod
+  },
   VxeTreeSelect: {
     tableAutoFocus: 'input',
     renderTableEdit: defaultTableOrTreeSelectEditRender,
@@ -31534,11 +31744,21 @@ render_renderer.mixin({
     },
     tableExportMethod: handleExportTreeSelectMethod
   },
+  /**
+   * 已废弃，被 FormatTreeSelect 替换
+   * @deprecated
+   */
   formatTree: {
     renderTableDefault(h, renderOpts, params) {
       return getCellLabelVNs(h, renderOpts, params, getTreeSelectCellValue(renderOpts, params));
     }
   },
+  FormatTreeSelect: {
+    renderTableDefault(h, renderOpts, params) {
+      return getCellLabelVNs(h, renderOpts, params, getTreeSelectCellValue(renderOpts, params));
+    },
+    tableExportMethod: handleExportTreeSelectMethod
+  },
   VxeColorPicker: {
     tableAutoFocus: 'input',
     renderTableEdit(h, renderOpts, params) {