up: 5.3.2

src/main/webapp/WEB-INF/manager/cms/content/form.ftl

@@ -48,9 +48,10 @@
                                     </div>
                                 </el-form-item>
                             </el-col>
-                            <el-col span="12" v-if="returnIsShow">
+                            <el-col span="12" >
-                                <el-form-item label="所属栏目" prop="categoryId">
+                                <el-form-item label="所属栏目" prop="categoryId" >
                                     <treeselect v-model="form.categoryId"
+                                                :disabled="!returnIsShow"
                                                 :disable-branch-nodes="true"
                                                 :normalizer="node=>{
                                                 return {
@@ -60,29 +61,18 @@
                                                 }}"
                                                 @change="categoryChange"
                                                 :options="contentCategoryIdOptions" placeholder="请选择"></treeselect>
+
                                     <div class="ms-form-tip">
                                         标签：<a href="http://doc.mingsoft.net/mcms/biao-qian/wen-zhang-lie-biao-ms-arclist.html" target="_blank">${'$'}{field.typetitle}</a>
                                         不能选择封面、链接栏目类型，不能选择父栏目
                                     </div>
                                 </el-form-item>
-                            </el-col>
+
-                            <el-col :span="12" v-else>
-                                <el-form-item label="文章副标题" prop="contentShortTitle">
-                                    <el-input v-model="form.contentShortTitle"
-                                              :disabled="false"
-                                              :style="{width:  '100%'}"
-                                              :clearable="true"
-                                              placeholder="请输入文章副标题">
-                                    </el-input>
-                                    <div class="ms-form-tip">
-                                        标签：<a href="http://doc.mingsoft.net/mcms/biao-qian/wen-zhang-lie-biao-ms-arclist.html" target="_blank">${'$'}{field.shorttitle}</a>
-                                    </div>
-                                </el-form-item>
                             </el-col>
                         </el-row>
                         <el-row
                                 gutter="0"
-                                justify="start" align="top" v-if="returnIsShow">
+                                justify="start" align="top">
                             <el-col :span="12">
                                 <el-form-item label="文章副标题" prop="contentShortTitle">
                                     <el-input v-model="form.contentShortTitle"
@@ -127,7 +117,7 @@
                                                    :label="item.dictLabel"></el-option>
                                     </el-select>
                                     <div class="ms-form-tip">
-                                       标签：<a href="http://doc.mingsoft.net/mcms/biao-qian/wen-zhang-lie-biao-ms-arclist.html" target="_blank">${'$'}{flag}</a>
+                                        标签：<a href="http://doc.mingsoft.net/mcms/biao-qian/wen-zhang-lie-biao-ms-arclist.html" target="_blank">${'$'}{flag}</a>
                                         通过自定义字典可扩展，通常用在 arclist标签的flag属性上进行过滤文章
                                     </div>
                                 </el-form-item>
@@ -154,43 +144,6 @@
                                 </el-form-item>
                             </el-col>
                         </el-row>
-                        <el-row
-                                gutter="0"
-                                justify="start" align="top">
-                            <el-col span="12">
-                                <el-form-item label="文章标签" prop="contentTags">
-                                    <el-select v-model="form.contentTags"
-                                               :style="{width: '100%'}"
-                                               :filterable="false"
-                                               :disabled="false"
-                                               filterable
-                                               :multiple="true" :clearable="true"
-                                               placeholder="请选择文章标签">
-                                        <el-option v-for='item in contentTagsOptions' :key="item.dictValue"
-                                                   :value="item.dictValue"
-                                                   :label="item.dictLabel"></el-option>
-                                    </el-select>
-                                    <div class="ms-form-tip">
-                                        标签：<a href="http://doc.mingsoft.net/mcms/biao-qian/wen-zhang-lie-biao-ms-arclist.html" target="_blank">${'$'}{field.tags}</a>
-                                        通过自定义字典可扩展数据
-                                    </div>
-                                </el-form-item>
-                            </el-col>
-                            <el-col span="12" v-if="!returnIsShow">
-                                <el-form-item label="文章外链接" prop="contentOutLink">
-                                    <el-input v-model="form.contentOutLink"
-                                              :disabled="false"
-                                              :style="{width:  '100%'}"
-                                              :clearable="true"
-                                              placeholder="请输入文章外链接">
-                                    </el-input>
-                                    <div class="ms-form-tip">
-                                        标签：<a href="http://doc.mingsoft.net/mcms/biao-qian/wen-zhang-lie-biao-ms-arclist.html"
-                                              target="_blank">${'$'}{field.outlink}</a> 文章外链接必须以http或者https等开头
-                                    </div>
-                                </el-form-item>
-                            </el-col>
-                        </el-row>
                         <el-row
                                 gutter="0"
                                 justify="start" align="top">
