vxe-table 4.12.5 → 4.13.0-beta.1

package/lib/table/src/footer.js

@@ -15,30 +15,6 @@ const {
   renderEmptyElement
 } = _ui.VxeUI;
 const renderType = 'footer';
-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
-        };
-      }
-    }
-  }
-}
 var _default = exports.default = (0, _vue.defineComponent)({
   name: 'VxeTableFooter',
   props: {
@@ -102,11 +78,12 @@ var _default = exports.default = (0, _vue.defineComponent)({
         scrollXLoad,
         scrollYLoad,
         overflowX,
-        currentColumn,
-        mergeFooterList
+        currentColumn
       } = tableReactData;
       const {
         fullColumnIdData,
+        mergeFooterList,
+        mergeFooterCellMaps,
         scrollXStore
       } = tableInternalData;
       const tooltipOpts = computeTooltipOpts.value;
@@ -201,7 +178,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
         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 _vue=require("vue"),_xeUtils=_interopRequireDefault(require("xe-utils")),_ui=require("../../ui"),_dom=require("../../ui/src/dom"),_util=require("./util");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let{renderer,renderEmptyElement}=_ui.VxeUI,renderType="footer";function mergeFooterMethod(l,t,o){for(let e=0;e<l.length;e++){var{row:r,col:i,rowspan:n,colspan:a}=l[e];if(-1<i&&-1<r&&n&&a){if(r===t&&i===o)return{rowspan:n,colspan:a};if(r<=t&&t<r+n&&i<=o&&o<i+a)return{rowspan:0,colspan:0}}}}var _default=exports.default=(0,_vue.defineComponent)({name:"VxeTableFooter",props:{footerTableData:{type:Array,default:()=>[]},tableColumn:{type:Array,default:()=>[]},fixedColumn:{type:Array,default:()=>[]},fixedType:{type:String,default:null}},setup(m){let J=(0,_vue.inject)("$xeTable",{}),{xID:g,props:_,reactData:h,internalData:b}=J,{computeTooltipOpts:l,computeColumnOpts:w,computeColumnDragOpts:y,computeCellOpts:t,computeFooterCellOpts:o,computeDefaultRowHeight:r,computeResizableOpts:i}=J.getComputeMaps(),C=(0,_vue.ref)(),T=(0,_vue.ref)(),F=(0,_vue.ref)(),D=(0,_vue.ref)(),O=(0,_vue.ref)(),I=(0,_vue.ref)(),S=(y,C,T,F,D)=>{let O=J.xeGrid,I=m.fixedType,{resizable:S,border:E,footerCellClassName:M,footerCellStyle:k,footerAlign:z,footerSpanMethod:U,align:R,columnKey:$,showFooterOverflow:A}=_,{scrollXLoad:j,scrollYLoad:q,overflowX:L,currentColumn:X,mergeFooterList:N}=h,{fullColumnIdData:G,scrollXStore:H}=b,P=l.value;let W=i.value.isAllColumnDrag,B=w.value;var e=r.value;let K=t.value,V=o.value,Y=(0,_util.getCellHeight)(V.height||K.height)||e;return y.map((l,e)=>{var{type:t,showFooterOverflow:o,footerAlign:r,align:i,footerClassName:n,editRender:a,cellRender:u}=l,s=l.id,d=G[s]||{},a=a||u,u=a?renderer.get(a.name):null;let c=P.showAll;var a=l.children&&l.children.length,a=I?l.fixed!==I&&!a:l.fixed&&L,p=(_xeUtils.default.isBoolean(V.padding)?V:K).padding,o=_xeUtils.default.eqNull(o)?A:o,r=r||(u?u.tableFooterCellAlign:"")||z||i||(u?u.tableCellAlign:"")||R;let f="ellipsis"===o,v="title"===o,x=!0===o||"tooltip"===o,m=v||x||f;var i=_xeUtils.default.isBoolean(l.resizable)?l.resizable:B.resizable||S,u={colid:s},o={},g=d.index,d=d._index,_=d;let h={$table:J,$grid:O,row:T,rowIndex:D,_rowIndex:D,$rowIndex:F,column:l,columnIndex:g,$columnIndex:e,_columnIndex:d,itemIndex:_,items:T,fixed:I,type:renderType,data:C},b=(j&&!m&&(f=m=!0),(v||x||c)&&(o.onMouseenter=e=>{v?(0,_dom.updateCellTitle)(e.currentTarget,l):(x||c)&&J.triggerFooterTooltipEvent(e,h)}),(x||c)&&(o.onMouseleave=e=>{(x||c)&&J.handleTargetLeaveEvent(e)}),o.onClick=e=>{J.dispatchEvent("footer-cell-click",Object.assign({cell:e.currentTarget},h),e)},!(o.onDblclick=e=>{J.dispatchEvent("footer-cell-dblclick",Object.assign({cell:e.currentTarget},h),e)}));if(N.length){g=mergeFooterMethod(N,D,d);if(g){var{rowspan:_,colspan:g}=g;if(!_||!g)return null;1<_&&(b=!0,u.rowspan=_),1<g&&(b=!0,u.colspan=g)}}else if(U){var{rowspan:_=1,colspan:g=1}=U(h)||{};if(!_||!g)return null;1<_&&(u.rowspan=_),1<g&&(u.colspan=g)}_=e===y.length-1,g=!l.resizeWidth&&("auto"===l.minWidth||"auto"===l.width);let w=!1;b||j&&!l.fixed&&(d<H.visibleStartIndex-H.preloadSize||d>H.visibleEndIndex+H.preloadSize)&&(w=!0);d={};return m?d.height=Y+"px":d.minHeight=Y+"px",(0,_vue.h)("td",Object.assign(Object.assign(Object.assign(Object.assign({class:["vxe-footer--column",l.id,{["col--"+r]:r,["col--"+t]:t,"col--last":_,"fixed--width":!g,"fixed--hidden":a,"is--padding":p,"col--ellipsis":m,"col--current":X===l},(0,_dom.getPropClass)(n,h),(0,_dom.getPropClass)(M,h)]},u),{style:k?_xeUtils.default.isFunction(k)?k(h):k:null}),o),{key:$||j||q||B.useKey||B.drag?l.id:e}),[(0,_vue.h)("div",{class:["vxe-cell",{"c--title":v,"c--tooltip":x,"c--ellipsis":f}],style:d},w?[]:[(0,_vue.h)("div",{colid:s,class:"vxe-cell--wrapper"},l.renderFooter(h))]),!a&&i&&W?(0,_vue.h)("div",{class:["vxe-cell--col-resizable",{"is--line":!E||"none"===E}],onMousedown:e=>J.handleColResizeMousedownEvent(e,I,h),onDblclick:e=>J.handleColResizeDblclickEvent(e,h)}):renderEmptyElement(J)])})};return(0,_vue.onMounted)(()=>{(0,_vue.nextTick)(()=>{var e=m.fixedType,l=b.elemStore,e=`${e||"main"}-footer-`;l[e+"wrapper"]=C,l[e+"scroll"]=T,l[e+"table"]=F,l[e+"colgroup"]=D,l[e+"list"]=O,l[e+"xSpace"]=I})}),(0,_vue.onUnmounted)(()=>{var e=m.fixedType,l=b.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}),()=>{let{fixedType:l,fixedColumn:e,tableColumn:t}=m;var{spanMethod:o,footerSpanMethod:r,showFooterOverflow:i}=_,{visibleColumn:n,fullColumnIdData:a}=b,{isGroup:u,isColLoading:s,overflowX:d,scrollXLoad:c,scrollYLoad:p,dragCol:f}=h;let v=t,x=!(c||p||i)||o||r?!1:!0;return s||!l&&d||(v=n),l&&x&&(v=e||[]),l||u||c&&f&&2<v.length&&(p=a[f.id])&&(i=p._index,o=v[0],r=v[v.length-1],s=a[o.id],d=a[r.id],s)&&d&&(n=s._index,u=d._index,i<n?v=[f].concat(v):u<i&&(v=v.concat([f]))),(0,_vue.h)("div",{ref:C,class:["vxe-table--footer-wrapper",l?`fixed-${l}--wrapper`:"body--wrapper"],xid:g},[(0,_vue.h)("div",{ref:T,class:"vxe-table--footer-inner-wrapper",onScroll(e){J.triggerFooterScrollEvent(e,l)}},[l?renderEmptyElement(J):(0,_vue.h)("div",{ref:I,class:"vxe-body--x-space"}),(0,_vue.h)("table",{ref:F,class:"vxe-table--footer",xid:g,cellspacing:0,cellpadding:0,border:0},[(0,_vue.h)("colgroup",{ref:D},v.map((e,l)=>(0,_vue.h)("col",{name:e.id,key:l,style:{width:e.renderWidth+"px"}}))),(0,_vue.h)("tfoot",{ref:O},(r=>{let{fixedType:i,footerTableData:n}=m,{footerRowClassName:a,footerRowStyle:u}=_,{isColLoading:s,isDragColMove:d}=h,c=w.value,p=y.value;return n.map((e,l)=>{let t=l;var o={$table:J,row:e,_rowIndex:t,$rowIndex:l,fixed:i,type:renderType};return!s&&c.drag&&p.animation?(0,_vue.h)(_vue.TransitionGroup,{key:l,name:"vxe-header--col-list"+(d?"":"-disabled"),tag:"tr",class:["vxe-footer--row",a?_xeUtils.default.isFunction(a)?a(o):a:""],style:u?_xeUtils.default.isFunction(u)?u(o):u:null},{default:()=>S(r,n,e,l,t)}):(0,_vue.h)("tr",{key:l,class:["vxe-footer--row",a?_xeUtils.default.isFunction(a)?a(o):a:""],style:u?_xeUtils.default.isFunction(u)?u(o):u:null},S(r,n,e,l,t))})})(v))])])])}}});
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _vue=require("vue"),_xeUtils=_interopRequireDefault(require("xe-utils")),_ui=require("../../ui"),_dom=require("../../ui/src/dom"),_util=require("./util");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let{renderer,renderEmptyElement}=_ui.VxeUI,renderType="footer";var _default=exports.default=(0,_vue.defineComponent)({name:"VxeTableFooter",props:{footerTableData:{type:Array,default:()=>[]},tableColumn:{type:Array,default:()=>[]},fixedColumn:{type:Array,default:()=>[]},fixedType:{type:String,default:null}},setup(m){let Q=(0,_vue.inject)("$xeTable",{}),{xID:g,props:_,reactData:h,internalData:b}=Q,{computeTooltipOpts:l,computeColumnOpts:y,computeColumnDragOpts:w,computeCellOpts:t,computeFooterCellOpts:o,computeDefaultRowHeight:r,computeResizableOpts:i}=Q.getComputeMaps(),C=(0,_vue.ref)(),T=(0,_vue.ref)(),D=(0,_vue.ref)(),F=(0,_vue.ref)(),O=(0,_vue.ref)(),I=(0,_vue.ref)(),S=(w,C,T,D,F)=>{let O=Q.xeGrid,I=m.fixedType,{resizable:S,border:E,footerCellClassName:M,footerCellStyle:k,footerAlign:z,footerSpanMethod:U,align:R,columnKey:$,showFooterOverflow:A}=_,{scrollXLoad:j,scrollYLoad:q,overflowX:L,currentColumn:X}=h,{fullColumnIdData:N,mergeFooterList:G,mergeFooterCellMaps:H,scrollXStore:P}=b,W=l.value;let B=i.value.isAllColumnDrag,K=y.value;var e=r.value;let V=t.value,Y=o.value,J=(0,_util.getCellHeight)(Y.height||V.height)||e;return w.map((l,e)=>{var{type:t,showFooterOverflow:o,footerAlign:r,align:i,footerClassName:a,editRender:n,cellRender:u}=l,d=l.id,s=N[d]||{},n=n||u,u=n?renderer.get(n.name):null;let c=W.showAll;var n=l.children&&l.children.length,n=I?l.fixed!==I&&!n:l.fixed&&L,p=(_xeUtils.default.isBoolean(Y.padding)?Y:V).padding,o=_xeUtils.default.eqNull(o)?A:o,r=r||(u?u.tableFooterCellAlign:"")||z||i||(u?u.tableCellAlign:"")||R;let f="ellipsis"===o,v="title"===o,x=!0===o||"tooltip"===o,m=v||x||f;var i=_xeUtils.default.isBoolean(l.resizable)?l.resizable:K.resizable||S,u={colid:d},o={},g=s.index,s=s._index,_=s;let h={$table:Q,$grid:O,row:T,rowIndex:F,_rowIndex:F,$rowIndex:D,column:l,columnIndex:g,$columnIndex:e,_columnIndex:s,itemIndex:_,items:T,fixed:I,type:renderType,data:C},b=(j&&!m&&(f=m=!0),(v||x||c)&&(o.onMouseenter=e=>{v?(0,_dom.updateCellTitle)(e.currentTarget,l):(x||c)&&Q.triggerFooterTooltipEvent(e,h)}),(x||c)&&(o.onMouseleave=e=>{(x||c)&&Q.handleTargetLeaveEvent(e)}),o.onClick=e=>{Q.dispatchEvent("footer-cell-click",Object.assign({cell:e.currentTarget},h),e)},!(o.onDblclick=e=>{Q.dispatchEvent("footer-cell-dblclick",Object.assign({cell:e.currentTarget},h),e)}));if(G.length){g=H[F+":"+s];if(g){var{rowspan:_,colspan:g}=g;if(!_||!g)return null;1<_&&(b=!0,u.rowspan=_),1<g&&(b=!0,u.colspan=g)}}else if(U){var{rowspan:_=1,colspan:g=1}=U(h)||{};if(!_||!g)return null;1<_&&(u.rowspan=_),1<g&&(u.colspan=g)}_=e===w.length-1,g=!l.resizeWidth&&("auto"===l.minWidth||"auto"===l.width);let y=!1;b||j&&!l.fixed&&(s<P.visibleStartIndex-P.preloadSize||s>P.visibleEndIndex+P.preloadSize)&&(y=!0);s={};return m?s.height=J+"px":s.minHeight=J+"px",(0,_vue.h)("td",Object.assign(Object.assign(Object.assign(Object.assign({class:["vxe-footer--column",l.id,{["col--"+r]:r,["col--"+t]:t,"col--last":_,"fixed--width":!g,"fixed--hidden":n,"is--padding":p,"col--ellipsis":m,"col--current":X===l},(0,_dom.getPropClass)(a,h),(0,_dom.getPropClass)(M,h)]},u),{style:k?_xeUtils.default.isFunction(k)?k(h):k:null}),o),{key:$||j||q||K.useKey||K.drag?l.id:e}),[(0,_vue.h)("div",{class:["vxe-cell",{"c--title":v,"c--tooltip":x,"c--ellipsis":f}],style:s},y?[]:[(0,_vue.h)("div",{colid:d,class:"vxe-cell--wrapper"},l.renderFooter(h))]),!n&&i&&B?(0,_vue.h)("div",{class:["vxe-cell--col-resizable",{"is--line":!E||"none"===E}],onMousedown:e=>Q.handleColResizeMousedownEvent(e,I,h),onDblclick:e=>Q.handleColResizeDblclickEvent(e,h)}):renderEmptyElement(Q)])})};return(0,_vue.onMounted)(()=>{(0,_vue.nextTick)(()=>{var e=m.fixedType,l=b.elemStore,e=`${e||"main"}-footer-`;l[e+"wrapper"]=C,l[e+"scroll"]=T,l[e+"table"]=D,l[e+"colgroup"]=F,l[e+"list"]=O,l[e+"xSpace"]=I})}),(0,_vue.onUnmounted)(()=>{var e=m.fixedType,l=b.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}),()=>{let{fixedType:l,fixedColumn:e,tableColumn:t}=m;var{spanMethod:o,footerSpanMethod:r,showFooterOverflow:i}=_,{visibleColumn:a,fullColumnIdData:n}=b,{isGroup:u,isColLoading:d,overflowX:s,scrollXLoad:c,scrollYLoad:p,dragCol:f}=h;let v=t,x=!(c||p||i)||o||r?!1:!0;return d||!l&&s||(v=a),l&&x&&(v=e||[]),l||u||c&&f&&2<v.length&&(p=n[f.id])&&(i=p._index,o=v[0],r=v[v.length-1],d=n[o.id],s=n[r.id],d)&&s&&(a=d._index,u=s._index,i<a?v=[f].concat(v):u<i&&(v=v.concat([f]))),(0,_vue.h)("div",{ref:C,class:["vxe-table--footer-wrapper",l?`fixed-${l}--wrapper`:"body--wrapper"],xid:g},[(0,_vue.h)("div",{ref:T,class:"vxe-table--footer-inner-wrapper",onScroll(e){Q.triggerFooterScrollEvent(e,l)}},[l?renderEmptyElement(Q):(0,_vue.h)("div",{ref:I,class:"vxe-body--x-space"}),(0,_vue.h)("table",{ref:D,class:"vxe-table--footer",xid:g,cellspacing:0,cellpadding:0,border:0},[(0,_vue.h)("colgroup",{ref:F},v.map((e,l)=>(0,_vue.h)("col",{name:e.id,key:l,style:{width:e.renderWidth+"px"}}))),(0,_vue.h)("tfoot",{ref:O},(r=>{let{fixedType:i,footerTableData:a}=m,{footerRowClassName:n,footerRowStyle:u}=_,{isColLoading:d,isDragColMove:s}=h,c=y.value,p=w.value;return a.map((e,l)=>{let t=l;var o={$table:Q,row:e,_rowIndex:t,$rowIndex:l,fixed:i,type:renderType};return!d&&c.drag&&p.animation?(0,_vue.h)(_vue.TransitionGroup,{key:l,name:"vxe-header--col-list"+(s?"":"-disabled"),tag:"tr",class:["vxe-footer--row",n?_xeUtils.default.isFunction(n)?n(o):n:""],style:u?_xeUtils.default.isFunction(u)?u(o):u:null},{default:()=>S(r,a,e,l,t)}):(0,_vue.h)("tr",{key:l,class:["vxe-footer--row",n?_xeUtils.default.isFunction(n)?n(o):n:""],style:u?_xeUtils.default.isFunction(u)?u(o):u:null},S(r,a,e,l,t))})})(v))])])])}}});

package/lib/table/src/table.js

@@ -108,10 +108,6 @@ var _default = exports.default = (0, _vue.defineComponent)({
       // 树节点列信息
       treeNodeColumn: null,
       hasFixedColumn: false,
-      // 合并单元格的对象集
-      mergeList: [],
-      // 合并表尾数据的对象集
-      mergeFooterList: [],
       // 刷新列标识，当列筛选被改变时，触发表格刷新数据
       upDataFlag: 0,
       // 刷新列标识，当列的特定属性被改变时，触发表格刷新列
@@ -264,6 +260,8 @@ var _default = exports.default = (0, _vue.defineComponent)({
       pendingRowFlag: 1,
       insertRowFlag: 1,
       removeRowFlag: 1,
+      mergeBodyFlag: 1,
+      mergeFootFlag: 1,
       rowHeightStore: {
         default: 48,
         medium: 44,
@@ -356,13 +354,26 @@ var _default = exports.default = (0, _vue.defineComponent)({
       tableFullColumn: [],
       // 渲染所有列
       visibleColumn: [],
-      // 总的缓存数据集
+      // 全量数据集（包括当前和已删除）
       fullAllDataRowIdData: {},
+      // 数据集（仅当前）
+      fullDataRowIdData: {},
+      // 数据集（仅可视）
+      visibleDataRowIdData: {},
       // 渲染中缓存数据
       sourceDataRowIdData: {},
-      fullDataRowIdData: {},
       fullColumnIdData: {},
       fullColumnFieldData: {},
+      // 合并单元格的数据
+      mergeBodyList: [],
+      mergeBodyMaps: {},
+      // 合并表尾的数据
+      mergeFooterList: [],
+      mergeFooterMaps: {},
+      // 已合并单元格数据集合
+      mergeBodyCellMaps: {},
+      // 已合并表尾数据集合
+      mergeFooterCellMaps: {},
       // 已展开的行集合
       rowExpandedMaps: {},
       // 懒加载中的展开行的集合
@@ -694,25 +705,28 @@ var _default = exports.default = (0, _vue.defineComponent)({
       return Object.assign({}, getConfig().table.customConfig, props.customConfig);
     });
     const computeTableRowExpandedList = (0, _vue.computed)(() => {
+      const {
+        treeConfig
+      } = props;
       const {
         rowExpandedFlag,
-        tableData,
         expandColumn
       } = reactData;
       const {
+        visibleDataRowIdData,
         rowExpandedMaps
       } = internalData;
+      const treeOpts = computeTreeOpts.value;
       const {
-        handleGetRowId
-      } = (0, _util.createHandleGetRowId)($xeTable);
+        transform
+      } = treeOpts;
       const expandList = [];
       if (expandColumn && rowExpandedFlag) {
-        const rowKeys = {};
-        tableData.forEach(row => {
-          rowKeys[handleGetRowId(row)] = true;
-        });
+        if (treeConfig && !transform) {
+          return _xeUtils.default.values(rowExpandedMaps);
+        }
         _xeUtils.default.each(rowExpandedMaps, (row, rowid) => {
-          if (rowKeys[rowid]) {
+          if (visibleDataRowIdData[rowid]) {
             expandList.push(row);
           }
         });
@@ -1153,55 +1167,157 @@ var _default = exports.default = (0, _vue.defineComponent)({
         }
       }
     };
-    const setMerges = (merges, mList, rowList) => {
+    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 = merges => {
+      const {
+        fullAllDataRowIdData,
+        fullColumnIdData,
+        visibleColumn,
+        afterFullData,
+        mergeBodyList,
+        mergeBodyMaps
+      } = internalData;
+      if (merges) {
+        const {
+          handleGetRowId
+        } = (0, _util.createHandleGetRowId)($xeTable);
+        if (!_xeUtils.default.isArray(merges)) {
+          merges = [merges];
+        }
+        merges.forEach(item => {
+          let {
+            row: margeRow,
+            col: margeCol,
+            rowspan,
+            colspan
+          } = item;
+          let mergeRowIndex = -1;
+          let mergeColumnIndex = -1;
+          if (_xeUtils.default.isNumber(margeRow)) {
+            mergeRowIndex = margeRow;
+          } else {
+            const rowid = margeRow ? handleGetRowId(margeRow) : null;
+            const rowRest = rowid ? fullAllDataRowIdData[rowid] : null;
+            if (rowRest) {
+              mergeRowIndex = rowRest._index;
+            }
+          }
+          if (_xeUtils.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 = _xeUtils.default.toNumber(rowspan) || 1;
+            colspan = _xeUtils.default.toNumber(colspan) || 1;
+            if (rowspan > 1 || colspan > 1) {
+              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 {
+                mergeItem = {
+                  row: mergeRowIndex,
+                  col: mergeColumnIndex,
+                  rowspan,
+                  colspan,
+                  _row: row,
+                  _col: column,
+                  _rowspan: rowspan,
+                  _colspan: colspan
+                };
+                mergeBodyMaps[`${mergeRowIndex}:${mergeColumnIndex}`] = mergeItem;
+                mergeBodyList.push(mergeItem);
+              }
+            }
+          }
+        });
+      }
+    };
+    const handleFooterMerge = merges => {
+      const {
+        footerTableData
+      } = reactData;
+      const {
+        mergeFooterList,
+        mergeFooterMaps
+      } = internalData;
       if (merges) {
-        // const { treeConfig } = props
         const {
           visibleColumn
         } = internalData;
         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,
-            col,
+            row: margeRow,
+            col: margeCol,
             rowspan,
             colspan
           } = item;
-          if (rowList && _xeUtils.default.isNumber(row)) {
-            row = rowList[row];
-          }
-          if (_xeUtils.default.isNumber(col)) {
-            col = visibleColumn[col];
+          const mergeRowIndex = _xeUtils.default.isNumber(margeRow) ? margeRow : -1;
+          let mergeColumnIndex = -1;
+          if (_xeUtils.default.isNumber(margeCol)) {
+            mergeColumnIndex = margeCol;
           }
-          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 || (0, _util.getRowid)($xeTable, item._row) === (0, _util.getRowid)($xeTable, row)) && (item._col.id === col || item._col.id === col.id));
-              const mergeItem = mList[mcIndex];
+              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 {
-                const mergeRowIndex = rowList ? $xeTable.findRowIndexOf(rowList, row) : row;
-                const mergeColIndex = tableMethods.getVTColumnIndex(col);
-                mList.push({
+                mergeItem = {
                   row: mergeRowIndex,
-                  col: mergeColIndex,
+                  col: mergeColumnIndex,
                   rowspan,
                   colspan,
                   _row: row,
-                  _col: col,
+                  _col: column,
                   _rowspan: rowspan,
                   _colspan: colspan
-                });
+                };
+                mergeFooterMaps[`${mergeRowIndex}:${mergeColumnIndex}`] = mergeItem;
+                mergeFooterList.push(mergeItem);
               }
             }
           }
@@ -3142,7 +3258,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
       internalData.tableFullData = fullData;
       internalData.tableFullTreeData = treeData;
       // 缓存数据
-      $xeTable.cacheRowMap(true);
+      $xeTable.cacheRowMap(isReset);
       // 原始数据
       internalData.tableSynchData = datas;
       if (isReset) {
@@ -3160,6 +3276,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
       $xeTable.clearMergeFooterItems();
       $xeTable.handleTableData(true);
       $xeTable.updateFooter();
+      $xeTable.handleUpdateBodyMerge();
       return (0, _vue.nextTick)().then(() => {
         updateHeight();
         updateStyle();
@@ -3274,11 +3391,11 @@ var _default = exports.default = (0, _vue.defineComponent)({
     };
     const loadScrollXData = () => {
       const {
-        mergeList,
-        mergeFooterList,
         isScrollXBig
       } = reactData;
       const {
+        mergeBodyList,
+        mergeFooterList,
         scrollXStore
       } = internalData;
       const {
@@ -3297,7 +3414,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
       };
       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
@@ -3648,11 +3765,11 @@ var _default = exports.default = (0, _vue.defineComponent)({
      */
     const loadScrollYData = () => {
       const {
-        mergeList,
         isAllOverflow,
         isScrollYBig
       } = reactData;
       const {
+        mergeBodyList,
         scrollYStore
       } = internalData;
       const {
@@ -3672,7 +3789,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
       };
       scrollYStore.visibleStartIndex = toVisibleIndex - 1;
       scrollYStore.visibleEndIndex = toVisibleIndex + visibleSize + 1;
-      calculateMergerOffsetIndex(mergeList, offsetItem, 'row');
+      calculateMergerOffsetIndex(mergeBodyList, offsetItem, 'row');
       const {
         startIndex: offsetStartIndex,
         endIndex: offsetEndIndex
@@ -4014,7 +4131,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
        * 对于某些特殊的场景，比如深层树节点元素发生变动时可能会用到
        */
       syncData() {
-        (0, _log.warnLog)('vxe.error.delFunc', ['syncData', 'getData']);
+        (0, _log.errLog)('vxe.error.delFunc', ['syncData', 'getData']);
         return (0, _vue.nextTick)().then(() => {
           reactData.tableData = [];
           emit('update:data', internalData.tableFullData);
@@ -6658,6 +6775,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
           }) : [];
         }
         reactData.footerTableData = footData;
+        $xeTable.handleUpdateFooterMerge();
         return (0, _vue.nextTick)();
       },
       /**
@@ -6683,9 +6801,10 @@ var _default = exports.default = (0, _vue.defineComponent)({
         if (props.spanMethod) {
           (0, _log.errLog)('vxe.error.errConflicts', ['merge-cells', 'span-method']);
         }
-        setMerges(merges, reactData.mergeList, internalData.afterFullData);
+        handleBodyMerge(merges);
+        $xeTable.handleUpdateBodyMerge();
         return (0, _vue.nextTick)().then(() => {
-          tableMethods.updateCellAreas();
+          $xeTable.updateCellAreas();
           return updateStyle();
         });
       },
@@ -6697,9 +6816,9 @@ var _default = exports.default = (0, _vue.defineComponent)({
         if (props.spanMethod) {
           (0, _log.errLog)('vxe.error.errConflicts', ['merge-cells', 'span-method']);
         }
-        const rest = removeMerges(merges, reactData.mergeList, internalData.afterFullData);
+        const rest = removeMerges(merges, internalData.mergeBodyList, internalData.afterFullData);
         return (0, _vue.nextTick)().then(() => {
-          tableMethods.updateCellAreas();
+          $xeTable.updateCellAreas();
           updateStyle();
           return rest;
         });
@@ -6708,13 +6827,15 @@ var _default = exports.default = (0, _vue.defineComponent)({
        * 获取所有被合并的单元格
        */
       getMergeCells() {
-        return reactData.mergeList.slice(0);
+        return internalData.mergeBodyList.slice(0);
       },
       /**
        * 清除所有单元格合并
        */
       clearMergeCells() {
-        reactData.mergeList = [];
+        internalData.mergeBodyList = [];
+        internalData.mergeBodyMaps = {};
+        internalData.mergeBodyCellMaps = {};
         return (0, _vue.nextTick)().then(() => {
           return updateStyle();
         });
@@ -6723,7 +6844,8 @@ var _default = exports.default = (0, _vue.defineComponent)({
         if (props.footerSpanMethod) {
           (0, _log.errLog)('vxe.error.errConflicts', ['merge-footer-items', 'footer-span-method']);
         }
-        setMerges(merges, reactData.mergeFooterList);
+        handleFooterMerge(merges);
+        $xeTable.handleUpdateFooterMerge();
         return (0, _vue.nextTick)().then(() => {
           tableMethods.updateCellAreas();
           return updateStyle();
@@ -6733,7 +6855,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
         if (props.footerSpanMethod) {
           (0, _log.errLog)('vxe.error.errConflicts', ['merge-footer-items', 'footer-span-method']);
         }
-        const rest = removeMerges(merges, reactData.mergeFooterList);
+        const rest = removeMerges(merges, internalData.mergeFooterList);
         return (0, _vue.nextTick)().then(() => {
           tableMethods.updateCellAreas();
           updateStyle();
@@ -6744,13 +6866,15 @@ var _default = exports.default = (0, _vue.defineComponent)({
        * 获取所有被合并的表尾
        */
       getMergeFooterItems() {
-        return reactData.mergeFooterList.slice(0);
+        return internalData.mergeFooterList.slice(0);
       },
       /**
        * 清除所有表尾合并
        */
       clearMergeFooterItems() {
-        reactData.mergeFooterList = [];
+        internalData.mergeFooterList = [];
+        internalData.mergeFooterMaps = {};
+        internalData.mergeFooterCellMaps = {};
         return (0, _vue.nextTick)().then(() => {
           return updateStyle();
         });
@@ -7887,20 +8011,23 @@ var _default = exports.default = (0, _vue.defineComponent)({
           fullList = handleVirtualTreeToList();
         }
         const tableData = scrollYLoad ? fullList.slice(scrollYStore.startIndex, scrollYStore.endIndex) : fullList.slice(0);
+        const visibleDataRowIdMaps = {};
         tableData.forEach((row, $index) => {
           const rowid = (0, _util.getRowid)($xeTable, row);
           const rest = fullDataRowIdData[rowid];
           if (rest) {
             rest.$index = $index;
           }
+          visibleDataRowIdMaps[rowid] = row;
         });
         reactData.tableData = tableData;
+        internalData.visibleDataRowIdData = visibleDataRowIdMaps;
         return (0, _vue.nextTick)();
       },
       /**
        * 更新数据行的 Map
        */
-      cacheRowMap() {
+      cacheRowMap(isReset) {
         const {
           treeConfig
         } = props;
@@ -7916,7 +8043,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
         const {
           lazy
         } = treeOpts;
-        const fullAllDataRowIdMaps = Object.assign({}, fullAllDataRowIdData); // 存在已删除数据
+        const fullAllDataRowIdMaps = isReset ? {} : Object.assign({}, fullAllDataRowIdData); // 存在已删除数据
         const fullDataRowIdMaps = {};
         const {
           handleUpdateRowId
@@ -8825,6 +8952,23 @@ var _default = exports.default = (0, _vue.defineComponent)({
       }, checked, isForce) {
         $xeTable.handleBatchSelectRows([row], checked, isForce);
       },
+      /**
+       * 处理合并
+       */
+      handleUpdateBodyMerge() {
+        const {
+          mergeBodyList
+        } = internalData;
+        internalData.mergeBodyCellMaps = buildMergeData(mergeBodyList);
+        reactData.mergeBodyFlag++;
+      },
+      handleUpdateFooterMerge() {
+        const {
+          mergeFooterList
+        } = internalData;
+        internalData.mergeFooterCellMaps = buildMergeData(mergeFooterList);
+        reactData.mergeFootFlag++;
+      },
       triggerHeaderTitleEvent(evnt, iconParams, params) {
         const tipContent = iconParams.content || iconParams.message;
         if (tipContent) {
@@ -11239,20 +11383,22 @@ var _default = exports.default = (0, _vue.defineComponent)({
           } = treeOpts;
           const cellStyle = {};
           const rowid = handleGetRowId(row);
-          const rest = fullAllDataRowIdData[rowid];
+          const rowRest = fullAllDataRowIdData[rowid];
           let rowLevel = 0;
           let seq = -1;
-          let _rowIndex = 0;
-          const rowIndex = $xeTable.getRowIndex(row);
-          const $rowIndex = $xeTable.getVMRowIndex(row);
-          if (rest) {
-            rowLevel = rest.level;
+          let _rowIndex = -1;
+          let rowIndex = -1;
+          let $rowIndex = -1;
+          if (rowRest) {
+            rowLevel = rowRest.level;
             if (treeConfig && transform && seqMode === 'increasing') {
-              seq = rest._index + 1;
+              seq = rowRest._index + 1;
             } else {
-              seq = rest.seq;
+              seq = rowRest.seq;
             }
-            _rowIndex = rest._index;
+            rowIndex = rowRest.index;
+            $rowIndex = rowRest.$index;
+            _rowIndex = rowRest._index;
           }
           if (expandHeight) {
             cellStyle.height = `${expandHeight}px`;
@@ -11835,6 +11981,8 @@ var _default = exports.default = (0, _vue.defineComponent)({
       if (columnOpts.drag || rowOpts.drag || customOpts.allowSort) {
         (0, _dom.initTpImg)();
       }
+      ;
+      window.aa = $xeTable;
       (0, _vue.nextTick)(() => {
         const {
           data,
@@ -11927,7 +12075,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
         if (rowOpts.height && !props.showOverflow) {
           (0, _log.warnLog)('vxe.error.notProp', ['table.show-overflow']);
         }
-        if (!$xeTable.handleCellAreaMousedownEvent) {
+        if (!$xeTable.triggerCellAreaMousedownEvent) {
           if (props.areaConfig) {
             (0, _log.warnLog)('vxe.error.notProp', ['area-config']);
           }