vxe-pc-ui 4.20.0 → 4.20.2

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/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/modal.scss

@@ -52,7 +52,8 @@ html[data-vxe-lock-scroll] {
     }
     .vxe-modal--body {
       overflow: hidden;
-      .vxe-modal--content {
+      .vxe-modal--content,
+      .vxe-modal--scrollbar-content {
         overflow: hidden;
       }
     }
@@ -74,7 +75,8 @@ html[data-vxe-lock-scroll] {
   align-items: center;
   font-size: 1.6em;
 }
-.vxe-modal--content {
+.vxe-modal--content,
+.vxe-modal--scrollbar-content {
   flex-grow: 1;
   white-space: pre-line;
 }
@@ -447,7 +449,8 @@ html[data-vxe-lock-scroll] {
           visibility: hidden;
         }
       }
-      .vxe-modal--content {
+      .vxe-modal--content,
+      .vxe-modal--scrollbar-content {
         max-width: 800px;
         float: left;
       }
@@ -478,7 +481,8 @@ html[data-vxe-lock-scroll] {
     }
     .vxe-modal--body {
       overflow: auto;
-      .vxe-modal--content {
+      .vxe-modal--content,
+      .vxe-modal--scrollbar-content {
         overflow: auto;
       }
     }
@@ -538,3 +542,7 @@ html[data-vxe-lock-scroll] {
     overflow: hidden;
   }
 }
+
+.vxe-modal--scrollbar-content {
+  width: 100%;
+}

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

@@ -34,7 +34,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/drawer.d.ts

@@ -1,5 +1,6 @@
 import { RenderFunction, SetupContext, Ref } from 'vue'
 import { DefineVxeComponentApp, DefineVxeComponentOptions, DefineVxeComponentInstance, VxeComponentBaseOptions, VxeComponentEventParams, VxeComponentSizeType, VxeComponentSlotType, ValueOf } from '@vxe-ui/core'
+import { VxeScrollbarProps } from './scrollbar'
 
 /* eslint-disable no-use-before-define,@typescript-eslint/ban-types */
 
@@ -73,6 +74,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 {
@@ -125,6 +137,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

@@ -2,6 +2,7 @@ import { RenderFunction, SetupContext, Ref, ComputedRef } from 'vue'
 import { VxeComponentBaseOptions, DefineVxeComponentInstance } from '@vxe-ui/core'
 import { VxeTableConstructor, VxeTableMethods, VxeTablePrivateMethods } from '../table'
 import { VxeGanttDefines } from '../gantt'
+import { VxeScrollbarPropTypes } from '../scrollbar'
 
 /* eslint-disable no-use-before-define */
 
@@ -37,6 +38,10 @@ export interface GanttViewReactData {
   lastScrollTime: number
   lazScrollLoading: boolean
 
+  // 滚动条
+  yThumbHeight: number
+  xThumbWidth: number
+
   scrollVMLoading: boolean
   scrollYHeight: number
   scrollYTop: number
@@ -75,7 +80,13 @@ export interface GanttViewInternalData {
     startIndex: number
     endIndex: number
   }
-  // 最后滚动位置
+
+  // 滚动条
+  scrollObserver?: ResizeObserver
+  isThumbDrag?: boolean
+  thumbDragOffset: number
+  yThumbTop: number
+  xThumbLeft: number
   lastScrollLeft: number
   lastScrollTop: number
 
@@ -111,6 +122,14 @@ export interface GanttViewPrivateRef {
 }
 
 export interface GanttViewPrivateComputed {
+  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>
   computeScaleDateList: ComputedRef<Date[]>
   computeNowLineLeft: ComputedRef<number>
 }
@@ -164,6 +183,10 @@ export interface VxeGanttViewPrivateMethods {
    * @private
    */
   handleUpdateSYStatus(scrollYLoad: boolean): void
+  /**
+   * @private
+   */
+  updateScrollbar(): void
 }
 
 export interface VxeGanttViewMethods {

package/types/components/gantt.d.ts

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

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

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

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

@@ -228,7 +228,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> {
@@ -305,8 +314,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 { RenderFunction, SetupContext, Ref, ComputedRef } from 'vue'
 import { DefineVxeComponentApp, DefineVxeComponentOptions, DefineVxeComponentInstance, VxeComponentSizeType, VxeComponentBaseOptions, VxeComponentEventParams, ValueOf, VxeComponentSlotType } from '@vxe-ui/core'
+import { VxeScrollbarProps } from './scrollbar'
 
 /* eslint-disable no-use-before-define,@typescript-eslint/ban-types */
 
@@ -126,6 +127,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 {
@@ -194,6 +206,14 @@ export interface VxeModalProps {
   animat?: VxeModalPropTypes.Animat
   padding?: VxeModalPropTypes.Padding
   beforeHideMethod?: VxeModalPropTypes.BeforeHideMethod
+  /**
+   * 使用虚拟滚动条
+   */
+  useScrollbar?: VxeModalPropTypes.UseScrollbar
+  /**
+   * 滚动条配置项
+   */
+  scrollbarConfig?: VxeModalPropTypes.ScrollbarConfig
   slots?: VxeModalPropTypes.Slots
   /**
    * @deprecated 已废弃，请使用 content

package/types/components/scrollbar.d.ts

@@ -25,6 +25,7 @@ export interface VxeScrollbarPrivateRef extends ScrollbarPrivateRef { }
 
 export namespace VxeScrollbarPropTypes {
   export type Id = number | string
+  export type ViewId = number | string
   export type Width = number | string
   export type Height = number | string
   export type MinWidth = number | string
@@ -34,6 +35,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
@@ -45,7 +48,7 @@ export namespace VxeScrollbarPropTypes {
      * 滚动条显示位置
      */
     position?: 'top' | 'bottom' | ''
-    visible?: 'auto' | 'hidden' | 'visible' | ''
+    visible?: boolean
     /**
      * 滚动到边界触发的阈值会触发 scroll-boundary 事件
      */
@@ -62,7 +65,7 @@ export namespace VxeScrollbarPropTypes {
      * 滚动条显示位置
      */
     position?: 'left' | 'right' | ''
-    visible?: 'auto' | 'hidden' | 'visible' | ''
+    visible?: boolean
     /**
      * 滚动到边界触发的阈值会触发 scroll-boundary 事件
      */
@@ -81,6 +84,10 @@ export interface VxeScrollbarProps {
    * ID
    */
   id?: VxeScrollbarPropTypes.Id
+  /**
+   * View ID
+   */
+  viewId?: VxeScrollbarPropTypes.ViewId
   /**
    * 容器宽度
    */
@@ -109,6 +116,14 @@ export interface VxeScrollbarProps {
    * 是否加载中
    */
   loading?: VxeScrollbarPropTypes.Loading
+  /**
+   * 是否自动隐藏
+   */
+  autoHide?: VxeScrollbarPropTypes.AutoHide
+  /**
+   * 是否显示
+   */
+  visible?: VxeScrollbarPropTypes.Visible
   /**
    * 是否使用原生滚动条
    */