vxe-table 3.18.1 → 3.18.3

package/es/table/src/methods.js

@@ -1022,7 +1022,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) {
@@ -1033,7 +1033,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) {
@@ -1044,7 +1044,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) {
@@ -1934,11 +1934,59 @@ 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 (!XEUtils.isArray(merges)) {
+            merges = [merges];
+        }
+        merges.forEach((item) => {
+            const { row: margeRow, col: margeCol } = item;
+            let mergeRowIndex = -1;
+            let mergeColumnIndex = -1;
+            if (XEUtils.isNumber(margeRow)) {
+                mergeRowIndex = margeRow;
+            }
+            else {
+                const rowid = margeRow ? handleGetRowId(margeRow) : null;
+                const rowRest = rowid ? fullAllDataRowIdData[rowid] : null;
+                if (rowRest) {
+                    mergeRowIndex = rowRest._index;
+                }
+            }
+            if (XEUtils.isNumber(margeCol)) {
+                mergeColumnIndex = margeCol;
+            }
+            else {
+                const colid = margeCol ? margeCol.id : null;
+                const colRest = colid ? fullColumnIdData[colid] : null;
+                if (colRest) {
+                    mergeColumnIndex = colRest._index;
+                }
+            }
+            const mcIndex = XEUtils.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, fullColumnIdData } = internalData;
+    const { mergeHeaderList, mergeHeaderMaps, fullColumnIdData } = internalData;
     if (merges) {
         const { visibleColumn } = internalData;
         if (!XEUtils.isArray(merges)) {
@@ -1964,7 +2012,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;
@@ -1982,37 +2030,26 @@ 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, fullColumnIdData, fullAllDataRowIdData, mergeBodyMaps } = internalData;
+    const { mergeHeaderList, fullColumnIdData, mergeHeaderMaps } = internalData;
     const rest = [];
     if (merges) {
-        const { handleGetRowId } = createHandleGetRowId($xeTable);
         if (!XEUtils.isArray(merges)) {
             merges = [merges];
         }
         merges.forEach((item) => {
             const { row: margeRow, col: margeCol } = item;
-            let mergeRowIndex = -1;
+            const mergeRowIndex = XEUtils.isNumber(margeRow) ? margeRow : -1;
             let mergeColumnIndex = -1;
-            if (XEUtils.isNumber(margeRow)) {
-                mergeRowIndex = margeRow;
-            }
-            else {
-                const rowid = margeRow ? handleGetRowId(margeRow) : null;
-                const rowRest = rowid ? fullAllDataRowIdData[rowid] : null;
-                if (rowRest) {
-                    mergeRowIndex = rowRest._index;
-                }
-            }
             if (XEUtils.isNumber(margeCol)) {
                 mergeColumnIndex = margeCol;
             }
@@ -2023,14 +2060,14 @@ function removeBodyMerges($xeTable, merges) {
                     mergeColumnIndex = colRest._index;
                 }
             }
-            const mcIndex = XEUtils.findIndexOf(mergeBodyList, item => (item.row === mergeRowIndex) && (item.col === mergeColumnIndex));
+            const mcIndex = XEUtils.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}`];
                     }
                 }
             }
@@ -2038,6 +2075,62 @@ 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 (!XEUtils.isArray(merges)) {
+            merges = [merges];
+        }
+        merges.forEach((item) => {
+            let { row: margeRow, col: margeCol, rowspan, colspan } = item;
+            const mergeRowIndex = XEUtils.isNumber(margeRow) ? margeRow : -1;
+            let mergeColumnIndex = -1;
+            if (XEUtils.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 = XEUtils.toNumber(rowspan) || 1;
+                colspan = XEUtils.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 { mergeFooterList, fullColumnIdData, mergeFooterMaps } = internalData;
@@ -2148,8 +2241,23 @@ 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 = getConfig().table.minHeight;
+        if (XEUtils.eqNull(val)) {
+            if (eqEmptyValue(defMinHeight)) {
+                // 编辑模式默认最小高度
+                if (isEnableConf(editConfig)) {
+                    val = 144;
+                }
+            }
+            else {
+                val = defMinHeight;
+            }
+        }
+    }
     let num = 0;
     if (val) {
         if (val === '100%' || val === 'auto') {
@@ -2648,11 +2756,19 @@ 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 { mergeFooterItems } = props;
-    if (mergeFooterItems) {
-        $xeTable.setMergeFooterItems(mergeFooterItems);
+    const { mergeFooterCells, mergeFooterItems } = props;
+    const mFooterCells = mergeFooterCells || mergeFooterItems;
+    if (mFooterCells) {
+        $xeTable.setMergeFooterCells(mFooterCells);
     }
 }
 // 计算可视渲染相关数据
@@ -3105,6 +3221,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))
@@ -3167,6 +3287,7 @@ function handleLoadDefaults($xeTable) {
     handleDefaultTreeExpand($xeTable);
     handleDefaultRowGroupExpand($xeTable);
     handleDefaultMergeCells($xeTable);
+    handleDefaultMergeHeaderItems($xeTable);
     handleDefaultMergeFooterItems($xeTable);
     $xeTable.$nextTick(() => setTimeout(() => $xeTable.recalculate()));
 }
@@ -6677,6 +6798,14 @@ 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;
@@ -11139,6 +11268,10 @@ const Methods = {
         }
         reactData.footerTableData = footData;
         $xeTable.handleUpdateFooterMerge();
+        $xeTable.dispatchEvent('footer-data-change', {
+            visibleColumn: internalData.visibleColumn,
+            footData
+        }, null);
         return $xeTable.$nextTick();
     },
     /**
@@ -11219,45 +11352,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;
@@ -11269,6 +11458,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;

package/es/table/src/props.js

@@ -10,7 +10,7 @@ export const tableProps = {
     // 表格的最小高度
     minHeight: {
         type: [Number, String],
-        default: () => getConfig().table.minHeight
+        default: () => null
     },
     // 表格的最大高度
     maxHeight: [Number, String],
@@ -129,20 +129,37 @@ export const tableProps = {
     headerRowStyle: [Object, Function],
     // 给表尾行附加样式
     footerRowStyle: [Object, Function],
-    // 合并指定单元格
+    // 用于分组表头，显示为自定义列头，配合 mergeHeaderCells 灵活实现自定义合并
+    showCustomHeader: {
+        type: Boolean,
+        default: () => getConfig().table.showCustomHeader
+    },
+    // 临时合并指定的表头单元格
+    mergeHeaderCells: Array,
+    // 临时合并指定的单元格
     mergeCells: Array,
-    // 合并指定的表尾
+    // 临时合并指定的表尾单元格
+    mergeFooterCells: Array,
     mergeFooterItems: Array,
     // 自定义合并行或列的方法
     spanMethod: Function,
     // 表尾合并行或列
     footerSpanMethod: Function,
     // 设置所有内容过长时显示为省略号
-    showOverflow: { type: [Boolean, String], default: () => getConfig().table.showOverflow },
+    showOverflow: {
+        type: [Boolean, String],
+        default: () => getConfig().table.showOverflow
+    },
     // 设置表头所有内容过长时显示为省略号
-    showHeaderOverflow: { type: [Boolean, String], default: () => getConfig().table.showHeaderOverflow },
+    showHeaderOverflow: {
+        type: [Boolean, String],
+        default: () => getConfig().table.showHeaderOverflow
+    },
     // 设置表尾所有内容过长时显示为省略号
-    showFooterOverflow: { type: [Boolean, String], default: () => getConfig().table.showFooterOverflow },
+    showFooterOverflow: {
+        type: [Boolean, String],
+        default: () => getConfig().table.showFooterOverflow
+    },
     /** 高级属性 */
     /**
      * （即将废弃）columnKey 已废弃，被 column-config.useKey 替换

package/es/table/src/table.js

@@ -31,12 +31,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;
@@ -331,7 +338,10 @@ function renderScrollX(h, $xeTable) {
                     ref: 'refScrollXSpaceElem',
                     class: 'vxe-table--scroll-x-space'
                 })
-            ])
+            ]),
+            h('div', {
+                class: 'vxe-table--scroll-x-handle-appearance'
+            })
         ]),
         h('div', {
             ref: 'refScrollXRightCornerElem',
@@ -475,9 +485,7 @@ export default {
     },
     data() {
         const xID = XEUtils.uniqueId();
-        return {
-            xID,
-            tId: xID,
+        const reactData = {
             // 低性能的静态列
             staticColumns: [],
             // 渲染的列分组
@@ -498,6 +506,8 @@ export default {
             scrollbarWidth: 0,
             // 横向滚动条的高度
             scrollbarHeight: 0,
+            // 最后滚动时间戳
+            lastScrollTime: 0,
             // 行高
             rowHeight: 0,
             // 表格父容器的高度
@@ -523,9 +533,13 @@ export default {
             expandColumn: null,
             checkboxColumn: null,
             radioColumn: null,
-            hasFixedColumn: false,
             // 树节点列信息
             treeNodeColumn: null,
+            hasFixedColumn: false,
+            // 刷新列标识，当列筛选被改变时，触发表格刷新数据
+            upDataFlag: 0,
+            // 刷新列标识，当列的特定属性被改变时，触发表格刷新列
+            reColumnFlag: 0,
             // 初始化标识
             initStore: {
                 filter: false,
@@ -533,11 +547,6 @@ export default {
                 export: false,
                 custom: false
             },
-            customColumnList: [],
-            // 刷新列标识，当列筛选被改变时，触发表格刷新数据
-            upDataFlag: 0,
-            // 刷新列标识，当列的特定属性被改变时，触发表格刷新列
-            reColumnFlag: 0,
             // 自定义列相关的信息
             customStore: {
                 btnEl: null,
@@ -551,6 +560,7 @@ export default {
                 oldFixedMaps: {},
                 oldVisibleMaps: {}
             },
+            customColumnList: [],
             // 当前选中的筛选列
             filterStore: {
                 isAllSelected: false,
@@ -619,6 +629,7 @@ export default {
             tooltipStore: {
                 row: null,
                 column: null,
+                content: null,
                 visible: false,
                 currOpts: {}
             },
@@ -651,8 +662,8 @@ export default {
                 columns: [],
                 isPrint: false,
                 hasFooter: false,
-                hasTree: false,
                 hasMerge: false,
+                hasTree: false,
                 hasColgroup: false,
                 visible: false
             },
@@ -683,6 +694,7 @@ export default {
             pendingRowFlag: 1,
             insertRowFlag: 1,
             removeRowFlag: 1,
+            mergeHeadFlag: 1,
             mergeBodyFlag: 1,
             mergeFootFlag: 1,
             rowHeightStore: {
@@ -699,6 +711,7 @@ export default {
             scrollXLeft: 0,
             scrollXWidth: 0,
             isScrollXBig: false,
+            lazScrollLoading: false,
             rowExpandHeightFlag: 1,
             calcCellHeightFlag: 1,
             resizeHeightFlag: 1,
@@ -711,12 +724,11 @@ export default {
             dragTipText: '',
             isDragResize: false,
             isRowLoading: false,
-            isColLoading: false,
-            reScrollFlag: 0,
-            reLayoutFlag: 0,
-            footFlag: 0,
-            crossTableDragRowInfo: crossTableDragRowGlobal
+            isColLoading: false
         };
+        return Object.assign(Object.assign({ xID }, reactData), { 
+            // 私有属性
+            reScrollFlag: 0, reLayoutFlag: 0, footFlag: 0, mergeFooteCellFlag: 0, crossTableDragRowInfo: crossTableDragRowGlobal });
     },
     computed: Object.assign(Object.assign({}, {}), { tableId() {
             return this.computeTableId;
@@ -1395,9 +1407,21 @@ export default {
             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;