ak
/
msopen
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
wujj 2020-07-02 15:28:23 +08:00
parent 86fa059999 3d934928b9
commit 3714e70d1c
7 changed files with 49 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/net/mingsoft/cms/util/CmsParserUtil.java
View File

@ -66,17 +66,7 @@ public class CmsParserUtil extends ParserUtil {
*/ */
public static void generateList(CategoryEntity column, int articleIdTotal) public static void generateList(CategoryEntity column, int articleIdTotal)
throws TemplateNotFoundException, MalformedTemplateNameException, ParseException, IOException { throws TemplateNotFoundException, MalformedTemplateNameException, ParseException, IOException {
// 只初始化一次cfg
if (ftl == null) {
ftl = new FileTemplateLoader(new File(ParserUtil.buildTempletPath()));
cfg.setTemplateLoader(ftl);
}
// 移动端模板
try{ try{
Template mobileTemplate = cfg.getTemplate(
BasicUtil.getApp().getAppMobileStyle() + File.separator + column.getCategoryListUrl(), Const.UTF8);
// pc端模板
// 文章的栏目模型编号 // 文章的栏目模型编号
String columnContentModelId = column.getMdiyModelId(); String columnContentModelId = column.getMdiyModelId();
PageBean page = new PageBean(); PageBean page = new PageBean();
@ -87,7 +77,6 @@ public class CmsParserUtil extends ParserUtil {
//获取总数 //获取总数
String columnListPath; String columnListPath;
String mobilePath;
ModelEntity contentModel = null; ModelEntity contentModel = null;
// 判断当前栏目是否有自定义模型 // 判断当前栏目是否有自定义模型
if (StringUtils.isNotBlank(columnContentModelId)) { if (StringUtils.isNotBlank(columnContentModelId)) {

39
src/main/webapp/WEB-INF/manager/cms/category/form.ftl
View File

@ -3,9 +3,6 @@
<head> <head>
<title>分类</title> <title>分类</title>
<#include "../../include/head-file.ftl"> <#include "../../include/head-file.ftl">
<script src="${base}/static/locale/lang/cms/category/ch.js"></script>
<script src="${base}/static/locale/lang/cms/category/en.js"></script>
</head> </head>
<body> <body>
<div id="form" v-cloak> <div id="form" v-cloak>
@ -22,7 +19,7 @@
justify="start" align="top"> justify="start" align="top">
<el-col span="12"> <el-col span="12">
<el-form-item label="栏目管理名称" prop="categoryTitle"> <el-form-item label="栏目管理名称" prop="categoryTitle">
<template slot='label'>{{$t('form.categoryTitle.text')}} <template slot='label'>栏目管理名称
<el-popover slot="label" placement="top-start" title="提示" trigger="hover"> <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" <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/nei-rong-biao-qian-ms-field.html"
target="_blank">{ms:field.typetitle/}</a> target="_blank">{ms:field.typetitle/}</a>
@ -35,12 +32,12 @@
:disabled="false" :disabled="false"
:style="{width: '100%'}" :style="{width: '100%'}"
:clearable="true" :clearable="true"
:placeholder="$t('form.categoryTitle.placeholder')"> placeholder="请输入栏目管理名称">
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col span="12"> <el-col span="12">
<el-form-item :label="$t('form.categoryId')" prop="categoryId"> <el-form-item label="所属栏目" prop="categoryId">
<tree-select ref="tree" :props="{value: 'id',label: 'categoryTitle',children: 'children'}" <tree-select ref="tree" :props="{value: 'id',label: 'categoryTitle',children: 'children'}"
:options="treeList" :style="{width:'100%'}" :options="treeList" :style="{width:'100%'}"
v-model="form.categoryId"></tree-select> v-model="form.categoryId"></tree-select>
@ -52,7 +49,7 @@
justify="start" align="top"> justify="start" align="top">
<el-col span="12"> <el-col span="12">
<el-form-item prop="categoryType"> <el-form-item prop="categoryType">
<template slot='label'>{{$t('form.categoryType')}} <template slot='label'>栏目类型
<el-popover slot="label" placement="top-start" title="提示" trigger="hover"> <el-popover slot="label" placement="top-start" title="提示" trigger="hover">
列表：常用于带列表、详情的业务，例如：新闻列表、图片列表<br>封面：常用单篇文章显示，例如：关于我们、公司介绍<br>修改栏目时如果该栏目存在文章则不能修改栏目类型 列表：常用于带列表、详情的业务，例如：新闻列表、图片列表<br>封面：常用单篇文章显示，例如：关于我们、公司介绍<br>修改栏目时如果该栏目存在文章则不能修改栏目类型
<i class="el-icon-question" slot="reference"></i> <i class="el-icon-question" slot="reference"></i>
@ -69,7 +66,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col span="12"> <el-col span="12">
<el-form-item :label="$t('form.categorySort')" prop="categorySort"> <el-form-item label="自定义顺序" prop="categorySort">
<el-input-number <el-input-number
v-model="form.categorySort" v-model="form.categorySort"
:disabled="false" :disabled="false"
@ -82,7 +79,7 @@
gutter="0" gutter="0"
justify="start" align="top"> justify="start" align="top">
<el-col span="12"> <el-col span="12">
<el-form-item prop="categoryUrl" :label=" $tc('form.categoryUrl',form.categoryType)"> <el-form-item prop="categoryUrl" :label="form.categoryType =='1'? '内容模板' : '封面模板'">
<el-select v-model="form.categoryUrl" <el-select v-model="form.categoryUrl"
:style="{width: '100%'}" :style="{width: '100%'}"
:filterable="true" :filterable="true"
@ -96,7 +93,7 @@
</el-col> </el-col>
<el-col span="12"> <el-col span="12">
<el-form-item prop="mdiyModelId"> <el-form-item prop="mdiyModelId">
<template slot='label'>{{$t('form.mdiyModelId')}} <template slot='label'>自定义模型
<el-popover slot="label" placement="top-start" title="提示" width="400" trigger="hover" <el-popover slot="label" placement="top-start" title="提示" width="400" trigger="hover"
content="如果发布时候文章字段信息不够，可以采用铭飞代码生成器生成自定义模型，再通过“自定义管理->自定义模型->导入”功能导入模型，注意类型是cms"> content="如果发布时候文章字段信息不够，可以采用铭飞代码生成器生成自定义模型，再通过“自定义管理->自定义模型->导入”功能导入模型，注意类型是cms">
<i class="el-icon-question" slot="reference"></i> <i class="el-icon-question" slot="reference"></i>
@ -117,7 +114,7 @@
<el-row gutter="0" justify="start" align="top"> <el-row gutter="0" justify="start" align="top">
<el-col span="12"> <el-col span="12">
<el-form-item prop="categoryListUrl" v-if="form.categoryType == '1'"> <el-form-item prop="categoryListUrl" v-if="form.categoryType == '1'">
<template slot='label'>{{$t('form.categoryListUrl')}} <template slot='label'>列表模板
<el-popover slot="label" placement="top-start" title="提示" trigger="hover" <el-popover slot="label" placement="top-start" title="提示" trigger="hover"
content="当栏目类型为列表时有效"> content="当栏目类型为列表时有效">
<i class="el-icon-question" slot="reference"></i> <i class="el-icon-question" slot="reference"></i>
@ -136,7 +133,7 @@
</el-col> </el-col>
<el-col span="12"> <el-col span="12">
<el-form-item label="栏目属性" prop="categoryFlag"> <el-form-item label="栏目属性" prop="categoryFlag">
<template slot='label'>{{$t('form.categoryFlag')}} <template slot='label'>栏目属性
<el-popover placement="top-start" title="提示" trigger="hover" content="类型不满足可以在自定义字典菜单中新增,字段类型为“栏目属性”"> <el-popover placement="top-start" title="提示" trigger="hover" content="类型不满足可以在自定义字典菜单中新增,字段类型为“栏目属性”">
<i class="el-icon-question" slot="reference"></i> <i class="el-icon-question" slot="reference"></i>
</el-popover> </el-popover>
@ -154,7 +151,7 @@
</el-col> </el-col>
</el-row> </el-row>
<el-form-item label="栏目管理关键字" prop="categoryKeyword"> <el-form-item label="栏目管理关键字" prop="categoryKeyword">
<template slot='label'>{{$t('form.categoryKeyword')}} <template slot='label'>栏目关键字
<el-popover slot="label" placement="top-start" title="提示" trigger="hover"> <el-popover slot="label" placement="top-start" title="提示" trigger="hover">
<a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/lan-mu-lie-biao-ms-channel.html" <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/lan-mu-lie-biao-ms-channel.html"
target="_blank">[field.typekeyword/]</a> target="_blank">[field.typekeyword/]</a>
@ -170,7 +167,7 @@
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="栏目管理描述" prop="categoryDescrip"> <el-form-item label="栏目管理描述" prop="categoryDescrip">
<template slot='label'>{{$t('form.categoryDescrip')}} <template slot='label'>栏目描述
<el-popover slot="label" placement="top-start" title="提示" trigger="hover"> <el-popover slot="label" placement="top-start" title="提示" trigger="hover">
<a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/lan-mu-lie-biao-ms-channel.html" <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/lan-mu-lie-biao-ms-channel.html"
target="_blank">[field.typedescrip/]</a> target="_blank">[field.typedescrip/]</a>
@ -186,7 +183,7 @@
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="" prop="categoryImg"> <el-form-item label="" prop="categoryImg">
<template slot='label'>{{$t('form.categoryImg')}} <template slot='label'>缩略图
<el-popover slot="label" placement="top-start" title="提示" trigger="hover"> <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" <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/nei-rong-biao-qian-ms-field.html"
target="_blank">{ms:field.typelitpic/}</a> target="_blank">{ms:field.typelitpic/}</a>
@ -212,7 +209,7 @@
</el-upload> </el-upload>
</el-form-item> </el-form-item>
<el-form-item prop="categoryDiyUrl"> <el-form-item prop="categoryDiyUrl">
<template slot='label'>{{$t('form.categoryDiyUrl')}} <template slot='label'>自定义链接
<el-popover slot="label" placement="top-start" title="提示" trigger="hover"> <el-popover slot="label" placement="top-start" title="提示" trigger="hover">
<a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/lan-mu-lie-biao-ms-channel.html" <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/lan-mu-lie-biao-ms-channel.html"
target="_blank">[field.typeurl/]</a> target="_blank">[field.typeurl/]</a>
@ -233,17 +230,10 @@
</body> </body>
</html> </html>
<script> <script>
var i18n = new VueI18n({
locale: parent.indexVue.locale.language, // 设置地区
messages:Object.assign({}, localeCh, localeEn)
})
var form = new Vue({ var form = new Vue({
i18n:i18n,
el: '#form', el: '#form',
data: function () { data: function () {
return { return {
locale:parent.indexVue.locale,
treeList: [{ treeList: [{
id: '0', id: '0',
categoryTitle: '顶级栏目', categoryTitle: '顶级栏目',
@ -312,9 +302,6 @@
}; };
}, },
watch: { watch: {
'locale.language':function (n,o) {
this.$i18n.locale = n
},
'form.categoryId': function (n, o) { 'form.categoryId': function (n, o) {
var _this = this; var _this = this;

15
src/main/webapp/WEB-INF/manager/index.ftl
View File

@ -192,8 +192,6 @@
collapseMenu: false, //菜单折叠，false不折叠 collapseMenu: false, //菜单折叠，false不折叠
currentTab: '工作台', //当前激活tab的name currentTab: '工作台', //当前激活tab的name
tabIndex: 1, tabIndex: 1,
// markList:
// ['项目管理', '组织管理', '客户管理', '合同管理', '印章管理', '绩效管理', '权限管理', '系统设置'],
markList: [ markList: [
{title: "权限管理", icon: "icon-wode", hide: true}, {title: "权限管理", icon: "icon-wode", hide: true},
{title: "系统设置", icon: "icon-xitongguanli", hide: true}, {title: "系统设置", icon: "icon-xitongguanli", hide: true},
@ -310,18 +308,6 @@
}) })
}, },
<#--connect: function () {-->
<#-- var that = this-->
<#-- var sockjs = new SockJS("/websocket");-->
<#-- var stompClient = Stomp.over(sockjs);-->
<#-- stompClient.connect({}, function (frame) {-->
<#-- stompClient.subscribe('/topic/message/' +${Session.manager_session.managerId}, function (greeting) {-->
<#-- if (greeting.body == "list") {-->
<#-- that.getMessage()-->
<#-- }-->
<#-- });-->
<#-- });-->
<#--},-->
markMenu: function (title, icon) { markMenu: function (title, icon) {
var menu = { var menu = {
title: title, title: title,
@ -571,7 +557,6 @@
//setInterval(this.getMessage,3000) //setInterval(this.getMessage,3000)
// 菜单列表 // 菜单列表
this.list(); this.list();
// this.connect();
//获取登录用户信息 //获取登录用户信息
this.managerGet(); this.managerGet();
var that = this; var that = this;

62
src/main/webapp/WEB-INF/manager/main.ftl
View File

@ -43,8 +43,7 @@
</div> </div>
<div class="class-6" > <div class="class-6" >
</div> </div>
<div class="class-7" > <div class="panel" >
<div class="panel">
<div v-if="alwaysList.length>0" class="panel-title"> <div v-if="alwaysList.length>0" class="panel-title">
常用功能 常用功能
</div> </div>
@ -61,9 +60,6 @@
<!--文本结束--> <!--文本结束-->
</div> </div>
</div> </div>
</div>
</div> </div>
<!--大容器开始--> <!--大容器开始-->
<div class="class-43" > <div class="class-43" >
@ -466,36 +462,40 @@
}); });
</script> </script>
<style> <style>
.panel-content .mitem {
color: #333333;
cursor: pointer;
outline-offset: -1px;
height: 88px;
flex-direction: column;
display: flex;
animation-duration: 1s;
width: 88px;
background-repeat: no-repeat;
align-items: center;
}
.panel .panel-content .mitem:hover i ,.panel .panel-content .mitem:hover .item-title{
color:#409EFF
}
.panel-content .mitem i {
font-size: 36px;
}
.panel { .panel {
margin-top:10px;
color: #333333; color: #333333;
padding: 10px; padding-right:20px;
padding-top:20px;
max-width:100%;
padding-left:20px;
outline-offset: -1px; outline-offset: -1px;
flex: 1;
background-color: rgba(255, 255, 255, 1); background-color: rgba(255, 255, 255, 1);
flex-direction: column; flex-direction: column;
display: flex; display: flex;
animation-duration: 1s; animation-duration: 1s;
background-repeat: no-repeat; background-repeat: no-repeat;
} }
.panel .panel-content .mitem:hover i ,.panel .panel-content .mitem:hover .item-title{
color:#409EFF
}
.panel-content .mitem i {
font-size: 40px;
}
.panel-content .mitem {
color: #333333;
cursor: pointer;
outline-offset: -1px;
max-width:100%;
height: 69px;
flex-direction: column;
display: flex;
animation-duration: 1s;
width: 25%;
background-repeat: no-repeat;
align-items: center;
margin-bottom:20px;
}
.panel .panel-title { .panel .panel-title {
color: #333333; color: #333333;
word-wrap: break-word; word-wrap: break-word;
@ -503,8 +503,6 @@
display: inline-block; display: inline-block;
animation-duration: 1s; animation-duration: 1s;
font-size: 16px; font-size: 16px;
padding-left: 10px;
margin-top: 5px;
} }
.panel .panel-content { .panel .panel-content {
color: #333333; color: #333333;
@ -521,6 +519,14 @@
padding-left: 10px; padding-left: 10px;
background-repeat: no-repeat; background-repeat: no-repeat;
} }
.panel .panel-content .mitem .item-title{
color:#333333;
word-wrap:break-word;
display:inline-block;
animation-duration:1s;
font-size:14px;
line-height:1.4;
}
.custom-body { .custom-body {
} }
.class-1 .class-1

1
src/main/webapp/static/ms-admin/5.0.0/css/app.css
View File

@ -134,7 +134,6 @@ a:link,a:visited,a:active{text-decoration: none; color:#409EFF;}
.ms-index .el-menu { .ms-index .el-menu {
border-right: none; border-right: none;
background-color: unset; background-color: unset;
height: calc(100vh - 141px);
} }
.ms-index .el-menu-item { .ms-index .el-menu-item {
white-space: nowrap; white-space: nowrap;

2
src/main/webapp/static/ms-admin/5.0.0/css/index.css
View File

@ -86,7 +86,7 @@ textarea::-webkit-input-placeholder {
height: 50px; height: 50px;
} }
.ms-header button { .ms-header button {
height: 30px; /*height: 30px;*/
} }
.ms-pagination { .ms-pagination {
padding: 20px 0; padding: 20px 0;

2
src/main/webapp/static/plugins/ms/1.0.0/ms.util.js
View File

@ -62,7 +62,7 @@
fmt: function(de, fmt) { fmt: function(de, fmt) {
var date = new Date(typeof de == "string"?de.replace(/-/g, "/"):de); var date = new Date(typeof de == "string"?de.replace(/-/g, "/"):de);
if (!fmt) { if (!fmt) {
fmt = "yyyy-mm-dd"; fmt = "yyyy-MM-dd";
} }
var o = { var o = {
"M+": date.getMonth() + 1, //月份 "M+": date.getMonth() + 1, //月份