From 72f7732a4f48e949481e263a81796d7f1e58c4e3 Mon Sep 17 00:00:00 2001
From: zhongyh <1599558112>
Date: Sat, 28 Dec 2019 18:20:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WEB-INF/manager/cms/category/form.ftl     | 51 +++++++++++++++++--
 .../WEB-INF/manager/cms/category/index.ftl    | 33 +++++++++++-
 .../WEB-INF/manager/cms/content/form.ftl      | 48 ++++++++++++++++-
 .../WEB-INF/manager/cms/content/main.ftl      | 40 ++++++++++++++-
 4 files changed, 163 insertions(+), 9 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 bd487b7b..b6971d12 100644
--- a/src/main/webapp/WEB-INF/manager/cms/category/form.ftl
+++ b/src/main/webapp/WEB-INF/manager/cms/category/form.ftl
@@ -12,12 +12,19 @@
 		</el-header>
 		<el-main class="ms-container">
             <el-scrollbar class="ms-scrollbar" style="height: 100%;">
-                <el-form ref="form" :model="form" :rules="rules" label-width="120px" size="mini">
+                <el-form ref="form" :model="form" :rules="rules" label-width="130px" size="mini">
                         <el-row
                                 gutter="0"
                                 justify="start" align="top">
                                 <el-col span="12">
             <el-form-item  label="栏目管理名称" prop="categoryTitle">
+                <template slot='label'>栏目管理名称
+                <el-popover slot="label" placement="top-start" title="提示" trigger="hover" >
+                    <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/nei-rong-biao-qian-ms-field.html" target="_blank">{field.typetitle/}</a>
+                    <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/lan-mu-lie-biao-ms-channel.html" target="_blank">[field.typetitle/]</a>
+                    <i class="el-icon-question" slot="reference"></i>
+                </el-popover>
+                </template>
                 <el-input v-model="form.categoryTitle"
                           :disabled="false"
                           :style="{width:  '100%'}"
@@ -28,7 +35,7 @@
                                 </el-col>
                                 <el-col span="12">
             <el-form-item  label="所属栏目" prop="categoryId">
-            <tree-select :props="{value: 'id',label: 'categoryTitle',children: 'children'}"
+            <tree-select ref="tree" :props="{value: 'id',label: 'categoryTitle',children: 'children'}"
                          :options="treeList" :style="{width:'100%'}"
                          v-model="form.categoryId"></tree-select>
             </el-form-item>
@@ -123,6 +130,13 @@
                         </el-col>
                     </el-row>
             <el-form-item  label="栏目管理关键字" prop="categoryKeyword">
+                <template slot='label'>栏目关键字
+                    <el-popover slot="label" placement="top-start" title="提示" trigger="hover" >
+                        <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/nei-rong-biao-qian-ms-field.html" target="_blank">{field.typekeyword/}</a>
+                        <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/lan-mu-lie-biao-ms-channel.html" target="_blank">[field.typekeyword/]</a>
+                        <i class="el-icon-question" slot="reference"></i>
+                    </el-popover>
+                </template>
                 <el-input
                         type="textarea" :rows="5"
                         :disabled="false"
@@ -133,6 +147,13 @@
                 </el-input>
             </el-form-item>
             <el-form-item  label="栏目管理描述" prop="categoryDescrip">
+                <template slot='label'>栏目描述
+                    <el-popover slot="label" placement="top-start" title="提示" trigger="hover" >
+                        <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/nei-rong-biao-qian-ms-field.html" target="_blank">{field.typedescrip/}</a>
+                        <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/lan-mu-lie-biao-ms-channel.html" target="_blank">[field.typedescrip/]</a>
+                        <i class="el-icon-question" slot="reference"></i>
+                    </el-popover>
+                </template>
                 <el-input
                         type="textarea" :rows="5"
                         :disabled="false"
@@ -166,7 +187,6 @@
             </el-form-item>
             <el-form-item  label="自定义链接" prop="categoryDiyUrl">
                 <el-input
-                        type="textarea" :rows="5"
                         :disabled="false"
 
                         v-model="form.categoryDiyUrl"
@@ -190,6 +210,7 @@
                     categoryTitle:'顶级栏目',
                     children:[],
                 }],
+                categoryList:[],
                 saveDisabled: false,
                 categoryTypeDisabled:true,
                 //表单数据
