Skip to content
GitLab
"...src/main/git@ustchcs.com:gujinli1118/springboot-plus.git" did not exist on "c83b07feb6dd7354a4010932027a2bff0424ceb5"
Commit 175c8d55 authored by 铭飞's avatar 铭飞 Committed by Gitee
Browse files

!203 问号标签提示 

Merge pull request !203 from 小伍/5.0.0
parents 95e0ee01 f8a59a5e
Expand all Show whitespace changes
Inline Side-by-side
doc/5.0/cms-content图片转化.sql deleted 100644 → 0
View file @ 95e0ee01
UPDATE cms_content
SET content_img = concat( '[{"path":"', content_img, '"}]' )
WHERE
content_img IS NOT NULL
AND trim( content_img ) != ''
\ No newline at end of file
doc/5.0/cms-content转化.sql deleted 100644 → 0
View file @ 95e0ee01
INSERT INTO cms_content (
cms_content.id,
cms_content.app_id,
cms_content.content_url,
cms_content.content_details,
cms_content.content_keyword,
cms_content.content_description,
cms_content.content_img,
cms_content.content_sort,
cms_content.content_datetime,
cms_content.content_source,
cms_content.content_author,
cms_content.content_display,
cms_content.content_type,
cms_content.content_category_id,
cms_content.content_title,
cms_content.content_hit
)
SELECT
basic.basic_id,
cms_article.article_webid,
cms_article.article_url,
cms_article.article_content,
cms_article.article_keyword,
basic.basic_description,
basic.basic_thumbnails,
basic.basic_sort,
basic.basic_datetime,
cms_article.article_source,
cms_article.article_author,
basic.basic_display,
cms_article.article_type,
basic.basic_categoryid,
basic.basic_title,
basic.basic_hit
FROM
basic
INNER JOIN cms_article ON cms_article.article_basicid = basic.basic_id
doc/5.0/cms_category转化.sql deleted 100644 → 0
View file @ 95e0ee01
INSERT INTO cms_category (
cms_category.id,
cms_category.category_title,
cms_category.category_sort,
cms_category.category_parent_id,
cms_category.category_path,
cms_category.category_flag,
cms_category.dict_id,
cms_category.app_id,
cms_category.category_manager_id,
cms_category.category_datetime,
cms_category.mdiy_model_id,
cms_category.category_diy_url,
cms_category.category_img,
cms_category.category_descrip,
cms_category.category_keyword,
cms_category.category_url,
cms_category.category_list_url,
cms_category.category_type,
cms_category.category_id
) SELECT
category.category_id,
category.category_title,
category.category_sort,
category.category_parent_id,
basic_column.column_path,
basic_column.column_flag,
category.category_dict_id,
category.category_appid,
category.category_managerid,
category.category_datetime,
basic_column.column_cm_id,
basic_column.column_diy_url,
category.category_smallimg,
basic_column.column_descrip,
basic_column.column_keyword,
basic_column.column_url,
basic_column.column_listurl,
basic_column.column_type,
category.category_categoryid
FROM
basic_column
INNER JOIN category ON basic_column.column_category_id = category.category_id
\ No newline at end of file
doc/5.0/db-mcms-5.0.sql deleted 100644 → 0
View file @ 95e0ee01
This diff is collapsed.
doc/db-mcms-5.0.sql 0 → 100644
View file @ 175c8d55
This source diff could not be displayed because it is too large. You can view the blob instead.
src/main/webapp/WEB-INF/manager/cms/category/index.ftl
View file @ 175c8d55
...@@ -34,38 +34,17 @@ ...@@ -34,38 +34,17 @@
<el-table-column label="编号" width="120" prop="id"> <el-table-column label="编号" width="120" prop="id">
<template slot='header'>编号 <template slot='header'>编号
<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">{field.typeid/}</a> <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/nei-rong-biao-qian-ms-field.html" target="_blank">{ms:field.typeid/}</a>
<a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/lan-mu-lie-biao-ms-channel.html" target="_blank">[field.typeid/]</a> <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/lan-mu-lie-biao-ms-channel.html" target="_blank">[field.typeid/]</a>
<i class="el-icon-question" slot="reference"></i> <i class="el-icon-question" slot="reference"></i>
</el-popover> </el-popover>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="标题" align="left" prop="categoryTitle"> <el-table-column label="标题" align="left" prop="categoryTitle">
<template slot='header'>标题
<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">{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>
<i class="el-icon-question" slot="reference"></i>
</el-popover>
</template>
</el-table-column> </el-table-column>
<el-table-column label="属性" align="center" prop="categoryType" :formatter="categoryTypeFormat" width="70"> <el-table-column label="属性" align="center" prop="categoryType" :formatter="categoryTypeFormat" width="70">
<template slot='header'>属性
<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">{field.flag/}</a>
<a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/lan-mu-lie-biao-ms-channel.html" target="_blank">[field.flag/]</a>
<i class="el-icon-question" slot="reference"></i>
</el-popover>
</template>
</el-table-column> </el-table-column>
<el-table-column label="链接地址" align="left" prop="categoryPath" show-overflow-tooltip> <el-table-column label="链接地址" align="left" prop="categoryPath" show-overflow-tooltip>
<template slot='header'>链接地址
<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">{field.typelink/}</a>
<a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/lan-mu-lie-biao-ms-channel.html" target="_blank">[field.typelink/]</a>
<i class="el-icon-question" slot="reference"></i>
</el-popover>
</template>
<template slot-scope="scope"> <template slot-scope="scope">
<span style="cursor: pointer" class="copyBtn" :data-clipboard-text="'{ms:global.url/}'+scope.row.categoryPath+'/index.html'" @click="copyUrl">{{"{ms:global.url/}"+scope.row.categoryPath+"/index.html"}}</span> <span style="cursor: pointer" class="copyBtn" :data-clipboard-text="'{ms:global.url/}'+scope.row.categoryPath+'/index.html'" @click="copyUrl">{{"{ms:global.url/}"+scope.row.categoryPath+"/index.html"}}</span>
</template> </template>
......
src/main/webapp/WEB-INF/manager/cms/content/form.ftl
View file @ 175c8d55
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
<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">{field.title/}</a> <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.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>
...@@ -44,8 +44,7 @@ ...@@ -44,8 +44,7 @@
<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">{field.typeid/}</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>
<a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/wen-zhang-lie-biao-ms-arclist.html" target="_blank">[field.typeid/]</a>
<i class="el-icon-question" slot="reference"></i> <i class="el-icon-question" slot="reference"></i>
</el-popover> </el-popover>
</template> </template>
...@@ -75,6 +74,13 @@ ...@@ -75,6 +74,13 @@
</el-col> </el-col>
<el-col span="12"> <el-col span="12">
<el-form-item label="发布时间" prop="contentDatetime"> <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>
<i class="el-icon-question" slot="reference"></i>
</el-popover>
</template>
<el-date-picker <el-date-picker
v-model="form.contentDatetime" v-model="form.contentDatetime"
placeholder="请选择发布时间" placeholder="请选择发布时间"
...@@ -99,7 +105,7 @@ ...@@ -99,7 +105,7 @@
<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">{field.author/}</a> <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.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>
...@@ -116,7 +122,7 @@ ...@@ -116,7 +122,7 @@
<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">{field.source/}</a> <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.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>
...@@ -165,7 +171,7 @@ ...@@ -165,7 +171,7 @@
<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">{field.litpic/}</a> <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.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>
...@@ -186,37 +192,42 @@ ...@@ -186,37 +192,42 @@
<div slot="tip" class="el-upload__tip">最多上传1张图片</div> <div slot="tip" class="el-upload__tip">最多上传1张图片</div>
</el-upload> </el-upload>
</el-form-item> </el-form-item>
<el-form-item label="描述" prop="contentDescription"> <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>
<i class="el-icon-question" slot="reference"></i>
</el-popover>
</template>
<el-input <el-input
type="textarea" :rows="5" type="textarea" :rows="5"
:disabled="false" :disabled="false"
v-model="form.contentKeyword"
v-model="form.contentDescription"
:style="{width: '100%'}" :style="{width: '100%'}"
placeholder="请输入对该文章的简短描述，以便用户查看文章简略"> placeholder="请输入文章关键字">
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="关键字" prop="contentKeyword"> <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">{field.keyword/}</a> <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.keyword/]</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>
<el-input <el-input
type="textarea" :rows="5" type="textarea" :rows="5"
:disabled="false" :disabled="false"
v-model="form.contentDescription"
v-model="form.contentKeyword"
:style="{width: '100%'}" :style="{width: '100%'}"
placeholder="请输入文章关键字"> placeholder="请输入对该文章的简短描述，以便用户查看文章简略">
</el-input> </el-input>
</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">{field.content/}</a> <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.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>
......
src/main/webapp/WEB-INF/manager/cms/content/main.ftl
View file @ 175c8d55
...@@ -63,45 +63,24 @@ ...@@ -63,45 +63,24 @@
<el-table-column label="编号" width="70" prop="id"> <el-table-column label="编号" width="70" prop="id">
<template slot='header'>编号 <template slot='header'>编号
<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">{field.id/}</a> <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/nei-rong-biao-qian-ms-field.html" target="_blank">{ms:field.id/}</a>
<a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/wen-zhang-lie-biao-ms-arclist.html" target="_blank">[field.id/]</a> <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/wen-zhang-lie-biao-ms-arclist.html" target="_blank">[field.id/]</a>
<i class="el-icon-question" slot="reference"></i> <i class="el-icon-question" slot="reference"></i>
</el-popover> </el-popover>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="栏目名" align="left" prop="contentCategoryId" :formatter="contentCategoryIdFormat" width="100"> <el-table-column label="栏目名" align="left" prop="contentCategoryId" :formatter="contentCategoryIdFormat" width="100">
<template slot='header'>栏目名
<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">{field.typename/}</a>
<a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/wen-zhang-lie-biao-ms-arclist.html" target="_blank">[field.typename/]</a>
<i class="el-icon-question" slot="reference"></i>
</el-popover>
</template>
</el-table-column> </el-table-column>
<el-table-column label="文章标题" align="left" prop="contentTitle" show-overflow-tooltip> <el-table-column label="文章标题" align="left" prop="contentTitle" show-overflow-tooltip>
<template slot='header'>文章标题
<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">{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>
</el-popover>
</template>
</el-table-column> </el-table-column>
<el-table-column label="作者" align="left" prop="contentAuthor" width="100" show-overflow-tooltip> <el-table-column label="作者" align="left" prop="contentAuthor" width="100" show-overflow-tooltip>
<template slot='header'>作者
<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">{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>
</el-popover>
</template>
</el-table-column> </el-table-column>
<el-table-column label="排序" width="55" align="right" prop="contentSort"> <el-table-column label="排序" width="55" align="right" prop="contentSort">
</el-table-column> </el-table-column>
<el-table-column label="点击量" width="90" align="right" prop="contentHit"> <el-table-column label="点击量" width="90" align="right" prop="contentHit">
<template slot='header'>点击量 <template slot='header'>点击量
<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">{field.hit/}</a> <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/nei-rong-biao-qian-ms-field.html" target="_blank">{ms:field.hit/}</a>
<a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/wen-zhang-lie-biao-ms-arclist.html" target="_blank">[field.hit/]</a> <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/wen-zhang-lie-biao-ms-arclist.html" target="_blank">[field.hit/]</a>
<i class="el-icon-question" slot="reference"></i> <i class="el-icon-question" slot="reference"></i>
</el-popover> </el-popover>
......
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