vxe-table 3.17.0-beta.1 → 3.17.0-beta.2

package/lib/table/src/methods.js

@@ -607,6 +607,38 @@ function handleRowGroupVirtualExpand($xeTable, rows, expanded) {
     }, 30);
   });
 }
+/**
+ * 处理默认展开分组行
+ */
+function handleDefaultRowGroupExpand($xeTable) {
+  const reactData = $xeTable;
+  const internalData = $xeTable;
+  const {
+    isRowGroupStatus
+  } = reactData;
+  if (isRowGroupStatus) {
+    const {
+      fullDataRowIdData
+    } = internalData;
+    const aggregateOpts = $xeTable.computeAggregateOpts;
+    const {
+      expandAll,
+      expandRowKeys
+    } = aggregateOpts;
+    if (expandAll) {
+      $xeTable.setAllRowGroupExpand(true);
+    } else if (expandRowKeys) {
+      const defExpandeds = [];
+      expandRowKeys.forEach(rowid => {
+        const rowRest = fullDataRowIdData[rowid];
+        if (rowRest) {
+          defExpandeds.push(rowRest.row);
+        }
+      });
+      $xeTable.setRowGroupExpand(defExpandeds, true);
+    }
+  }
+}
 function updateAfterListIndex($xeTable) {
   const props = $xeTable;
   const internalData = $xeTable;
@@ -3514,6 +3546,13 @@ function loadTableData($xeTable, datas, isReset) {
         }
         reactData.isRowLoading = false;
         handleRecalculateStyle($xeTable, false, false, false);
+        // 如果是自动行高，特殊情况需调用 recalculate 手动刷新
+        if (!props.showOverflow) {
+          setTimeout(() => {
+            handleLazyRecalculate($xeTable, false, true, true);
+            setTimeout(() => handleLazyRecalculate($xeTable, false, true, true), 3000);
+          }, 2000);
+        }
         // 是否变更虚拟滚动
         if (oldScrollYLoad === sYLoad) {
           (0, _util.restoreScrollLocation)($xeTable, targetScrollLeft, targetScrollTop).then(() => {
@@ -3543,6 +3582,7 @@ function handleLoadDefaults($xeTable) {
   handleDefaultRadioChecked($xeTable);
   handleDefaultRowExpand($xeTable);
   handleDefaultTreeExpand($xeTable);
+  handleDefaultRowGroupExpand($xeTable);
   handleDefaultMergeCells($xeTable);
   handleDefaultMergeFooterItems($xeTable);
   $xeTable.$nextTick(() => setTimeout(() => $xeTable.recalculate()));
@@ -6116,7 +6156,6 @@ const Methods = {
       scrollbarHeight
     } = reactData;
     const {
-      elemStore,
       visibleColumn
     } = internalData;
     const {
@@ -6141,26 +6180,31 @@ const Methods = {
     } = evnt;
     const dragBtnElem = evnt.target;
     let resizeColumn = column;
-    if (column.children && column.children.length) {
+    const isDragGroupCol = column.children && column.children.length;
+    if (isDragGroupCol) {
       _xeUtils.default.eachTree(column.children, childColumn => {
         resizeColumn = childColumn;
       });
     }
-    const cell = dragBtnElem.parentNode;
-    const cellParams = Object.assign(params, {
+    let cell = dragBtnElem.parentElement;
+    if (isDragGroupCol) {
+      const trEl = cell ? cell.parentElement : null;
+      const theadEl = trEl ? trEl.parentElement : null;
+      cell = theadEl ? theadEl.querySelector(`.vxe-header--column[colid="${resizeColumn.id}"]`) : null;
+    }
+    if (!cell) {
+      return;
+    }
+    const cellParams = _xeUtils.default.assign(params, {
       cell
     });
     let dragLeft = 0;
-    const bodyScrollElem = (0, _util.getRefElem)(elemStore['main-body-scroll']);
-    if (!bodyScrollElem) {
-      return;
-    }
     const tableRect = tableEl.getBoundingClientRect();
     const rightContainerRect = rightContainerElem ? rightContainerElem.getBoundingClientRect() : null;
     const cellRect = cell.getBoundingClientRect();
     const dragBtnRect = dragBtnElem.getBoundingClientRect();
     const dragBtnWidth = dragBtnElem.clientWidth;
-    const dragBtnOffsetWidth = Math.floor(dragBtnWidth / 2);
+    const dragBtnOffsetWidth = _xeUtils.default.floor(dragBtnWidth / 2);
     const dragPosLeft = dragBtnRect.x - tableRect.x + dragBtnOffsetWidth;
     const minInterval = (0, _util.getColReMinWidth)(cellParams) - dragBtnOffsetWidth; // 列之间的最小间距
     const dragMinLeft = isRightFixed ? 0 : cellRect.x - tableRect.x + dragBtnWidth + minInterval;
@@ -10115,8 +10159,7 @@ const Methods = {
   },
   setSort(sortConfs, isUpdate) {
     const $xeTable = this;
-    // 已废弃，即将去掉事件触发 new Event('click') -> null
-    return handleSortEvent($xeTable, new Event('click'), sortConfs, isUpdate);
+    return handleSortEvent($xeTable, null, sortConfs, isUpdate);
   },
   setSortByEvent(evnt, sortConfs, isUpdate) {
     const $xeTable = this;
@@ -11909,8 +11952,6 @@ const Methods = {
   },
   /**
    * 如果有滚动条，则滚动到对应的位置
-   * @param {Number} scrollLeft 左距离
-   * @param {Number} scrollTop 上距离
    */
   scrollTo(scrollLeft, scrollTop) {
     const $xeTable = this;
@@ -11927,6 +11968,12 @@ const Methods = {
     const xHandleEl = $xeTable.$refs.refScrollXHandleElem;
     const yHandleEl = $xeTable.$refs.refScrollYHandleElem;
     internalData.intoRunScroll = true;
+    if (scrollLeft) {
+      if (!_xeUtils.default.isNumber(scrollLeft)) {
+        scrollTop = scrollLeft.top;
+        scrollLeft = scrollLeft.left;
+      }
+    }
     if (_xeUtils.default.isNumber(scrollLeft)) {
       (0, _dom.setScrollLeft)(xHandleEl, scrollLeft);
       (0, _dom.setScrollLeft)(bodyScrollElem, scrollLeft);