@@ -229,6 +250,29 @@
             }
         },
         watch:{
+            'form.categoryId':function (n, o) {
+                if(n == this.form.id){
+                    this.$notify({
+                        title: '提示',
+                        message: '所属栏目不能为自身',
+                        type: 'error'
+                    });
+                    return;
+                }
+                this.categoryList.forEach(item=>{
+                   if(item.categoryParentId !=null && item.categoryParentId !="" && item.categoryParentId.indexOf(this.form.id) != -1){
+                       if(item.id == n){
+                           this.form.categoryId = null;
+                           this.$refs.tree.clearHandle();
+                           this.$notify({
+                               title: '提示',
+                               message: '不能选择子分类',
+                               type: 'warning'
+                           });
+                       }
+                   }
+                });
+            }
         },
         computed:{
         },
@@ -238,6 +282,7 @@
                 ms.http.get(ms.manager+"/cms/category/list.do",{pageSize:9999}).then(function(res){
                     if(res.result){
                         //res.data.rows.push({id:0,categoryId: null,categoryTitle:'顶级栏目管理'});
+                        that.categoryList = res.data.rows;
                         that.treeList[0].children = ms.util.treeData(res.data.rows,'id','categoryId','children');
                     }
                 }).catch(function(err){
diff --git a/src/main/webapp/WEB-INF/manager/cms/category/index.ftl b/src/main/webapp/WEB-INF/manager/cms/category/index.ftl
index ee225e9a..501039bc 100644
--- a/src/main/webapp/WEB-INF/manager/cms/category/index.ftl
+++ b/src/main/webapp/WEB-INF/manager/cms/category/index.ftl
@@ -31,12 +31,41 @@
 					{{emptyText}}
 				</template>
 				<el-table-column type="selection" width="40"></el-table-column>
-				<el-table-column label="编号" width="80" prop="id"></el-table-column>
+				<el-table-column label="编号" width="120" prop="id">
+					<template slot='header'>编号
+						<el-popover placement="top-start" title="提示" trigger="hover" >
+							<a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/nei-rong-biao-qian-ms-field.html" target="_blank">{field.typeid/}</a>
+							<a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/lan-mu-lie-biao-ms-channel.html" target="_blank">[field.typeid/]</a>
+							<i class="el-icon-question" slot="reference"></i>
+						</el-popover>
+					</template>
+				</el-table-column>
                  <el-table-column label="标题" align="left" prop="categoryTitle">
+					 <template slot='header'>标题
+						 <el-popover placement="top-start" title="提示" trigger="hover" >
+							 <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/nei-rong-biao-qian-ms-field.html" target="_blank">{field.typetitle/}</a>
+							 <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/lan-mu-lie-biao-ms-channel.html" target="_blank">[field.typetitle/]</a>
+							 <i class="el-icon-question" slot="reference"></i>
+						 </el-popover>
+					 </template>
                  </el-table-column>
-            <el-table-column label="属性" align="center" prop="categoryType" :formatter="categoryTypeFormat" width="65">
+            <el-table-column label="属性" align="center" prop="categoryType" :formatter="categoryTypeFormat" width="70">
+				<template slot='header'>属性
+					<el-popover placement="top-start" title="提示" trigger="hover" >
+						<a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/nei-rong-biao-qian-ms-field.html" target="_blank">{field.flag/}</a>
+						<a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/lan-mu-lie-biao-ms-channel.html" target="_blank">[field.flag/]</a>
+						<i class="el-icon-question" slot="reference"></i>
+					</el-popover>
+				</template>
             </el-table-column>
                 <el-table-column label="链接地址" align="left" prop="categoryPath" show-overflow-tooltip>
+					<template slot='header'>链接地址
+						<el-popover placement="top-start" title="提示" trigger="hover" >
+							<a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/nei-rong-biao-qian-ms-field.html" target="_blank">{field.typelink/}</a>
+							<a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/lan-mu-lie-biao-ms-channel.html" target="_blank">[field.typelink/]</a>
+							<i class="el-icon-question" slot="reference"></i>
+						</el-popover>
+					</template>
 					<template slot-scope="scope">
 						<span style="cursor: pointer" class="copyBtn" :data-clipboard-text="'{ms:global.url/}'+scope.row.categoryPath+'/index.html'" @click="copyUrl">{{"{ms:global.url/}"+scope.row.categoryPath+"/index.html"}}</span>
 					</template>
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 cad44af1..5a73a6c7 100644
--- a/src/main/webapp/WEB-INF/manager/cms/content/form.ftl
+++ b/src/main/webapp/WEB-INF/manager/cms/content/form.ftl
@@ -25,6 +25,13 @@
                         justify="start" align="top">
                     <el-col :span="returnIsShow?'12':'24'">
                         <el-form-item label="文章标题" prop="contentTitle">
+                            <template slot='label'>文章标题
+                                <el-popover placement="top-start" title="提示" trigger="hover" >
+                                    <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/nei-rong-biao-qian-ms-field.html" target="_blank">{field.title/}</a>
+                                    <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/wen-zhang-lie-biao-ms-arclist.html" target="_blank">[field.title/]</a>
+                                    <i class="el-icon-question" slot="reference"></i>
+                                </el-popover>
+                            </template>
                             <el-input v-model="form.contentTitle"
                                       :disabled="false"
                                       :style="{width:  '100%'}"
@@ -35,6 +42,13 @@
                     </el-col>
                     <el-col span="12" v-if="returnIsShow">
                         <el-form-item label="所属栏目" prop="contentCategoryId">
+                            <template slot='label'>所属栏目
+                                <el-popover placement="top-start" title="提示" trigger="hover" >
+                                    <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/nei-rong-biao-qian-ms-field.html" target="_blank">{field.typeid/}</a>
+                                    <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/wen-zhang-lie-biao-ms-arclist.html" target="_blank">[field.typeid/]</a>
+                                    <i class="el-icon-question" slot="reference"></i>
+                                </el-popover>
+                            </template>
                             <tree-select :props="{value: 'id',label: 'categoryTitle',children: 'children'}"
                                          :options="contentCategoryIdOptions" :style="{width:'100%'}"
                                          @change="categoryChange"
@@ -83,6 +97,13 @@
                         justify="start" align="top">
                     <el-col span="12">
                         <el-form-item label="文章作者" prop="contentAuthor">
+                            <template slot='label'>文章作者
+                                <el-popover placement="top-start" title="提示" trigger="hover" >
+                                    <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/nei-rong-biao-qian-ms-field.html" target="_blank">{field.author/}</a>
+                                    <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/wen-zhang-lie-biao-ms-arclist.html" target="_blank">[field.author/]</a>
+                                    <i class="el-icon-question" slot="reference"></i>
+                                </el-popover>
+                            </template>
                             <el-input v-model="form.contentAuthor"
                                       :disabled="false"
                                       :style="{width:  '100%'}"
@@ -93,6 +114,13 @@
                     </el-col>
                     <el-col span="12">
                         <el-form-item label="文章来源" prop="contentSource">
+                            <template slot='label'>文章来源
+                                <el-popover placement="top-start" title="提示" trigger="hover" >
+                                    <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/nei-rong-biao-qian-ms-field.html" target="_blank">{field.source/}</a>
+                                    <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/wen-zhang-lie-biao-ms-arclist.html" target="_blank">[field.source/]</a>
+                                    <i class="el-icon-question" slot="reference"></i>
+                                </el-popover>
+                            </template>
                             <el-input v-model="form.contentSource"
                                       :disabled="false"
                                       :style="{width:  '100%'}"
@@ -135,8 +163,10 @@
                 </el-row>
                 <el-form-item label="" prop="contentImg">
                     <template slot='label'>文章缩略图
-                        <el-popover slot="label" placement="top-start" title="提示" width="200" trigger="hover"
-                                    content="文章缩略图,支持jpg格式">
+                        <el-popover placement="top-start" title="提示" trigger="hover" >
+                            文章缩略图,支持jpg格式
+                            <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/nei-rong-biao-qian-ms-field.html" target="_blank">{field.litpic/}</a>
+                            <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/wen-zhang-lie-biao-ms-arclist.html" target="_blank">[field.litpic/]</a>
                             <i class="el-icon-question" slot="reference"></i>
                         </el-popover>
                     </template>
@@ -167,6 +197,13 @@
                     </el-input>
                 </el-form-item>
                 <el-form-item label="关键字" prop="contentKeyword">
+                    <template slot='label'>关键字
+                        <el-popover placement="top-start" title="提示" trigger="hover" >
+                            <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/nei-rong-biao-qian-ms-field.html" target="_blank">{field.keyword/}</a>
+                            <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/wen-zhang-lie-biao-ms-arclist.html" target="_blank">[field.keyword/]</a>
+                            <i class="el-icon-question" slot="reference"></i>
+                        </el-popover>
+                    </template>
                     <el-input
                             type="textarea" :rows="5"
                             :disabled="false"
@@ -177,6 +214,13 @@
                     </el-input>
                 </el-form-item>
                 <el-form-item label="文章内容" prop="contentDetails">
+                    <template slot='label'>文章内容
+                        <el-popover placement="top-start" title="提示" trigger="hover" >
+                            <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/nei-rong-biao-qian-ms-field.html" target="_blank">{field.content/}</a>
+                            <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/wen-zhang-lie-biao-ms-arclist.html" target="_blank">[field.content/]</a>
+                            <i class="el-icon-question" slot="reference"></i>
+                        </el-popover>
+                    </template>
                     <vue-ueditor-wrap style="line-height: 0px" v-model="form.contentDetails"
                                       :config="editorConfig"></vue-ueditor-wrap>
                 </el-form-item>
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 d493766b..f847815e 100644
--- a/src/main/webapp/WEB-INF/manager/cms/content/main.ftl
+++ b/src/main/webapp/WEB-INF/manager/cms/content/main.ftl
@@ -60,16 +60,52 @@
                 {{emptyText}}
             </template>
             <el-table-column type="selection" width="40"></el-table-column>
-            <el-table-column label="编号" width="60" prop="id"></el-table-column>
+            <el-table-column label="编号" width="70" prop="id">
+                <template slot='header'>编号
+                    <el-popover placement="top-start" title="提示" trigger="hover" >
+                        <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/nei-rong-biao-qian-ms-field.html" target="_blank">{field.id/}</a>
+                        <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/wen-zhang-lie-biao-ms-arclist.html" target="_blank">[field.id/]</a>
+                        <i class="el-icon-question" slot="reference"></i>
+                    </el-popover>
+                </template>
+            </el-table-column>
             <el-table-column label="栏目名" align="left" prop="contentCategoryId" :formatter="contentCategoryIdFormat" width="100">
+                <template slot='header'>栏目名
+                    <el-popover placement="top-start" title="提示" trigger="hover" >
+                        <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/nei-rong-biao-qian-ms-field.html" target="_blank">{field.typename/}</a>
+                        <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/wen-zhang-lie-biao-ms-arclist.html" target="_blank">[field.typename/]</a>
+                        <i class="el-icon-question" slot="reference"></i>
+                    </el-popover>
+                </template>
             </el-table-column>
             <el-table-column label="文章标题" align="left" prop="contentTitle" show-overflow-tooltip>
+                <template slot='header'>文章标题
+                    <el-popover placement="top-start" title="提示" trigger="hover" >
+                        <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/nei-rong-biao-qian-ms-field.html" target="_blank">{field.title/}</a>
+                        <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/wen-zhang-lie-biao-ms-arclist.html" target="_blank">[field.title/]</a>
+                        <i class="el-icon-question" slot="reference"></i>
+                    </el-popover>
+                </template>
             </el-table-column>
             <el-table-column label="作者" align="left" prop="contentAuthor" width="100" show-overflow-tooltip>
+                <template slot='header'>作者
+                    <el-popover placement="top-start" title="提示" trigger="hover" >
+                        <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/nei-rong-biao-qian-ms-field.html" target="_blank">{field.author/}</a>
+                        <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/wen-zhang-lie-biao-ms-arclist.html" target="_blank">[field.author/]</a>
+                        <i class="el-icon-question" slot="reference"></i>
+                    </el-popover>
+                </template>
             </el-table-column>
             <el-table-column label="排序" width="55" align="right" prop="contentSort">
             </el-table-column>
-            <el-table-column label="点击" width="55" align="right" prop="contentHit">
+            <el-table-column label="点击量" width="90" align="right" prop="contentHit">
+                <template slot='header'>点击量
+                    <el-popover placement="top-start" title="提示" trigger="hover" >
+                        <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/nei-rong-biao-qian-ms-field.html" target="_blank">{field.hit/}</a>
+                        <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/wen-zhang-lie-biao-ms-arclist.html" target="_blank">[field.hit/]</a>
+                        <i class="el-icon-question" slot="reference"></i>
+                    </el-popover>
+                </template>
                 <template slot-scope="scope">
                     {{scope.row.contentHit?scope.row.contentHit:0}}
                 </template>