@@ -248,33 +201,59 @@
                                             :disabled="false"
                                             controls-position="">
                                     </el-input-number>
-                                  	<div class="ms-form-tip">
+                                    <div class="ms-form-tip">
                                         提示：前台模板标签需要设置orderby属性为sort才能生效
                                     </div>
                                 </el-form-item>
                             </el-col>
                         </el-row>
-                        <el-form-item label="文章缩略图" prop="contentImg">
+                        <el-row
-                            <el-upload
+                                gutter="0"
-                                    :file-list="form.contentImg"
+                                justify="start" align="top">
-                                    :action="ms.manager+'/file/upload.do'"
+                            <el-col span="12">
-                                    :on-remove="contentImghandleRemove"
+                                <el-form-item label="文章缩略图" prop="contentImg">
-                                    :style="{width:''}"
+                                    <el-upload
-                                    :limit="10"
+                                            :file-list="form.contentImg"
-                                    :on-exceed="contentImghandleExceed"
+                                            :action="ms.manager+'/file/upload.do'"
-                                    :disabled="false"
+                                            :on-remove="contentImghandleRemove"
-                                    :data="{uploadPath:'/cms/content','isRename':true ,'appId':true}"
+                                            :style="{width:''}"
-                                    :on-success="contentImgSuccess"
+                                            :limit="10"
-                                    :on-error="contentImgError"
+                                            :on-exceed="contentImghandleExceed"
-                                    accept="image/*"
+                                            :disabled="false"
-                                    list-type="picture-card">
+                                            :data="{uploadPath:'/cms/content','isRename':true ,'appId':true}"
-                                <i class="el-icon-plus"></i>
+                                            :on-success="contentImgSuccess"
-                                <div slot="tip" class="ms-form-tip">
+                                            :on-error="contentImgError"
-                                    标签：<a href="http://doc.mingsoft.net/mcms/biao-qian/wen-zhang-lie-biao-ms-arclist.html" target="_blank">${'{@ms:file field.litpic/}'}</a><br/>
+                                            accept="image/*"
-                                    最多可上传10张图片，文章缩略图,支持jpg格式；多图情况下，{@ms:file field.litpic/}会只取第一张缩略图，其他用法参考文档arclist标签
+                                            list-type="picture-card">
-                                </div>
+                                        <i class="el-icon-plus"></i>
-                            </el-upload>
+                                        <div slot="tip" class="ms-form-tip">
-                        </el-form-item>
+                                            标签：<a href="http://doc.mingsoft.net/mcms/biao-qian/wen-zhang-lie-biao-ms-arclist.html" target="_blank">${'{@ms:file field.litpic/}'}</a><br/>
+                                            最多可上传10张图片，文章缩略图,支持jpg格式；多图情况下，{@ms:file field.litpic/}会只取第一张缩略图，其他用法参考文档arclist标签
+                                        </div>
+                                    </el-upload>
+                                </el-form-item>
+                            </el-col>
+                            <el-col span="12">
+                                <el-form-item label="文章标签" prop="contentTags">
+                                    <el-select v-model="form.contentTags"
+                                               :style="{width: '100%'}"
+                                               :filterable="false"
+                                               :disabled="false"
+                                               filterable
+                                               :multiple="true" :clearable="true"
+                                               placeholder="请选择文章标签">
+                                        <el-option v-for='item in contentTagsOptions' :key="item.dictValue"
+                                                   :value="item.dictValue"
+                                                   :label="item.dictLabel"></el-option>
+                                    </el-select>
+                                    <div class="ms-form-tip">
+                                        标签：<a href="http://doc.mingsoft.net/mcms/biao-qian/wen-zhang-lie-biao-ms-arclist.html" target="_blank">${'$'}{field.tags}</a>
+                                        通过自定义字典可扩展数据
+                                    </div>
+                                </el-form-item>
+                            </el-col>
+                        </el-row>
+
                         <el-form-item label="关键字" prop="contentKeyword">
                             <el-input
                                     type="textarea" :rows="5"
@@ -402,7 +381,9 @@
                 }
             };
         },
