From a96859d7330de1582bb824738cb99ac9ef359074 Mon Sep 17 00:00:00 2001
From: tianbj <1309855586@qq.com>
Date: Fri, 29 Nov 2019 17:15:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=BB=9A=E5=8A=A8=E6=9D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/manager/cms/category/form.ftl |  4 +++-
 src/main/webapp/WEB-INF/manager/cms/content/form.ftl  | 10 +++++++++-
 src/main/webapp/WEB-INF/manager/cms/content/index.ftl |  3 +++
 src/main/webapp/WEB-INF/manager/cms/content/main.ftl  |  3 +++
 src/main/webapp/static/ms-admin/4.7.2/css/app.css     |  9 +++++++++
 5 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/src/main/webapp/WEB-INF/manager/cms/category/form.ftl b/src/main/webapp/WEB-INF/manager/cms/category/form.ftl
index cc2ea931..b82d7376 100644
--- a/src/main/webapp/WEB-INF/manager/cms/category/form.ftl
+++ b/src/main/webapp/WEB-INF/manager/cms/category/form.ftl
@@ -11,7 +11,8 @@
 			<el-button size="mini" icon="iconfont icon-fanhui" plain onclick="javascript:history.go(-1)">返回</el-button>
 		</el-header>
 		<el-main class="ms-container">
-            <el-form ref="form" :model="form" :rules="rules" label-width="120px" size="mini">
+            <el-scrollbar class="ms-scrollbar" style="height: 100%;">
+                <el-form ref="form" :model="form" :rules="rules" label-width="120px" size="mini">
                         <el-row
                                 gutter="0"
                                 justify="start" align="top">
@@ -152,6 +153,7 @@
                     </el-select>
             </el-form-item>
             </el-form>
+            </el-scrollbar>
 		</el-main>
 	</div>
 	</body>
diff --git a/src/main/webapp/WEB-INF/manager/cms/content/form.ftl b/src/main/webapp/WEB-INF/manager/cms/content/form.ftl
index 81a86520..c341b1e2 100644
--- a/src/main/webapp/WEB-INF/manager/cms/content/form.ftl
+++ b/src/main/webapp/WEB-INF/manager/cms/content/form.ftl
@@ -11,7 +11,8 @@
 			<el-button size="mini" icon="iconfont icon-fanhui" plain onclick="javascript:history.go(-1)" v-if="returnIsShow">返回</el-button>
 		</el-header>
 		<el-main class="ms-container">
-            <el-form ref="form" :model="form" :rules="rules" label-width="120px" size="mini">
+            <el-scrollbar class="ms-scrollbar" style="height: 100%;">
+                <el-form ref="form" :model="form" :rules="rules" label-width="120px" size="mini">
                         <el-row
                                 gutter="0"
                                 justify="start" align="top">
@@ -168,6 +169,7 @@
             <vue-ueditor-wrap style="line-height: 0px" v-model="form.contentDetails" :config="editorConfig"></vue-ueditor-wrap>
             </el-form-item>
             </el-form>
+            </el-scrollbar>
 		</el-main>
 	</div>
 	</body>
@@ -382,4 +384,10 @@
     .el-select{
         width: 100%;
     }
+    body{
+        overflow: hidden;
+    }
+    #form{
+        overflow: hidden;
+    }
 </style>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/manager/cms/content/index.ftl b/src/main/webapp/WEB-INF/manager/cms/content/index.ftl
index 0de0339d..779d734a 100644
--- a/src/main/webapp/WEB-INF/manager/cms/content/index.ftl
+++ b/src/main/webapp/WEB-INF/manager/cms/content/index.ftl
@@ -114,4 +114,7 @@
 		height: 40px !important;
 		line-height: 46px !important;
 	}
+	body{
+		overflow: hidden;
+	}
 </style>
diff --git a/src/main/webapp/WEB-INF/manager/cms/content/main.ftl b/src/main/webapp/WEB-INF/manager/cms/content/main.ftl
index ba2d664e..0a61ebdb 100644
--- a/src/main/webapp/WEB-INF/manager/cms/content/main.ftl
+++ b/src/main/webapp/WEB-INF/manager/cms/content/main.ftl
@@ -334,4 +334,7 @@
     #main .ms-container {
         height: calc(100vh - 141px);
     }
+    body{
+        overflow: hidden;
+    }
 </style>
\ No newline at end of file
diff --git a/src/main/webapp/static/ms-admin/4.7.2/css/app.css b/src/main/webapp/static/ms-admin/4.7.2/css/app.css
index 82938dc9..a24fbb3a 100644
--- a/src/main/webapp/static/ms-admin/4.7.2/css/app.css
+++ b/src/main/webapp/static/ms-admin/4.7.2/css/app.css
@@ -118,4 +118,13 @@ a:link,a:visited,a:active{text-decoration: none; color:#409EFF;}
 .el-table__body-wrapper::-webkit-scrollbar-thumb {
     border-radius: 10px;
     background-color: rgba(144,147,153,.5);
+}
+.ms-scrollbar .el-scrollbar__wrap{
+    overflow-x: hidden;
+}
+.ms-scrollbar .el-scrollbar__bar.is-vertical{
+    width: 6px !important;
+}
+.ms-scrollbar .el-scrollbar__view{
+    padding-right: 17px;
 }
\ No newline at end of file