@lambo-design/pro-layout 1.0.0-beta.3 → 1.0.0-beta.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@lambo-design/pro-layout",
3
- "version": "1.0.0-beta.3",
3
+ "version": "1.0.0-beta.5",
4
4
  "description": "",
5
5
  "main": "index.js",
6
6
  "scripts": {
@@ -205,6 +205,9 @@ export default {
205
205
  <style scoped lang="less">
206
206
  @import "@lambo-design/core/src/styles/default";
207
207
  .pro-layout-sider{
208
+ overflow-y: scroll;
209
+ overflow-x: hidden;
210
+ margin-right: -18px;
208
211
  /deep/.ivu-menu-submenu{
209
212
  .ivu-menu{
210
213
  background: #1A1A1A;
package/src/index.vue CHANGED
@@ -5,6 +5,7 @@
5
5
  </i-header>
6
6
  <i-layout>
7
7
  <i-sider
8
+ class="pro-layout-sider"
8
9
  hide-trigger
9
10
  collapsible
10
11
  :width="256"
@@ -13,7 +14,7 @@
13
14
  <LamboProLayoutSider ref="sider"></LamboProLayoutSider>
14
15
  </i-sider>
15
16
  <i-content class="pro-layout-content">
16
- <i-layout>
17
+ <i-layout class="pro-layout-content-layout">
17
18
  <div class="pro-layout-tabs">
18
19
  <LamboProLayoutTabs></LamboProLayoutTabs>
19
20
  </div>
@@ -198,10 +199,23 @@ export default {
198
199
  <style scoped lang="less">
199
200
  .pro-layout{
200
201
  color: #ffffff;
201
- min-width: 1100px;
202
- min-height: 600px;
202
+ height: 100%;
203
+ width: 100vh;
204
+ overflow: hidden;
203
205
  .ivu-layout-header{
204
206
  padding: 0;
205
207
  }
208
+ .pro-layout-sider{
209
+ overflow: hidden;
210
+ }
211
+ .pro-layout-content{
212
+ .pro-layout-content-layout{
213
+ height: ~"calc(100% - 65px)";
214
+ .pro-layout-page{
215
+ height: ~"calc(100% - 115px)";
216
+ overflow: auto;
217
+ }
218
+ }
219
+ }
206
220
  }
207
221
  </style>