vxe-pc-ui 3.18.23 → 3.19.0

package/lib/vxe-layout-aside/style/style.css

@@ -16,9 +16,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;
 }

package/lib/vxe-layout-aside/style/style.min.css

@@ -1 +1 @@
-.vxe-layout-aside{position:relative;display:flex;flex-direction:column;flex-shrink:0;width:var(--vxe-ui-layout-aside-default-width);overflow:hidden}.vxe-layout-aside.is--animat{transition:width .3s}.vxe-layout-aside.is--collapse{width:var(--vxe-ui-layout-aside-collapse-width)}.vxe-layout-aside.is--padding{padding:var(--vxe-ui-layout-padding-default)}.vxe-layout-aside--inner{flex-grow:1;overflow-y:auto;overflow-x:hidden;outline:0}
+.vxe-layout-aside{position:relative;display:flex;flex-direction:column;flex-shrink:0;width:var(--vxe-ui-layout-aside-default-width);overflow:hidden}.vxe-layout-aside.is--animat{transition:width .3s}.vxe-layout-aside.is--collapse{width:var(--vxe-ui-layout-aside-collapse-width)}.vxe-layout-aside.is--padding{padding:var(--vxe-ui-layout-padding-default)}.vxe-layout-aside--scrollbar{flex-grow:1;overflow:hidden}

package/lib/vxe-layout-body/style/style.css

@@ -9,8 +9,7 @@
   padding: var(--vxe-ui-layout-padding-double);
 }
 
