owl-cli 5.14.0 → 5.18.0

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

@@ -20,7 +20,7 @@
   var params = JSON.parse($body);
   var id = params.id;
 
-  var obj = @projectCodeService.get(id);
+  var obj = @projectCodeService.get(id,true);
   var ret = {
     state:'ok',
     obj:obj

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

@@ -34,6 +34,12 @@ var spec = @spec;
   var keyword = searchArgs.keyword;
   var pageSize = params.pageSize;
   var page = params.page;
+  var recycleBin = searchArgs.recycleBin;
+  $.log("searchArgs=" + JSON.stringify(searchArgs));
+  delete searchArgs.recycleBin;
+  $.log("recycleBin=" + recycleBin);
+
+
   if(!page){
     page = 1;
   }
@@ -87,11 +93,9 @@ var spec = @spec;
 
   if(roleId){
     var tablePermission = getTablePermission("@projectCode",loginId,roleId);
-
     if(tablePermission && tablePermission.filters){
       filters = filters.concat(tablePermission.filters);
     }
-
   }
 
   if(m !== '0'){
@@ -107,26 +111,46 @@ var spec = @spec;
     ]);
   }
 
-  var query = {
-    "query": {
-      "bool": {
-        "must": {
-          "query_string": {
-            "query":getKeywordQuery()
-          }
-        },
-        "must_not": {
-          "match": {
-            "del": "T"
-          }
-        },
-        "filter": filters
-      }
-    },
-    "from" : from, "size" : pageSize,
-    sort:[{owl_createTime:{order:"desc"}}]
+  if(recycleBin){
+    filters.push({"term":{"del.keyword":"T"}});
+    var query = {
+      "query": {
+        "bool": {
+          "must": {
+            "query_string": {
+              "query":getKeywordQuery()
+            }
+          },
+          "filter": filters
+        }
+      },
+      "from" : from, "size" : pageSize,
+      sort:[{owl_createTime:{order:"desc"}}]
+    }
+  }
+  else{
+    var query = {
+      "query": {
+        "bool": {
+          "must": {
+            "query_string": {
+              "query":getKeywordQuery()
+            }
+          },
+          "must_not": {
+            "match": {
+              "del": "T"
+            }
+          },
+          "filter": filters
+        }
+      },
+      "from" : from, "size" : pageSize,
+      sort:[{owl_createTime:{order:"desc"}}]
+    }
   }
 
+
   var elasticSearchUrl = $.getEnv( "elasticSearchUrl" );
 
   var headers = { "Content-Type": "application/json;charset=utf-8" };

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

@@ -546,7 +546,7 @@ var @projectCodeService = (function (pigeon) {
                     f.updateParentPath(data);
                 }
                 pigeon.lock(f.getLock(data))
-                var obj = f.get(data.id)
+                var obj = f.get(data.id,true)
                 if (!obj) {
                     throw {msg: '对象不存在!id=' + data.id, code: 'notFound'}
                 }

package/package.json

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