owl-cli 6.144.0 → 6.147.0

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

@@ -1006,7 +1006,13 @@ var @projectCodeService = (function (pigeon) {
             return filters;
         },
 
-        buildQuery:function(mfilters,searchArgs,keyword,isRecycleBin){
+        buildQuery:function(mfilters,searchArgs,keyword,isRecycleBin,meta_fields){
+            if(!meta_fields){
+                var meta = spec["#meta"];
+                if(meta){
+                    meta_fields = spec["#meta"]["keyword_fields"];
+                }
+            }
             delete searchArgs.keyword;
             var filters = [];
             var must_not = [{
@@ -1118,14 +1124,28 @@ var @projectCodeService = (function (pigeon) {
             else{
                 keywordQuery = "*"
             }
+            var keyword_fields = null;
+            if(meta_fields && Array.isArray(meta_fields) && meta_fields.length>0){
+                keyword_fields = meta_fields;
+            }
+            var queryStringQuery = {
+                "query_string": {
+                    "query":keywordQuery
+                }
+            }
+
+            if(keyword_fields && keyword_fields.length>0){
+                queryStringQuery = {
+                    "query_string": {
+                        "query":keywordQuery,
+                        "fields":keyword_fields,
+                    }
+                }
+            }
             var query = {
                 "query": {
                     "bool": {
-                        "must": {
-                            "query_string": {
-                                "query":keywordQuery
-                            }
-                        },
+                        "must": queryStringQuery,
                         "must_not": must_not,
                         "filter": filters
                     }
@@ -1134,8 +1154,8 @@ var @projectCodeService = (function (pigeon) {
             return query;
         },
 
-        count:function(mfilters,searchArgs,keyword,dataSource,isRecycleBin){
-            var query = f.buildQuery(mfilters,searchArgs,keyword,isRecycleBin);
+        count:function(mfilters,searchArgs,keyword,dataSource,isRecycleBin,meta_fields){
+            var query = f.buildQuery(mfilters,searchArgs,keyword,isRecycleBin,meta_fields);
             var elasticSearchUrl = $.getEnv( "elasticSearchUrl" );
 
             var headers = { "Content-Type": "application/json;charset=utf-8" };
@@ -1159,8 +1179,8 @@ var @projectCodeService = (function (pigeon) {
             }
             return 0;
         },
-        search: function(mfilters, searchArgs, keyword,from, pageSize, sort, dataSource,isRecycleBin){
-            var query = f.buildQuery(mfilters,searchArgs,keyword,isRecycleBin);
+        search: function(mfilters, searchArgs, keyword,from, pageSize, sort, dataSource,isRecycleBin,meta_fields){
+            var query = f.buildQuery(mfilters,searchArgs,keyword,isRecycleBin,meta_fields);
             // var effectiveSort = [{owl_createTime:{order:"desc"}}];
             var effectiveSort = [];
             if(sort){

package/package.json

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