vxe-table 3.19.16 → 3.19.18

package/es/table/src/methods.js

@@ -3311,7 +3311,7 @@ function loadTableData($xeTable, datas, isReset) {
                         handleRecalculateStyle($xeTable, false, true, true);
                         updateRowOffsetTop($xeTable);
                         updateTreeLineStyle($xeTable);
-                        resolve();
+                        $xeTable.$nextTick(() => resolve());
                     });
                 }
                 else {
@@ -3321,7 +3321,7 @@ function loadTableData($xeTable, datas, isReset) {
                             handleRecalculateStyle($xeTable, false, true, true);
                             updateRowOffsetTop($xeTable);
                             updateTreeLineStyle($xeTable);
-                            resolve();
+                            $xeTable.$nextTick(() => resolve());
                         });
                     });
                 }
@@ -3693,42 +3693,65 @@ 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;
@@ -8867,6 +8890,8 @@ const Methods = {
                 return errRest;
             });
         }
+        clearRowDragData($xeTable);
+        clearCrossTableDragStatus($xeTable);
         return Promise.resolve(errRest);
     },
     handleCrossTableRowDragCancelEvent() {
@@ -9318,6 +9343,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;
@@ -9565,6 +9592,8 @@ const Methods = {
                 return errRest;
             });
         }
+        clearColDragData($xeTable);
+        clearCrossTableDragStatus($xeTable);
         return Promise.resolve(errRest);
     },
     handleHeaderCellDragDragendEvent(evnt) {
@@ -11521,7 +11550,7 @@ const Methods = {
             $xeGanttView.handleUpdateSYSpace();
         }
         return $xeTable.$nextTick().then(() => {
-            updateStyle($xeTable);
+            return updateStyle($xeTable);
         });
     },
     updateScrollYStatus() {

package/es/table/src/table.js

@@ -2141,7 +2141,10 @@ export default {
             h('div', {
                 key: 'tn',
                 ref: 'refEmptyPlaceholder',
-                class: 'vxe-table--empty-place-wrapper'
+                class: 'vxe-table--empty-place-wrapper',
+                attrs: {
+                    xid: xID
+                }
             }, [
                 h('div', {
                     class: 'vxe-table--empty-placeholder'

package/es/table/style.css

@@ -3514,12 +3514,12 @@
   text-align: center;
   overflow: hidden;
   width: 100%;
-  pointer-events: none;
   outline: 0;
 }
 .vxe-table--render-default .vxe-table--empty-block {
   display: none;
   visibility: hidden;
+  pointer-events: none;
 }
 .vxe-table--render-default .vxe-table--empty-place-wrapper {
   display: none;
@@ -3528,6 +3528,7 @@
   top: 0;
   z-index: 5;
   overflow: hidden;
+  pointer-events: none;
 }
 .vxe-table--render-default .vxe-table--empty-placeholder {
   display: flex;