vxe-pc-ui 4.20.1 → 4.20.5

package/packages/list/src/list.ts

@@ -1,18 +1,21 @@
 import { h, PropType, ref, Ref, computed, onBeforeUnmount, watch, reactive, nextTick, onActivated, onMounted, VNode } from 'vue'
 import { defineVxeComponent } from '../../ui/src/comp'
 import XEUtils from 'xe-utils'
-import { VxeUI, getConfig, getIcon, getI18n, domUtils, menus, globalEvents, globalResize, useSize, createEvent, renderEmptyElement } from '../../ui'
+import { VxeUI, useSize, createEvent, renderEmptyElement } from '../../ui'
 import { getCrossListDragRowInfo } from './store'
 import { isScale, removeClass, addClass, getTpImg, toCssUnit, hasClass } from '../../ui/src/dom'
 import { isEnableConf, getText, enModelValue, deModelValue, getDefaultConfig } from '../../ui/src/utils'
 import { createComponentLog } from '../../ui/src/log'
 import { moveRowAnimateToTb, clearRowAnimate } from '../../ui/src/anime'
-import { getThumbOffsetSize, getThumbSize, getScrollFromClick, getScrollFromDrag } from '../../scrollbar/src/util'
 import { getItemCacheObj } from './util'
 import VxeLoadingComponent from '../../loading'
 
 import type { VxeListConstructor, VxeListPropTypes, VxeListEmits, ListReactData, VxeListPrivateMethods, ListInternalData, VxeListDefines, ValueOf, ListMethods, ListPrivateMethods, ListPrivateRef, VxeComponentStyleType } from '../../../types'
 
