vxe-pc-ui 4.20.0 → 4.20.2

package/types/components/table.d.ts

@@ -10,6 +10,7 @@ import { VxeToolbarConstructor, VxeToolbarInstance } from './toolbar'
 import { VxeTableCustomPanelConstructor } from './table-module/custom'
 import { VxeGanttConstructor, VxeGanttPrivateMethods } from './gantt'
 import { VxeGanttViewConstructor, VxeGanttViewInstance, VxeGanttViewPrivateMethods } from './gantt-module/gantt-view'
+import { VxeScrollbarPropTypes } from './scrollbar'
 
 /* eslint-disable no-use-before-define,@typescript-eslint/ban-types */
 
@@ -2972,33 +2973,52 @@ export namespace VxeTablePropTypes {
   }
 
   export interface ScrollbarXConfig {
+    /**
+     * 滚动条高度
+     */
+    height?: number
     /**
      * 滚动条显示位置
      */
     position?: 'top' | 'bottom' | ''
     /**
-     * 滚动条显示方式
+     * 是否显示
      */
     visible?: 'auto' | 'visible' | 'hidden' | boolean
+    /**
+     * 是否自动隐藏滚动条
+     */
+    autoHide?: boolean
     /**
      * 滚动行为
+     * @deprecated
      */
     overscrollBehavior?: 'contain' | 'none' | ''
   }
   export interface ScrollbarYConfig {
+    /**
+     * 滚动条宽度
+     */
+    width?: number
     /**
      * 滚动条显示位置
      */
     position?: 'left' | 'right' | ''
     /**
-     * 滚动条显示方式
+     * 是否显示
      */
     visible?: 'auto' | 'visible' | 'hidden' | boolean
+    /**
+     * 是否自动隐藏滚动条
+     */
+    autoHide?: boolean
     /**
      * 滚动行为
+     * @deprecated
      */
     overscrollBehavior?: 'contain' | 'none' | ''
   }
+  export type UseScrollbar = boolean
   /**
    * 滚动条配置项
    */
@@ -3011,18 +3031,38 @@ export namespace VxeTablePropTypes {
      * 滚动条高度
      */
     height?: number
+    padding?: boolean
+    /**
+     * 是否自动隐藏滚动条
+     */
+    autoHide?: boolean
+    /**
+     * 是否显示
+     */
+    visible?: boolean
     /**
      * 滚动行为
+     * @deprecated
      */
     overscrollBehavior?: 'contain' | 'none' | ''
     /**
-     * 横向滚动条
+     * 已废弃，请使用 xConfig
+     * @deprecated
      */
     x?: ScrollbarXConfig
     /**
-     * 纵向滚动条
+     * 横向滚动条
+     */
+    xConfig?: ScrollbarXConfig
+    /**
+     * 已废弃，请使用 yConfig
+     * @deprecated
      */
     y?: ScrollbarYConfig
+    /**
+     * 纵向滚动条
+     */
+    yConfig?: ScrollbarYConfig
   }
 
   /**
@@ -3868,6 +3908,10 @@ export interface VxeTableProps<D = any> {
    * 纵向虚拟滚动配置
    */
   virtualYConfig?: VxeTablePropTypes.VirtualYConfig
+  /**
+   * 使用虚拟滚动条
+   */
+  useScrollbar?: VxeTablePropTypes.UseScrollbar
   /**
    * 滚动条配置项
    */
