vxe-pc-ui 3.20.8 → 3.20.9

package/lib/index.umd.js

@@ -11402,6 +11402,7 @@ __webpack_require__.d(__webpack_exports__, {
   setup: function() { return /* reexport */ setup; },
   sizeMixin: function() { return /* reexport */ sizeMixin; },
   use: function() { return /* reexport */ use; },
+  vScrollbarMixin: function() { return /* reexport */ vScrollbarMixin; },
   validators: function() { return /* reexport */ validators; },
   version: function() { return /* reexport */ ui_version; },
   watermark: function() { return /* reexport */ components_watermark; }
@@ -11659,6 +11660,7 @@ __webpack_require__.d(components_namespaceObject, {
   setup: function() { return setup; },
   sizeMixin: function() { return sizeMixin; },
   use: function() { return use; },
+  vScrollbarMixin: function() { return vScrollbarMixin; },
   validators: function() { return validators; },
   version: function() { return ui_version; },
   watermark: function() { return components_watermark; }
@@ -11702,7 +11704,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.33";
+var coreVersion = "3.4.35";
 var VxeCore = {
   coreVersion: coreVersion,
   uiVersion: '',
@@ -12463,7 +12465,7 @@ function createLog(type, name) {
     return msg;
   };
 }
-var version = "3.4.33";
+var version = "3.4.35";
 var log = {
   create: createLog,
   warn: createLog('warn', "v".concat(version)),
@@ -13394,6 +13396,7 @@ var popperUtils = {
 ;// ./node_modules/@vxe-ui/core/es/src/mixins.js
 
 
+
 var sizeMixin = external_commonjs_vue_commonjs2_vue_root_Vue_default().extend({
   inject: {
     $xeSizeInfo: {
@@ -13418,6 +13421,30 @@ var sizeMixin = external_commonjs_vue_commonjs2_vue_root_Vue_default().extend({
     }
   }
 });
+var vScrollbarMixin = external_commonjs_vue_commonjs2_vue_root_Vue_default().extend({
+  inject: {
+    $xeScrollbarInfo: {
+      default: null
+    }
+  },
+  provide: function provide() {
+    var _this2 = this;
+    return {
+      $xeScrollbarInfo: {
+        getIsVScrollbar: function getIsVScrollbar() {
+          return _this2.computeIsVScrollbar;
+        }
+      }
+    };
+  },
+  computed: {
+    computeIsVScrollbar: function computeIsVScrollbar() {
+      var useScrollbar = this.useScrollbar;
+      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;
+    }
+  }
+});
 var permissionMixin = external_commonjs_vue_commonjs2_vue_root_Vue_default().extend({
   computed: {
     computePermissionInfo: function computePermissionInfo() {
@@ -13427,6 +13454,7 @@ var permissionMixin = external_commonjs_vue_commonjs2_vue_root_Vue_default().ext
 });
 var globalMixins = {
   sizeMixin: sizeMixin,
+  vScrollbarMixin: vScrollbarMixin,
   permissionMixin: permissionMixin
 };
 ;// ./node_modules/@vxe-ui/core/es/index.esm.js
@@ -13701,7 +13729,7 @@ var es_array_filter = __webpack_require__(2008);
 
 
 var log_log = VxeUI.log;
-var uiVersion = "ui v".concat("3.20.8");
+var uiVersion = "ui v".concat("3.20.9");
 function createComponentLog(name) {
   var tableVersion = VxeUI.tableVersion ? "table v".concat(VxeUI.tableVersion) : '';
   var ganttVersion = VxeUI.ganttVersion ? "gantt v".concat(VxeUI.ganttVersion) : '';
@@ -13721,7 +13749,7 @@ var errLog = log_log.create('error', uiVersion);
 
 
 
-var ui_version = "3.20.8";
+var ui_version = "3.20.9";
 VxeUI.uiVersion = ui_version;
 VxeUI.dynamicApp = dynamicApp;
 function config(options) {
@@ -16945,12 +16973,20 @@ function createInternalData() {
         return scrollbar_getConfig().scrollbar.viewInnerClassName;
       }
     },
+    /**
+     * 已废弃
+     * @deprecated
+     */
     autoResize: {
       type: Boolean,
       default: function _default() {
         return scrollbar_getConfig().scrollbar.autoResize;
       }
     },
+    /**
+     * 已废弃
+     * @deprecated
+     */
     syncResize: [Boolean, String, Number]
   },
   data: function data() {
@@ -17682,7 +17718,7 @@ function tooltip_createInternalData() {
 }
 /* harmony default export */ var tooltip = (/* define-vxe-component start */defineVxeComponent({
   name: 'VxeTooltip',
-  mixins: [globalMixins.sizeMixin],
+  mixins: [globalMixins.sizeMixin, globalMixins.vScrollbarMixin],
   props: {
     value: Boolean,
     size: {
@@ -17966,11 +18002,12 @@ function tooltip_createInternalData() {
     },
     updatePlacement: function updatePlacement() {
       var $xeTooltip = this;
-      $xeTooltip.updateTipStyle();
-      return $xeTooltip.$nextTick().then(function () {
+      return $xeTooltip.updateTipStyle().then(function () {
         return $xeTooltip.updateTipStyle();
       }).then(function () {
-        return $xeTooltip.updateTipStyle();
+        setTimeout(function () {
+          return $xeTooltip.updateTipStyle();
+        }, 15);
       });
     },
     isActived: function isActived() {
@@ -18173,9 +18210,9 @@ function tooltip_createInternalData() {
       var reactData = $xeTooltip.reactData;
       var useHtml = props.useHtml,
         theme = props.theme,
-        useScrollbar = props.useScrollbar,
         useHTML = props.useHTML;
       var tipContent = reactData.tipContent;
+      var isVScrollbar = $xeTooltip.computeIsVScrollbar;
       var wrapperStyle = $xeTooltip.computeWrapperStyle;
       var contentSlot = slots.content;
       var contVNs = [];
@@ -18195,7 +18232,7 @@ function tooltip_createInternalData() {
           key: 'cd'
         }, "".concat(tipContent)));
       }
-      if (useScrollbar) {
+      if (isVScrollbar) {
         return h(packages_scrollbar, {
           key: 5,
           ref: 'contentScrollbar',
@@ -22049,7 +22086,7 @@ var Calendar = VxeCalendar;
 
 /* harmony default export */ var card = (/* define-vxe-component start */defineVxeComponent({
   name: 'VxeCard',
-  mixins: [globalMixins.sizeMixin],
+  mixins: [globalMixins.sizeMixin, globalMixins.vScrollbarMixin],
   props: {
     title: String,
     showTitleOverflow: {
@@ -23143,7 +23180,7 @@ function list_createInternalData() {
 }
 /* harmony default export */ var list = (/* define-vxe-component start */defineVxeComponent({
   name: 'VxeList',
-  mixins: [globalMixins.sizeMixin],
+  mixins: [globalMixins.sizeMixin, globalMixins.vScrollbarMixin],
   props: {
     data: Array,
     height: [Number, String],
@@ -23205,7 +23242,8 @@ function list_createInternalData() {
       xID: xID,
       reactData: reactData,
       crossListDragRowInfo: crossListDragRowGlobal,
-      reFlag: 0
+      reLayoutFlag: 0,
+      reScrollFlag: 0
     });
   },
   computed: _objectSpread2(_objectSpread2({}, {}), {}, {
@@ -23715,8 +23753,14 @@ function list_createInternalData() {
     },
     updateScrollbar: function updateScrollbar() {
       var $xeList = this;
-      $xeList.updateThumbSize();
-      $xeList.updateThumbOffset();
+      var isVScrollbar = $xeList.computeIsVScrollbar;
+      if (isVScrollbar) {
+        return $xeList.$nextTick().then(function () {
+          $xeList.updateThumbSize();
+          $xeList.updateThumbOffset();
+        });
+      }
+      return Promise.resolve();
     },
     /**
      * 重新计算列表
@@ -23737,10 +23781,11 @@ function list_createInternalData() {
           parentHeight = parentEl.clientHeight - Math.ceil(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(parentStyle.paddingLeft) + external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(parentStyle.paddingRight));
         }
         reactData.parentHeight = parentHeight;
-        $xeList.updateScrollbar();
         $xeList.updateHeight();
         if (el.clientWidth && el.clientHeight) {
-          return $xeList.computeScrollLoad();
+          return $xeList.computeScrollLoad().then(function () {
+            $xeList.updateScrollbar();
+          });
         }
       }
       return $xeList.$nextTick();
@@ -23754,7 +23799,7 @@ function list_createInternalData() {
         visibleSize = scrollYStore.visibleSize,
         offsetSize = scrollYStore.offsetSize,
         rowHeight = scrollYStore.rowHeight;
-      var scrollBodyElem = evnt.target;
+      var scrollBodyElem = evnt.currentTarget;
       var scrollTop = scrollBodyElem.scrollTop;
       var toVisibleIndex = Math.floor(scrollTop / rowHeight);
       var offsetStartIndex = Math.max(0, toVisibleIndex - 1 - offsetSize);
@@ -23771,7 +23816,7 @@ function list_createInternalData() {
       var $xeList = this;
       var reactData = $xeList.reactData;
       var internalData = $xeList.internalData;
-      var scrollBodyElem = evnt.target;
+      var scrollBodyElem = evnt.currentTarget;
       var scrollTop = scrollBodyElem.scrollTop;
       var scrollLeft = scrollBodyElem.scrollLeft;
       var isX = scrollLeft !== internalData.lastScrollLeft;
@@ -25137,6 +25182,28 @@ function list_createInternalData() {
       }, evnt);
     },
     // 滚动条
+    bindScrollbarResize: function bindScrollbarResize() {
+      var $xeList = this;
+      var internalData = $xeList.internalData;
+      var scrollObserver = internalData.scrollObserver;
+      var isVScrollbar = $xeList.computeIsVScrollbar;
+      if (isVScrollbar) {
+        if (!scrollObserver) {
+          var el = $xeList.$refs.refElem;
+          var viewInnerEl = $xeList.$refs.refVirtualSpaceElem;
+          var _scrollObserver = list_globalResize.create(function () {
+            $xeList.reScrollFlag++;
+          });
+          if (el) {
+            _scrollObserver.observe(el);
+          }
+          if (viewInnerEl) {
+            _scrollObserver.observe(viewInnerEl);
+          }
+          internalData.scrollObserver = _scrollObserver;
+        }
+      }
+    },
     updateThumbSize: function updateThumbSize() {
       var $xeList = this;
       var reactData = $xeList.reactData;
@@ -25555,8 +25622,7 @@ function list_createInternalData() {
       var slots = $xeList.$scopedSlots;
       var showCheckbox = props.showCheckbox,
         className = props.className,
-        loading = props.loading,
-        useScrollbar = props.useScrollbar;
+        loading = props.loading;
       var bodyHeight = reactData.bodyHeight,
         topSpaceHeight = reactData.topSpaceHeight,
         rowList = reactData.rowList,
@@ -25568,6 +25634,7 @@ function list_createInternalData() {
       var headerSlot = slots.header;
       var footerSlot = slots.footer;
       var vSize = $xeList.computeSize;
+      var isVScrollbar = $xeList.computeIsVScrollbar;
       var wrapperStyles = $xeList.computeWrapperStyles;
       var virtualStyles = $xeList.computeVirtualStyles;
       var radioOpts = $xeList.computeRadioOpts;
@@ -25594,9 +25661,9 @@ function list_createInternalData() {
       }
       return h('div', {
         ref: 'refElem',
-        class: ['vxe-list', useScrollbar ? "ov-x--".concat(scrollXVisible === false ? 'hidden' : 'visible') : '', useScrollbar ? "ov-y--".concat(scrollYVisible === false ? 'hidden' : 'visible') : '', useScrollbar ? "sx-pos--".concat(scrollbarXToTop ? 'top' : 'bottom') : '', useScrollbar ? "sy-pos--".concat(scrollbarYToLeft ? 'left' : 'right') : '', className ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(className) ? className({
+        class: ['vxe-list', isVScrollbar ? "ov-x--".concat(scrollXVisible === false ? 'hidden' : 'visible') : '', isVScrollbar ? "ov-y--".concat(scrollYVisible === false ? 'hidden' : 'visible') : '', isVScrollbar ? "sx-pos--".concat(scrollbarXToTop ? 'top' : 'bottom') : '', isVScrollbar ? "sy-pos--".concat(scrollbarYToLeft ? 'left' : 'right') : '', className ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(className) ? className({
           $list: $xeList
-        }) : className : '', _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "size--".concat(vSize), vSize), 'is--virtual-scrollbar', useScrollbar), 'ov-padding', useScrollbar && scrollbarOpts.padding), 'ov-x--auto-hide', useScrollbar && scrollXAutoHide), 'ov-y--auto-hide', useScrollbar && scrollYAutoHide), 'overflow-y', yThumbHeight), 'overflow-x', xThumbWidth), 'is--drag', isDrag), 'is--loading', loading)],
+        }) : className : '', _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "size--".concat(vSize), vSize), 'is--virtual-scrollbar', isVScrollbar), 'ov-padding', isVScrollbar && scrollbarOpts.padding), 'ov-x--auto-hide', isVScrollbar && scrollXAutoHide), 'ov-y--auto-hide', isVScrollbar && scrollYAutoHide), 'overflow-y', yThumbHeight), 'overflow-x', xThumbWidth), 'is--drag', isDrag), 'is--loading', loading)],
         on: leOns,
         style: wrapperStyles
       }, [headerSlot || showDefChekboxHead ? h('div', {
@@ -25627,6 +25694,7 @@ function list_createInternalData() {
           scroll: $xeList.scrollEvent
         }
       }, [h('div', {
+        ref: 'refVirtualSpaceElem',
         class: 'vxe-list--y-space',
         style: {
           height: bodyHeight ? "".concat(bodyHeight, "px") : ''
@@ -25658,7 +25726,7 @@ function list_createInternalData() {
       /**
        * 滚动条
        */
-      useScrollbar ? h('div', {
+      isVScrollbar ? h('div', {
         class: scrollbarWrapperClss
       }, [scrollXVisible === false ? renderEmptyElement($xeList) : h('div', {
         ref: 'refTrackXElem',
@@ -25716,50 +25784,61 @@ function list_createInternalData() {
     },
     height: function height() {
       var $xeList = this;
-      $xeList.reFlag++;
+      $xeList.reLayoutFlag++;
     },
     maxHeight: function maxHeight() {
       var $xeList = this;
-      $xeList.reFlag++;
+      $xeList.reLayoutFlag++;
     },
     syncResize: function syncResize() {
       var $xeList = this;
-      $xeList.reFlag++;
+      $xeList.reLayoutFlag++;
     },
-    useScrollbar: function useScrollbar() {
+    computeIsVScrollbar: function computeIsVScrollbar() {
       var $xeList = this;
-      $xeList.reFlag++;
+      $xeList.$nextTick(function () {
+        $xeList.bindScrollbarResize();
+        $xeList.$nextTick(function () {
+          $xeList.reLayoutFlag++;
+        });
+      });
     },
     computeRowHeight: function computeRowHeight() {
       var $xeList = this;
-      $xeList.reFlag++;
+      $xeList.reLayoutFlag++;
     },
     computeScrollYWidth: function computeScrollYWidth() {
       var $xeList = this;
-      $xeList.reFlag++;
+      $xeList.reLayoutFlag++;
     },
     computeScrollXHeight: function computeScrollXHeight() {
       var $xeList = this;
-      $xeList.reFlag++;
+      $xeList.reLayoutFlag++;
     },
     computeScrollXVisible: function computeScrollXVisible() {
       var $xeList = this;
       $xeList.$nextTick(function () {
-        $xeList.reFlag++;
+        $xeList.reLayoutFlag++;
       });
     },
     computeScrollYVisible: function computeScrollYVisible() {
       var $xeList = this;
       $xeList.$nextTick(function () {
-        $xeList.reFlag++;
+        $xeList.reLayoutFlag++;
       });
     },
-    reFlag: function reFlag() {
+    reLayoutFlag: function reLayoutFlag() {
       var $xeList = this;
       $xeList.recalculate().then(function () {
         $xeList.recalculate();
       });
     },
+    reScrollFlag: function reScrollFlag() {
+      var $xeList = this;
+      $xeList.updateScrollbar().then(function () {
+        $xeList.updateScrollbar();
+      });
+    },
     checkRowKey: function checkRowKey() {
       var $xeList = this;
       $xeList.updateRadioModeValue();
@@ -25783,8 +25862,7 @@ function list_createInternalData() {
     var showSeq = props.showSeq,
       showRadio = props.showRadio,
       showCheckbox = props.showCheckbox,
-      autoResize = props.autoResize,
-      useScrollbar = props.useScrollbar;
+      autoResize = props.autoResize;
     var rowOpts = $xeList.computeRowOpts;
     var useKey = rowOpts.useKey,
       keyField = rowOpts.keyField;
@@ -25806,25 +25884,12 @@ function list_createInternalData() {
     if (useKey && !keyField) {
       list_errLog('vxe.error.reqSupportProp', ['row-config.useKey', 'row-config.keyField']);
     }
-    var el = $xeList.$refs.refElem;
-    if (useScrollbar) {
-      var viewInnerEl = $xeList.$refs.refVirtualBody;
-      var scrollObserver = list_globalResize.create(function () {
-        $xeList.reFlag++;
-      });
-      if (el) {
-        scrollObserver.observe(el);
-      }
-      if (viewInnerEl) {
-        scrollObserver.observe(viewInnerEl);
-      }
-      internalData.scrollObserver = scrollObserver;
-    }
     if (autoResize) {
+      var el = $xeList.$refs.refElem;
       var parentEl = $xeList.getParentElem();
       var resizeObserver = list_globalResize.create(function () {
         if (props.autoResize) {
-          $xeList.reFlag++;
+          $xeList.reLayoutFlag++;
         }
       });
       if (el) {
@@ -25835,9 +25900,10 @@ function list_createInternalData() {
       }
       internalData.resizeObserver = resizeObserver;
     }
-    $xeList.reFlag++;
+    $xeList.reLayoutFlag++;
+    $xeList.bindScrollbarResize();
     list_globalEvents.on($xeList, 'resize', function () {
-      $xeList.reFlag++;
+      $xeList.reLayoutFlag++;
     });
   },
   activated: function activated() {
@@ -43178,7 +43244,7 @@ var allActiveDrawers = [];
 
 /* harmony default export */ var drawer = (/* define-vxe-component start */defineVxeComponent({
   name: 'VxeDrawer',
-  mixins: [globalMixins.sizeMixin, globalMixins.permissionMixin],
+  mixins: [globalMixins.sizeMixin, globalMixins.vScrollbarMixin, globalMixins.permissionMixin],
   props: {
     value: Boolean,
     id: String,
@@ -49420,7 +49486,7 @@ var ImagePreview = VxeImagePreview;
 
 /* harmony default export */ var layout_aside = (/* define-vxe-component start */defineVxeComponent({
   name: 'VxeLayoutAside',
-  mixins: [globalMixins.sizeMixin],
+  mixins: [globalMixins.sizeMixin, globalMixins.vScrollbarMixin],
   props: {
     width: [String, Number],
     collapsed: Boolean,
@@ -49586,7 +49652,7 @@ function layout_body_createReactData() {
 }
 /* harmony default export */ var layout_body = (/* define-vxe-component start */defineVxeComponent({
   name: 'VxeLayoutBody',
-  mixins: [globalMixins.sizeMixin],
+  mixins: [globalMixins.sizeMixin, globalMixins.vScrollbarMixin],
   props: {
     loading: Boolean,
     padding: Boolean,
@@ -49768,15 +49834,25 @@ var LayoutBody = VxeLayoutBody;
 
 
 
+var layout_container_getConfig = VxeUI.getConfig,
+  layout_container_baseUtils = VxeUI.baseUtils,
+  layout_container_createEvent = VxeUI.createEvent;
+var layout_container_getDefVal = layout_container_baseUtils.getDefVal;
 /* harmony default export */ var layout_container = (/* define-vxe-component start */defineVxeComponent({
   name: 'VxeLayoutContainer',
-  mixins: [globalMixins.sizeMixin],
+  mixins: [globalMixins.sizeMixin, globalMixins.vScrollbarMixin],
   props: {
     vertical: Boolean,
+    useScrollbar: {
+      type: Boolean,
+      default: function _default() {
+        return layout_container_getDefVal(layout_container_getConfig().layoutContainer.useScrollbar, layout_container_getConfig().useScrollbar);
+      }
+    },
     size: {
       type: String,
       default: function _default() {
-        return getConfig().layoutContainer.size || getConfig().size;
+        return layout_container_getConfig().layoutContainer.size || layout_container_getConfig().size;
       }
     }
   },
@@ -49795,7 +49871,7 @@ var LayoutBody = VxeLayoutBody;
     //
     dispatchEvent: function dispatchEvent(type, params, evnt) {
       var $xeLayoutContainer = this;
-      $xeLayoutContainer.$emit(type, createEvent(evnt, {
+      $xeLayoutContainer.$emit(type, layout_container_createEvent(evnt, {
         $layoutContainer: $xeLayoutContainer
       }, params));
     },
@@ -50161,7 +50237,7 @@ function menu_createReactData() {
 var nemuUniqueKey = 100000000;
 /* harmony default export */ var menu = (/* define-vxe-component start */defineVxeComponent({
   name: 'VxeMenu',
-  mixins: [globalMixins.sizeMixin, globalMixins.permissionMixin],
+  mixins: [globalMixins.sizeMixin, globalMixins.vScrollbarMixin, globalMixins.permissionMixin],
   props: {
     value: [String, Number],
     expandAll: Boolean,
@@ -51119,7 +51195,7 @@ var lockScrollAttrKey = 'data-vxe-lock-scroll';
 var lockScrollCssWidthKey = '--vxe-ui-modal-lock-scroll-view-width';
 /* harmony default export */ var modal = (/* define-vxe-component start */defineVxeComponent({
   name: 'VxeModal',
-  mixins: [globalMixins.sizeMixin, globalMixins.permissionMixin],
+  mixins: [globalMixins.sizeMixin, globalMixins.vScrollbarMixin, globalMixins.permissionMixin],
   props: {
     value: Boolean,
     id: String,
@@ -63635,7 +63711,7 @@ var tabs_createComponentLog = createComponentLog('tabs'),
 var scrollbarOffsetSize = 20;
 /* harmony default export */ var tabs = (/* define-vxe-component start */defineVxeComponent({
   name: 'VxeTabs',
-  mixins: [globalMixins.sizeMixin],
+  mixins: [globalMixins.sizeMixin, globalMixins.vScrollbarMixin],
   props: {
     value: [String, Number, Boolean],
     options: Array,
@@ -66789,7 +66865,7 @@ function tree_createInternalData() {
 }
 /* harmony default export */ var tree = (/* define-vxe-component start */defineVxeComponent({
   name: 'VxeTree',
-  mixins: [globalMixins.sizeMixin],
+  mixins: [globalMixins.sizeMixin, globalMixins.vScrollbarMixin],
   props: {
     data: Array,
     autoResize: {
@@ -66987,7 +67063,8 @@ function tree_createInternalData() {
       xID: xID,
       reactData: reactData,
       crossTreeDragNodeInfo: crossTreeDragNodeGlobal,
-      reFlag: 0,
+      reLayoutFlag: 0,
+      reScrollFlag: 0,
       dataFlag: 0
     });
   },
@@ -67870,8 +67947,14 @@ function tree_createInternalData() {
     },
     updateScrollbar: function updateScrollbar() {
       var $xeTree = this;
-      $xeTree.updateThumbSize();
-      $xeTree.updateThumbOffset();
+      var isVScrollbar = $xeTree.computeIsVScrollbar;
+      if (isVScrollbar) {
+        return $xeTree.$nextTick().then(function () {
+          $xeTree.updateThumbSize();
+          $xeTree.updateThumbOffset();
+        });
+      }
+      return Promise.resolve();
     },
     /**
      * 重新计算列表
@@ -67897,11 +67980,11 @@ function tree_createInternalData() {
           var parentPaddingSize = getPaddingTopBottomSize(parentEl);
           reactData.parentHeight = Math.max(headHeight + footHeight + rowHeight, parentEl.clientHeight - parentPaddingSize - headHeight - footHeight);
         }
-        $xeTree.updateScrollbar();
         $xeTree.updateHeight();
         return $xeTree.computeScrollLoad().then(function () {
           $xeTree.updateHeight();
           $xeTree.updateYSpace();
+          $xeTree.updateScrollbar();
         });
       }
       return $xeTree.$nextTick();
@@ -67941,7 +68024,7 @@ function tree_createInternalData() {
       var $xeTree = this;
       var reactData = $xeTree.reactData;
       var internalData = $xeTree.internalData;
-      var scrollBodyElem = evnt.target;
+      var scrollBodyElem = evnt.currentTarget;
       var scrollTop = scrollBodyElem.scrollTop;
       var scrollLeft = scrollBodyElem.scrollLeft;
       var isX = scrollLeft !== internalData.lastScrollLeft;
@@ -69734,6 +69817,28 @@ function tree_createInternalData() {
       }
     },
     // 滚动条
+    bindScrollbarResize: function bindScrollbarResize() {
+      var $xeTree = this;
+      var internalData = $xeTree.internalData;
+      var isVScrollbar = $xeTree.computeIsVScrollbar;
+      var scrollObserver = internalData.scrollObserver;
+      if (isVScrollbar) {
+        if (!scrollObserver) {
+          var el = $xeTree.$refs.refElem;
+          var viewInnerEl = $xeTree.$refs.refVirtualSpaceElem;
+          var _scrollObserver = globalResize.create(function () {
+            $xeTree.reScrollFlag++;
+          });
+          if (el) {
+            _scrollObserver.observe(el);
+          }
+          if (viewInnerEl) {
+            _scrollObserver.observe(viewInnerEl);
+          }
+          internalData.scrollObserver = _scrollObserver;
+        }
+      }
+    },
     updateThumbSize: function updateThumbSize() {
       var $xeTree = this;
       var reactData = $xeTree.reactData;
@@ -70250,8 +70355,7 @@ function tree_createInternalData() {
       var reactData = $xeTree.reactData;
       var loading = props.loading,
         trigger = props.trigger,
-        showLine = props.showLine,
-        useScrollbar = props.useScrollbar;
+        showLine = props.showLine;
       var bodyHeight = reactData.bodyHeight,
         topSpaceHeight = reactData.topSpaceHeight,
         treeList = reactData.treeList,
@@ -70259,6 +70363,7 @@ function tree_createInternalData() {
         xThumbWidth = reactData.xThumbWidth,
         yThumbHeight = reactData.yThumbHeight;
       var vSize = $xeTree.computeSize;
+      var isVScrollbar = $xeTree.computeIsVScrollbar;
       var radioOpts = $xeTree.computeRadioOpts;
       var checkboxOpts = $xeTree.computeCheckboxOpts;
       var loadingOpts = $xeTree.computeLoadingOpts;
@@ -70285,7 +70390,7 @@ function tree_createInternalData() {
       }
       return h('div', {
         ref: 'refElem',
-        class: ['vxe-tree', useScrollbar ? "ov-x--".concat(scrollXVisible === false ? 'hidden' : 'visible') : '', useScrollbar ? "ov-y--".concat(scrollYVisible === false ? 'hidden' : 'visible') : '', useScrollbar ? "sx-pos--".concat(scrollbarXToTop ? 'top' : 'bottom') : '', useScrollbar ? "sy-pos--".concat(scrollbarYToLeft ? 'left' : 'right') : '', (_ref = {}, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_ref, "size--".concat(vSize), vSize), 'show--line', showLine), 'is--virtual-scrollbar', useScrollbar), 'ov-padding', useScrollbar && scrollbarOpts.padding), 'ov-x--auto-hide', useScrollbar && scrollXAutoHide), 'ov-y--auto-hide', useScrollbar && scrollYAutoHide), 'overflow-y', yThumbHeight), 'overflow-x', xThumbWidth), 'checkbox--highlight', checkboxOpts.highlight), 'radio--highlight', radioOpts.highlight), _defineProperty(_defineProperty(_defineProperty(_ref, 'node--hover', isNodeHover), 'node--trigger', trigger === 'node'), 'is--loading', loading))],
+        class: ['vxe-tree', isVScrollbar ? "ov-x--".concat(scrollXVisible === false ? 'hidden' : 'visible') : '', isVScrollbar ? "ov-y--".concat(scrollYVisible === false ? 'hidden' : 'visible') : '', isVScrollbar ? "sx-pos--".concat(scrollbarXToTop ? 'top' : 'bottom') : '', isVScrollbar ? "sy-pos--".concat(scrollbarYToLeft ? 'left' : 'right') : '', (_ref = {}, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_ref, "size--".concat(vSize), vSize), 'show--line', showLine), 'is--virtual-scrollbar', isVScrollbar), 'ov-padding', isVScrollbar && scrollbarOpts.padding), 'ov-x--auto-hide', isVScrollbar && scrollXAutoHide), 'ov-y--auto-hide', isVScrollbar && scrollYAutoHide), 'overflow-y', yThumbHeight), 'overflow-x', xThumbWidth), 'checkbox--highlight', checkboxOpts.highlight), 'radio--highlight', radioOpts.highlight), _defineProperty(_defineProperty(_defineProperty(_ref, 'node--hover', isNodeHover), 'node--trigger', trigger === 'node'), 'is--loading', loading))],
         style: wrapperStyles,
         on: teOns
       }, [headerSlot ? h('div', {
@@ -70301,6 +70406,7 @@ function tree_createInternalData() {
           scroll: $xeTree.scrollEvent
         }
       }, [h('div', {
+        ref: 'refVirtualSpaceElem',
         class: 'vxe-tree--y-space',
         style: {
           height: bodyHeight ? "".concat(bodyHeight, "px") : ''
@@ -70320,7 +70426,7 @@ function tree_createInternalData() {
       /**
        * 滚动条
        */
-      useScrollbar ? h('div', {
+      isVScrollbar ? h('div', {
         class: scrollbarWrapperClss
       }, [scrollXVisible === false ? renderEmptyElement($xeTree) : h('div', {
         ref: 'refTrackXElem',
@@ -70444,45 +70550,56 @@ function tree_createInternalData() {
     },
     height: function height() {
       var $xeTree = this;
-      $xeTree.reFlag++;
+      $xeTree.reLayoutFlag++;
     },
     minHeight: function minHeight() {
       var $xeTree = this;
-      $xeTree.reFlag++;
+      $xeTree.reLayoutFlag++;
     },
     maxHeight: function maxHeight() {
       var $xeTree = this;
-      $xeTree.reFlag++;
+      $xeTree.reLayoutFlag++;
     },
-    useScrollbar: function useScrollbar() {
+    computeIsVScrollbar: function computeIsVScrollbar() {
       var $xeTree = this;
-      $xeTree.reFlag++;
+      $xeTree.$nextTick(function () {
+        $xeTree.bindScrollbarResize();
+        $xeTree.$nextTick(function () {
+          $xeTree.reLayoutFlag++;
+        });
+      });
     },
     computeScrollYWidth: function computeScrollYWidth() {
       var $xeTree = this;
-      $xeTree.reFlag++;
+      $xeTree.reLayoutFlag++;
     },
     computeScrollXHeight: function computeScrollXHeight() {
       var $xeTree = this;
-      $xeTree.reFlag++;
+      $xeTree.reLayoutFlag++;
     },
     computeScrollXVisible: function computeScrollXVisible() {
       var $xeTree = this;
       $xeTree.$nextTick(function () {
-        $xeTree.reFlag++;
+        $xeTree.reLayoutFlag++;
       });
     },
     computeScrollYVisible: function computeScrollYVisible() {
       var $xeTree = this;
       $xeTree.$nextTick(function () {
-        $xeTree.reFlag++;
+        $xeTree.reLayoutFlag++;
       });
     },
-    reFlag: function reFlag() {
+    reLayoutFlag: function reLayoutFlag() {
       var $xeTree = this;
       $xeTree.recalculate().then(function () {
         $xeTree.recalculate();
       });
+    },
+    reScrollFlag: function reScrollFlag() {
+      var $xeTree = this;
+      $xeTree.updateScrollbar().then(function () {
+        $xeTree.updateScrollbar();
+      });
     }
   },
   created: function created() {
@@ -70503,8 +70620,7 @@ function tree_createInternalData() {
       showOverflow = props.showOverflow,
       lazy = props.lazy,
       loadMethod = props.loadMethod,
-      autoResize = props.autoResize,
-      useScrollbar = props.useScrollbar;
+      autoResize = props.autoResize;
     var dragOpts = $xeTree.computeDragOpts;
     if (!showOverflow) {
       tree_errLog('vxe.error.errProp', ['show-overflow=false', 'show-overflow=true']);
@@ -70525,25 +70641,12 @@ function tree_createInternalData() {
     if (menuConfig && !VxeUIContextMenu) {
       tree_errLog('vxe.error.reqComp', ['vxe-context-menu']);
     }
-    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 el = $xeTree.$refs.refElem;
       var parentEl = $xeTree.getParentElem();
       var resizeObserver = globalResize.create(function () {
         if (props.autoResize) {
-          $xeTree.reFlag++;
+          $xeTree.reLayoutFlag++;
         }
       });
       if (el) {
@@ -70554,9 +70657,10 @@ function tree_createInternalData() {
       }
       internalData.resizeObserver = resizeObserver;
     }
-    $xeTree.reFlag++;
+    $xeTree.reLayoutFlag++;
+    $xeTree.bindScrollbarResize();
     globalEvents.on($xeTree, 'resize', function () {
-      $xeTree.reFlag++;
+      $xeTree.reLayoutFlag++;
     });
   },
   beforeDestroy: function beforeDestroy() {