|
@@ -23,7 +23,7 @@
|
|
|
</el-aside>
|
|
|
<el-main>
|
|
|
<div>
|
|
|
- <myFormSearch :logical="logical" :logicalProps="logicalProps" :list="(editData && editData.component == 'customSearch')?editData.data:list" :operator="operator" :field="field" :searchValue="true" @search="search"></myFormSearch>
|
|
|
+ <myFormSearch :list="(editData && editData.component == 'customSearch')?editData.data:list" :operator="operator" :field="field" :searchValue="true" @search="search"></myFormSearch>
|
|
|
</div>
|
|
|
</el-main>
|
|
|
</el-container>
|
|
@@ -42,25 +42,7 @@ export default {
|
|
|
height:document.getElementsByClassName('el-main')[0].clientHeight,
|
|
|
checkList:[],
|
|
|
checked:false,
|
|
|
- //逻辑符
|
|
|
- logical:[
|
|
|
- {
|
|
|
- name:'并且',
|
|
|
- value:'AND'
|
|
|
- },
|
|
|
- {
|
|
|
- name:'或者',
|
|
|
- value:'OR'
|
|
|
- },
|
|
|
- {
|
|
|
- name:'非',
|
|
|
- value:'NOT'
|
|
|
- },
|
|
|
- ],
|
|
|
- logicalProps:{
|
|
|
- label:'name',
|
|
|
- value:'value'
|
|
|
- },
|
|
|
+
|
|
|
//运算符
|
|
|
operator:[
|
|
|
{
|