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:
panpp 2020-07-01 09:16:34 +08:00
parent db3741229e 5be80533b1
commit 33df7e9f8a
1 changed files with 13 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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;