-.vxe-layout-body--inner {
+.vxe-layout-body--scrollbar {
   flex-grow: 1;
-  overflow: auto;
-  outline: 0;
+  overflow: hidden;
 }

package/lib/vxe-layout-body/style/style.min.css

@@ -1 +1 @@
-.vxe-layout-body{position:relative;display:flex;flex-direction:column;flex-grow:1;overflow:hidden}.vxe-layout-body.is--padding{padding:var(--vxe-ui-layout-padding-double)}.vxe-layout-body--inner{flex-grow:1;overflow:auto;outline:0}
+.vxe-layout-body{position:relative;display:flex;flex-direction:column;flex-grow:1;overflow:hidden}.vxe-layout-body.is--padding{padding:var(--vxe-ui-layout-padding-double)}.vxe-layout-body--scrollbar{flex-grow:1;overflow:hidden}

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

@@ -80,12 +80,13 @@
 
 .vxe-menu--collapse-wrapper {
   display: none;
+  flex-direction: column;
   position: absolute;
-  overflow: auto;
+  overflow: hidden;
   background-color: var(--vxe-ui-layout-background-color);
 }
 .vxe-menu--collapse-wrapper.is--collapsed {
-  display: block;
+  display: flex;
   transition: all 0.25s ease-in-out;
 }
 .vxe-menu--collapse-wrapper:not(.is--enter) {
@@ -100,6 +101,13 @@
   width: var(--vxe-ui-layout-aside-default-width);
   box-shadow: var(--vxe-ui-menu-collapse-wrapper-box-shadow);
 }
+.vxe-menu--collapse-wrapper > .vxe-menu--header, .vxe-menu--collapse-wrapper > .vxe-menu--footer {
+  flex-shrink: 0;
+}
+.vxe-menu--collapse-wrapper > .vxe-menu--body {
+  flex-grow: 1;
+  overflow: hidden;
+}
 
 .vxe-menu--item-link {
   display: flex;

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

@@ -1 +1 @@
-.vxe-menu,.vxe-menu--collapse-wrapper{--vxe-ui-menu-current-font-size:var(--vxe-ui-font-size-default);--vxe-ui-menu-current-item-height:var(--vxe-ui-menu-item-height-default);--vxe-ui-menu-current-item-padding:var(--vxe-ui-layout-padding-default);--vxe-ui-menu-current-margin:4px}.vxe-menu--collapse-wrapper.size--xlarge,.vxe-menu.size--xlarge{--vxe-ui-menu-current-font-size:var(--vxe-ui-font-size-xlarge);--vxe-ui-menu-current-item-height:var(--vxe-ui-menu-item-height-xlarge);--vxe-ui-menu-current-item-padding:var(--vxe-ui-layout-padding-xlarge)}.vxe-menu--collapse-wrapper.size--large,.vxe-menu.size--large{--vxe-ui-menu-current-font-size:var(--vxe-ui-font-size-large);--vxe-ui-menu-current-item-height:var(--vxe-ui-menu-item-height-large);--vxe-ui-menu-current-item-padding:var(--vxe-ui-layout-padding-large)}.vxe-menu--collapse-wrapper.size--medium,.vxe-menu.size--medium{--vxe-ui-menu-current-font-size:var(--vxe-ui-font-size-medium);--vxe-ui-menu-current-item-height:var(--vxe-ui-menu-item-height-medium);--vxe-ui-menu-current-item-padding:var(--vxe-ui-layout-padding-medium)}.vxe-menu--collapse-wrapper.size--small,.vxe-menu.size--small{--vxe-ui-menu-current-font-size:var(--vxe-ui-font-size-small);--vxe-ui-menu-current-item-height:var(--vxe-ui-menu-item-height-small);--vxe-ui-menu-current-item-padding:var(--vxe-ui-layout-padding-small)}.vxe-menu--collapse-wrapper.size--mini,.vxe-menu.size--mini{--vxe-ui-menu-current-font-size:var(--vxe-ui-font-size-mini);--vxe-ui-menu-current-item-height:var(--vxe-ui-menu-item-height-mini);--vxe-ui-menu-current-item-padding:var(--vxe-ui-layout-padding-mini)}.vxe-menu--collapse-wrapper.size--large,.vxe-menu--collapse-wrapper.size--xlarge,.vxe-menu.size--large,.vxe-menu.size--xlarge{--vxe-ui-menu-current-margin:6px}.vxe-menu--collapse-wrapper.size--mini,.vxe-menu--collapse-wrapper.size--small,.vxe-menu.size--mini,.vxe-menu.size--small{--vxe-ui-menu-current-margin:2px}.vxe-menu{position:relative}.vxe-menu.is--collapsed .vxe-menu--item-custom-title,.vxe-menu.is--collapsed .vxe-menu--item-link-collapse,.vxe-menu.is--collapsed .vxe-menu--item-link-title{display:none}.vxe-menu.is--loading{min-height:4em}.vxe-menu.border--first .vxe-menu--item-level1>.vxe-menu--item-link{border-bottom:1px solid var(--vxe-ui-menu-border-color)}.vxe-menu.border--first-group .vxe-menu--item-level1.has--child>.vxe-menu--item-link{border-bottom:1px solid var(--vxe-ui-menu-border-color)}.vxe-menu.border--group .vxe-menu--item-wrapper.has--child>.vxe-menu--item-link{border-bottom:1px solid var(--vxe-ui-menu-border-color)}.vxe-menu.border--all .vxe-menu--item-wrapper>.vxe-menu--item-link{border-bottom:1px solid var(--vxe-ui-menu-border-color)}.vxe-menu,.vxe-menu--collapse-wrapper{font-size:var(--vxe-ui-menu-current-font-size);color:var(--vxe-ui-font-color);font-family:var(--vxe-ui-font-family);background-color:var(--vxe-ui-layout-background-color)}.vxe-menu--collapse-wrapper{display:none;position:absolute;overflow:auto;background-color:var(--vxe-ui-layout-background-color)}.vxe-menu--collapse-wrapper.is--collapsed{display:block;transition:all .25s ease-in-out}.vxe-menu--collapse-wrapper:not(.is--enter){width:var(--vxe-ui-layout-aside-collapse-width)}.vxe-menu--collapse-wrapper:not(.is--enter) .vxe-menu--item-custom-title,.vxe-menu--collapse-wrapper:not(.is--enter) .vxe-menu--item-link-collapse,.vxe-menu--collapse-wrapper:not(.is--enter) .vxe-menu--item-link-title{display:none}.vxe-menu--collapse-wrapper.is--enter{width:var(--vxe-ui-layout-aside-default-width);box-shadow:var(--vxe-ui-menu-collapse-wrapper-box-shadow)}.vxe-menu--item-link{display:flex;flex-direction:row;align-items:center;margin:0 var(--vxe-ui-menu-current-item-padding);height:var(--vxe-ui-menu-current-item-height);color:var(--vxe-ui-font-color);border-radius:var(--vxe-ui-base-border-radius);text-decoration:none;cursor:pointer}.vxe-menu--item-link:hover{background-color:var(--vxe-ui-base-hover-background-color)}.vxe-menu--item-custom-title,.vxe-menu--item-link,.vxe-menu--item-link-title{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.vxe-menu--item-link-icon{flex-shrink:0;width:var(--vxe-ui-menu-icon-width);text-align:center}.vxe-menu--item-custom-title,.vxe-menu--item-link-title{flex-grow:1;padding-left:.2em}.vxe-menu--item-link-collapse{flex-shrink:0;padding:.5em;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.vxe-menu--item-link-collapse i{display:inline-block;font-size:.8em;transition:transform .25s ease-in-out}.vxe-menu--item-wrapper{margin:var(--vxe-ui-menu-current-margin) 0}.vxe-menu--item-wrapper:first-child{margin-top:0}.vxe-menu--item-wrapper:last-child{margin-bottom:0}.vxe-menu--item-wrapper.vxe-menu--item-level1>.vxe-menu--item-link{padding:0 var(--vxe-ui-layout-padding-double)}.vxe-menu--item-wrapper.vxe-menu--item-level1>.vxe-menu--item-link{padding:0 var(--vxe-ui-layout-padding-double) 0 calc(var(--vxe-ui-layout-padding-double) * 1)}.vxe-menu--item-wrapper.vxe-menu--item-level2>.vxe-menu--item-link{padding:0 var(--vxe-ui-layout-padding-double) 0 calc(var(--vxe-ui-layout-padding-double) * 2)}.vxe-menu--item-wrapper.vxe-menu--item-level3>.vxe-menu--item-link{padding:0 var(--vxe-ui-layout-padding-double) 0 calc(var(--vxe-ui-layout-padding-double) * 3)}.vxe-menu--item-wrapper.vxe-menu--item-level4>.vxe-menu--item-link{padding:0 var(--vxe-ui-layout-padding-double) 0 calc(var(--vxe-ui-layout-padding-double) * 4)}.vxe-menu--item-wrapper.vxe-menu--item-level5>.vxe-menu--item-link{padding:0 var(--vxe-ui-layout-padding-double) 0 calc(var(--vxe-ui-layout-padding-double) * 5)}.vxe-menu--item-wrapper.vxe-menu--item-level6>.vxe-menu--item-link{padding:0 var(--vxe-ui-layout-padding-double) 0 calc(var(--vxe-ui-layout-padding-double) * 6)}.vxe-menu--item-wrapper.vxe-menu--item-level7>.vxe-menu--item-link{padding:0 var(--vxe-ui-layout-padding-double) 0 calc(var(--vxe-ui-layout-padding-double) * 7)}.vxe-menu--item-group{height:0;overflow:hidden}.vxe-menu--item-group[data-effect]{transition:height .3s ease-in-out}.vxe-menu--item-wrapper.is--active>.vxe-menu--item-link{font-weight:700}.vxe-menu--item-wrapper.is--exact-active>.vxe-menu--item-link{color:var(--vxe-ui-font-primary-color);background-color:var(--vxe-ui-base-active-background-color)}.vxe-menu--item-wrapper.is--expand>.vxe-menu--item-group{height:auto}
+.vxe-menu,.vxe-menu--collapse-wrapper{--vxe-ui-menu-current-font-size:var(--vxe-ui-font-size-default);--vxe-ui-menu-current-item-height:var(--vxe-ui-menu-item-height-default);--vxe-ui-menu-current-item-padding:var(--vxe-ui-layout-padding-default);--vxe-ui-menu-current-margin:4px}.vxe-menu--collapse-wrapper.size--xlarge,.vxe-menu.size--xlarge{--vxe-ui-menu-current-font-size:var(--vxe-ui-font-size-xlarge);--vxe-ui-menu-current-item-height:var(--vxe-ui-menu-item-height-xlarge);--vxe-ui-menu-current-item-padding:var(--vxe-ui-layout-padding-xlarge)}.vxe-menu--collapse-wrapper.size--large,.vxe-menu.size--large{--vxe-ui-menu-current-font-size:var(--vxe-ui-font-size-large);--vxe-ui-menu-current-item-height:var(--vxe-ui-menu-item-height-large);--vxe-ui-menu-current-item-padding:var(--vxe-ui-layout-padding-large)}.vxe-menu--collapse-wrapper.size--medium,.vxe-menu.size--medium{--vxe-ui-menu-current-font-size:var(--vxe-ui-font-size-medium);--vxe-ui-menu-current-item-height:var(--vxe-ui-menu-item-height-medium);--vxe-ui-menu-current-item-padding:var(--vxe-ui-layout-padding-medium)}.vxe-menu--collapse-wrapper.size--small,.vxe-menu.size--small{--vxe-ui-menu-current-font-size:var(--vxe-ui-font-size-small);--vxe-ui-menu-current-item-height:var(--vxe-ui-menu-item-height-small);--vxe-ui-menu-current-item-padding:var(--vxe-ui-layout-padding-small)}.vxe-menu--collapse-wrapper.size--mini,.vxe-menu.size--mini{--vxe-ui-menu-current-font-size:var(--vxe-ui-font-size-mini);--vxe-ui-menu-current-item-height:var(--vxe-ui-menu-item-height-mini);--vxe-ui-menu-current-item-padding:var(--vxe-ui-layout-padding-mini)}.vxe-menu--collapse-wrapper.size--large,.vxe-menu--collapse-wrapper.size--xlarge,.vxe-menu.size--large,.vxe-menu.size--xlarge{--vxe-ui-menu-current-margin:6px}.vxe-menu--collapse-wrapper.size--mini,.vxe-menu--collapse-wrapper.size--small,.vxe-menu.size--mini,.vxe-menu.size--small{--vxe-ui-menu-current-margin:2px}.vxe-menu{position:relative}.vxe-menu.is--collapsed .vxe-menu--item-custom-title,.vxe-menu.is--collapsed .vxe-menu--item-link-collapse,.vxe-menu.is--collapsed .vxe-menu--item-link-title{display:none}.vxe-menu.is--loading{min-height:4em}.vxe-menu.border--first .vxe-menu--item-level1>.vxe-menu--item-link{border-bottom:1px solid var(--vxe-ui-menu-border-color)}.vxe-menu.border--first-group .vxe-menu--item-level1.has--child>.vxe-menu--item-link{border-bottom:1px solid var(--vxe-ui-menu-border-color)}.vxe-menu.border--group .vxe-menu--item-wrapper.has--child>.vxe-menu--item-link{border-bottom:1px solid var(--vxe-ui-menu-border-color)}.vxe-menu.border--all .vxe-menu--item-wrapper>.vxe-menu--item-link{border-bottom:1px solid var(--vxe-ui-menu-border-color)}.vxe-menu,.vxe-menu--collapse-wrapper{font-size:var(--vxe-ui-menu-current-font-size);color:var(--vxe-ui-font-color);font-family:var(--vxe-ui-font-family);background-color:var(--vxe-ui-layout-background-color)}.vxe-menu--collapse-wrapper{display:none;flex-direction:column;position:absolute;overflow:hidden;background-color:var(--vxe-ui-layout-background-color)}.vxe-menu--collapse-wrapper.is--collapsed{display:flex;transition:all .25s ease-in-out}.vxe-menu--collapse-wrapper:not(.is--enter){width:var(--vxe-ui-layout-aside-collapse-width)}.vxe-menu--collapse-wrapper:not(.is--enter) .vxe-menu--item-custom-title,.vxe-menu--collapse-wrapper:not(.is--enter) .vxe-menu--item-link-collapse,.vxe-menu--collapse-wrapper:not(.is--enter) .vxe-menu--item-link-title{display:none}.vxe-menu--collapse-wrapper.is--enter{width:var(--vxe-ui-layout-aside-default-width);box-shadow:var(--vxe-ui-menu-collapse-wrapper-box-shadow)}.vxe-menu--collapse-wrapper>.vxe-menu--footer,.vxe-menu--collapse-wrapper>.vxe-menu--header{flex-shrink:0}.vxe-menu--collapse-wrapper>.vxe-menu--body{flex-grow:1;overflow:hidden}.vxe-menu--item-link{display:flex;flex-direction:row;align-items:center;margin:0 var(--vxe-ui-menu-current-item-padding);height:var(--vxe-ui-menu-current-item-height);color:var(--vxe-ui-font-color);border-radius:var(--vxe-ui-base-border-radius);text-decoration:none;cursor:pointer}.vxe-menu--item-link:hover{background-color:var(--vxe-ui-base-hover-background-color)}.vxe-menu--item-custom-title,.vxe-menu--item-link,.vxe-menu--item-link-title{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.vxe-menu--item-link-icon{flex-shrink:0;width:var(--vxe-ui-menu-icon-width);text-align:center}.vxe-menu--item-custom-title,.vxe-menu--item-link-title{flex-grow:1;padding-left:.2em}.vxe-menu--item-link-collapse{flex-shrink:0;padding:.5em;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.vxe-menu--item-link-collapse i{display:inline-block;font-size:.8em;transition:transform .25s ease-in-out}.vxe-menu--item-wrapper{margin:var(--vxe-ui-menu-current-margin) 0}.vxe-menu--item-wrapper:first-child{margin-top:0}.vxe-menu--item-wrapper:last-child{margin-bottom:0}.vxe-menu--item-wrapper.vxe-menu--item-level1>.vxe-menu--item-link{padding:0 var(--vxe-ui-layout-padding-double)}.vxe-menu--item-wrapper.vxe-menu--item-level1>.vxe-menu--item-link{padding:0 var(--vxe-ui-layout-padding-double) 0 calc(var(--vxe-ui-layout-padding-double) * 1)}.vxe-menu--item-wrapper.vxe-menu--item-level2>.vxe-menu--item-link{padding:0 var(--vxe-ui-layout-padding-double) 0 calc(var(--vxe-ui-layout-padding-double) * 2)}.vxe-menu--item-wrapper.vxe-menu--item-level3>.vxe-menu--item-link{padding:0 var(--vxe-ui-layout-padding-double) 0 calc(var(--vxe-ui-layout-padding-double) * 3)}.vxe-menu--item-wrapper.vxe-menu--item-level4>.vxe-menu--item-link{padding:0 var(--vxe-ui-layout-padding-double) 0 calc(var(--vxe-ui-layout-padding-double) * 4)}.vxe-menu--item-wrapper.vxe-menu--item-level5>.vxe-menu--item-link{padding:0 var(--vxe-ui-layout-padding-double) 0 calc(var(--vxe-ui-layout-padding-double) * 5)}.vxe-menu--item-wrapper.vxe-menu--item-level6>.vxe-menu--item-link{padding:0 var(--vxe-ui-layout-padding-double) 0 calc(var(--vxe-ui-layout-padding-double) * 6)}.vxe-menu--item-wrapper.vxe-menu--item-level7>.vxe-menu--item-link{padding:0 var(--vxe-ui-layout-padding-double) 0 calc(var(--vxe-ui-layout-padding-double) * 7)}.vxe-menu--item-group{height:0;overflow:hidden}.vxe-menu--item-group[data-effect]{transition:height .3s ease-in-out}.vxe-menu--item-wrapper.is--active>.vxe-menu--item-link{font-weight:700}.vxe-menu--item-wrapper.is--exact-active>.vxe-menu--item-link{color:var(--vxe-ui-font-primary-color);background-color:var(--vxe-ui-base-active-background-color)}.vxe-menu--item-wrapper.is--expand>.vxe-menu--item-group{height:auto}

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;
@@ -65,11 +62,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 {
@@ -77,6 +79,7 @@
   right: 0;
   top: 0;
   width: var(--vxe-ui-scrollbar-y-width);
+  padding: 0 var(--vxe-ui-scrollbar-track-padding);
 }
 
 .vxe-scrollbar--thumb-y {
@@ -89,7 +92,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;-ms-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;-ms-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;
 }
@@ -102,14 +131,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;-ms-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;-ms-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": "3.18.23",
+  "version": "3.19.0",
   "description": "A vue based PC component library",
   "scripts": {
     "update": "npm install --legacy-peer-deps",

package/packages/calendar/src/calendar.ts

@@ -6,7 +6,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 type { VxeCalendarEmits, CalendarInternalData, CalendarReactData, ValueOf, VxeCalendarPropTypes, VxeComponentSizeType, VxeDatePanelDefines, VxeCalendarConstructor } from '../../../types'
 

package/packages/card/src/card.ts

@@ -4,7 +4,7 @@ import XEUtils from 'xe-utils'
 import { getConfig, createEvent, globalMixins, renderEmptyElement } from '../../ui'
 import { toCssUnit } from '../../ui/src/dom'
 import { getSlotVNs } from '../../ui/src/vn'
-import VxeLoadingComponent from '../../loading/src/loading'
+import VxeLoadingComponent from '../../loading'
 
 import type { CardReactData, VxeCardEmits, VxeCardPropTypes, ValueOf, VxeComponentSizeType } from '../../../types'
 

package/packages/carousel/src/carousel.ts

@@ -4,7 +4,7 @@ import XEUtils from 'xe-utils'
 import { getConfig, getIcon, createEvent, globalMixins, 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 type { CarouselReactData, VxeComponentSizeType, VxeCarouselPropTypes, CarouselInternalData, VxeCarouselEmits, VxeCarouselDefines, ValueOf } from '../../../types'
 

package/packages/countdown/src/countdown.ts

@@ -3,7 +3,7 @@ import { defineVxeComponent } from '../../ui/src/comp'
 import XEUtils from 'xe-utils'
 import { getConfig, getI18n, createEvent, globalMixins, renderEmptyElement } from '../../ui'
 import { getSlotVNs } from '../../ui/src/vn'
-import VxeTextComponent from '../../text/src/text'
+import VxeTextComponent from '../../text'
 
 import type { VxeCountdownPropTypes, CountdownReactData, CountdownInternalData, VxeCountdownEmits, VxeComponentSizeType, ValueOf } from '../../../types'
 

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

@@ -7,9 +7,9 @@ import { updatePanelPlacement, getEventTargetNode, getPopupAppendElement, toCssU
 import { parseDateString, parseDateObj, getRangeDateByCode, handleValueFormat, hasTimestampValueType, hasDateValueType, parseDateValue, getNextMonth, getPrevMonth, getNextYear, getPrevYear } from '../../date-panel/src/util'
 import { getSlotVNs } from '../../ui/src/vn'
 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 { VxeDateRangePickerConstructor, VxeDateRangePickerEmits, DateRangePickerReactData, DateRangePickerInternalData, VxeButtonGroupDefines, VxeComponentSizeType, VxeDateRangePickerPropTypes, VxeFormConstructor, VxeFormPrivateMethods, VxeFormDefines, ValueOf, VxeModalConstructor, VxeDrawerConstructor, VxeModalMethods, VxeDrawerMethods, VxeDateRangePickerDefines, 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, renderer, createEvent, globa
 import { getEventTargetNode, getPopupAppendElement, 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, IconPickerInternalData, ValueOf, IconPickerReactData, VxeInputConstructor, VxeComponentSizeType, VxeIconPickerEmits, 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 { PropType, CreateElement, VNode } from 'vue'
 import { defineVxeComponent } from '../../ui/src/comp'
 import { toCssUnit } from '../../ui/src/dom'
 import { getConfig, createEvent, globalMixins } from '../../ui'
-import VxeLoadingComponent from '../../loading'
 import XEUtils from 'xe-utils'
+import VxeScrollbarComponent from '../../scrollbar'
 
 import type { VxeLayoutAsidePropTypes, LayoutAsideReactData, VxeComponentSizeType, VxeLayoutAsideEmits, ValueOf, VxeComponentStyleType } from '../../../types'
 
@@ -19,6 +19,7 @@ export default /* define-vxe-component start */ 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
@@ -62,6 +63,12 @@ export default /* define-vxe-component start */ defineVxeComponent({
         stys['--vxe-ui-layout-aside-default-width'] = toCssUnit(width)
       }
       return stys
+    },
+    computeScrollbarOpts () {
+      const $xeLayoutAside = this
+      const props = $xeLayoutAside
+
+      return Object.assign({}, getConfig().layoutAside.scrollbarConfig, props.scrollbarConfig)
     }
   },
   methods: {
@@ -84,6 +91,8 @@ export default /* define-vxe-component start */ defineVxeComponent({
       const varStyle = $xeLayoutAside.computeVarStyle
       const vSize = $xeLayoutAside.computeSize
       const collapseOpts = $xeLayoutAside.computeCollapseOpts
+      const scrollbarOpts = $xeLayoutAside.computeScrollbarOpts
+      const { native, yConfig, className, viewAttrs, viewClassName, viewInnerClassName } = scrollbarOpts
       const defaultSlot = slots.default
 
       return h('aside', {
@@ -96,16 +105,23 @@ export default /* define-vxe-component start */ defineVxeComponent({
         }],
         style: varStyle
       }, [
-        h('div', {
-          class: 'vxe-layout-aside--inner'
-        }, defaultSlot ? defaultSlot({}) : []),
-        /**
-         * 加载中
-         */
-        h(VxeLoadingComponent, {
-          class: 'vxe-list-view--loading',
+        h(VxeScrollbarComponent, {
           props: {
-            value: loading
+            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) : '')
+          },
+          scopedSlots: {
+            default: () => {
+              return defaultSlot ? defaultSlot({}) : []
+            }
           }
         })
       ])

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

@@ -1,9 +1,9 @@
 import { PropType, CreateElement, VNode } from 'vue'
 import { defineVxeComponent } from '../../ui/src/comp'
 import { getConfig, createEvent, globalMixins, 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, VxeLayoutBodyEmits, VxeComponentSizeType, ValueOf } from '../../../types'
 
@@ -28,6 +28,7 @@ export default /* define-vxe-component start */ 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
@@ -58,6 +59,12 @@ export default /* define-vxe-component start */ defineVxeComponent({
       return Object.assign({}, getConfig().layoutBody.backtopConfig, props.backtopConfig, {
         target: '#' + backtopId
       })
+    },
+    computeScrollbarOpts () {
+      const $xeLayoutBody = this
+      const props = $xeLayoutBody
+
+      return Object.assign({}, getConfig().layoutBody.scrollbarConfig, props.scrollbarConfig)
     }
   },
   methods: {
@@ -79,6 +86,8 @@ export default /* define-vxe-component start */ defineVxeComponent({
 
       const { loading, padding, showBacktop } = props
       const backtopOpts = $xeLayoutBody.computeBacktopOpts
+      const scrollbarOpts = $xeLayoutBody.computeScrollbarOpts
+      const { native, xConfig, yConfig, className, viewAttrs, viewClassName, viewInnerClassName } = scrollbarOpts
       const vSize = $xeLayoutBody.computeSize
       const defaultSlot = slots.default
       const backtopSlot = slots.backtop
@@ -105,19 +114,22 @@ export default /* define-vxe-component start */ defineVxeComponent({
           'is--padding': padding
         }]
       }, [
-        h('div', {
-          attrs: {
-            id: showBacktop ? backtopId : ''
-          },
-          class: 'vxe-layout-body--inner'
-        }, defaultSlot ? defaultSlot({}) : []),
-        /**
-         * 加载中
-         */
-        h(VxeLoadingComponent, {
-          class: 'vxe-list-view--loading',
+        h(VxeScrollbarComponent, {
           props: {
-            value: loading
+            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) : '')
+          },
+          scopedSlots: {
+            default: () => defaultSlot ? defaultSlot({}) : []
           }
         }),
         /**

package/packages/list/src/list.ts

@@ -9,7 +9,7 @@ import { getSlotVNs } from '../../ui/src/vn'
 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 { VxeListPropTypes, VxeListEmits, VxeComponentSizeType, ListReactData, VxeListDefines, ValueOf, ListInternalData, VxeListConstructor, VxeListPrivateMethods, 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, MenuInternalData, MenuReactData, VxeMenuPropTypes, VxeLayoutAsideConstructor, VxeMenuEmits, VxeLayoutAsidePropTypes, VxeComponentPermissionInfo, VxeComponentSizeType, ValueOf } from '../../../types'
 
@@ -75,6 +76,7 @@ export default /* define-vxe-component start */ 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
@@ -137,6 +139,12 @@ export default /* define-vxe-component start */ defineVxeComponent({
       const propsOpts = $xeMenu.computePropsOpts as VxeMenuPropTypes.OptionProps
       return propsOpts.routerLink || 'routerLink'
     },
+    computeScrollbarOpts () {
+      const $xeMenu = this
+      const props = $xeMenu
+
+      return Object.assign({}, getConfig().menu.scrollbarConfig, props.scrollbarConfig)
+    },
     computeCurrBorder () {
       const $xeMenu = this
       const props = $xeMenu
@@ -773,6 +781,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
       const isCollapsed = $xeMenu.computeIsCollapsed
       const currBorder = $xeMenu.computeCurrBorder
       const varStyle = $xeMenu.computeVarStyle
+      const scrollbarOpts = $xeMenu.computeScrollbarOpts
       const headerSlot = slots.header
       const footerSlot = slots.footer
       let ons: Record<string, any> = {}
@@ -823,9 +832,13 @@ export default /* define-vxe-component start */ defineVxeComponent({
                     class: 'vxe-menu--header'
                   }, headerSlot(stParams))
                   : renderEmptyElement($xeMenu),
-                h('div', {
-                  class: 'vxe-menu--body'
-                }, menuList.map(child => $xeMenu.renderDefaultChildren(h, child, menuList))),
+                h(VxeScrollbarComponent, {
+                  class: 'vxe-menu--body',
+                  props: scrollbarOpts,
+                  scopedSlots: {
+                    default: () => menuList.map(child => $xeMenu.renderDefaultChildren(h, child, menuList))
+                  }
+                }),
                 footerSlot
                   ? h('div', {
                     class: 'vxe-menu--footer'
@@ -838,7 +851,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
          * 加载中
          */
         h(VxeLoadingComponent, {
-          class: 'vxe-list-view--loading',
+          class: 'vxe-menu-view--loading',
           props: {
             value: loading
           }