-        watch: {},
+        watch: {
+
+        },
         computed: {
             currCategory: function () {
                 var that = this;
@@ -603,7 +584,7 @@
 
                         if (category.length > 0) {
                             that.categoryType = category[0].categoryType
-                            if (category[0].categoryType == '2') {
+                            if (category[0].categoryType == '2' || category[0].categoryType == '3') {
                                 that.returnIsShow = false;
                             }
                         }

src/main/webapp/static/plugins/iconfont/1.0.0/iconfont.json

@@ -5,6 +5,335 @@
   "css_prefix_text": "icon-",
   "description": "",
   "glyphs": [
+    {
+      "icon_id": "1540085",
+      "name": "插件",
+      "font_class": "chajian",
+      "unicode": "e809",
+      "unicode_decimal": 59401
+    },
+    {
+      "icon_id": "2076318",
+      "name": "帮助",
+      "font_class": "bangzhu",
+      "unicode": "e8a3",
+      "unicode_decimal": 59555
+    },
+    {
+      "icon_id": "14178198",
+      "name": "gitbook",
+      "font_class": "logo",
+      "unicode": "e80a",
+      "unicode_decimal": 59402
+    },
+    {
+      "icon_id": "145454",
+      "name": "图片",
+      "font_class": "tupian2",
+      "unicode": "e7f5",
+      "unicode_decimal": 59381
+    },
+    {
+      "icon_id": "201638",
+      "name": "编辑",
+      "font_class": "bianji2",
+      "unicode": "e7f6",
+      "unicode_decimal": 59382
+    },
+    {
+      "icon_id": "297679",
+      "name": "文本编辑",
+      "font_class": "wenbenbianji",
+      "unicode": "e7f7",
+      "unicode_decimal": 59383
+    },
+    {
+      "icon_id": "1727448",
+      "name": "217时间-线性",
+      "font_class": "shijian-xianxing",
+      "unicode": "e8c4",
+      "unicode_decimal": 59588
+    },
+    {
+      "icon_id": "2471392",
+      "name": "图片剪切",
+      "font_class": "tupianjianqie",
+      "unicode": "e7f8",
+      "unicode_decimal": 59384
+    },
+    {
+      "icon_id": "2678615",
+      "name": "金钱",
+      "font_class": "jinqian",
+      "unicode": "e7f9",
+      "unicode_decimal": 59385
+    },
+    {
+      "icon_id": "3615260",
+      "name": "城市级联管理",
+      "font_class": "chengshijilianguanli",
+      "unicode": "e7fa",
+      "unicode_decimal": 59386
+    },
+    {
+      "icon_id": "4682278",
+      "name": "附件",
+      "font_class": "accessories",
+      "unicode": "e7fb",
+      "unicode_decimal": 59387
+    },
+    {
+      "icon_id": "5315201",
+      "name": "80-多选",
+      "font_class": "-duoxuan",
+      "unicode": "e7fc",
+      "unicode_decimal": 59388
+    },
+    {
+      "icon_id": "5881145",
+      "name": "多行文本",
+      "font_class": "duohangwenben2",
+      "unicode": "e7fd",
+      "unicode_decimal": 59389
+    },
+    {
+      "icon_id": "5886128",
+      "name": "颜色",
+      "font_class": "yanse1",
+      "unicode": "e7fe",
+      "unicode_decimal": 59390
+    },
+    {
+      "icon_id": "6965076",
+      "name": "定位",
+      "font_class": "dingwei1",
+      "unicode": "e7ff",
+      "unicode_decimal": 59391
+    },
+    {
+      "icon_id": "13638673",
+      "name": "开关",
+      "font_class": "kaiguan1",
+      "unicode": "e800",
+      "unicode_decimal": 59392
+    },
+    {
+      "icon_id": "15126403",
+      "name": "icon_滑块",
+      "font_class": "icon_huakuai",
+      "unicode": "e801",
+      "unicode_decimal": 59393
+    },
+    {
+      "icon_id": "15126407",
+      "name": "icon_评分",
+      "font_class": "icon_pingfen",
+      "unicode": "e802",
+      "unicode_decimal": 59394
+    },
+    {
+      "icon_id": "16852655",
+      "name": "富文本编辑",
+      "font_class": "textEdit",
+      "unicode": "e803",
+      "unicode_decimal": 59395
+    },
+    {
+      "icon_id": "17374549",
+      "name": "编辑器",
+      "font_class": "bianjiqi",
+      "unicode": "e804",
+      "unicode_decimal": 59396
+    },
+    {
+      "icon_id": "17374570",
+      "name": "栅格布局",
+      "font_class": "zhagebuju",
+      "unicode": "e805",
+      "unicode_decimal": 59397
+    },
+    {
+      "icon_id": "17544309",
+      "name": "计数器",
+      "font_class": "jishuqi",
+      "unicode": "e806",
+      "unicode_decimal": 59398
+    },
+    {
+      "icon_id": "18672045",
+      "name": "级联",
+      "font_class": "jilian",
+      "unicode": "e807",
+      "unicode_decimal": 59399
+    },
+    {
+      "icon_id": "23626733",
+      "name": "下拉选择",
+      "font_class": "xialaxuanze",
+      "unicode": "e808",
+      "unicode_decimal": 59400
+    },
+    {
+      "icon_id": "23956554",
+      "name": "两端对齐",
+      "font_class": "liangduanduiqi2",
+      "unicode": "e7f4",
+      "unicode_decimal": 59380
+    },
+    {
+      "icon_id": "15371",
+      "name": "方块",
+      "font_class": "fangkuai",
+      "unicode": "e7f3",
+      "unicode_decimal": 59379
+    },
+    {
+      "icon_id": "12752309",
+      "name": "撤销",
+      "font_class": "chexiao_huaban",
+      "unicode": "e7f1",
+      "unicode_decimal": 59377
+    },
+    {
+      "icon_id": "12752310",
+      "name": "重做",
+      "font_class": "zhongzuo_huaban",
+      "unicode": "e7f2",
+      "unicode_decimal": 59378
+    },
+    {
+      "icon_id": "17722537",
+      "name": "下载ms 代码",
+      "font_class": "xiazaimsdaima",
+      "unicode": "e7f0",
+      "unicode_decimal": 59376
+    },
+    {
+      "icon_id": "17722549",
+      "name": "局部代码",
+      "font_class": "jubudaima",
+      "unicode": "e7e8",
+      "unicode_decimal": 59368
+    },
+    {
+      "icon_id": "17722557",
+      "name": "页面代码",
+      "font_class": "yemiandaima",
+      "unicode": "e7ef",
+      "unicode_decimal": 59375
+    },
+    {
+      "icon_id": "17717165",
+      "name": "演示数据参考线框",
+      "font_class": "yanshishujucankaoxiankuang",
+      "unicode": "e7ee",
+      "unicode_decimal": 59374
+    },
+    {
+      "icon_id": "17713522",
+      "name": "ms标签参考",
+      "font_class": "msbiaoqiancankao",
+      "unicode": "e7e9",
+      "unicode_decimal": 59369
+    },
+    {
+      "icon_id": "17713582",
+      "name": "vue参考",
+      "font_class": "vuecankao",
+      "unicode": "e7ea",
+      "unicode_decimal": 59370
+    },
+    {
+      "icon_id": "17713660",
+      "name": "ux参考",
+      "font_class": "uxcankao",
+      "unicode": "e7eb",
+      "unicode_decimal": 59371
+    },
+    {
+      "icon_id": "17713754",
+      "name": "粘贴样式",
+      "font_class": "niantieyangshi",
+      "unicode": "e7ec",
+      "unicode_decimal": 59372
+    },
+    {
+      "icon_id": "17713819",
+      "name": "粘贴html",
+      "font_class": "niantiehtml",
+      "unicode": "e7ed",
+      "unicode_decimal": 59373
+    },
+    {
+      "icon_id": "17710154",
+      "name": "下载html代码",
+      "font_class": "down-html",
+      "unicode": "e7e7",
+      "unicode_decimal": 59367
+    },
+    {
+      "icon_id": "15214514",
+      "name": "css",
+      "font_class": "css",
+      "unicode": "e7e6",
+      "unicode_decimal": 59366
+    },
+    {
+      "icon_id": "16554169",
+      "name": "file-css",
+      "font_class": "file-css",
+      "unicode": "e8de",
+      "unicode_decimal": 59614
+    },
+    {
+      "icon_id": "1616783",
+      "name": "换行",
+      "font_class": "huanhang1",
+      "unicode": "e7e5",
+      "unicode_decimal": 59365
+    },
+    {
+      "icon_id": "1422727",
+      "name": "展开",
+      "font_class": "zhankai1",
+      "unicode": "e7e4",
+      "unicode_decimal": 59364
+    },
+    {
+      "icon_id": "11759985",
+      "name": "显示器",
+      "font_class": "xianshiqi",
+      "unicode": "e7e3",
+      "unicode_decimal": 59363
+    },
+    {
+      "icon_id": "2733970",
+      "name": "模版",
+      "font_class": "moban1",
+      "unicode": "e7e2",
+      "unicode_decimal": 59362
+    },
+    {
+      "icon_id": "1368544",
+      "name": "删除",
+      "font_class": "del",
+      "unicode": "e7e1",
+      "unicode_decimal": 59361
+    },
+    {
+      "icon_id": "16398996",
+      "name": "展开",
+      "font_class": "zhankai",
+      "unicode": "e85e",
+      "unicode_decimal": 59486
+    },
+    {
+      "icon_id": "16399032",
+      "name": "收缩",
+      "font_class": "shousuo1",
+      "unicode": "e85f",
+      "unicode_decimal": 59487
+    },
     {
       "icon_id": "12330036",
       "name": "加载",