sunjianxi
/
cycgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复文章属性栏目属性筛选，添加时间范围搜索

Browse Source
master
sgjj 6 years ago
parent 4355dbcfd8
commit d3f9a70118
6 changed files with 46 additions and 56 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      doc/5.0.0-to-5.1-mysql.sql
  2. 5
      doc/mcms-5.1.sql
  3. 7
      src/main/java/net/mingsoft/cms/dao/IContentDao.xml
  4. 24
      src/main/webapp/WEB-INF/manager/cms/category/form.ftl
  5. 58
      src/main/webapp/WEB-INF/manager/cms/content/form.ftl
  6. 4
      src/main/webapp/templets/1/default/search.htm

4
doc/5.0.0-to-5.1-mysql.sql
View File

File diff suppressed because one or more lines are too long

5
doc/mcms-5.1.sql
View File

File diff suppressed because one or more lines are too long

7
src/main/java/net/mingsoft/cms/dao/IContentDao.xml
Unescape View File

@ -326,7 +326,9 @@
and a.content_source like CONCAT("%",#{map.content_source},"%")
</if>
<if test="map.content_type!=null">
and a.content_type like CONCAT("%",#{map.content_type},"%")
and <foreach item="item" index="index" collection="map.content_type.split(',')" open="(" separator="or" close=")">
FIND_IN_SET('${item}',a.content_type)
</foreach>
</if>
<if test="map.content_description!=null">
and a.content_description like CONCAT("%",#{map.content_description},"%")
@ -337,6 +339,9 @@
<if test="map.content_details!=null">
and a.content_details like CONCAT("%",#{map.content_details},"%")
</if>
<if test="map.content_datetime_start!=null and map.content_datetime_end!=null">
and a.content_datetime between #{map.content_datetime_start} and #{map.content_datetime_end}
</if>
<if test="tableName!=null and tableName!='' and diyMap!=null">
<foreach item="item" index="index" collection="diyList" open=""
separator="" close="">

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

@ -21,10 +21,8 @@
<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">{ms: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>
<a href="http://doc.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>
@ -157,8 +155,8 @@
<el-form-item prop="categoryDiyUrl">
<template slot='label'>自定义链接
<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"
target="_blank">[field.typeurl/]</a>
<a href="http://doc.mingsoft.net/plugs-cms/biao-qian/lan-mu-lie-biao-ms-channel.html"
target="_blank">${'$'}{field.typeurl}</a>
<i class="el-icon-question" slot="reference"></i>
</el-popover>
</template>
@ -174,8 +172,8 @@
<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/lan-mu-lie-biao-ms-channel.html"
target="_blank">[field.typekeyword/]</a>
<a href="http://doc.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>
@ -190,8 +188,8 @@
<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/lan-mu-lie-biao-ms-channel.html"
target="_blank">[field.typedescrip/]</a>
<a href="http://doc.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>
@ -206,10 +204,8 @@
<el-form-item label="" prop="categoryImg" >
<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">{ms:field.typelitpic/}</a>
<a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/lan-mu-lie-biao-ms-channel.html"
target="_blank">[field.typelitpic/]</a>
<a href="http://doc.mingsoft.net/plugs-cms/biao-qian/lan-mu-lie-biao-ms-channel.html"
target="_blank">${'$'}{field.typelitpic}</a>
<i class="el-icon-question" slot="reference"></i>
</el-popover>
</template>

58
src/main/webapp/WEB-INF/manager/cms/content/form.ftl
Unescape View File

@ -24,10 +24,8 @@
<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">{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>
<a href="http://doc.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>
@ -43,8 +41,8 @@
<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">{ms:field.typetitle/}</a>
<a href="http://doc.mingsoft.net/plugs-cms/biao-qian/wen-zhang-lie-biao-ms-arclist.html"
target="_blank">${'$'}{field.typetitle}</a>
<i class="el-icon-question" slot="reference"></i>
</el-popover>
</template>
@ -60,6 +58,12 @@
justify="start" align="top">
<el-col span="12">
<el-form-item label="文章类型" prop="contentType">
<template slot='label'>文章类型
<el-popover placement="top-start" title="提示" trigger="hover">
用于筛选文章，在自定义字典添加
<i class="el-icon-question" slot="reference"></i>
</el-popover>
</template>
<el-select v-model="form.contentType"
:style="{width: '100%'}"
:filterable="false"
@ -76,10 +80,8 @@
<el-form-item label="发布时间" prop="contentDatetime">
<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">{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>
<a href="http://doc.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>
</el-popover>
</template>
@ -107,10 +109,8 @@
<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">{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>
<a href="http://doc.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>
@ -126,10 +126,8 @@
<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">{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>
<a href="http://doc.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>
@ -180,10 +178,8 @@
<template slot='label'>文章缩略图
<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">{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>
<a href="http://doc.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>
@ -206,10 +202,8 @@
<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">{{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>
<a href="http://doc.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>
@ -224,10 +218,8 @@
<el-form-item label="描述" prop="contentDescription">
<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">{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>
<a href="http://doc.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>
</el-popover>
</template>
@ -242,10 +234,8 @@
<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">{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>
<a href="http://doc.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>

4
src/main/webapp/templets/1/default/search.htm
Unescape View File

@ -19,8 +19,8 @@
{ms:arclist size=10 ispaging=true}
<li>
<a href="{ms:global.url/}/[field.link/]">
[field.title/]
<span class="ms-content-main-li-time">[field.date?string("yyyy-MM-dd")/]</span>
${field.title}
<span class="ms-content-main-li-time">${field.date?string("yyyy-MM-dd")}</span>
</a>
</li>
{/ms:arclist}

Write Preview
Loading…
Cancel
Save