vxe-pc-ui 3.20.1 → 3.20.5

package/packages/tree/src/tree.ts

@@ -9,7 +9,6 @@ import { crossTreeDragNodeGlobal, getCrossTreeDragNodeInfo } from './store'
 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, VxeTreeConstructor, VxeTreePropTypes,
 
 const { warnLog, errLog } = createComponentLog('tree')
 
-const { menus, getConfig, getI18n, getIcon } = VxeUI
+const { menus, scrollbarUtils, getConfig, getI18n, getIcon } = VxeUI
+
+const { getThumbOffsetSize, getThumbSize, getScrollFromClick, getScrollFromDrag } = scrollbarUtils
 
 let crossTreeDragNodeObj: {
   $oldTree: VxeTreeConstructor & VxeTreePrivateMethods
@@ -584,8 +585,10 @@ function createInternalData (): TreeInternalData {
     treeExpandedMaps: {},
     treeExpandLazyLoadedMaps: {},
 
-    // 滚动条
     // resizeObserver: undefined,
+
+    // 滚动条
+    // scrollObserver: undefined,
     // isThumbDrag: false,
     thumbDragOffset: 0,
     yThumbTop: 0,
@@ -748,7 +751,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 +896,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 +944,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 +958,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 +1008,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 +1022,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 +4269,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 +4337,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 +4377,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-plugins/extend-gantt-chart.d.ts

@@ -37,7 +37,7 @@ export interface VxeGanttExtendChartPrivateMethods<D = any> {
    * 内部方法
    * @private
    */
-  handleTaskBarMousedownEvent(evnt: MouseEvent, params: {
+  handleTaskBarModnEvent(evnt: MouseEvent, params: {
     $gantt: VxeGanttConstructor<D>
     row: D
     scaleType: VxeGanttDefines.ColumnScaleType

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/layout-aside.d.ts

@@ -43,10 +43,25 @@ export namespace VxeLayoutAsidePropTypes {
 }
 
 export interface VxeLayoutAsideProps {
+  /**
+   * 宽度
+   */
   width?: VxeLayoutAsidePropTypes.Width
+  /**
+   * 是否折叠
+   */
   collapsed?: VxeLayoutAsidePropTypes.Collapsed
+  /**
+   * 折叠后宽度
+   */
   collapseWidth?: VxeLayoutAsidePropTypes.CollapseWidth
+  /**
+   * 加载中
+   */
   loading?: VxeLayoutAsidePropTypes.Loading
+  /**
+   * 显示内边距
+   */
   padding?: VxeLayoutAsidePropTypes.Padding
   size?: VxeLayoutAsidePropTypes.Size
   collapseConfig?: VxeLayoutAsidePropTypes.CollapseConfig

package/types/components/layout-body.d.ts

@@ -38,6 +38,9 @@ export namespace VxeLayoutBodyPropTypes {
 }
 export interface VxeLayoutBodyProps {
   size?: VxeLayoutBodyPropTypes.Size
+  /**
+   * 加载中
+   */
   loading?: VxeLayoutBodyPropTypes.Loading
   padding?: VxeLayoutBodyPropTypes.Padding
   showBacktop?: VxeLayoutBodyPropTypes.ShowBacktop

package/types/components/list.d.ts

@@ -235,8 +235,17 @@ export namespace VxeListPropTypes {
 export interface VxeListProps<D = any> {
   size?: VxeListPropTypes.Size
   data?: D[]
+  /**
+   * 高度
+   */
   height?: VxeListPropTypes.Height
+  /**
+   * 最大高度
+   */
   maxHeight?: VxeListPropTypes.MaxHeight
+  /**
+   * 加载中
+   */
   loading?: VxeListPropTypes.Loading
   autoResize?: VxeListPropTypes.AutoResize
   syncResize?: VxeListPropTypes.SyncResize
@@ -250,7 +259,13 @@ export interface VxeListProps<D = any> {
   checkboxConfig?: VxeListPropTypes.CheckboxConfig
   rowConfig?: VxeListPropTypes.RowConfig
   dragConfig?: VxeListPropTypes.DragConfig
+  /**
+   * 右键菜单配置项
+   */
   menuConfig?: VxeListPropTypes.MenuConfig
+  /**
+   * 纵向虚拟滚动配置
+   */
   virtualYConfig?: VxeListPropTypes.VirtualYConfig
   /**
    * 使用虚拟滚动条
@@ -306,8 +321,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
    */

package/types/components/number-input.d.ts

@@ -32,7 +32,6 @@ export namespace VxeNumberInputPropTypes {
   export type FloatContent = string
   export type FloatAlign = VxeComponentAlignType
   export type MaxLength = string | number | null
-  export type Multiple = boolean
   export type AutoComplete = string
   export type Align = string
   export type Form = string
@@ -119,6 +118,9 @@ export namespace VxeNumberInputPropTypes {
 }
 
 export interface VxeNumberInputProps {
+  /**
+   * 尺寸大小
+   */
   size?: VxeNumberInputPropTypes.Size
   value?: VxeNumberInputPropTypes.ModelValue
   className?: VxeNumberInputPropTypes.ClassName
@@ -129,7 +131,13 @@ export interface VxeNumberInputProps {
   width?: VxeNumberInputPropTypes.Width
   immediate?: VxeNumberInputPropTypes.Immediate
   name?: VxeNumberInputPropTypes.Name
+  /**
+   * 控件类型
+   */
   type?: VxeNumberInputPropTypes.Type
+  /**
+   * 显示清除按钮
+   */
   clearable?: VxeNumberInputPropTypes.Clearable
   readonly?: VxeNumberInputPropTypes.Readonly
   disabled?: VxeNumberInputPropTypes.Disabled
@@ -137,8 +145,10 @@ export interface VxeNumberInputProps {
   floatContent?: VxeNumberInputPropTypes.FloatContent
   floatAlign?: VxeNumberInputPropTypes.FloatAlign
   maxLength?: VxeNumberInputPropTypes.MaxLength
-  multiple?: VxeNumberInputPropTypes.Multiple
   autoComplete?: VxeNumberInputPropTypes.AutoComplete
+  /**
+   * 对齐方式
+   */
   align?: VxeNumberInputPropTypes.Align
   form?: VxeNumberInputPropTypes.Form
 

package/types/components/table-plugins/extend-pivot-table.d.ts

@@ -45,7 +45,7 @@ export interface VxeTableExtendPivotTablePrivateMethods<D = any> {
    * 内部方法
    * @private
    */
-  handlePivotTableAggregatePanelDragendEvent(evnt: DragEvent): void
+  handlePivotTableAggPanelDragendEvent(evnt: DragEvent): void
 }
 
 declare module '../table' {

package/types/components/table.d.ts

@@ -12,6 +12,7 @@ import { VxeTabsConstructor, VxeTabsPrivateMethods } from './tabs'
 import { VxeSplitterConstructor, VxeSplitterMethods } from './splitter'
 import { VxeGanttConstructor, VxeGanttPrivateMethods } from './gantt'
 import { VxeGanttViewConstructor, VxeGanttViewInstance, VxeGanttViewPrivateMethods } from './gantt-module/gantt-view'
+import { VxeScrollbarPropTypes } from './scrollbar'
 
 /* eslint-disable @typescript-eslint/no-empty-interface,no-use-before-define,@typescript-eslint/ban-types,@typescript-eslint/no-unused-vars */
 
@@ -3513,6 +3514,9 @@ export namespace VxeTablePropTypes {
 }
 
 export interface VxeTableProps<D = any> {
+  /**
+   * 尺寸大小
+   */
   size?: VxeTablePropTypes.Size
   /**
    * 唯一标识
@@ -3970,8 +3974,15 @@ export interface TablePrivateComputed<D = any> {
   computeScrollbarOpts: VxeTablePropTypes.ScrollbarConfig
   computeScrollbarXOpts: VxeTablePropTypes.ScrollbarXConfig
   computeScrollbarYOpts: VxeTablePropTypes.ScrollbarYConfig
+  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
+  computeScrollbarWrapperClss: string
   computeColumnOpts: VxeTablePropTypes.ColumnOpts
   computeCurrentColumnOpts: VxeTablePropTypes.CurrentColumnConfig
   computeScrollXThreshold: number
@@ -4138,6 +4149,11 @@ export interface TableReactData<D = any> {
   scrollbarWidth: number
   // 横向滚动条的高度
   scrollbarHeight: number
+
+  // 滚动条
+  yThumbHeight: number
+  xThumbWidth: number
+
   /**
    * 行高
    * @deprecated
@@ -4379,9 +4395,17 @@ export interface TableInternalData<D = any> {
   currentRow: D | null
   currentCol: VxeTableDefines.ColumnInfo | null
 
-  // 最后滚动位置
-  lastScrollLeft: number
+  resizeObserver?: ResizeObserver
+
+  // 滚动条
+  scrollObserver?: ResizeObserver
+  isThumbDrag?: boolean
+  thumbDragOffset: number
+  yThumbTop: number
+  xThumbLeft: number
   lastScrollTop: number
+  lastScrollLeft: number
+
   // 单选框属性，已选中保留的行
   radioReserveRow: any
   // 复选框属性，已选中保留的行
@@ -5981,6 +6005,16 @@ export interface TablePrivateMethods<D = any> {
     row: any
     column: VxeTableDefines.ColumnInfo
   }, cellValue?: any): Promise<any>
+  /**
+   * 内部方法
+   * @private
+   */
+  updateScrollbar(): void
+  /**
+   * 内部方法
+   * @private
+   */
+  updateThumbOffset(): void
   /**
    * 内部方法
    * @private

package/types/components/tree.d.ts

@@ -339,10 +339,22 @@ export namespace VxeTreePropTypes {
 }
 
 export interface VxeTreeProps<D = any> {
+  /**
+   * 数据源
+   */
   data?: VxeTreePropTypes.Data<D>
   autoResize?: VxeTreePropTypes.AutoResize
+  /**
+   * 高度
+   */
   height?: VxeTreePropTypes.Height
+  /**
+   * 最小高度
+   */
   minHeight?: VxeTreePropTypes.MinHeight
+  /**
+   * 最大高度
+   */
   maxHeight?: VxeTreePropTypes.MaxHeight
   loading?: VxeTreePropTypes.Loading
   loadingConfig?: VxeTreePropTypes.LoadingConfig
@@ -480,8 +492,10 @@ export interface TreeInternalData {
   treeExpandedMaps: Record<string, boolean>
   treeExpandLazyLoadedMaps: Record<string, boolean>
 
-  // 滚动条
   resizeObserver?: ResizeObserver
+
+  // 滚动条
+  scrollObserver?: ResizeObserver
   isThumbDrag?: boolean
   thumbDragOffset: number
   yThumbTop: number