owl-cli 5.30.0 → 5.33.0

package/defaultTemplate/api/src/handlers/list.jsx

@@ -13,6 +13,26 @@ function trim(s){
 }
 var spec = @spec;
 
+function buildSort(sort){
+  if(!sort){
+    return null;
+  }
+  var result = [];
+  for(var k in sort){
+    var direction = sort[k];
+    if(direction === 'ascend'){
+      var sortItem = {};
+      sortItem[k] = [{"order":"asc"}]
+      result.push(sortItem);
+    }
+    else if(direction === 'descend'){
+      var sortItem = {};
+      sortItem[k] = [{"order":"desc"}]
+      result.push(sortItem);
+    }
+  }
+  return result;
+}
 ;(function(){
 
   var env = checklogin();
@@ -34,12 +54,13 @@ var spec = @spec;
   var keyword = searchArgs.keyword;
   var pageSize = params.pageSize;
   var page = params.page;
+  var sort = params.sort;
   var recycleBin = searchArgs.recycleBin;
   // $.log("searchArgs=" + JSON.stringify(searchArgs));
   delete searchArgs.recycleBin;
   // $.log("recycleBin=" + recycleBin);
 
-
+  var effectiveSort = buildSort(sort);
   if(!page){
     page = 1;
   }
@@ -71,6 +92,13 @@ var spec = @spec;
         }
         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});
+        }
+      }
       else{
         var term = {};
         if(v){
@@ -94,14 +122,14 @@ var spec = @spec;
 
     if(meta && meta.isTree && env.orgId!=='0'){
       if(meta.root){
-          if(meta.root.startsWith("$")){
-            var rootId = eval(meta.root.substring(1));
-            filters.push({
-              "term":{
-                "parentPathIds" : rootId
-              }
-            })
-          }
+        if(meta.root.startsWith("$")){
+          var rootId = eval(meta.root.substring(1));
+          filters.push({
+            "term":{
+              "parentPathIds" : rootId
+            }
+          })
+        }
       }
     }
     return filters;
@@ -110,7 +138,7 @@ var spec = @spec;
   var filters = getFilters();
 
   if(roleId){
-    var tablePermission = getTablePermission("@projectCode",loginId,roleId);
+    var tablePermission = getTablePermission("owl_wh_receipt",loginId,roleId);
     if(tablePermission && tablePermission.filters){
       filters = filters.concat(tablePermission.filters);
     }
@@ -143,7 +171,7 @@ var spec = @spec;
         }
       },
       "from" : from, "size" : pageSize,
-      sort:[{owl_createTime:{order:"desc"}}]
+      sort:effectiveSort || [{owl_createTime:{order:"desc"}}]
     }
   }
   else{
@@ -164,7 +192,7 @@ var spec = @spec;
         }
       },
       "from" : from, "size" : pageSize,
-      sort:[{owl_createTime:{order:"desc"}}]
+      sort:effectiveSort || [{owl_createTime:{order:"desc"}}]
     }
   }
 
@@ -179,7 +207,7 @@ var spec = @spec;
     var basicAuth = "Basic " + auth;
     headers["Authorization"] = basicAuth;
   }
-  var searchUrl = elasticSearchUrl+"/@projectCode/_search";
+  var searchUrl = elasticSearchUrl+"/owl_wh_receipt/_search";
 
   var sndTxt = JSON.stringify(query);
   $.log(sndTxt);
@@ -194,7 +222,7 @@ var spec = @spec;
   var objs = hits.map(function(hit){return hit._source});
 
 
-  var countUrl = elasticSearchUrl+"/@projectCode/_count";
+  var countUrl = elasticSearchUrl+"/owl_wh_receipt/_count";
 
   var ss = HttpUtils.postRaw( countUrl, sndTxt, headers);
   var cr = JSON.parse(ss);
@@ -202,7 +230,7 @@ var spec = @spec;
   var count = result.count;
 //这里重新从pigeon取了一次数据，做了删除的判断
 // var ids = hits.map(function(hit){return hit._source.id});
-// var list = @projectCodeService.getObjects(ids);
+// var list = owl_wh_receiptService.getObjects(ids);
 // var objs  = list.filter(function(value){
 //   return value.del != "T";
 // });
@@ -214,7 +242,4 @@ var spec = @spec;
   }
   out.print(JSON.stringify(ret));
 
-})();
-
-
-
+})();

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

@@ -875,8 +875,20 @@ var @projectCodeService = (function (pigeon) {
         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,17 +991,14 @@ var @projectCodeService = (function (pigeon) {
                                 "query":keywordQuery
                             }
                         },
-                        "must_not": {
-                            "match": {
-                                "del": "T"
-                            }
-                        },
+                        "must_not": must_not,
                         "filter": filters
                     }
                 }
             }
             return query;
         },
+
         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.30.0",
+  "version": "5.33.0",
   "main": "index.js",
   "preferGlobal": true,
   "bin": {