owl-cli 5.29.0 → 5.32.0

package/defaultTemplate/api/src/services/modelService.jsx

@@ -872,11 +872,23 @@ var @projectCodeService = (function (pigeon) {
             return filters;
         },
 
-        buildQuery(m,searchArgs,keyword){
+        buildQuery:function(m,searchArgs,keyword){
             delete searchArgs.keyword;
             var filters = [];
+            var must_not = [{
+                term:{
+                    del:'T'
+                }
+            }];
             for(var k in searchArgs){
+
                 var v = searchArgs[k];
+
+                var isNotClause = false;
+                if(k.indexOf("!")===0){
+                    isNotClause = true;
+                    k = k.substring(1);
+                }
                 if(typeof v === 'object' && v.type === 'or'){
                     var shouldClauses = [];
                     if(Array.isArray(v.args)){
@@ -887,12 +899,21 @@ var @projectCodeService = (function (pigeon) {
                             }
 
                         });
-                        filters.push({bool:{should:shouldClauses}});
+                        if(isNotClause){
+                            must_not.push({bool:{should:shouldClauses}});
+                        }else{
+                            filters.push({bool:{should:shouldClauses}});
+                        }
+
                     }
                     else{
                         if(v.args && typeof(v.args)==='object'){
                             var shouldQueries = f.createQuery(v);
-                            filters.push({bool:{filter:shouldQueries}});
+                            if(isNotClause){
+                                must_not.push({bool:{should:shouldClauses}});
+                            }else{
+                                filters.push({bool:{should:shouldClauses}});
+                            }
                         }
                     }
                 }
@@ -902,13 +923,21 @@ var @projectCodeService = (function (pigeon) {
                         'gte':v[0],
                         'lte':v[1]
                     }
-                    filters.push({range:range});
+                    if(isNotClause){
+                        must_not.push({range:range});
+                    }else{
+                        filters.push({range:range});
+                    }
                 }
                 else if(typeof(v)=='object' && v.type==='terms'){
                     var terms = {};
                     if(v.values){
                         terms[k + ".keyword"] = v.values;
-                        filters.push({terms:terms});
+                        if(isNotClause){
+                            must_not.push({terms:terms});
+                        }else{
+                            filters.push({terms:terms});
+                        }
                     }
                 }
                 else{
@@ -916,12 +945,21 @@ var @projectCodeService = (function (pigeon) {
                     if(typeof v == 'string' ){
                         if(v){
                             term[k+".keyword"] = trim('' + v)
-                            filters.push({term:term})
+                            if(isNotClause){
+                                must_not.push({term:term});
+                            }else{
+                                filters.push({term:term});
+                            }
+
                         }
                     }
                     else if (typeof v == 'number'){
                         term[k] = trim('' + v)
-                        filters.push({term:term})
+                        if(isNotClause){
+                            must_not.push({term:term});
+                        }else{
+                            filters.push({term:term});
+                        }
                     }
                 }
             }
@@ -953,18 +991,15 @@ var @projectCodeService = (function (pigeon) {
                                 "query":keywordQuery
                             }
                         },
-                        "must_not": {
-                            "match": {
-                                "del": "T"
-                            }
-                        },
+                        "must_not": must_not,
                         "filter": filters
                     }
                 }
             }
             return query;
         },
-        count(m,searchArgs,keyword,dataSource){
+
+        count:function(m,searchArgs,keyword,dataSource){
             var query = f.buildQuery(m,searchArgs,keyword);
             var elasticSearchUrl = $.getEnv( "elasticSearchUrl" );
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "owl-cli",
-  "version": "5.29.0",
+  "version": "5.32.0",
   "main": "index.js",
   "preferGlobal": true,
   "bin": {