vxe-table 3.18.0 → 3.18.2

package/lib/index.umd.js

@@ -2002,7 +2002,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.18.0";
+const version = "3.18.2";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2678,7 +2678,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.18.0"}`;
+const log_version = `table v${"3.18.2"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -2781,6 +2781,7 @@ class ColumnInfo {
       headerClassName: _vm.headerClassName,
       footerClassName: _vm.footerClassName,
       formatter,
+      headerFormatter: _vm.headerFormatter,
       footerFormatter: _vm.footerFormatter,
       padding: _vm.padding,
       verticalAlign: _vm.verticalAlign,
@@ -2971,14 +2972,19 @@ function createInternalData() {
     sourceDataRowIdData: {},
     fullColumnIdData: {},
     fullColumnFieldData: {},
+    // 合并表头单元格的数据
+    mergeHeaderList: [],
+    mergeHeaderMaps: {},
+    // 已合并单元格数据集合
+    mergeHeaderCellMaps: {},
     // 合并单元格的数据
     mergeBodyList: [],
     mergeBodyMaps: {},
+    // 已合并单元格数据集合
+    mergeBodyCellMaps: {},
     // 合并表尾的数据
     mergeFooterList: [],
     mergeFooterMaps: {},
-    // 已合并单元格数据集合
-    mergeBodyCellMaps: {},
     // 已合并表尾数据集合
     mergeFooterCellMaps: {},
     // 已展开的行集合
@@ -3069,6 +3075,72 @@ const convertHeaderColumnToRows = originColumns => {
   });
   return rows;
 };
+function convertHeaderToGridRows(spanColumns) {
+  const rSize = spanColumns.length;
+  const cSize = spanColumns[0].reduce((sum, cell) => sum + cell.colSpan, 0);
+  const occupiedRows = [];
+  const fullRows = [];
+  for (let rIndex = 0; rIndex < rSize; rIndex++) {
+    const oCols = [];
+    const dCols = [];
+    for (let cIndex = 0; cIndex < cSize; cIndex++) {
+      oCols.push(false);
+      dCols.push('');
+    }
+    occupiedRows.push(oCols);
+    fullRows.push(dCols);
+  }
+  for (let rIndex = 0; rIndex < rSize; rIndex++) {
+    let currColIndex = 0;
+    for (const column of spanColumns[rIndex]) {
+      const {
+        colSpan,
+        rowSpan
+      } = column;
+      let startColIndex = -1;
+      for (let ccIndex = currColIndex; ccIndex <= cSize - colSpan; ccIndex++) {
+        let oFlag = true;
+        for (let csIndex = 0; csIndex < colSpan; csIndex++) {
+          if (occupiedRows[rIndex][ccIndex + csIndex]) {
+            oFlag = false;
+            break;
+          }
+        }
+        if (oFlag) {
+          startColIndex = ccIndex;
+          break;
+        }
+      }
+      if (startColIndex === -1) {
+        for (let j = 0; j <= cSize - colSpan; j++) {
+          let oFlag = true;
+          for (let k = 0; k < colSpan; k++) {
+            if (occupiedRows[rIndex][j + k]) {
+              oFlag = false;
+              break;
+            }
+          }
+          if (oFlag) {
+            startColIndex = j;
+            break;
+          }
+        }
+        if (startColIndex === -1) {
+          // error
+          break;
+        }
+      }
+      for (let srIndex = rIndex; srIndex < rIndex + rowSpan; srIndex++) {
+        for (let scIndex = startColIndex; scIndex < startColIndex + colSpan; scIndex++) {
+          occupiedRows[srIndex][scIndex] = true;
+          fullRows[srIndex][scIndex] = column;
+        }
+      }
+      currColIndex = startColIndex + colSpan;
+    }
+  }
+  return fullRows;
+}
 function restoreScrollLocation($xeTable, scrollLeft, scrollTop) {
   const internalData = $xeTable;
   if (scrollLeft || scrollTop) {
@@ -5163,6 +5235,8 @@ const columnProps = {
   footerClassName: [String, Function],
   // 格式化显示内容
   formatter: [Function, Array, String],
+  // 格式化表头显示内容
+  headerFormatter: [Function, Array, String],
   // 格式化表尾显示内容
   footerFormatter: [Function, Array, String],
   // 是否显示间距
@@ -5392,7 +5466,7 @@ const tableProps = {
   // 表格的最小高度
   minHeight: {
     type: [Number, String],
-    default: () => props_getConfig().table.minHeight
+    default: () => null
   },
   // 表格的最大高度
   maxHeight: [Number, String],
@@ -5511,9 +5585,17 @@ const tableProps = {
   headerRowStyle: [Object, Function],
   // 给表尾行附加样式
   footerRowStyle: [Object, Function],
-  // 合并指定单元格
+  // 用于分组表头，显示为自定义列头，配合 mergeHeaderCells 灵活实现自定义合并
+  showCustomHeader: {
+    type: Boolean,
+    default: () => props_getConfig().table.showCustomHeader
+  },
+  // 临时合并指定的表头单元格
+  mergeHeaderCells: Array,
+  // 临时合并指定的单元格
   mergeCells: Array,
-  // 合并指定的表尾
+  // 临时合并指定的表尾单元格
+  mergeFooterCells: Array,
   mergeFooterItems: Array,
   // 自定义合并行或列的方法
   spanMethod: Function,
@@ -5730,6 +5812,15 @@ function clearColAnimate(elem, clss) {
     }
   }, 500);
 }
+;// CONCATENATED MODULE: ./packages/table/src/store.ts
+// 跨表拖拽
+const crossTableDragRowGlobal = {
+  row: null
+};
+function getCrossTableDragRowInfo($xeTable) {
+  const crossTableDragRowInfo = $xeTable.crossTableDragRowInfo;
+  return crossTableDragRowInfo;
+}
 ;// CONCATENATED MODULE: ./packages/table/src/methods.ts
 
 
@@ -5741,6 +5832,7 @@ function clearColAnimate(elem, clss) {
 
 
 
+
 const {
   getConfig: methods_getConfig,
   getI18n: methods_getI18n,
@@ -5754,6 +5846,7 @@ const supportMaxRow = 5e6;
 const customStorageKey = 'VXE_CUSTOM_STORE';
 const maxYHeight = 5e6;
 const maxXWidth = 5e6;
+let crossTableDragRowObj = null;
 function eqCellValue(row1, row2, field) {
   const val1 = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row1, field);
   const val2 = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row2, field);
@@ -7001,20 +7094,25 @@ function updateStyle($xeTable) {
     emptyPlaceholderElem.style.top = `${tHeaderHeight}px`;
     emptyPlaceholderElem.style.height = bodyWrapperElem ? `${bodyWrapperElem.offsetHeight - osbHeight}px` : '';
   }
+  const scrollbarXConf = scrollbarOpts.x || {};
   const scrollbarXToTop = $xeTable.computeScrollbarXToTop;
+  const scrollbarYConf = scrollbarOpts.y || {};
   const scrollbarYToLeft = $xeTable.computeScrollbarYToLeft;
   let xScrollbarVisible = overflowX ? 'visible' : 'hidden';
-  if ($xeGanttView) {
+  if (scrollbarXConf.visible === 'visible' || $xeGanttView) {
     osbHeight = scrollbarHeight;
     xScrollbarVisible = 'visible';
-  } else if (scrollbarOpts.x && scrollbarOpts.x.visible === false) {
+  } else if (scrollbarXConf.visible === 'hidden' || scrollbarXConf.visible === false) {
     osbHeight = 0;
     xScrollbarVisible = 'hidden';
   }
   let yScrollbarVisible = overflowY ? 'visible' : 'hidden';
-  if (scrollbarOpts.y && scrollbarOpts.y.visible === false || $xeGanttView && !scrollbarYToLeft) {
+  if (scrollbarYConf.visible === 'hidden' || scrollbarYConf.visible === false || $xeGanttView && !scrollbarYToLeft) {
     osbWidth = 0;
     yScrollbarVisible = 'hidden';
+  } else if (scrollbarYConf.visible === 'visible') {
+    osbWidth = scrollbarWidth;
+    yScrollbarVisible = 'visible';
   }
   let tbHeight = 0;
   let bodyMaxHeight = 0;
@@ -7054,7 +7152,7 @@ function updateStyle($xeTable) {
   }
   if (xRightCornerEl) {
     xRightCornerEl.style.width = scrollbarXToTop ? '' : `${osbWidth}px`;
-    xRightCornerEl.style.display = scrollbarXToTop ? '' : overflowX && osbHeight ? 'block' : '';
+    xRightCornerEl.style.display = scrollbarXToTop ? '' : xScrollbarVisible === 'visible' ? 'block' : '';
   }
   const scrollYVirtualEl = $xeTable.$refs.refScrollYVirtualElem;
   if (scrollYVirtualEl) {
@@ -7065,7 +7163,7 @@ function updateStyle($xeTable) {
   const yTopCornerEl = $xeTable.$refs.refScrollYTopCornerElem;
   if (yTopCornerEl) {
     yTopCornerEl.style.height = `${tHeaderHeight}px`;
-    yTopCornerEl.style.display = overflowY && tHeaderHeight ? 'block' : '';
+    yTopCornerEl.style.display = tHeaderHeight && yScrollbarVisible === 'visible' ? 'block' : '';
   }
   const yWrapperEl = $xeTable.$refs.refScrollYWrapperElem;
   if (yWrapperEl) {
@@ -7076,7 +7174,7 @@ function updateStyle($xeTable) {
   if (yBottomCornerEl) {
     yBottomCornerEl.style.height = `${tFooterHeight}px`;
     yBottomCornerEl.style.top = `${tHeaderHeight + tbHeight}px`;
-    yBottomCornerEl.style.display = overflowY && tFooterHeight ? 'block' : '';
+    yBottomCornerEl.style.display = tFooterHeight && yScrollbarVisible === 'visible' ? 'block' : '';
   }
   const rowExpandEl = $xeTable.$refs.refRowExpandElem;
   if (rowExpandEl) {
@@ -8104,15 +8202,71 @@ function handleBodyMerge($xeTable, merges) {
     });
   }
 }
-function handleFooterMerge($xeTable, merges) {
+function removeBodyMerges($xeTable, merges) {
+  const internalData = $xeTable;
+  const {
+    mergeBodyList,
+    fullColumnIdData,
+    fullAllDataRowIdData,
+    mergeBodyMaps
+  } = internalData;
+  const rest = [];
+  if (merges) {
+    const {
+      handleGetRowId
+    } = createHandleGetRowId($xeTable);
+    if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(merges)) {
+      merges = [merges];
+    }
+    merges.forEach(item => {
+      const {
+        row: margeRow,
+        col: margeCol
+      } = item;
+      let mergeRowIndex = -1;
+      let mergeColumnIndex = -1;
+      if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(margeRow)) {
+        mergeRowIndex = margeRow;
+      } else {
+        const rowid = margeRow ? handleGetRowId(margeRow) : null;
+        const rowRest = rowid ? fullAllDataRowIdData[rowid] : null;
+        if (rowRest) {
+          mergeRowIndex = rowRest._index;
+        }
+      }
+      if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(margeCol)) {
+        mergeColumnIndex = margeCol;
+      } else {
+        const colid = margeCol ? margeCol.id : null;
+        const colRest = colid ? fullColumnIdData[colid] : null;
+        if (colRest) {
+          mergeColumnIndex = colRest._index;
+        }
+      }
+      const mcIndex = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findIndexOf(mergeBodyList, item => item.row === mergeRowIndex && item.col === mergeColumnIndex);
+      if (mcIndex > -1) {
+        const rItems = mergeBodyList.splice(mcIndex, 1);
+        const item = rItems[0];
+        if (item) {
+          rest.push(rItems[0]);
+          if (mergeBodyMaps[`${mergeRowIndex}:${mergeColumnIndex}`]) {
+            delete mergeBodyMaps[`${mergeRowIndex}:${mergeColumnIndex}`];
+          }
+        }
+      }
+    });
+  }
+  return rest;
+}
+function handleHeaderMerge($xeTable, merges) {
   const reactData = $xeTable;
   const internalData = $xeTable;
   const {
     footerTableData
   } = reactData;
   const {
-    mergeFooterList,
-    mergeFooterMaps,
+    mergeHeaderList,
+    mergeHeaderMaps,
     fullColumnIdData
   } = internalData;
   if (merges) {
@@ -8146,7 +8300,7 @@ function handleFooterMerge($xeTable, merges) {
         if (rowspan > 1 || colspan > 1) {
           const row = footerTableData[mergeRowIndex];
           const column = visibleColumn[mergeColumnIndex];
-          let mergeItem = mergeFooterMaps[`${mergeRowIndex}:${mergeColumnIndex}`];
+          let mergeItem = mergeHeaderMaps[`${mergeRowIndex}:${mergeColumnIndex}`];
           if (mergeItem) {
             mergeItem.rowspan = rowspan;
             mergeItem.colspan = colspan;
@@ -8163,27 +8317,23 @@ function handleFooterMerge($xeTable, merges) {
               _rowspan: rowspan,
               _colspan: colspan
             };
-            mergeFooterMaps[`${mergeRowIndex}:${mergeColumnIndex}`] = mergeItem;
-            mergeFooterList.push(mergeItem);
+            mergeHeaderMaps[`${mergeRowIndex}:${mergeColumnIndex}`] = mergeItem;
+            mergeHeaderList.push(mergeItem);
           }
         }
       }
     });
   }
 }
-function removeBodyMerges($xeTable, merges) {
+function removeHeaderMerges($xeTable, merges) {
   const internalData = $xeTable;
   const {
-    mergeBodyList,
+    mergeHeaderList,
     fullColumnIdData,
-    fullAllDataRowIdData,
-    mergeBodyMaps
+    mergeHeaderMaps
   } = internalData;
   const rest = [];
   if (merges) {
-    const {
-      handleGetRowId
-    } = createHandleGetRowId($xeTable);
     if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(merges)) {
       merges = [merges];
     }
@@ -8192,17 +8342,8 @@ function removeBodyMerges($xeTable, merges) {
         row: margeRow,
         col: margeCol
       } = item;
-      let mergeRowIndex = -1;
+      const mergeRowIndex = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(margeRow) ? margeRow : -1;
       let mergeColumnIndex = -1;
-      if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(margeRow)) {
-        mergeRowIndex = margeRow;
-      } else {
-        const rowid = margeRow ? handleGetRowId(margeRow) : null;
-        const rowRest = rowid ? fullAllDataRowIdData[rowid] : null;
-        if (rowRest) {
-          mergeRowIndex = rowRest._index;
-        }
-      }
       if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(margeCol)) {
         mergeColumnIndex = margeCol;
       } else {
@@ -8212,14 +8353,14 @@ function removeBodyMerges($xeTable, merges) {
           mergeColumnIndex = colRest._index;
         }
       }
-      const mcIndex = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findIndexOf(mergeBodyList, item => item.row === mergeRowIndex && item.col === mergeColumnIndex);
+      const mcIndex = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findIndexOf(mergeHeaderList, item => item.row === mergeRowIndex && item.col === mergeColumnIndex);
       if (mcIndex > -1) {
-        const rItems = mergeBodyList.splice(mcIndex, 1);
+        const rItems = mergeHeaderList.splice(mcIndex, 1);
         const item = rItems[0];
         if (item) {
-          rest.push(rItems[0]);
-          if (mergeBodyMaps[`${mergeRowIndex}:${mergeColumnIndex}`]) {
-            delete mergeBodyMaps[`${mergeRowIndex}:${mergeColumnIndex}`];
+          rest.push(item);
+          if (mergeHeaderMaps[`${mergeRowIndex}:${mergeColumnIndex}`]) {
+            delete mergeHeaderMaps[`${mergeRowIndex}:${mergeColumnIndex}`];
           }
         }
       }
@@ -8227,6 +8368,73 @@ function removeBodyMerges($xeTable, merges) {
   }
   return rest;
 }
+function handleFooterMerge($xeTable, merges) {
+  const reactData = $xeTable;
+  const internalData = $xeTable;
+  const {
+    footerTableData
+  } = reactData;
+  const {
+    mergeFooterList,
+    mergeFooterMaps,
+    fullColumnIdData
+  } = internalData;
+  if (merges) {
+    const {
+      visibleColumn
+    } = internalData;
+    if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(merges)) {
+      merges = [merges];
+    }
+    merges.forEach(item => {
+      let {
+        row: margeRow,
+        col: margeCol,
+        rowspan,
+        colspan
+      } = item;
+      const mergeRowIndex = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(margeRow) ? margeRow : -1;
+      let mergeColumnIndex = -1;
+      if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(margeCol)) {
+        mergeColumnIndex = margeCol;
+      } else {
+        const colid = margeCol ? margeCol.id : null;
+        const colRest = colid ? fullColumnIdData[colid] : null;
+        if (colRest) {
+          mergeColumnIndex = colRest._index;
+        }
+      }
+      if (mergeRowIndex > -1 && mergeColumnIndex > -1 && (rowspan || colspan)) {
+        rowspan = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(rowspan) || 1;
+        colspan = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(colspan) || 1;
+        if (rowspan > 1 || colspan > 1) {
+          const row = footerTableData[mergeRowIndex];
+          const column = visibleColumn[mergeColumnIndex];
+          let mergeItem = mergeFooterMaps[`${mergeRowIndex}:${mergeColumnIndex}`];
+          if (mergeItem) {
+            mergeItem.rowspan = rowspan;
+            mergeItem.colspan = colspan;
+            mergeItem._rowspan = rowspan;
+            mergeItem._colspan = colspan;
+          } else {
+            mergeItem = {
+              row: mergeRowIndex,
+              col: mergeColumnIndex,
+              rowspan,
+              colspan,
+              _row: row,
+              _col: column,
+              _rowspan: rowspan,
+              _colspan: colspan
+            };
+            mergeFooterMaps[`${mergeRowIndex}:${mergeColumnIndex}`] = mergeItem;
+            mergeFooterList.push(mergeItem);
+          }
+        }
+      }
+    });
+  }
+}
 function removeFooterMerges($xeTable, merges) {
   const internalData = $xeTable;
   const {
@@ -8354,10 +8562,26 @@ function clearAllSort($xeTable) {
 function calcTableHeight($xeTable, key) {
   const props = $xeTable;
   const reactData = $xeTable;
+  const {
+    editConfig
+  } = props;
   const {
     parentHeight
   } = reactData;
-  const val = props[key];
+  let val = props[key];
+  if (key === 'minHeight') {
+    const defMinHeight = methods_getConfig().table.minHeight;
+    if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(val)) {
+      if (eqEmptyValue(defMinHeight)) {
+        // 编辑模式默认最小高度
+        if (isEnableConf(editConfig)) {
+          val = 144;
+        }
+      } else {
+        val = defMinHeight;
+      }
+    }
+  }
   let num = 0;
   if (val) {
     if (val === '100%' || val === 'auto') {
@@ -8587,6 +8811,11 @@ function handleTargetEnterEvent($xeTable, isClear) {
     }
   }
 }
+function clearCrossTableDragStatus($xeTable) {
+  const crossTableDragRowInfo = getCrossTableDragRowInfo($xeTable);
+  crossTableDragRowObj = null;
+  crossTableDragRowInfo.row = null;
+}
 function clearDragStatus($xeTable) {
   const reactData = $xeTable;
   const {
@@ -8597,6 +8826,7 @@ function clearDragStatus($xeTable) {
     clearColDropOrigin($xeTable);
     clearRowDropOrigin($xeTable);
     hideDropTip($xeTable);
+    clearCrossTableDragStatus($xeTable);
     reactData.dragRow = null;
     reactData.dragCol = null;
   }
@@ -8801,6 +9031,26 @@ function hideDropTip($xeTable) {
     cdLineEl.style.display = '';
   }
 }
+function clearRowDragData($xeTable) {
+  const $xeGantt = $xeTable.$xeGantt;
+  const reactData = $xeTable;
+  const internalData = $xeTable;
+  let wrapperEl = $xeTable.$refs.refElem;
+  const dtClss = ['.vxe-body--row'];
+  if ($xeGantt) {
+    const ganttContainerElem = $xeGantt.$refs.refGanttContainerElem;
+    if (ganttContainerElem) {
+      wrapperEl = ganttContainerElem;
+    }
+    dtClss.push('.vxe-gantt-view--body-row', '.vxe-gantt-view--chart-row');
+  }
+  hideDropTip($xeTable);
+  clearRowDropOrigin($xeTable);
+  clearRowAnimate(wrapperEl, dtClss);
+  internalData.prevDragToChild = false;
+  reactData.dragRow = null;
+  reactData.dragCol = null;
+}
 /**
  * 处理显示 tooltip
  * @param {Event} evnt 事件
@@ -8880,13 +9130,24 @@ function handleDefaultMergeCells($xeTable) {
     $xeTable.setMergeCells(mergeCells);
   }
 }
+function handleDefaultMergeHeaderItems($xeTable) {
+  const props = $xeTable;
+  const {
+    mergeHeaderCells
+  } = props;
+  if (mergeHeaderCells) {
+    $xeTable.setMergeHeaderCells(mergeHeaderCells);
+  }
+}
 function handleDefaultMergeFooterItems($xeTable) {
   const props = $xeTable;
   const {
+    mergeFooterCells,
     mergeFooterItems
   } = props;
-  if (mergeFooterItems) {
-    $xeTable.setMergeFooterItems(mergeFooterItems);
+  const mFooterCells = mergeFooterCells || mergeFooterItems;
+  if (mFooterCells) {
+    $xeTable.setMergeFooterCells(mFooterCells);
   }
 }
 // 计算可视渲染相关数据
@@ -9392,6 +9653,10 @@ function loadTableData($xeTable, datas, isReset) {
     }
     handleReserveStatus($xeTable);
     $xeTable.checkSelectionStatus();
+    $xeTable.dispatchEvent('data-change', {
+      visibleColumn: internalData.visibleColumn,
+      visibleData: internalData.afterFullData
+    }, null);
     return new Promise(resolve => {
       $xeTable.$nextTick().then(() => handleRecalculateStyle($xeTable, false, false, false)).then(() => {
         handleRecalculateStyle($xeTable, false, true, true);
@@ -9448,6 +9713,7 @@ function handleLoadDefaults($xeTable) {
   handleDefaultTreeExpand($xeTable);
   handleDefaultRowGroupExpand($xeTable);
   handleDefaultMergeCells($xeTable);
+  handleDefaultMergeHeaderItems($xeTable);
   handleDefaultMergeFooterItems($xeTable);
   $xeTable.$nextTick(() => setTimeout(() => $xeTable.recalculate()));
 }
@@ -11362,7 +11628,9 @@ const Methods = {
         }
       }
     }
-    return $xeTable.handleRowDragSwapEvent(null, true, dragRow, prevDragRow, dragPos || defPos, dragToChild === true);
+    const rest = $xeTable.handleRowDragSwapEvent(null, true, dragRow, prevDragRow, dragPos || defPos, dragToChild === true);
+    clearRowDragData($xeTable);
+    return rest;
   },
   /**
    * 获取表格的全量列
@@ -12946,7 +13214,7 @@ const Methods = {
                 // 如果点击了当前表格之外
                 !getEventTargetNode(evnt, $el).flag) {
                   setTimeout(() => {
-                    this.handleClearEdit(evnt).then(() => {
+                    $xeTable.handleClearEdit(evnt).then(() => {
                       // 如果存在校验，点击了表格之外则清除
                       if (!this.isActivated && editRules && validOpts.autoClear) {
                         this.validErrorMaps = {};
@@ -12961,17 +13229,17 @@ const Methods = {
       }
     } else if (mouseConfig) {
       if (!getEventTargetNode(evnt, $el).flag && !($xeGGWrapper && getEventTargetNode(evnt, $xeGGWrapper.$el).flag) && !(tableMenu && getEventTargetNode(evnt, tableMenu.$el).flag) && !($toolbar && getEventTargetNode(evnt, $toolbar.$el).flag)) {
-        if (this.clearSelected) {
-          this.clearSelected();
+        if ($xeTable.clearSelected) {
+          $xeTable.clearSelected();
         }
         if (areaOpts.autoClear) {
-          if (this.getCellAreas) {
-            const cellAreas = this.getCellAreas();
+          if ($xeTable.getCellAreas) {
+            const cellAreas = $xeTable.getCellAreas();
             if (cellAreas && cellAreas.length && !getEventTargetNode(evnt, document.body, 'vxe-table--ignore-areas-clear').flag) {
-              this.preventEvent(evnt, 'event.clearAreas', {}, () => {
-                this.clearCellAreas();
-                this.clearCopyCellArea();
-                this.emitEvent('clear-cell-area-selection', {
+              $xeTable.preventEvent(evnt, 'event.clearAreas', {}, () => {
+                $xeTable.clearCellAreas();
+                $xeTable.clearCopyCellArea();
+                $xeTable.dispatchEvent('clear-cell-area-selection', {
                   cellAreas
                 }, evnt);
               });
@@ -13010,6 +13278,7 @@ const Methods = {
    * 表格键盘事件
    */
   keydownEvent(evnt) {
+    const $xeTable = this;
     const {
       filterStore,
       ctxMenuStore,
@@ -13028,7 +13297,7 @@ const Methods = {
     const isEsc = keyCode === 27;
     if (isEsc) {
       this.preventEvent(evnt, 'event.keydown', null, () => {
-        this.emitEvent('keydown-start', {}, evnt);
+        $xeTable.dispatchEvent('keydown-start', {}, evnt);
         if (keyboardConfig && mouseConfig && mouseOpts.area && this.handleKeyboardCellAreaEvent) {
           this.handleKeyboardCellAreaEvent(evnt);
         } else if (actived.row || filterStore.visible || ctxMenuStore.visible) {
@@ -13048,8 +13317,8 @@ const Methods = {
             }
           }
         }
-        this.emitEvent('keydown', {}, evnt);
-        this.emitEvent('keydown-end', {}, evnt);
+        $xeTable.dispatchEvent('keydown', {}, evnt);
+        $xeTable.dispatchEvent('keydown-end', {}, evnt);
       });
     }
   },
@@ -13390,6 +13659,7 @@ const Methods = {
     }
   },
   handleGlobalPasteEvent(evnt) {
+    const $xeTable = this;
     const {
       isActivated,
       keyboardConfig,
@@ -13408,10 +13678,11 @@ const Methods = {
           this.handlePasteCellAreaEvent(evnt);
         }
       }
-      this.emitEvent('paste', {}, evnt);
+      $xeTable.dispatchEvent('paste', {}, evnt);
     }
   },
   handleGlobalCopyEvent(evnt) {
+    const $xeTable = this;
     const {
       isActivated,
       keyboardConfig,
@@ -13430,10 +13701,11 @@ const Methods = {
           this.handleCopyCellAreaEvent(evnt);
         }
       }
-      this.emitEvent('copy', {}, evnt);
+      $xeTable.dispatchEvent('copy', {}, evnt);
     }
   },
   handleGlobalCutEvent(evnt) {
+    const $xeTable = this;
     const {
       isActivated,
       keyboardConfig,
@@ -13452,7 +13724,7 @@ const Methods = {
           this.handleCutCellAreaEvent(evnt);
         }
       }
-      this.emitEvent('cut', {}, evnt);
+      $xeTable.dispatchEvent('cut', {}, evnt);
     }
   },
   handleGlobalResizeEvent() {
@@ -13475,6 +13747,16 @@ const Methods = {
     internalData.mergeBodyCellMaps = buildMergeData(mergeBodyList);
     reactData.mergeBodyFlag++;
   },
+  handleUpdateHeaderMerge() {
+    const $xeTable = this;
+    const reactData = $xeTable;
+    const internalData = $xeTable;
+    const {
+      mergeHeaderList
+    } = internalData;
+    internalData.mergeHeaderCellMaps = buildMergeData(mergeHeaderList);
+    reactData.mergeHeadFlag++;
+  },
   handleUpdateFooterMerge() {
     const $xeTable = this;
     const reactData = $xeTable;
@@ -14858,7 +15140,8 @@ const Methods = {
     return $xeTable.$nextTick();
   },
   triggerHeaderCellDblclickEvent(evnt, params) {
-    this.emitEvent('header-cell-dblclick', Object.assign({
+    const $xeTable = this;
+    $xeTable.dispatchEvent('header-cell-dblclick', Object.assign({
       cell: evnt.currentTarget
     }, params), evnt);
   },
@@ -15076,7 +15359,7 @@ const Methods = {
         }
       }
     }
-    this.emitEvent('cell-dblclick', params, evnt);
+    $xeTable.dispatchEvent('cell-dblclick', params, evnt);
   },
   handleColumnSortEvent(evnt, column) {
     const $xeTable = this;
@@ -15569,15 +15852,276 @@ const Methods = {
             status: true
           };
         });
-      }).catch(() => {
-        return errRest;
-      });
+      }).catch(() => {
+        return errRest;
+      });
+    }
+    return Promise.resolve(errRest);
+  },
+  /**
+   * 处理跨表拖拽完成
+   */
+  handleCrossTableRowDragFinishEvent(evnt) {
+    const $xeTable = this;
+    const $xeGantt = $xeTable.$xeGantt;
+    const reactData = $xeTable;
+    const internalData = $xeTable;
+    const crossTableDragRowInfo = getCrossTableDragRowInfo($xeTable);
+    const {
+      tableData
+    } = reactData;
+    const {
+      fullAllDataRowIdData
+    } = internalData;
+    const rowOpts = $xeTable.computeRowOpts;
+    const cellOpts = $xeTable.computeCellOpts;
+    const defaultRowHeight = $xeTable.computeDefaultRowHeight;
+    const rowDragOpts = $xeTable.computeRowDragOpts;
+    const {
+      animation,
+      isCrossTableDrag
+    } = rowDragOpts;
+    const treeOpts = $xeTable.computeTreeOpts;
+    const {
+      mapChildrenField
+    } = treeOpts;
+    const el = $xeTable.$refs.refElem;
+    if (isCrossTableDrag && crossTableDragRowObj && crossTableDragRowInfo) {
+      const {
+        row: dragRow
+      } = crossTableDragRowInfo;
+      if (dragRow) {
+        const dragRowid = getRowid($xeTable, dragRow);
+        const dragRowRest = fullAllDataRowIdData[dragRowid];
+        let dragRowHeight = 0;
+        let rsIndex = -1;
+        if (dragRowRest) {
+          if (animation) {
+            dragRowHeight = getCellRestHeight(dragRowRest, cellOpts, rowOpts, defaultRowHeight);
+          }
+          rsIndex = dragRowRest.$index;
+        }
+        const dragRangeList = rsIndex > -1 && rsIndex < tableData.length - 1 ? tableData.slice(rsIndex + 1) : [];
+        const dragList = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toTreeArray([dragRow], {
+          updated: true,
+          children: mapChildrenField
+        });
+        $xeTable.remove(dragList).then(() => {
+          if (animation && dragRowHeight && dragRangeList.length) {
+            const $xeGanttView = internalData.xeGanttView;
+            let wrapperEl = el;
+            if ($xeGantt && $xeGanttView) {
+              const ganttContainerElem = $xeGantt.$refs.refGanttContainerElem;
+              if (ganttContainerElem) {
+                wrapperEl = ganttContainerElem;
+              }
+            }
+            const dtClss = [];
+            dragRangeList.forEach(row => {
+              const rowid = getRowid($xeTable, row);
+              dtClss.push(`.vxe-body--row[rowid="${rowid}"]`);
+              if ($xeGantt) {
+                dtClss.push(`.vxe-gantt-view--body-row[rowid="${rowid}"]`, `.vxe-gantt-view--chart-row[rowid="${rowid}"]`);
+              }
+            });
+            const dtTrList = wrapperEl.querySelectorAll(dtClss.join(','));
+            moveRowAnimateToTb(dtTrList, dragRowHeight);
+          }
+        });
+        $xeTable.dispatchEvent('row-remove-dragend', {
+          row: dragRow
+        }, evnt);
+        clearRowDragData($xeTable);
+        clearCrossTableDragStatus($xeTable);
+      }
+    }
+  },
+  /**
+   * 处理跨表拖至新的空表
+   */
+  handleCrossTableRowDragoverEmptyEvent(evnt) {
+    const $xeTable = this;
+    const reactData = $xeTable;
+    const internalData = $xeTable;
+    const {
+      tableData
+    } = reactData;
+    const rowDragOpts = $xeTable.computeRowDragOpts;
+    const {
+      isCrossTableDrag
+    } = rowDragOpts;
+    if (isCrossTableDrag && crossTableDragRowObj && !tableData.length) {
+      const {
+        $oldTable
+      } = crossTableDragRowObj;
+      if ($oldTable && $oldTable.xID !== $xeTable.xID) {
+        evnt.preventDefault();
+        crossTableDragRowObj.$newTable = $xeTable;
+        internalData.prevDragRow = null;
+      }
+    }
+  },
+  /**
+   * 处理跨表拖插入
+   */
+  handleCrossTableRowDragInsertEvent(evnt) {
+    const $xeTable = this;
+    const $xeGantt = $xeTable.$xeGantt;
+    const props = $xeTable;
+    const reactData = $xeTable;
+    const internalData = $xeTable;
+    const crossTableDragRowInfo = getCrossTableDragRowInfo($xeTable);
+    const {
+      treeConfig
+    } = props;
+    const {
+      prevDragRow,
+      prevDragPos,
+      prevDragToChild
+    } = internalData;
+    const rowDragOpts = $xeTable.computeRowDragOpts;
+    const {
+      animation,
+      isSelfToChildDrag,
+      isCrossTableDrag,
+      dragEndMethod,
+      dragToChildMethod
+    } = rowDragOpts;
+    const rowOpts = $xeTable.computeRowOpts;
+    const cellOpts = $xeTable.computeCellOpts;
+    const defaultRowHeight = $xeTable.computeDefaultRowHeight;
+    const treeOpts = $xeTable.computeTreeOpts;
+    const {
+      parentField,
+      mapChildrenField
+    } = treeOpts;
+    const childrenField = treeOpts.children || treeOpts.childrenField;
+    // 跨表拖拽
+    if (isCrossTableDrag && crossTableDragRowObj && crossTableDragRowInfo) {
+      const {
+        row: oldRow
+      } = crossTableDragRowInfo;
+      const {
+        $oldTable
+      } = crossTableDragRowObj;
+      const el = $xeTable.$refs.refElem;
+      if ($oldTable && oldRow) {
+        const dragRow = oldRow;
+        let dragOffsetIndex = -1;
+        if (prevDragRow) {
+          dragOffsetIndex = prevDragPos === 'bottom' ? 1 : 0;
+        }
+        const dragParams = {
+          oldRow: dragRow,
+          newRow: prevDragRow,
+          dragRow,
+          dragPos: prevDragPos,
+          dragToChild: !!prevDragToChild,
+          offsetIndex: dragOffsetIndex
+        };
+        const isDragToChildFlag = isSelfToChildDrag && dragToChildMethod ? dragToChildMethod(dragParams) : prevDragToChild;
+        const errRest = {
+          status: false
+        };
+        Promise.resolve(dragEndMethod ? dragEndMethod(dragParams) : true).then(status => {
+          if (!status) {
+            return errRest;
+          }
+          let insertRest = Promise.resolve();
+          if (treeConfig) {
+            const dragList = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toTreeArray([dragRow], {
+              updated: true,
+              children: mapChildrenField
+            });
+            $oldTable.handleCrossTableRowDragFinishEvent(evnt);
+            if (prevDragRow) {
+              dragRow[parentField] = prevDragRow[parentField];
+            } else {
+              dragRow[parentField] = null;
+            }
+            dragList.forEach(row => {
+              row[childrenField] = undefined;
+              row[mapChildrenField] = undefined;
+            });
+            if (prevDragRow) {
+              if (prevDragPos === 'bottom') {
+                insertRest = $xeTable.insertNextAt(dragList, prevDragRow);
+              } else {
+                insertRest = $xeTable.insertAt(dragList, prevDragRow);
+              }
+            } else {
+              insertRest = $xeTable.insert(dragList);
+            }
+          } else {
+            $oldTable.handleCrossTableRowDragFinishEvent(evnt);
+            if (prevDragRow) {
+              if (prevDragPos === 'bottom') {
+                insertRest = $xeTable.insertNextAt(dragRow, prevDragRow);
+              } else {
+                insertRest = $xeTable.insertAt(dragRow, prevDragRow);
+              }
+            } else {
+              insertRest = $xeTable.insert(dragRow);
+            }
+          }
+          $xeTable.dispatchEvent('row-insert-dragend', {
+            oldRow,
+            newRow: prevDragRow,
+            dragRow,
+            dragPos: prevDragPos,
+            dragToChild: isDragToChildFlag,
+            offsetIndex: dragOffsetIndex
+          }, evnt);
+          clearRowDragData($xeTable);
+          insertRest.then(() => {
+            const {
+              tableData
+            } = reactData;
+            const {
+              fullAllDataRowIdData
+            } = internalData;
+            const oldRowid = getRowid($xeTable, dragRow);
+            const oldRowRest = fullAllDataRowIdData[oldRowid];
+            let dragRowHeight = 0;
+            let rsIndex = -1;
+            if (oldRowRest) {
+              if (animation) {
+                dragRowHeight = getCellRestHeight(oldRowRest, cellOpts, rowOpts, defaultRowHeight);
+              }
+              rsIndex = oldRowRest.$index;
+            }
+            const dragRangeList = rsIndex > -1 ? tableData.slice(rsIndex) : [];
+            if (animation && dragRowHeight && dragRangeList.length) {
+              const $xeGanttView = internalData.xeGanttView;
+              let wrapperEl = el;
+              if ($xeGantt && $xeGanttView) {
+                const ganttContainerElem = $xeGantt.$refs.refGanttContainerElem;
+                if (ganttContainerElem) {
+                  wrapperEl = ganttContainerElem;
+                }
+              }
+              const dtClss = [];
+              dragRangeList.forEach(row => {
+                const rowid = getRowid($xeTable, row);
+                dtClss.push(`.vxe-body--row[rowid="${rowid}"]`);
+                if ($xeGantt) {
+                  dtClss.push(`.vxe-gantt-view--body-row[rowid="${rowid}"]`, `.vxe-gantt-view--chart-row[rowid="${rowid}"]`);
+                }
+              });
+              const dtTrList = wrapperEl.querySelectorAll(dtClss.join(','));
+              moveRowAnimateToTb(dtTrList, -dragRowHeight);
+            }
+          });
+        });
+      }
     }
-    return Promise.resolve(errRest);
+  },
+  hideCrossTableRowDropClearStatus() {
+    const $xeTable = this;
+    hideDropTip($xeTable);
   },
   handleRowDragDragendEvent(evnt) {
     const $xeTable = this;
-    const $xeGantt = $xeTable.$xeGantt;
     const props = $xeTable;
     const reactData = $xeTable;
     const internalData = $xeTable;
@@ -15600,7 +16144,23 @@ const Methods = {
       prevDragRow,
       prevDragPos
     } = internalData;
-    let wrapperEl = $xeTable.$refs.refElem;
+    const rowDragOpts = $xeTable.computeRowDragOpts;
+    const {
+      isCrossTableDrag,
+      isCrossDrag
+    } = rowDragOpts;
+    // 跨表拖拽
+    if (isCrossTableDrag && crossTableDragRowObj) {
+      const {
+        $newTable
+      } = crossTableDragRowObj;
+      if ($newTable && $newTable.xID !== $xeTable.xID) {
+        if (!treeConfig || isCrossDrag) {
+          $newTable.handleCrossTableRowDragInsertEvent(evnt);
+        }
+        return;
+      }
+    }
     if (treeConfig && lazy && prevDragToChild) {
       // 懒加载
       const newRowid = getRowid($xeTable, prevDragRow);
@@ -15615,20 +16175,8 @@ const Methods = {
     } else {
       $xeTable.handleRowDragSwapEvent(evnt, true, dragRow, prevDragRow, prevDragPos, prevDragToChild);
     }
-    const dtClss = ['.vxe-body--row'];
-    if ($xeGantt) {
-      const ganttContainerElem = $xeGantt.$refs.refGanttContainerElem;
-      if (ganttContainerElem) {
-        wrapperEl = ganttContainerElem;
-      }
-      dtClss.push('.vxe-gantt-view--body-row', '.vxe-gantt-view--chart-row');
-    }
-    hideDropTip($xeTable);
-    clearRowDropOrigin($xeTable);
-    clearRowAnimate(wrapperEl, dtClss);
-    internalData.prevDragToChild = false;
-    reactData.dragRow = null;
-    reactData.dragCol = null;
+    clearRowDragData($xeTable);
+    clearCrossTableDragStatus($xeTable);
   },
   handleRowDragDragoverEvent(evnt) {
     const $xeTable = this;
@@ -15655,9 +16203,10 @@ const Methods = {
     const {
       isPeerDrag,
       isCrossDrag,
-      isToChildDrag
+      isToChildDrag,
+      isCrossTableDrag
     } = rowDragOpts;
-    if (!dragRow) {
+    if (!dragRow && !(isCrossTableDrag && (!treeConfig || isCrossDrag) && crossTableDragRowObj)) {
       evnt.preventDefault();
       return;
     }
@@ -15666,18 +16215,40 @@ const Methods = {
     const rowid = trEl.getAttribute('rowid') || '';
     const rest = fullAllDataRowIdData[rowid];
     if (rest) {
+      evnt.preventDefault();
       const row = rest.row;
       const rowid = getRowid($xeTable, row);
       const rowRest = fullAllDataRowIdData[rowid];
-      evnt.preventDefault();
-      const {
-        dragRow
-      } = reactData;
       const offsetY = evnt.clientY - trEl.getBoundingClientRect().y;
       const dragPos = offsetY < trEl.clientHeight / 2 ? 'top' : 'bottom';
-      internalData.prevDragToChild = !!(treeConfig && transform && isToChildDrag && isControlKey);
+      internalData.prevDragToChild = !!(treeConfig && transform && isCrossDrag && isToChildDrag && isControlKey);
       internalData.prevDragRow = row;
       internalData.prevDragPos = dragPos;
+      // 跨表拖拽
+      if (isCrossTableDrag && (!treeConfig || isCrossDrag) && crossTableDragRowObj) {
+        const {
+          $oldTable,
+          $newTable
+        } = crossTableDragRowObj;
+        if ($oldTable) {
+          const oldTableReactData = $oldTable;
+          if ($oldTable.xID === $xeTable.xID) {
+            if ($newTable) {
+              $newTable.hideCrossTableRowDropClearStatus();
+            }
+            reactData.isCrossDragRow = false;
+            oldTableReactData.isCrossDragRow = false;
+            crossTableDragRowObj.$newTable = null;
+          } else if (!treeConfig || isCrossDrag) {
+            $oldTable.hideCrossTableRowDropClearStatus();
+            oldTableReactData.isCrossDragRow = true;
+            reactData.dragTipText = oldTableReactData.dragTipText;
+            crossTableDragRowObj.$newTable = $xeTable;
+            showDropTip($xeTable, evnt, trEl, null, true, dragPos);
+            return;
+          }
+        }
+      }
       if ($xeTable.eqRow(dragRow, row) || isControlKey && treeConfig && lazy && row[hasChildField] && rowRest && !rowRest.treeLoaded || !isCrossDrag && treeConfig && transform && (isPeerDrag ? dragRow[parentField] !== row[parentField] : rest.level)) {
         showDropTip($xeTable, evnt, trEl, null, false, dragPos);
         return;
@@ -15694,12 +16265,14 @@ const Methods = {
     const $xeTable = this;
     const props = $xeTable;
     const reactData = $xeTable;
+    const crossTableDragRowInfo = getCrossTableDragRowInfo($xeTable);
     evnt.stopPropagation();
     const {
       dragConfig
     } = props;
     const rowDragOpts = $xeTable.computeRowDragOpts;
     const {
+      isCrossTableDrag,
       trigger,
       dragStartMethod
     } = rowDragOpts;
@@ -15715,10 +16288,19 @@ const Methods = {
       trEl.draggable = false;
       reactData.dragRow = null;
       reactData.dragCol = null;
+      clearCrossTableDragStatus($xeTable);
       hideDropTip($xeTable);
       return;
     }
+    if (isCrossTableDrag) {
+      crossTableDragRowInfo.row = row;
+      crossTableDragRowObj = {
+        $oldTable: $xeTable,
+        $newTable: null
+      };
+    }
     reactData.dragRow = row;
+    reactData.isCrossDragRow = false;
     reactData.dragCol = null;
     trEl.draggable = true;
     updateRowDropOrigin($xeTable, row);
@@ -16064,6 +16646,7 @@ const Methods = {
     internalData.prevDragToChild = false;
     reactData.dragRow = null;
     reactData.dragCol = null;
+    clearCrossTableDragStatus($xeTable);
   },
   handleHeaderCellDragDragoverEvent(evnt) {
     const $xeTable = this;
@@ -16157,11 +16740,13 @@ const Methods = {
       reactData.dragRow = null;
       reactData.dragCol = null;
       hideDropTip($xeTable);
+      clearCrossTableDragStatus($xeTable);
       return;
     }
     reactData.dragCol = column;
     reactData.dragRow = null;
     thEl.draggable = true;
+    clearCrossTableDragStatus($xeTable);
     updateColDropOrigin($xeTable, column);
     updateColDropTipContent($xeTable, thEl);
     $xeTable.dispatchEvent('column-dragstart', params, evnt);
@@ -16171,6 +16756,7 @@ const Methods = {
     const reactData = $xeTable;
     clearColDropOrigin($xeTable);
     hideDropTip($xeTable);
+    clearCrossTableDragStatus($xeTable);
     reactData.dragRow = null;
     reactData.dragCol = null;
   },
@@ -18402,6 +18988,10 @@ const Methods = {
     }
     reactData.footerTableData = footData;
     $xeTable.handleUpdateFooterMerge();
+    $xeTable.dispatchEvent('footer-data-change', {
+      visibleColumn: internalData.visibleColumn,
+      footData
+    }, null);
     return $xeTable.$nextTick();
   },
   /**
@@ -18488,45 +19078,101 @@ const Methods = {
       return updateStyle($xeTable);
     });
   },
-  setMergeFooterItems(merges) {
+  setMergeHeaderCells(merges) {
+    const $xeTable = this;
+    handleHeaderMerge($xeTable, merges);
+    $xeTable.handleUpdateHeaderMerge();
+    return $xeTable.$nextTick().then(() => {
+      return updateStyle($xeTable);
+    });
+  },
+  /**
+   * 移除表头单元格合并 [{row:Row|number, col:ColumnInfo|number}]
+   */
+  removeMergeHeaderCells(merges) {
+    const $xeTable = this;
+    const rest = removeHeaderMerges($xeTable, merges);
+    $xeTable.handleUpdateHeaderMerge();
+    return $xeTable.$nextTick().then(() => {
+      updateStyle($xeTable);
+      return rest;
+    });
+  },
+  /**
+   * 获取所有被合并的表头单元格
+   */
+  getMergeHeaderCells() {
+    const $xeTable = this;
+    const internalData = $xeTable;
+    return internalData.mergeHeaderList.slice(0);
+  },
+  /**
+   * 清除所有表头单元格合并
+   */
+  clearMergeHeaderCells() {
+    const $xeTable = this;
+    const reactData = $xeTable;
+    const internalData = $xeTable;
+    internalData.mergeHeaderList = [];
+    internalData.mergeHeaderMaps = {};
+    internalData.mergeHeaderCellMaps = {};
+    reactData.mergeHeadFlag++;
+    return $xeTable.$nextTick().then(() => {
+      return updateStyle($xeTable);
+    });
+  },
+  setMergeFooterCells(merges) {
     const $xeTable = this;
     const props = $xeTable;
     if (props.footerSpanMethod) {
-      errLog('vxe.error.errConflicts', ['merge-footer-items', 'footer-span-method']);
+      errLog('vxe.error.errConflicts', ['merge-footer-cells | merge-footer-items', 'footer-span-method']);
     }
     handleFooterMerge($xeTable, merges);
     $xeTable.handleUpdateFooterMerge();
     return $xeTable.$nextTick().then(() => {
-      $xeTable.updateCellAreas();
       return updateStyle($xeTable);
     });
   },
-  removeMergeFooterItems(merges) {
+  setMergeFooterItems(merges) {
+    const $xeTable = this;
+    // errLog('vxe.error.delFunc', ['setMergeFooterItems', 'setMergeFooterCells'])
+    return $xeTable.setMergeFooterCells(merges);
+  },
+  removeMergeFooterCells(merges) {
     const $xeTable = this;
     const props = $xeTable;
     if (props.footerSpanMethod) {
-      errLog('vxe.error.errConflicts', ['merge-footer-items', 'footer-span-method']);
+      errLog('vxe.error.errConflicts', ['merge-footer-cells | merge-footer-items', 'footer-span-method']);
     }
     const rest = removeFooterMerges($xeTable, merges);
     $xeTable.handleUpdateFooterMerge();
     return $xeTable.$nextTick().then(() => {
-      $xeTable.updateCellAreas();
       updateStyle($xeTable);
       return rest;
     });
   },
+  removeMergeFooterItems(merges) {
+    const $xeTable = this;
+    // errLog('vxe.error.delFunc', ['removeMergeFooterItems', 'removeMergeFooterCells'])
+    return $xeTable.removeMergeFooterCells(merges);
+  },
   /**
    * 获取所有被合并的表尾
    */
-  getMergeFooterItems() {
+  getMergeFooterCells() {
     const $xeTable = this;
     const internalData = $xeTable;
     return internalData.mergeFooterList.slice(0);
   },
+  getMergeFooterItems() {
+    const $xeTable = this;
+    // errLog('vxe.error.delFunc', ['getMergeFooterItems', 'getMergeFooterCells'])
+    return $xeTable.getMergeFooterCells();
+  },
   /**
    * 清除所有表尾合并
    */
-  clearMergeFooterItems() {
+  clearMergeFooterCells() {
     const $xeTable = this;
     const reactData = $xeTable;
     const internalData = $xeTable;
@@ -18538,6 +19184,11 @@ const Methods = {
       return updateStyle($xeTable);
     });
   },
+  clearMergeFooterItems() {
+    const $xeTable = this;
+    // errLog('vxe.error.delFunc', ['clearMergeFooterItems', 'clearMergeFooterCells'])
+    return $xeTable.clearMergeFooterCells();
+  },
   handleUpdateAggData() {
     const $xeTable = this;
     const internalData = $xeTable;
@@ -18575,14 +19226,7 @@ const Methods = {
   // 已废弃，使用 dispatchEvent
   emitEvent(type, params, evnt) {
     const $xeTable = this;
-    const $xeGrid = $xeTable.$xeGrid;
-    const $xeGantt = $xeTable.$xeGantt;
-    $xeTable.$emit(type, createEvent(evnt, {
-      $table: $xeTable,
-      $grid: $xeGrid,
-      $gantt: $xeGantt,
-      $event: evnt
-    }));
+    $xeTable.dispatchEvent(type, params, evnt);
   },
   focus() {
     this.isActivated = true;
@@ -19682,7 +20326,7 @@ const {
   renderEmptyElement: header_renderEmptyElement
 } = core_.VxeUI;
 const cellType = 'header';
-const header_renderRows = (h, _vm, isGroup, isOptimizeMode, cols, $rowIndex) => {
+function header_renderRows(h, _vm, isGroup, isOptimizeMode, headerGroups, $rowIndex, cols) {
   const props = _vm;
   const $xeTable = _vm.$parent;
   const $xeGrid = $xeTable.$xeGrid;
@@ -19696,6 +20340,7 @@ const header_renderRows = (h, _vm, isGroup, isOptimizeMode, cols, $rowIndex) =>
   const {
     resizable: allResizable,
     columnKey,
+    showCustomHeader,
     headerCellClassName,
     headerCellStyle,
     showHeaderOverflow: allColumnHeaderOverflow,
@@ -19709,11 +20354,14 @@ const header_renderRows = (h, _vm, isGroup, isOptimizeMode, cols, $rowIndex) =>
     scrollXLoad,
     scrollYLoad,
     overflowX,
+    mergeHeadFlag,
     tableColumn
   } = tableReactData;
   const {
     fullColumnIdData,
-    scrollXStore
+    scrollXStore,
+    mergeHeaderList,
+    mergeHeaderCellMaps
   } = tableInternalData;
   const virtualXOpts = $xeTable.computeVirtualXOpts;
   const columnOpts = $xeTable.computeColumnOpts;
@@ -19727,6 +20375,7 @@ const header_renderRows = (h, _vm, isGroup, isOptimizeMode, cols, $rowIndex) =>
     isCrossDrag,
     isPeerDrag
   } = columnDragOpts;
+  const isLastRow = $rowIndex === headerGroups.length - 1;
   return cols.map((column, $columnIndex) => {
     const {
       type,
@@ -19759,7 +20408,7 @@ const header_renderRows = (h, _vm, isGroup, isOptimizeMode, cols, $rowIndex) =>
       hasFilter = filters.some(item => item.checked);
     }
     const columnIndex = colRest.index;
-    const _columnIndex = colRest._index;
+    const _columnIndex = showCustomHeader ? $columnIndex : colRest._index;
     const cellParams = {
       $table: $xeTable,
       $grid: $xeGrid,
@@ -19776,10 +20425,34 @@ const header_renderRows = (h, _vm, isGroup, isOptimizeMode, cols, $rowIndex) =>
       hasFilter
     };
     const thAttrs = {
-      colid,
-      colspan: column.colSpan > 1 ? column.colSpan : null,
-      rowspan: column.rowSpan > 1 ? column.rowSpan : null
+      colid
     };
+    let isMergeCell = false;
+    // 合并行或列
+    if (!showCustomHeader) {
+      thAttrs.colspan = column.colSpan > 1 ? column.colSpan : null;
+      thAttrs.rowspan = column.rowSpan > 1 ? column.rowSpan : null;
+    }
+    if (mergeHeadFlag && mergeHeaderList.length && (showCustomHeader || isLastRow)) {
+      const spanRest = mergeHeaderCellMaps[`${$rowIndex}:${showCustomHeader ? $columnIndex : _columnIndex}`];
+      if (spanRest) {
+        const {
+          rowspan,
+          colspan
+        } = spanRest;
+        if (!rowspan || !colspan) {
+          return null;
+        }
+        if (rowspan > 1) {
+          isMergeCell = true;
+          thAttrs.rowspan = rowspan;
+        }
+        if (colspan > 1) {
+          isMergeCell = true;
+          thAttrs.colspan = colspan;
+        }
+      }
+    }
     const thOns = {
       click: evnt => $xeTable.triggerHeaderCellClickEvent(evnt, cellParams),
       dblclick: evnt => $xeTable.triggerHeaderCellDblclickEvent(evnt, cellParams)
@@ -19806,7 +20479,7 @@ const header_renderRows = (h, _vm, isGroup, isOptimizeMode, cols, $rowIndex) =>
     const showResizable = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(column.resizable) ? column.resizable : columnOpts.resizable || allResizable;
     const isAutoCellWidth = !column.resizeWidth && (column.minWidth === 'auto' || column.width === 'auto');
     let isVNPreEmptyStatus = false;
-    if (isOptimizeMode && overflowX && !isGroup) {
+    if (isOptimizeMode && overflowX && !isGroup && !isMergeCell) {
       if (!dragCol || dragCol.id !== colid) {
         if (scrollXLoad && tableColumn.length > 10 && !column.fixed && !virtualXOpts.immediate && (_columnIndex < scrollXStore.visibleStartIndex - scrollXStore.preloadSize || _columnIndex > scrollXStore.visibleEndIndex + scrollXStore.preloadSize)) {
           isVNPreEmptyStatus = true;
@@ -19820,7 +20493,7 @@ const header_renderRows = (h, _vm, isGroup, isOptimizeMode, cols, $rowIndex) =>
       tcStyle.minHeight = `${currCellHeight}px`;
     }
     return h('th', {
-      class: ['vxe-table--column vxe-header--column', colid, {
+      class: ['vxe-table--column vxe-header--column', colid, fixedHiddenColumn ? 'fixed--hidden' : 'fixed--visible', {
         [`col--${headAlign}`]: headAlign,
         [`col--${type}`]: type,
         'col--last': isLastColumn,
@@ -19828,7 +20501,6 @@ const header_renderRows = (h, _vm, isGroup, isOptimizeMode, cols, $rowIndex) =>
         'col--group': isColGroup,
         'col--ellipsis': hasEllipsis,
         'fixed--width': !isAutoCellWidth,
-        'fixed--hidden': fixedHiddenColumn,
         'is--padding': isPadding,
         'is--sortable': column.sortable,
         'col--filter': !!filters,
@@ -19840,7 +20512,7 @@ const header_renderRows = (h, _vm, isGroup, isOptimizeMode, cols, $rowIndex) =>
       attrs: thAttrs,
       style: headerCellStyle ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(headerCellStyle) ? headerCellStyle(cellParams) : headerCellStyle : undefined,
       on: thOns,
-      key: columnKey || scrollXLoad || scrollYLoad || columnOpts.useKey || columnOpts.drag || isColGroup ? colid : $columnIndex
+      key: showCustomHeader ? `${colid}${$columnIndex}` : columnKey || scrollXLoad || scrollYLoad || columnOpts.useKey || columnOpts.drag || isColGroup ? colid : $columnIndex
     }, [h('div', {
       class: ['vxe-cell', {
         'c--title': showTitle,
@@ -19855,9 +20527,9 @@ const header_renderRows = (h, _vm, isGroup, isOptimizeMode, cols, $rowIndex) =>
       class: 'vxe-cell--wrapper vxe-header-cell--wrapper'
     }, column.renderHeader(h, cellParams))]),
     /**
-    * 列宽拖动
-    */
-    !fixedHiddenColumn && showResizable ? h('div', {
+     * 列宽拖动
+     */
+    !fixedHiddenColumn && showResizable && (!showCustomHeader || isLastRow) ? h('div', {
       class: 'vxe-cell--col-resizable',
       on: {
         mousedown: evnt => $xeTable.handleColResizeMousedownEvent(evnt, fixedType, cellParams),
@@ -19865,7 +20537,7 @@ const header_renderRows = (h, _vm, isGroup, isOptimizeMode, cols, $rowIndex) =>
       }
     }) : header_renderEmptyElement($xeTable)]);
   });
-};
+}
 function renderHeads(h, _vm, isGroup, isOptimizeMode, headerGroups) {
   const props = _vm;
   const $xeTable = _vm.$parent;
@@ -19888,7 +20560,7 @@ function renderHeads(h, _vm, isGroup, isOptimizeMode, headerGroups) {
       key: $rowIndex,
       class: ['vxe-header--row', headerRowClassName ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(headerRowClassName) ? headerRowClassName(params) : headerRowClassName : ''],
       style: headerRowStyle ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(headerRowStyle) ? headerRowStyle(params) : headerRowStyle : undefined
-    }, header_renderRows(h, _vm, isGroup, isOptimizeMode, cols, $rowIndex));
+    }, header_renderRows(h, _vm, isGroup, isOptimizeMode, headerGroups, $rowIndex, cols));
   });
 }
 /* harmony default export */ var header = ({
@@ -19910,11 +20582,13 @@ function renderHeads(h, _vm, isGroup, isOptimizeMode, headerGroups) {
   },
   watch: {
     tableColumn() {
-      this.uploadColumn();
+      const _vm = this;
+      _vm.uploadColumn();
     }
   },
   created() {
-    this.uploadColumn();
+    const _vm = this;
+    _vm.uploadColumn();
   },
   mounted() {
     const _vm = this;
@@ -19937,8 +20611,9 @@ function renderHeads(h, _vm, isGroup, isOptimizeMode, headerGroups) {
     elemStore[`${prefix}repair`] = _vm.$refs.refHeaderBorderRepair;
   },
   destroyed() {
-    const props = this;
-    const $xeTable = this.$parent;
+    const _vm = this;
+    const props = _vm;
+    const $xeTable = _vm.$parent;
     const internalData = $xeTable;
     const {
       fixedType
@@ -19956,8 +20631,9 @@ function renderHeads(h, _vm, isGroup, isOptimizeMode, headerGroups) {
     elemStore[`${prefix}repair`] = null;
   },
   render(h) {
-    const props = this;
-    const $xeTable = this.$parent;
+    const _vm = this;
+    const props = _vm;
+    const $xeTable = _vm.$parent;
     const tableProps = $xeTable;
     const tableReactData = $xeTable;
     const tableInternalData = $xeTable;
@@ -19971,7 +20647,7 @@ function renderHeads(h, _vm, isGroup, isOptimizeMode, headerGroups) {
     } = props;
     const {
       headerColumn
-    } = this;
+    } = _vm;
     const {
       mouseConfig,
       showHeaderOverflow: allColumnHeaderOverflow,
@@ -20090,7 +20766,7 @@ function renderHeads(h, _vm, isGroup, isOptimizeMode, headerGroups) {
      */
     h('thead', {
       ref: 'refHeaderTHead'
-    }, renderHeads(h, this, isGroup, isOptimizeMode, renderHeaderList))]), mouseConfig && mouseOpts.area ? h('div', {
+    }, renderHeads(h, _vm, isGroup, isOptimizeMode, renderHeaderList))]), mouseConfig && mouseOpts.area ? h('div', {
       class: 'vxe-table--cell-area'
     }, [h('span', {
       class: 'vxe-table--cell-main-area'
@@ -20108,12 +20784,37 @@ function renderHeads(h, _vm, isGroup, isOptimizeMode, headerGroups) {
   },
   methods: {
     uploadColumn() {
-      const $xeTable = this.$parent;
+      const _vm = this;
+      const $xeTable = _vm.$parent;
+      const tableProps = $xeTable;
       const tableReactData = $xeTable;
+      const tableInternalData = $xeTable;
+      const props = _vm;
+      const {
+        showCustomHeader
+      } = tableProps;
+      const {
+        collectColumn,
+        visibleColumn
+      } = tableInternalData;
+      const {
+        tableGroupColumn
+      } = props;
       const {
         isGroup
       } = tableReactData;
-      this.headerColumn = isGroup ? convertHeaderColumnToRows(this.tableGroupColumn) : [];
+      let spanColumns = isGroup ? convertHeaderColumnToRows(tableGroupColumn) : [];
+      let visibleColgroups = [];
+      if (showCustomHeader && spanColumns.length > 1) {
+        visibleColgroups = convertHeaderToGridRows(spanColumns);
+        spanColumns = visibleColgroups;
+      }
+      _vm.headerColumn = spanColumns;
+      $xeTable.dispatchEvent('columns-change', {
+        visibleColgroups,
+        collectColumn,
+        visibleColumn
+      }, null);
     }
   }
 });
@@ -20411,8 +21112,9 @@ function footer_renderHeads(h, _vm, isOptimizeMode, renderColumnList) {
     elemStore[`${prefix}xSpace`] = _vm.$refs.refFooterXSpace;
   },
   destroyed() {
-    const props = this;
-    const $xeTable = this.$parent;
+    const _vm = this;
+    const props = _vm;
+    const $xeTable = _vm.$parent;
     const tableInternalData = $xeTable;
     const {
       fixedType
@@ -20429,8 +21131,9 @@ function footer_renderHeads(h, _vm, isOptimizeMode, renderColumnList) {
     elemStore[`${prefix}xSpace`] = null;
   },
   render(h) {
-    const props = this;
-    const $xeTable = this.$parent;
+    const _vm = this;
+    const props = _vm;
+    const $xeTable = _vm.$parent;
     const tableProps = $xeTable;
     const tableReactData = $xeTable;
     const tableInternalData = $xeTable;
@@ -20549,7 +21252,7 @@ function footer_renderHeads(h, _vm, isOptimizeMode, renderColumnList) {
     */
     h('tfoot', {
       ref: 'refFooterTFoot'
-    }, footer_renderHeads(h, this, isOptimizeMode, renderColumnList))])])]);
+    }, footer_renderHeads(h, _vm, isOptimizeMode, renderColumnList))])])]);
   }
 });
 ;// CONCATENATED MODULE: ./packages/table/module/custom/panel.ts
@@ -23041,6 +23744,7 @@ const {
      * @param column
      */
     _openFilter(fieldOrColumn) {
+      const $xeTable = this;
       const column = handleFieldOrColumn(this, fieldOrColumn);
       if (column && column.filters) {
         const {
@@ -23049,7 +23753,7 @@ const {
         const {
           fixed
         } = column;
-        return this.scrollToColumn(column).then(() => {
+        return $xeTable.scrollToColumn(column).then(() => {
           const headerWrapperElem = elemStore[`${fixed || 'main'}-header-wrapper`] || elemStore['main-header-wrapper'];
           if (headerWrapperElem) {
             const filterBtnElem = headerWrapperElem.querySelector(`.vxe-header--column.${column.id} .vxe-cell--filter`);
@@ -23057,7 +23761,7 @@ const {
           }
         });
       }
-      return this.$nextTick();
+      return $xeTable.$nextTick();
     },
     /**
      * 修改筛选条件列表
@@ -23278,9 +23982,9 @@ const {
           datas.push(item.data);
         }
       });
-      const filterList = this.getCheckedFilters();
+      const filterList = $xeTable.getCheckedFilters();
       const params = {
-        $table: this,
+        $table: $xeTable,
         $event: evnt,
         column,
         field,
@@ -23292,21 +23996,21 @@ const {
       };
       // 如果是服务端筛选，则跳过本地筛选处理
       if (!filterOpts.remote) {
-        this.handleTableData(true);
-        this.checkSelectionStatus();
+        $xeTable.handleTableData(true);
+        $xeTable.checkSelectionStatus();
       }
-      if (mouseConfig && mouseOpts.area && this.handleFilterEvent) {
+      if (mouseConfig && mouseOpts.area && $xeTable.handleFilterEvent) {
         $xeTable.handleFilterEvent(evnt, params);
       }
       if (evnt) {
-        $xeTable.emitEvent('filter-change', params, evnt);
+        $xeTable.dispatchEvent('filter-change', params, evnt);
       }
       $xeTable.closeFilter();
       return $xeTable.updateFooter().then(() => {
         const {
           scrollXLoad,
           scrollYLoad
-        } = this;
+        } = reactData;
         if (oldScrollXLoad || scrollXLoad || oldScrollYLoad || scrollYLoad) {
           if (oldScrollXLoad || scrollXLoad) {
             $xeTable.updateScrollXSpace();
@@ -23341,6 +24045,7 @@ const {
       $xeTable.handleColumnConfirmFilter(column, evnt);
     },
     handleClearFilter(column) {
+      const $xeTable = this;
       if (column) {
         const {
           filters,
@@ -23360,7 +24065,7 @@ const {
             filterResetMethod({
               options: filters,
               column,
-              $table: this
+              $table: $xeTable
             });
           }
         }
@@ -23563,26 +24268,33 @@ const {
           };
           if (columnTargetNode.flag) {
             const cell = columnTargetNode.targetElem;
-            const column = this.getColumnNode(cell).item;
+            const columnNodeRest = $xeTable.getColumnNode(cell);
+            const column = columnNodeRest ? columnNodeRest.item : null;
             let typePrefix = `${layout}-`;
-            Object.assign(params, {
-              column,
-              columnIndex: this.getColumnIndex(column),
-              cell
-            });
+            if (column) {
+              Object.assign(params, {
+                column,
+                columnIndex: $xeTable.getColumnIndex(column),
+                cell
+              });
+            }
             if (layout === 'body') {
-              const row = this.getRowNode(cell.parentNode).item;
+              const rowNodeRest = $xeTable.getRowNode(cell.parentNode);
+              const row = rowNodeRest ? rowNodeRest.item : null;
               typePrefix = '';
-              params.row = row;
-              params.rowIndex = this.getRowIndex(row);
+              if (row) {
+                params.row = row;
+                params.rowIndex = $xeTable.getRowIndex(row);
+              }
             }
+            const eventType = `${typePrefix}cell-menu`;
             this.handleOpenMenuEvent(evnt, layout, params);
             // 在 v4 中废弃事件 cell-context-menu、header-cell-context-menu、footer-cell-context-menu
             if (this.$listeners[`${typePrefix}cell-context-menu`]) {
               warnLog('vxe.error.delEvent', [`${typePrefix}cell-context-menu`, `${typePrefix}cell-menu`]);
-              this.emitEvent(`${typePrefix}cell-context-menu`, params, evnt);
+              $xeTable.dispatchEvent(`${typePrefix}cell-context-menu`, params, evnt);
             } else {
-              this.emitEvent(`${typePrefix}cell-menu`, params, evnt);
+              $xeTable.dispatchEvent(eventType, params, evnt);
             }
             return;
           } else if (getEventTargetNode(evnt, this.$el, `vxe-table--${layout}-wrapper`, target => target.getAttribute('xid') === tId).flag) {
@@ -23765,9 +24477,9 @@ const {
         // 在 v4 中废弃事件 context-menu-click
         if (this.$listeners['context-menu-click']) {
           warnLog('vxe.error.delEvent', ['context-menu-click', 'menu-click']);
-          this.emitEvent('context-menu-click', params, evnt);
+          $xeTable.dispatchEvent('context-menu-click', params, evnt);
         } else {
-          this.emitEvent('menu-click', params, evnt);
+          $xeTable.dispatchEvent('menu-click', params, evnt);
         }
         this.closeMenu();
       }
@@ -23944,11 +24656,13 @@ function handleInsertRowAt($xeTable, records, targetRow, isInsertNextRow) {
     tableFullData,
     fullDataRowIdData,
     fullAllDataRowIdData,
-    insertRowMaps
+    insertRowMaps,
+    removeRowMaps
   } = internalData;
   const treeOpts = $xeTable.computeTreeOpts;
   const {
     transform,
+    parentField,
     rowField,
     mapChildrenField
   } = treeOpts;
@@ -23960,6 +24674,14 @@ function handleInsertRowAt($xeTable, records, targetRow, isInsertNextRow) {
     [mapChildrenField]: [],
     [childrenField]: []
   } : {}, record)));
+  let treeRecords = [];
+  if (treeConfig && transform) {
+    treeRecords = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toArrayTree(newRecords, {
+      key: rowField,
+      parentKey: parentField,
+      children: childrenField
+    });
+  }
   if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(targetRow)) {
     // 如果为虚拟树
     if (treeConfig && transform) {
@@ -24057,21 +24779,26 @@ function handleInsertRowAt($xeTable, records, targetRow, isInsertNextRow) {
           const parentMapChilds = parentRow ? parentRow[mapChildrenField] : tableFullTreeData;
           const parentRest = fullAllDataRowIdData[getRowid($xeTable, parentRow)];
           const parentLevel = parentRest ? parentRest.level : 0;
-          newRecords.forEach((item, i) => {
-            const rowid = getRowid($xeTable, item);
-            if (item[treeOpts.parentField]) {
-              if (parentRow && item[treeOpts.parentField] !== parentRow[rowField]) {
-                errLog('vxe.error.errProp', [`${treeOpts.parentField}=${item[treeOpts.parentField]}`, `${treeOpts.parentField}=${parentRow[rowField]}`]);
-              }
-            }
+          treeRecords.forEach((row, i) => {
             if (parentRow) {
-              item[treeOpts.parentField] = parentRow[rowField];
+              if (row[parentField] !== parentRow[rowField]) {
+                row[parentField] = parentRow[rowField];
+                errLog('vxe.error.errProp', [`${parentField}=${row[parentField]}`, `${parentField}=${parentRow[rowField]}`]);
+              }
+            } else {
+              if (row[parentField] !== null) {
+                row[parentField] = null;
+                errLog('vxe.error.errProp', [`${parentField}=${row[parentField]}`, 'null']);
+              }
             }
             let targetIndex = matchMapObj.index + i;
             if (isInsertNextRow) {
               targetIndex = targetIndex + 1;
             }
-            parentMapChilds.splice(targetIndex, 0, item);
+            parentMapChilds.splice(targetIndex, 0, row);
+          });
+          external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(treeRecords, item => {
+            const rowid = getRowid($xeTable, item);
             const rest = {
               row: item,
               rowid,
@@ -24089,8 +24816,13 @@ function handleInsertRowAt($xeTable, records, targetRow, isInsertNextRow) {
               oTop: 0,
               expandHeight: 0
             };
+            if (item[childrenField]) {
+              item[mapChildrenField] = item[childrenField];
+            }
             fullDataRowIdData[rowid] = rest;
             fullAllDataRowIdData[rowid] = rest;
+          }, {
+            children: childrenField
           });
           // 源
           if (parentRow) {
@@ -24103,7 +24835,7 @@ function handleInsertRowAt($xeTable, records, targetRow, isInsertNextRow) {
               if (isInsertNextRow) {
                 targetIndex = targetIndex + 1;
               }
-              parentChilds.splice(targetIndex, 0, ...newRecords);
+              parentChilds.splice(targetIndex, 0, ...treeRecords);
             }
           }
         } else {
@@ -24134,7 +24866,7 @@ function handleInsertRowAt($xeTable, records, targetRow, isInsertNextRow) {
           afIndex = Math.min(afterFullData.length, afIndex + 1);
         }
         if (afIndex === -1) {
-          throw new Error(errLog('vxe.error.unableInsert'));
+          throw new Error(mixin_getI18n('vxe.error.unableInsert'));
         }
         afterFullData.splice(afIndex, 0, ...newRecords);
         const tfIndex = $xeTable.findRowIndexOf(tableFullData, targetRow);
@@ -24158,10 +24890,27 @@ function handleInsertRowAt($xeTable, records, targetRow, isInsertNextRow) {
       }
     }
   }
-  newRecords.forEach(newRow => {
+  const handleStatus = newRow => {
     const rowid = getRowid($xeTable, newRow);
-    insertRowMaps[rowid] = newRow;
-  });
+    // 如果是被删除的数据，则还原状态
+    if (removeRowMaps[rowid]) {
+      delete removeRowMaps[rowid];
+      if (insertRowMaps[rowid]) {
+        delete insertRowMaps[rowid];
+      }
+    } else {
+      insertRowMaps[rowid] = newRow;
+    }
+  };
+  // 如果为虚拟树
+  if (treeConfig && transform) {
+    external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(treeRecords, handleStatus, {
+      children: mapChildrenField
+    });
+  } else {
+    newRecords.forEach(handleStatus);
+  }
+  reactData.removeRowFlag++;
   reactData.insertRowFlag++;
   $xeTable.cacheRowMap(false);
   $xeTable.updateScrollYStatus();
@@ -24812,7 +25561,9 @@ function handleEditCell($xeTable, row, fieldOrColumn, isPos) {
       if (column && row) {
         return {
           row,
-          column
+          rowIndex: $xeTable.getRowIndex(row),
+          column,
+          columnIndex: $xeTable.getColumnIndex(column)
         };
       }
       return null;
@@ -27783,12 +28534,13 @@ function checkRuleStatus(rule, val) {
      * 聚焦到校验通过的单元格并弹出校验错误提示
      */
     handleValidError(params) {
+      const $xeTable = this;
       const {
         validOpts
       } = this;
       return new Promise(resolve => {
         if (validOpts.autoPos === false) {
-          this.emitEvent('valid-error', params);
+          $xeTable.dispatchEvent('valid-error', params, null);
           resolve();
         } else {
           this.handleEdit(params, {
@@ -28201,6 +28953,7 @@ function checkRuleStatus(rule, val) {
      * 弹出校验错误提示
      */
     showValidTooltip(params) {
+      const $xeTable = this;
       const {
         $refs,
         height,
@@ -28237,7 +28990,7 @@ function checkRuleStatus(rule, val) {
           }
         });
       }
-      this.emitEvent('valid-error', params, null);
+      $xeTable.dispatchEvent('valid-error', params, null);
       if (validTip) {
         if (validTip && (validOpts.message === 'tooltip' || validOpts.message === 'default' && !height && tableData.length < 2)) {
           return validTip.open(cell, content);
@@ -28700,6 +29453,7 @@ function emitCustomEvent($xeTable, type, evnt) {
 
 
 
+
 
 
 const {
@@ -28719,12 +29473,19 @@ function handleUpdateMergeBodyCells($xeTable, merges) {
   internalData.mergeBodyCellMaps = {};
   $xeTable.setMergeCells(merges);
 }
+function handleUpdateMergeHeaderCells($xeTable, merges) {
+  const internalData = $xeTable;
+  internalData.mergeHeaderList = [];
+  internalData.mergeHeaderMaps = {};
+  internalData.mergeHeaderCellMaps = {};
+  $xeTable.setMergeHeaderCells(merges);
+}
 function handleUpdateMergeFooterCells($xeTable, merges) {
   const internalData = $xeTable;
   internalData.mergeFooterList = [];
   internalData.mergeFooterMaps = {};
   internalData.mergeFooterCellMaps = {};
-  $xeTable.setMergeFooterItems(merges);
+  $xeTable.setMergeFooterCells(merges);
 }
 function handleKeyField($xeTable) {
   const internalData = $xeTable;
@@ -28811,6 +29572,7 @@ function renderEmptyBody(h, $xeTable) {
 const renderDragTipContents = (h, $xeTable) => {
   const props = $xeTable;
   const reactData = $xeTable;
+  const crossTableDragRowInfo = getCrossTableDragRowInfo($xeTable);
   const {
     dragConfig
   } = props;
@@ -28825,9 +29587,10 @@ const renderDragTipContents = (h, $xeTable) => {
   const rTipSlot = rowDragSlots.tip || (dragConfig && dragConfig.slots ? dragConfig.slots.rowTip : null);
   const columnDragSlots = columnDragOpts.slots || {};
   const cTipSlot = columnDragSlots.tip;
-  if (dragRow && rTipSlot) {
+  const dRow = dragRow || (rowDragOpts.isCrossTableDrag ? crossTableDragRowInfo.row : null);
+  if (dRow && rTipSlot) {
     return $xeTable.callSlot(rTipSlot, {
-      row: dragRow
+      row: dRow
     }, h);
   }
   if (dragCol && cTipSlot) {
@@ -28839,6 +29602,7 @@ const renderDragTipContents = (h, $xeTable) => {
 };
 const table_renderDragTip = (h, $xeTable) => {
   const reactData = $xeTable;
+  const crossTableDragRowInfo = getCrossTableDragRowInfo($xeTable);
   const {
     dragRow,
     dragCol
@@ -28847,6 +29611,7 @@ const table_renderDragTip = (h, $xeTable) => {
   const columnOpts = $xeTable.computeColumnOpts;
   const rowDragOpts = $xeTable.computeRowDragOpts;
   const columnDragOpts = $xeTable.computeColumnDragOpts;
+  const dRow = dragRow || (rowDragOpts.isCrossTableDrag ? crossTableDragRowInfo.row : null);
   if (rowOpts.drag || columnOpts.drag) {
     return h('div', {
       class: 'vxe-table--drag-wrapper'
@@ -28860,7 +29625,7 @@ const table_renderDragTip = (h, $xeTable) => {
       class: ['vxe-table--drag-col-line', {
         'is--guides': columnDragOpts.showGuidesStatus
       }]
-    }), dragRow && rowDragOpts.showDragTip || dragCol && columnDragOpts.showDragTip ? h('div', {
+    }), dRow && rowDragOpts.showDragTip || dragCol && columnDragOpts.showDragTip ? h('div', {
       ref: 'refDragTipElem',
       class: 'vxe-table--drag-sort-tip'
     }, [h('div', {
@@ -28868,7 +29633,7 @@ const table_renderDragTip = (h, $xeTable) => {
     }, [h('div', {
       class: 'vxe-table--drag-sort-tip-status'
     }, [h('span', {
-      class: ['vxe-table--drag-sort-tip-normal-status', dragRow ? table_getIcon().TABLE_DRAG_STATUS_ROW : table_getIcon().TABLE_DRAG_STATUS_COLUMN]
+      class: ['vxe-table--drag-sort-tip-normal-status', dRow ? table_getIcon().TABLE_DRAG_STATUS_ROW : table_getIcon().TABLE_DRAG_STATUS_COLUMN]
     }), h('span', {
       class: ['vxe-table--drag-sort-tip-sub-status', table_getIcon().TABLE_DRAG_STATUS_SUB_ROW]
     }), h('span', {
@@ -29027,7 +29792,9 @@ function renderScrollX(h, $xeTable) {
   }, [h('div', {
     ref: 'refScrollXSpaceElem',
     class: 'vxe-table--scroll-x-space'
-  })])]), h('div', {
+  })]), h('div', {
+    class: 'vxe-table--scroll-x-handle-appearance'
+  })]), h('div', {
     ref: 'refScrollXRightCornerElem',
     class: 'vxe-table--scroll-x-right-corner'
   })]);
@@ -29144,9 +29911,7 @@ function renderBody(h, $xeTable) {
   },
   data() {
     const xID = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().uniqueId();
-    return {
-      xID,
-      tId: xID,
+    const reactData = {
       // 低性能的静态列
       staticColumns: [],
       // 渲染的列分组
@@ -29167,6 +29932,8 @@ function renderBody(h, $xeTable) {
       scrollbarWidth: 0,
       // 横向滚动条的高度
       scrollbarHeight: 0,
+      // 最后滚动时间戳
+      lastScrollTime: 0,
       // 行高
       rowHeight: 0,
       // 表格父容器的高度
@@ -29192,9 +29959,13 @@ function renderBody(h, $xeTable) {
       expandColumn: null,
       checkboxColumn: null,
       radioColumn: null,
-      hasFixedColumn: false,
       // 树节点列信息
       treeNodeColumn: null,
+      hasFixedColumn: false,
+      // 刷新列标识，当列筛选被改变时，触发表格刷新数据
+      upDataFlag: 0,
+      // 刷新列标识，当列的特定属性被改变时，触发表格刷新列
+      reColumnFlag: 0,
       // 初始化标识
       initStore: {
         filter: false,
@@ -29202,11 +29973,6 @@ function renderBody(h, $xeTable) {
         export: false,
         custom: false
       },
-      customColumnList: [],
-      // 刷新列标识，当列筛选被改变时，触发表格刷新数据
-      upDataFlag: 0,
-      // 刷新列标识，当列的特定属性被改变时，触发表格刷新列
-      reColumnFlag: 0,
       // 自定义列相关的信息
       customStore: {
         btnEl: null,
@@ -29220,6 +29986,7 @@ function renderBody(h, $xeTable) {
         oldFixedMaps: {},
         oldVisibleMaps: {}
       },
+      customColumnList: [],
       // 当前选中的筛选列
       filterStore: {
         isAllSelected: false,
@@ -29288,6 +30055,7 @@ function renderBody(h, $xeTable) {
       tooltipStore: {
         row: null,
         column: null,
+        content: null,
         visible: false,
         currOpts: {}
       },
@@ -29320,8 +30088,8 @@ function renderBody(h, $xeTable) {
         columns: [],
         isPrint: false,
         hasFooter: false,
-        hasTree: false,
         hasMerge: false,
+        hasTree: false,
         hasColgroup: false,
         visible: false
       },
@@ -29352,6 +30120,7 @@ function renderBody(h, $xeTable) {
       pendingRowFlag: 1,
       insertRowFlag: 1,
       removeRowFlag: 1,
+      mergeHeadFlag: 1,
       mergeBodyFlag: 1,
       mergeFootFlag: 1,
       rowHeightStore: {
@@ -29368,22 +30137,30 @@ function renderBody(h, $xeTable) {
       scrollXLeft: 0,
       scrollXWidth: 0,
       isScrollXBig: false,
+      lazScrollLoading: false,
       rowExpandHeightFlag: 1,
       calcCellHeightFlag: 1,
       resizeHeightFlag: 1,
       resizeWidthFlag: 1,
       isCustomStatus: false,
-      isDragRowMove: false,
+      isCrossDragRow: false,
       dragRow: null,
-      isDragColMove: false,
+      isCrossDragCol: false,
       dragCol: null,
       dragTipText: '',
       isDragResize: false,
       isRowLoading: false,
-      isColLoading: false,
+      isColLoading: false
+    };
+    return {
+      xID,
+      ...reactData,
+      // 私有属性
       reScrollFlag: 0,
       reLayoutFlag: 0,
-      footFlag: 0
+      footFlag: 0,
+      mergeFooteCellFlag: 0,
+      crossTableDragRowInfo: crossTableDragRowGlobal
     };
   },
   computed: {
@@ -30147,9 +30924,21 @@ function renderBody(h, $xeTable) {
       const $xeTable = this;
       handleUpdateMergeBodyCells($xeTable, value);
     },
-    mergeFooterItems(value) {
+    mergeHeaderCells(value) {
+      const $xeTable = this;
+      handleUpdateMergeHeaderCells($xeTable, value);
+    },
+    mergeFooterCells() {
+      this.mergeFooteCellFlag++;
+    },
+    mergeFooterItems() {
+      this.mergeFooteCellFlag++;
+    },
+    mergeFooteCellFlag() {
       const $xeTable = this;
-      handleUpdateMergeFooterCells($xeTable, value);
+      const props = $xeTable;
+      const mFooterCells = props.mergeFooterCells || props.mergeFooterItems;
+      handleUpdateMergeFooterCells($xeTable, mFooterCells || []);
     },
     computeRowGroupFields(val) {
       const $xeTable = this;
@@ -30207,6 +30996,7 @@ function renderBody(h, $xeTable) {
     const currentColumnOpts = $xeTable.computeCurrentColumnOpts;
     const keyboardOpts = $xeTable.computeKeyboardOpts;
     const aggregateOpts = $xeTable.computeAggregateOpts;
+    const rowDragOpts = $xeTable.computeRowDragOpts;
     const {
       groupFields
     } = aggregateOpts;
@@ -30314,7 +31104,10 @@ function renderBody(h, $xeTable) {
       }
     }
     if (treeConfig && rowOpts.drag && !treeOpts.transform) {
-      warnLog('vxe.error.notSupportProp', ['column-config.drag', 'tree-config.transform=false', 'tree-config.transform=true']);
+      warnLog('vxe.error.notSupportProp', ['row-config.drag', 'tree-config.transform=false', 'tree-config.transform=true']);
+    }
+    if (treeConfig && rowDragOpts.isCrossTableDrag && !rowDragOpts.isCrossDrag) {
+      errLog('vxe.error.reqSupportProp', ['tree-config & row-drag-config.isCrossTableDrag', 'row-drag-config.isCrossDrag']);
     }
     if (props.dragConfig) {
       warnLog('vxe.error.delProp', ['drag-config', 'row-drag-config']);
@@ -30641,6 +31434,7 @@ function renderBody(h, $xeTable) {
       rightList
     } = columnStore;
     const loadingSlot = slots.loading;
+    const rowDragOpts = $xeTable.computeRowDragOpts;
     const tableTipConfig = $xeTable.computeTableTipConfig;
     const validTipConfig = $xeTable.computeValidTipConfig;
     const validOpts = $xeTable.computeValidOpts;
@@ -30660,6 +31454,13 @@ function renderBody(h, $xeTable) {
     const columnDragOpts = $xeTable.computeColumnDragOpts;
     const scrollbarXToTop = $xeTable.computeScrollbarXToTop;
     const scrollbarYToLeft = $xeTable.computeScrollbarYToLeft;
+    const {
+      isCrossTableDrag
+    } = rowDragOpts;
+    const rwOns = {};
+    if (isCrossTableDrag && !tableData.length) {
+      rwOns.onDragover = $xeTable.handleCrossTableRowDragoverEmptyEvent;
+    }
     return h('div', {
       ref: 'refElem',
       class: ['vxe-table', 'vxe-table--render-default', `tid_${xID}`, `border--${tableBorder}`, `sx-pos--${scrollbarXToTop ? 'top' : 'bottom'}`, `sy-pos--${scrollbarYToLeft ? 'left' : 'right'}`, {
@@ -30719,7 +31520,8 @@ function renderBody(h, $xeTable) {
       class: 'vxe-table-var-mini'
     })]), h('div', {
       key: 'tw',
-      class: 'vxe-table--render-wrapper'
+      class: 'vxe-table--render-wrapper',
+      on: rwOns
     }, scrollbarXToTop ? [renderScrollX(h, $xeTable), renderBody(h, $xeTable)] : [renderBody(h, $xeTable), renderScrollX(h, $xeTable)]),
     /**
      * 空数据