owl-cli 7.23.0 → 7.26.0

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

@@ -755,7 +755,7 @@ var @projectCodeService = (function (pigeon) {
             data.owl_lastModifiedUserId = userId;
             data.owl_lastModifiedIp = ip;
             data.owl_lastModifiedUserAgent = ua;
-            data.obj.owl_modifyTime = new Date().getTime();
+            data.owl_modifyTime = new Date().getTime();
 
             var key = pigeon.getRKey(data['owl_createTime'], 13)
             pigeon.deleteFromList(f.getAllListName(), key, id)
@@ -1035,6 +1035,20 @@ var @projectCodeService = (function (pigeon) {
             return filters;
         },
 
+        // 构建通配查询（将 SQL 风格的 % 转为 ES 的 *）
+        buildWildcardQuery:function(k, v){
+            // v 预期包含 % 作为通配符标记，转换为 ES 的 *
+            var value = ('' + v).replace(/%/g, '*');
+            var field = k + ".keyword";
+            var wildcard = {};
+            wildcard[field] = {
+                value: value,
+                // 在 ES 7.10+ 支持不区分大小写
+                case_insensitive: true
+            };
+            return { wildcard: wildcard };
+        },
+
         buildQuery:function(mfilters,searchArgs,keyword,isRecycleBin,meta_fields){
             if(!meta_fields){
                 var meta = spec["#meta"];
@@ -1085,14 +1099,7 @@ var @projectCodeService = (function (pigeon) {
 
                     }
                     else{
-                        if(v.args && typeof(v.args)==='object'){
-                            var shouldQueries = f.createQuery(v);
-                            if(isNotClause){
-                                must_not.push({bool:{should:shouldClauses}});
-                            }else{
-                                filters.push({bool:{should:shouldClauses}});
-                            }
-                        }
+                      //do noting,所以 or 语句不支持 单个对象，必须带一个 args 数组
                     }
                 }
                 else if(typeof(v)=='object' && Array.isArray(v)){
@@ -1124,9 +1131,19 @@ var @projectCodeService = (function (pigeon) {
                         if(v){
                             term[k+".keyword"] = trim('' + v)
                             if(isNotClause){
-                                must_not.push({term:term});
+                                if(v.indexOf('%')>-1){
+                                    must_not.push(f.buildWildcardQuery(k, v));
+                                }
+                                else{
+                                    must_not.push({term:term});
+                                }
                             }else{
-                                filters.push({term:term});
+                                if(v.indexOf('%')>-1){
+                                    filters.push(f.buildWildcardQuery(k, v));
+                                }
+                                else{
+                                    filters.push({term:term});
+                                }
                             }
 
                         }

package/package.json

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