vxe-pc-ui 3.20.9 → 3.20.10

package/types/components/scrollbar.d.ts

@@ -1,4 +1,4 @@
-import { DefineVxeComponentApp, DefineVxeComponentOptions, DefineVxeComponentInstance, VxeComponentEventParams, ValueOf, VxeComponentStyleType } from '@vxe-ui/core'
+import { DefineVxeComponentApp, DefineVxeComponentOptions, DefineVxeComponentInstance, VxeComponentEventParams, ValueOf, VxeComponentSizeType, VxeComponentStyleType, VxeUseInitVScrollbarReactData, VxeUseInitVScrollbarInternalData } from '@vxe-ui/core'
 
 /* eslint-disable @typescript-eslint/no-empty-interface,no-use-before-define,@typescript-eslint/ban-types */
 
@@ -17,6 +17,7 @@ export interface ScrollbarPrivateRef {
 export interface VxeScrollbarPrivateRef extends ScrollbarPrivateRef { }
 
 export namespace VxeScrollbarPropTypes {
+  export type Size = VxeComponentSizeType
   export type Id = number | string
   export type ViewId = number | string
   export type Theme = '' | 'light' | 'dark'
@@ -83,6 +84,7 @@ export namespace VxeScrollbarPropTypes {
 }
 
 export interface VxeScrollbarProps {
+  size?: VxeScrollbarPropTypes.Size
   /**
    * ID
    */
@@ -183,18 +185,9 @@ export interface ScrollbarPrivateComputed {
 }
 export interface VxeScrollbarPrivateComputed extends ScrollbarPrivateComputed { }
 
-export interface ScrollbarReactData {
-  yThumbHeight: number
-  xThumbWidth: number
+export interface ScrollbarReactData extends VxeUseInitVScrollbarReactData {
 }
-export interface ScrollbarInternalData {
-  resizeObserver?: ResizeObserver
-  isThumbDrag?: boolean
-  thumbDragOffset: number
-  yThumbTop: number
-  xThumbLeft: number
-  lastScrollTop: number
-  lastScrollLeft: number
+export interface ScrollbarInternalData extends VxeUseInitVScrollbarInternalData {
 }
 
 export interface ScrollbarMethods {
@@ -231,11 +224,11 @@ export interface ScrollbarMethods {
   /**
    * 获取滚动视图元素
    */
-  getViewElem(): HTMLElement | null
+  getScrollViewElem(): HTMLElement | null | undefined
   /**
    * 获取滚动视图内容包裹元素
    */
-  getViewInnerElem(): HTMLElement | null
+  getScrollViewInnerElem(): HTMLElement | null | undefined
   /**
    * 重新计算样式
    * 对于某些特殊场景可能会用到，比如更新内容

package/types/components/select.d.ts

@@ -1,6 +1,7 @@
-import { DefineVxeComponentApp, DefineVxeComponentOptions, DefineVxeComponentInstance, VxeComponentEventParams, VxeComponentSizeType, VxeComponentStyleType, ValueOf } from '@vxe-ui/core'
+import { DefineVxeComponentApp, DefineVxeComponentOptions, DefineVxeComponentInstance, VxeComponentEventParams, VxeComponentSizeType, VxeComponentStyleType, ValueOf, VxeComponentIsVScrollbar, VxeUseInitVScrollbarReactData, VxeUseInitVScrollbarInternalData } from '@vxe-ui/core'
 import { VxeOptgroupProps } from './optgroup'
 import { VxeOptionProps, VxeOptionPropTypes } from './option'
+import { VxeScrollbarProps } from './scrollbar'
 
 /* eslint-disable @typescript-eslint/no-empty-interface,no-use-before-define,@typescript-eslint/ban-types */
 
@@ -9,6 +10,7 @@ export type VxeSelectComponent = DefineVxeComponentOptions<VxeSelectProps>
 
 export type VxeSelectInstance = DefineVxeComponentInstance<{
   reactData: SelectReactData
+  internalData: SelectInternalData
 }, VxeSelectProps, VxeSelectPrivateComputed, VxeSelectMethods>
 
 export type VxeSelectConstructor = VxeSelectInstance
@@ -193,6 +195,17 @@ export namespace VxeSelectPropTypes {
    * @deprecated
    */
   export interface ScrollY extends VirtualYConfig {}
+  export type UseScrollbar = VxeComponentIsVScrollbar
+  export interface ScrollbarConfig extends Pick<VxeScrollbarProps, 'xConfig' | 'yConfig' | 'padding' | 'autoHide' | 'visible' | 'className' | 'viewAttrs' | 'viewClassName' | 'viewInnerClassName'> {
+    /**
+     * 滚动条宽度
+     */
+    width?: number | string
+    /**
+     * 滚动条高度
+     */
+    height?: number | string
+  }
 }
 
 export interface VxeSelectProps {
@@ -273,6 +286,14 @@ export interface VxeSelectProps {
    * 纵向虚拟滚动配置项
    */
   virtualYConfig?: VxeSelectPropTypes.VirtualYConfig
+  /**
+   * 使用虚拟滚动条
+   */
+  useScrollbar?: VxeSelectPropTypes.UseScrollbar
+  /**
+   * 滚动条配置项
+   */
+  scrollbarConfig?: VxeSelectPropTypes.ScrollbarConfig
 
   /**
    * 已废弃，被 remote-config.queryMethod 替换
@@ -300,7 +321,7 @@ export interface SelectPrivateComputed {
 }
 export interface VxeSelectPrivateComputed extends SelectPrivateComputed { }
 
-export interface SelectReactData {
+export interface SelectReactData extends VxeUseInitVScrollbarReactData {
   initialized: boolean
   scrollYLoad: boolean
   bodyHeight: number
@@ -322,7 +343,7 @@ export interface SelectReactData {
   isActivated: boolean
 }
 
-export interface SelectInternalData {
+export interface SelectInternalData extends VxeUseInitVScrollbarInternalData {
   isLoaded?: boolean
   synchData: any[]
   fullData: any[]
@@ -346,6 +367,10 @@ export interface SelectInternalData {
 
 export interface SelectMethods {
   dispatchEvent(type: ValueOf<VxeSelectEmits>, params: Record<string, any>, evnt: Event | null): void
+  /**
+   * 获取滚动视图元素
+   */
+  getScrollViewElem(): HTMLElement | null | undefined
   /**
    * 加载数据
    * @param data 列表数据

package/types/components/table.d.ts

@@ -1,6 +1,6 @@
 import { VNode, CreateElement } from 'vue'
 import { NormalizedScopedSlot } from 'vue/types/vnode'
-import { DefineVxeComponentApp, DefineVxeComponentOptions, DefineVxeComponentInstance, VxeComponentEventParams, VxeComponentSizeType, ValueOf, VxeGlobalConfig, VxeComponentStyleType, VxeComponentSlotType, VxeGlobalRendererOptions, VxeComponentIsVScrollbar } from '@vxe-ui/core'
+import { DefineVxeComponentApp, DefineVxeComponentOptions, DefineVxeComponentInstance, VxeComponentEventParams, VxeComponentSizeType, ValueOf, VxeGlobalConfig, VxeComponentStyleType, VxeComponentSlotType, VxeGlobalRendererOptions, VxeComponentIsVScrollbar, VxeUseSizeResult, VxeUseVScrollbarResult, VxeUseInitVScrollbarResult, VxeUseInitVScrollbarReactData, VxeUseInitVScrollbarInternalData } from '@vxe-ui/core'
 import { VxeColumnPropTypes, VxeColumnProps, VxeColumnSlotTypes } from './column'
 import { VxeTableExtendCellAreaDefines, VxeTableExtendCellAreaEmits } from './table-plugins'
 import { VxeGridConstructor, VxeGridPrivateMethods } from './grid'
@@ -3969,9 +3969,8 @@ export interface VxeTableProps<D = any> {
 }
 
 export interface TablePrivateComputed<D = any> {
-  computeSize: VxeComponentSizeType
-  computeIsVScrollbar: VxeComponentIsVScrollbar
   computeTableId: string
+  computeTableStyle: VxeComponentStyleType
   computeRowField: string
   computeEditDirtyOpts: VxeTablePropTypes.EditDirtyConfig
   computeValidOpts: VxeTablePropTypes.ValidOpts<D>
@@ -4131,9 +4130,9 @@ export interface TablePrivateComputed<D = any> {
    */
   computeSYOpts: VxeTablePropTypes.VirtualYConfig & { gt: number }
 }
-export interface VxeTablePrivateComputed<D = any> extends TablePrivateComputed<D> { }
+export interface VxeTablePrivateComputed<D = any> extends TablePrivateComputed<D>, VxeUseSizeResult, VxeUseVScrollbarResult { }
 
-export interface TableReactData<D = any> {
+export interface TableReactData<D = any> extends VxeUseInitVScrollbarReactData {
   updateColFlag: number
   // 低性能的静态列
   staticColumns: any[]
@@ -4156,10 +4155,6 @@ export interface TableReactData<D = any> {
   // 横向滚动条的高度
   scrollbarHeight: number
 
-  // 滚动条
-  yThumbHeight: number
-  xThumbWidth: number
-
   /**
    * 行高
    * @deprecated
@@ -4358,7 +4353,7 @@ export interface TableReactData<D = any> {
   currColFlag: number
 }
 
-export interface TableInternalData<D = any> {
+export interface TableInternalData<D = any> extends VxeUseInitVScrollbarInternalData {
   tZindex: number
   currKeyField: string
   isCurrDeepKey: boolean
@@ -4403,15 +4398,6 @@ export interface TableInternalData<D = any> {
 
   resizeObserver?: ResizeObserver
 
-  // 滚动条
-  scrollObserver?: ResizeObserver
-  isThumbDrag?: boolean
-  thumbDragOffset: number
-  yThumbTop: number
-  xThumbLeft: number
-  lastScrollTop: number
-  lastScrollLeft: number
-
   // 单选框属性，已选中保留的行
   radioReserveRow: any
   // 复选框属性，已选中保留的行
@@ -4601,6 +4587,10 @@ export interface TableMethods<DT = any> {
    * 获取根元素
    */
   getEl(): HTMLDivElement
+  /**
+   * 获取滚动视图元素
+   */
+  getScrollViewElem(): HTMLElement | null | undefined
   /**
    * 手动清除表格所有条件，还原到初始状态
    * 对于增删改查的场景中可能会用到，比如在数据保存之后清除表格缓存
@@ -5608,9 +5598,19 @@ export interface TableMethods<DT = any> {
    */
   getCustomStoreData(): VxeTableDefines.CustomStoreData
 }
-export interface VxeTableMethods<D = any> extends TableMethods<D> { }
+export interface VxeTableMethods<D = any> extends TableMethods<D>, VxeUseInitVScrollbarResult { }
 
 export interface TablePrivateMethods<D = any> {
+  /**
+   * 内部方法
+   * @private
+   */
+  getInternalData(): TableInternalData<D>
+  /**
+   * 内部方法
+   * @private
+   */
+  getReactData(): TableReactData<D>
   /**
    * 内部方法
    * @deprecated

package/types/components/tree.d.ts

@@ -1,4 +1,4 @@
-import { DefineVxeComponentApp, DefineVxeComponentOptions, DefineVxeComponentInstance, VxeComponentEventParams, VxeComponentSizeType, ValueOf, VxeComponentIsVScrollbar } from '@vxe-ui/core'
+import { DefineVxeComponentApp, DefineVxeComponentOptions, DefineVxeComponentInstance, VxeComponentEventParams, VxeComponentSizeType, ValueOf, VxeComponentIsVScrollbar, VxeUseInitVScrollbarReactData, VxeUseInitVScrollbarInternalData } from '@vxe-ui/core'
 import { VxeContextMenuPropTypes, VxeContextMenuDefines } from './context-menu'
 import { VxeTooltipPropTypes } from './tooltip'
 import { VxeScrollbarProps } from './scrollbar'
@@ -449,7 +449,7 @@ export interface TreePrivateComputed<D = any> {
 }
 export interface VxeTreePrivateComputed extends TreePrivateComputed { }
 
-export interface TreeReactData {
+export interface TreeReactData extends VxeUseInitVScrollbarReactData {
   parentHeight: number
   customHeight: number
   customMinHeight: number
@@ -463,10 +463,6 @@ export interface TreeReactData {
   updateExpandedFlag: number
   updateCheckboxFlag: number
 
-  // 滚动条
-  yThumbHeight: number
-  xThumbWidth: number
-
   insertNodeFlag: number
   removeNodeFlag: number
 
@@ -480,7 +476,7 @@ export interface TreeReactData {
   }
 }
 
-export interface TreeInternalData {
+export interface TreeInternalData extends VxeUseInitVScrollbarInternalData {
   initialized?: boolean
   lastFilterValue?: string
   afterTreeList: any[]
@@ -494,15 +490,6 @@ export interface TreeInternalData {
 
   resizeObserver?: ResizeObserver
 
-  // 滚动条
-  scrollObserver?: ResizeObserver
-  isThumbDrag?: boolean
-  thumbDragOffset: number
-  yThumbTop: number
-  xThumbLeft: number
-  lastScrollTop: number
-  lastScrollLeft: number
-
   scrollYStore: {
     startIndex: number
     endIndex: number
@@ -524,6 +511,10 @@ export interface TreeInternalData {
 
 export interface TreeMethods<D = any> {
   dispatchEvent(type: ValueOf<VxeTreeEmits>, params: Record<string, any>, evnt: Event | null): void
+  /**
+   * 获取滚动视图元素
+   */
+  getScrollViewElem(): HTMLElement | null | undefined
   /**
    * 加载数据
    */