From 075a858fc60bac516120267e47e78f28f7dd7f04 Mon Sep 17 00:00:00 2001
From: cgd_mac <349008059@qq.com>
Date: Fri, 7 Jan 2022 22:55:13 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20uI=20=E5=85=A8=E5=B1=80=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/config/defaultSettings.js |  6 +++---
 src/layouts/BasicLayout.less  | 14 ++++++++++----
 src/layouts/BasicLayout.vue   |  4 ++--
 3 files changed, 15 insertions(+), 9 deletions(-)

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 @@
     <template v-slot:rightContentRender>
       <right-content :top-menu="settings.layout === 'topmenu'" :is-mobile="isMobile" :theme="settings.theme" />
     </template>
-    <template v-slot:footerRender>
+    <!-- <template v-slot:footerRender>
       <global-footer />
-    </template>
+    </template> -->
     <router-view />
   </pro-layout>
 </template>