owl-cli 6.89.0 → 6.91.0

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

@@ -943,7 +943,7 @@ var @projectCodeService = (function (pigeon) {
             return filters;
         },
 
-        buildQuery:function(m,searchArgs,keyword){
+        buildQuery:function(mfilters,searchArgs,keyword){
             delete searchArgs.keyword;
             var filters = [];
             var must_not = [{
@@ -1034,16 +1034,8 @@ var @projectCodeService = (function (pigeon) {
                     }
                 }
             }
-            if(m !== '0'){
-                filters = filters.concat([
-                    {"term": { "_m.keyword": m }}
-                ]);
-            }
-            else{
-                //如果m === '0'，代表是平台
-                // filters = filters.concat([
-                //     {"term":{"_t":spec["_t"]}}
-                // ]);
+            if(mfilters && Array.isArray(mfilters) && mfilters.length>0){
+                filters = filters.concat(mfilters);
             }
 
             //getKeyword query
@@ -1070,8 +1062,8 @@ var @projectCodeService = (function (pigeon) {
             return query;
         },
 
-        count:function(m,searchArgs,keyword,dataSource){
-            var query = f.buildQuery(m,searchArgs,keyword);
+        count:function(mfilters,searchArgs,keyword,dataSource){
+            var query = f.buildQuery(mfilters,searchArgs,keyword);
             var elasticSearchUrl = $.getEnv( "elasticSearchUrl" );
 
             var headers = { "Content-Type": "application/json;charset=utf-8" };
@@ -1095,8 +1087,8 @@ var @projectCodeService = (function (pigeon) {
             }
             return 0;
         },
-        search: function(m, searchArgs, keyword,from, pageSize, sort, dataSource){
-            var query = f.buildQuery(m,searchArgs,keyword);
+        search: function(mfilters, searchArgs, keyword,from, pageSize, sort, dataSource){
+            var query = f.buildQuery(mfilters,searchArgs,keyword);
             var effectiveSort = [{owl_createTime:{order:"desc"}}];
             if(sort){
                 effectiveSort = sort;

package/package.json

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