@@ -13,7 +13,7 @@
<el-option
v-for="item in logical"
:key="item[logicalProps.value]"
- :label="item[logicalProps.value]"
+ :label="item[logicalProps.label]"
:value="item[logicalProps.value]">
</el-option>
</el-select>
@@ -129,15 +129,18 @@ export default {
default: ()=>{ return [
{
name:'并且',
- value:'AND'
+ label:'AND',
+ value:'AND',
},
name:'或者',
- value:'OR'
+ label:'OR',
+ value:'OR',
name:'非',
- value:'NOT'
+ label:'NOT',
+ value:'AND NOT'
] }
@@ -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:'并且',
- },
- name:'或者',
- name:'非',
- ],
- logicalProps:{
- label:'name',
- value:'value'
+
//运算符
operator:[