+const { getConfig, getIcon, getI18n, domUtils, scrollbarUtils, menus, globalEvents, globalResize } = VxeUI
+
+const { getThumbOffsetSize, getThumbSize, getScrollFromClick, getScrollFromDrag } = scrollbarUtils
+
 const { warnLog, errLog } = createComponentLog('tree')
 
 function getRowKeyByField (row: any, keyField: string) {
@@ -63,8 +66,10 @@ function createInternalData (): ListInternalData {
     fullKeyMaps: {},
     rowMaps: {},
 
-    // 滚动条
     // resizeObserver: undefined,
+
+    // 滚动条
+    // scrollObserver: undefined,
     // isThumbDrag: false,
     thumbDragOffset: 0,
     yThumbTop: 0,
@@ -133,7 +138,7 @@ export default defineVxeComponent({
     scrollY: Object as PropType<VxeListPropTypes.ScrollY>,
     useScrollbar: {
       type: Boolean as PropType<VxeListPropTypes.UseScrollbar>,
-      default: () => getConfig().list.useScrollbar
+      default: () => getDefaultConfig(getConfig().list.useScrollbar, getConfig().useScrollbar)
     },
     scrollbarConfig: Object as PropType<VxeListPropTypes.ScrollbarConfig>
   },
@@ -241,11 +246,8 @@ export default defineVxeComponent({
 
     const computeWrapperStyles = computed(() => {
       const rowHeight = computeRowHeight.value
-      const scrollbarOpts = computeScrollbarOpts.value
-      const scrollbarXOpts = computeScrollbarXOpts.value
-      const scrollbarYOpts = computeScrollbarYOpts.value
-      const barWidth = getDefaultConfig(getDefaultConfig(scrollbarYOpts.width, scrollbarOpts.width), getConfig().scrollbar.width)
-      const barHeight = getDefaultConfig(getDefaultConfig(scrollbarXOpts.height, scrollbarOpts.height), getConfig().scrollbar.height)
+      const barWidth = computeScrollYWidth.value
+      const barHeight = computeScrollXHeight.value
       const stys: VxeComponentStyleType = {}
       if (rowHeight) {
         stys['--vxe-ui-list-row-height'] = toCssUnit(rowHeight)
@@ -284,6 +286,18 @@ export default defineVxeComponent({
       return Object.assign({}, getConfig().scrollbar.yConfig, scrollbarOpts.yConfig)
     })
 
+    const computeScrollXHeight = computed(() => {
+      const scrollbarOpts = computeScrollbarOpts.value
+      const scrollbarXOpts = computeScrollbarXOpts.value
+      return getDefaultConfig(getDefaultConfig(scrollbarXOpts.height, scrollbarOpts.height), getConfig().scrollbar.height)
+    })
+
+    const computeScrollYWidth = computed(() => {
+      const scrollbarOpts = computeScrollbarOpts.value
+      const scrollbarYOpts = computeScrollbarYOpts.value
+      return getDefaultConfig(getDefaultConfig(scrollbarYOpts.width, scrollbarOpts.width), getConfig().scrollbar.width)
+    })
+
     const computeScrollXVisible = computed(() => {
       const scrollbarOpts = computeScrollbarOpts.value
       const scrollbarXOpts = computeScrollbarXOpts.value
@@ -309,15 +323,11 @@ export default defineVxeComponent({
     })
 
     const computeScrollbarWrapperClss = computed(() => {
-      const scrollbarOpts = computeScrollbarOpts.value
-      const { padding } = scrollbarOpts
       const { yThumbHeight, xThumbWidth } = reactData
       const scrollbarXToTop = computeScrollbarXToTop.value
       const scrollbarYToLeft = computeScrollbarYToLeft.value
       const scrollXVisible = computeScrollXVisible.value
       const scrollYVisible = computeScrollYVisible.value
-      const scrollXAutoHide = computeScrollXAutoHide.value
-      const scrollYAutoHide = computeScrollYAutoHide.value
       return domUtils.buildClass([
         'vxe-scrollbar is--virtual',
         `ov-x--${scrollXVisible === false ? 'hidden' : 'visible'}`,
@@ -325,9 +335,6 @@ export default defineVxeComponent({
         `sx-pos--${scrollbarXToTop ? 'top' : 'bottom'}`,
         `sy-pos--${scrollbarYToLeft ? 'left' : 'right'}`
       ], {
-        'is--padding': padding,
-        'ov-x--auto-hide': scrollXAutoHide,
-        'ov-y--auto-hide': scrollYAutoHide,
         'overflow-y': yThumbHeight,
         'overflow-x': xThumbWidth
       })
@@ -360,6 +367,11 @@ export default defineVxeComponent({
       return getRowIdByField(row, keyField)
     }
 
+    const getParentElem = () => {
+      const el = refElem.value
+      return el ? el.parentElement : null
+    }
+
     const calcTableHeight = (key: 'height' | 'maxHeight') => {
       const { parentHeight } = reactData
       const val = props[key]
@@ -2540,6 +2552,12 @@ export default defineVxeComponent({
     watch(computeRowHeight, () => {
       reFlag.value++
     })
+    watch(computeScrollYWidth, () => {
+      reFlag.value++
+    })
+    watch(computeScrollXHeight, () => {
+      reFlag.value++
+    })
     watch(computeScrollXVisible, () => {
       nextTick(() => {
         reFlag.value++
@@ -2605,20 +2623,32 @@ export default defineVxeComponent({
       if (useKey && !keyField) {
         errLog('vxe.error.reqSupportProp', ['row-config.useKey', 'row-config.keyField'])
       }
-      if (useScrollbar || autoResize) {
-        const el = refElem.value
+      const el = refElem.value
+      if (useScrollbar) {
         const viewInnerEl = refVirtualBody.value
-        const resizeObserver = globalResize.create(() => {
+        const scrollObserver = globalResize.create(() => {
           reFlag.value++
         })
         if (el) {
-          resizeObserver.observe(el)
-          if (autoResize) {
-            resizeObserver.observe(el.parentElement as HTMLDivElement)
-          }
+          scrollObserver.observe(el)
         }
         if (viewInnerEl) {
-          resizeObserver.observe(viewInnerEl)
+          scrollObserver.observe(viewInnerEl)
+        }
+        internalData.scrollObserver = scrollObserver
+      }
+      if (autoResize) {
+        const parentEl = getParentElem()
+        const resizeObserver = globalResize.create(() => {
+          if (props.autoResize) {
+            reFlag.value++
+          }
+        })
+        if (el) {
+          resizeObserver.observe(el)
+        }
+        if (parentEl) {
+          resizeObserver.observe(parentEl)
         }
         internalData.resizeObserver = resizeObserver
       }
@@ -2629,10 +2659,13 @@ export default defineVxeComponent({
     })
 
     onBeforeUnmount(() => {
-      const { resizeObserver } = internalData
+      const { scrollObserver, resizeObserver } = internalData
       if (resizeObserver) {
         resizeObserver.disconnect()
       }
+      if (scrollObserver) {
+        scrollObserver.disconnect()
+      }
       globalEvents.off($xeList, 'resize')
       XEUtils.assign(reactData, createReactData())
       XEUtils.assign(internalData, createInternalData())

package/packages/menu/src/menu.ts

@@ -3,7 +3,7 @@ import { defineVxeComponent } from '../../ui/src/comp'
 import XEUtils from 'xe-utils'
 import { VxeUI, createEvent, permission, useSize, globalEvents, renderEmptyElement } from '../../ui'
 import { getPopupContainer, scrollToView, toCssUnit } from '../../ui/src/dom'
-import { getLastZIndex, nextZIndex, isEnableConf } from '../../ui/src/utils'
+import { getLastZIndex, nextZIndex, isEnableConf, getDefaultConfig } from '../../ui/src/utils'
 import { getSlotVNs } from '../../ui/src/vn'
 import { createComponentLog } from '../../ui/src/log'
 import VxeLoadingComponent from '../../loading'
@@ -74,7 +74,7 @@ export default defineVxeComponent({
     menuConfig: Object as PropType<VxeMenuPropTypes.MenuConfig>,
     useScrollbar: {
       type: Boolean as PropType<VxeMenuPropTypes.UseScrollbar>,
-      default: () => getConfig().menu.useScrollbar
+      default: () => getDefaultConfig(getConfig().menu.useScrollbar, getConfig().useScrollbar)
     },
     scrollbarConfig: Object as PropType<VxeMenuPropTypes.ScrollbarConfig>,
     appendTo: {

package/packages/modal/src/modal.ts

@@ -2,13 +2,14 @@ import { h, Teleport, ref, Ref, inject, computed, reactive, provide, nextTick, w
 import { defineVxeComponent } from '../../ui/src/comp'
 import XEUtils from 'xe-utils'
 import { getEventTargetNode, getPopupContainer, getPopupWrapperElement, isScale, toCssUnit } from '../../ui/src/dom'
-import { getLastZIndex, nextZIndex, getSubLastZIndex, nextSubZIndex, getFuncText, handleBooleanDefaultValue } from '../../ui/src/utils'
+import { getLastZIndex, nextZIndex, getSubLastZIndex, nextSubZIndex, getFuncText, handleBooleanDefaultValue, getDefaultConfig } from '../../ui/src/utils'
 import { VxeUI, getConfig, getIcon, getI18n, globalEvents, GLOBAL_EVENT_KEYS, createEvent, useSize, renderEmptyElement } from '../../ui'
 import { getSlotVNs } from '../../ui/src/vn'
 import { createComponentLog } from '../../ui/src/log'
 import { allActiveModals } from './store'
 import VxeButtonComponent from '../../button'
 import VxeLoadingComponent from '../../loading'
+import VxeScrollbarComponent from '../../scrollbar'
 
 import type { VxeModalConstructor, VxeModalPropTypes, ModalReactData, ModalInternalData, VxeModalEmits, VxeModalPrivateComputed, ModalEventTypes, VxeButtonInstance, ModalMethods, ModalPrivateRef, VxeModalMethods, ValueOf, VxeDrawerConstructor, VxeDrawerMethods, VxeFormConstructor, VxeFormPrivateMethods } from '../../../types'
 import type { VxeTableConstructor, VxeTablePrivateMethods } from '../../../types/components/table'
@@ -223,6 +224,11 @@ export default defineVxeComponent({
     },
     beforeHideMethod: Function as PropType<VxeModalPropTypes.BeforeHideMethod>,
     slots: Object as PropType<VxeModalPropTypes.Slots>,
+    useScrollbar: {
+      type: Boolean as PropType<VxeModalPropTypes.UseScrollbar>,
+      default: () => getDefaultConfig(getConfig().modal.useScrollbar, getConfig().useScrollbar)
+    },
+    scrollbarConfig: Object as PropType<VxeModalPropTypes.ScrollbarConfig>,
 
     /**
      * 已废弃
@@ -310,6 +316,27 @@ export default defineVxeComponent({
       return Object.assign({}, getConfig().modal.zoomConfig, props.zoomConfig)
     })
 
+    const computeScrollbarOpts = computed(() => {
+      return Object.assign({}, getConfig().modal.scrollbarConfig, props.scrollbarConfig)
+    })
+
+    const computeScrollbarProps = computed(() => {
+      const scrollbarOpts = computeScrollbarOpts.value
+      const { viewClassName, viewInnerClassName } = scrollbarOpts
+      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) : '')
+      }
+    })
+
     const computeMaps: VxeModalPrivateComputed = {
       computeSize,
       computeZoomOpts
@@ -1371,9 +1398,10 @@ export default defineVxeComponent({
     }
 
     const renderBody = () => {
-      const { slots: propSlots = {}, status, message, iconStatus, useHtml } = props
+      const { slots: propSlots = {}, status, message, iconStatus, useScrollbar, useHtml } = props
       const content = props.content || message
       const isMsg = computeIsMsg.value
+      const scrollbarProps = computeScrollbarProps.value
       const defaultSlot = slots.default || propSlots.default
       const leftSlot = slots.left || propSlots.left
       const rightSlot = slots.right || propSlots.right
@@ -1389,18 +1417,47 @@ export default defineVxeComponent({
           ])
         )
       }
-      contVNs.push(
-        useHtml && !defaultSlot
-          ? h('div', {
-            key: 'hc',
-            class: 'vxe-modal--content',
-            innerHTML: getFuncText(content)
-          })
-          : h('div', {
-            key: 'dc',
-            class: 'vxe-modal--content'
-          }, defaultSlot ? getSlotVNs(defaultSlot({ $modal: $xeModal })) : getFuncText(content))
-      )
+
+      if (useHtml && !defaultSlot) {
+        contVNs.push(
+          useScrollbar
+            ? h(VxeScrollbarComponent, {
+              key: 'shc',
+              class: 'vxe-modal--scrollbar-content',
+              ...scrollbarProps
+            }, {
+              default () {
+                return [
+                  h('div', {
+                    class: 'vxe-modal--scrollbar-content-html',
+                    innerHTML: getFuncText(content)
+                  })
+                ]
+              }
+            })
+            : h('div', {
+              key: 'hc',
+              class: 'vxe-modal--content',
+              innerHTML: getFuncText(content)
+            })
+        )
+      } else {
+        contVNs.push(
+          useScrollbar
+            ? h(VxeScrollbarComponent, {
+              key: 'sdc',
+              class: 'vxe-modal--scrollbar-content',
+              ...scrollbarProps
+            }, {
+              default: () => defaultSlot ? getSlotVNs(defaultSlot({ $modal: $xeModal })) : getFuncText(content)
+            })
+            : h('div', {
+              key: 'dc',
+              class: 'vxe-modal--content'
+            }, defaultSlot ? getSlotVNs(defaultSlot({ $modal: $xeModal })) : getFuncText(content))
+        )
+      }
+
       return h('div', {
         class: 'vxe-modal--body'
       }, [

package/packages/scrollbar/src/scrollbar.ts

@@ -3,13 +3,14 @@ import { defineVxeComponent } from '../../ui/src/comp'
 import XEUtils from 'xe-utils'
 import { VxeUI } from '../../ui'
 import { toCssUnit } from '../../ui/src/dom'
-import { getThumbOffsetSize, getThumbSize, getScrollFromClick, getScrollFromDrag } from './util'
 import { getDefaultConfig } from '../../ui/src/utils'
 import VxeLoadingComponent from '../../loading'
 
 import type { ScrollbarReactData, ScrollbarInternalData, VxeScrollbarEmits, ScrollbarMethods, ScrollbarPrivateMethods, VxeScrollbarPropTypes, ValueOf, ScrollbarPrivateRef, VxeScrollbarPrivateComputed, VxeScrollbarConstructor, VxeScrollbarPrivateMethods, VxeComponentStyleType } from '../../../types'
 
-const { getConfig, createEvent, domUtils, globalResize, globalEvents, renderEmptyElement } = VxeUI
+const { getConfig, createEvent, domUtils, scrollbarUtils, globalResize, globalEvents, renderEmptyElement } = VxeUI
+
+const { getThumbOffsetSize, getThumbSize, getScrollFromClick, getScrollFromDrag } = scrollbarUtils
 
 function createReactData (): ScrollbarReactData {
   return {
@@ -105,10 +106,8 @@ export default defineVxeComponent({
 
     const computeWrapperStyle = computed(() => {
       const { width, height, minWidth, minHeight, maxWidth, maxHeight } = props
-      const xOpts = computeXOpts.value
-      const yOpts = computeYOpts.value
-      const barWidth = yOpts.width
-      const barHeight = xOpts.height
+      const barWidth = computeYWidth.value
+      const barHeight = computeXHeight.value
       const stys: VxeComponentStyleType = {}
       if (width) {
         stys.width = toCssUnit(width)
@@ -135,6 +134,16 @@ export default defineVxeComponent({
       return stys
     })
 
+    const computeXHeight = computed(() => {
+      const xOpts = computeXOpts.value
+      return xOpts.height
+    })
+
+    const computeYWidth = computed(() => {
+      const yOpts = computeYOpts.value
+      return yOpts.width
+    })
+
     const computeXVisible = computed(() => {
       const { visible } = props
       const xOpts = computeXOpts.value
@@ -642,6 +651,12 @@ export default defineVxeComponent({
     watch(() => props.syncResize, () => {
       reFlag.value++
     })
+    watch(computeYWidth, () => {
+      reFlag.value++
+    })
+    watch(computeXHeight, () => {
+      reFlag.value++
+    })
     watch(computeXVisible, () => {
       nextTick(() => {
         reFlag.value++

package/packages/tabs/src/tabs.ts

@@ -3,7 +3,7 @@ import { defineVxeComponent } from '../../ui/src/comp'
 import { createEvent, getConfig, getIcon, globalEvents, permission, useSize, renderEmptyElement } from '../../ui'
 import { getSlotVNs } from '../../ui/src/vn'
 import { toCssUnit, addClass, removeClass } from '../../ui/src/dom'
-import { isEnableConf } from '../../ui/src/utils'
+import { getDefaultConfig, isEnableConf } from '../../ui/src/utils'
 import { createComponentLog } from '../../ui/src/log'
 import XEUtils from 'xe-utils'
 import VxeLoadingComponent from '../../loading'
@@ -55,7 +55,7 @@ export default defineVxeComponent({
     },
     useScrollbar: {
       type: Boolean as PropType<VxeTabsPropTypes.UseScrollbar>,
-      default: () => getConfig().tabs.useScrollbar
+      default: () => getDefaultConfig(getConfig().tabs.useScrollbar, getConfig().useScrollbar)
     },
     scrollbarConfig: Object as PropType<VxeTabsPropTypes.ScrollbarConfig>,
     // 已废弃

package/packages/tree/src/tree.ts

@@ -9,7 +9,6 @@ import { getSlotVNs } from '../../ui/src/vn'
 import { toCssUnit, isScale, getPaddingTopBottomSize, addClass, removeClass, getTpImg, hasControlKey, getEventTargetNode, hasClass } from '../../ui/src/dom'
 import { isEnableConf, enModelValue, deModelValue, getText, getDefaultConfig } from '../../ui/src/utils'
 import { moveRowAnimateToTb, clearRowAnimate } from '../../ui/src/anime'
-import { getThumbOffsetSize, getThumbSize, getScrollFromClick, getScrollFromDrag } from '../../scrollbar/src/util'
 import VxeLoadingComponent from '../../loading'
 import VxeTooltipComponent from '../../tooltip'
 
@@ -17,7 +16,9 @@ import type { TreeReactData, VxeTreeEmits, VxeTreePropTypes, TreeInternalData, T
 
 const { warnLog, errLog } = createComponentLog('tree')
 
-const { menus, getConfig, getI18n, getIcon } = VxeUI
+const { menus, scrollbarUtils, getConfig, getI18n, getIcon } = VxeUI
+
+const { getThumbOffsetSize, getThumbSize, getScrollFromClick, getScrollFromDrag } = scrollbarUtils
 
 /**
  * 生成节点的唯一主键
@@ -70,8 +71,10 @@ function createInternalData (): TreeInternalData {
     treeExpandedMaps: {},
     treeExpandLazyLoadedMaps: {},
 
-    // 滚动条
     // resizeObserver: undefined,
+
+    // 滚动条
+    // scrollObserver: undefined,
     // isThumbDrag: false,
     thumbDragOffset: 0,
     yThumbTop: 0,
@@ -236,7 +239,7 @@ export default defineVxeComponent({
     virtualYConfig: Object as PropType<VxeTreePropTypes.VirtualYConfig>,
     useScrollbar: {
       type: Boolean as PropType<VxeTreePropTypes.UseScrollbar>,
-      default: () => getConfig().tree.useScrollbar
+      default: () => getDefaultConfig(getConfig().tree.useScrollbar, getConfig().useScrollbar)
     },
     scrollbarConfig: Object as PropType<VxeTreePropTypes.ScrollbarConfig>
   },
@@ -373,11 +376,8 @@ export default defineVxeComponent({
     })
 
     const computeWrapperStyles = computed(() => {
-      const scrollbarOpts = computeScrollbarOpts.value
-      const scrollbarXOpts = computeScrollbarXOpts.value
-      const scrollbarYOpts = computeScrollbarYOpts.value
-      const barWidth = getDefaultConfig(getDefaultConfig(scrollbarYOpts.width, scrollbarOpts.width), getConfig().scrollbar.width)
-      const barHeight = getDefaultConfig(getDefaultConfig(scrollbarXOpts.height, scrollbarOpts.height), getConfig().scrollbar.height)
+      const barWidth = computeScrollYWidth.value
+      const barHeight = computeScrollXHeight.value
       const stys: VxeComponentStyleType = {}
       if (barWidth || barHeight) {
         stys['--vxe-ui-scrollbar-y-width'] = toCssUnit(barWidth || barHeight)
@@ -436,6 +436,18 @@ export default defineVxeComponent({
       return Object.assign({}, getConfig().scrollbar.yConfig, scrollbarOpts.yConfig)
     })
 
+    const computeScrollXHeight = computed(() => {
+      const scrollbarOpts = computeScrollbarOpts.value
+      const scrollbarXOpts = computeScrollbarXOpts.value
+      return getDefaultConfig(getDefaultConfig(scrollbarXOpts.height, scrollbarOpts.height), getConfig().scrollbar.height)
+    })
+
+    const computeScrollYWidth = computed(() => {
+      const scrollbarOpts = computeScrollbarOpts.value
+      const scrollbarYOpts = computeScrollbarYOpts.value
+      return getDefaultConfig(getDefaultConfig(scrollbarYOpts.width, scrollbarOpts.width), getConfig().scrollbar.width)
+    })
+
     const computeScrollXVisible = computed(() => {
       const scrollbarOpts = computeScrollbarOpts.value
       const scrollbarXOpts = computeScrollbarXOpts.value
@@ -461,15 +473,11 @@ export default defineVxeComponent({
     })
 
     const computeScrollbarWrapperClss = computed(() => {
-      const scrollbarOpts = computeScrollbarOpts.value
-      const { padding } = scrollbarOpts
       const { yThumbHeight, xThumbWidth } = reactData
       const scrollbarXToTop = computeScrollbarXToTop.value
       const scrollbarYToLeft = computeScrollbarYToLeft.value
       const scrollXVisible = computeScrollXVisible.value
       const scrollYVisible = computeScrollYVisible.value
-      const scrollXAutoHide = computeScrollXAutoHide.value
-      const scrollYAutoHide = computeScrollYAutoHide.value
       return domUtils.buildClass([
         'vxe-scrollbar is--virtual',
         `ov-x--${scrollXVisible === false ? 'hidden' : 'visible'}`,
@@ -477,9 +485,6 @@ export default defineVxeComponent({
         `sx-pos--${scrollbarXToTop ? 'top' : 'bottom'}`,
         `sy-pos--${scrollbarYToLeft ? 'left' : 'right'}`
       ], {
-        'is--padding': padding,
-        'ov-x--auto-hide': scrollXAutoHide,
-        'ov-y--auto-hide': scrollYAutoHide,
         'overflow-y': yThumbHeight,
         'overflow-x': xThumbWidth
       })
@@ -3855,6 +3860,12 @@ export default defineVxeComponent({
     watch(() => props.useScrollbar, () => {
       reFlag.value++
     })
+    watch(computeScrollYWidth, () => {
+      reFlag.value++
+    })
+    watch(computeScrollXHeight, () => {
+      reFlag.value++
+    })
     watch(computeScrollXVisible, () => {
       nextTick(() => {
         reFlag.value++
@@ -3893,23 +3904,32 @@ export default defineVxeComponent({
       if (menuConfig && !VxeUIContextMenu) {
         errLog('vxe.error.reqComp', ['vxe-context-menu'])
       }
+      const el = refElem.value
       if (useScrollbar || autoResize) {
-        const el = refElem.value
         const viewInnerEl = refVirtualBody.value
+        const scrollObserver = globalResize.create(() => {
+          updateScrollbar()
+        })
+        if (el) {
+          scrollObserver.observe(el)
+        }
+        if (viewInnerEl) {
+          scrollObserver.observe(viewInnerEl)
+        }
+        internalData.scrollObserver = scrollObserver
+      }
+      if (autoResize) {
         const parentEl = getParentElem()
         const resizeObserver = globalResize.create(() => {
-          reFlag.value++
+          if (props.autoResize) {
+            reFlag.value++
+          }
         })
         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
       }
@@ -3921,10 +3941,13 @@ export default defineVxeComponent({
     })
 
     onBeforeUnmount(() => {
-      const { resizeObserver } = internalData
+      const { scrollObserver, resizeObserver } = internalData
       if (resizeObserver) {
         resizeObserver.disconnect()
       }
+      if (scrollObserver) {
+        scrollObserver.disconnect()
+      }
       globalEvents.off($xeTree, 'resize')
       XEUtils.assign(reactData, createReactData())
       XEUtils.assign(internalData, createInternalData())

package/styles/components/drawer.scss

@@ -181,8 +181,8 @@
   &.is--drag {
     cursor: move;
     transition: none;
-   .vxe-modal--body,
-   .vxe-modal--footer {
+   .vxe-drawer--body,
+   .vxe-drawer--footer {
       &:after {
         content: "";
         position: absolute;
@@ -192,9 +192,10 @@
         height: 100%;
       }
     }
-    .vxe-modal--body {
+    .vxe-drawer--body {
       overflow: hidden;
-      .vxe-modal--content {
+      .vxe-drawer--content,
+      .vxe-drawer--scrollbar-content {
         overflow: hidden;
       }
     }
@@ -213,7 +214,8 @@
   overflow: auto;
   outline: 0;
 }
-.vxe-drawer--content {
+.vxe-drawer--content,
+.vxe-drawer--scrollbar-content  {
   flex-grow: 1;
   white-space: pre-line;
 }
@@ -227,7 +229,8 @@
   flex-grow: 1;
   overflow: auto;
   outline: 0;
-  .vxe-drawer--content {
+  .vxe-drawer--content,
+  .vxe-drawer--scrollbar-content  {
     overflow: auto;
   }
 }
@@ -349,3 +352,7 @@
     overflow: hidden;
   }
 }
+
+.vxe-drawer--scrollbar-content {
+  width: 100%;
+}

package/styles/components/modal.scss

@@ -52,7 +52,8 @@ html[data-vxe-lock-scroll] {
     }
     .vxe-modal--body {
       overflow: hidden;
-      .vxe-modal--content {
+      .vxe-modal--content,
+      .vxe-modal--scrollbar-content {
         overflow: hidden;
       }
     }
@@ -74,7 +75,8 @@ html[data-vxe-lock-scroll] {
   align-items: center;
   font-size: 1.6em;
 }
-.vxe-modal--content {
+.vxe-modal--content,
+.vxe-modal--scrollbar-content {
   flex-grow: 1;
   white-space: pre-line;
 }
@@ -447,7 +449,8 @@ html[data-vxe-lock-scroll] {
           visibility: hidden;
         }
       }
-      .vxe-modal--content {
+      .vxe-modal--content,
+      .vxe-modal--scrollbar-content {
         max-width: 800px;
         float: left;
       }
@@ -478,7 +481,8 @@ html[data-vxe-lock-scroll] {
     }
     .vxe-modal--body {
       overflow: auto;
-      .vxe-modal--content {
+      .vxe-modal--content,
+      .vxe-modal--scrollbar-content {
         overflow: auto;
       }
     }
@@ -538,3 +542,7 @@ html[data-vxe-lock-scroll] {
     overflow: hidden;
   }
 }
+
+.vxe-modal--scrollbar-content {
+  width: 100%;
+}