vxe-pc-ui 3.20.0 → 3.20.1

package/packages/ui/src/utils.ts

@@ -72,3 +72,7 @@ export function enModelValue (nodeid: string | number | null | undefined) {
 export function deModelValue (nodeid: string | number | null) {
   return nodeid ? decodeURIComponent(`${nodeid}`) : nodeid
 }
+
+export function getDefaultConfig <T = any, D = any> (val1: T, def1: D): (T | D) {
+  return XEUtils.eqNull(val1) ? def1 : val1
+}

package/styles/components/list.scss

@@ -290,21 +290,34 @@
 
 // 滚动条
 .vxe-list {
-  & > .vxe-scrollbar {
-    position: unset;
+  &.ov-padding {
+    &.overflow-x {
+      &.sx-pos--top {
+        padding-top: var(--vxe-ui-scrollbar-x-height);
+      }
+      &.sx-pos--bottom {
+        padding-bottom: var(--vxe-ui-scrollbar-x-height);
+      }
+    }
+    &.overflow-y {
+      &.sy-pos--left {
+        padding-left: var(--vxe-ui-scrollbar-y-width);
+      }
+      &.sy-pos--right {
+        padding-right: var(--vxe-ui-scrollbar-y-width);
+      }
+    }
   }
-  &.is--virtual-scrollbar {
+  &.ov-x--hidden {
     & > .vxe-list--virtual-wrapper {
-      scrollbar-width: none;
-      -ms-overflow-style: none;
+      overflow-x: hidden;
     }
-    & > .vxe-list--virtual-wrapper::-webkit-scrollbar {
-      display: none;
+  }
+  &.ov-y--hidden {
+    & > .vxe-list--virtual-wrapper {
+      overflow-y: hidden;
     }
   }
-}
-
-.vxe-list {
   &.is--virtual-scrollbar {
     &.ov-x--auto-hide {
       &:hover {
@@ -337,4 +350,16 @@
       }
     }
   }
+  & > .vxe-scrollbar {
+    position: unset;
+  }
+  &.is--virtual-scrollbar {
+    & > .vxe-list--virtual-wrapper {
+      scrollbar-width: none;
+      -ms-overflow-style: none;
+    }
+    & > .vxe-list--virtual-wrapper::-webkit-scrollbar {
+      display: none;
+    }
+  }
 }

package/styles/components/tree.scss

@@ -308,3 +308,79 @@
   width: 0;
   float: left;
 }
+
+// 滚动条
+.vxe-tree {
+  &.ov-padding {
+    &.overflow-x {
+      &.sx-pos--top {
+        padding-top: var(--vxe-ui-scrollbar-x-height);
+      }
+      &.sx-pos--bottom {
+        padding-bottom: var(--vxe-ui-scrollbar-x-height);
+      }
+    }
+    &.overflow-y {
+      &.sy-pos--left {
+        padding-left: var(--vxe-ui-scrollbar-y-width);
+      }
+      &.sy-pos--right {
+        padding-right: var(--vxe-ui-scrollbar-y-width);
+      }
+    }
+  }
+  &.ov-x--hidden {
+    & > .vxe-tree--node-list-wrapper {
+      overflow-x: hidden;
+    }
+  }
+  &.ov-y--hidden {
+    & > .vxe-tree--node-list-wrapper {
+      overflow-y: hidden;
+    }
+  }
+  &.is--virtual-scrollbar {
+    &.ov-x--auto-hide {
+      &:hover {
+        & > .vxe-scrollbar {
+          & > .vxe-scrollbar--track-x {
+            opacity: 1;
+          }
+        }
+      }
+      & > .vxe-scrollbar {
+        & > .vxe-scrollbar--track-x {
+          opacity: 0;
+          @include baseMixin.createAnimationTransition(opacity, 0.8s);
+        }
+      }
+    }
+    &.ov-y--auto-hide {
+      &:hover {
+        & > .vxe-scrollbar {
+          & > .vxe-scrollbar--track-y {
+            opacity: 1;
+          }
+        }
+      }
+      & > .vxe-scrollbar {
+        & > .vxe-scrollbar--track-y {
+          opacity: 0;
+          @include baseMixin.createAnimationTransition(opacity, 0.8s);
+        }
+      }
+    }
+  }
+  & > .vxe-scrollbar {
+    position: unset;
+  }
+  &.is--virtual-scrollbar {
+    & > .vxe-tree--node-list-wrapper {
+      scrollbar-width: none;
+      -ms-overflow-style: none;
+    }
+    & > .vxe-tree--node-list-wrapper::-webkit-scrollbar {
+      display: none;
+    }
+  }
+}

package/types/components/card.d.ts

@@ -27,7 +27,16 @@ export namespace VxeCardPropTypes {
   export type Padding = boolean
   export type Size = VxeComponentSizeType
   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 VxeCardProps = {

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

@@ -30,7 +30,16 @@ export namespace VxeLayoutAsidePropTypes {
     animation?: boolean
   }
   export type UseScrollbar = boolean
-  export interface ScrollbarConfig extends Pick<VxeScrollbarProps, 'native' | '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 interface VxeLayoutAsideProps {

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

@@ -25,7 +25,16 @@ export namespace VxeLayoutBodyPropTypes {
   export type ShowBacktop = boolean
   export interface BacktopConfig extends Omit<VxeBacktopProps, 'target'> {}
   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 interface VxeLayoutBodyProps {
   size?: VxeLayoutBodyPropTypes.Size

package/types/components/list.d.ts

@@ -220,7 +220,16 @@ export namespace VxeListPropTypes {
     enabled?: boolean
   }
   export type UseScrollbar = boolean
-  export interface ScrollbarConfig extends Pick<VxeScrollbarProps, 'xConfig' | 'yConfig' | 'padding'> {}
+  export interface ScrollbarConfig extends Pick<VxeScrollbarProps, 'xConfig' | 'yConfig' | 'padding' | 'autoHide' | 'visible'> {
+    /**
+     * 滚动条宽度
+     */
+    width?: number | string
+    /**
+     * 滚动条高度
+     */
+    height?: number | string
+  }
 }
 
 export interface VxeListProps<D = any> {

package/types/components/scrollbar.d.ts

@@ -28,6 +28,8 @@ export namespace VxeScrollbarPropTypes {
   export type Loading = boolean
   export type Native = boolean
   export type Padding = boolean
+  export type AutoHide = boolean
+  export type Visible = boolean
   export interface XConfig {
     height?: number | string
     // showArrows?: boolean
@@ -39,7 +41,7 @@ export namespace VxeScrollbarPropTypes {
      * 滚动条显示位置
      */
     position?: 'top' | 'bottom' | ''
-    visible?: 'auto' | 'hidden' | 'visible' | ''
+    visible?: boolean
     /**
      * 滚动到边界触发的阈值会触发 scroll-boundary 事件
      */
@@ -56,7 +58,7 @@ export namespace VxeScrollbarPropTypes {
      * 滚动条显示位置
      */
     position?: 'left' | 'right' | ''
-    visible?: 'auto' | 'hidden' | 'visible' | ''
+    visible?: boolean
     /**
      * 滚动到边界触发的阈值会触发 scroll-boundary 事件
      */
@@ -75,6 +77,10 @@ export interface VxeScrollbarProps {
    * ID
    */
   id?: VxeScrollbarPropTypes.Id
+  /**
+   * View ID
+   */
+  viewId?: VxeScrollbarPropTypes.ViewId
   /**
    * 容器宽度
    */
@@ -111,6 +117,14 @@ export interface VxeScrollbarProps {
    * 滚动条是否需要边距
    */
   padding?: VxeScrollbarPropTypes.Padding
+  /**
+   * 是否自动隐藏
+   */
+  autoHide?: VxeScrollbarPropTypes.AutoHide
+  /**
+   * 是否显示
+   */
+  visible?: VxeScrollbarPropTypes.Visible
   /**
    * 纵向滚动条宽度
    */

package/types/components/table.d.ts

@@ -2940,33 +2940,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
   /**
    * 滚动条配置项
    */
@@ -2979,18 +2998,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
   }
 
   /**
@@ -3839,6 +3878,10 @@ export interface VxeTableProps<D = any> {
    * 纵向虚拟滚动配置
    */
   virtualYConfig?: VxeTablePropTypes.VirtualYConfig
+  /**
+   * 使用虚拟滚动条
+   */
+  useScrollbar?: VxeTablePropTypes.UseScrollbar
   /**
    * 滚动条配置项
    */

package/types/components/tabs.d.ts

@@ -107,7 +107,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

@@ -1,6 +1,7 @@
 import { DefineVxeComponentApp, DefineVxeComponentOptions, DefineVxeComponentInstance, 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,@typescript-eslint/no-unused-vars */
 
@@ -324,6 +325,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> {
@@ -403,6 +415,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> {
@@ -431,6 +451,10 @@ export interface TreeReactData {
   updateExpandedFlag: number
   updateCheckboxFlag: number
 
+  // 滚动条
+  yThumbHeight: number
+  xThumbWidth: number
+
   insertNodeFlag: number
   removeNodeFlag: number
 
@@ -446,7 +470,6 @@ export interface TreeReactData {
 
 export interface TreeInternalData {
   initialized?: boolean
-  resizeObserver?: ResizeObserver
   lastFilterValue?: string
   afterTreeList: any[]
   treeFullData: any[]
@@ -456,8 +479,16 @@ export interface TreeInternalData {
   selectCheckboxMaps: Record<string, any>
   treeExpandedMaps: Record<string, boolean>
   treeExpandLazyLoadedMaps: Record<string, boolean>
-  lastScrollLeft: number
+
+  // 滚动条
+  resizeObserver?: ResizeObserver
+  isThumbDrag?: boolean
+  thumbDragOffset: number
+  yThumbTop: number
+  xThumbLeft: number
   lastScrollTop: number
+  lastScrollLeft: number
+
   scrollYStore: {
     startIndex: number
     endIndex: number