owl-cli 6.126.0 → 6.128.0

package/defaultTemplate/api/src/handlers/include/checklogin.jsx

@@ -96,8 +96,8 @@ function getPermissions(roleId, tableId) {
         tables:{
             type:"or",
             args:[
-                { tableId: tableId},
-                { tableId: "*"}
+                { "tables.tableId": tableId},
+                { "tables.tableId": "all"}
             ]
        }
    }

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

@@ -81,9 +81,14 @@ function buildSort(sort){
    var dataSource = null;
    var mfilters =  getListPermissionFilter(tableId, roleId, orgId, loginId, permissions);
 
+    var isRecycleBin = false;
+    if(recycleBin){
+        isRecycleBin = true;
+    }
+
 
-   var sr =  @projectCodeService.search(mfilters, searchArgs, keyword,from, pageSize, effectiveSort, dataSource );
-   var count =  @projectCodeService.count(mfilters, searchArgs, keyword);
+   var sr =  @projectCodeService.search(mfilters, searchArgs, keyword,from, pageSize, effectiveSort, dataSource ,isRecycleBin );
+   var count =  @projectCodeService.count(mfilters, searchArgs, keyword ,isRecycleBin);
 
 
    if(sr.state=='ok'){

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

@@ -1009,7 +1009,7 @@ var @projectCodeService = (function (pigeon) {
             return filters;
         },
 
-        buildQuery:function(mfilters,searchArgs,keyword){
+        buildQuery:function(mfilters,searchArgs,keyword,isRecycleBin){
             delete searchArgs.keyword;
             var filters = [];
             var must_not = [{
@@ -1017,6 +1017,15 @@ var @projectCodeService = (function (pigeon) {
                     "del.keyword":'T'
                 }
             }];
+
+            if(isRecycleBin){
+                must_not = [];
+                filters.push({
+                    term:{
+                        "del.keyword":'T'
+                    }
+                });
+            }
             for(var k in searchArgs){
 
                 var v = searchArgs[k];
@@ -1128,8 +1137,8 @@ var @projectCodeService = (function (pigeon) {
             return query;
         },
 
-        count:function(mfilters,searchArgs,keyword,dataSource){
-            var query = f.buildQuery(mfilters,searchArgs,keyword);
+        count:function(mfilters,searchArgs,keyword,dataSource,isRecycleBin){
+            var query = f.buildQuery(mfilters,searchArgs,keyword,isRecycleBin);
             var elasticSearchUrl = $.getEnv( "elasticSearchUrl" );
 
             var headers = { "Content-Type": "application/json;charset=utf-8" };
@@ -1153,8 +1162,8 @@ var @projectCodeService = (function (pigeon) {
             }
             return 0;
         },
-        search: function(mfilters, searchArgs, keyword,from, pageSize, sort, dataSource){
-            var query = f.buildQuery(mfilters,searchArgs,keyword);
+        search: function(mfilters, searchArgs, keyword,from, pageSize, sort, dataSource,isRecycleBin){
+            var query = f.buildQuery(mfilters,searchArgs,keyword,isRecycleBin);
             // var effectiveSort = [{owl_createTime:{order:"desc"}}];
             var effectiveSort = [];
             if(sort){

package/package.json

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