|
@@ -19,6 +19,10 @@
|
|
</el-select>
|
|
</el-select>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
|
|
|
|
|
+ <el-form-item label="搜索" prop="content">
|
|
|
|
+ <el-input v-model="searchInfo.content" clearable> </el-input>
|
|
|
|
+ </el-form-item>
|
|
|
|
+
|
|
<el-form-item >
|
|
<el-form-item >
|
|
<el-button @click="createPaperItem" type="primary">添加内容</el-button>
|
|
<el-button @click="createPaperItem" type="primary">添加内容</el-button>
|
|
<el-button @click="flushAll" type="primary">刷新</el-button>
|
|
<el-button @click="flushAll" type="primary">刷新</el-button>
|
|
@@ -37,9 +41,9 @@
|
|
<div v-html="row.desc" style="height: 50px;text-overflow: ellipsis;overflow: hidden;"> </div>
|
|
<div v-html="row.desc" style="height: 50px;text-overflow: ellipsis;overflow: hidden;"> </div>
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
- <el-table-column prop="text" label="文本">
|
|
|
|
|
|
+ <el-table-column prop="text" label="文本或json">
|
|
<template slot-scope="{ row }">
|
|
<template slot-scope="{ row }">
|
|
- <div v-html="row.text" style="height: 50px;text-overflow: ellipsis;overflow: hidden;"> </div>
|
|
|
|
|
|
+ <div v-html="row.text||row.content" style="height: 50px;text-overflow: ellipsis;overflow: hidden;"> </div>
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
<!-- <el-table-column prop="video" label="视频" ></el-table-column> -->
|
|
<!-- <el-table-column prop="video" label="视频" ></el-table-column> -->
|
|
@@ -94,7 +98,7 @@
|
|
<el-col :span="12">
|
|
<el-col :span="12">
|
|
<el-form-item label="父节点" prop="parentId">
|
|
<el-form-item label="父节点" prop="parentId">
|
|
<el-select v-model="form.parentId" clearable>
|
|
<el-select v-model="form.parentId" clearable>
|
|
- <el-option v-for="(item,index) in children"
|
|
|
|
|
|
+ <el-option v-for="(item,index) in tableData"
|
|
:value="item.id"
|
|
:value="item.id"
|
|
:key="index"
|
|
:key="index"
|
|
:label="item.id">
|
|
:label="item.id">
|
|
@@ -102,6 +106,13 @@
|
|
</el-select>
|
|
</el-select>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
</el-col>
|
|
</el-col>
|
|
|
|
+
|
|
|
|
+ <el-col :span="24">
|
|
|
|
+ <el-form-item label="json文本" prop="content">
|
|
|
|
+ <el-input v-model="form.content" style="width: 600px;" type="textarea"/>
|
|
|
|
+ </el-form-item>
|
|
|
|
+ </el-col>
|
|
|
|
+
|
|
<el-col :span="24" v-if="form.type=='image'">
|
|
<el-col :span="24" v-if="form.type=='image'">
|
|
<el-form-item label="图片地址" prop="parentId">
|
|
<el-form-item label="图片地址" prop="parentId">
|
|
<el-input v-model="form.image" style="width: 600px;"/>
|
|
<el-input v-model="form.image" style="width: 600px;"/>
|
|
@@ -192,8 +203,8 @@
|
|
return item.text||item.marks||item.desc||(''+item.id);
|
|
return item.text||item.marks||item.desc||(''+item.id);
|
|
}
|
|
}
|
|
const gbForm = {
|
|
const gbForm = {
|
|
- children: [],desc: "",id: 0,preview: 0,style:'',text:'',type:'',video:'',
|
|
|
|
- image: "", link: 0,marks: "",nodeId: "main",orderId: 0,parentId: 0,poster: ""
|
|
|
|
|
|
+ children: [],desc: "",id: 0,preview: 0,style:'',text:'',type:'',video:'',content:'',
|
|
|
|
+ image: "", link: 0,marks: "",nodeId: "main",orderId: 0,parentId: 0,poster: "",isJson:0
|
|
}
|
|
}
|
|
export default {
|
|
export default {
|
|
name: 'application',
|
|
name: 'application',
|
|
@@ -206,7 +217,7 @@
|
|
size:10,
|
|
size:10,
|
|
getTitle,
|
|
getTitle,
|
|
form: Object.assign({}, gbForm),
|
|
form: Object.assign({}, gbForm),
|
|
- typeList:['json','image','video','slider','matrix','title','text','tabs','table-texts','bold-text'],
|
|
|
|
|
|
+ typeList:['image','title','text','form','form-input','form-radio','form-datetime','video','slider','matrix','tabs','table-texts','bold-text'],
|
|
dialogItem: false,
|
|
dialogItem: false,
|
|
nodeId:'main',
|
|
nodeId:'main',
|
|
children: [],
|
|
children: [],
|
|
@@ -215,6 +226,7 @@
|
|
paperStyleList:[],
|
|
paperStyleList:[],
|
|
searchInfo:{
|
|
searchInfo:{
|
|
type:'',
|
|
type:'',
|
|
|
|
+ content:'',
|
|
},
|
|
},
|
|
rules: {
|
|
rules: {
|
|
type: [{ required: true, message: "请选择类型", trigger: "blur" }],
|
|
type: [{ required: true, message: "请选择类型", trigger: "blur" }],
|
|
@@ -281,10 +293,14 @@
|
|
},
|
|
},
|
|
filterData(){
|
|
filterData(){
|
|
let nodeId = this.nodeId||'main';
|
|
let nodeId = this.nodeId||'main';
|
|
- let {type}= this.searchInfo;
|
|
|
|
|
|
+ let {type, content}= this.searchInfo;
|
|
this.tableData = this.children.filter( item =>{
|
|
this.tableData = this.children.filter( item =>{
|
|
if( item.nodeId != nodeId) return false;
|
|
if( item.nodeId != nodeId) return false;
|
|
- if( type && item.type != type) return false
|
|
|
|
|
|
+ if( type && item.type != type) return false;
|
|
|
|
+ if( content){
|
|
|
|
+ let allcontent = item.text + item.marks + item.desc;
|
|
|
|
+ if(allcontent.indexOf(content)==-1) return false;
|
|
|
|
+ }
|
|
return true
|
|
return true
|
|
})
|
|
})
|
|
},
|
|
},
|