@@ -27,15 +27,7 @@ function sidebarScrollFix() {
27
27
"width" : "233px"
28
28
} ) ;
29
29
30
- //如果底部空间不够,动态增加侧边栏高度
31
30
var visibleOffsetTop = $ ( this ) . offset ( ) . top - $ ( window ) . scrollTop ( ) ;
32
- var offsetBottom = $ ( '.sidebar-menu' ) . height ( ) - visibleOffsetTop ;
33
- var requireVisibleHeight = $ ( this ) . height ( ) + $ ( this ) . children ( 'ul' ) . height ( ) ;
34
- if ( offsetBottom <= requireVisibleHeight ) {
35
- $ ( '.sidebar-menu' ) . css ( {
36
- "height" : ( requireVisibleHeight + $ ( window ) . height ( ) ) + "px"
37
- } )
38
- }
39
31
40
32
//调整一级菜单li下子列表的布局位置至右侧
41
33
var offsetTop = visibleOffsetTop + $ ( this ) . height ( ) ;
@@ -45,16 +37,11 @@ function sidebarScrollFix() {
45
37
46
38
//fix小尺寸屏幕下二级菜单高度高于窗口高度时显示不全的情况
47
39
var $activeList = $ ( this ) . children ( 'ul' ) ;
48
- var activeListOffsetBottom = Math . abs ( $ ( window ) . height ( ) - visibleOffsetTop - $ ( this ) . height ( ) ) ;
49
- var requireActiveListHeight = $activeList . height ( ) ;
50
- if ( activeListOffsetBottom < requireActiveListHeight ) {
51
- $activeList . css ( {
52
- "height" : requireActiveListHeight
53
- } ) ;
54
- //滚动条样式
55
- $activeList . addClass ( 'scroll-list' ) ;
56
- }
57
-
40
+ var maxHeight = Math . abs ( $ ( window ) . height ( ) - offsetTop ) ;
41
+ $activeList . css ( {
42
+ "max-height" : maxHeight
43
+ } ) ;
44
+ $activeList . addClass ( 'scroll-list' ) ;
58
45
} , function ( evt ) {
59
46
if ( ! $ ( 'body' ) . hasClass ( 'sidebar-collapse' ) ) {
60
47
return ;
@@ -63,7 +50,7 @@ function sidebarScrollFix() {
63
50
$ ( this ) . children ( 'ul' ) . removeClass ( 'scroll-list' ) ;
64
51
//恢复原来的高度
65
52
$ ( this ) . children ( 'ul' ) . css ( {
66
- "height" : "auto"
53
+ "max- height" : ''
67
54
} ) ;
68
55
} ) ;
69
56
$ ( '.main-sidebar' ) . on ( 'scroll' , function ( evt ) {
0 commit comments