diff --git a/src/config/defaultSettings.js b/src/config/defaultSettings.js index c06d675..0d25468 100644 --- a/src/config/defaultSettings.js +++ b/src/config/defaultSettings.js @@ -16,9 +16,9 @@ export default { primaryColor: '#1890ff', // primary color of ant design layout: 'sidemenu', // nav menu position: `sidemenu` or `topmenu` contentWidth: 'Fluid', // layout of content: `Fluid` or `Fixed`, only works when layout is topmenu - fixedHeader: false, // sticky header - fixSiderbar: false, // sticky siderbar - colorWeak: false, + fixedHeader: true, // sticky header + fixSiderbar: true, // sticky siderbar + colorWeak: true, menu: { locale: true }, diff --git a/src/layouts/BasicLayout.less b/src/layouts/BasicLayout.less index 371f01a..63c7daf 100644 --- a/src/layouts/BasicLayout.less +++ b/src/layouts/BasicLayout.less @@ -35,8 +35,14 @@ } .ant-layout-sider { - flex: 0 0 230px !important; - max-width: 230px !important; - min-width: 230px !important; - width: 230px !important; + flex: 0 0 230px; + max-width: 230px; + min-width: 230px; + width: 230px; +} + +.ant-pro-basicLayout-content{ + height: calc(100vh - 95px) !important; + overflow-x: hidden; + overflow-y: auto; } diff --git a/src/layouts/BasicLayout.vue b/src/layouts/BasicLayout.vue index 5b6cce9..cee1943 100644 --- a/src/layouts/BasicLayout.vue +++ b/src/layouts/BasicLayout.vue @@ -14,9 +14,9 @@ -