vxe-table 3.15.1 → 3.15.3

package/lib/table/src/header.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"),_util=require("./util");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let{renderer,renderEmptyElement}=_ui.VxeUI,cellType="header",renderRows=($,e,D,E,S,T)=>{let R=e.$parent,I=R.$xeGrid;var l=R,r=R,a=R;let O=e.fixedType,{resizable:U,columnKey:k,headerCellClassName:z,headerCellStyle:M,showHeaderOverflow:A,headerAlign:F,align:X,mouseConfig:q}=l,{currentColumn:L,dragCol:G,scrollXLoad:N,scrollYLoad:B,overflowX:W}=r,{fullColumnIdData:K,scrollXStore:P}=a,V=R.computeColumnOpts,Y=R.computeColumnDragOpts,j=R.computeCellOpts;e=R.computeDefaultRowHeight;let J=R.computeHeaderCellOpts,Q=(0,_util.getCellHeight)(J.height||j.height)||e,{disabledMethod:Z,isCrossDrag:ee,isPeerDrag:le}=Y;return S.map((e,l)=>{var{type:r,showHeaderOverflow:a,headerAlign:t,align:d,filters:i,headerClassName:o,editRender:s,cellRender:n}=e,u=e.id,c=K[u]||{},s=s||n,n=s?renderer.get(s.name):null,s=e.children&&e.children.length,p=O?e.fixed!==O&&!s:e.fixed&&W,f=(_xeUtils.default.isBoolean(J.padding)?J:j).padding,a=_xeUtils.default.isUndefined(a)||_xeUtils.default.isNull(a)?A:a,t=t||(n?n.tableHeaderCellAlign:"")||F||d||(n?n.tableCellAlign:"")||X;let x="ellipsis"===a;d="title"===a,n=!0===a||"tooltip"===a;let g=d||n||x,m=!1,h=null;i&&(h=i[0],m=i.some(e=>e.checked));a=c.index,c=c._index;let v={$table:R,$grid:I,$rowIndex:T,column:e,columnIndex:a,$columnIndex:l,_columnIndex:c,firstFilterOption:h,fixed:O,type:cellType,isHidden:p,hasFilter:m};var a={colid:u,colspan:1<e.colSpan?e.colSpan:null,rowspan:1<e.rowSpan?e.rowSpan:null},C={click:e=>R.triggerHeaderCellClickEvent(e,v),dblclick:e=>R.triggerHeaderCellDblclickEvent(e,v)},b=(N&&!g&&(x=g=!0),V.drag&&"cell"===Y.trigger);let y=!1;b&&(y=!(!Z||!Z(v))),(q||b)&&(C.mousedown=e=>R.triggerHeaderCellMousedownEvent(e,v)),V.drag&&(C.dragstart=R.handleHeaderCellDragDragstartEvent,C.dragend=R.handleHeaderCellDragDragendEvent,C.dragover=R.handleHeaderCellDragDragoverEvent,b)&&(C.mouseup=R.handleHeaderCellDragMouseupEvent);var b=l===S.length-1,w=_xeUtils.default.isBoolean(e.resizable)?e.resizable:V.resizable||U,H=!e.resizeWidth&&("auto"===e.minWidth||"auto"===e.width);let _=!1;D||G&&G.id===u||N&&!e.fixed&&(c<P.visibleStartIndex-P.preloadSize||c>P.visibleEndIndex+P.preloadSize)&&(_=!0);c={};return g?c.height=Q+"px":c.minHeight=Q+"px",$("th",{class:["vxe-header--column",u,{["col--"+t]:t,["col--"+r]:r,"col--last":b,"col--fixed":e.fixed,"col--group":s,"col--ellipsis":g,"fixed--width":!H,"fixed--hidden":p,"is--padding":f,"is--sortable":e.sortable,"col--filter":!!i,"is--filter-active":m,"is--drag-active":V.drag&&!e.fixed&&!y&&(ee||le||!e.parentId),"is--drag-disabled":V.drag&&y,"col--current":L===e},(0,_utils.getClass)(o,v),(0,_utils.getClass)(z,v)],attrs:a,style:M?_xeUtils.default.isFunction(M)?M(v):M:void 0,on:C,key:k||N||B||V.useKey||V.drag||s?u:l},[$("div",{class:["vxe-cell",{"c--title":d,"c--tooltip":n,"c--ellipsis":x}],style:c},_||E&&p?[]:[$("div",{attrs:{colid:u},class:"vxe-cell--wrapper"},e.renderHeader($,v))]),!p&&w?$("div",{class:"vxe-cell--col-resizable",on:{mousedown:e=>R.handleColResizeMousedownEvent(e,O,v),dblclick:e=>R.handleColResizeDblclickEvent(e,v)}}):renderEmptyElement(R)])})};function renderHeads(a,t,d,i,e){let o=t.$parent;var l=o,r=o;let s=t.fixedType,n=o.computeColumnOpts,u=o.computeColumnDragOpts,{headerRowClassName:c,headerRowStyle:p}=l,{isColLoading:f,isDragColMove:x}=r;return e.map((e,l)=>{var r={$table:o,$rowIndex:l,fixed:s,type:cellType};return!f&&n.drag&&u.animation?a("transition-group",{key:l,props:{tag:"tr",name:"vxe-header--col-list"+(x?"":"-disabled"),class:["vxe-header--row",c?_xeUtils.default.isFunction(c)?c(r):c:""],style:p?_xeUtils.default.isFunction(p)?p(r):p:null}},renderRows(a,t,d,i,e,l)):a("tr",{key:l,class:["vxe-header--row",c?_xeUtils.default.isFunction(c)?c(r):c:""],style:p?_xeUtils.default.isFunction(p)?p(r):p:void 0},renderRows(a,t,d,i,e,l))})}var _default=exports.default={name:"VxeTableHeader",props:{tableData:Array,tableColumn:Array,tableGroupColumn:Array,fixedColumn:Array,fixedType:{type:String,default:null}},data(){return{headerColumn:[]}},watch:{tableColumn(){this.uploadColumn()}},created(){this.uploadColumn()},mounted(){var e=this,l=e.fixedType,r=e.$parent.elemStore,l=`${l||"main"}-header-`;r[l+"wrapper"]=e.$refs.refElem,r[l+"scroll"]=e.$refs.refHeaderScroll,r[l+"table"]=e.$refs.refHeaderTable,r[l+"colgroup"]=e.$refs.refHeaderColgroup,r[l+"list"]=e.$refs.refHeaderTHead,r[l+"xSpace"]=e.$refs.refHeaderXSpace,r[l+"repair"]=e.$refs.refHeaderBorderRepair},destroyed(){var e=this.fixedType,l=this.$parent.elemStore,e=`${e||"main"}-header-`;l[e+"wrapper"]=null,l[e+"scroll"]=null,l[e+"table"]=null,l[e+"colgroup"]=null,l[e+"list"]=null,l[e+"xSpace"]=null,l[e+"repair"]=null},render(r){let l=this.$parent;var e=l,a=l,t=l,d=l.xID;let{fixedType:i,fixedColumn:o,tableColumn:s}=this;var n=this.headerColumn,{mouseConfig:e,showHeaderOverflow:u,spanMethod:c,footerSpanMethod:p}=e,{isGroup:a,isColLoading:f,overflowX:x,scrollXLoad:g,scrollYLoad:m,dragCol:h}=a,{visibleColumn:t,fullColumnIdData:v}=t,C=l.computeMouseOpts;let b=n,y=s,w=!1;return a?y=t:(!(g||m||u)||c||p||(w=!0),f||!i&&x||(y=t),i&&w&&(y=o||[]),b=[y]),i||a||g&&h&&2<y.length&&(n=v[h.id])&&(m=n._index,u=y[0],c=y[y.length-1],p=v[u.id],f=v[c.id],p)&&f&&(x=p._index,t=f._index,m<x?(y=[h].concat(y),b=[[h].concat(b[0])].concat(b.slice(1))):t<m&&(y=y.concat([h]),b=[b[0].concat([h])].concat(b.slice(1)))),r("div",{ref:"refElem",class:["vxe-table--header-wrapper",i?`fixed-${i}--wrapper`:"body--wrapper"],attrs:{xid:d}},[r("div",{ref:"refHeaderScroll",class:"vxe-table--header-inner-wrapper",on:{scroll(e){l.triggerHeaderScrollEvent(e,i)}}},[i?renderEmptyElement(l):r("div",{ref:"refHeaderXSpace",class:"vxe-body--x-space"}),r("table",{ref:"refHeaderTable",class:"vxe-table--header",attrs:{xid:d,cellspacing:0,cellpadding:0,border:0}},[r("colgroup",{ref:"refHeaderColgroup"},y.map((e,l)=>r("col",{attrs:{name:e.id},key:l,style:{width:e.renderWidth+"px"}}))),r("thead",{ref:"refHeaderTHead"},renderHeads(r,this,a,w,b)),e&&C.area?r("div",{class:"vxe-table--cell-area"},[r("span",{class:"vxe-table--cell-main-area"}),r("span",{class:"vxe-table--cell-copy-area"}),r("span",{class:"vxe-table--cell-extend-area"}),r("span",{class:"vxe-table--cell-multi-area"}),r("span",{class:"vxe-table--cell-active-area"}),r("span",{class:"vxe-table--cell-col-status-area"})]):renderEmptyElement(l)])])])},methods:{uploadColumn(){var e=this.$parent.isGroup;this.headerColumn=e?(0,_util.convertHeaderColumnToRows)(this.tableGroupColumn):[]}}};
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_ui=require("../../ui"),_utils=require("../../ui/src/utils"),_util=require("./util");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let{renderer,renderEmptyElement}=_ui.VxeUI,cellType="header",renderRows=($,e,D,E,S,T)=>{let R=e.$parent,O=R.$xeGrid;var l=R,r=R,a=R;let I=e.fixedType,{resizable:U,columnKey:k,headerCellClassName:z,headerCellStyle:M,showHeaderOverflow:A,headerAlign:X,align:F,mouseConfig:q}=l,{currentColumn:L,dragCol:G,scrollXLoad:N,scrollYLoad:B,overflowX:V}=r,{fullColumnIdData:W,scrollXStore:K}=a,P=R.computeVirtualXOpts,Y=R.computeColumnOpts,j=R.computeColumnDragOpts,J=R.computeCellOpts;e=R.computeDefaultRowHeight;let Q=R.computeHeaderCellOpts,Z=(0,_util.getCellHeight)(Q.height||J.height)||e,{disabledMethod:ee,isCrossDrag:le,isPeerDrag:re}=j;return S.map((e,l)=>{var{type:r,showHeaderOverflow:a,headerAlign:t,align:d,filters:i,headerClassName:o,editRender:s,cellRender:n}=e,u=e.id,c=W[u]||{},s=s||n,n=s?renderer.get(s.name):null,s=e.children&&e.children.length,p=I?e.fixed!==I&&!s:e.fixed&&V,f=(_xeUtils.default.isBoolean(Q.padding)?Q:J).padding,a=_xeUtils.default.isUndefined(a)||_xeUtils.default.isNull(a)?A:a,t=t||(n?n.tableHeaderCellAlign:"")||X||d||(n?n.tableCellAlign:"")||F;let m="ellipsis"===a;d="title"===a,n=!0===a||"tooltip"===a;let x=d||n||m,g=!1,h=null;i&&(h=i[0],g=i.some(e=>e.checked));a=c.index,c=c._index;let v={$table:R,$grid:O,$rowIndex:T,column:e,columnIndex:a,$columnIndex:l,_columnIndex:c,firstFilterOption:h,fixed:I,type:cellType,isHidden:p,hasFilter:g};var a={colid:u,colspan:1<e.colSpan?e.colSpan:null,rowspan:1<e.rowSpan?e.rowSpan:null},C={click:e=>R.triggerHeaderCellClickEvent(e,v),dblclick:e=>R.triggerHeaderCellDblclickEvent(e,v)},b=(N&&!x&&(m=x=!0),Y.drag&&"cell"===j.trigger);let y=!1;b&&(y=!(!ee||!ee(v))),(q||b)&&(C.mousedown=e=>R.triggerHeaderCellMousedownEvent(e,v)),Y.drag&&(C.dragstart=R.handleHeaderCellDragDragstartEvent,C.dragend=R.handleHeaderCellDragDragendEvent,C.dragover=R.handleHeaderCellDragDragoverEvent,b)&&(C.mouseup=R.handleHeaderCellDragMouseupEvent);var b=l===S.length-1,w=_xeUtils.default.isBoolean(e.resizable)?e.resizable:Y.resizable||U,H=!e.resizeWidth&&("auto"===e.minWidth||"auto"===e.width);let _=!1;D||G&&G.id===u||N&&!e.fixed&&!P.immediate&&(c<K.visibleStartIndex-K.preloadSize||c>K.visibleEndIndex+K.preloadSize)&&(_=!0);c={};return x?c.height=Z+"px":c.minHeight=Z+"px",$("th",{class:["vxe-header--column",u,{["col--"+t]:t,["col--"+r]:r,"col--last":b,"col--fixed":e.fixed,"col--group":s,"col--ellipsis":x,"fixed--width":!H,"fixed--hidden":p,"is--padding":f,"is--sortable":e.sortable,"col--filter":!!i,"is--filter-active":g,"is--drag-active":Y.drag&&!e.fixed&&!y&&(le||re||!e.parentId),"is--drag-disabled":Y.drag&&y,"col--current":L===e},(0,_utils.getClass)(o,v),(0,_utils.getClass)(z,v)],attrs:a,style:M?_xeUtils.default.isFunction(M)?M(v):M:void 0,on:C,key:k||N||B||Y.useKey||Y.drag||s?u:l},[$("div",{class:["vxe-cell",{"c--title":d,"c--tooltip":n,"c--ellipsis":m}],style:c},_||E&&p?[]:[$("div",{attrs:{colid:u},class:"vxe-cell--wrapper"},e.renderHeader($,v))]),!p&&w?$("div",{class:"vxe-cell--col-resizable",on:{mousedown:e=>R.handleColResizeMousedownEvent(e,I,v),dblclick:e=>R.handleColResizeDblclickEvent(e,v)}}):renderEmptyElement(R)])})};function renderHeads(a,t,d,i,e){let o=t.$parent;var l=o,r=o;let s=t.fixedType,n=o.computeColumnOpts,u=o.computeColumnDragOpts,{headerRowClassName:c,headerRowStyle:p}=l,{isColLoading:f,isDragColMove:m}=r;return e.map((e,l)=>{var r={$table:o,$rowIndex:l,fixed:s,type:cellType};return!f&&n.drag&&u.animation?a("transition-group",{key:l,props:{tag:"tr",name:"vxe-header--col-list"+(m?"":"-disabled"),class:["vxe-header--row",c?_xeUtils.default.isFunction(c)?c(r):c:""],style:p?_xeUtils.default.isFunction(p)?p(r):p:null}},renderRows(a,t,d,i,e,l)):a("tr",{key:l,class:["vxe-header--row",c?_xeUtils.default.isFunction(c)?c(r):c:""],style:p?_xeUtils.default.isFunction(p)?p(r):p:void 0},renderRows(a,t,d,i,e,l))})}var _default=exports.default={name:"VxeTableHeader",props:{tableData:Array,tableColumn:Array,tableGroupColumn:Array,fixedColumn:Array,fixedType:{type:String,default:null}},data(){return{headerColumn:[]}},watch:{tableColumn(){this.uploadColumn()}},created(){this.uploadColumn()},mounted(){var e=this,l=e.fixedType,r=e.$parent.elemStore,l=`${l||"main"}-header-`;r[l+"wrapper"]=e.$refs.refElem,r[l+"scroll"]=e.$refs.refHeaderScroll,r[l+"table"]=e.$refs.refHeaderTable,r[l+"colgroup"]=e.$refs.refHeaderColgroup,r[l+"list"]=e.$refs.refHeaderTHead,r[l+"xSpace"]=e.$refs.refHeaderXSpace,r[l+"repair"]=e.$refs.refHeaderBorderRepair},destroyed(){var e=this.fixedType,l=this.$parent.elemStore,e=`${e||"main"}-header-`;l[e+"wrapper"]=null,l[e+"scroll"]=null,l[e+"table"]=null,l[e+"colgroup"]=null,l[e+"list"]=null,l[e+"xSpace"]=null,l[e+"repair"]=null},render(r){let l=this.$parent;var e=l,a=l,t=l,d=l.xID;let{fixedType:i,fixedColumn:o,tableColumn:s}=this;var n=this.headerColumn,{mouseConfig:e,showHeaderOverflow:u,spanMethod:c,footerSpanMethod:p}=e,{isGroup:a,isColLoading:f,overflowX:m,scrollXLoad:x,scrollYLoad:g,dragCol:h}=a,{visibleColumn:t,fullColumnIdData:v}=t,C=l.computeMouseOpts;let b=n,y=s,w=!1;return a?y=t:(!(x||g||u)||c||p||(w=!0),f||!i&&m||(y=t),i&&w&&(y=o||[]),b=[y]),i||a||x&&h&&2<y.length&&(n=v[h.id])&&(g=n._index,u=y[0],c=y[y.length-1],p=v[u.id],f=v[c.id],p)&&f&&(m=p._index,t=f._index,g<m?(y=[h].concat(y),b=[[h].concat(b[0])].concat(b.slice(1))):t<g&&(y=y.concat([h]),b=[b[0].concat([h])].concat(b.slice(1)))),r("div",{ref:"refElem",class:["vxe-table--header-wrapper",i?`fixed-${i}--wrapper`:"body--wrapper"],attrs:{xid:d}},[r("div",{ref:"refHeaderScroll",class:"vxe-table--header-inner-wrapper",on:{scroll(e){l.triggerHeaderScrollEvent(e,i)}}},[i?renderEmptyElement(l):r("div",{ref:"refHeaderXSpace",class:"vxe-body--x-space"}),r("table",{ref:"refHeaderTable",class:"vxe-table--header",attrs:{xid:d,cellspacing:0,cellpadding:0,border:0}},[r("colgroup",{ref:"refHeaderColgroup"},y.map((e,l)=>r("col",{attrs:{name:e.id},key:l,style:{width:e.renderWidth+"px"}}))),r("thead",{ref:"refHeaderTHead"},renderHeads(r,this,a,w,b)),e&&C.area?r("div",{class:"vxe-table--cell-area"},[r("span",{class:"vxe-table--cell-main-area"}),r("span",{class:"vxe-table--cell-copy-area"}),r("span",{class:"vxe-table--cell-extend-area"}),r("span",{class:"vxe-table--cell-multi-area"}),r("span",{class:"vxe-table--cell-active-area"}),r("span",{class:"vxe-table--cell-col-status-area"})]):renderEmptyElement(l)])])])},methods:{uploadColumn(){var e=this.$parent.isGroup;this.headerColumn=e?(0,_util.convertHeaderColumnToRows)(this.tableGroupColumn):[]}}};

