diff --git a/ruoyi-ui/src/assets/styles/index.scss b/ruoyi-ui/src/assets/styles/index.scss index 19dc701e2..7b9f52ba1 100644 --- a/ruoyi-ui/src/assets/styles/index.scss +++ b/ruoyi-ui/src/assets/styles/index.scss @@ -254,8 +254,8 @@ li { } } -// .vue-treeselect__control { -// height: 34px !important; -// line-height: 34px; -// overflow: hidden; -// } \ No newline at end of file +.vue-treeselect__control { + height: 34px !important; + line-height: 34px; + overflow: hidden; +} \ No newline at end of file diff --git a/ruoyi-ui/src/layout/components/AppMain.vue b/ruoyi-ui/src/layout/components/AppMain.vue index b21a19ffa..0b88ff862 100644 --- a/ruoyi-ui/src/layout/components/AppMain.vue +++ b/ruoyi-ui/src/layout/components/AppMain.vue @@ -29,6 +29,7 @@ export default { width: 100%; position: relative; overflow: hidden; + overflow-y: auto; } .fixed-header+.app-main { @@ -38,7 +39,7 @@ export default { .hasTagsView { .app-main { /* 84 = navbar + tags-view = 50 + 34 */ - min-height: calc(100vh - 84px); + height: calc(100vh - 84px); } .fixed-header+.app-main { diff --git a/ruoyi-ui/src/views/index.vue b/ruoyi-ui/src/views/index.vue index 89954164f..6686ceedc 100644 --- a/ruoyi-ui/src/views/index.vue +++ b/ruoyi-ui/src/views/index.vue @@ -1,7 +1,7 @@