vxe-table 3.14.5 → 3.15.0-beta.0

package/lib/table/src/footer.js

@@ -15,30 +15,6 @@ const {
   renderer,
   renderEmptyElement
 } = _ui.VxeUI;
-function mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex) {
-  for (let mIndex = 0; mIndex < mergeFooterList.length; mIndex++) {
-    const {
-      row: mergeRowIndex,
-      col: mergeColIndex,
-      rowspan: mergeRowspan,
-      colspan: mergeColspan
-    } = mergeFooterList[mIndex];
-    if (mergeColIndex > -1 && mergeRowIndex > -1 && mergeRowspan && mergeColspan) {
-      if (mergeRowIndex === _rowIndex && mergeColIndex === _columnIndex) {
-        return {
-          rowspan: mergeRowspan,
-          colspan: mergeColspan
-        };
-      }
-      if (_rowIndex >= mergeRowIndex && _rowIndex < mergeRowIndex + mergeRowspan && _columnIndex >= mergeColIndex && _columnIndex < mergeColIndex + mergeColspan) {
-        return {
-          rowspan: 0,
-          colspan: 0
-        };
-      }
-    }
-  }
-}
 function renderRows(h, _vm, tableColumn, footerTableData, row, $rowIndex, _rowIndex) {
   const props = _vm;
   const $xeTable = _vm.$parent;
@@ -64,11 +40,12 @@ function renderRows(h, _vm, tableColumn, footerTableData, row, $rowIndex, _rowIn
     scrollXLoad,
     scrollYLoad,
     overflowX,
-    currentColumn,
-    mergeFooterList
+    currentColumn
   } = tableReactData;
   const {
     fullColumnIdData,
+    mergeFooterList,
+    mergeFooterCellMaps,
     scrollXStore
   } = tableInternalData;
   const tooltipOpts = $xeTable.computeTooltipOpts;
@@ -162,7 +139,7 @@ function renderRows(h, _vm, tableColumn, footerTableData, row, $rowIndex, _rowIn
     let isMergeCell = false;
     // 合并行或列
     if (mergeFooterList.length) {
-      const spanRest = mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex);
+      const spanRest = mergeFooterCellMaps[`${_rowIndex}:${_columnIndex}`];
       if (spanRest) {
         const {
           rowspan,

package/lib/table/src/footer.min.js

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_ui=require("../../ui"),_utils=require("../../ui/src/utils"),_dom=require("../../ui/src/dom"),_util=require("./util");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let renderType="footer",{renderer,renderEmptyElement}=_ui.VxeUI;function mergeFooterMethod(l,r,t){for(let e=0;e<l.length;e++){var{row:o,col:i,rowspan:a,colspan:n}=l[e];if(-1<i&&-1<o&&a&&n){if(o===r&&i===t)return{rowspan:a,colspan:n};if(o<=r&&r<o+a&&i<=t&&t<i+n)return{rowspan:0,colspan:0}}}}function renderRows(C,e,_,F,T,$,S){let E=e.$parent;var l=E,r=E,t=E;let I=E.$xeGrid,O=e.fixedType,{resizable:D,border:R,footerCellClassName:z,footerCellStyle:k,footerAlign:U,footerSpanMethod:A,align:M,columnKey:q,showFooterOverflow:L}=l,{scrollXLoad:X,scrollYLoad:H,overflowX:N,currentColumn:j,mergeFooterList:W}=r,{fullColumnIdData:B,scrollXStore:G}=t,K=E.computeTooltipOpts,V=E.resizableOpts.isAllColumnDrag,Y=E.computeColumnOpts;e=E.computeDefaultRowHeight;let P=E.computeCellOpts,J=E.computeFooterCellOpts,Q=(0,_util.getCellHeight)(J.height||P.height)||e;return _.map((l,e)=>{var{type:r,showFooterOverflow:t,footerAlign:o,align:i,footerClassName:a,editRender:n,cellRender:s}=l,d=l.id,u=B[d]||{},n=n||s,s=n?renderer.get(n.name):null;let p=K.showAll;var n=l.children&&l.children.length,n=O?l.fixed!==O&&!n:l.fixed&&N,c=(_xeUtils.default.isBoolean(J.padding)?J:P).padding,t=_xeUtils.default.eqNull(t)?L:t,o=o||(s?s.tableFooterCellAlign:"")||U||i||(s?s.tableCellAlign:"")||M;let f="ellipsis"===t,x="title"===t,m=!0===t||"tooltip"===t,g=x||m||f;var i=_xeUtils.default.isBoolean(l.resizable)?l.resizable:Y.resizable||D,s={colid:d},t={},v=u.index,u=u._index,h=u;let w={$table:E,$grid:I,row:T,rowIndex:S,_rowIndex:S,$rowIndex:$,column:l,columnIndex:v,$columnIndex:e,_columnIndex:u,itemIndex:h,items:T,fixed:O,type:renderType,data:F},y=(X&&!g&&(f=g=!0),(x||m||p)&&(t.mouseenter=e=>{x?(0,_dom.updateCellTitle)(e.currentTarget,l):(m||p)&&E.triggerFooterTooltipEvent(e,w)}),(m||p)&&(t.mouseleave=e=>{(m||p)&&E.handleTargetLeaveEvent(e)}),t.click=e=>{E.dispatchEvent("footer-cell-click",Object.assign({cell:e.currentTarget},w),e)},!(t.dblclick=e=>{E.dispatchEvent("footer-cell-dblclick",Object.assign({cell:e.currentTarget},w),e)}));if(W.length){v=mergeFooterMethod(W,S,u);if(v){var{rowspan:h,colspan:v}=v;if(!h||!v)return null;1<h&&(y=!0,s.rowspan=h),1<v&&(y=!0,s.colspan=v)}}else if(A){var{rowspan:h=1,colspan:v=1}=A(w)||{};if(!h||!v)return null;1<h&&(s.rowspan=h),1<v&&(s.colspan=v)}h=e===_.length-1,v=!l.resizeWidth&&("auto"===l.minWidth||"auto"===l.width);let b=!1;y||X&&!l.fixed&&(u<G.visibleStartIndex-G.preloadSize||u>G.visibleEndIndex+G.preloadSize)&&(b=!0);u={};return g?u.height=Q+"px":u.minHeight=Q+"px",C("td",{class:["vxe-footer--column",l.id,{["col--"+o]:o,["col--"+r]:r,"col--last":h,"fixed--width":!v,"fixed--hidden":n,"is--padding":c,"col--ellipsis":g,"col--current":j===l},(0,_utils.getClass)(a,w),(0,_utils.getClass)(z,w)],attrs:s,style:k?_xeUtils.default.isFunction(k)?k(w):k:void 0,on:t,key:q||X||H||Y.useKey||Y.drag?l.id:e},[C("div",{class:["vxe-cell",{"c--title":x,"c--tooltip":m,"c--ellipsis":f}],style:u},b?[]:[C("div",{attrs:{colid:d},class:"vxe-cell--wrapper"},l.renderFooter(C,w))]),!n&&i&&V?C("div",{class:["vxe-cell--col-resizable",{"is--line":!R||"none"===R}],on:{mousedown:e=>E.handleColResizeMousedownEvent(e,O,w),dblclick:e=>E.handleColResizeDblclickEvent(e,w)}}):renderEmptyElement(E)])})}function renderHeads(o,i,a){let n=i.$parent;var e=n,l=n;let{fixedType:s,footerTableData:d}=i,{footerRowClassName:u,footerRowStyle:p}=e,{isColLoading:c,isDragColMove:f}=l,x=n.computeColumnOpts,m=n.computeColumnDragOpts;return d.map((e,l)=>{var r=l,t={$table:n,row:e,_rowIndex:r,$rowIndex:l,fixed:s,type:renderType};return!c&&x.drag&&m.animation?o("transition-group",{key:l,props:{tag:"tr",name:"vxe-header--col-list"+(f?"":"-disabled"),class:["vxe-footer--row",u?_xeUtils.default.isFunction(u)?u(t):u:""],style:p?_xeUtils.default.isFunction(p)?p(t):p:void 0}},renderRows(o,i,a,d,e,l,r)):o("tr",{key:l,class:["vxe-footer--row",u?_xeUtils.default.isFunction(u)?u(t):u:""],style:p?_xeUtils.default.isFunction(p)?p(t):p:void 0},renderRows(o,i,a,d,e,l,r))})}var _default=exports.default={name:"VxeTableFooter",props:{footerTableData:{type:Array,default:()=>[]},tableColumn:{type:Array,default:()=>[]},fixedColumn:{type:Array,default:()=>[]},fixedType:{type:String,default:null}},mounted(){var e=this,l=e.fixedType,r=e.$parent.elemStore,l=`${l||"main"}-footer-`;r[l+"wrapper"]=e.$refs.refElem,r[l+"scroll"]=e.$refs.refFooterScroll,r[l+"table"]=e.$refs.refFooterTable,r[l+"colgroup"]=e.$refs.refFooterColgroup,r[l+"list"]=e.$refs.refFooterTFoot,r[l+"xSpace"]=e.$refs.refFooterXSpace},destroyed(){var e=this.fixedType,l=this.$parent.elemStore,e=`${e||"main"}-footer-`;l[e+"wrapper"]=null,l[e+"scroll"]=null,l[e+"table"]=null,l[e+"colgroup"]=null,l[e+"list"]=null,l[e+"xSpace"]=null},render(r){let l=this.$parent;var e=l,t=l,o=l,i=l.xID;let{fixedType:a,fixedColumn:n,tableColumn:s}=this;var{spanMethod:e,footerSpanMethod:d,showFooterOverflow:u}=e,{visibleColumn:o,fullColumnIdData:p}=o,{isGroup:t,isColLoading:c,overflowX:f,scrollXLoad:x,scrollYLoad:m,dragCol:g}=t;let v=s,h=!(x||m||u)||e||d?!1:!0;return c||!a&&f||(v=o),a&&h&&(v=n||[]),a||t||x&&g&&2<v.length&&(m=p[g.id])&&(u=m._index,e=v[0],d=v[v.length-1],c=p[e.id],f=p[d.id],c)&&f&&(o=c._index,t=f._index,u<o?v=[g].concat(v):t<u&&(v=v.concat([g]))),r("div",{ref:"refElem",class:["vxe-table--footer-wrapper",a?`fixed-${a}--wrapper`:"body--wrapper"],attrs:{xid:i}},[r("div",{ref:"refFooterScroll",class:"vxe-table--footer-inner-wrapper",on:{scroll(e){l.triggerFooterScrollEvent(e,a)}}},[a?renderEmptyElement(l):r("div",{ref:"refFooterXSpace",class:"vxe-body--x-space"}),r("table",{ref:"refFooterTable",class:"vxe-table--footer",attrs:{xid:i,cellspacing:0,cellpadding:0,border:0}},[r("colgroup",{ref:"refFooterColgroup"},v.map((e,l)=>r("col",{attrs:{name:e.id},key:l,style:{width:e.renderWidth+"px"}}))),r("tfoot",{ref:"refFooterTFoot"},renderHeads(r,this,v))])])])}};
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_ui=require("../../ui"),_utils=require("../../ui/src/utils"),_dom=require("../../ui/src/dom"),_util=require("./util");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let renderType="footer",{renderer,renderEmptyElement}=_ui.VxeUI;function renderRows(C,e,_,F,T,$,S){let E=e.$parent;var l=E,r=E,t=E;let I=E.$xeGrid,O=e.fixedType,{resizable:D,border:R,footerCellClassName:z,footerCellStyle:k,footerAlign:U,footerSpanMethod:A,align:q,columnKey:L,showFooterOverflow:M}=l,{scrollXLoad:X,scrollYLoad:H,overflowX:N,currentColumn:j}=r,{fullColumnIdData:W,mergeFooterList:B,mergeFooterCellMaps:G,scrollXStore:K}=t,V=E.computeTooltipOpts,Y=E.resizableOpts.isAllColumnDrag,P=E.computeColumnOpts;e=E.computeDefaultRowHeight;let J=E.computeCellOpts,Q=E.computeFooterCellOpts,Z=(0,_util.getCellHeight)(Q.height||J.height)||e;return _.map((l,e)=>{var{type:r,showFooterOverflow:t,footerAlign:o,align:i,footerClassName:a,editRender:n,cellRender:s}=l,d=l.id,u=W[d]||{},n=n||s,s=n?renderer.get(n.name):null;let p=V.showAll;var n=l.children&&l.children.length,n=O?l.fixed!==O&&!n:l.fixed&&N,c=(_xeUtils.default.isBoolean(Q.padding)?Q:J).padding,t=_xeUtils.default.eqNull(t)?M:t,o=o||(s?s.tableFooterCellAlign:"")||U||i||(s?s.tableCellAlign:"")||q;let f="ellipsis"===t,x="title"===t,m=!0===t||"tooltip"===t,g=x||m||f;var i=_xeUtils.default.isBoolean(l.resizable)?l.resizable:P.resizable||D,s={colid:d},t={},v=u.index,u=u._index,h=u;let w={$table:E,$grid:I,row:T,rowIndex:S,_rowIndex:S,$rowIndex:$,column:l,columnIndex:v,$columnIndex:e,_columnIndex:u,itemIndex:h,items:T,fixed:O,type:renderType,data:F},y=(X&&!g&&(f=g=!0),(x||m||p)&&(t.mouseenter=e=>{x?(0,_dom.updateCellTitle)(e.currentTarget,l):(m||p)&&E.triggerFooterTooltipEvent(e,w)}),(m||p)&&(t.mouseleave=e=>{(m||p)&&E.handleTargetLeaveEvent(e)}),t.click=e=>{E.dispatchEvent("footer-cell-click",Object.assign({cell:e.currentTarget},w),e)},!(t.dblclick=e=>{E.dispatchEvent("footer-cell-dblclick",Object.assign({cell:e.currentTarget},w),e)}));if(B.length){v=G[S+":"+u];if(v){var{rowspan:h,colspan:v}=v;if(!h||!v)return null;1<h&&(y=!0,s.rowspan=h),1<v&&(y=!0,s.colspan=v)}}else if(A){var{rowspan:h=1,colspan:v=1}=A(w)||{};if(!h||!v)return null;1<h&&(s.rowspan=h),1<v&&(s.colspan=v)}h=e===_.length-1,v=!l.resizeWidth&&("auto"===l.minWidth||"auto"===l.width);let b=!1;y||X&&!l.fixed&&(u<K.visibleStartIndex-K.preloadSize||u>K.visibleEndIndex+K.preloadSize)&&(b=!0);u={};return g?u.height=Z+"px":u.minHeight=Z+"px",C("td",{class:["vxe-footer--column",l.id,{["col--"+o]:o,["col--"+r]:r,"col--last":h,"fixed--width":!v,"fixed--hidden":n,"is--padding":c,"col--ellipsis":g,"col--current":j===l},(0,_utils.getClass)(a,w),(0,_utils.getClass)(z,w)],attrs:s,style:k?_xeUtils.default.isFunction(k)?k(w):k:void 0,on:t,key:L||X||H||P.useKey||P.drag?l.id:e},[C("div",{class:["vxe-cell",{"c--title":x,"c--tooltip":m,"c--ellipsis":f}],style:u},b?[]:[C("div",{attrs:{colid:d},class:"vxe-cell--wrapper"},l.renderFooter(C,w))]),!n&&i&&Y?C("div",{class:["vxe-cell--col-resizable",{"is--line":!R||"none"===R}],on:{mousedown:e=>E.handleColResizeMousedownEvent(e,O,w),dblclick:e=>E.handleColResizeDblclickEvent(e,w)}}):renderEmptyElement(E)])})}function renderHeads(o,i,a){let n=i.$parent;var e=n,l=n;let{fixedType:s,footerTableData:d}=i,{footerRowClassName:u,footerRowStyle:p}=e,{isColLoading:c,isDragColMove:f}=l,x=n.computeColumnOpts,m=n.computeColumnDragOpts;return d.map((e,l)=>{var r=l,t={$table:n,row:e,_rowIndex:r,$rowIndex:l,fixed:s,type:renderType};return!c&&x.drag&&m.animation?o("transition-group",{key:l,props:{tag:"tr",name:"vxe-header--col-list"+(f?"":"-disabled"),class:["vxe-footer--row",u?_xeUtils.default.isFunction(u)?u(t):u:""],style:p?_xeUtils.default.isFunction(p)?p(t):p:void 0}},renderRows(o,i,a,d,e,l,r)):o("tr",{key:l,class:["vxe-footer--row",u?_xeUtils.default.isFunction(u)?u(t):u:""],style:p?_xeUtils.default.isFunction(p)?p(t):p:void 0},renderRows(o,i,a,d,e,l,r))})}var _default=exports.default={name:"VxeTableFooter",props:{footerTableData:{type:Array,default:()=>[]},tableColumn:{type:Array,default:()=>[]},fixedColumn:{type:Array,default:()=>[]},fixedType:{type:String,default:null}},mounted(){var e=this,l=e.fixedType,r=e.$parent.elemStore,l=`${l||"main"}-footer-`;r[l+"wrapper"]=e.$refs.refElem,r[l+"scroll"]=e.$refs.refFooterScroll,r[l+"table"]=e.$refs.refFooterTable,r[l+"colgroup"]=e.$refs.refFooterColgroup,r[l+"list"]=e.$refs.refFooterTFoot,r[l+"xSpace"]=e.$refs.refFooterXSpace},destroyed(){var e=this.fixedType,l=this.$parent.elemStore,e=`${e||"main"}-footer-`;l[e+"wrapper"]=null,l[e+"scroll"]=null,l[e+"table"]=null,l[e+"colgroup"]=null,l[e+"list"]=null,l[e+"xSpace"]=null},render(r){let l=this.$parent;var e=l,t=l,o=l,i=l.xID;let{fixedType:a,fixedColumn:n,tableColumn:s}=this;var{spanMethod:e,footerSpanMethod:d,showFooterOverflow:u}=e,{visibleColumn:o,fullColumnIdData:p}=o,{isGroup:t,isColLoading:c,overflowX:f,scrollXLoad:x,scrollYLoad:m,dragCol:g}=t;let v=s,h=!(x||m||u)||e||d?!1:!0;return c||!a&&f||(v=o),a&&h&&(v=n||[]),a||t||x&&g&&2<v.length&&(m=p[g.id])&&(u=m._index,e=v[0],d=v[v.length-1],c=p[e.id],f=p[d.id],c)&&f&&(o=c._index,t=f._index,u<o?v=[g].concat(v):t<u&&(v=v.concat([g]))),r("div",{ref:"refElem",class:["vxe-table--footer-wrapper",a?`fixed-${a}--wrapper`:"body--wrapper"],attrs:{xid:i}},[r("div",{ref:"refFooterScroll",class:"vxe-table--footer-inner-wrapper",on:{scroll(e){l.triggerFooterScrollEvent(e,a)}}},[a?renderEmptyElement(l):r("div",{ref:"refFooterXSpace",class:"vxe-body--x-space"}),r("table",{ref:"refFooterTable",class:"vxe-table--footer",attrs:{xid:i,cellspacing:0,cellpadding:0,border:0}},[r("colgroup",{ref:"refFooterColgroup"},v.map((e,l)=>r("col",{attrs:{name:e.id},key:l,style:{width:e.renderWidth+"px"}}))),r("tfoot",{ref:"refFooterTFoot"},renderHeads(r,this,v))])])])}};

package/lib/table/src/methods.js

@@ -1520,20 +1520,48 @@ function calculateMergerOffsetIndex(list, offsetItem, type) {
     }
   }
 }
-function setMerges($xeTable, merges, mList, rowList) {
-  // const props = $xeTable
+function buildMergeData(mergeConfigs) {
+  const mergeMaps = {};
+  if (mergeConfigs && mergeConfigs.length) {
+    for (let mIndex = 0; mIndex < mergeConfigs.length; mIndex++) {
+      const {
+        row: _rowIndex,
+        col: _columnIndex,
+        rowspan: mergeRowspan,
+        colspan: mergeColspan
+      } = mergeConfigs[mIndex];
+      for (let i = 0; i < mergeRowspan; i++) {
+        for (let j = 0; j < mergeColspan; j++) {
+          mergeMaps[`${_rowIndex + i}:${_columnIndex + j}`] = !i && !j ? {
+            rowspan: mergeRowspan,
+            colspan: mergeColspan
+          } : {
+            rowspan: 0,
+            colspan: 0
+          };
+        }
+      }
+    }
+  }
+  return mergeMaps;
+}
+const handleBodyMerge = ($xeTable, merges) => {
   const internalData = $xeTable;
+  const {
+    fullAllDataRowIdData,
+    fullColumnIdData,
+    visibleColumn,
+    afterFullData,
+    mergeBodyList,
+    mergeBodyMaps
+  } = internalData;
   if (merges) {
-    // const { treeConfig } = props
     const {
-      visibleColumn
-    } = internalData;
+      handleGetRowId
+    } = (0, _util.createHandleGetRowId)($xeTable);
     if (!_xeUtils.default.isArray(merges)) {
       merges = [merges];
     }
-    // if (treeConfig && merges.length) {
-    //   errLog('vxe.error.noTree', ['merge-cells | merge-footer-items'])
-    // }
     merges.forEach(item => {
       let {
         row,
@@ -1541,42 +1569,117 @@ function setMerges($xeTable, merges, mList, rowList) {
         rowspan,
         colspan
       } = item;
-      if (rowList && _xeUtils.default.isNumber(row)) {
-        row = rowList[row];
+      let mergeRowIndex = -1;
+      let mergeColumnIndex = -1;
+      if (_xeUtils.default.isNumber(row)) {
+        mergeRowIndex = row;
+      } else {
+        const rowid = row ? handleGetRowId(row) : null;
+        const rowRest = rowid ? fullAllDataRowIdData[rowid] : null;
+        if (rowRest) {
+          mergeRowIndex = rowRest._index;
+        }
       }
       if (_xeUtils.default.isNumber(col)) {
-        col = visibleColumn[col];
+        mergeColumnIndex = col;
+      } else {
+        const colid = col ? col.id : null;
+        const colRest = colid ? fullColumnIdData[colid] : null;
+        if (colRest) {
+          mergeColumnIndex = colRest._index;
+        }
       }
-      if ((rowList ? row : _xeUtils.default.isNumber(row)) && col && (rowspan || colspan)) {
+      if (mergeRowIndex > -1 && mergeColumnIndex > -1 && (rowspan || colspan)) {
         rowspan = _xeUtils.default.toNumber(rowspan) || 1;
         colspan = _xeUtils.default.toNumber(colspan) || 1;
         if (rowspan > 1 || colspan > 1) {
-          const mcIndex = _xeUtils.default.findIndexOf(mList, item => item._row === row && item._col === col);
-          const mergeItem = mList[mcIndex];
+          const row = afterFullData[mergeRowIndex];
+          const column = visibleColumn[mergeColumnIndex];
+          let mergeItem = mergeBodyMaps[`${mergeRowIndex}:${mergeColumnIndex}`];
           if (mergeItem) {
             mergeItem.rowspan = rowspan;
             mergeItem.colspan = colspan;
             mergeItem._rowspan = rowspan;
             mergeItem._colspan = colspan;
           } else {
-            const mergeRowIndex = rowList ? rowList.indexOf(row) : row;
-            const mergeColIndex = visibleColumn.indexOf(col);
-            mList.push({
+            mergeItem = {
               row: mergeRowIndex,
-              col: mergeColIndex,
+              col: mergeColumnIndex,
               rowspan,
               colspan,
               _row: row,
-              _col: col,
+              _col: column,
               _rowspan: rowspan,
               _colspan: colspan
-            });
+            };
+            mergeBodyMaps[`${mergeRowIndex}:${mergeColumnIndex}`] = mergeItem;
+            mergeBodyList.push(mergeItem);
           }
         }
       }
     });
   }
-}
+};
+const handleFooterMerge = ($xeTable, merges) => {
+  const reactData = $xeTable;
+  const internalData = $xeTable;
+  const {
+    footerTableData
+  } = reactData;
+  const {
+    mergeFooterList,
+    mergeFooterMaps
+  } = internalData;
+  if (merges) {
+    const {
+      visibleColumn
+    } = internalData;
+    if (!_xeUtils.default.isArray(merges)) {
+      merges = [merges];
+    }
+    merges.forEach(item => {
+      let {
+        row: margeRow,
+        col: margeCol,
+        rowspan,
+        colspan
+      } = item;
+      const mergeRowIndex = _xeUtils.default.isNumber(margeRow) ? margeRow : -1;
+      let mergeColumnIndex = -1;
+      if (_xeUtils.default.isNumber(margeCol)) {
+        mergeColumnIndex = margeCol;
+      }
+      if (mergeRowIndex > -1 && mergeColumnIndex > -1 && (rowspan || colspan)) {
+        rowspan = _xeUtils.default.toNumber(rowspan) || 1;
+        colspan = _xeUtils.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 removeMerges($xeTable, merges, mList, rowList) {
   // const props = $xeTable
   const internalData = $xeTable;
@@ -2311,11 +2414,11 @@ function loadScrollXData($xeTable) {
   const reactData = $xeTable;
   const internalData = $xeTable;
   const {
-    mergeList,
-    mergeFooterList,
     isScrollXBig
   } = reactData;
   const {
+    mergeBodyList,
+    mergeFooterList,
     scrollXStore
   } = internalData;
   const {
@@ -2334,7 +2437,7 @@ function loadScrollXData($xeTable) {
   };
   scrollXStore.visibleStartIndex = toVisibleIndex - 1;
   scrollXStore.visibleEndIndex = toVisibleIndex + visibleSize + 1;
-  calculateMergerOffsetIndex(mergeList.concat(mergeFooterList), offsetItem, 'col');
+  calculateMergerOffsetIndex(mergeBodyList.concat(mergeFooterList), offsetItem, 'col');
   const {
     startIndex: offsetStartIndex,
     endIndex: offsetEndIndex
@@ -2559,11 +2662,11 @@ function loadScrollYData($xeTable) {
   const reactData = $xeTable;
   const internalData = $xeTable;
   const {
-    mergeList,
     isAllOverflow,
     isScrollYBig
   } = reactData;
   const {
+    mergeBodyList,
     scrollYStore
   } = internalData;
   const {
@@ -2583,7 +2686,7 @@ function loadScrollYData($xeTable) {
   };
   scrollYStore.visibleStartIndex = toVisibleIndex - 1;
   scrollYStore.visibleEndIndex = toVisibleIndex + visibleSize + 1;
-  calculateMergerOffsetIndex(mergeList, offsetItem, 'row');
+  calculateMergerOffsetIndex(mergeBodyList, offsetItem, 'row');
   const {
     startIndex: offsetStartIndex,
     endIndex: offsetEndIndex
@@ -3017,7 +3120,7 @@ const Methods = {
    * 对于某些特殊的场景，比如深层树节点元素发生变动时可能会用到
    */
   syncData() {
-    (0, _log.warnLog)('vxe.error.delFunc', ['syncData', 'getData']);
+    (0, _log.errLog)('vxe.error.delFunc', ['syncData', 'getData']);
     return this.$nextTick().then(() => {
       this.tableData = [];
       return this.$nextTick().then(() => this.loadTableData(this.tableFullData, true));
@@ -3028,38 +3131,43 @@ const Methods = {
    * 对于手动更改了排序、筛选...等条件后需要重新处理数据时可能会用到
    */
   updateData() {
+    const $xeTable = this;
+    const reactData = $xeTable;
     const {
       scrollXLoad,
       scrollYLoad
-    } = this;
-    return this.handleTableData(true).then(() => {
-      this.updateFooter();
+    } = reactData;
+    return $xeTable.handleTableData(true).then(() => {
+      $xeTable.updateFooter();
       if (scrollXLoad || scrollYLoad) {
         if (scrollXLoad) {
-          this.updateScrollXSpace();
+          $xeTable.updateScrollXSpace();
         }
         if (scrollYLoad) {
-          this.updateScrollYSpace();
+          $xeTable.updateScrollYSpace();
         }
-        return this.refreshScroll();
+        return $xeTable.refreshScroll();
       }
     }).then(() => {
-      this.updateCellAreas();
-      return this.recalculate(true);
+      $xeTable.updateCellAreas();
+      return $xeTable.recalculate(true);
     }).then(() => {
       // 存在滚动行为未结束情况
-      setTimeout(() => this.recalculate(), 50);
+      setTimeout(() => $xeTable.recalculate(), 50);
     });
   },
   handleTableData(force) {
     const $xeTable = this;
+    const reactData = $xeTable;
+    const internalData = $xeTable;
+    const {
+      scrollYLoad
+    } = reactData;
     const {
-      scrollYLoad,
       scrollYStore,
-      fullDataRowIdData,
-      afterFullData
-    } = this;
-    let fullList = afterFullData;
+      fullDataRowIdData
+    } = internalData;
+    let fullList = internalData.afterFullData;
     // 是否进行数据处理
     if (force) {
       // 更新数据，处理筛选和排序
@@ -3068,14 +3176,17 @@ const Methods = {
       fullList = handleVirtualTreeToList($xeTable);
     }
     const tableData = scrollYLoad ? fullList.slice(scrollYStore.startIndex, scrollYStore.endIndex) : fullList.slice(0);
+    const visibleDataRowIdMaps = {};
     tableData.forEach((row, $index) => {
       const rowid = (0, _util.getRowid)(this, row);
       const rest = fullDataRowIdData[rowid];
       if (rest) {
         rest.$index = $index;
       }
+      visibleDataRowIdMaps[rowid] = row;
     });
     this.tableData = tableData;
+    internalData.visibleDataRowIdData = visibleDataRowIdMaps;
     return this.$nextTick();
   },
   /**
@@ -3160,7 +3271,7 @@ const Methods = {
     internalData.tableFullData = fullData;
     internalData.tableFullTreeData = treeData;
     // 缓存数据
-    $xeTable.cacheRowMap(true);
+    $xeTable.cacheRowMap(isReset);
     // 原始数据
     internalData.tableSynchData = datas;
     if (isReset) {
@@ -3178,6 +3289,7 @@ const Methods = {
     $xeTable.clearMergeFooterItems();
     $xeTable.handleTableData(true);
     $xeTable.updateFooter();
+    $xeTable.handleUpdateBodyMerge();
     return $xeTable.$nextTick().then(() => {
       updateHeight($xeTable);
       updateStyle($xeTable);
@@ -3352,7 +3464,7 @@ const Methods = {
   /**
    * 更新数据行的 Map
    */
-  cacheRowMap() {
+  cacheRowMap(isReset) {
     const $xeTable = this;
     const props = $xeTable;
     const reactData = $xeTable;
@@ -3372,7 +3484,7 @@ const Methods = {
     const {
       lazy
     } = treeOpts;
-    const fullAllDataRowIdMaps = Object.assign({}, fullAllDataRowIdData); // 存在已删除数据
+    const fullAllDataRowIdMaps = isReset ? {} : Object.assign({}, fullAllDataRowIdData); // 存在已删除数据
     const fullDataRowIdMaps = {};
     const {
       handleUpdateRowId
@@ -6381,6 +6493,29 @@ const Methods = {
     this.updateCellAreas();
     this.recalculate(true);
   },
+  /**
+   * 处理合并
+   */
+  handleUpdateBodyMerge() {
+    const $xeTable = this;
+    const reactData = $xeTable;
+    const internalData = $xeTable;
+    const {
+      mergeBodyList
+    } = internalData;
+    internalData.mergeBodyCellMaps = buildMergeData(mergeBodyList);
+    reactData.mergeBodyFlag++;
+  },
+  handleUpdateFooterMerge() {
+    const $xeTable = this;
+    const reactData = $xeTable;
+    const internalData = $xeTable;
+    const {
+      mergeFooterList
+    } = internalData;
+    internalData.mergeFooterCellMaps = buildMergeData(mergeFooterList);
+    reactData.mergeFootFlag++;
+  },
   handleTargetLeaveEvent() {
     const $xeTable = this;
     const internalData = $xeTable;
@@ -10569,26 +10704,33 @@ const Methods = {
    */
   updateFooter() {
     const $xeTable = this;
+    const props = $xeTable;
+    const reactData = $xeTable;
+    const internalData = $xeTable;
     const $xeGrid = $xeTable.$xeGrid;
     const {
       showFooter,
-      visibleColumn,
       footerData,
       footerMethod
-    } = this;
+    } = props;
+    const {
+      visibleColumn,
+      afterFullData
+    } = internalData;
     let footData = [];
     if (showFooter && footerData && footerData.length) {
       footData = footerData.slice(0);
     } else if (showFooter && footerMethod) {
       footData = visibleColumn.length ? footerMethod({
         columns: visibleColumn,
-        data: this.afterFullData,
+        data: afterFullData,
         $table: $xeTable,
         $grid: $xeGrid
       }) : [];
     }
-    this.footerTableData = footData;
-    return this.$nextTick();
+    reactData.footerTableData = footData;
+    $xeTable.handleUpdateFooterMerge();
+    return $xeTable.$nextTick();
   },
   /**
    * 更新列状态 updateStatus({ row, column }, cellValue)
@@ -10613,12 +10755,14 @@ const Methods = {
    */
   setMergeCells(merges) {
     const $xeTable = this;
-    if (this.spanMethod) {
+    const props = $xeTable;
+    if (props.spanMethod) {
       (0, _log.errLog)('vxe.error.errConflicts', ['merge-cells', 'span-method']);
     }
-    setMerges(this, merges, this.mergeList, this.afterFullData);
-    return this.$nextTick().then(() => {
-      this.updateCellAreas();
+    handleBodyMerge($xeTable, merges);
+    $xeTable.handleUpdateBodyMerge();
+    return $xeTable.$nextTick().then(() => {
+      $xeTable.updateCellAreas();
       return updateStyle($xeTable);
     });
   },
@@ -10628,12 +10772,14 @@ const Methods = {
    */
   removeMergeCells(merges) {
     const $xeTable = this;
-    if (this.spanMethod) {
+    const props = $xeTable;
+    const internalData = $xeTable;
+    if (props.spanMethod) {
       (0, _log.errLog)('vxe.error.errConflicts', ['merge-cells', 'span-method']);
     }
-    const rest = removeMerges(this, merges, this.mergeList, this.afterFullData);
-    return this.$nextTick().then(() => {
-      this.updateCellAreas();
+    const rest = removeMerges($xeTable, merges, internalData.mergeBodyList, internalData.afterFullData);
+    return $xeTable.$nextTick().then(() => {
+      $xeTable.updateCellAreas();
       updateStyle($xeTable);
       return rest;
     });
@@ -10642,37 +10788,46 @@ const Methods = {
    * 获取所有被合并的单元格
    */
   getMergeCells() {
-    return this.mergeList.slice(0);
+    const $xeTable = this;
+    const internalData = $xeTable;
+    return internalData.mergeBodyList.slice(0);
   },
   /**
    * 清除所有单元格合并
    */
   clearMergeCells() {
     const $xeTable = this;
-    this.mergeList = [];
-    return this.$nextTick().then(() => {
+    const internalData = $xeTable;
+    internalData.mergeBodyList = [];
+    internalData.mergeBodyMaps = {};
+    internalData.mergeBodyCellMaps = {};
+    return $xeTable.$nextTick().then(() => {
       return updateStyle($xeTable);
     });
   },
   setMergeFooterItems(merges) {
     const $xeTable = this;
-    if (this.footerSpanMethod) {
+    const props = $xeTable;
+    if (props.footerSpanMethod) {
       (0, _log.errLog)('vxe.error.errConflicts', ['merge-footer-items', 'footer-span-method']);
     }
-    setMerges(this, merges, this.mergeFooterList);
-    return this.$nextTick().then(() => {
-      this.updateCellAreas();
+    handleFooterMerge($xeTable, merges);
+    $xeTable.handleUpdateFooterMerge();
+    return $xeTable.$nextTick().then(() => {
+      $xeTable.updateCellAreas();
       return updateStyle($xeTable);
     });
   },
   removeMergeFooterItems(merges) {
     const $xeTable = this;
-    if (this.footerSpanMethod) {
+    const props = $xeTable;
+    const internalData = $xeTable;
+    if (props.footerSpanMethod) {
       (0, _log.errLog)('vxe.error.errConflicts', ['merge-footer-items', 'footer-span-method']);
     }
-    const rest = removeMerges(this, merges, this.mergeFooterList, null);
-    return this.$nextTick().then(() => {
-      this.updateCellAreas();
+    const rest = removeMerges($xeTable, merges, internalData.mergeFooterList);
+    return $xeTable.$nextTick().then(() => {
+      $xeTable.updateCellAreas();
       updateStyle($xeTable);
       return rest;
     });
@@ -10681,15 +10836,20 @@ const Methods = {
    * 获取所有被合并的表尾
    */
   getMergeFooterItems() {
-    return this.mergeFooterList.slice(0);
+    const $xeTable = this;
+    const internalData = $xeTable;
+    return internalData.mergeFooterList.slice(0);
   },
   /**
    * 清除所有表尾合并
    */
   clearMergeFooterItems() {
     const $xeTable = this;
-    this.mergeFooterList = [];
-    return this.$nextTick().then(() => {
+    const internalData = $xeTable;
+    internalData.mergeFooterList = [];
+    internalData.mergeFooterMaps = {};
+    internalData.mergeFooterCellMaps = {};
+    return $xeTable.$nextTick().then(() => {
       return updateStyle($xeTable);
     });
   },