Skip to content
GitLab
Commit 73d06da7 authored by sgjj's avatar sgjj
Browse files

Merge remote-tracking branch 'origin/master'

parents 7c14089d f0d75c5e
Expand all Show whitespace changes
Inline Side-by-side
ms-mcms.iml deleted 100644 → 0
View file @ 7c14089d
This diff is collapsed.
src/main/webapp/WEB-INF/manager/cms/content/form.ftl
View file @ 73d06da7
...@@ -12,26 +12,22 @@ ...@@ -12,26 +12,22 @@
<el-button size="mini" icon="iconfont icon-fanhui" plain onclick="javascript:history.go(-1)">返回 <el-button size="mini" icon="iconfont icon-fanhui" plain onclick="javascript:history.go(-1)">返回
</el-button> </el-button>
</el-header> </el-header>
<el-main class="ms-container"> <el-main class="ms-container" style="position:relative;">
<el-scrollbar style="height: 100%;"> <el-scrollbar style="height: 100%;">
<el-tabs v-model="activeName" style="height: calc(100% - 10px);"> <el-tabs v-model="activeName" style="height: calc(100% - 10px);">
<el-tab-pane v-for="(item, index) in editableTabs" <el-tab-pane style="position:relative;" v-for="(item, index) in editableTabs" :key="index"
:key="index" :label="item.title" :name="item.name">
:label="item.title" <el-form v-if="item.title=='文章编辑'" ref="form" :model="form" :rules="rules" label-width="120px"
:name="item.name"> size="mini">
<el-scrollbar class="ms-scrollbar" style="height: 100%;"> <el-row gutter="0" justify="start" align="top">
<el-form v-if="item.title=='文章编辑'" ref="form" :model="form" :rules="rules" label-width="120px" size="mini">
<el-row
gutter="0"
justify="start" align="top">
<el-col :span="returnIsShow?'12':'24'"> <el-col :span="returnIsShow?'12':'24'">
<el-form-item label="文章标题" prop="contentTitle"> <el-form-item label="文章标题" prop="contentTitle">
<template slot='label'>文章标题 <template slot='label'>文章标题
<el-popover placement="top-start" title="提示" trigger="hover" > <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">{ms:field.title/}</a> <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/nei-rong-biao-qian-ms-field.html"
<a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/wen-zhang-lie-biao-ms-arclist.html" target="_blank">[field.title/]</a> target="_blank">{ms: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> <i class="el-icon-question" slot="reference"></i>
</el-popover> </el-popover>
</template> </template>
...@@ -46,8 +42,9 @@ ...@@ -46,8 +42,9 @@
<el-col span="12" v-if="returnIsShow"> <el-col span="12" v-if="returnIsShow">
<el-form-item label="所属栏目" prop="contentCategoryId"> <el-form-item label="所属栏目" prop="contentCategoryId">
<template slot='label'>所属栏目 <template slot='label'>所属栏目
<el-popover placement="top-start" title="提示" trigger="hover" > <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">{ms:field.typetitle/}</a> <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/nei-rong-biao-qian-ms-field.html"
target="_blank">{ms:field.typetitle/}</a>
<i class="el-icon-question" slot="reference"></i> <i class="el-icon-question" slot="reference"></i>
</el-popover> </el-popover>
</template> </template>
...@@ -78,9 +75,11 @@ ...@@ -78,9 +75,11 @@
<el-col span="12"> <el-col span="12">
<el-form-item label="发布时间" prop="contentDatetime"> <el-form-item label="发布时间" prop="contentDatetime">
<template slot='label'>发布时间 <template slot='label'>发布时间
<el-popover placement="top-start" title="提示" trigger="hover" > <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">{ms:field.date?string("yyyy-MM-dd")/}</a> <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/nei-rong-biao-qian-ms-field.html"
<a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/wen-zhang-lie-biao-ms-arclist.html" target="_blank">[field.date?string("yyyy-MM-dd")/]</a> target="_blank">{ms:field.date?string("yyyy-MM-dd")/}</a>
<a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/wen-zhang-lie-biao-ms-arclist.html"
target="_blank">[field.date?string("yyyy-MM-dd")/]</a>
<i class="el-icon-question" slot="reference"></i> <i class="el-icon-question" slot="reference"></i>
</el-popover> </el-popover>
</template> </template>
...@@ -107,9 +106,11 @@ ...@@ -107,9 +106,11 @@
<el-col span="12"> <el-col span="12">
<el-form-item label="文章作者" prop="contentAuthor"> <el-form-item label="文章作者" prop="contentAuthor">
<template slot='label'>文章作者 <template slot='label'>文章作者
<el-popover placement="top-start" title="提示" trigger="hover" > <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">{ms:field.author/}</a> <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/nei-rong-biao-qian-ms-field.html"
<a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/wen-zhang-lie-biao-ms-arclist.html" target="_blank">[field.author/]</a> target="_blank">{ms: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> <i class="el-icon-question" slot="reference"></i>
</el-popover> </el-popover>
</template> </template>
...@@ -124,9 +125,11 @@ ...@@ -124,9 +125,11 @@
<el-col span="12"> <el-col span="12">
<el-form-item label="文章来源" prop="contentSource"> <el-form-item label="文章来源" prop="contentSource">
<template slot='label'>文章来源 <template slot='label'>文章来源
<el-popover placement="top-start" title="提示" trigger="hover" > <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">{ms:field.source/}</a> <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/nei-rong-biao-qian-ms-field.html"
<a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/wen-zhang-lie-biao-ms-arclist.html" target="_blank">[field.source/]</a> target="_blank">{ms: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> <i class="el-icon-question" slot="reference"></i>
</el-popover> </el-popover>
</template> </template>
...@@ -145,7 +148,8 @@ ...@@ -145,7 +148,8 @@
<el-col span="12"> <el-col span="12">
<el-form-item label="" prop="contentDisplay"> <el-form-item label="" prop="contentDisplay">
<template slot='label'>是否显示 <template slot='label'>是否显示
<el-popover slot="label" placement="top-start" title="提示" width="200" trigger="hover" <el-popover slot="label" placement="top-start" title="提示" width="200"
trigger="hover"
content="选择否后前端将不显示，需要重新生成才有效果"> content="选择否后前端将不显示，需要重新生成才有效果">
<i class="el-icon-question" slot="reference"></i> <i class="el-icon-question" slot="reference"></i>
</el-popover> </el-popover>
...@@ -153,8 +157,10 @@ ...@@ -153,8 +157,10 @@
<el-radio-group v-model="form.contentDisplay" <el-radio-group v-model="form.contentDisplay"
:style="{width: ''}" :style="{width: ''}"
:disabled="false"> :disabled="false">
<el-radio :style="{display: true ? 'inline-block' : 'block'}" :label="item.value" <el-radio :style="{display: true ? 'inline-block' : 'block'}"
v-for='(item, index) in contentDisplayOptions' :key="item.value + index"> :label="item.value"
v-for='(item, index) in contentDisplayOptions'
:key="item.value + index">
{{true? item.label : item.value}} {{true? item.label : item.value}}
</el-radio> </el-radio>
</el-radio-group> </el-radio-group>
...@@ -172,10 +178,12 @@ ...@@ -172,10 +178,12 @@
</el-row> </el-row>
<el-form-item label="" prop="contentImg"> <el-form-item label="" prop="contentImg">
<template slot='label'>文章缩略图 <template slot='label'>文章缩略图
<el-popover placement="top-start" title="提示" trigger="hover" > <el-popover placement="top-start" title="提示" trigger="hover">
文章缩略图,支持jpg格式 文章缩略图,支持jpg格式
<a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/nei-rong-biao-qian-ms-field.html" target="_blank">{ms:field.litpic/}</a> <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/nei-rong-biao-qian-ms-field.html"
<a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/wen-zhang-lie-biao-ms-arclist.html" target="_blank">[field.litpic/]</a> target="_blank">{ms: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> <i class="el-icon-question" slot="reference"></i>
</el-popover> </el-popover>
</template> </template>
...@@ -197,9 +205,11 @@ ...@@ -197,9 +205,11 @@
</el-form-item> </el-form-item>
<el-form-item label="关键字" prop="contentKeyword"> <el-form-item label="关键字" prop="contentKeyword">
<template slot='label'>关键字 <template slot='label'>关键字
<el-popover placement="top-start" title="提示" trigger="hover" > <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">{{ms:field.keyword/}</a> <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/nei-rong-biao-qian-ms-field.html"
<a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/wen-zhang-lie-biao-ms-arclist.html" target="_blank">[field.keyword/]</a> target="_blank">{{ms: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> <i class="el-icon-question" slot="reference"></i>
</el-popover> </el-popover>
</template> </template>
...@@ -213,9 +223,11 @@ ...@@ -213,9 +223,11 @@
</el-form-item> </el-form-item>
<el-form-item label="描述" prop="contentDescription"> <el-form-item label="描述" prop="contentDescription">
<template slot='label'>描述 <template slot='label'>描述
<el-popover placement="top-start" title="提示" trigger="hover" > <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">{ms:field.descrip/}</a> <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/nei-rong-biao-qian-ms-field.html"
<a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/wen-zhang-lie-biao-ms-arclist.html" target="_blank">[field.descrip/]</a> target="_blank">{ms:field.descrip/}</a>
<a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/wen-zhang-lie-biao-ms-arclist.html"
target="_blank">[field.descrip/]</a>
<i class="el-icon-question" slot="reference"></i> <i class="el-icon-question" slot="reference"></i>
</el-popover> </el-popover>
</template> </template>
...@@ -229,9 +241,11 @@ ...@@ -229,9 +241,11 @@
</el-form-item> </el-form-item>
<el-form-item label="文章内容" prop="contentDetails"> <el-form-item label="文章内容" prop="contentDetails">
<template slot='label'>文章内容 <template slot='label'>文章内容
<el-popover placement="top-start" title="提示" trigger="hover" > <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">{ms:field.content/}</a> <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/nei-rong-biao-qian-ms-field.html"
<a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/wen-zhang-lie-biao-ms-arclist.html" target="_blank">[field.content/]</a> target="_blank">{ms: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> <i class="el-icon-question" slot="reference"></i>
</el-popover> </el-popover>
</template> </template>
...@@ -240,10 +254,8 @@ ...@@ -240,10 +254,8 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<div :id="'model'+index" v-else></div> <div :id="'model'+index" v-else></div>
</el-scrollbar>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
</el-scrollbar> </el-scrollbar>
</el-main> </el-main>
</div> </div>
...@@ -395,7 +407,7 @@ ...@@ -395,7 +407,7 @@
if (that.returnIsShow) { if (that.returnIsShow) {
javascript: history.go(-1); javascript: history.go(-1);
}else { } else {
//如果是顶级封面或封面，则重新拿到当前封面id,避免重复保存 //如果是顶级封面或封面，则重新拿到当前封面id,避免重复保存
that.list(that.form.contentCategoryId); that.list(that.form.contentCategoryId);
} }
...@@ -488,7 +500,7 @@ ...@@ -488,7 +500,7 @@
"id": id "id": id
}).then(function (res) { }).then(function (res) {
if (res.result && res.data) { if (res.result && res.data) {
if (res.data.contentType&&res.data.contentType!='') { if (res.data.contentType && res.data.contentType != '') {
res.data.contentType = res.data.contentType.split(','); res.data.contentType = res.data.contentType.split(',');
} else { } else {
res.data.contentType = []; res.data.contentType = [];
...@@ -631,4 +643,7 @@ ...@@ -631,4 +643,7 @@
#form { #form {
overflow: hidden; overflow: hidden;
} }
.el-scrollbar__bar.is-vertical{
width: 6px!important;
}
</style> </style>
src/main/webapp/WEB-INF/manager/cms/content/index.ftl
View file @ 73d06da7
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<div id="index" v-cloak> <div id="index" v-cloak>
<!--左侧--> <!--左侧-->
<el-container class="index-menu"> <el-container class="index-menu">
<div class="left-tree"> <div class="left-tree" style="position:relative;">
<el-scrollbar style="height: 100%;"> <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-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> </el-scrollbar>
...@@ -123,4 +123,5 @@ ...@@ -123,4 +123,5 @@
body{ body{
overflow: hidden; overflow: hidden;
} }
</style> </style>
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment