vxe-pc-ui 3.20.10 → 3.20.12

package/lib/index.umd.js

@@ -11706,7 +11706,7 @@ var es_regexp_exec = __webpack_require__(7495);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.match.js
 var es_string_match = __webpack_require__(1761);
 ;// ./node_modules/@vxe-ui/core/es/src/core.js
-var coreVersion = "3.4.35";
+var coreVersion = "3.4.38";
 var VxeCore = {
   coreVersion: coreVersion,
   uiVersion: '',
@@ -12467,7 +12467,7 @@ function createLog(type, name) {
     return msg;
   };
 }
-var version = "3.4.35";
+var version = "3.4.38";
 var log = {
   create: createLog,
   warn: createLog('warn', "v".concat(version)),
@@ -13242,7 +13242,7 @@ var popperUtils = {
     var _Object$assign = Object.assign({
         appendTo: '',
         teleportTo: false,
-        marginSize: 18,
+        marginSize: 12,
         isMinWidth: true
       }, options),
       defaultTop = _Object$assign.defaultTop,
@@ -13457,14 +13457,14 @@ var permissionMixin = external_commonjs_vue_commonjs2_vue_root_Vue_default().ext
  */
 var vScrollbarMixin = external_commonjs_vue_commonjs2_vue_root_Vue_default().extend({
   inject: {
-    $xeVmInfo: {
+    $xeScrollbarInfo: {
       default: null
     }
   },
   provide: function provide() {
     var _this2 = this;
     return {
-      $xeVmInfo: {
+      $xeScrollbarInfo: {
         getIsVScrollbar: function getIsVScrollbar() {
           return _this2.computeIsVScrollbar;
         }
@@ -13474,8 +13474,8 @@ var vScrollbarMixin = external_commonjs_vue_commonjs2_vue_root_Vue_default().ext
   computed: {
     computeIsVScrollbar: function computeIsVScrollbar() {
       var useScrollbar = this.useScrollbar;
-      var $xeVmInfo = this.$xeVmInfo;
-      return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(useScrollbar) ? useScrollbar : $xeVmInfo ? $xeVmInfo.getIsVScrollbar() : null;
+      var $xeScrollbarInfo = this.$xeScrollbarInfo;
+      return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(useScrollbar) ? useScrollbar : $xeScrollbarInfo ? $xeScrollbarInfo.getIsVScrollbar() : null;
     }
   }
 });
@@ -13935,7 +13935,7 @@ var es_array_filter = __webpack_require__(2008);
 
 
 var log_log = VxeUI.log;
-var uiVersion = "ui v".concat("3.20.10");
+var uiVersion = "ui v".concat("3.20.12");
 function createComponentLog(name) {
   var tableVersion = VxeUI.tableVersion ? "table v".concat(VxeUI.tableVersion) : '';
   var ganttVersion = VxeUI.ganttVersion ? "gantt v".concat(VxeUI.ganttVersion) : '';
@@ -13955,7 +13955,7 @@ var errLog = log_log.create('error', uiVersion);
 
 
 
-var ui_version = "3.20.10";
+var ui_version = "3.20.12";
 VxeUI.uiVersion = ui_version;
 VxeUI.dynamicApp = dynamicApp;
 function config(options) {
@@ -17125,6 +17125,12 @@ function createInternalData() {
         return scrollbar_getConfig().scrollbar.native;
       }
     },
+    fluentOverlay: {
+      type: Boolean,
+      default: function _default() {
+        return scrollbar_getConfig().scrollbar.fluentOverlay;
+      }
+    },
     padding: {
       type: Boolean,
       default: function _default() {
@@ -17288,7 +17294,8 @@ function createInternalData() {
       var native = props.native,
         theme = props.theme,
         className = props.className,
-        padding = props.padding;
+        padding = props.padding,
+        fluentOverlay = props.fluentOverlay;
       var yThumbHeight = reactData.yThumbHeight,
         xThumbWidth = reactData.xThumbWidth;
       var vSize = $xeScrollbar.computeSize;
@@ -17298,7 +17305,7 @@ function createInternalData() {
       var yVisible = $xeScrollbar.computeYVisible;
       var xAutoHide = $xeScrollbar.computeXAutoHide;
       var yAutoHide = $xeScrollbar.computeYAutoHide;
-      return scrollbar_domUtils.buildClass(['vxe-scrollbar', vSize ? "size--".concat(vSize) : '', theme ? "theme--".concat(theme) : '', "ov-x--".concat(xVisible === false ? 'hidden' : 'visible'), "ov-y--".concat(yVisible === false ? 'hidden' : 'visible'), "sx-pos--".concat(xToTop ? 'top' : 'bottom'), "sy-pos--".concat(yToLeft ? 'left' : 'right'), native ? 'is--native' : 'is--virtual', className], {
+      return scrollbar_domUtils.buildClass(['vxe-scrollbar', vSize ? "size--".concat(vSize) : '', theme ? "theme--".concat(theme) : '', fluentOverlay ? 'is--fluent-overlay' : 'is--default-mode', "ov-x--".concat(xVisible === false ? 'hidden' : 'visible'), "ov-y--".concat(yVisible === false ? 'hidden' : 'visible'), "sx-pos--".concat(xToTop ? 'top' : 'bottom'), "sy-pos--".concat(yToLeft ? 'left' : 'right'), native ? 'is--native' : 'is--virtual', className], {
         'is--padding': padding,
         'ov-x--auto-hide': xAutoHide,
         'ov-y--auto-hide': yAutoHide,
@@ -23419,11 +23426,12 @@ function list_createInternalData() {
       var reactData = $xeList.reactData;
       var yThumbHeight = reactData.yThumbHeight,
         xThumbWidth = reactData.xThumbWidth;
+      var scrollbarOpts = $xeList.computeScrollbarOpts;
       var scrollbarXToTop = $xeList.computeScrollbarXToTop;
       var scrollbarYToLeft = $xeList.computeScrollbarYToLeft;
       var scrollXVisible = $xeList.computeScrollXVisible;
       var scrollYVisible = $xeList.computeScrollYVisible;
-      return list_domUtils.buildClass(['vxe-scrollbar is--virtual', "ov-x--".concat(scrollXVisible === false ? 'hidden' : 'visible'), "ov-y--".concat(scrollYVisible === false ? 'hidden' : 'visible'), "sx-pos--".concat(scrollbarXToTop ? 'top' : 'bottom'), "sy-pos--".concat(scrollbarYToLeft ? 'left' : 'right')], {
+      return list_domUtils.buildClass(['vxe-scrollbar is--virtual', scrollbarOpts.fluentOverlay ? 'is--fluent-overlay' : 'is--default-mode', "ov-x--".concat(scrollXVisible === false ? 'hidden' : 'visible'), "ov-y--".concat(scrollYVisible === false ? 'hidden' : 'visible'), "sx-pos--".concat(scrollbarXToTop ? 'top' : 'bottom'), "sy-pos--".concat(scrollbarYToLeft ? 'left' : 'right')], {
         'overflow-y': yThumbHeight,
         'overflow-x': xThumbWidth
       });
@@ -23855,7 +23863,10 @@ function list_createInternalData() {
       var scrollLeft = scrollBodyElem.scrollLeft;
       var isX = scrollLeft !== internalData.lastScrollLeft;
       var isY = scrollTop !== internalData.lastScrollTop;
-      $xeList.updateThumbOffset();
+      var isVScrollbar = $xeList.computeIsVScrollbar;
+      if (isVScrollbar) {
+        $xeList.updateThumbOffset();
+      }
       internalData.lastScrollTop = scrollTop;
       internalData.lastScrollLeft = scrollLeft;
       if (reactData.scrollYLoad) {
@@ -25224,13 +25235,17 @@ function list_createInternalData() {
       if (isVScrollbar) {
         if (!scrollObserver) {
           var el = $xeList.$refs.refElem;
-          var viewInnerEl = $xeList.$refs.refVirtualSpaceElem;
+          var viewSpaceEl = $xeList.$refs.refVirtualSpaceElem;
+          var viewInnerEl = $xeList.$refs.refVirtualBody;
           var _scrollObserver = list_globalResize.create(function () {
             $xeList.reScrollFlag++;
           });
           if (el) {
             _scrollObserver.observe(el);
           }
+          if (viewSpaceEl) {
+            _scrollObserver.observe(viewSpaceEl);
+          }
           if (viewInnerEl) {
             _scrollObserver.observe(viewInnerEl);
           }
@@ -49647,8 +49662,8 @@ function layout_body_createReactData() {
       var backtopId = $xeLayoutBody.backtopId;
       var loading = props.loading,
         padding = props.padding,
-        showBacktop = props.showBacktop,
-        useScrollbar = props.useScrollbar;
+        showBacktop = props.showBacktop;
+      var isVScrollbar = $xeLayoutBody.computeIsVScrollbar;
       var backtopOpts = $xeLayoutBody.computeBacktopOpts;
       var scrollbarProps = $xeLayoutBody.computeScrollbarProps;
       var vSize = $xeLayoutBody.computeSize;
@@ -49668,7 +49683,7 @@ function layout_body_createReactData() {
       }
       return h('div', {
         class: ['vxe-layout-body', _defineProperty(_defineProperty(_defineProperty({}, "size--".concat(vSize), vSize), 'is--loading', loading), 'is--padding', padding)]
-      }, [useScrollbar ? h(packages_scrollbar, {
+      }, [isVScrollbar ? h(packages_scrollbar, {
         props: scrollbarProps,
         scopedSlots: {
           default: function _default() {
@@ -54181,11 +54196,12 @@ function select_createInternalData() {
       var reactData = $xeSelect.reactData;
       var yThumbHeight = reactData.yThumbHeight,
         xThumbWidth = reactData.xThumbWidth;
+      var scrollbarOpts = $xeSelect.computeScrollbarOpts;
       var scrollbarXToTop = $xeSelect.computeScrollbarXToTop;
       var scrollbarYToLeft = $xeSelect.computeScrollbarYToLeft;
       var scrollXVisible = $xeSelect.computeScrollXVisible;
       var scrollYVisible = $xeSelect.computeScrollYVisible;
-      return select_domUtils.buildClass(['vxe-scrollbar is--virtual', "ov-x--".concat(scrollXVisible === false ? 'hidden' : 'visible'), "ov-y--".concat(scrollYVisible === false ? 'hidden' : 'visible'), "sx-pos--".concat(scrollbarXToTop ? 'top' : 'bottom'), "sy-pos--".concat(scrollbarYToLeft ? 'left' : 'right')], {
+      return select_domUtils.buildClass(['vxe-scrollbar is--virtual', scrollbarOpts.fluentOverlay ? 'is--fluent-overlay' : 'is--default-mode', "ov-x--".concat(scrollXVisible === false ? 'hidden' : 'visible'), "ov-y--".concat(scrollYVisible === false ? 'hidden' : 'visible'), "sx-pos--".concat(scrollbarXToTop ? 'top' : 'bottom'), "sy-pos--".concat(scrollbarYToLeft ? 'left' : 'right')], {
         'overflow-y': yThumbHeight,
         'overflow-x': xThumbWidth
       });
@@ -55329,7 +55345,10 @@ function select_createInternalData() {
       var scrollBodyElem = evnt.target;
       var scrollTop = scrollBodyElem.scrollTop;
       var scrollLeft = scrollBodyElem.scrollLeft;
-      $xeSelect.updateThumbOffset();
+      var isVScrollbar = $xeSelect.computeIsVScrollbar;
+      if (isVScrollbar) {
+        $xeSelect.updateThumbOffset();
+      }
       var isX = scrollLeft !== internalData.lastScrollLeft;
       var isY = scrollTop !== internalData.lastScrollTop;
       internalData.lastScrollTop = scrollTop;
@@ -55435,13 +55454,17 @@ function select_createInternalData() {
       if (isVScrollbar) {
         if (!scrollObserver) {
           var el = $xeSelect.$refs.refElem;
-          var viewInnerEl = $xeSelect.$refs.refVirtualSpaceElem;
+          var viewSpaceEl = $xeSelect.$refs.refVirtualSpaceElem;
+          var viewInnerEl = $xeSelect.$refs.refVirtualBody;
           var _scrollObserver = select_globalResize.create(function () {
             $xeSelect.reScrollFlag++;
           });
           if (el) {
             _scrollObserver.observe(el);
           }
+          if (viewSpaceEl) {
+            _scrollObserver.observe(viewSpaceEl);
+          }
           if (viewInnerEl) {
             _scrollObserver.observe(viewInnerEl);
           }
@@ -67429,11 +67452,12 @@ function tree_createInternalData() {
       var reactData = $xeTree.reactData;
       var yThumbHeight = reactData.yThumbHeight,
         xThumbWidth = reactData.xThumbWidth;
+      var scrollbarOpts = $xeTree.computeScrollbarOpts;
       var scrollbarXToTop = $xeTree.computeScrollbarXToTop;
       var scrollbarYToLeft = $xeTree.computeScrollbarYToLeft;
       var scrollXVisible = $xeTree.computeScrollXVisible;
       var scrollYVisible = $xeTree.computeScrollYVisible;
-      return domUtils.buildClass(['vxe-scrollbar is--virtual', "ov-x--".concat(scrollXVisible === false ? 'hidden' : 'visible'), "ov-y--".concat(scrollYVisible === false ? 'hidden' : 'visible'), "sx-pos--".concat(scrollbarXToTop ? 'top' : 'bottom'), "sy-pos--".concat(scrollbarYToLeft ? 'left' : 'right')], {
+      return domUtils.buildClass(['vxe-scrollbar is--virtual', scrollbarOpts.fluentOverlay ? 'is--fluent-overlay' : 'is--default-mode', "ov-x--".concat(scrollXVisible === false ? 'hidden' : 'visible'), "ov-y--".concat(scrollYVisible === false ? 'hidden' : 'visible'), "sx-pos--".concat(scrollbarXToTop ? 'top' : 'bottom'), "sy-pos--".concat(scrollbarYToLeft ? 'left' : 'right')], {
         'overflow-y': yThumbHeight,
         'overflow-x': xThumbWidth
       });
@@ -68185,7 +68209,10 @@ function tree_createInternalData() {
       var scrollLeft = scrollBodyElem.scrollLeft;
       var isX = scrollLeft !== internalData.lastScrollLeft;
       var isY = scrollTop !== internalData.lastScrollTop;
-      $xeTree.updateThumbOffset();
+      var isVScrollbar = $xeTree.computeIsVScrollbar;
+      if (isVScrollbar) {
+        $xeTree.updateThumbOffset();
+      }
       internalData.lastScrollTop = scrollTop;
       internalData.lastScrollLeft = scrollLeft;
       if (reactData.scrollYLoad) {
@@ -69981,13 +70008,17 @@ function tree_createInternalData() {
       if (isVScrollbar) {
         if (!scrollObserver) {
           var el = $xeTree.$refs.refElem;
-          var viewInnerEl = $xeTree.$refs.refVirtualSpaceElem;
+          var viewSpaceEl = $xeTree.$refs.refVirtualSpaceElem;
+          var viewInnerEl = $xeTree.$refs.refVirtualBody;
           var _scrollObserver = globalResize.create(function () {
             $xeTree.reScrollFlag++;
           });
           if (el) {
             _scrollObserver.observe(el);
           }
+          if (viewSpaceEl) {
+            _scrollObserver.observe(viewSpaceEl);
+          }
           if (viewInnerEl) {
             _scrollObserver.observe(viewInnerEl);
           }