vxe-table 4.10.0-beta.7 → 4.10.0-beta.8

package/lib/index.umd.js

@@ -1998,7 +1998,7 @@ function eqEmptyValue(cellValue) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "4.10.0-beta.7";
+const version = "4.10.0-beta.8";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2414,7 +2414,7 @@ var es_array_push = __webpack_require__(4114);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"4.10.0-beta.7"}`;
+const log_version = `table v${"4.10.0-beta.8"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -2837,14 +2837,16 @@ const convertHeaderColumnToRows = originColumns => {
   return rows;
 };
 function restoreScrollLocation($xeTable, scrollLeft, scrollTop) {
-  const {
-    internalData
-  } = $xeTable;
+  const internalData = $xeTable.internalData;
   return $xeTable.clearScroll().then(() => {
     if (scrollLeft || scrollTop) {
       // 重置最后滚动状态
       internalData.lastScrollLeft = 0;
       internalData.lastScrollTop = 0;
+      internalData.inVirtualScroll = false;
+      internalData.inBodyScroll = false;
+      internalData.inFooterScroll = false;
+      internalData.bodyScrollType = '';
       // 还原滚动状态
       return $xeTable.scrollTo(scrollLeft, scrollTop);
     }
@@ -12120,7 +12122,6 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       editStore.insertMaps = {};
       editStore.removeMaps = {};
       const sYLoad = updateScrollYStatus(fullData);
-      reactData.scrollYLoad = sYLoad;
       reactData.isDragRowMove = false;
       // 全量数据
       internalData.tableFullData = fullData;
@@ -12722,15 +12723,18 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
     };
     const scrollXEvent = evnt => {
       const {
+        intoRunScroll,
         inFooterScroll,
         inBodyScroll,
         lastScrollTop
       } = internalData;
-      if (inFooterScroll) {
-        return;
-      }
-      if (inBodyScroll) {
-        return;
+      if (!intoRunScroll) {
+        if (inFooterScroll) {
+          return;
+        }
+        if (inBodyScroll) {
+          return;
+        }
       }
       const tableHeader = refTableHeader.value;
       const tableBody = refTableBody.value;
@@ -12762,15 +12766,18 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
     };
     const scrollYEvent = evnt => {
       const {
+        intoRunScroll,
         inFooterScroll,
         inBodyScroll,
         lastScrollLeft
       } = internalData;
-      if (inFooterScroll) {
-        return;
-      }
-      if (inBodyScroll) {
-        return;
+      if (!intoRunScroll) {
+        if (inFooterScroll) {
+          return;
+        }
+        if (inBodyScroll) {
+          return;
+        }
       }
       const tableBody = refTableBody.value;
       const leftBody = refTableLeftBody.value;
@@ -12815,8 +12822,8 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         internalData.lcsTimeout = undefined;
         internalData.inVirtualScroll = false;
         internalData.inBodyScroll = false;
-        internalData.bodyScrollType = '';
         internalData.inFooterScroll = false;
+        internalData.bodyScrollType = '';
         if (isRollX && scrollXLoad) {
           tablePrivateMethods.updateScrollXData();
         }
@@ -15037,6 +15044,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         const rightBodyElem = rightBody ? rightBody.$el : null;
         const tableHeaderElem = tableHeader ? tableHeader.$el : null;
         const tableFooterElem = tableFooter ? tableFooter.$el : null;
+        internalData.intoRunScroll = true;
         if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(scrollLeft)) {
           const xHandleEl = refScrollXHandleElem.value;
           if (xHandleEl) {
@@ -15061,6 +15069,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           return new Promise(resolve => {
             setTimeout(() => {
               (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)(() => {
+                internalData.intoRunScroll = false;
                 resolve();
               });
             }, 30);
@@ -18472,7 +18481,6 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         const {
           showOverflow
         } = props;
-        // reactData.tableColumn = []
         return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)().then(() => {
           handleTableColumn();
           calcCellHeight();
@@ -18483,7 +18491,6 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         });
       },
       updateScrollYData() {
-        // reactData.tableData = []
         return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)().then(() => {
           tablePrivateMethods.handleTableData();
           calcCellHeight();