vxe-table 3.19.16 → 3.19.17

package/lib/table/src/methods.js

@@ -3926,7 +3926,7 @@ function loadTableData($xeTable, datas, isReset) {
             handleRecalculateStyle($xeTable, false, true, true);
             updateRowOffsetTop($xeTable);
             updateTreeLineStyle($xeTable);
-            resolve();
+            $xeTable.$nextTick(() => resolve());
           });
         } else {
           setTimeout(() => {
@@ -3934,7 +3934,7 @@ function loadTableData($xeTable, datas, isReset) {
               handleRecalculateStyle($xeTable, false, true, true);
               updateRowOffsetTop($xeTable);
               updateTreeLineStyle($xeTable);
-              resolve();
+              $xeTable.$nextTick(() => resolve());
             });
           });
         }
@@ -4387,48 +4387,67 @@ function lazyScrollYData($xeTable) {
     loadScrollYData($xeTable);
   }, fpsTime);
 }
+function handleSyncScroll($xeTable, isRollX, isRollY) {
+  const reactData = $xeTable;
+  const internalData = $xeTable;
+  const {
+    scrollXLoad,
+    scrollYLoad,
+    isAllOverflow
+  } = reactData;
+  internalData.lcsRunTime = Date.now();
+  internalData.lcsTimeout = undefined;
+  internalData.intoRunScroll = false;
+  internalData.inVirtualScroll = false;
+  internalData.inWheelScroll = false;
+  internalData.inHeaderScroll = false;
+  internalData.inBodyScroll = false;
+  internalData.inFooterScroll = false;
+  reactData.lazScrollLoading = false;
+  internalData.scrollRenderType = '';
+  let xRest = null;
+  let yRest = null;
+  if (!isAllOverflow) {
+    calcCellHeight($xeTable);
+    updateRowOffsetTop($xeTable);
+  }
+  if (isRollX && scrollXLoad) {
+    xRest = $xeTable.updateScrollXData();
+  }
+  if (isRollY && scrollYLoad) {
+    yRest = $xeTable.updateScrollYData().then(() => {
+      if (!isAllOverflow) {
+        calcCellHeight($xeTable);
+        updateRowOffsetTop($xeTable);
+      }
+      return $xeTable.updateScrollYSpace();
+    });
+  }
+  updateRowExpandStyle($xeTable);
+  return Promise.all([xRest, yRest, $xeTable.updateCellAreas()]);
+}
 function checkLastSyncScroll($xeTable, isRollX, isRollY) {
   const reactData = $xeTable;
   const internalData = $xeTable;
   const {
     lcsTimeout
   } = internalData;
+  reactData.lazScrollLoading = true;
   if (lcsTimeout) {
     clearTimeout(lcsTimeout);
   }
   internalData.lcsTimeout = setTimeout(() => {
-    const {
-      scrollXLoad,
-      scrollYLoad,
-      isAllOverflow
-    } = reactData;
-    internalData.lcsRunTime = Date.now();
-    internalData.lcsTimeout = undefined;
-    internalData.intoRunScroll = false;
-    internalData.inVirtualScroll = false;
-    internalData.inWheelScroll = false;
-    internalData.inHeaderScroll = false;
-    internalData.inBodyScroll = false;
-    internalData.inFooterScroll = false;
-    internalData.scrollRenderType = '';
-    if (!isAllOverflow) {
-      calcCellHeight($xeTable);
-      updateRowOffsetTop($xeTable);
-    }
-    if (isRollX && scrollXLoad) {
-      $xeTable.updateScrollXData();
-    }
-    if (isRollY && scrollYLoad) {
-      $xeTable.updateScrollYData().then(() => {
-        if (!isAllOverflow) {
-          calcCellHeight($xeTable);
-          updateRowOffsetTop($xeTable);
-        }
-        $xeTable.updateScrollYSpace();
-      });
-    }
-    $xeTable.updateCellAreas();
-  }, 250);
+    handleSyncScroll($xeTable, isRollX, isRollY).then(() => {
+      if (reactData.scrollXLoad || reactData.scrollYLoad) {
+        $xeTable.$nextTick(() => {
+          updateRowExpandStyle($xeTable);
+          if (!internalData.lcsTimeout) {
+            handleSyncScroll($xeTable, isRollX, isRollY);
+          }
+        });
+      }
+    });
+  }, 200);
 }
 const getWheelSpeed = lastScrollTime => {
   let multiple = 1;
@@ -10352,6 +10371,8 @@ const Methods = {
         return errRest;
       });
     }
+    clearRowDragData($xeTable);
+    clearCrossTableDragStatus($xeTable);
     return Promise.resolve(errRest);
   },
   handleCrossTableRowDragCancelEvent() {
@@ -10892,6 +10913,8 @@ const Methods = {
       const isDragToChildFlag = isSelfToChildDrag && dragToChildMethod ? dragToChildMethod(dragParams) : prevDragToChild;
       return Promise.resolve(dragEndMethod ? dragEndMethod(dragParams) : true).then(status => {
         if (!status) {
+          clearColDragData($xeTable);
+          clearCrossTableDragStatus($xeTable);
           return errRest;
         }
         let dragTargetColumn = null;
@@ -11146,6 +11169,8 @@ const Methods = {
         return errRest;
       });
     }
+    clearColDragData($xeTable);
+    clearCrossTableDragStatus($xeTable);
     return Promise.resolve(errRest);
   },
   handleHeaderCellDragDragendEvent(evnt) {
@@ -13422,7 +13447,7 @@ const Methods = {
       $xeGanttView.handleUpdateSYSpace();
     }
     return $xeTable.$nextTick().then(() => {
-      updateStyle($xeTable);
+      return updateStyle($xeTable);
     });
   },
   updateScrollYStatus() {