package/lib/table/src/methods.js

@@ -378,6 +378,116 @@ const updateScrollYStatus = ($xeTable, fullData) => {
   reactData.scrollYLoad = scrollYLoad;
   return scrollYLoad;
 };
+/**
+ * 展开与收起树节点
+ * @param rows
+ * @param expanded
+ * @returns
+ */
+function handleBaseTreeExpand($xeTable, rows, expanded) {
+  const reactData = $xeTable;
+  const internalData = $xeTable;
+  const {
+    treeNodeColumn
+  } = reactData;
+  const {
+    fullAllDataRowIdData,
+    tableFullData,
+    treeExpandedMaps,
+    treeExpandLazyLoadedMaps
+  } = internalData;
+  const treeOpts = $xeTable.computeTreeOpts;
+  const {
+    reserve,
+    lazy,
+    accordion,
+    toggleMethod
+  } = treeOpts;
+  const childrenField = treeOpts.children || treeOpts.childrenField;
+  const hasChildField = treeOpts.hasChild || treeOpts.hasChildField;
+  const result = [];
+  const columnIndex = $xeTable.getColumnIndex(treeNodeColumn);
+  const $columnIndex = $xeTable.getVMColumnIndex(treeNodeColumn);
+  const {
+    handleGetRowId
+  } = (0, _util.createHandleGetRowId)($xeTable);
+  let validRows = toggleMethod ? rows.filter(row => toggleMethod({
+    $table: $xeTable,
+    expanded,
+    column: treeNodeColumn,
+    columnIndex,
+    $columnIndex,
+    row
+  })) : rows;
+  if (accordion) {
+    validRows = validRows.length ? [validRows[validRows.length - 1]] : [];
+    // 同一级只能展开一个
+    const matchObj = _xeUtils.default.findTree(tableFullData, item => item === validRows[0], {
+      children: childrenField
+    });
+    if (matchObj) {
+      matchObj.items.forEach(item => {
+        const rowid = handleGetRowId(item);
+        if (treeExpandedMaps[rowid]) {
+          delete treeExpandedMaps[rowid];
+        }
+      });
+    }
+  }
+  if (expanded) {
+    validRows.forEach(row => {
+      const rowid = handleGetRowId(row);
+      if (!treeExpandedMaps[rowid]) {
+        const rowRest = fullAllDataRowIdData[rowid];
+        if (rowRest) {
+          const isLoad = lazy && row[hasChildField] && !rowRest.treeLoaded && !treeExpandLazyLoadedMaps[rowid];
+          // 是否使用懒加载
+          if (isLoad) {
+            result.push(handleAsyncTreeExpandChilds($xeTable, row));
+          } else {
+            if (row[childrenField] && row[childrenField].length) {
+              treeExpandedMaps[rowid] = row;
+            }
+          }
+        }
+      }
+    });
+  } else {
+    validRows.forEach(item => {
+      const rowid = handleGetRowId(item);
+      if (treeExpandedMaps[rowid]) {
+        delete treeExpandedMaps[rowid];
+      }
+    });
+  }
+  if (reserve) {
+    validRows.forEach(row => handleTreeExpandReserve($xeTable, row, expanded));
+  }
+  reactData.treeExpandedFlag++;
+  return Promise.all(result).then(() => {
+    return $xeTable.recalculate();
+  });
+}
+/**
+ * 虚拟树的展开与收起
+ * @param rows
+ * @param expanded
+ * @returns
+ */
+function handleVirtualTreeExpand($xeTable, rows, expanded) {
+  return handleBaseTreeExpand($xeTable, rows, expanded).then(() => {
+    handleVirtualTreeToList($xeTable);
+    $xeTable.handleTableData();
+    updateAfterDataIndex($xeTable);
+    return $xeTable.$nextTick();
+  }).then(() => {
+    return $xeTable.recalculate(true);
+  }).then(() => {
+    setTimeout(() => {
+      $xeTable.updateCellAreas();
+    }, 30);
+  });
+}
 function updateAfterListIndex($xeTable) {
   const props = $xeTable;
   const internalData = $xeTable;
@@ -3347,7 +3457,11 @@ const Methods = {
       handleReserveStatus($xeTable);
       $xeTable.checkSelectionStatus();
       return new Promise(resolve => {
-        this.$nextTick().then(() => $xeTable.recalculate()).then(() => {
+        this.$nextTick().then(() => handleRecalculateLayout($xeTable, false)).then(() => {
+          calcCellHeight($xeTable);
+          updateRowOffsetTop($xeTable);
+          return handleRecalculateLayout($xeTable, false);
+        }).then(() => {
           let targetScrollLeft = lastScrollLeft;
           let targetScrollTop = lastScrollTop;
           const virtualXOpts = $xeTable.computeVirtualXOpts;
@@ -3360,8 +3474,7 @@ const Methods = {
             targetScrollTop = 0;
           }
           reactData.isRowLoading = false;
-          calcCellHeight($xeTable);
-          updateRowOffsetTop($xeTable);
+          handleRecalculateLayout($xeTable, false);
           // 是否变更虚拟滚动
           if (oldScrollYLoad === sYLoad) {
             (0, _util.restoreScrollLocation)($xeTable, targetScrollLeft, targetScrollTop).then(() => {
@@ -7506,6 +7619,12 @@ const Methods = {
     const {
       column: newValue
     } = params;
+    const {
+      trigger
+    } = currentColumnOpts;
+    if (trigger === 'manual') {
+      return;
+    }
     const isChange = oldValue !== newValue;
     if (!beforeRowMethod || beforeRowMethod({
       column: newValue,
@@ -7534,6 +7653,12 @@ const Methods = {
     const {
       row: newValue
     } = params;
+    const {
+      trigger
+    } = currentRowOpts;
+    if (trigger === 'manual') {
+      return;
+    }
     const isChange = oldValue !== newValue;
     if (!beforeRowMethod || beforeRowMethod({
       row: newValue,
@@ -9325,8 +9450,8 @@ const Methods = {
         columnIndex,
         $columnIndex,
         row,
-        rowIndex: this.getRowIndex(row),
-        $rowIndex: this.getVMRowIndex(row)
+        rowIndex: $xeTable.getRowIndex(row),
+        $rowIndex: $xeTable.getVMRowIndex(row)
       })) : rows;
       if (expanded) {
         validRows.forEach(row => {
@@ -9551,7 +9676,8 @@ const Methods = {
     const $xeTable = this;
     const internalData = $xeTable;
     const {
-      treeExpandLazyLoadedMaps
+      treeExpandLazyLoadedMaps,
+      treeEATime
     } = internalData;
     const treeOpts = $xeTable.computeTreeOpts;
     const {
@@ -9560,7 +9686,8 @@ const Methods = {
     } = params;
     const {
       lazy,
-      trigger
+      trigger,
+      accordion
     } = treeOpts;
     if (trigger === 'manual') {
       return;
@@ -9571,7 +9698,17 @@ const Methods = {
       const expanded = !$xeTable.isTreeExpandByRow(row);
       const columnIndex = $xeTable.getColumnIndex(column);
       const $columnIndex = $xeTable.getVMColumnIndex(column);
-      $xeTable.setTreeExpand(row, expanded);
+      if (treeEATime) {
+        clearTimeout(treeEATime);
+      }
+      $xeTable.setTreeExpand(row, expanded).then(() => {
+        if (accordion) {
+          internalData.treeEATime = setTimeout(() => {
+            internalData.treeEATime = undefined;
+            $xeTable.scrollToRow(row);
+          }, 30);
+        }
+      });
       $xeTable.dispatchEvent('toggle-tree-expand', {
         expanded,
         column,
@@ -9611,117 +9748,6 @@ const Methods = {
     });
     return this.setTreeExpand(expandeds, expanded);
   },
-  /**
-   * 默认，展开与收起树节点
-   * @param rows
-   * @param expanded
-   * @returns
-   */
-  handleBaseTreeExpand(rows, expanded) {
-    const $xeTable = this;
-    const reactData = $xeTable;
-    const internalData = $xeTable;
-    const {
-      treeNodeColumn
-    } = reactData;
-    const {
-      fullAllDataRowIdData,
-      tableFullData,
-      treeExpandedMaps,
-      treeExpandLazyLoadedMaps
-    } = internalData;
-    const treeOpts = $xeTable.computeTreeOpts;
-    const {
-      reserve,
-      lazy,
-      accordion,
-      toggleMethod
-    } = treeOpts;
-    const childrenField = treeOpts.children || treeOpts.childrenField;
-    const hasChildField = treeOpts.hasChild || treeOpts.hasChildField;
-    const result = [];
-    const columnIndex = $xeTable.getColumnIndex(treeNodeColumn);
-    const $columnIndex = $xeTable.getVMColumnIndex(treeNodeColumn);
-    const {
-      handleGetRowId
-    } = (0, _util.createHandleGetRowId)($xeTable);
-    let validRows = toggleMethod ? rows.filter(row => toggleMethod({
-      $table: $xeTable,
-      expanded,
-      column: treeNodeColumn,
-      columnIndex,
-      $columnIndex,
-      row
-    })) : rows;
-    if (accordion) {
-      validRows = validRows.length ? [validRows[validRows.length - 1]] : [];
-      // 同一级只能展开一个
-      const matchObj = _xeUtils.default.findTree(tableFullData, item => item === validRows[0], {
-        children: childrenField
-      });
-      if (matchObj) {
-        matchObj.items.forEach(item => {
-          const rowid = handleGetRowId(item);
-          if (treeExpandedMaps[rowid]) {
-            delete treeExpandedMaps[rowid];
-          }
-        });
-      }
-    }
-    if (expanded) {
-      validRows.forEach(row => {
-        const rowid = handleGetRowId(row);
-        if (!treeExpandedMaps[rowid]) {
-          const rowRest = fullAllDataRowIdData[rowid];
-          if (rowRest) {
-            const isLoad = lazy && row[hasChildField] && !rowRest.treeLoaded && !treeExpandLazyLoadedMaps[rowid];
-            // 是否使用懒加载
-            if (isLoad) {
-              result.push(handleAsyncTreeExpandChilds($xeTable, row));
-            } else {
-              if (row[childrenField] && row[childrenField].length) {
-                treeExpandedMaps[rowid] = row;
-              }
-            }
-          }
-        }
-      });
-    } else {
-      validRows.forEach(item => {
-        const rowid = handleGetRowId(item);
-        if (treeExpandedMaps[rowid]) {
-          delete treeExpandedMaps[rowid];
-        }
-      });
-    }
-    if (reserve) {
-      validRows.forEach(row => handleTreeExpandReserve($xeTable, row, expanded));
-    }
-    reactData.treeExpandedFlag++;
-    return Promise.all(result).then(() => {
-      return $xeTable.recalculate();
-    });
-  },
-  /**
-   * 虚拟树的展开与收起
-   * @param rows
-   * @param expanded
-   * @returns
-   */
-  handleVirtualTreeExpand(rows, expanded) {
-    const $xeTable = this;
-    return this.handleBaseTreeExpand(rows, expanded).then(() => {
-      handleVirtualTreeToList($xeTable);
-      this.handleTableData();
-      updateAfterDataIndex($xeTable);
-    }).then(() => {
-      return this.recalculate();
-    }).then(() => {
-      setTimeout(() => {
-        this.updateCellAreas();
-      }, 30);
-    });
-  },
   /**
    * 设置展开树形节点，二个参数设置这一行展开与否
    * 支持单行
@@ -9730,6 +9756,7 @@ const Methods = {
    * @param {Boolean} expanded 是否展开
    */
   setTreeExpand(rows, expanded) {
+    const $xeTable = this;
     const {
       treeOpts
     } = this;
@@ -9743,9 +9770,9 @@ const Methods = {
       if (rows.length) {
         // 如果为虚拟树
         if (transform) {
-          return this.handleVirtualTreeExpand(rows, expanded);
+          return handleVirtualTreeExpand($xeTable, rows, expanded);
         } else {
-          return this.handleBaseTreeExpand(rows, expanded);
+          return handleBaseTreeExpand($xeTable, rows, expanded);
         }
       }
     }
@@ -10453,7 +10480,8 @@ const Methods = {
       if (isScrollXBig && mouseOpts.area) {
         (0, _log.errLog)('vxe.error.notProp', ['mouse-config.area']);
       }
-      $xeTable.$nextTick(() => {
+      calcScrollbar($xeTable);
+      return $xeTable.$nextTick(() => {
         updateStyle($xeTable);
       });
     }
@@ -10572,6 +10600,7 @@ const Methods = {
     if (isScrollYBig && mouseOpts.area) {
       (0, _log.errLog)('vxe.error.notProp', ['mouse-config.area']);
     }
+    calcScrollbar($xeTable);
     return $xeTable.$nextTick().then(() => {
       updateStyle($xeTable);
     });