vxe-pc-ui 4.18.23 → 4.19.0

package/lib/vxe-scrollbar/style/style.css

@@ -5,8 +5,6 @@
 .vxe-scrollbar.is--virtual > .vxe-scrollbar--view {
   scrollbar-width: none;
   -ms-overflow-style: none;
-  overflow-x: auto;
-  overflow-y: auto;
 }
 .vxe-scrollbar.is--virtual > .vxe-scrollbar--view::-webkit-scrollbar {
   display: none;
@@ -25,16 +23,6 @@
   opacity: 0;
   transition: opacity 0.8s ease-in-out;
 }
-.vxe-scrollbar.is--native > .vxe-scrollbar--view {
-  overflow-x: auto;
-  overflow-y: auto;
-}
-.vxe-scrollbar.is--native.ov-x--hidden > .vxe-scrollbar--view {
-  overflow-x: hidden;
-}
-.vxe-scrollbar.is--native.ov-y--hidden > .vxe-scrollbar--view {
-  overflow-y: hidden;
-}
 .vxe-scrollbar.is--native > .vxe-scrollbar--view::-webkit-scrollbar {
   width: var(--vxe-ui-scrollbar-y-width);
   height: var(--vxe-ui-scrollbar-x-height);
@@ -49,14 +37,23 @@
 .vxe-scrollbar.is--native > .vxe-scrollbar--view::-webkit-scrollbar-thumb:active {
   background-color: var(--vxe-ui-scrollbar-thumb-active-background-color);
 }
+.vxe-scrollbar.ov-x--hidden > .vxe-scrollbar--view {
+  overflow-x: hidden;
+}
+.vxe-scrollbar.ov-y--hidden > .vxe-scrollbar--view {
+  overflow-y: hidden;
+}
 
 .vxe-scrollbar--view {
   height: 100%;
   width: 100%;
+  overflow-x: auto;
+  overflow-y: auto;
 }
 
 .vxe-scrollbar--track-x,
 .vxe-scrollbar--track-y {
+  display: none;
   position: absolute;
   background-color: var(--vxe-ui-scrollbar-track-background-color);
   -webkit-user-select: none;
@@ -64,11 +61,16 @@
           user-select: none;
 }
 
+.vxe-scrollbar.overflow-y > .vxe-scrollbar--track-x, .vxe-scrollbar.overflow-y > .vxe-scrollbar--track-y {
+  display: block;
+}
+
 .vxe-scrollbar--track-x {
   width: 100%;
   bottom: 0;
   left: 0;
   height: var(--vxe-ui-scrollbar-x-height);
+  padding: var(--vxe-ui-scrollbar-track-padding) 0;
 }
 
 .vxe-scrollbar--track-y {
@@ -76,6 +78,7 @@
   right: 0;
   top: 0;
   width: var(--vxe-ui-scrollbar-y-width);
+  padding: 0 var(--vxe-ui-scrollbar-track-padding);
 }
 
 .vxe-scrollbar--thumb-y {
@@ -88,7 +91,7 @@
 
 .vxe-scrollbar--thumb-x,
 .vxe-scrollbar--thumb-y {
-  border-radius: var(--vxe-ui-base-border-radius);
+  border-radius: var(--vxe-ui-scrollbar-thumb-border-radius);
   background-color: var(--vxe-ui-scrollbar-thumb-background-color);
 }
 .vxe-scrollbar--thumb-x:hover,

package/lib/vxe-scrollbar/style/style.min.css

@@ -1 +1 @@
-.vxe-scrollbar{width:100%;position:relative}.vxe-scrollbar.is--virtual>.vxe-scrollbar--view{scrollbar-width:none;-ms-overflow-style:none;overflow-x:auto;overflow-y:auto}.vxe-scrollbar.is--virtual>.vxe-scrollbar--view::-webkit-scrollbar{display:none}.vxe-scrollbar.is--virtual.ov-x--auto-hide:hover>.vxe-scrollbar--track-x{opacity:1}.vxe-scrollbar.is--virtual.ov-x--auto-hide>.vxe-scrollbar--track-x{opacity:0;transition:opacity .8s ease-in-out}.vxe-scrollbar.is--virtual.ov-y--auto-hide:hover>.vxe-scrollbar--track-y{opacity:1}.vxe-scrollbar.is--virtual.ov-y--auto-hide>.vxe-scrollbar--track-y{opacity:0;transition:opacity .8s ease-in-out}.vxe-scrollbar.is--native>.vxe-scrollbar--view{overflow-x:auto;overflow-y:auto}.vxe-scrollbar.is--native.ov-x--hidden>.vxe-scrollbar--view{overflow-x:hidden}.vxe-scrollbar.is--native.ov-y--hidden>.vxe-scrollbar--view{overflow-y:hidden}.vxe-scrollbar.is--native>.vxe-scrollbar--view::-webkit-scrollbar{width:var(--vxe-ui-scrollbar-y-width);height:var(--vxe-ui-scrollbar-x-height)}.vxe-scrollbar.is--native>.vxe-scrollbar--view::-webkit-scrollbar-thumb{border-radius:var(--vxe-ui-base-border-radius);background-color:var(--vxe-ui-scrollbar-thumb-background-color)}.vxe-scrollbar.is--native>.vxe-scrollbar--view::-webkit-scrollbar-thumb:hover{background-color:var(--vxe-ui-scrollbar-thumb-hover-background-color)}.vxe-scrollbar.is--native>.vxe-scrollbar--view::-webkit-scrollbar-thumb:active{background-color:var(--vxe-ui-scrollbar-thumb-active-background-color)}.vxe-scrollbar--view{height:100%;width:100%}.vxe-scrollbar--track-x,.vxe-scrollbar--track-y{position:absolute;background-color:var(--vxe-ui-scrollbar-track-background-color);-webkit-user-select:none;-moz-user-select:none;user-select:none}.vxe-scrollbar--track-x{width:100%;bottom:0;left:0;height:var(--vxe-ui-scrollbar-x-height)}.vxe-scrollbar--track-y{height:100%;right:0;top:0;width:var(--vxe-ui-scrollbar-y-width)}.vxe-scrollbar--thumb-y{width:100%}.vxe-scrollbar--thumb-x{height:100%}.vxe-scrollbar--thumb-x,.vxe-scrollbar--thumb-y{border-radius:var(--vxe-ui-base-border-radius);background-color:var(--vxe-ui-scrollbar-thumb-background-color)}.vxe-scrollbar--thumb-x:hover,.vxe-scrollbar--thumb-y:hover{background-color:var(--vxe-ui-scrollbar-thumb-hover-background-color)}.vxe-scrollbar--thumb-x:active,.vxe-scrollbar--thumb-y:active{background-color:var(--vxe-ui-scrollbar-thumb-active-background-color)}
+.vxe-scrollbar{width:100%;position:relative}.vxe-scrollbar.is--virtual>.vxe-scrollbar--view{scrollbar-width:none;-ms-overflow-style:none}.vxe-scrollbar.is--virtual>.vxe-scrollbar--view::-webkit-scrollbar{display:none}.vxe-scrollbar.is--virtual.ov-x--auto-hide:hover>.vxe-scrollbar--track-x{opacity:1}.vxe-scrollbar.is--virtual.ov-x--auto-hide>.vxe-scrollbar--track-x{opacity:0;transition:opacity .8s ease-in-out}.vxe-scrollbar.is--virtual.ov-y--auto-hide:hover>.vxe-scrollbar--track-y{opacity:1}.vxe-scrollbar.is--virtual.ov-y--auto-hide>.vxe-scrollbar--track-y{opacity:0;transition:opacity .8s ease-in-out}.vxe-scrollbar.is--native>.vxe-scrollbar--view::-webkit-scrollbar{width:var(--vxe-ui-scrollbar-y-width);height:var(--vxe-ui-scrollbar-x-height)}.vxe-scrollbar.is--native>.vxe-scrollbar--view::-webkit-scrollbar-thumb{border-radius:var(--vxe-ui-base-border-radius);background-color:var(--vxe-ui-scrollbar-thumb-background-color)}.vxe-scrollbar.is--native>.vxe-scrollbar--view::-webkit-scrollbar-thumb:hover{background-color:var(--vxe-ui-scrollbar-thumb-hover-background-color)}.vxe-scrollbar.is--native>.vxe-scrollbar--view::-webkit-scrollbar-thumb:active{background-color:var(--vxe-ui-scrollbar-thumb-active-background-color)}.vxe-scrollbar.ov-x--hidden>.vxe-scrollbar--view{overflow-x:hidden}.vxe-scrollbar.ov-y--hidden>.vxe-scrollbar--view{overflow-y:hidden}.vxe-scrollbar--view{height:100%;width:100%;overflow-x:auto;overflow-y:auto}.vxe-scrollbar--track-x,.vxe-scrollbar--track-y{display:none;position:absolute;background-color:var(--vxe-ui-scrollbar-track-background-color);-webkit-user-select:none;-moz-user-select:none;user-select:none}.vxe-scrollbar.overflow-y>.vxe-scrollbar--track-x,.vxe-scrollbar.overflow-y>.vxe-scrollbar--track-y{display:block}.vxe-scrollbar--track-x{width:100%;bottom:0;left:0;height:var(--vxe-ui-scrollbar-x-height);padding:var(--vxe-ui-scrollbar-track-padding) 0}.vxe-scrollbar--track-y{height:100%;right:0;top:0;width:var(--vxe-ui-scrollbar-y-width);padding:0 var(--vxe-ui-scrollbar-track-padding)}.vxe-scrollbar--thumb-y{width:100%}.vxe-scrollbar--thumb-x{height:100%}.vxe-scrollbar--thumb-x,.vxe-scrollbar--thumb-y{border-radius:var(--vxe-ui-scrollbar-thumb-border-radius);background-color:var(--vxe-ui-scrollbar-thumb-background-color)}.vxe-scrollbar--thumb-x:hover,.vxe-scrollbar--thumb-y:hover{background-color:var(--vxe-ui-scrollbar-thumb-hover-background-color)}.vxe-scrollbar--thumb-x:active,.vxe-scrollbar--thumb-y:active{background-color:var(--vxe-ui-scrollbar-thumb-active-background-color)}

package/lib/vxe-text-ellipsis/style/style.css

@@ -1,7 +1,27 @@
+.vxe-text-ellipsis {
+  --vxe-ui-text-ellipsis-current-font-size: inherit;
+}
+.vxe-text-ellipsis.size--xlarge {
+  --vxe-ui-text-ellipsis-current-font-size: var(--vxe-ui-font-size-xlarge);
+}
+.vxe-text-ellipsis.size--large {
+  --vxe-ui-text-ellipsis-current-font-size: var(--vxe-ui-font-size-large);
+}
+.vxe-text-ellipsis.size--medium {
+  --vxe-ui-text-ellipsis-current-font-size: var(--vxe-ui-font-size-medium);
+}
+.vxe-text-ellipsis.size--small {
+  --vxe-ui-text-ellipsis-current-font-size: var(--vxe-ui-font-size-small);
+}
+.vxe-text-ellipsis.size--mini {
+  --vxe-ui-text-ellipsis-current-font-size: var(--vxe-ui-font-size-mini);
+}
+
 .vxe-text-ellipsis {
   display: block;
   overflow: hidden;
   white-space: normal;
+  font-size: var(--vxe-ui-text-ellipsis-current-font-size);
 }
 .vxe-text-ellipsis.theme--primary {
   color: var(--vxe-ui-font-primary-color);
@@ -57,6 +77,15 @@
 .vxe-text-ellipsis.theme--error > .vxe-text-ellipsis--link:hover {
   color: var(--vxe-ui-status-error-lighten-color);
 }
+.vxe-text-ellipsis.theme--perfect {
+  color: var(--vxe-ui-table-header-background-color);
+}
+.vxe-text-ellipsis.theme--perfect > .vxe-text-ellipsis--link:focus {
+  color: var(--vxe-ui-table-header-background-color);
+}
+.vxe-text-ellipsis.theme--perfect > .vxe-text-ellipsis--link:hover {
+  color: var(--vxe-ui-table-header-background-color);
+}
 .vxe-text-ellipsis.is--underline:hover .vxe-text-ellipsis--link {
   text-decoration: underline;
 }
@@ -101,14 +130,4 @@
 .vxe-text-ellipsis--link {
   text-decoration: none;
   color: inherit;
-}
-
-.vxe-text-ellipsis.size--medium {
-  font-size: var(--vxe-ui-font-size-medium);
-}
-.vxe-text-ellipsis.size--small {
-  font-size: var(--vxe-ui-font-size-small);
-}
-.vxe-text-ellipsis.size--mini {
-  font-size: var(--vxe-ui-font-size-mini);
 }

package/lib/vxe-text-ellipsis/style/style.min.css

@@ -1 +1 @@
-.vxe-text-ellipsis{display:block;overflow:hidden;white-space:normal}.vxe-text-ellipsis.theme--primary{color:var(--vxe-ui-font-primary-color)}.vxe-text-ellipsis.theme--primary>.vxe-text-ellipsis--link:focus{color:var(--vxe-ui-font-primary-darken-color)}.vxe-text-ellipsis.theme--primary>.vxe-text-ellipsis--link:hover{color:var(--vxe-ui-font-primary-lighten-color)}.vxe-text-ellipsis.theme--success{color:var(--vxe-ui-status-success-color)}.vxe-text-ellipsis.theme--success>.vxe-text-ellipsis--link:focus{color:var(--vxe-ui-status-success-darken-color)}.vxe-text-ellipsis.theme--success>.vxe-text-ellipsis--link:hover{color:var(--vxe-ui-status-success-lighten-color)}.vxe-text-ellipsis.theme--info{color:var(--vxe-ui-status-info-color)}.vxe-text-ellipsis.theme--info>.vxe-text-ellipsis--link:focus{color:var(--vxe-ui-status-info-darken-color)}.vxe-text-ellipsis.theme--info>.vxe-text-ellipsis--link:hover{color:var(--vxe-ui-status-info-lighten-color)}.vxe-text-ellipsis.theme--warning{color:var(--vxe-ui-status-warning-color)}.vxe-text-ellipsis.theme--warning>.vxe-text-ellipsis--link:focus{color:var(--vxe-ui-status-warning-darken-color)}.vxe-text-ellipsis.theme--warning>.vxe-text-ellipsis--link:hover{color:var(--vxe-ui-status-warning-lighten-color)}.vxe-text-ellipsis.theme--danger{color:var(--vxe-ui-status-danger-color)}.vxe-text-ellipsis.theme--danger>.vxe-text-ellipsis--link:focus{color:var(--vxe-ui-status-danger-darken-color)}.vxe-text-ellipsis.theme--danger>.vxe-text-ellipsis--link:hover{color:var(--vxe-ui-status-danger-lighten-color)}.vxe-text-ellipsis.theme--error{color:var(--vxe-ui-status-error-color)}.vxe-text-ellipsis.theme--error>.vxe-text-ellipsis--link:focus{color:var(--vxe-ui-status-error-darken-color)}.vxe-text-ellipsis.theme--error>.vxe-text-ellipsis--link:hover{color:var(--vxe-ui-status-error-lighten-color)}.vxe-text-ellipsis.is--underline:hover .vxe-text-ellipsis--link{text-decoration:underline}.vxe-text-ellipsis.is--single{text-overflow:ellipsis;white-space:nowrap}.vxe-text-ellipsis.is--multi{word-wrap:break-word;word-break:break-all}.vxe-text-ellipsis.is--copy>.vxe-text-ellipsis--icon{cursor:pointer}.vxe-text-ellipsis.is--copy>.vxe-text-ellipsis--icon:focus{color:var(--vxe-ui-font-darken-color)}.vxe-text-ellipsis.is--copy>.vxe-text-ellipsis--icon:hover{color:var(--vxe-ui-font-primary-lighten-color)}.vxe-text-ellipsis.is--copy>.vxe-text-ellipsis--icon:active{color:var(--vxe-ui-font-primary-darken-color)}.vxe-text-ellipsis .vxe-text-ellipsis--reality{display:none;z-index:-1;pointer-events:none}.vxe-text-ellipsis--icon{padding:0 .1em;-webkit-user-select:none;-moz-user-select:none;user-select:none}.vxe-text-ellipsis--content,.vxe-text-ellipsis--link{padding:0 .1em}.vxe-text-ellipsis--link{text-decoration:none;color:inherit}.vxe-text-ellipsis.size--medium{font-size:var(--vxe-ui-font-size-medium)}.vxe-text-ellipsis.size--small{font-size:var(--vxe-ui-font-size-small)}.vxe-text-ellipsis.size--mini{font-size:var(--vxe-ui-font-size-mini)}
+.vxe-text-ellipsis{--vxe-ui-text-ellipsis-current-font-size:inherit}.vxe-text-ellipsis.size--xlarge{--vxe-ui-text-ellipsis-current-font-size:var(--vxe-ui-font-size-xlarge)}.vxe-text-ellipsis.size--large{--vxe-ui-text-ellipsis-current-font-size:var(--vxe-ui-font-size-large)}.vxe-text-ellipsis.size--medium{--vxe-ui-text-ellipsis-current-font-size:var(--vxe-ui-font-size-medium)}.vxe-text-ellipsis.size--small{--vxe-ui-text-ellipsis-current-font-size:var(--vxe-ui-font-size-small)}.vxe-text-ellipsis.size--mini{--vxe-ui-text-ellipsis-current-font-size:var(--vxe-ui-font-size-mini)}.vxe-text-ellipsis{display:block;overflow:hidden;white-space:normal;font-size:var(--vxe-ui-text-ellipsis-current-font-size)}.vxe-text-ellipsis.theme--primary{color:var(--vxe-ui-font-primary-color)}.vxe-text-ellipsis.theme--primary>.vxe-text-ellipsis--link:focus{color:var(--vxe-ui-font-primary-darken-color)}.vxe-text-ellipsis.theme--primary>.vxe-text-ellipsis--link:hover{color:var(--vxe-ui-font-primary-lighten-color)}.vxe-text-ellipsis.theme--success{color:var(--vxe-ui-status-success-color)}.vxe-text-ellipsis.theme--success>.vxe-text-ellipsis--link:focus{color:var(--vxe-ui-status-success-darken-color)}.vxe-text-ellipsis.theme--success>.vxe-text-ellipsis--link:hover{color:var(--vxe-ui-status-success-lighten-color)}.vxe-text-ellipsis.theme--info{color:var(--vxe-ui-status-info-color)}.vxe-text-ellipsis.theme--info>.vxe-text-ellipsis--link:focus{color:var(--vxe-ui-status-info-darken-color)}.vxe-text-ellipsis.theme--info>.vxe-text-ellipsis--link:hover{color:var(--vxe-ui-status-info-lighten-color)}.vxe-text-ellipsis.theme--warning{color:var(--vxe-ui-status-warning-color)}.vxe-text-ellipsis.theme--warning>.vxe-text-ellipsis--link:focus{color:var(--vxe-ui-status-warning-darken-color)}.vxe-text-ellipsis.theme--warning>.vxe-text-ellipsis--link:hover{color:var(--vxe-ui-status-warning-lighten-color)}.vxe-text-ellipsis.theme--danger{color:var(--vxe-ui-status-danger-color)}.vxe-text-ellipsis.theme--danger>.vxe-text-ellipsis--link:focus{color:var(--vxe-ui-status-danger-darken-color)}.vxe-text-ellipsis.theme--danger>.vxe-text-ellipsis--link:hover{color:var(--vxe-ui-status-danger-lighten-color)}.vxe-text-ellipsis.theme--error{color:var(--vxe-ui-status-error-color)}.vxe-text-ellipsis.theme--error>.vxe-text-ellipsis--link:focus{color:var(--vxe-ui-status-error-darken-color)}.vxe-text-ellipsis.theme--error>.vxe-text-ellipsis--link:hover{color:var(--vxe-ui-status-error-lighten-color)}.vxe-text-ellipsis.theme--perfect{color:var(--vxe-ui-table-header-background-color)}.vxe-text-ellipsis.theme--perfect>.vxe-text-ellipsis--link:focus{color:var(--vxe-ui-table-header-background-color)}.vxe-text-ellipsis.theme--perfect>.vxe-text-ellipsis--link:hover{color:var(--vxe-ui-table-header-background-color)}.vxe-text-ellipsis.is--underline:hover .vxe-text-ellipsis--link{text-decoration:underline}.vxe-text-ellipsis.is--single{text-overflow:ellipsis;white-space:nowrap}.vxe-text-ellipsis.is--multi{word-wrap:break-word;word-break:break-all}.vxe-text-ellipsis.is--copy>.vxe-text-ellipsis--icon{cursor:pointer}.vxe-text-ellipsis.is--copy>.vxe-text-ellipsis--icon:focus{color:var(--vxe-ui-font-darken-color)}.vxe-text-ellipsis.is--copy>.vxe-text-ellipsis--icon:hover{color:var(--vxe-ui-font-primary-lighten-color)}.vxe-text-ellipsis.is--copy>.vxe-text-ellipsis--icon:active{color:var(--vxe-ui-font-primary-darken-color)}.vxe-text-ellipsis .vxe-text-ellipsis--reality{display:none;z-index:-1;pointer-events:none}.vxe-text-ellipsis--icon{padding:0 .1em;-webkit-user-select:none;-moz-user-select:none;user-select:none}.vxe-text-ellipsis--content,.vxe-text-ellipsis--link{padding:0 .1em}.vxe-text-ellipsis--link{text-decoration:none;color:inherit}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vxe-pc-ui",
-  "version": "4.18.23",
+  "version": "4.19.0",
   "description": "A vue based PC component library",
   "scripts": {
     "update": "npm install --legacy-peer-deps",
@@ -27,7 +27,7 @@
   "style": "lib/style.css",
   "typings": "types/index.d.ts",
   "dependencies": {
-    "@vxe-ui/core": "^4.4.27"
+    "@vxe-ui/core": "^4.4.28"
   },
   "devDependencies": {
     "@rollup/plugin-commonjs": "^29.0.0",

package/packages/calendar/src/calendar.ts

@@ -5,7 +5,7 @@ import { getDateQuarter } from '../../date-panel/src/util'
 import { toCssUnit } from '../../ui/src/dom'
 import { isEnableConf } from '../../ui/src/utils'
 import { createComponentLog } from '../../ui/src/log'
-import VxeButtonComponent from '../../button/src/button'
+import VxeButtonComponent from '../../button'
 import XEUtils from 'xe-utils'
 
 import type { VxeCalendarConstructor, VxeCalendarEmits, CalendarInternalData, CalendarReactData, CalendarMethods, VxeCalendarPropTypes, CalendarPrivateRef, VxeDatePanelDefines, ValueOf } from '../../../types'

package/packages/card/src/card.ts

@@ -3,7 +3,7 @@ import { defineVxeComponent } from '../../ui/src/comp'
 import { getSlotVNs } from '../../ui/src/vn'
 import { getConfig, createEvent, useSize, renderEmptyElement } from '../../ui'
 import { toCssUnit } from '../../ui/src/dom'
-import VxeLoadingComponent from '../../loading/src/loading'
+import VxeLoadingComponent from '../../loading'
 import XEUtils from 'xe-utils'
 
 import type { CardReactData, VxeCardEmits, VxeCardPropTypes, CardPrivateRef, ValueOf, CardMethods, CardPrivateMethods, VxeCardPrivateComputed, VxeCardConstructor, VxeCardPrivateMethods } from '../../../types'

package/packages/carousel/src/carousel.ts

@@ -3,7 +3,7 @@ import { defineVxeComponent } from '../../ui/src/comp'
 import { getConfig, getIcon, createEvent, renderEmptyElement } from '../../ui'
 import { getSlotVNs } from '../../ui/src/vn'
 import { toCssUnit } from '../../ui/src/dom'
-import VxeLoadingComponent from '../../loading/src/loading'
+import VxeLoadingComponent from '../../loading'
 import XEUtils from 'xe-utils'
 
 import type { CarouselReactData, CarouselPrivateRef, VxeCarouselPropTypes, CarouselInternalData, CarouselMethods, CarouselPrivateMethods, VxeCarouselEmits, VxeCarouselDefines, VxeCarouselPrivateComputed, VxeCarouselConstructor, ValueOf, VxeCarouselPrivateMethods } from '../../../types'

package/packages/countdown/src/countdown.ts

@@ -2,7 +2,7 @@ import { ref, h, reactive, watch, computed, PropType, onUnmounted, onMounted } f
 import { defineVxeComponent } from '../../ui/src/comp'
 import { getConfig, getI18n, createEvent, useSize, renderEmptyElement } from '../../ui'
 import { getSlotVNs } from '../../ui/src/vn'
-import VxeTextComponent from '../../text/src/text'
+import VxeTextComponent from '../../text'
 import XEUtils from 'xe-utils'
 
 import type { VxeCountdownPropTypes, CountdownReactData, CountdownInternalData, CountdownPrivateRef, VxeCountdownEmits, VxeCountdownPrivateComputed, VxeCountdownConstructor, VxeCountdownPrivateMethods, ValueOf, CountdownMethods, CountdownPrivateMethods } from '../../../types'

package/packages/date-picker/src/date-picker.ts

@@ -7,9 +7,9 @@ import { updatePanelPlacement, getEventTargetNode, hasControlKey, getPopupContai
 import { getSlotVNs } from '../../ui/src/vn'
 import { parseDateObj, parseDateValue, getDateByCode, handleValueFormat, hasDateValueType, hasTimestampValueType, isAllSameChar, getChunkDefaultNum, checkDateInputFormat } from '../../date-panel/src/util'
 import { createComponentLog } from '../../ui/src/log'
-import VxeDatePanelComponent from '../../date-panel/src/date-panel'
-import VxeButtonComponent from '../../button/src/button'
-import VxeButtonGroupComponent from '../../button/src/button-group'
+import VxeDatePanelComponent from '../../date-panel'
+import VxeButtonComponent from '../../button'
+import VxeButtonGroupComponent from '../../button-group'
 
 import type { VxeDatePickerConstructor, VxeDatePickerEmits, DatePickerInternalData, DatePickerReactData, DatePickerMethods, VxeDatePanelDefines, VxeDatePickerPropTypes, DatePickerPrivateRef, VxeFormConstructor, VxeFormPrivateMethods, VxeFormDefines, ValueOf, VxeModalConstructor, VxeDrawerConstructor, VxeModalMethods, VxeDrawerMethods, VxeDatePickerDefines, VxeButtonGroupEvents, VxeDatePanelConstructor, VxeCardConstructor, VxeCardPrivateMethods, VxeComponentStyleType } from '../../../types'
 import type { VxeTableConstructor, VxeTablePrivateMethods } from '../../../types/components/table'

package/packages/icon-picker/src/icon-picker.ts

@@ -5,7 +5,7 @@ import { getConfig, getIcon, getI18n, globalEvents, createEvent, renderer, useSi
 import { getEventTargetNode, getPopupContainer, toCssUnit, updatePanelPlacement } from '../../ui/src/dom'
 import { getLastZIndex, nextZIndex, getFuncText } from '../../ui/src/utils'
 import { getSlotVNs } from '../../ui/src/vn'
-import VxeInputComponent from '../../input/src/input'
+import VxeInputComponent from '../../input'
 
 import type { VxeIconPickerPropTypes, VxeIconPickerConstructor, IconPickerInternalData, VxeInputConstructor, ValueOf, IconPickerReactData, VxeIconPickerEmits, IconPickerMethods, IconPickerPrivateRef, VxeIconPickerMethods, VxeIconPickerDefines, VxeDrawerConstructor, VxeDrawerMethods, VxeFormDefines, VxeFormConstructor, VxeFormPrivateMethods, VxeModalConstructor, VxeModalMethods, VxeComponentStyleType } from '../../../types'
 import type { VxeTableConstructor, VxeTablePrivateMethods } from '../../../types/components/table'

package/packages/layout-aside/src/layout-aside.ts

@@ -2,8 +2,8 @@ import { ref, h, reactive, computed, provide, PropType } from 'vue'
 import { defineVxeComponent } from '../../ui/src/comp'
 import { toCssUnit } from '../../ui/src/dom'
 import { getConfig, useSize, createEvent } from '../../ui'
-import VxeLoadingComponent from '../../loading'
 import XEUtils from 'xe-utils'
+import VxeScrollbarComponent from '../../scrollbar'
 
 import type { VxeLayoutAsidePropTypes, LayoutAsideReactData, VxeLayoutAsideEmits, LayoutAsidePrivateRef, LayoutAsideMethods, LayoutAsidePrivateMethods, VxeLayoutAsidePrivateComputed, VxeLayoutAsideConstructor, VxeLayoutAsidePrivateMethods, ValueOf, VxeComponentStyleType } from '../../../types'
 
@@ -16,6 +16,7 @@ export default defineVxeComponent({
     loading: Boolean as PropType<VxeLayoutAsidePropTypes.Loading>,
     padding: Boolean as PropType<VxeLayoutAsidePropTypes.Padding>,
     collapseConfig: Object as PropType<VxeLayoutAsidePropTypes.CollapseConfig>,
+    scrollbarConfig: Object as PropType<VxeLayoutAsidePropTypes.ScrollbarConfig>,
     size: {
       type: String as PropType<VxeLayoutAsidePropTypes.Size>,
       default: () => getConfig().layoutAside.size || getConfig().size
@@ -41,6 +42,10 @@ export default defineVxeComponent({
       return Object.assign({}, getConfig().layoutAside.collapseConfig, props.collapseConfig)
     })
 
+    const computeScrollbarOpts = computed(() => {
+      return Object.assign({}, getConfig().layoutAside.scrollbarConfig, props.scrollbarConfig)
+    })
+
     const computeVarStyle = computed(() => {
       const { width, collapseWidth } = props
       const stys: VxeComponentStyleType = {}
@@ -86,6 +91,8 @@ export default defineVxeComponent({
       const varStyle = computeVarStyle.value
       const vSize = computeSize.value
       const collapseOpts = computeCollapseOpts.value
+      const scrollbarOpts = computeScrollbarOpts.value
+      const { native, yConfig, className, viewAttrs, viewClassName, viewInnerClassName } = scrollbarOpts
       const defaultSlot = slots.default
 
       return h('aside', {
@@ -99,15 +106,21 @@ export default defineVxeComponent({
         }],
         style: varStyle
       }, [
-        h('div', {
-          class: 'vxe-layout-aside--inner'
-        }, defaultSlot ? defaultSlot({}) : []),
-        /**
-         * 加载中
-         */
-        h(VxeLoadingComponent, {
-          class: 'vxe-list-view--loading',
-          modelValue: loading
+        h(VxeScrollbarComponent, {
+          loading,
+          native,
+          xConfig: {
+            visible: 'hidden'
+          },
+          yConfig,
+          className: 'vxe-layout-aside--scrollbar' + (className ? (' ' + className) : ''),
+          viewAttrs,
+          viewClassName: 'vxe-layout-aside--view' + (viewClassName ? (' ' + viewClassName) : ''),
+          viewInnerClassName: 'vxe-layout-aside--inner' + (viewInnerClassName ? (' ' + viewInnerClassName) : '')
+        }, {
+          default: () => {
+            return defaultSlot ? defaultSlot({}) : []
+          }
         })
       ])
     }

package/packages/layout-body/src/layout-body.ts

@@ -1,9 +1,9 @@
 import { ref, h, reactive, PropType, computed } from 'vue'
 import { defineVxeComponent } from '../../ui/src/comp'
 import { getConfig, useSize, createEvent, renderEmptyElement } from '../../ui'
-import VxeLoadingComponent from '../../loading'
-import VxeUIBacktopComponent from '../../backtop'
 import XEUtils from 'xe-utils'
+import VxeScrollbarComponent from '../../scrollbar'
+import VxeUIBacktopComponent from '../../backtop'
 
 import type { LayoutBodyInternalData, VxeLayoutBodyPropTypes, LayoutBodyReactData, LayoutBodyPrivateRef, VxeLayoutBodyEmits, LayoutBodyMethods, LayoutBodyPrivateMethods, VxeLayoutBodyPrivateComputed, VxeLayoutBodyConstructor, VxeLayoutBodyPrivateMethods, ValueOf } from '../../../types'
 
@@ -25,6 +25,7 @@ export default defineVxeComponent({
       default: () => getConfig().layoutBody.showBacktop
     },
     backtopConfig: Object as PropType<VxeLayoutBodyPropTypes.BacktopConfig>,
+    scrollbarConfig: Object as PropType<VxeLayoutBodyPropTypes.ScrollbarConfig>,
     size: {
       type: String as PropType<VxeLayoutBodyPropTypes.Size>,
       default: () => getConfig().layoutBody.size || getConfig().size
@@ -54,6 +55,10 @@ export default defineVxeComponent({
       })
     })
 
+    const computeScrollbarOpts = computed(() => {
+      return Object.assign({}, getConfig().layoutBody.scrollbarConfig, props.scrollbarConfig)
+    })
+
     const computeMaps: VxeLayoutBodyPrivateComputed = {
       computeSize
     }
@@ -85,6 +90,8 @@ export default defineVxeComponent({
     const renderVN = () => {
       const { loading, padding, showBacktop } = props
       const backtopOpts = computeBacktopOpts.value
+      const scrollbarOpts = computeScrollbarOpts.value
+      const { native, xConfig, yConfig, className, viewAttrs, viewClassName, viewInnerClassName } = scrollbarOpts
       const vSize = computeSize.value
       const defaultSlot = slots.default
       const backtopSlot = slots.backtop
@@ -112,16 +119,20 @@ export default defineVxeComponent({
           'is--padding': padding
         }]
       }, [
-        h('div', {
-          id: showBacktop ? backtopId : '',
-          class: 'vxe-layout-body--inner'
-        }, defaultSlot ? defaultSlot({}) : []),
-        /**
-         * 加载中
-         */
-        h(VxeLoadingComponent, {
-          class: 'vxe-list-view--loading',
-          modelValue: loading
+        h(VxeScrollbarComponent, {
+          loading,
+          native,
+          xConfig,
+          yConfig,
+          className: 'vxe-layout-body--scrollbar' + (className ? (' ' + className) : ''),
+          viewAttrs: {
+            ...viewAttrs,
+            id: showBacktop ? (backtopId || null) : null
+          },
+          viewClassName: 'vxe-layout-body--view' + (viewClassName ? (' ' + viewClassName) : ''),
+          viewInnerClassName: 'vxe-layout-body--inner' + (viewInnerClassName ? (' ' + viewInnerClassName) : '')
+        }, {
+          default: () => defaultSlot ? defaultSlot({}) : []
         }),
         /**
          * 回到顶部

package/packages/list/src/list.ts

@@ -8,7 +8,7 @@ import { isEnableConf, getText, enModelValue, deModelValue } from '../../ui/src/
 import { createComponentLog } from '../../ui/src/log'
 import { moveRowAnimateToTb, clearRowAnimate } from '../../ui/src/anime'
 import { getItemCacheObj } from './util'
-import VxeLoadingComponent from '../../loading/src/loading'
+import VxeLoadingComponent from '../../loading'
 
 import type { VxeListConstructor, VxeListPropTypes, VxeListEmits, ListReactData, VxeListPrivateMethods, ListInternalData, VxeListDefines, ValueOf, ListMethods, ListPrivateMethods, ListPrivateRef, VxeComponentStyleType } from '../../../types'
 

package/packages/menu/src/menu.ts

@@ -7,6 +7,7 @@ import { getLastZIndex, nextZIndex, isEnableConf } from '../../ui/src/utils'
 import { getSlotVNs } from '../../ui/src/vn'
 import { createComponentLog } from '../../ui/src/log'
 import VxeLoadingComponent from '../../loading'
+import VxeScrollbarComponent from '../../scrollbar'
 
 import type { VxeMenuDefines, VxeMenuPropTypes, MenuInternalData, MenuReactData, VxeMenuEmits, MenuMethods, VxeComponentSlotType, MenuPrivateMethods, MenuPrivateRef, VxeMenuPrivateComputed, VxeMenuConstructor, VxeMenuPrivateMethods, ValueOf, VxeLayoutAsideConstructor, VxeLayoutAsidePrivateMethods } from '../../../types'
 
@@ -71,6 +72,7 @@ export default defineVxeComponent({
       default: () => getConfig().menu.size || getConfig().size
     },
     menuConfig: Object as PropType<VxeMenuPropTypes.MenuConfig>,
+    scrollbarConfig: Object as PropType<VxeMenuPropTypes.ScrollbarConfig>,
     appendTo: {
       type: [String, Function] as PropType<VxeMenuPropTypes.AppendTo>,
       default: () => getConfig().menu.appendTo
@@ -134,6 +136,10 @@ export default defineVxeComponent({
       return propsOpts.routerLink || 'routerLink'
     })
 
+    const computeScrollbarOpts = computed(() => {
+      return Object.assign({}, getConfig().menu.scrollbarConfig, props.scrollbarConfig)
+    })
+
     const computeCurrBorder = computed(() => {
       const { border } = props
       if (border) {
@@ -682,6 +688,7 @@ export default defineVxeComponent({
       const isCollapsed = computeIsCollapsed.value
       const currBorder = computeCurrBorder.value
       const varStyle = computeVarStyle.value
+      const scrollbarOpts = computeScrollbarOpts.value
       const headerSlot = slots.header
       const footerSlot = slots.footer
       let ons: Record<string, any> = {}
@@ -735,9 +742,12 @@ export default defineVxeComponent({
                     class: 'vxe-menu--header'
                   }, headerSlot(stParams))
                   : renderEmptyElement($xeMenu),
-                h('div', {
-                  class: 'vxe-menu--body'
-                }, menuList.map(child => renderDefaultChildren(child, menuList))),
+                h(VxeScrollbarComponent, {
+                  class: 'vxe-menu--body',
+                  ...scrollbarOpts
+                }, {
+                  default: () => menuList.map(child => renderDefaultChildren(child, menuList))
+                }),
                 footerSlot
                   ? h('div', {
                     class: 'vxe-menu--footer'
@@ -750,7 +760,7 @@ export default defineVxeComponent({
          * 加载中
          */
         h(VxeLoadingComponent, {
-          class: 'vxe-list-view--loading',
+          class: 'vxe-menu-view--loading',
           modelValue: loading
         })
       ])

package/packages/scrollbar/src/scrollbar.ts

@@ -32,6 +32,7 @@ function createInternalData (): ScrollbarInternalData {
 export default defineVxeComponent({
   name: 'VxeScrollbar',
   props: {
+    id: [String, Number] as PropType<VxeScrollbarPropTypes.Id>,
     width: [String, Number] as PropType<VxeScrollbarPropTypes.Width>,
     height: [String, Number] as PropType<VxeScrollbarPropTypes.Height>,
     minWidth: [String, Number] as PropType<VxeScrollbarPropTypes.MinWidth>,
@@ -45,8 +46,22 @@ export default defineVxeComponent({
     },
     xConfig: Object as PropType<VxeScrollbarPropTypes.XConfig>,
     yConfig: Object as PropType<VxeScrollbarPropTypes.YConfig>,
-    className: String as PropType<VxeScrollbarPropTypes.ClassName>,
-    viewClassName: String as PropType<VxeScrollbarPropTypes.ViewClassName>,
+    className: {
+      type: String as PropType<VxeScrollbarPropTypes.ClassName>,
+      default: () => getConfig().scrollbar.className
+    },
+    viewAttrs: {
+      type: Object as PropType<VxeScrollbarPropTypes.ViewAttrs>,
+      default: () => getConfig().scrollbar.viewAttrs
+    },
+    viewClassName: {
+      type: String as PropType<VxeScrollbarPropTypes.ViewClassName>,
+      default: () => getConfig().scrollbar.viewClassName
+    },
+    viewInnerClassName: {
+      type: String as PropType<VxeScrollbarPropTypes.ViewInnerClassName>,
+      default: () => getConfig().scrollbar.viewInnerClassName
+    },
     autoResize: {
       type: Boolean as PropType<VxeScrollbarPropTypes.AutoResize>,
       default: () => getConfig().scrollbar.autoResize
@@ -108,6 +123,7 @@ export default defineVxeComponent({
 
     const computeWrapperClss = computed(() => {
       const { native, className } = props
+      const { yThumbHeight, xThumbWidth } = reactData
       const xOpts = computeXOpts.value
       const yOpts = computeYOpts.value
       return domUtils.buildClass([
@@ -118,7 +134,9 @@ export default defineVxeComponent({
         className
       ], {
         'ov-x--auto-hide': xOpts.autoHide,
-        'ov-y--auto-hide': yOpts.autoHide
+        'ov-y--auto-hide': yOpts.autoHide,
+        'overflow-y': yThumbHeight,
+        'overflow-x': xThumbWidth
       })
     })
 
@@ -130,6 +148,14 @@ export default defineVxeComponent({
       ])
     })
 
+    const computeViewInnerClss = computed(() => {
+      const { viewInnerClassName } = props
+      return domUtils.buildClass([
+        'vxe-scrollbar--view-inner',
+        viewInnerClassName
+      ])
+    })
+
     const computeXOpts = computed(() => {
       return Object.assign({}, getConfig().scrollbar.xConfig, props.xConfig)
     })
@@ -427,31 +453,32 @@ export default defineVxeComponent({
     Object.assign($xeScrollbar, scrollbarMethods, scrollbarPrivateMethods)
 
     const renderVN = () => {
-      const { native, loading, autoResize } = props
+      const { id, native, loading, viewAttrs } = props
       const wrapperStyle = computeWrapperStyle.value
       const wrapperClss = computeWrapperClss.value
       const viewClss = computeViewClss.value
+      const viewInnerClss = computeViewInnerClss.value
       const xOpts = computeXOpts.value
       const yOpts = computeYOpts.value
       const defaultSlot = slots.default
       return h('div', {
         ref: refElem,
+        id: id || null,
         class: wrapperClss,
         style: wrapperStyle
       }, [
         h('div', {
           ref: refViewElem,
           class: viewClss,
-          onScroll: scrollEvent
-        }, autoResize
-          ? [
-              h('div', {
-                key: 'vi',
-                ref: refViewInnerElem,
-                class: 'vxe-scrollbar--view-inner'
-              }, defaultSlot ? defaultSlot({}) : [])
-            ]
-          : defaultSlot ? defaultSlot({}) : []),
+          onScroll: scrollEvent,
+          ...viewAttrs
+        }, [
+          h('div', {
+            key: 'vi',
+            ref: refViewInnerElem,
+            class: viewInnerClss
+          }, defaultSlot ? defaultSlot({}) : [])
+        ]),
         native || xOpts.visible === 'hidden'
           ? renderEmptyElement($xeScrollbar)
           : h('div', {

package/packages/select/src/select.ts

@@ -6,8 +6,8 @@ import { getEventTargetNode, getPopupContainer, toCssUnit, updatePanelPlacement
 import { getLastZIndex, nextZIndex, getFuncText, eqEmptyValue } from '../../ui/src/utils'
 import { getSlotVNs } from '../../ui/src/vn'
 import { createComponentLog } from '../../ui/src/log'
-import VxeInputComponent from '../../input/src/input'
-import VxeButtonComponent from '../../button/src/button'
+import VxeInputComponent from '../../input'
+import VxeButtonComponent from '../../button'
 
 import type { VxeSelectPropTypes, VxeSelectConstructor, SelectInternalData, SelectReactData, VxeSelectDefines, VxeButtonEvents, ValueOf, VxeSelectEmits, VxeComponentSlotType, VxeInputConstructor, SelectMethods, SelectPrivateRef, VxeSelectMethods, VxeOptionProps, VxeDrawerConstructor, VxeDrawerMethods, VxeFormDefines, VxeFormConstructor, VxeFormPrivateMethods, VxeModalConstructor, VxeModalMethods, VxeInputEvents, VxeComponentStyleType, VxeCardConstructor, VxeCardPrivateMethods } from '../../../types'
 import type { VxeTableConstructor, VxeTablePrivateMethods } from '../../../types/components/table'

package/packages/tabs/src/tabs.ts

@@ -6,7 +6,7 @@ import { toCssUnit, addClass, removeClass } from '../../ui/src/dom'
 import { isEnableConf } from '../../ui/src/utils'
 import { createComponentLog } from '../../ui/src/log'
 import XEUtils from 'xe-utils'
-import VxeLoadingComponent from '../../loading/src/loading'
+import VxeLoadingComponent from '../../loading'
 
 import type { VxeTabsPropTypes, VxeTabPaneProps, VxeTabsEmits, TabsInternalData, TabsReactData, TabsPrivateRef, VxeTabsPrivateComputed, VxeTabsConstructor, VxeTabsPrivateMethods, VxeTabPaneDefines, ValueOf, TabsMethods, TabsPrivateMethods, VxeComponentStyleType } from '../../../types'
 

package/packages/ui/index.ts

@@ -221,11 +221,16 @@ setConfig({
     digits: 2,
     controls: true
   },
-  layoutAside: {},
-  layoutBody: {
-    backtopConfig: {
+  layoutAside: {
+    scrollbarConfig: {
+      yConfig: {
+        autoHide: true
+      }
     }
   },
+  layoutBody: {
+    backtopConfig: {}
+  },
   layoutContainer: {},
   layoutFooter: {},
   layoutHeader: {},

package/packages/upload/src/upload.ts

@@ -6,7 +6,7 @@ import { getSlotVNs } from '../../ui/src/vn'
 import { createComponentLog } from '../../ui/src/log'
 import { initTpImg, getTpImg, getEventTargetNode, toCssUnit } from '../../ui/src/dom'
 import { readLocalFile } from './util'
-import VxeButtonComponent from '../../button/src/button'
+import VxeButtonComponent from '../../button'
 
 import type { VxeUploadDefines, VxeUploadPropTypes, UploadReactData, UploadInternalData, UploadPrivateMethods, UploadMethods, VxeUploadEmits, UploadPrivateRef, VxeUploadPrivateComputed, VxeUploadConstructor, VxeUploadPrivateMethods, VxeFormDefines, VxeFormConstructor, VxeFormPrivateMethods, ValueOf, VxeComponentEventParams } from '../../../types'
 import type { VxeTableConstructor, VxeTablePrivateMethods } from '../../../types/components/table'

package/styles/components/layout-aside.scss

@@ -15,9 +15,7 @@
     padding: var(--vxe-ui-layout-padding-default);
   }
 }
-.vxe-layout-aside--inner {
+.vxe-layout-aside--scrollbar {
   flex-grow: 1;
-  overflow-y: auto;
-  overflow-x: hidden;
-  outline: 0;
+  overflow: hidden;
 }