vxe-table 3.18.1 → 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.1";
+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.1"}`;
+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,
@@ -7070,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) {
@@ -7081,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) {
@@ -7092,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) {
@@ -8120,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) {
@@ -8162,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;
@@ -8179,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];
     }
@@ -8208,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 {
@@ -8228,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}`];
           }
         }
       }
@@ -8243,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 {
@@ -8370,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') {
@@ -8922,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);
   }
 }
 // 计算可视渲染相关数据
@@ -9434,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);
@@ -9490,6 +9713,7 @@ function handleLoadDefaults($xeTable) {
   handleDefaultTreeExpand($xeTable);
   handleDefaultRowGroupExpand($xeTable);
   handleDefaultMergeCells($xeTable);
+  handleDefaultMergeHeaderItems($xeTable);
   handleDefaultMergeFooterItems($xeTable);
   $xeTable.$nextTick(() => setTimeout(() => $xeTable.recalculate()));
 }
@@ -13523,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;
@@ -18754,6 +18988,10 @@ const Methods = {
     }
     reactData.footerTableData = footData;
     $xeTable.handleUpdateFooterMerge();
+    $xeTable.dispatchEvent('footer-data-change', {
+      visibleColumn: internalData.visibleColumn,
+      footData
+    }, null);
     return $xeTable.$nextTick();
   },
   /**
@@ -18840,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;
@@ -18890,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;
@@ -20027,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;
@@ -20041,6 +20340,7 @@ const header_renderRows = (h, _vm, isGroup, isOptimizeMode, cols, $rowIndex) =>
   const {
     resizable: allResizable,
     columnKey,
+    showCustomHeader,
     headerCellClassName,
     headerCellStyle,
     showHeaderOverflow: allColumnHeaderOverflow,
@@ -20054,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;
@@ -20072,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,
@@ -20104,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,
@@ -20121,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)
@@ -20151,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;
@@ -20165,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,
@@ -20173,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,
@@ -20185,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,
@@ -20200,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),
@@ -20210,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;
@@ -20233,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 = ({
@@ -20255,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;
@@ -20282,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
@@ -20301,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;
@@ -20316,7 +20647,7 @@ function renderHeads(h, _vm, isGroup, isOptimizeMode, headerGroups) {
     } = props;
     const {
       headerColumn
-    } = this;
+    } = _vm;
     const {
       mouseConfig,
       showHeaderOverflow: allColumnHeaderOverflow,
@@ -20435,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'
@@ -20453,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);
     }
   }
 });
@@ -20756,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
@@ -20774,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;
@@ -20894,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
@@ -29115,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;
@@ -29427,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'
   })]);
@@ -29544,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: [],
       // 渲染的列分组
@@ -29567,6 +29932,8 @@ function renderBody(h, $xeTable) {
       scrollbarWidth: 0,
       // 横向滚动条的高度
       scrollbarHeight: 0,
+      // 最后滚动时间戳
+      lastScrollTime: 0,
       // 行高
       rowHeight: 0,
       // 表格父容器的高度
@@ -29592,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,
@@ -29602,11 +29973,6 @@ function renderBody(h, $xeTable) {
         export: false,
         custom: false
       },
-      customColumnList: [],
-      // 刷新列标识，当列筛选被改变时，触发表格刷新数据
-      upDataFlag: 0,
-      // 刷新列标识，当列的特定属性被改变时，触发表格刷新列
-      reColumnFlag: 0,
       // 自定义列相关的信息
       customStore: {
         btnEl: null,
@@ -29620,6 +29986,7 @@ function renderBody(h, $xeTable) {
         oldFixedMaps: {},
         oldVisibleMaps: {}
       },
+      customColumnList: [],
       // 当前选中的筛选列
       filterStore: {
         isAllSelected: false,
@@ -29688,6 +30055,7 @@ function renderBody(h, $xeTable) {
       tooltipStore: {
         row: null,
         column: null,
+        content: null,
         visible: false,
         currOpts: {}
       },
@@ -29720,8 +30088,8 @@ function renderBody(h, $xeTable) {
         columns: [],
         isPrint: false,
         hasFooter: false,
-        hasTree: false,
         hasMerge: false,
+        hasTree: false,
         hasColgroup: false,
         visible: false
       },
@@ -29752,6 +30120,7 @@ function renderBody(h, $xeTable) {
       pendingRowFlag: 1,
       insertRowFlag: 1,
       removeRowFlag: 1,
+      mergeHeadFlag: 1,
       mergeBodyFlag: 1,
       mergeFootFlag: 1,
       rowHeightStore: {
@@ -29768,6 +30137,7 @@ function renderBody(h, $xeTable) {
       scrollXLeft: 0,
       scrollXWidth: 0,
       isScrollXBig: false,
+      lazScrollLoading: false,
       rowExpandHeightFlag: 1,
       calcCellHeightFlag: 1,
       resizeHeightFlag: 1,
@@ -29780,10 +30150,16 @@ function renderBody(h, $xeTable) {
       dragTipText: '',
       isDragResize: false,
       isRowLoading: false,
-      isColLoading: false,
+      isColLoading: false
+    };
+    return {
+      xID,
+      ...reactData,
+      // 私有属性
       reScrollFlag: 0,
       reLayoutFlag: 0,
       footFlag: 0,
+      mergeFooteCellFlag: 0,
       crossTableDragRowInfo: crossTableDragRowGlobal
     };
   },
@@ -30548,9 +30924,21 @@ function renderBody(h, $xeTable) {
       const $xeTable = this;
       handleUpdateMergeBodyCells($xeTable, value);
     },
-    mergeFooterItems(value) {
+    mergeHeaderCells(value) {
       const $xeTable = this;
-      handleUpdateMergeFooterCells($xeTable, value);
+      handleUpdateMergeHeaderCells($xeTable, value);
+    },
+    mergeFooterCells() {
+      this.mergeFooteCellFlag++;
+    },
+    mergeFooterItems() {
+      this.mergeFooteCellFlag++;
+    },
+    mergeFooteCellFlag() {
+      const $xeTable = this;
+      const props = $xeTable;
+      const mFooterCells = props.mergeFooterCells || props.mergeFooterItems;
+      handleUpdateMergeFooterCells($xeTable, mFooterCells || []);
     },
     computeRowGroupFields(val) {
       const $xeTable = this;