vxe-pc-ui 3.20.1 → 3.20.2

package/packages/modal/src/modal.ts

@@ -3,12 +3,13 @@ import { defineVxeComponent } from '../../ui/src/comp'
 import XEUtils from 'xe-utils'
 import { VxeUI, getConfig, getI18n, getIcon, createEvent, globalEvents, globalMixins, renderEmptyElement, GLOBAL_EVENT_KEYS } from '../../ui'
 import { getEventTargetNode, getPopupAppendElement, 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 { 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, VxeModalMethods, ModalEventTypes, VxeModalEmits, VxeComponentSizeType, VxeComponentPermissionInfo, ValueOf, VxeButtonConstructor, VxeDrawerConstructor, VxeDrawerMethods, VxeFormConstructor, VxeFormPrivateMethods } from '../../../types'
 import type { VxeTableConstructor, VxeTablePrivateMethods } from '../../../types/components/table'
@@ -227,6 +228,11 @@ export default /* define-vxe-component start */ 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>,
 
     /**
      * 已废弃
@@ -316,23 +322,47 @@ export default /* define-vxe-component start */ defineVxeComponent({
 
       return props.type === 'modal'
     },
-    computeIsMinimizeStatus  () {
+    computeIsMinimizeStatus () {
       const $xeModal = this
       const reactData = $xeModal.reactData as ModalReactData
 
       return reactData.zoomStatus === 'minimize'
     },
-    computeIsMaximizeStatus  () {
+    computeIsMaximizeStatus () {
       const $xeModal = this
       const reactData = $xeModal.reactData as ModalReactData
 
       return reactData.zoomStatus === 'maximize'
     },
-    computeZoomOpts  () {
+    computeZoomOpts () {
       const $xeModal = this
       const props = $xeModal
 
       return Object.assign({}, getConfig().modal.zoomConfig, props.zoomConfig)
+    },
+    computeScrollbarOpts () {
+      const $xeModal = this
+      const props = $xeModal
+
+      return Object.assign({}, getConfig().modal.scrollbarConfig, props.scrollbarConfig)
+    },
+    computeScrollbarProps () {
+      const $xeModal = this
+
+      const scrollbarOpts = $xeModal.computeScrollbarOpts as VxeModalPropTypes.ScrollbarConfig
+      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) : '')
+      }
     }
   },
   watch: {
@@ -1539,9 +1569,10 @@ export default /* define-vxe-component start */ defineVxeComponent({
       const props = $xeModal
       const slots = $xeModal.$scopedSlots
 
-      const { slots: propSlots = {}, status, message, iconStatus, useHtml } = props
+      const { slots: propSlots = {}, status, message, iconStatus, useScrollbar, useHtml } = props
       const content = props.content || message
       const isMsg = $xeModal.computeIsMsg
+      const scrollbarProps = $xeModal.computeScrollbarProps
       const defaultSlot = slots.default || propSlots.default
       const leftSlot = slots.left || propSlots.left
       const rightSlot = slots.right || propSlots.right
@@ -1557,20 +1588,53 @@ export default /* define-vxe-component start */ defineVxeComponent({
           ])
         )
       }
-      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(VxeScrollbarComponent, {
+              key: 'shc',
+              class: 'vxe-modal--scrollbar-content',
+              props: scrollbarProps,
+              scopedSlots: {
+                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(VxeScrollbarComponent, {
+              key: 'sdc',
+              class: 'vxe-modal--scrollbar-content',
+              props: scrollbarProps,
+              scopedSlots: {
+                default: () => 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'
       }, [

package/packages/scrollbar/src/scrollbar.ts

@@ -103,10 +103,8 @@ export default /* define-vxe-component start */ defineVxeComponent({
       const props = $xeScrollbar
 
       const { width, height, minWidth, minHeight, maxWidth, maxHeight } = props
-      const xOpts = $xeScrollbar.computeXOpts
-      const yOpts = $xeScrollbar.computeYOpts
-      const barWidth = yOpts.width
-      const barHeight = xOpts.height
+      const barWidth = $xeScrollbar.computeYWidth
+      const barHeight = $xeScrollbar.computeXHeight
       const stys: VxeComponentStyleType = {}
       if (width) {
         stys.width = toCssUnit(width)
@@ -132,6 +130,18 @@ export default /* define-vxe-component start */ defineVxeComponent({
       }
       return stys
     },
+    computeXHeight () {
+      const $xeScrollbar = this
+
+      const xOpts = ($xeScrollbar as any).computeXOpts as VxeScrollbarPropTypes.XConfig
+      return xOpts.height
+    },
+    computeYWidth () {
+      const $xeScrollbar = this
+
+      const yOpts = ($xeScrollbar as any).computeYOpts as VxeScrollbarPropTypes.YConfig
+      return yOpts.width
+    },
     computeXVisible () {
       const $xeScrollbar = this
       const props = $xeScrollbar
@@ -710,6 +720,16 @@ export default /* define-vxe-component start */ defineVxeComponent({
 
       $xeScrollbar.reFlag++
     },
+    computeYWidth () {
+      const $xeScrollbar = this
+
+      $xeScrollbar.reFlag++
+    },
+    computeXHeight () {
+      const $xeScrollbar = this
+
+      $xeScrollbar.reFlag++
+    },
     computeXVisible () {
       const $xeScrollbar = this
 

package/packages/tabs/src/tabs.ts

@@ -4,7 +4,7 @@ import XEUtils from 'xe-utils'
 import { createEvent, getConfig, getIcon, globalEvents, globalMixins, permission, 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 VxeLoadingComponent from '../../loading'
 import VxeScrollbarComponent from '../../scrollbar'
@@ -58,7 +58,7 @@ export default /* define-vxe-component start */ 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

@@ -584,8 +584,10 @@ function createInternalData (): TreeInternalData {
     treeExpandedMaps: {},
     treeExpandLazyLoadedMaps: {},
 
-    // 滚动条
     // resizeObserver: undefined,
+
+    // 滚动条
+    // scrollObserver: undefined,
     // isThumbDrag: false,
     thumbDragOffset: 0,
     yThumbTop: 0,
@@ -748,7 +750,7 @@ export default /* define-vxe-component start */ 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>
   },
@@ -893,11 +895,8 @@ export default /* define-vxe-component start */ defineVxeComponent({
     computeWrapperStyles () {
       const $xeTree = this
 
-      const scrollbarOpts = $xeTree.computeScrollbarOpts
-      const scrollbarXOpts = $xeTree.computeScrollbarXOpts
-      const scrollbarYOpts = $xeTree.computeScrollbarYOpts
-      const barWidth = getDefaultConfig(getDefaultConfig(scrollbarYOpts.width, scrollbarOpts.width), getConfig().scrollbar.width)
-      const barHeight = getDefaultConfig(getDefaultConfig(scrollbarXOpts.height, scrollbarOpts.height), getConfig().scrollbar.height)
+      const barWidth = $xeTree.computeScrollYWidth
+      const barHeight = $xeTree.computeScrollXHeight
       const stys: VxeComponentStyleType = {}
       if (barWidth || barHeight) {
         stys['--vxe-ui-scrollbar-y-width'] = toCssUnit(barWidth || barHeight)
@@ -944,13 +943,13 @@ export default /* define-vxe-component start */ defineVxeComponent({
 
       return Object.assign({}, getConfig().tree.filterConfig, props.filterConfig)
     },
-    computeScrollbarOpts  () {
+    computeScrollbarOpts () {
       const $xeTree = this
       const props = $xeTree
 
       return Object.assign({}, getConfig().tree.scrollbarConfig, props.scrollbarConfig)
     },
-    computeScrollbarXOpts  () {
+    computeScrollbarXOpts () {
       const $xeTree = this
 
       const scrollbarOpts = $xeTree.computeScrollbarOpts as VxeTreePropTypes.ScrollbarConfig
@@ -958,12 +957,26 @@ export default /* define-vxe-component start */ defineVxeComponent({
         visible: false
       })
     },
-    computeScrollbarYOpts  () {
+    computeScrollbarYOpts () {
       const $xeTree = this
 
       const scrollbarOpts = $xeTree.computeScrollbarOpts as VxeTreePropTypes.ScrollbarConfig
       return Object.assign({}, getConfig().scrollbar.yConfig, scrollbarOpts.yConfig)
     },
+    computeScrollXHeight () {
+      const $xeTree = this
+
+      const scrollbarOpts = $xeTree.computeScrollbarOpts as VxeTreePropTypes.ScrollbarConfig
+      const scrollbarXOpts = $xeTree.computeScrollbarXOpts as VxeScrollbarPropTypes.XConfig
+      return getDefaultConfig(getDefaultConfig(scrollbarXOpts.height, scrollbarOpts.height), getConfig().scrollbar.height)
+    },
+    computeScrollYWidth () {
+      const $xeTree = this
+
+      const scrollbarOpts = $xeTree.computeScrollbarOpts as VxeTreePropTypes.ScrollbarConfig
+      const scrollbarYOpts = $xeTree.computeScrollbarYOpts as VxeScrollbarPropTypes.YConfig
+      return getDefaultConfig(getDefaultConfig(scrollbarYOpts.width, scrollbarOpts.width), getConfig().scrollbar.width)
+    },
     computeScrollXVisible () {
       const $xeTree = this
 
@@ -994,17 +1007,13 @@ export default /* define-vxe-component start */ defineVxeComponent({
     },
     computeScrollbarWrapperClss () {
       const $xeTree = this
-      const reactData = ($xeTree as any).reactData
+      const reactData = ($xeTree as any).reactData as TreeReactData
 
-      const scrollbarOpts = $xeTree.computeScrollbarOpts as VxeTreePropTypes.ScrollbarConfig
-      const { padding } = scrollbarOpts
       const { yThumbHeight, xThumbWidth } = reactData
       const scrollbarXToTop = $xeTree.computeScrollbarXToTop
       const scrollbarYToLeft = $xeTree.computeScrollbarYToLeft
       const scrollXVisible = $xeTree.computeScrollXVisible
       const scrollYVisible = $xeTree.computeScrollYVisible
-      const scrollXAutoHide = $xeTree.computeScrollXAutoHide as boolean
-      const scrollYAutoHide = $xeTree.computeScrollYAutoHide as boolean
       return domUtils.buildClass([
         'vxe-scrollbar is--virtual',
         `ov-x--${scrollXVisible === false ? 'hidden' : 'visible'}`,
@@ -1012,9 +1021,6 @@ export default /* define-vxe-component start */ 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
       })
@@ -4262,6 +4268,16 @@ export default /* define-vxe-component start */ defineVxeComponent({
 
       $xeTree.reFlag++
     },
+    computeScrollYWidth () {
+      const $xeTree = this
+
+      $xeTree.reFlag++
+    },
+    computeScrollXHeight () {
+      const $xeTree = this
+
+      $xeTree.reFlag++
+    },
     computeScrollXVisible () {
       const $xeTree = this
 
@@ -4320,23 +4336,32 @@ export default /* define-vxe-component start */ defineVxeComponent({
     if (menuConfig && !VxeUIContextMenu) {
       errLog('vxe.error.reqComp', ['vxe-context-menu'])
     }
-    if (useScrollbar || autoResize) {
-      const el = $xeTree.$refs.refElem as HTMLDivElement
+    const el = $xeTree.$refs.refElem as HTMLDivElement
+    if (useScrollbar) {
       const viewInnerEl = $xeTree.$refs.refVirtualBody as HTMLDivElement
+      const scrollObserver = globalResize.create(() => {
+        $xeTree.updateScrollbar()
+      })
+      if (el) {
+        scrollObserver.observe(el)
+      }
+      if (viewInnerEl) {
+        scrollObserver.observe(viewInnerEl)
+      }
+      internalData.scrollObserver = scrollObserver
+    }
+    if (autoResize) {
       const parentEl = $xeTree.getParentElem()
       const resizeObserver = globalResize.create(() => {
-        $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
     }
@@ -4351,10 +4376,13 @@ export default /* define-vxe-component start */ defineVxeComponent({
     const reactData = $xeTree.reactData
     const internalData = $xeTree.internalData
 
-    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

@@ -538,3 +538,7 @@ html[data-vxe-lock-scroll] {
     overflow: hidden;
   }
 }
+
+.vxe-modal--scrollbar-content {
+  width: 100%;
+}

package/types/components/drawer.d.ts

@@ -1,5 +1,6 @@
 import { CreateElement } from 'vue'
 import { DefineVxeComponentApp, DefineVxeComponentOptions, DefineVxeComponentInstance, VxeComponentEventParams, VxeComponentSizeType, VxeComponentSlotType, ValueOf } from '@vxe-ui/core'
+import { VxeScrollbarProps } from './scrollbar'
 
 /* eslint-disable @typescript-eslint/no-empty-interface,no-use-before-define,@typescript-eslint/ban-types */
 
@@ -67,6 +68,17 @@ export namespace VxeDrawerPropTypes {
   export type Padding = boolean
   export type BeforeHideMethod = (params: VxeDrawerDefines.DrawerVisibleParams) => Promise<any>
   export type Slots = VxeDrawerSlots
+  export type UseScrollbar = boolean
+  export interface ScrollbarConfig extends Pick<VxeScrollbarProps, 'xConfig' | 'yConfig' | 'padding' | 'autoHide' | 'visible' | 'className' | 'viewAttrs' | 'viewClassName' | 'viewInnerClassName'> {
+    /**
+     * 滚动条宽度
+     */
+    width?: number | string
+    /**
+     * 滚动条高度
+     */
+    height?: number | string
+  }
 }
 
 export interface VxeDrawerProps {
@@ -119,6 +131,14 @@ export interface VxeDrawerProps {
   padding?: VxeDrawerPropTypes.Padding
   beforeHideMethod?: VxeDrawerPropTypes.BeforeHideMethod
   slots?: VxeDrawerPropTypes.Slots
+  /**
+   * 使用虚拟滚动条
+   */
+  useScrollbar?: VxeDrawerPropTypes.UseScrollbar
+  /**
+   * 滚动条配置项
+   */
+  scrollbarConfig?: VxeDrawerPropTypes.ScrollbarConfig
 }
 
 export interface DrawerPrivateComputed {

package/types/components/gantt-module/gantt-view.d.ts

@@ -1,6 +1,7 @@
 import { DefineVxeComponentInstance } from '@vxe-ui/core'
 import { VxeTableConstructor, VxeTableMethods, VxeTablePrivateMethods } from '../table'
 import { VxeGanttDefines, VxeGanttConstructor } from '../gantt'
+import { VxeScrollbarPropTypes } from '../scrollbar'
 
 /* eslint-disable no-use-before-define */
 
@@ -34,6 +35,10 @@ export interface GanttViewReactData {
   lastScrollTime: number
   lazScrollLoading: boolean
 
+  // 滚动条
+  yThumbHeight: number
+  xThumbWidth: number
+
   scrollVMLoading: boolean
   scrollYHeight: number
   scrollYTop: number
@@ -72,7 +77,13 @@ export interface GanttViewInternalData {
     startIndex: number
     endIndex: number
   }
-  // 最后滚动位置
+
+  // 滚动条
+  scrollObserver?: ResizeObserver
+  isThumbDrag?: boolean
+  thumbDragOffset: number
+  yThumbTop: number
+  xThumbLeft: number
   lastScrollLeft: number
   lastScrollTop: number
 
@@ -105,6 +116,14 @@ export interface GanttViewPrivateRef {
 }
 
 export interface GanttViewPrivateComputed {
+  computeScrollXHeight: number | undefined
+  computeScrollYWidth: number | undefined
+  computeScrollXVisible: 'auto' | 'visible' | 'hidden' | boolean | undefined
+  computeScrollYVisible: 'auto' | 'visible' | 'hidden' | boolean | undefined
+  computeScrollXAutoHide: VxeScrollbarPropTypes.AutoHide | undefined
+  computeScrollYAutoHide: VxeScrollbarPropTypes.AutoHide | undefined
+  computeScrollbarXToTop: boolean
+  computeScrollbarYToLeft: boolean
   computeScaleDateList: Date[]
   computeNowLineLeft: number
 }
@@ -158,6 +177,10 @@ export interface VxeGanttViewPrivateMethods {
    * @private
    */
   handleUpdateSYStatus(scrollYLoad: boolean): void
+  /**
+   * @private
+   */
+  updateScrollbar(): void
 }
 
 export interface VxeGanttViewMethods {

package/types/components/gantt.d.ts

@@ -723,6 +723,8 @@ export interface GanttPrivateComputed<D = any> extends GridPrivateComputed<D> {
   computeTypeField: string
   computeProgressField: string
   computeScrollbarOpts: VxeTablePropTypes.ScrollbarConfig
+  computeScrollbarXOpts: VxeTablePropTypes.ScrollbarXConfig
+  computeScrollbarYOpts: VxeTablePropTypes.ScrollbarYConfig
   computeScrollbarXToTop: boolean
   computeScrollbarYToLeft: boolean
 }

package/types/components/list.d.ts

@@ -306,8 +306,10 @@ export interface ListInternalData {
   fullKeyMaps: Record<string, any>
   rowMaps: Record<string, VxeListDefines.RowCacheItem>
 
-  // 滚动条
   resizeObserver?: ResizeObserver
+
+  // 滚动条
+  scrollObserver?: ResizeObserver
   isThumbDrag?: boolean
   thumbDragOffset: number
   yThumbTop: number

package/types/components/modal.d.ts

@@ -1,5 +1,6 @@
 import { CreateElement } from 'vue'
 import { DefineVxeComponentApp, DefineVxeComponentOptions, DefineVxeComponentInstance, VxeComponentSizeType, VxeComponentEventParams, ValueOf, VxeComponentSlotType } from '@vxe-ui/core'
+import { VxeScrollbarProps } from './scrollbar'
 
 /* eslint-disable @typescript-eslint/no-empty-interface,no-use-before-define,@typescript-eslint/ban-types */
 
@@ -120,6 +121,17 @@ export namespace VxeModalPropTypes {
     type: ModalEventTypes
   }) => Promise<any>
   export type Slots = VxeModalSlots
+  export type UseScrollbar = boolean
+  export interface ScrollbarConfig extends Pick<VxeScrollbarProps, 'xConfig' | 'yConfig' | 'padding' | 'autoHide' | 'visible' | 'className' | 'viewAttrs' | 'viewClassName' | 'viewInnerClassName'> {
+    /**
+     * 滚动条宽度
+     */
+    width?: number | string
+    /**
+     * 滚动条高度
+     */
+    height?: number | string
+  }
 }
 
 export interface VxeModalProps {
@@ -189,6 +201,14 @@ export interface VxeModalProps {
   padding?: VxeModalPropTypes.Padding
   beforeHideMethod?: VxeModalPropTypes.BeforeHideMethod
   slots?: VxeModalPropTypes.Slots
+  /**
+   * 使用虚拟滚动条
+   */
+  useScrollbar?: VxeModalPropTypes.UseScrollbar
+  /**
+   * 滚动条配置项
+   */
+  scrollbarConfig?: VxeModalPropTypes.ScrollbarConfig
   /**
    * @deprecated 已废弃，请使用 content
    */