vxe-table 3.25.0-beta.7 → 3.25.1

package/es/table/src/table.js

@@ -32,6 +32,8 @@ function bindScrollbarResize($xeTable) {
     if (isVScrollbar) {
         const el = $xeTable.$refs.refElem;
         const viewInnerEl = getRefElem(elemStore['main-body-table']);
+        const viewXSpaceEl = getRefElem(elemStore['main-body-xSpace']);
+        const viewYSpaceEl = getRefElem(elemStore['main-body-ySpace']);
         const scrollObserver = globalResize.create(() => {
             $xeTable.reScrollFlag++;
         });
@@ -41,6 +43,12 @@ function bindScrollbarResize($xeTable) {
         if (viewInnerEl) {
             scrollObserver.observe(viewInnerEl);
         }
+        if (viewXSpaceEl) {
+            scrollObserver.observe(viewXSpaceEl);
+        }
+        if (viewYSpaceEl) {
+            scrollObserver.observe(viewYSpaceEl);
+        }
         internalData.scrollObserver = scrollObserver;
     }
 }
@@ -564,14 +572,19 @@ function renderVirtualBody(h, $xeTable) {
     const hideYScroll = scrollYVisible === false || scrollYVisible === 'hidden';
     return h('div', {
         key: 'lvb',
-        class: ['vxe-table--layout-wrapper', `sx-pos--${scrollbarXToTop ? 'top' : 'bottom'}`, `sy-pos--${scrollbarYToLeft ? 'left' : 'right'}`, {
+        class: [
+            'vxe-table--layout-wrapper',
+            `sx-pos--${scrollbarXToTop ? 'top' : 'bottom'}`,
+            `sy-pos--${scrollbarYToLeft ? 'left' : 'right'}`,
+            {
                 'is--virtual-scrollbar': isVScrollbar,
                 'ov-padding': isVScrollbar && scrollbarOpts.padding,
                 'ov-x--auto-hide': isVScrollbar && scrollXAutoHide,
                 'ov-y--auto-hide': isVScrollbar && scrollYAutoHide,
                 'overflow-y': yThumbHeight,
                 'overflow-x': xThumbWidth
-            }]
+            }
+        ]
     }, [
         renderViewport(h, $xeTable),
         h('div', {
@@ -833,12 +846,14 @@ export default {
             const $xeTable = this;
             const reactData = $xeTable;
             const { yThumbHeight, xThumbWidth } = reactData;
+            const scrollbarOpts = $xeTable.computeScrollbarOpts;
             const scrollbarXToTop = $xeTable.computeScrollbarXToTop;
             const scrollbarYToLeft = $xeTable.computeScrollbarYToLeft;
             const scrollXVisible = $xeTable.computeScrollXVisible;
             const scrollYVisible = $xeTable.computeScrollYVisible;
             return domUtils.buildClass([
                 'vxe-scrollbar is--virtual',
+                scrollbarOpts.fluentOverlay ? 'is--fluent-overlay' : 'is--default-mode',
                 `ov-x--${scrollXVisible === false ? 'hidden' : 'visible'}`,
                 `ov-y--${scrollYVisible === false ? 'hidden' : 'visible'}`,
                 `sx-pos--${scrollbarXToTop ? 'top' : 'bottom'}`,

package/es/ui/index.js

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

package/es/ui/src/log.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 const { log } = VxeUI;
-const tableVersion = `table v${"3.25.0-beta.7"}`;
+const tableVersion = `table v${"3.25.1"}`;
 export function createComponentLog(name) {
     const uiVersion = VxeUI.uiVersion ? `ui v${VxeUI.uiVersion}` : '';
     const ganttVersion = VxeUI.ganttVersion ? `gantt v${VxeUI.ganttVersion}` : '';

package/lib/index.umd.js

@@ -3323,7 +3323,7 @@ function getDefaultConfig(val1, def1) {
 /* unused harmony import specifier */ var VxeUI;
 
 
-const version = "3.25.0-beta.7";
+const version = "3.25.1";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -4286,7 +4286,7 @@ function getPopupAppendElement(appendTo) {
 const {
   log: log_log
 } = core_.VxeUI;
-const tableVersion = `table v${"3.25.0-beta.7"}`;
+const tableVersion = `table v${"3.25.1"}`;
 function createComponentLog(name) {
   const uiVersion = core_.VxeUI.uiVersion ? `ui v${core_.VxeUI.uiVersion}` : '';
   const ganttVersion = core_.VxeUI.ganttVersion ? `gantt v${core_.VxeUI.ganttVersion}` : '';
@@ -21299,6 +21299,8 @@ function bindScrollbarResize($xeTable) {
   if (isVScrollbar) {
     const el = $xeTable.$refs.refElem;
     const viewInnerEl = getRefElem(elemStore['main-body-table']);
+    const viewXSpaceEl = getRefElem(elemStore['main-body-xSpace']);
+    const viewYSpaceEl = getRefElem(elemStore['main-body-ySpace']);
     const scrollObserver = table_globalResize.create(() => {
       $xeTable.reScrollFlag++;
     });
@@ -21308,6 +21310,12 @@ function bindScrollbarResize($xeTable) {
     if (viewInnerEl) {
       scrollObserver.observe(viewInnerEl);
     }
+    if (viewXSpaceEl) {
+      scrollObserver.observe(viewXSpaceEl);
+    }
+    if (viewYSpaceEl) {
+      scrollObserver.observe(viewYSpaceEl);
+    }
     internalData.scrollObserver = scrollObserver;
   }
 }
@@ -22104,11 +22112,12 @@ function renderVirtualBody(h, $xeTable) {
         yThumbHeight,
         xThumbWidth
       } = reactData;
+      const scrollbarOpts = $xeTable.computeScrollbarOpts;
       const scrollbarXToTop = $xeTable.computeScrollbarXToTop;
       const scrollbarYToLeft = $xeTable.computeScrollbarYToLeft;
       const scrollXVisible = $xeTable.computeScrollXVisible;
       const scrollYVisible = $xeTable.computeScrollYVisible;
-      return domUtils.buildClass(['vxe-scrollbar is--virtual', `ov-x--${scrollXVisible === false ? 'hidden' : 'visible'}`, `ov-y--${scrollYVisible === false ? 'hidden' : 'visible'}`, `sx-pos--${scrollbarXToTop ? 'top' : 'bottom'}`, `sy-pos--${scrollbarYToLeft ? 'left' : 'right'}`], {
+      return domUtils.buildClass(['vxe-scrollbar is--virtual', scrollbarOpts.fluentOverlay ? 'is--fluent-overlay' : 'is--default-mode', `ov-x--${scrollXVisible === false ? 'hidden' : 'visible'}`, `ov-y--${scrollYVisible === false ? 'hidden' : 'visible'}`, `sx-pos--${scrollbarXToTop ? 'top' : 'bottom'}`, `sy-pos--${scrollbarYToLeft ? 'left' : 'right'}`], {
         'overflow-y': yThumbHeight,
         'overflow-x': xThumbWidth
       });