vxe-pc-ui 4.20.10 → 4.20.12

package/lib/index.umd.js

@@ -3372,7 +3372,7 @@ if (typeof window !== 'undefined') {
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.push.js
 var es_array_push = __webpack_require__(4114);
 ;// ./node_modules/@vxe-ui/core/es/src/core.js
-const coreVersion = "4.4.35";
+const coreVersion = "4.4.38";
 const VxeCore = {
   coreVersion,
   uiVersion: '',
@@ -4000,7 +4000,7 @@ function createLog(type, name) {
     return msg;
   };
 }
-const version = "4.4.35";
+const version = "4.4.38";
 const log = {
   create: createLog,
   warn: createLog('warn', `v${version}`),
@@ -4668,7 +4668,7 @@ const popperUtils = {
     } = Object.assign({
       appendTo: '',
       teleportTo: false,
-      marginSize: 18,
+      marginSize: 12,
       isMinWidth: true
     }, options);
     let panelPlacement = 'bottom';
@@ -5334,7 +5334,7 @@ function checkDynamic() {
 const {
   log: log_log
 } = VxeUI;
-const uiVersion = `ui v${"4.20.10"}`;
+const uiVersion = `ui v${"4.20.12"}`;
 function createComponentLog(name) {
   const tableVersion = VxeUI.tableVersion ? `table v${VxeUI.tableVersion}` : '';
   const ganttVersion = VxeUI.ganttVersion ? `gantt v${VxeUI.ganttVersion}` : '';
@@ -5352,7 +5352,7 @@ const errLog = log_log.create('error', uiVersion);
 
 
 
-const ui_version = "4.20.10";
+const ui_version = "4.20.12";
 VxeUI.uiVersion = ui_version;
 VxeUI.dynamicApp = dynamicApp;
 function config(options) {
@@ -8277,6 +8277,10 @@ function createInternalData() {
       type: Boolean,
       default: () => scrollbar_getConfig().scrollbar.native
     },
+    fluentOverlay: {
+      type: Boolean,
+      default: () => scrollbar_getConfig().scrollbar.fluentOverlay
+    },
     padding: {
       type: Boolean,
       default: () => scrollbar_getConfig().scrollbar.padding
@@ -8421,7 +8425,8 @@ function createInternalData() {
         native,
         theme,
         className,
-        padding
+        padding,
+        fluentOverlay
       } = props;
       const {
         yThumbHeight,
@@ -8434,7 +8439,7 @@ function createInternalData() {
       const yVisible = computeYVisible.value;
       const xAutoHide = computeXAutoHide.value;
       const yAutoHide = computeYAutoHide.value;
-      return scrollbar_domUtils.buildClass(['vxe-scrollbar', vSize ? `size--${vSize}` : '', theme ? `theme--${theme}` : '', `ov-x--${xVisible === false ? 'hidden' : 'visible'}`, `ov-y--${yVisible === false ? 'hidden' : 'visible'}`, `sx-pos--${xToTop ? 'top' : 'bottom'}`, `sy-pos--${yToLeft ? 'left' : 'right'}`, native ? 'is--native' : 'is--virtual', className], {
+      return scrollbar_domUtils.buildClass(['vxe-scrollbar', vSize ? `size--${vSize}` : '', theme ? `theme--${theme}` : '', fluentOverlay ? 'is--fluent-overlay' : 'is--default-mode', `ov-x--${xVisible === false ? 'hidden' : 'visible'}`, `ov-y--${yVisible === false ? 'hidden' : 'visible'}`, `sx-pos--${xToTop ? 'top' : 'bottom'}`, `sy-pos--${yToLeft ? 'left' : 'right'}`, native ? 'is--native' : 'is--virtual', className], {
         'is--padding': padding,
         'ov-x--auto-hide': xAutoHide,
         'ov-y--auto-hide': yAutoHide,
@@ -14012,11 +14017,12 @@ let crossListDragRowObj = null;
         yThumbHeight,
         xThumbWidth
       } = reactData;
+      const scrollbarOpts = computeScrollbarOpts.value;
       const scrollbarXToTop = computeScrollbarXToTop.value;
       const scrollbarYToLeft = computeScrollbarYToLeft.value;
       const scrollXVisible = computeScrollXVisible.value;
       const scrollYVisible = computeScrollYVisible.value;
-      return list_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 list_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
       });
@@ -14284,7 +14290,10 @@ let crossListDragRowObj = null;
       const scrollLeft = scrollBodyElem.scrollLeft;
       const isX = scrollLeft !== internalData.lastScrollLeft;
       const isY = scrollTop !== internalData.lastScrollTop;
-      updateThumbOffset();
+      const isVScrollbar = computeIsVScrollbar.value;
+      if (isVScrollbar) {
+        updateThumbOffset();
+      }
       internalData.lastScrollTop = scrollTop;
       internalData.lastScrollLeft = scrollLeft;
       if (reactData.scrollYLoad) {
@@ -15803,13 +15812,17 @@ let crossListDragRowObj = null;
       if (isVScrollbar) {
         if (!scrollObserver) {
           const el = refElem.value;
-          const viewInnerEl = refVirtualSpaceElem.value;
+          const viewSpaceEl = refVirtualSpaceElem.value;
+          const viewInnerEl = refVirtualBody.value;
           const scrollObserver = list_globalResize.create(() => {
             reScrollFlag.value++;
           });
           if (el) {
             scrollObserver.observe(el);
           }
+          if (viewSpaceEl) {
+            scrollObserver.observe(viewSpaceEl);
+          }
           if (viewInnerEl) {
             scrollObserver.observe(viewInnerEl);
           }
@@ -42623,11 +42636,12 @@ function select_createInternalData() {
         yThumbHeight,
         xThumbWidth
       } = reactData;
+      const scrollbarOpts = computeScrollbarOpts.value;
       const scrollbarXToTop = computeScrollbarXToTop.value;
       const scrollbarYToLeft = computeScrollbarYToLeft.value;
       const scrollXVisible = computeScrollXVisible.value;
       const scrollYVisible = computeScrollYVisible.value;
-      return select_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 select_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
       });
@@ -43617,7 +43631,10 @@ function select_createInternalData() {
       const scrollLeft = scrollBodyElem.scrollLeft;
       const isX = scrollLeft !== internalData.lastScrollLeft;
       const isY = scrollTop !== internalData.lastScrollTop;
-      updateThumbOffset();
+      const isVScrollbar = computeIsVScrollbar.value;
+      if (isVScrollbar) {
+        updateThumbOffset();
+      }
       internalData.lastScrollTop = scrollTop;
       internalData.lastScrollLeft = scrollLeft;
       if (reactData.scrollYLoad) {
@@ -43770,13 +43787,17 @@ function select_createInternalData() {
       if (isVScrollbar) {
         if (!scrollObserver) {
           const el = refElem.value;
-          const viewInnerEl = refVirtualSpaceElem.value;
+          const viewSpaceEl = refVirtualSpaceElem.value;
+          const viewInnerEl = refVirtualBody.value;
           const scrollObserver = select_globalResize.create(() => {
             reScrollFlag.value++;
           });
           if (el) {
             scrollObserver.observe(el);
           }
+          if (viewSpaceEl) {
+            scrollObserver.observe(viewSpaceEl);
+          }
           if (viewInnerEl) {
             scrollObserver.observe(viewInnerEl);
           }
@@ -54417,11 +54438,12 @@ let crossTreeDragNodeObj = null;
         yThumbHeight,
         xThumbWidth
       } = reactData;
+      const scrollbarOpts = computeScrollbarOpts.value;
       const scrollbarXToTop = computeScrollbarXToTop.value;
       const scrollbarYToLeft = computeScrollbarYToLeft.value;
       const scrollXVisible = computeScrollXVisible.value;
       const scrollYVisible = computeScrollYVisible.value;
-      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
       });
@@ -55122,7 +55144,10 @@ let crossTreeDragNodeObj = null;
       const scrollLeft = scrollBodyElem.scrollLeft;
       const isX = scrollLeft !== internalData.lastScrollLeft;
       const isY = scrollTop !== internalData.lastScrollTop;
-      updateThumbOffset();
+      const isVScrollbar = computeIsVScrollbar.value;
+      if (isVScrollbar) {
+        updateThumbOffset();
+      }
       internalData.lastScrollTop = scrollTop;
       internalData.lastScrollLeft = scrollLeft;
       if (reactData.scrollYLoad) {
@@ -57472,13 +57497,17 @@ let crossTreeDragNodeObj = null;
       if (isVScrollbar) {
         if (!scrollObserver) {
           const el = refElem.value;
-          const viewInnerEl = refVirtualSpaceElem.value;
+          const viewSpaceEl = refVirtualSpaceElem.value;
+          const viewInnerEl = refVirtualBody.value;
           const scrollObserver = globalResize.create(() => {
             reScrollFlag.value++;
           });
           if (el) {
             scrollObserver.observe(el);
           }
+          if (viewSpaceEl) {
+            scrollObserver.observe(viewSpaceEl);
+          }
           if (viewInnerEl) {
             scrollObserver.observe(viewInnerEl);
           }