@@ -3956,8 +4000,15 @@ export interface TablePrivateComputed<D = any> {
   computeScrollbarOpts: ComputedRef<VxeTablePropTypes.ScrollbarConfig>
   computeScrollbarXOpts: ComputedRef<VxeTablePropTypes.ScrollbarXConfig>
   computeScrollbarYOpts: ComputedRef<VxeTablePropTypes.ScrollbarYConfig>
+  computeScrollXHeight: ComputedRef<number | undefined>
+  computeScrollYWidth: ComputedRef<number | undefined>
+  computeScrollXVisible: ComputedRef<'auto' | 'visible' | 'hidden' | boolean | undefined>
+  computeScrollYVisible: ComputedRef<'auto' | 'visible' | 'hidden' | boolean | undefined>
+  computeScrollXAutoHide: ComputedRef<VxeScrollbarPropTypes.AutoHide | undefined>
+  computeScrollYAutoHide: ComputedRef<VxeScrollbarPropTypes.AutoHide | undefined>
   computeScrollbarXToTop: ComputedRef<boolean>
   computeScrollbarYToLeft: ComputedRef<boolean>
+  computeScrollbarWrapperClss: ComputedRef<string>
   computeColumnOpts: ComputedRef<VxeTablePropTypes.ColumnOpts>
   computeCurrentColumnOpts: ComputedRef<VxeTablePropTypes.CurrentColumnConfig>
   computeScrollXThreshold: ComputedRef<number>
@@ -4076,6 +4127,11 @@ export interface TableReactData<D = any> {
   scrollbarWidth: number
   // 横向滚动条的高度
   scrollbarHeight: number
+
+  // 滚动条
+  yThumbHeight: number
+  xThumbWidth: number
+
   /**
    * 行高
    * @deprecated
@@ -4317,9 +4373,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
   // 复选框属性，已选中保留的行
@@ -5916,6 +5980,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/tabs.d.ts

@@ -114,7 +114,16 @@ export namespace VxeTabsPropTypes {
     }) => boolean
   }
   export type UseScrollbar = boolean
-  export interface ScrollbarConfig extends Pick<VxeScrollbarProps, 'native' | 'xConfig' | 'yConfig' | 'padding' | 'className' | 'viewAttrs' | 'viewClassName' | 'viewInnerClassName'> {}
+  export interface ScrollbarConfig extends Pick<VxeScrollbarProps, 'xConfig' | 'yConfig' | 'padding' | 'autoHide' | 'visible' | 'className' | 'viewAttrs' | 'viewClassName' | 'viewInnerClassName'> {
+    /**
+     * 滚动条宽度
+     */
+    width?: number | string
+    /**
+     * 滚动条高度
+     */
+    height?: number | string
+  }
 }
 
 export type VxeTabsProps = {

package/types/components/tree.d.ts

@@ -2,6 +2,7 @@ import { RenderFunction, SetupContext, Ref, ComputedRef } from 'vue'
 import { DefineVxeComponentApp, DefineVxeComponentOptions, DefineVxeComponentInstance, VxeComponentBaseOptions, VxeComponentEventParams, VxeComponentSizeType, ValueOf } from '@vxe-ui/core'
 import { VxeContextMenuPropTypes, VxeContextMenuDefines } from './context-menu'
 import { VxeTooltipPropTypes } from './tooltip'
+import { VxeScrollbarProps } from './scrollbar'
 
 /* eslint-disable no-use-before-define,@typescript-eslint/ban-types */
 
@@ -331,6 +332,17 @@ export namespace VxeTreePropTypes {
      */
     enabled?: boolean
   }
+  export type UseScrollbar = boolean
+  export interface ScrollbarConfig extends Pick<VxeScrollbarProps, 'xConfig' | 'yConfig' | 'padding' | 'autoHide' | 'visible'> {
+    /**
+     * 滚动条宽度
+     */
+    width?: number | string
+    /**
+     * 滚动条高度
+     */
+    height?: number | string
+  }
 }
 
 export interface VxeTreeProps<D = any> {
@@ -410,6 +422,14 @@ export interface VxeTreeProps<D = any> {
   iconLoaded?: VxeTreePropTypes.IconLoaded
   size?: VxeTreePropTypes.Size
   virtualYConfig?: VxeTreePropTypes.VirtualYConfig
+  /**
+   * 使用虚拟滚动条
+   */
+  useScrollbar?: VxeTreePropTypes.UseScrollbar
+  /**
+   * 滚动条配置项
+   */
+  scrollbarConfig?: VxeTreePropTypes.ScrollbarConfig
 }
 
 export interface TreePrivateComputed<D = any> {
@@ -438,6 +458,10 @@ export interface TreeReactData {
   updateExpandedFlag: number
   updateCheckboxFlag: number
 
+  // 滚动条
+  yThumbHeight: number
+  xThumbWidth: number
+
   insertNodeFlag: number
   removeNodeFlag: number
 
@@ -453,7 +477,6 @@ export interface TreeReactData {
 
 export interface TreeInternalData {
   initialized?: boolean
-  resizeObserver?: ResizeObserver
   lastFilterValue?: string
   afterTreeList: any[]
   treeFullData: any[]
@@ -463,8 +486,18 @@ export interface TreeInternalData {
   selectCheckboxMaps: Record<string, any>
   treeExpandedMaps: Record<string, boolean>
   treeExpandLazyLoadedMaps: Record<string, boolean>
-  lastScrollLeft: number
+
+  resizeObserver?: ResizeObserver
+
+  // 滚动条
+  scrollObserver?: ResizeObserver
+  isThumbDrag?: boolean
+  thumbDragOffset: number
+  yThumbTop: number
+  xThumbLeft: number
   lastScrollTop: number
+  lastScrollLeft: number
+
   scrollYStore: {
     startIndex: number
     endIndex: number