From a5893c605ac08ac635fd3aae2b66142ec53ca9bc Mon Sep 17 00:00:00 2001
From: vip <testby@163.com>
Date: Fri, 7 Aug 2020 11:00:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/manager/cms/content/form.ftl   | 5 +++++
 src/main/webapp/WEB-INF/manager/cms/content/index.ftl  | 2 +-
 src/main/webapp/WEB-INF/manager/cms/generate/index.ftl | 9 +++++++--
 3 files changed, 13 insertions(+), 3 deletions(-)

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 891dde7b..935abb5a 100644
--- a/src/main/webapp/WEB-INF/manager/cms/content/form.ftl
+++ b/src/main/webapp/WEB-INF/manager/cms/content/form.ftl
@@ -13,6 +13,9 @@
         </el-button>
     </el-header>
     <el-main class="ms-container">
+
+        <el-scrollbar style="height: 100%;">
+
         <el-tabs v-model="activeName" style="height: calc(100% - 10px);">
             <el-tab-pane v-for="(item, index) in editableTabs"
                          :key="index"
@@ -240,6 +243,8 @@
         </el-scrollbar>
             </el-tab-pane>
         </el-tabs>
+
+        </el-scrollbar>
     </el-main>
 </div>
 </body>
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 ca91a893..a786f69d 100644
--- a/src/main/webapp/WEB-INF/manager/cms/content/index.ftl
+++ b/src/main/webapp/WEB-INF/manager/cms/content/index.ftl
@@ -10,7 +10,7 @@
 	<!--左侧-->
 	<el-container class="index-menu">
 		<div class="left-tree">
-			<el-scrollbar style="height: 100vh;">
+			<el-scrollbar style="height: 100%;">
 				<el-tree :indent="5" v-loading="loading" highlight-current :expand-on-click-node="false" default-expand-all :empty-text="emptyText" :data="treeData" :props="defaultProps" @node-click="handleNodeClick" style="padding: 10px;height: 100%;"></el-tree>
 			</el-scrollbar>
 		</div>
diff --git a/src/main/webapp/WEB-INF/manager/cms/generate/index.ftl b/src/main/webapp/WEB-INF/manager/cms/generate/index.ftl
index 011e7680..8ee4e3d8 100644
--- a/src/main/webapp/WEB-INF/manager/cms/generate/index.ftl
+++ b/src/main/webapp/WEB-INF/manager/cms/generate/index.ftl
@@ -16,7 +16,6 @@
                   type="success"
                   :closable="false"
                   show-icon>
-            更新主页，如果系统存在引导页面可以手动修改主页位置文件名,default.html引导页面index.html主页。<br/>
             更新栏目列表，推荐使用指定栏目更新。系统提示“更新中”请不要刷新页面或点击其他菜单。<br/>
             根据时间与栏目类型生成文章
         </el-alert>
@@ -25,7 +24,13 @@
         <div class="class-2" >
             <div class="class-3" >
                 <div class="class-4" >
-                    <el-form-item  label="主题模板">
+                    <el-form-item >
+                        <template slot='label'>主题模板
+                            <el-popover slot="label" placement="top-start" title="提示" width="200" trigger="hover" content="更新主页，如果系统存在引导页面可以手动修改主页位置文件名,default.html引导页面index.html主页。">
+                                <i class="el-icon-question" slot="reference"></i>
+                            </el-popover>
+                        </template>
+
                         <el-select v-model="template"
                                    :filterable="true"
                                    :clearable="false"