vxe-table 3.16.0-beta.4 → 3.16.0-beta.5

package/es/table/src/methods.js

@@ -2634,7 +2634,7 @@ function handleLazyRecalculate($xeTable, reFull, reWidth, reHeight) {
         if (rceTimeout) {
             clearTimeout(rceTimeout);
             if (rceRunTime && rceRunTime + (refreshDelay - 5) < Date.now()) {
-                resolve(handleRecalculateStyle($xeTable, !!reFull, reWidth, reHeight));
+                resolve(handleRecalculateStyle($xeTable, reFull, reWidth, reHeight));
             }
             else {
                 $xeTable.$nextTick(() => {
@@ -2643,11 +2643,11 @@ function handleLazyRecalculate($xeTable, reFull, reWidth, reHeight) {
             }
         }
         else {
-            resolve(handleRecalculateStyle($xeTable, !!reFull, reWidth, reHeight));
+            resolve(handleRecalculateStyle($xeTable, reFull, reWidth, reHeight));
         }
         internalData.rceTimeout = setTimeout(() => {
             internalData.rceTimeout = undefined;
-            handleRecalculateStyle($xeTable, !!reFull, reWidth, reHeight);
+            handleRecalculateStyle($xeTable, reFull, reWidth, reHeight);
         }, refreshDelay);
     });
 }
@@ -2935,9 +2935,8 @@ function loadTableData($xeTable, datas, isReset) {
             $xeTable.$nextTick()
                 .then(() => handleRecalculateStyle($xeTable, false, false, false))
                 .then(() => {
-                calcCellHeight($xeTable);
+                handleRecalculateStyle($xeTable, false, true, true);
                 updateRowOffsetTop($xeTable);
-                return handleRecalculateStyle($xeTable, false, false, false);
             })
                 .then(() => {
                 let targetScrollLeft = lastScrollLeft;
@@ -2957,7 +2956,7 @@ function loadTableData($xeTable, datas, isReset) {
                 if (oldScrollYLoad === sYLoad) {
                     restoreScrollLocation($xeTable, targetScrollLeft, targetScrollTop)
                         .then(() => {
-                        calcCellHeight($xeTable);
+                        handleRecalculateStyle($xeTable, false, true, true);
                         updateRowOffsetTop($xeTable);
                         resolve();
                     });
@@ -2966,7 +2965,7 @@ function loadTableData($xeTable, datas, isReset) {
                     setTimeout(() => {
                         restoreScrollLocation($xeTable, targetScrollLeft, targetScrollTop)
                             .then(() => {
-                            calcCellHeight($xeTable);
+                            handleRecalculateStyle($xeTable, false, true, true);
                             updateRowOffsetTop($xeTable);
                             resolve();
                         });
@@ -3228,7 +3227,7 @@ function handleColumn($xeTable, collectColumn) {
                 $xeTable.handleUpdateCustomColumn();
             }
             reactData.isColLoading = false;
-            return $xeTable.recalculate();
+            return handleLazyRecalculate($xeTable, false, true, true);
         });
     });
 }

package/es/table/src/table.js

@@ -1772,24 +1772,24 @@ export default {
                     errLog('vxe.error.reqComp', ['vxe-tooltip']);
                 }
             }
+            if (this.autoResize) {
+                const resizeObserver = globalResize.create(() => {
+                    if (this.autoResize) {
+                        this.recalculate(true);
+                    }
+                });
+                resizeObserver.observe(this.$el);
+                resizeObserver.observe(this.getParentElem());
+                this.$resize = resizeObserver;
+            }
         });
-        if (this.autoResize) {
-            const resizeObserver = globalResize.create(() => {
-                if (this.autoResize) {
-                    this.recalculate(true);
-                }
-            });
-            resizeObserver.observe(this.$el);
-            resizeObserver.observe(this.getParentElem());
-            this.$resize = resizeObserver;
-        }
         if (virtualYOpts.mode !== 'scroll') {
             const tableViewportEl = $xeTable.$refs.refTableViewportElem;
             if (tableViewportEl) {
                 tableViewportEl.addEventListener('wheel', $xeTable.triggerBodyWheelEvent, { passive: false });
             }
         }
-        this.preventEvent(null, 'mounted');
+        $xeTable.preventEvent(null, 'mounted');
     },
     activated() {
         this.recalculate().then(() => this.refreshScroll());

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "3.16.0-beta.4";
+export const version = "3.16.0-beta.5";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({

package/es/ui/src/log.js

@@ -1,5 +1,5 @@
 import { VxeUI } from '@vxe-ui/core';
 const { log } = VxeUI;
-const version = `table v${"3.16.0-beta.4"}`;
+const version = `table v${"3.16.0-beta.5"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);

package/lib/index.umd.js

@@ -2002,7 +2002,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.16.0-beta.4";
+const version = "3.16.0-beta.5";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2667,7 +2667,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.16.0-beta.4"}`;
+const log_version = `table v${"3.16.0-beta.5"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -8369,18 +8369,18 @@ function handleLazyRecalculate($xeTable, reFull, reWidth, reHeight) {
     if (rceTimeout) {
       clearTimeout(rceTimeout);
       if (rceRunTime && rceRunTime + (refreshDelay - 5) < Date.now()) {
-        resolve(handleRecalculateStyle($xeTable, !!reFull, reWidth, reHeight));
+        resolve(handleRecalculateStyle($xeTable, reFull, reWidth, reHeight));
       } else {
         $xeTable.$nextTick(() => {
           resolve();
         });
       }
     } else {
-      resolve(handleRecalculateStyle($xeTable, !!reFull, reWidth, reHeight));
+      resolve(handleRecalculateStyle($xeTable, reFull, reWidth, reHeight));
     }
     internalData.rceTimeout = setTimeout(() => {
       internalData.rceTimeout = undefined;
-      handleRecalculateStyle($xeTable, !!reFull, reWidth, reHeight);
+      handleRecalculateStyle($xeTable, reFull, reWidth, reHeight);
     }, refreshDelay);
   });
 }
@@ -8703,9 +8703,8 @@ function loadTableData($xeTable, datas, isReset) {
     $xeTable.checkSelectionStatus();
     return new Promise(resolve => {
       $xeTable.$nextTick().then(() => handleRecalculateStyle($xeTable, false, false, false)).then(() => {
-        calcCellHeight($xeTable);
+        handleRecalculateStyle($xeTable, false, true, true);
         updateRowOffsetTop($xeTable);
-        return handleRecalculateStyle($xeTable, false, false, false);
       }).then(() => {
         let targetScrollLeft = lastScrollLeft;
         let targetScrollTop = lastScrollTop;
@@ -8723,14 +8722,14 @@ function loadTableData($xeTable, datas, isReset) {
         // 是否变更虚拟滚动
         if (oldScrollYLoad === sYLoad) {
           restoreScrollLocation($xeTable, targetScrollLeft, targetScrollTop).then(() => {
-            calcCellHeight($xeTable);
+            handleRecalculateStyle($xeTable, false, true, true);
             updateRowOffsetTop($xeTable);
             resolve();
           });
         } else {
           setTimeout(() => {
             restoreScrollLocation($xeTable, targetScrollLeft, targetScrollTop).then(() => {
-              calcCellHeight($xeTable);
+              handleRecalculateStyle($xeTable, false, true, true);
               updateRowOffsetTop($xeTable);
               resolve();
             });
@@ -9027,7 +9026,7 @@ function handleColumn($xeTable, collectColumn) {
         $xeTable.handleUpdateCustomColumn();
       }
       reactData.isColLoading = false;
-      return $xeTable.recalculate();
+      return handleLazyRecalculate($xeTable, false, true, true);
     });
   });
 }
@@ -29645,17 +29644,17 @@ function renderBody(h, $xeTable) {
           errLog('vxe.error.reqComp', ['vxe-tooltip']);
         }
       }
+      if (this.autoResize) {
+        const resizeObserver = table_globalResize.create(() => {
+          if (this.autoResize) {
+            this.recalculate(true);
+          }
+        });
+        resizeObserver.observe(this.$el);
+        resizeObserver.observe(this.getParentElem());
+        this.$resize = resizeObserver;
+      }
     });
-    if (this.autoResize) {
-      const resizeObserver = table_globalResize.create(() => {
-        if (this.autoResize) {
-          this.recalculate(true);
-        }
-      });
-      resizeObserver.observe(this.$el);
-      resizeObserver.observe(this.getParentElem());
-      this.$resize = resizeObserver;
-    }
     if (virtualYOpts.mode !== 'scroll') {
       const tableViewportEl = $xeTable.$refs.refTableViewportElem;
       if (tableViewportEl) {
@@ -29664,7 +29663,7 @@ function renderBody(h, $xeTable) {
         });
       }
     }
-    this.preventEvent(null, 'mounted');
+    $xeTable.preventEvent(null, 'mounted');
   },
   activated() {
     this.recalculate().then(() => this.refreshScroll());