vxe-pc-ui 3.20.1 → 3.20.5

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.5");
 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.5";
 VxeUI.uiVersion = ui_version;
 VxeUI.dynamicApp = dynamicApp;
 function config(options) {
@@ -20825,61 +20893,6 @@ VxeUI.component(loading);
 VxeUI.loading = LoadingController;
 var Loading = VxeLoading;
 /* harmony default export */ var packages_loading = (VxeLoading);
-;// ./packages/scrollbar/src/util.ts
-/**
- * 计算滚动条滑块的长度
- */
-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));
-}
-/**
- * 计算滚动条滑块的偏移位置
- */
-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;
-}
-/**
- * 根据点击轨道的位置，计算滑块的偏移位置
- */
-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 时，根据鼠标位置计算滑块的偏移位置
- */
-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;
-}
 ;// ./packages/scrollbar/src/scrollbar.ts
 
 
@@ -20890,13 +20903,17 @@ function getScrollFromDrag(pointerPosition, dragOffset, viewportSize, contentSiz
 
 
 
-
 var scrollbar_getConfig = VxeUI.getConfig,
   scrollbar_createEvent = VxeUI.createEvent,
   scrollbar_domUtils = VxeUI.domUtils,
+  scrollbar_scrollbarUtils = VxeUI.scrollbarUtils,
   scrollbar_globalResize = VxeUI.globalResize,
   scrollbar_globalEvents = VxeUI.globalEvents,
   scrollbar_renderEmptyElement = VxeUI.renderEmptyElement;
+var getThumbOffsetSize = scrollbar_scrollbarUtils.getThumbOffsetSize,
+  getThumbSize = scrollbar_scrollbarUtils.getThumbSize,
+  getScrollFromClick = scrollbar_scrollbarUtils.getScrollFromClick,
+  getScrollFromDrag = scrollbar_scrollbarUtils.getScrollFromDrag;
 function scrollbar_createReactData() {
   return {
     yThumbHeight: 0,
@@ -21003,10 +21020,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 +21047,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 +21580,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 +21684,7 @@ var Scrollbar = VxeScrollbar;
 
 
 
+
 /* harmony default export */ var card = (/* define-vxe-component start */defineVxeComponent({
   name: 'VxeCard',
   mixins: [globalMixins.sizeMixin],
@@ -21692,7 +21726,7 @@ var Scrollbar = VxeScrollbar;
     useScrollbar: {
       type: Boolean,
       default: function _default() {
-        return getConfig().card.useScrollbar;
+        return getDefaultConfig(getConfig().card.useScrollbar, getConfig().useScrollbar);
       }
     },
     scrollbarConfig: Object
@@ -22660,7 +22694,18 @@ function getItemCacheObj(item) {
 
 
 
-
+var list_getConfig = VxeUI.getConfig,
+  list_getIcon = VxeUI.getIcon,
+  list_getI18n = VxeUI.getI18n,
+  list_domUtils = VxeUI.domUtils,
+  list_scrollbarUtils = VxeUI.scrollbarUtils,
+  list_menus = VxeUI.menus,
+  list_globalEvents = VxeUI.globalEvents,
+  list_globalResize = VxeUI.globalResize;
+var list_getThumbOffsetSize = list_scrollbarUtils.getThumbOffsetSize,
+  list_getThumbSize = list_scrollbarUtils.getThumbSize,
+  list_getScrollFromClick = list_scrollbarUtils.getScrollFromClick,
+  list_getScrollFromDrag = list_scrollbarUtils.getScrollFromDrag;
 var list_createComponentLog = createComponentLog('tree'),
   list_warnLog = list_createComponentLog.warnLog,
   list_errLog = list_createComponentLog.errLog;
@@ -22710,8 +22755,9 @@ function list_createInternalData() {
     afterList: [],
     fullKeyMaps: {},
     rowMaps: {},
-    // 滚动条
     // resizeObserver: undefined,
+    // 滚动条
+    // scrollObserver: undefined,
     // isThumbDrag: false,
     thumbDragOffset: 0,
     yThumbTop: 0,
@@ -22745,26 +22791,26 @@ function list_createInternalData() {
     size: {
       type: String,
       default: function _default() {
-        return getConfig().list.size || getConfig().size;
+        return list_getConfig().list.size || list_getConfig().size;
       }
     },
     autoResize: {
       type: Boolean,
       default: function _default() {
-        return getConfig().list.autoResize;
+        return list_getConfig().list.autoResize;
       }
     },
     syncResize: [Boolean, String, Number],
     showSeq: {
       type: Boolean,
       default: function _default() {
-        return getConfig().list.showSeq;
+        return list_getConfig().list.showSeq;
       }
     },
     showRadio: {
       type: Boolean,
       default: function _default() {
-        return getConfig().list.showRadio;
+        return list_getConfig().list.showRadio;
       }
     },
     checkRowKey: [String, Number],
@@ -22772,7 +22818,7 @@ function list_createInternalData() {
     showCheckbox: {
       type: Boolean,
       default: function _default() {
-        return getConfig().list.showCheckbox;
+        return list_getConfig().list.showCheckbox;
       }
     },
     checkRowKeys: Array,
@@ -22785,7 +22831,7 @@ function list_createInternalData() {
     useScrollbar: {
       type: Boolean,
       default: function _default() {
-        return getConfig().list.useScrollbar;
+        return getDefaultConfig(list_getConfig().list.useScrollbar, list_getConfig().useScrollbar);
       }
     },
     scrollbarConfig: Object
@@ -22804,17 +22850,17 @@ function list_createInternalData() {
     computeRowOpts: function computeRowOpts() {
       var $xeList = this;
       var props = $xeList;
-      return Object.assign({}, getConfig().list.rowConfig, props.rowConfig);
+      return Object.assign({}, list_getConfig().list.rowConfig, props.rowConfig);
     },
     computeDragOpts: function computeDragOpts() {
       var $xeList = this;
       var props = $xeList;
-      return Object.assign({}, getConfig().list.dragConfig, props.dragConfig);
+      return Object.assign({}, list_getConfig().list.dragConfig, props.dragConfig);
     },
     computeSYOpts: function computeSYOpts() {
       var $xeList = this;
       var props = $xeList;
-      return Object.assign({}, getConfig().list.virtualYConfig || getConfig().list.scrollY, props.virtualYConfig || props.scrollY);
+      return Object.assign({}, list_getConfig().list.virtualYConfig || list_getConfig().list.scrollY, props.virtualYConfig || props.scrollY);
     },
     computeKeyField: function computeKeyField() {
       var $xeList = this;
@@ -22840,28 +22886,25 @@ function list_createInternalData() {
       var props = $xeList;
       return Object.assign({
         showIcon: true
-      }, getConfig().list.radioConfig, props.radioConfig);
+      }, list_getConfig().list.radioConfig, props.radioConfig);
     },
     computeCheckboxOpts: function computeCheckboxOpts() {
       var $xeList = this;
       var props = $xeList;
       return Object.assign({
         showIcon: true
-      }, getConfig().list.checkboxConfig, props.checkboxConfig);
+      }, list_getConfig().list.checkboxConfig, props.checkboxConfig);
     },
     computeMenuOpts: function computeMenuOpts() {
       var $xeList = this;
       var props = $xeList;
-      return Object.assign({}, getConfig().list.menuConfig, props.menuConfig);
+      return Object.assign({}, list_getConfig().list.menuConfig, props.menuConfig);
     },
     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);
@@ -22894,17 +22937,29 @@ function list_createInternalData() {
     computeScrollbarOpts: function computeScrollbarOpts() {
       var $xeList = this;
       var props = $xeList;
-      return Object.assign({}, getConfig().list.scrollbarConfig, props.scrollbarConfig);
+      return Object.assign({}, list_getConfig().list.scrollbarConfig, props.scrollbarConfig);
     },
     computeScrollbarXOpts: function computeScrollbarXOpts() {
       var $xeList = this;
       var scrollbarOpts = $xeList.computeScrollbarOpts;
-      return Object.assign({}, getConfig().scrollbar.xConfig, scrollbarOpts.xConfig);
+      return Object.assign({}, list_getConfig().scrollbar.xConfig, scrollbarOpts.xConfig);
     },
     computeScrollbarYOpts: function computeScrollbarYOpts() {
       var $xeList = this;
       var scrollbarOpts = $xeList.computeScrollbarOpts;
-      return Object.assign({}, getConfig().scrollbar.yConfig, scrollbarOpts.yConfig);
+      return Object.assign({}, list_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), list_getConfig().scrollbar.height);
+    },
+    computeScrollYWidth: function computeScrollYWidth() {
+      var $xeList = this;
+      var scrollbarOpts = $xeList.computeScrollbarOpts;
+      var scrollbarYOpts = $xeList.computeScrollbarYOpts;
+      return getDefaultConfig(getDefaultConfig(scrollbarYOpts.width, scrollbarOpts.width), list_getConfig().scrollbar.width);
     },
     computeScrollXVisible: function computeScrollXVisible() {
       var $xeList = this;
@@ -22922,31 +22977,24 @@ function list_createInternalData() {
       var $xeList = this;
       var scrollbarOpts = $xeList.computeScrollbarOpts;
       var scrollbarXOpts = $xeList.computeScrollbarXOpts;
-      return getDefaultConfig(getDefaultConfig(scrollbarXOpts.autoHide, scrollbarOpts.autoHide), getConfig().scrollbar.autoHide);
+      return getDefaultConfig(getDefaultConfig(scrollbarXOpts.autoHide, scrollbarOpts.autoHide), list_getConfig().scrollbar.autoHide);
     },
     computeScrollYAutoHide: function computeScrollYAutoHide() {
       var $xeList = this;
       var scrollbarOpts = $xeList.computeScrollbarOpts;
       var scrollbarYOpts = $xeList.computeScrollbarYOpts;
-      return getDefaultConfig(getDefaultConfig(scrollbarYOpts.autoHide, scrollbarOpts.autoHide), getConfig().scrollbar.autoHide);
+      return getDefaultConfig(getDefaultConfig(scrollbarYOpts.autoHide, scrollbarOpts.autoHide), list_getConfig().scrollbar.autoHide);
     },
     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,
+      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')], {
         'overflow-y': yThumbHeight,
         'overflow-x': xThumbWidth
       });
@@ -23123,6 +23171,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;
@@ -23862,7 +23915,7 @@ function list_createInternalData() {
         };
         tipContent = "".concat(rTooltipMethod(rtParams) || '');
       } else {
-        tipContent = getI18n('vxe.list.dragTip', [rowEl.textContent || '']);
+        tipContent = list_getI18n('vxe.list.dragTip', [rowEl.textContent || '']);
       }
       reactData.dragTipText = tipContent;
     },
@@ -24699,7 +24752,7 @@ function list_createInternalData() {
               events: {
                 optionClick: function optionClick(eventParams) {
                   var option = eventParams.option;
-                  var gMenuOpts = menus.get(option.code);
+                  var gMenuOpts = list_menus.get(option.code);
                   var tmMethod = gMenuOpts ? gMenuOpts.listMenuMethod : null;
                   var params = {
                     menu: option,
@@ -24733,14 +24786,14 @@ function list_createInternalData() {
         return;
       }
       var trackXEl = $xeList.$refs.refTrackXElem;
-      var xThumbWidth = trackXEl ? getThumbSize(viewEl.clientWidth, viewEl.scrollWidth, trackXEl.clientWidth) : 0;
+      var xThumbWidth = trackXEl ? list_getThumbSize(viewEl.clientWidth, viewEl.scrollWidth, trackXEl.clientWidth) : 0;
       var thumbXElem = $xeList.$refs.refThumbXElem;
       if (thumbXElem) {
         thumbXElem.style.width = xThumbWidth + 'px';
       }
       reactData.xThumbWidth = xThumbWidth;
       var trackYEl = $xeList.$refs.refTrackYElem;
-      var yThumbHeight = trackYEl ? getThumbSize(viewEl.clientHeight, viewEl.scrollHeight, trackYEl.clientHeight) : 0;
+      var yThumbHeight = trackYEl ? list_getThumbSize(viewEl.clientHeight, viewEl.scrollHeight, trackYEl.clientHeight) : 0;
       var thumbYElem = $xeList.$refs.refThumbYElem;
       if (thumbYElem) {
         thumbYElem.style.height = yThumbHeight + 'px';
@@ -24762,7 +24815,7 @@ function list_createInternalData() {
         yThumbHeight = reactData.yThumbHeight;
       var trackXEl = $xeList.$refs.refTrackXElem;
       var thumbXElem = $xeList.$refs.refThumbXElem;
-      var xThumbLeft = trackXEl && xThumbWidth ? getThumbOffsetSize(viewEl.scrollLeft, viewEl.clientWidth, viewEl.scrollWidth, trackXEl.clientWidth, xThumbWidth) : 0;
+      var xThumbLeft = trackXEl && xThumbWidth ? list_getThumbOffsetSize(viewEl.scrollLeft, viewEl.clientWidth, viewEl.scrollWidth, trackXEl.clientWidth, xThumbWidth) : 0;
       internalData.xThumbLeft = xThumbLeft;
       if (thumbXElem && xThumbWidth) {
         thumbXElem.style.width = xThumbWidth + 'px';
@@ -24770,7 +24823,7 @@ function list_createInternalData() {
       }
       var trackYEl = $xeList.$refs.refTrackYElem;
       var thumbYElem = $xeList.$refs.refThumbYElem;
-      var yThumbTop = trackYEl && yThumbHeight ? getThumbOffsetSize(viewEl.scrollTop, viewEl.clientHeight, viewEl.scrollHeight, trackYEl.clientHeight, yThumbHeight) : 0;
+      var yThumbTop = trackYEl && yThumbHeight ? list_getThumbOffsetSize(viewEl.scrollTop, viewEl.clientHeight, viewEl.scrollHeight, trackYEl.clientHeight, yThumbHeight) : 0;
       internalData.yThumbTop = yThumbTop;
       if (thumbYElem && yThumbHeight) {
         thumbYElem.style.height = yThumbHeight + 'px';
@@ -24791,7 +24844,7 @@ function list_createInternalData() {
       var xThumbWidth = reactData.xThumbWidth;
       var trackRect = trackEl.getBoundingClientRect();
       viewEl.scrollTo({
-        left: getScrollFromClick(evnt.clientX - trackRect.left, viewEl.clientWidth, viewEl.scrollWidth, trackEl.clientWidth, xThumbWidth),
+        left: list_getScrollFromClick(evnt.clientX - trackRect.left, viewEl.clientWidth, viewEl.scrollWidth, trackEl.clientWidth, xThumbWidth),
         behavior: 'auto'
       });
     },
@@ -24809,7 +24862,7 @@ function list_createInternalData() {
       var yThumbHeight = reactData.yThumbHeight;
       var trackRect = trackEl.getBoundingClientRect();
       viewEl.scrollTo({
-        top: getScrollFromClick(evnt.clientY - trackRect.top, viewEl.clientHeight, viewEl.scrollHeight, trackEl.clientHeight, yThumbHeight),
+        top: list_getScrollFromClick(evnt.clientY - trackRect.top, viewEl.clientHeight, viewEl.scrollHeight, trackEl.clientHeight, yThumbHeight),
         behavior: 'auto'
       });
     },
@@ -24829,7 +24882,7 @@ function list_createInternalData() {
       var trackRect = trackEl.getBoundingClientRect();
       var pointerPosition = evnt.clientX - trackRect.left;
       // 记录 thumb 的偏移
-      var thumbOffset = getThumbOffsetSize(viewEl.scrollLeft, viewEl.clientWidth, viewEl.scrollWidth, trackEl.clientWidth, xThumbWidth);
+      var thumbOffset = list_getThumbOffsetSize(viewEl.scrollLeft, viewEl.clientWidth, viewEl.scrollWidth, trackEl.clientWidth, xThumbWidth);
       internalData.thumbDragOffset = pointerPosition - thumbOffset;
     },
     pointermoveThumbXEvent: function pointermoveThumbXEvent(evnt) {
@@ -24852,7 +24905,7 @@ function list_createInternalData() {
         var trackEl = _thumbEl.parentElement;
         var trackRect = trackEl.getBoundingClientRect();
         // 更新偏移
-        viewEl.scrollLeft = getScrollFromDrag(evnt.clientX - trackRect.left, thumbDragOffset, viewEl.clientWidth, viewEl.scrollWidth, trackEl.clientWidth, xThumbWidth);
+        viewEl.scrollLeft = list_getScrollFromDrag(evnt.clientX - trackRect.left, thumbDragOffset, viewEl.clientWidth, viewEl.scrollWidth, trackEl.clientWidth, xThumbWidth);
       }
     },
     cleatPointerThumbEvent: function cleatPointerThumbEvent(evnt) {
@@ -24878,7 +24931,7 @@ function list_createInternalData() {
       var trackRect = trackEl.getBoundingClientRect();
       var pointerPosition = evnt.clientY - trackRect.top;
       // 记录 thumb 的偏移
-      var thumbOffset = getThumbOffsetSize(viewEl.scrollTop, viewEl.clientHeight, viewEl.scrollHeight, trackEl.clientHeight, yThumbHeight);
+      var thumbOffset = list_getThumbOffsetSize(viewEl.scrollTop, viewEl.clientHeight, viewEl.scrollHeight, trackEl.clientHeight, yThumbHeight);
       internalData.thumbDragOffset = pointerPosition - thumbOffset;
     },
     pointermoveThumbYEvent: function pointermoveThumbYEvent(evnt) {
@@ -24901,7 +24954,7 @@ function list_createInternalData() {
         var trackEl = _thumbEl2.parentElement;
         var trackRect = trackEl.getBoundingClientRect();
         // 更新偏移
-        viewEl.scrollTop = getScrollFromDrag(evnt.clientY - trackRect.top, thumbDragOffset, viewEl.clientHeight, viewEl.scrollHeight, trackEl.clientHeight, yThumbHeight);
+        viewEl.scrollTop = list_getScrollFromDrag(evnt.clientY - trackRect.top, thumbDragOffset, viewEl.clientHeight, viewEl.scrollHeight, trackEl.clientHeight, yThumbHeight);
       }
     },
     //
@@ -24931,9 +24984,9 @@ function list_createInternalData() {
         }, [h('div', {
           class: 'vxe-list--drag-sort-tip-status'
         }, [h('span', {
-          class: ['vxe-list--drag-sort-tip-normal-status', getIcon().LIST_DRAG_STATUS_NODE]
+          class: ['vxe-list--drag-sort-tip-normal-status', list_getIcon().LIST_DRAG_STATUS_NODE]
         }), h('span', {
-          class: ['vxe-list--drag-sort-tip-disabled-status', getIcon().LIST_DRAG_DISABLED]
+          class: ['vxe-list--drag-sort-tip-disabled-status', list_getIcon().LIST_DRAG_DISABLED]
         })]), h('div', {
           class: 'vxe-list--drag-sort-tip-content'
         }, dragTipText)])]) : renderEmptyElement($xeList)]);
@@ -24966,7 +25019,7 @@ function list_createInternalData() {
             }
           }
         }, [h('span', {
-          class: ['vxe-radio--icon', isChecked ? getIcon().RADIO_CHECKED : isDisabled ? getIcon().RADIO_DISABLED_UNCHECKED : getIcon().RADIO_UNCHECKED]
+          class: ['vxe-radio--icon', isChecked ? list_getIcon().RADIO_CHECKED : isDisabled ? list_getIcon().RADIO_DISABLED_UNCHECKED : list_getIcon().RADIO_UNCHECKED]
         })]);
       }
       return renderEmptyElement($xeList);
@@ -24997,7 +25050,7 @@ function list_createInternalData() {
             }
           }
         }, [h('span', {
-          class: ['vxe-checkbox--icon', isChecked ? getIcon().CHECKBOX_CHECKED : isDisabled ? getIcon().CHECKBOX_DISABLED_UNCHECKED : getIcon().CHECKBOX_UNCHECKED]
+          class: ['vxe-checkbox--icon', isChecked ? list_getIcon().CHECKBOX_CHECKED : isDisabled ? list_getIcon().CHECKBOX_DISABLED_UNCHECKED : list_getIcon().CHECKBOX_UNCHECKED]
         })]);
       }
       return renderEmptyElement($xeList);
@@ -25083,7 +25136,7 @@ function list_createInternalData() {
           class: 'vxe-list--drag-handle',
           on: handleOns
         }, [h('i', {
-          class: icon || getIcon().LIST_DRAG
+          class: icon || list_getIcon().LIST_DRAG
         })])]));
       }
       ctVNs.push(h('div', {
@@ -25198,7 +25251,7 @@ function list_createInternalData() {
           click: $xeList.changeCheckboxAllEvent
         }
       }, [h('span', {
-        class: ['vxe-checkbox--icon', isAllChecked ? getIcon().CHECKBOX_CHECKED : isAllIndeterminate ? getIcon().CHECKBOX_INDETERMINATE : getIcon().CHECKBOX_UNCHECKED]
+        class: ['vxe-checkbox--icon', isAllChecked ? list_getIcon().CHECKBOX_CHECKED : isAllIndeterminate ? list_getIcon().CHECKBOX_INDETERMINATE : list_getIcon().CHECKBOX_UNCHECKED]
       })])]) : renderEmptyElement($xeList), headerSlot ? h('div', {
         class: 'vxe-list--header-content'
       }, headerSlot({
@@ -25319,6 +25372,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,25 +25444,37 @@ 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 = list_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 = list_globalResize.create(function () {
+        if (props.autoResize) {
+          $xeList.reFlag++;
+        }
+      });
+      if (el) {
+        resizeObserver.observe(el);
+      }
+      if (parentEl) {
+        resizeObserver.observe(parentEl);
       }
       internalData.resizeObserver = resizeObserver;
     }
     $xeList.reFlag++;
-    globalEvents.on($xeList, 'resize', function () {
+    list_globalEvents.on($xeList, 'resize', function () {
       $xeList.reFlag++;
     });
   },
@@ -25415,11 +25488,15 @@ 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();
     }
-    globalEvents.off($xeList, 'resize');
+    if (scrollObserver) {
+      scrollObserver.disconnect();
+    }
+    list_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 +42807,8 @@ var allActiveDrawers = [];
 
 
 
+
+
 
 /* harmony default export */ var drawer = (/* define-vxe-component start */defineVxeComponent({
   name: 'VxeDrawer',
@@ -42920,7 +42999,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 +43079,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 +43500,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 +43555,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 +49050,7 @@ var ImagePreview = VxeImagePreview;
 
 
 
+
 /* harmony default export */ var layout_aside = (/* define-vxe-component start */defineVxeComponent({
   name: 'VxeLayoutAside',
   mixins: [globalMixins.sizeMixin],
@@ -48921,7 +49064,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 +49210,7 @@ var LayoutAside = VxeLayoutAside;
 
 
 
+
 function layout_body_createInternalData() {
   return {};
 }
@@ -49089,7 +49233,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 +49839,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 +50719,7 @@ var allActiveModals = [];
 
 
 
+
 
 
 var modal_createComponentLog = createComponentLog('modal'),
@@ -50859,6 +51004,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 +51101,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 +52344,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 +52360,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 +63307,7 @@ var scrollbarOffsetSize = 20;
     useScrollbar: {
       type: Boolean,
       default: function _default() {
-        return getConfig().tabs.useScrollbar;
+        return getDefaultConfig(getConfig().tabs.useScrollbar, getConfig().useScrollbar);
       }
     },
     scrollbarConfig: Object,
@@ -65636,16 +65842,20 @@ function getCrossTreeDragNodeInfo($xeTree) {
 
 
 
-
 
 
 var tree_createComponentLog = createComponentLog('tree'),
   tree_warnLog = tree_createComponentLog.warnLog,
   tree_errLog = tree_createComponentLog.errLog;
 var tree_menus = VxeUI.menus,
+  tree_scrollbarUtils = VxeUI.scrollbarUtils,
   tree_getConfig = VxeUI.getConfig,
   tree_getI18n = VxeUI.getI18n,
   tree_getIcon = VxeUI.getIcon;
+var tree_getThumbOffsetSize = tree_scrollbarUtils.getThumbOffsetSize,
+  tree_getThumbSize = tree_scrollbarUtils.getThumbSize,
+  tree_getScrollFromClick = tree_scrollbarUtils.getScrollFromClick,
+  tree_getScrollFromDrag = tree_scrollbarUtils.getScrollFromDrag;
 var crossTreeDragNodeObj = null;
 /**
  * 生成节点的唯一主键
@@ -66174,8 +66384,9 @@ function tree_createInternalData() {
     indeterminateNodeMaps: {},
     treeExpandedMaps: {},
     treeExpandLazyLoadedMaps: {},
-    // 滚动条
     // resizeObserver: undefined,
+    // 滚动条
+    // scrollObserver: undefined,
     // isThumbDrag: false,
     thumbDragOffset: 0,
     yThumbTop: 0,
@@ -66380,7 +66591,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 +66716,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 +66782,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 +66821,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
       });
@@ -69154,14 +69367,14 @@ function tree_createInternalData() {
         return;
       }
       var trackXEl = $xeTree.$refs.refTrackXElem;
-      var xThumbWidth = trackXEl ? getThumbSize(viewEl.clientWidth, viewEl.scrollWidth, trackXEl.clientWidth) : 0;
+      var xThumbWidth = trackXEl ? tree_getThumbSize(viewEl.clientWidth, viewEl.scrollWidth, trackXEl.clientWidth) : 0;
       var thumbXElem = $xeTree.$refs.refThumbXElem;
       if (thumbXElem) {
         thumbXElem.style.width = xThumbWidth + 'px';
       }
       reactData.xThumbWidth = xThumbWidth;
       var trackYEl = $xeTree.$refs.refTrackYElem;
-      var yThumbHeight = trackYEl ? getThumbSize(viewEl.clientHeight, viewEl.scrollHeight, trackYEl.clientHeight) : 0;
+      var yThumbHeight = trackYEl ? tree_getThumbSize(viewEl.clientHeight, viewEl.scrollHeight, trackYEl.clientHeight) : 0;
       var thumbYElem = $xeTree.$refs.refThumbYElem;
       if (thumbYElem) {
         thumbYElem.style.height = yThumbHeight + 'px';
@@ -69183,7 +69396,7 @@ function tree_createInternalData() {
         yThumbHeight = reactData.yThumbHeight;
       var trackXEl = $xeTree.$refs.refTrackXElem;
       var thumbXElem = $xeTree.$refs.refThumbXElem;
-      var xThumbLeft = trackXEl && xThumbWidth ? getThumbOffsetSize(viewEl.scrollLeft, viewEl.clientWidth, viewEl.scrollWidth, trackXEl.clientWidth, xThumbWidth) : 0;
+      var xThumbLeft = trackXEl && xThumbWidth ? tree_getThumbOffsetSize(viewEl.scrollLeft, viewEl.clientWidth, viewEl.scrollWidth, trackXEl.clientWidth, xThumbWidth) : 0;
       internalData.xThumbLeft = xThumbLeft;
       if (thumbXElem && xThumbWidth) {
         thumbXElem.style.width = xThumbWidth + 'px';
@@ -69191,7 +69404,7 @@ function tree_createInternalData() {
       }
       var trackYEl = $xeTree.$refs.refTrackYElem;
       var thumbYElem = $xeTree.$refs.refThumbYElem;
-      var yThumbTop = trackYEl && yThumbHeight ? getThumbOffsetSize(viewEl.scrollTop, viewEl.clientHeight, viewEl.scrollHeight, trackYEl.clientHeight, yThumbHeight) : 0;
+      var yThumbTop = trackYEl && yThumbHeight ? tree_getThumbOffsetSize(viewEl.scrollTop, viewEl.clientHeight, viewEl.scrollHeight, trackYEl.clientHeight, yThumbHeight) : 0;
       internalData.yThumbTop = yThumbTop;
       if (thumbYElem && yThumbHeight) {
         thumbYElem.style.height = yThumbHeight + 'px';
@@ -69212,7 +69425,7 @@ function tree_createInternalData() {
       var xThumbWidth = reactData.xThumbWidth;
       var trackRect = trackEl.getBoundingClientRect();
       viewEl.scrollTo({
-        left: getScrollFromClick(evnt.clientX - trackRect.left, viewEl.clientWidth, viewEl.scrollWidth, trackEl.clientWidth, xThumbWidth),
+        left: tree_getScrollFromClick(evnt.clientX - trackRect.left, viewEl.clientWidth, viewEl.scrollWidth, trackEl.clientWidth, xThumbWidth),
         behavior: 'auto'
       });
     },
@@ -69230,7 +69443,7 @@ function tree_createInternalData() {
       var yThumbHeight = reactData.yThumbHeight;
       var trackRect = trackEl.getBoundingClientRect();
       viewEl.scrollTo({
-        top: getScrollFromClick(evnt.clientY - trackRect.top, viewEl.clientHeight, viewEl.scrollHeight, trackEl.clientHeight, yThumbHeight),
+        top: tree_getScrollFromClick(evnt.clientY - trackRect.top, viewEl.clientHeight, viewEl.scrollHeight, trackEl.clientHeight, yThumbHeight),
         behavior: 'auto'
       });
     },
@@ -69250,7 +69463,7 @@ function tree_createInternalData() {
       var trackRect = trackEl.getBoundingClientRect();
       var pointerPosition = evnt.clientX - trackRect.left;
       // 记录 thumb 的偏移
-      var thumbOffset = getThumbOffsetSize(viewEl.scrollLeft, viewEl.clientWidth, viewEl.scrollWidth, trackEl.clientWidth, xThumbWidth);
+      var thumbOffset = tree_getThumbOffsetSize(viewEl.scrollLeft, viewEl.clientWidth, viewEl.scrollWidth, trackEl.clientWidth, xThumbWidth);
       internalData.thumbDragOffset = pointerPosition - thumbOffset;
     },
     pointermoveThumbXEvent: function pointermoveThumbXEvent(evnt) {
@@ -69273,7 +69486,7 @@ function tree_createInternalData() {
         var trackEl = _thumbEl.parentElement;
         var trackRect = trackEl.getBoundingClientRect();
         // 更新偏移
-        viewEl.scrollLeft = getScrollFromDrag(evnt.clientX - trackRect.left, thumbDragOffset, viewEl.clientWidth, viewEl.scrollWidth, trackEl.clientWidth, xThumbWidth);
+        viewEl.scrollLeft = tree_getScrollFromDrag(evnt.clientX - trackRect.left, thumbDragOffset, viewEl.clientWidth, viewEl.scrollWidth, trackEl.clientWidth, xThumbWidth);
       }
     },
     cleatPointerThumbEvent: function cleatPointerThumbEvent(evnt) {
@@ -69299,7 +69512,7 @@ function tree_createInternalData() {
       var trackRect = trackEl.getBoundingClientRect();
       var pointerPosition = evnt.clientY - trackRect.top;
       // 记录 thumb 的偏移
-      var thumbOffset = getThumbOffsetSize(viewEl.scrollTop, viewEl.clientHeight, viewEl.scrollHeight, trackEl.clientHeight, yThumbHeight);
+      var thumbOffset = tree_getThumbOffsetSize(viewEl.scrollTop, viewEl.clientHeight, viewEl.scrollHeight, trackEl.clientHeight, yThumbHeight);
       internalData.thumbDragOffset = pointerPosition - thumbOffset;
     },
     pointermoveThumbYEvent: function pointermoveThumbYEvent(evnt) {
@@ -69322,7 +69535,7 @@ function tree_createInternalData() {
         var trackEl = _thumbEl2.parentElement;
         var trackRect = trackEl.getBoundingClientRect();
         // 更新偏移
-        viewEl.scrollTop = getScrollFromDrag(evnt.clientY - trackRect.top, thumbDragOffset, viewEl.clientHeight, viewEl.scrollHeight, trackEl.clientHeight, yThumbHeight);
+        viewEl.scrollTop = tree_getScrollFromDrag(evnt.clientY - trackRect.top, thumbDragOffset, viewEl.clientHeight, viewEl.scrollHeight, trackEl.clientHeight, yThumbHeight);
       }
     },
     //
@@ -69867,6 +70080,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 +70147,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 +70185,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());