vxe-table 3.13.0-beta.9 → 3.13.0

package/lib/table/src/methods.js

@@ -364,7 +364,11 @@ const updateScrollYStatus = ($xeTable, fullData) => {
   return scrollYLoad;
 };
 function updateAfterListIndex($xeTable) {
+  const props = $xeTable;
   const internalData = $xeTable;
+  const {
+    treeConfig
+  } = props;
   const {
     afterFullData,
     fullDataRowIdData,
@@ -376,7 +380,9 @@ function updateAfterListIndex($xeTable) {
     const rowRest = fullAllDataRowIdData[rowid];
     const seq = index + 1;
     if (rowRest) {
-      rowRest.seq = seq;
+      if (!treeConfig) {
+        rowRest.seq = seq;
+      }
       rowRest._index = index;
     } else {
       const rest = {
@@ -2243,6 +2249,17 @@ function updateRowExpandStyle($xeTable) {
     }
   }
 }
+function handleRowExpandScroll($xeTable) {
+  const internalData = $xeTable;
+  const {
+    elemStore
+  } = internalData;
+  const rowExpandEl = $xeTable.$refs.refRowExpandElem;
+  const bodyScrollElem = (0, _util.getRefElem)(elemStore['main-body-scroll']);
+  if (rowExpandEl && bodyScrollElem) {
+    rowExpandEl.scrollTop = bodyScrollElem.scrollTop;
+  }
+}
 const Methods = {
   callSlot(slotFunc, params, h, vNodes) {
     if (slotFunc) {
@@ -6325,7 +6342,7 @@ const Methods = {
         const isSelected = sLen >= vLen;
         const halfSelect = !isSelected && (sLen >= 1 || hLen >= 1);
         if (checkField) {
-          _xeUtils.default.get(row, checkField, isSelected);
+          _xeUtils.default.set(row, checkField, isSelected);
         }
         if (isSelected) {
           if (!checkField) {
@@ -8561,7 +8578,7 @@ const Methods = {
       fullAllDataRowIdData,
       rowExpandLazyLoadedMaps,
       expandOpts,
-      expandColumn: column
+      expandColumn
     } = this;
     let rExpandedMaps = Object.assign({}, rowExpandedMaps);
     const {
@@ -8571,8 +8588,8 @@ const Methods = {
       toggleMethod
     } = expandOpts;
     const lazyRests = [];
-    const columnIndex = this.getColumnIndex(column);
-    const $columnIndex = this.getVMColumnIndex(column);
+    const columnIndex = $xeTable.getColumnIndex(expandColumn);
+    const $columnIndex = $xeTable.getVMColumnIndex(expandColumn);
     if (rows) {
       if (!_xeUtils.default.isArray(rows)) {
         rows = [rows];
@@ -8584,7 +8601,7 @@ const Methods = {
       }
       const validRows = toggleMethod ? rows.filter(row => toggleMethod({
         expanded,
-        column,
+        column: expandColumn,
         columnIndex,
         $columnIndex,
         row,
@@ -8617,7 +8634,13 @@ const Methods = {
       }
     }
     this.rowExpandedMaps = rExpandedMaps;
-    return Promise.all(lazyRests).then(() => $xeTable.recalculate()).then(() => $xeTable.updateCellAreas());
+    return Promise.all(lazyRests).then(() => $xeTable.recalculate()).then(() => {
+      if (expandColumn) {
+        updateRowExpandStyle($xeTable);
+        handleRowExpandScroll($xeTable);
+      }
+      return $xeTable.updateCellAreas();
+    });
   },
   /**
    * 判断行是否为展开状态