vxe-pc-ui 3.20.1 → 3.20.2

package/lib/index.umd.js

@@ -11392,6 +11392,7 @@ __webpack_require__.d(__webpack_exports__, {
   renderGlobalIcon: function() { return /* reexport */ renderGlobalIcon; },
   renderer: function() { return /* reexport */ renderer; },
   saveFile: function() { return /* reexport */ saveFile; },
+  scrollbarUtils: function() { return /* reexport */ scrollbarUtils; },
   setConfig: function() { return /* reexport */ setConfig; },
   setI18n: function() { return /* reexport */ setI18n; },
   setIcon: function() { return /* reexport */ setIcon; },
@@ -11647,6 +11648,7 @@ __webpack_require__.d(components_namespaceObject, {
   renderGlobalIcon: function() { return renderGlobalIcon; },
   renderer: function() { return renderer; },
   saveFile: function() { return saveFile; },
+  scrollbarUtils: function() { return scrollbarUtils; },
   setConfig: function() { return setConfig; },
   setI18n: function() { return setI18n; },
   setIcon: function() { return setIcon; },
@@ -11698,7 +11700,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.27";
+var coreVersion = "3.4.31";
 var VxeCore = {
   coreVersion: coreVersion,
   uiVersion: '',
@@ -12459,7 +12461,7 @@ function createLog(type, name) {
     return msg;
   };
 }
-var version = "3.4.27";
+var version = "3.4.31";
 var log = {
   create: createLog,
   warn: createLog('warn', "v".concat(version)),
@@ -13013,6 +13015,12 @@ var baseUtils = {
    */
   isEmpty: function isEmpty(value) {
     return value === null || value === undefined || value === '';
+  },
+  /**
+   * 获取配置值，如果存在则返回，如果不存在则使用默认值
+   */
+  getDefVal: function getDefVal(value, defVal) {
+    return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(value) ? defVal : value;
   }
 };
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.join.js
@@ -13031,7 +13039,7 @@ var domUtils = {
       for (var i = 0; i < staticClassNames.length; i++) {
         var val = staticClassNames[i];
         if (val) {
-          parts.push(val);
+          parts.push('' + val);
         }
       }
     }
@@ -13043,6 +13051,63 @@ var domUtils = {
     return parts.join(' ');
   }
 };
+;// ./node_modules/@vxe-ui/core/es/src/scrollbar-utils.js
+var scrollbarUtils = {
+  /**
+   * 计算滚动条滑块的长度
+   */
+  getThumbSize: function getThumbSize(viewportSize, contentSize, trackSize) {
+    if (contentSize <= viewportSize) {
+      return 0;
+    }
+    var ratio = viewportSize / contentSize;
+    var ideal = trackSize * ratio;
+    return Math.max(20, Math.min(ideal, trackSize));
+  },
+  /**
+   * 计算滚动条滑块的偏移位置
+   */
+  getThumbOffsetSize: function getThumbOffsetSize(offsetSize, viewportSize, contentSize, trackSize, thumbSize) {
+    var maxScroll = contentSize - viewportSize;
+    if (maxScroll <= 0) {
+      return 0;
+    }
+    var maxThumbOffset = trackSize - thumbSize;
+    if (maxThumbOffset <= 0) {
+      return 0;
+    }
+    var clamped = Math.min(Math.max(offsetSize, 0), maxScroll);
+    var ratio = clamped / maxScroll;
+    return ratio * maxThumbOffset;
+  },
+  /**
+   * 根据点击轨道的位置，计算滑块的偏移位置
+   */
+  getScrollFromClick: function getScrollFromClick(clickPosition, viewportSize, contentSize, trackSize, thumbSize) {
+    var maxThumbOffset = trackSize - thumbSize;
+    var maxScroll = contentSize - viewportSize;
+    if (maxScroll <= 0 || maxThumbOffset <= 0) {
+      return 0;
+    }
+    var thumbOffset = clickPosition - thumbSize / 2;
+    thumbOffset = Math.min(Math.max(thumbOffset, 0), maxThumbOffset);
+    var scrollOffset = thumbOffset / maxThumbOffset * maxScroll;
+    return scrollOffset;
+  },
+  /**
+   * 拖拽 thumb 时，根据鼠标位置计算滑块的偏移位置
+   */
+  getScrollFromDrag: function getScrollFromDrag(pointerPosition, dragOffset, viewportSize, contentSize, trackSize, thumbSize) {
+    var maxScroll = contentSize - viewportSize;
+    var maxThumbOffset = trackSize - thumbSize;
+    if (maxScroll <= 0 || maxThumbOffset <= 0) {
+      return 0;
+    }
+    var thumbOffset = pointerPosition - dragOffset;
+    thumbOffset = Math.min(Math.max(thumbOffset, 0), maxThumbOffset);
+    return thumbOffset / maxThumbOffset * maxScroll;
+  }
+};
 ;// ./node_modules/@vxe-ui/core/es/src/mixins.js
 
 
@@ -13107,6 +13172,7 @@ var globalMixins = {
 
 
 
+
 
 
 var installedPlugins = [];
@@ -13180,6 +13246,7 @@ var VxeUI = Object.assign(VxeCore, {
   permission: permission,
   baseUtils: baseUtils,
   domUtils: domUtils,
+  scrollbarUtils: scrollbarUtils,
   globalStore: globalStore,
   component: component,
   getComponent: getComponent,
@@ -13209,6 +13276,7 @@ setTheme();
 
 
 
+
 
 
 /* harmony default export */ var es_index_esm = ((/* unused pure expression or super */ null && (VxeUI)));
@@ -13347,7 +13415,7 @@ var es_array_filter = __webpack_require__(2008);
 
 
 var log_log = VxeUI.log;
-var uiVersion = "ui v".concat("3.20.1");
+var uiVersion = "ui v".concat("3.20.2");
 function createComponentLog(name) {
   var tableVersion = VxeUI.tableVersion ? "table v".concat(VxeUI.tableVersion) : '';
   var ganttVersion = VxeUI.ganttVersion ? "gantt v".concat(VxeUI.ganttVersion) : '';
@@ -13367,7 +13435,7 @@ var errLog = log_log.create('error', uiVersion);
 
 
 
-var ui_version = "3.20.1";
+var ui_version = "3.20.2";
 VxeUI.uiVersion = ui_version;
 VxeUI.dynamicApp = dynamicApp;
 function config(options) {
@@ -21003,10 +21071,8 @@ function scrollbar_createInternalData() {
         minHeight = props.minHeight,
         maxWidth = props.maxWidth,
         maxHeight = props.maxHeight;
-      var xOpts = $xeScrollbar.computeXOpts;
-      var yOpts = $xeScrollbar.computeYOpts;
-      var barWidth = yOpts.width;
-      var barHeight = xOpts.height;
+      var barWidth = $xeScrollbar.computeYWidth;
+      var barHeight = $xeScrollbar.computeXHeight;
       var stys = {};
       if (width) {
         stys.width = toCssUnit(width);
@@ -21032,6 +21098,16 @@ function scrollbar_createInternalData() {
       }
       return stys;
     },
+    computeXHeight: function computeXHeight() {
+      var $xeScrollbar = this;
+      var xOpts = $xeScrollbar.computeXOpts;
+      return xOpts.height;
+    },
+    computeYWidth: function computeYWidth() {
+      var $xeScrollbar = this;
+      var yOpts = $xeScrollbar.computeYOpts;
+      return yOpts.width;
+    },
     computeXVisible: function computeXVisible() {
       var $xeScrollbar = this;
       var props = $xeScrollbar;
@@ -21555,6 +21631,14 @@ function scrollbar_createInternalData() {
       var $xeScrollbar = this;
       $xeScrollbar.reFlag++;
     },
+    computeYWidth: function computeYWidth() {
+      var $xeScrollbar = this;
+      $xeScrollbar.reFlag++;
+    },
+    computeXHeight: function computeXHeight() {
+      var $xeScrollbar = this;
+      $xeScrollbar.reFlag++;
+    },
     computeXVisible: function computeXVisible() {
       var $xeScrollbar = this;
       $xeScrollbar.$nextTick(function () {
@@ -21651,6 +21735,7 @@ var Scrollbar = VxeScrollbar;
 
 
 
+
 /* harmony default export */ var card = (/* define-vxe-component start */defineVxeComponent({
   name: 'VxeCard',
   mixins: [globalMixins.sizeMixin],
@@ -21692,7 +21777,7 @@ var Scrollbar = VxeScrollbar;
     useScrollbar: {
       type: Boolean,
       default: function _default() {
-        return getConfig().card.useScrollbar;
+        return getDefaultConfig(getConfig().card.useScrollbar, getConfig().useScrollbar);
       }
     },
     scrollbarConfig: Object
@@ -22710,8 +22795,9 @@ function list_createInternalData() {
     afterList: [],
     fullKeyMaps: {},
     rowMaps: {},
-    // 滚动条
     // resizeObserver: undefined,
+    // 滚动条
+    // scrollObserver: undefined,
     // isThumbDrag: false,
     thumbDragOffset: 0,
     yThumbTop: 0,
@@ -22785,7 +22871,7 @@ function list_createInternalData() {
     useScrollbar: {
       type: Boolean,
       default: function _default() {
-        return getConfig().list.useScrollbar;
+        return getDefaultConfig(getConfig().list.useScrollbar, getConfig().useScrollbar);
       }
     },
     scrollbarConfig: Object
@@ -22857,11 +22943,8 @@ function list_createInternalData() {
     computeWrapperStyles: function computeWrapperStyles() {
       var $xeList = this;
       var rowHeight = $xeList.computeRowHeight;
-      var scrollbarOpts = $xeList.computeScrollbarOpts;
-      var scrollbarXOpts = $xeList.computeScrollbarXOpts;
-      var scrollbarYOpts = $xeList.computeScrollbarYOpts;
-      var barWidth = getDefaultConfig(getDefaultConfig(scrollbarYOpts.width, scrollbarOpts.width), getConfig().scrollbar.width);
-      var barHeight = getDefaultConfig(getDefaultConfig(scrollbarXOpts.height, scrollbarOpts.height), getConfig().scrollbar.height);
+      var barWidth = $xeList.computeScrollYWidth;
+      var barHeight = $xeList.computeScrollXHeight;
       var stys = {};
       if (rowHeight) {
         stys['--vxe-ui-list-row-height'] = toCssUnit(rowHeight);
@@ -22906,6 +22989,18 @@ function list_createInternalData() {
       var scrollbarOpts = $xeList.computeScrollbarOpts;
       return Object.assign({}, getConfig().scrollbar.yConfig, scrollbarOpts.yConfig);
     },
+    computeScrollXHeight: function computeScrollXHeight() {
+      var $xeList = this;
+      var scrollbarOpts = $xeList.computeScrollbarOpts;
+      var scrollbarXOpts = $xeList.computeScrollbarXOpts;
+      return getDefaultConfig(getDefaultConfig(scrollbarXOpts.height, scrollbarOpts.height), getConfig().scrollbar.height);
+    },
+    computeScrollYWidth: function computeScrollYWidth() {
+      var $xeList = this;
+      var scrollbarOpts = $xeList.computeScrollbarOpts;
+      var scrollbarYOpts = $xeList.computeScrollbarYOpts;
+      return getDefaultConfig(getDefaultConfig(scrollbarYOpts.width, scrollbarOpts.width), getConfig().scrollbar.width);
+    },
     computeScrollXVisible: function computeScrollXVisible() {
       var $xeList = this;
       var scrollbarOpts = $xeList.computeScrollbarOpts;
@@ -22933,20 +23028,13 @@ function list_createInternalData() {
     computeScrollbarWrapperClss: function computeScrollbarWrapperClss() {
       var $xeList = this;
       var reactData = $xeList.reactData;
-      var scrollbarOpts = $xeList.computeScrollbarOpts;
-      var padding = scrollbarOpts.padding;
       var yThumbHeight = reactData.yThumbHeight,
         xThumbWidth = reactData.xThumbWidth;
       var scrollbarXToTop = $xeList.computeScrollbarXToTop;
       var scrollbarYToLeft = $xeList.computeScrollbarYToLeft;
       var scrollXVisible = $xeList.computeScrollXVisible;
       var scrollYVisible = $xeList.computeScrollYVisible;
-      var scrollXAutoHide = $xeList.computeScrollXAutoHide;
-      var scrollYAutoHide = $xeList.computeScrollYAutoHide;
       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')], {
-        'is--padding': padding,
-        'ov-x--auto-hide': scrollXAutoHide,
-        'ov-y--auto-hide': scrollYAutoHide,
         'overflow-y': yThumbHeight,
         'overflow-x': xThumbWidth
       });
@@ -23123,6 +23211,11 @@ function list_createInternalData() {
       var fullData = internalData.fullData;
       return fullData;
     },
+    getParentElem: function getParentElem() {
+      var $xeList = this;
+      var el = $xeList.$refs.refElem;
+      return el ? el.parentElement : null;
+    },
     calcTableHeight: function calcTableHeight(key) {
       var $xeList = this;
       var props = $xeList;
@@ -25319,6 +25412,14 @@ function list_createInternalData() {
       var $xeList = this;
       $xeList.reFlag++;
     },
+    computeScrollYWidth: function computeScrollYWidth() {
+      var $xeList = this;
+      $xeList.reFlag++;
+    },
+    computeScrollXHeight: function computeScrollXHeight() {
+      var $xeList = this;
+      $xeList.reFlag++;
+    },
     computeScrollXVisible: function computeScrollXVisible() {
       var $xeList = this;
       $xeList.$nextTick(function () {
@@ -25383,20 +25484,32 @@ function list_createInternalData() {
     if (useKey && !keyField) {
       list_errLog('vxe.error.reqSupportProp', ['row-config.useKey', 'row-config.keyField']);
     }
-    if (useScrollbar || autoResize) {
-      var el = $xeList.$refs.refElem;
+    var el = $xeList.$refs.refElem;
+    if (useScrollbar) {
       var viewInnerEl = $xeList.$refs.refVirtualBody;
-      var resizeObserver = globalResize.create(function () {
+      var scrollObserver = globalResize.create(function () {
         $xeList.reFlag++;
       });
       if (el) {
-        resizeObserver.observe(el);
-        if (autoResize) {
-          resizeObserver.observe(el.parentElement);
-        }
+        scrollObserver.observe(el);
       }
       if (viewInnerEl) {
-        resizeObserver.observe(viewInnerEl);
+        scrollObserver.observe(viewInnerEl);
+      }
+      internalData.scrollObserver = scrollObserver;
+    }
+    if (autoResize) {
+      var parentEl = $xeList.getParentElem();
+      var resizeObserver = globalResize.create(function () {
+        if (props.autoResize) {
+          $xeList.reFlag++;
+        }
+      });
+      if (el) {
+        resizeObserver.observe(el);
+      }
+      if (parentEl) {
+        resizeObserver.observe(parentEl);
       }
       internalData.resizeObserver = resizeObserver;
     }
@@ -25415,10 +25528,14 @@ function list_createInternalData() {
     var $xeList = this;
     var reactData = $xeList.reactData;
     var internalData = $xeList.internalData;
-    var resizeObserver = internalData.resizeObserver;
+    var scrollObserver = internalData.scrollObserver,
+      resizeObserver = internalData.resizeObserver;
     if (resizeObserver) {
       resizeObserver.disconnect();
     }
+    if (scrollObserver) {
+      scrollObserver.disconnect();
+    }
     globalEvents.off($xeList, 'resize');
     external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().assign(reactData, list_createReactData());
     external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().assign(internalData, list_createInternalData());
@@ -42730,6 +42847,8 @@ var allActiveDrawers = [];
 
 
 
+
+
 
 /* harmony default export */ var drawer = (/* define-vxe-component start */defineVxeComponent({
   name: 'VxeDrawer',
@@ -42920,7 +43039,14 @@ var allActiveDrawers = [];
       }
     },
     beforeHideMethod: Function,
-    slots: Object
+    slots: Object,
+    useScrollbar: {
+      type: Boolean,
+      default: function _default() {
+        return getDefaultConfig(getConfig().drawer.useScrollbar, getConfig().useScrollbar);
+      }
+    },
+    scrollbarConfig: Object
   },
   inject: {
     $xeModal: {
@@ -42993,6 +43119,29 @@ var allActiveDrawers = [];
           return 'wr';
       }
       return 'wl';
+    },
+    computeScrollbarOpts: function computeScrollbarOpts() {
+      var $xeDrawer = this;
+      var props = $xeDrawer;
+      return Object.assign({}, getConfig().modal.scrollbarConfig, props.scrollbarConfig);
+    },
+    computeScrollbarProps: function computeScrollbarProps() {
+      var $xeDrawer = this;
+      var scrollbarOpts = $xeDrawer.computeScrollbarOpts;
+      var viewClassName = scrollbarOpts.viewClassName,
+        viewInnerClassName = scrollbarOpts.viewInnerClassName;
+      return {
+        width: scrollbarOpts.width,
+        height: scrollbarOpts.height,
+        autoHide: scrollbarOpts.autoHide,
+        visible: scrollbarOpts.visible,
+        xConfig: scrollbarOpts.xConfig,
+        yConfig: scrollbarOpts.yConfig,
+        className: scrollbarOpts.className,
+        viewAttrs: scrollbarOpts.viewAttrs,
+        viewClassName: 'vxe-drawer--scrollbar-content-view' + (viewClassName ? ' ' + viewClassName : ''),
+        viewInnerClassName: 'vxe-drawer--scrollbar-content-inner' + (viewClassName ? ' ' + viewInnerClassName : '')
+      };
     }
   }),
   methods: {
@@ -43391,10 +43540,53 @@ var allActiveDrawers = [];
       var _props$slots3 = props.slots,
         propSlots = _props$slots3 === void 0 ? {} : _props$slots3,
         content = props.content,
+        useScrollbar = props.useScrollbar,
         useHtml = props.useHtml;
+      var scrollbarProps = $xeDrawer.computeScrollbarProps;
       var defaultSlot = slots.default || propSlots.default;
       var leftSlot = slots.left || propSlots.left;
       var rightSlot = slots.right || propSlots.right;
+      var contVNs = [];
+      if (useHtml && !defaultSlot) {
+        contVNs.push(useScrollbar ? h(packages_scrollbar, {
+          key: 'shc',
+          class: 'vxe-drawer--scrollbar-content',
+          props: scrollbarProps,
+          scopedSlots: {
+            default: function _default() {
+              return [h('div', {
+                class: 'vxe-drawer--scrollbar-content-html',
+                domProps: {
+                  innerHTML: getFuncText(content)
+                }
+              })];
+            }
+          }
+        }) : h('div', {
+          key: 'hc',
+          class: 'vxe-drawer--content',
+          domProps: {
+            innerHTML: getFuncText(content)
+          }
+        }));
+      } else {
+        contVNs.push(useScrollbar ? h(packages_scrollbar, {
+          key: 'sdc',
+          class: 'vxe-drawer--scrollbar-content',
+          props: scrollbarProps,
+          scopedSlots: {
+            default: function _default() {
+              return defaultSlot ? $xeDrawer.callSlot(defaultSlot, {
+                $drawer: $xeDrawer
+              }, h) : getFuncText(content);
+            }
+          }
+        }) : h('div', {
+          class: 'vxe-drawer--content'
+        }, defaultSlot ? $xeDrawer.callSlot(defaultSlot, {
+          $drawer: $xeDrawer
+        }, h) : getFuncText(content)));
+      }
       return h('div', {
         class: 'vxe-drawer--body'
       }, [leftSlot ? h('div', {
@@ -43403,17 +43595,7 @@ var allActiveDrawers = [];
         $drawer: $xeDrawer
       }, h)) : renderEmptyElement($xeDrawer), h('div', {
         class: 'vxe-drawer--body-default'
-      }, [useHtml && !defaultSlot ? h('div', {
-        key: 'hc',
-        class: 'vxe-drawer--content',
-        domProps: {
-          innerHTML: getFuncText(content)
-        }
-      }) : h('div', {
-        class: 'vxe-drawer--content'
-      }, defaultSlot ? $xeDrawer.callSlot(defaultSlot, {
-        $drawer: $xeDrawer
-      }, h) : getFuncText(content))]), rightSlot ? h('div', {
+      }, contVNs), rightSlot ? h('div', {
         class: 'vxe-drawer--body-right'
       }, $xeDrawer.callSlot(rightSlot, {
         $drawer: $xeDrawer
@@ -48908,6 +49090,7 @@ var ImagePreview = VxeImagePreview;
 
 
 
+
 /* harmony default export */ var layout_aside = (/* define-vxe-component start */defineVxeComponent({
   name: 'VxeLayoutAside',
   mixins: [globalMixins.sizeMixin],
@@ -48921,7 +49104,7 @@ var ImagePreview = VxeImagePreview;
     useScrollbar: {
       type: Boolean,
       default: function _default() {
-        return getConfig().layoutAside.useScrollbar;
+        return getDefaultConfig(getConfig().layoutAside.useScrollbar, getConfig().useScrollbar);
       }
     },
     scrollbarConfig: Object,
@@ -49067,6 +49250,7 @@ var LayoutAside = VxeLayoutAside;
 
 
 
+
 function layout_body_createInternalData() {
   return {};
 }
@@ -49089,7 +49273,7 @@ function layout_body_createReactData() {
     useScrollbar: {
       type: Boolean,
       default: function _default() {
-        return getConfig().layoutBody.useScrollbar;
+        return getDefaultConfig(getConfig().layoutBody.useScrollbar, getConfig().useScrollbar);
       }
     },
     scrollbarConfig: Object,
@@ -49695,7 +49879,7 @@ var nemuUniqueKey = 100000000;
     useScrollbar: {
       type: Boolean,
       default: function _default() {
-        return menu_getConfig().menu.useScrollbar;
+        return getDefaultConfig(menu_getConfig().menu.useScrollbar, menu_getConfig().useScrollbar);
       }
     },
     scrollbarConfig: Object,
@@ -50575,6 +50759,7 @@ var allActiveModals = [];
 
 
 
+
 
 
 var modal_createComponentLog = createComponentLog('modal'),
@@ -50859,6 +51044,13 @@ var lockScrollCssWidthKey = '--vxe-ui-modal-lock-scroll-view-width';
     },
     beforeHideMethod: Function,
     slots: Object,
+    useScrollbar: {
+      type: Boolean,
+      default: function _default() {
+        return getDefaultConfig(getConfig().modal.useScrollbar, getConfig().useScrollbar);
+      }
+    },
+    scrollbarConfig: Object,
     /**
      * 已废弃
      * @deprecated
@@ -50949,6 +51141,29 @@ var lockScrollCssWidthKey = '--vxe-ui-modal-lock-scroll-view-width';
       var $xeModal = this;
       var props = $xeModal;
       return Object.assign({}, getConfig().modal.zoomConfig, props.zoomConfig);
+    },
+    computeScrollbarOpts: function computeScrollbarOpts() {
+      var $xeModal = this;
+      var props = $xeModal;
+      return Object.assign({}, getConfig().modal.scrollbarConfig, props.scrollbarConfig);
+    },
+    computeScrollbarProps: function computeScrollbarProps() {
+      var $xeModal = this;
+      var scrollbarOpts = $xeModal.computeScrollbarOpts;
+      var viewClassName = scrollbarOpts.viewClassName,
+        viewInnerClassName = scrollbarOpts.viewInnerClassName;
+      return {
+        width: scrollbarOpts.width,
+        height: scrollbarOpts.height,
+        autoHide: scrollbarOpts.autoHide,
+        visible: scrollbarOpts.visible,
+        xConfig: scrollbarOpts.xConfig,
+        yConfig: scrollbarOpts.yConfig,
+        className: scrollbarOpts.className,
+        viewAttrs: scrollbarOpts.viewAttrs,
+        viewClassName: 'vxe-modal--scrollbar-content-view' + (viewClassName ? ' ' + viewClassName : ''),
+        viewInnerClassName: 'vxe-modal--scrollbar-content-inner' + (viewClassName ? ' ' + viewInnerClassName : '')
+      };
     }
   }),
   watch: {
@@ -52169,9 +52384,11 @@ var lockScrollCssWidthKey = '--vxe-ui-modal-lock-scroll-view-width';
         status = props.status,
         message = props.message,
         iconStatus = props.iconStatus,
+        useScrollbar = props.useScrollbar,
         useHtml = props.useHtml;
       var content = props.content || message;
       var isMsg = $xeModal.computeIsMsg;
+      var scrollbarProps = $xeModal.computeScrollbarProps;
       var defaultSlot = slots.default || propSlots.default;
       var leftSlot = slots.left || propSlots.left;
       var rightSlot = slots.right || propSlots.right;
@@ -52183,18 +52400,47 @@ var lockScrollCssWidthKey = '--vxe-ui-modal-lock-scroll-view-width';
           class: ['vxe-modal--status-icon', iconStatus || getIcon()["MODAL_".concat(status).toLocaleUpperCase()]]
         })]));
       }
-      contVNs.push(useHtml && !defaultSlot ? h('div', {
-        key: 'hc',
-        class: 'vxe-modal--content',
-        domProps: {
-          innerHTML: getFuncText(content)
-        }
-      }) : h('div', {
-        key: 'dc',
-        class: 'vxe-modal--content'
-      }, defaultSlot ? $xeModal.callSlot(defaultSlot, {
-        $modal: $xeModal
-      }, h) : getFuncText(content)));
+      if (useHtml && !defaultSlot) {
+        contVNs.push(useScrollbar ? h(packages_scrollbar, {
+          key: 'shc',
+          class: 'vxe-modal--scrollbar-content',
+          props: scrollbarProps,
+          scopedSlots: {
+            default: function _default() {
+              return [h('div', {
+                class: 'vxe-modal--scrollbar-content-html',
+                domProps: {
+                  innerHTML: getFuncText(content)
+                }
+              })];
+            }
+          }
+        }) : h('div', {
+          key: 'hc',
+          class: 'vxe-modal--content',
+          domProps: {
+            innerHTML: getFuncText(content)
+          }
+        }));
+      } else {
+        contVNs.push(useScrollbar ? h(packages_scrollbar, {
+          key: 'sdc',
+          class: 'vxe-modal--scrollbar-content',
+          props: scrollbarProps,
+          scopedSlots: {
+            default: function _default() {
+              return defaultSlot ? $xeModal.callSlot(defaultSlot, {
+                $modal: $xeModal
+              }, h) : getFuncText(content);
+            }
+          }
+        }) : h('div', {
+          key: 'dc',
+          class: 'vxe-modal--content'
+        }, defaultSlot ? $xeModal.callSlot(defaultSlot, {
+          $modal: $xeModal
+        }, h) : getFuncText(content)));
+      }
       return h('div', {
         class: 'vxe-modal--body'
       }, [leftSlot ? h('div', {
@@ -63101,7 +63347,7 @@ var scrollbarOffsetSize = 20;
     useScrollbar: {
       type: Boolean,
       default: function _default() {
-        return getConfig().tabs.useScrollbar;
+        return getDefaultConfig(getConfig().tabs.useScrollbar, getConfig().useScrollbar);
       }
     },
     scrollbarConfig: Object,
@@ -66174,8 +66420,9 @@ function tree_createInternalData() {
     indeterminateNodeMaps: {},
     treeExpandedMaps: {},
     treeExpandLazyLoadedMaps: {},
-    // 滚动条
     // resizeObserver: undefined,
+    // 滚动条
+    // scrollObserver: undefined,
     // isThumbDrag: false,
     thumbDragOffset: 0,
     yThumbTop: 0,
@@ -66380,7 +66627,7 @@ function tree_createInternalData() {
     useScrollbar: {
       type: Boolean,
       default: function _default() {
-        return tree_getConfig().tree.useScrollbar;
+        return getDefaultConfig(tree_getConfig().tree.useScrollbar, tree_getConfig().useScrollbar);
       }
     },
     scrollbarConfig: Object
@@ -66505,11 +66752,8 @@ function tree_createInternalData() {
     },
     computeWrapperStyles: function computeWrapperStyles() {
       var $xeTree = this;
-      var scrollbarOpts = $xeTree.computeScrollbarOpts;
-      var scrollbarXOpts = $xeTree.computeScrollbarXOpts;
-      var scrollbarYOpts = $xeTree.computeScrollbarYOpts;
-      var barWidth = getDefaultConfig(getDefaultConfig(scrollbarYOpts.width, scrollbarOpts.width), tree_getConfig().scrollbar.width);
-      var barHeight = getDefaultConfig(getDefaultConfig(scrollbarXOpts.height, scrollbarOpts.height), tree_getConfig().scrollbar.height);
+      var barWidth = $xeTree.computeScrollYWidth;
+      var barHeight = $xeTree.computeScrollXHeight;
       var stys = {};
       if (barWidth || barHeight) {
         stys['--vxe-ui-scrollbar-y-width'] = toCssUnit(barWidth || barHeight);
@@ -66574,6 +66818,18 @@ function tree_createInternalData() {
       var scrollbarOpts = $xeTree.computeScrollbarOpts;
       return Object.assign({}, tree_getConfig().scrollbar.yConfig, scrollbarOpts.yConfig);
     },
+    computeScrollXHeight: function computeScrollXHeight() {
+      var $xeTree = this;
+      var scrollbarOpts = $xeTree.computeScrollbarOpts;
+      var scrollbarXOpts = $xeTree.computeScrollbarXOpts;
+      return getDefaultConfig(getDefaultConfig(scrollbarXOpts.height, scrollbarOpts.height), tree_getConfig().scrollbar.height);
+    },
+    computeScrollYWidth: function computeScrollYWidth() {
+      var $xeTree = this;
+      var scrollbarOpts = $xeTree.computeScrollbarOpts;
+      var scrollbarYOpts = $xeTree.computeScrollbarYOpts;
+      return getDefaultConfig(getDefaultConfig(scrollbarYOpts.width, scrollbarOpts.width), tree_getConfig().scrollbar.width);
+    },
     computeScrollXVisible: function computeScrollXVisible() {
       var $xeTree = this;
       var scrollbarOpts = $xeTree.computeScrollbarOpts;
@@ -66601,20 +66857,13 @@ function tree_createInternalData() {
     computeScrollbarWrapperClss: function computeScrollbarWrapperClss() {
       var $xeTree = this;
       var reactData = $xeTree.reactData;
-      var scrollbarOpts = $xeTree.computeScrollbarOpts;
-      var padding = scrollbarOpts.padding;
       var yThumbHeight = reactData.yThumbHeight,
         xThumbWidth = reactData.xThumbWidth;
       var scrollbarXToTop = $xeTree.computeScrollbarXToTop;
       var scrollbarYToLeft = $xeTree.computeScrollbarYToLeft;
       var scrollXVisible = $xeTree.computeScrollXVisible;
       var scrollYVisible = $xeTree.computeScrollYVisible;
-      var scrollXAutoHide = $xeTree.computeScrollXAutoHide;
-      var scrollYAutoHide = $xeTree.computeScrollYAutoHide;
       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')], {
-        'is--padding': padding,
-        'ov-x--auto-hide': scrollXAutoHide,
-        'ov-y--auto-hide': scrollYAutoHide,
         'overflow-y': yThumbHeight,
         'overflow-x': xThumbWidth
       });
@@ -69867,6 +70116,14 @@ function tree_createInternalData() {
       var $xeTree = this;
       $xeTree.reFlag++;
     },
+    computeScrollYWidth: function computeScrollYWidth() {
+      var $xeTree = this;
+      $xeTree.reFlag++;
+    },
+    computeScrollXHeight: function computeScrollXHeight() {
+      var $xeTree = this;
+      $xeTree.reFlag++;
+    },
     computeScrollXVisible: function computeScrollXVisible() {
       var $xeTree = this;
       $xeTree.$nextTick(function () {
@@ -69926,23 +70183,32 @@ function tree_createInternalData() {
     if (menuConfig && !VxeUIContextMenu) {
       tree_errLog('vxe.error.reqComp', ['vxe-context-menu']);
     }
-    if (useScrollbar || autoResize) {
-      var el = $xeTree.$refs.refElem;
+    var el = $xeTree.$refs.refElem;
+    if (useScrollbar) {
       var viewInnerEl = $xeTree.$refs.refVirtualBody;
+      var scrollObserver = globalResize.create(function () {
+        $xeTree.updateScrollbar();
+      });
+      if (el) {
+        scrollObserver.observe(el);
+      }
+      if (viewInnerEl) {
+        scrollObserver.observe(viewInnerEl);
+      }
+      internalData.scrollObserver = scrollObserver;
+    }
+    if (autoResize) {
       var parentEl = $xeTree.getParentElem();
       var resizeObserver = globalResize.create(function () {
-        $xeTree.reFlag++;
+        if (props.autoResize) {
+          $xeTree.reFlag++;
+        }
       });
       if (el) {
         resizeObserver.observe(el);
-        if (autoResize) {
-          if (parentEl) {
-            resizeObserver.observe(parentEl);
-          }
-        }
       }
-      if (viewInnerEl) {
-        resizeObserver.observe(viewInnerEl);
+      if (parentEl) {
+        resizeObserver.observe(parentEl);
       }
       internalData.resizeObserver = resizeObserver;
     }
@@ -69955,10 +70221,14 @@ function tree_createInternalData() {
     var $xeTree = this;
     var reactData = $xeTree.reactData;
     var internalData = $xeTree.internalData;
-    var resizeObserver = internalData.resizeObserver;
+    var scrollObserver = internalData.scrollObserver,
+      resizeObserver = internalData.resizeObserver;
     if (resizeObserver) {
       resizeObserver.disconnect();
     }
+    if (scrollObserver) {
+      scrollObserver.disconnect();
+    }
     globalEvents.off($xeTree, 'resize');
     external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().assign(reactData, tree_createReactData());
     external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().assign(internalData, tree_createInternalData());