Skip to content

C
cms_sys
Commit 01a99b3f authored by msgroup's avatar msgroup
Browse files
Options

1、注释修改 

2、修改栏目发布问题
parent 60d3fd09
Expand all Show whitespace changes
Inline Side-by-side
Showing with 37 additions and 17 deletions
src/main/webapp/WEB-INF/manager/cms/content/form.ftl
View file @ 01a99b3f
......@@ -36,13 +36,19 @@
</el-col>
<el-col span="12" v-if="returnIsShow">
<el-form-item label="所属栏目" prop="categoryId">
<tree-select :props="{value: 'id',label: 'categoryTitle',children: 'children'}"
:options="contentCategoryIdOptions" :style="{width:'100%'}"
<treeselect v-model="form.categoryId"
:disable-branch-nodes="true"
:normalizer="node=>{
return {
id: node.id,
label: node.categoryTitle,
children: node.children
}}"
@change="categoryChange"
v-model="form.categoryId"></tree-select>
:options="contentCategoryIdOptions" placeholder="请选择"/>
<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><br/>
不能为链接和封面类型新建文章
标签：<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>
......
src/main/webapp/WEB-INF/manager/cms/content/index.ftl
View file @ 01a99b3f
......@@ -51,12 +51,12 @@
methods: {
handleNodeClick: function (data) {
if (data.categoryType == '1') {
this.action = ms.manager + "/cms/content/main.do?categoryId=" + data.id;
this.action = ms.manager + "/cms/content/main.do?categoryId=" + data.id+"&leaf="+data.leaf;
} else if (data.categoryType == '2') {
this.action = ms.manager + "/cms/content/form.do?categoryId=" + data.id + "&type=2";
//id=0时为最顶级节点全部节点
} else if (data.id == 0){
this.action = ms.manager + "/cms/content/main.do";
this.action = ms.manager + "/cms/content/main.do?leaf=true";
}
},
treeList: function () {
......
src/main/webapp/WEB-INF/manager/cms/content/main.ftl
View file @ 01a99b3f
......@@ -11,7 +11,7 @@
<el-header class="ms-header" height="50px">
<el-col :span="12">
<@shiro.hasPermission name="cms:content:save">
<el-button type="primary" icon="el-icon-plus" size="mini" @click="save()">新增</el-button>
<el-button v-if="leaf=='true'" type="primary" icon="el-icon-plus" size="mini" @click="save()">新增</el-button>
</@shiro.hasPermission>
<@shiro.hasPermission name="cms:content:del">
<el-button type="danger" icon="el-icon-delete" size="mini" @click="del(selectionList)" :disabled="!selectionList.length">删除</el-button>
......@@ -269,7 +269,8 @@
// 文章类型
contentType: null,
categoryId: ''
}
},
leaf:1
},
methods: {
//查询列表
......@@ -470,6 +471,7 @@
this.contentCategoryIdOptionsGet();
this.contentTypeOptionsGet();
this.form.categoryId = ms.util.getParameter("categoryId");
this.leaf = ms.util.getParameter("leaf");
if (history.hasOwnProperty("state")) {
this.form = history.state.form;
this.currentPage = history.state.page.pageNo;
......
src/main/webapp/WEB-INF/manager/cms/generate/index.ftl
View file @ 01a99b3f
......@@ -23,7 +23,7 @@
:label="item"></el-option>
</el-select>
<div class="ms-form-tip">
更新主页，如果系统存在引导页面可以手动修改主页位置文件名,default.html引导页面index.html主页。
一般选择<i>index.htm</i>模版
</div>
</el-form-item>
</div>
......@@ -36,7 +36,9 @@
placeholder="请输入主页位置">
</el-input>
<div class="ms-form-tip">
主页位置htm文件名一般为index.html或default.html
一般为index.html或default.html,
如果是<i>引导页面->首页</i>，可以手动调整主页模版与主页设置，先生成引导页，再生成首页。一般default.html为引导页面index.html为主页。
</div>
</el-form-item>
</div>
......@@ -58,7 +60,7 @@
placeholder="请选择文章栏目">
</tree-select>
<div class="ms-form-tip">
生成对应栏目属性为列表的内容数据，例如：新闻详情、产品详情
生成指定栏目下的文章内容
</div>
</el-form-item>
</div>
......@@ -79,7 +81,7 @@
type="date">
</el-date-picker>
<div class="ms-form-tip">
根据内容的发布时间来生成，例如：2020-10-10，则生成10月10号以后发布的内容
根据内容的发布时间来生成，例如：2021-01-01，则生成21年01月01号以后发布的文章，如果遇到内容没有生成可以调整时间
</div>
</el-form-item>
</div>
......@@ -101,7 +103,7 @@
placeholder="请选择文章栏目">
</tree-select>
<div class="ms-form-tip">
生成栏目属性为列表、封面的内容数据，例如：关于我们、公司介绍、新闻列表、产品列表
生成<b>栏目类型</b>为列表的数据，例如：新闻列表、产品列表
</div>
</el-form-item>
</div>
......@@ -308,7 +310,7 @@
padding:20px;
outline:none;
outline-offset:-1px;
height:260px;
height:300px;
max-width:100%;
background-color:#FFFFFF;
flex-direction:column;
......@@ -456,7 +458,7 @@
padding:20px;
outline:none;
outline-offset:-1px;
height:260px;
height:300px;
max-width:100%;
background-color:#FFFFFF;
flex-direction:column;
......@@ -601,7 +603,7 @@
padding:20px;
outline:none;
outline-offset:-1px;
height:260px;
height:300px;
max-width:100%;
background-color:#FFFFFF;
flex-direction:column;
......
src/main/webapp/static/css/app.css
View file @ 01a99b3f
......@@ -80,6 +80,16 @@ a:link,a:visited,a:active{text-decoration: none; color:#409EFF;}
line-height: 18px;
padding: 4px 0;
}
.ms-form-tip b{
color: #e6a23c;
}
.ms-form-tip a:hover{
text-decoration: underline !important;
}
.ms-form-tip i{
background-color: #f0f9eb;
color: #67c23a;
}
.ms-select{
display: block;
}
......
Markdown is supported
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