Przeglądaj źródła

修改高级检索的逻辑符

zhuliu 1 rok temu
rodzic
commit
1474ab43ee

+ 7 - 4
src/utils/model/search/search.vue

@@ -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'
                 },
             ] }
         },

+ 2 - 20
src/views/components/import/conditionImport/customSearch.vue

@@ -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:[
                 {