owl-cli 6.34.0 → 6.36.0

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

@@ -108,7 +108,9 @@ function expandTablePermission(permissions) {
         if(same_org.add!='denied' && p.permission_same_org && p.permission_same_org.add){
             same_org.add = p.permission_same_org.add;
         }
-
+        if(same_org.list!='denied' && p.permission_same_org && p.permission_same_org.list){
+            same_org.list = p.permission_same_org.add;
+        }
 
         if(sub_org.read!='denied' && p.permission_sub_org && p.permission_sub_org.read){
             sub_org.read = p.permission_sub_org.read;
@@ -122,6 +124,9 @@ function expandTablePermission(permissions) {
         if(sub_org.add!='denied' && p.permission_sub_org && p.permission_sub_org.add){
             sub_org.add = p.permission_sub_org.add;
         }
+        if(sub_org.list!='denied' && p.permission_sub_org && p.permission_sub_org.list){
+            sub_org.list = p.permission_sub_org.list;
+        }
     }
 
     return {
@@ -516,14 +521,16 @@ function merge(oldObj,newObj,permissions,orgId){
 function getListPermissionFilter(tableId, roleId,orgId,userId, permissions){
     //获得有权限的对象的filter
     var tp = expandTablePermission(permissions);
+    $.log("tp=" + JSON.stringify(tp));
     var filters = [];
     var excludeFilters = [];
 
-    if(tp.same_org.read==='allowed' && tp.sub_org.read==='denied' && orgId!='0') {
+
+    if(tp.same_org.list==='allowed' && tp.sub_org.list==='denied' && orgId!='0') {
         //只能读取本组织的数据
         filters.push({"term": {"_orgId.keyword": orgId}});
     }
-    else if(tp.same_org.read==='allowed' && tp.sub_org.read==='allowed'&& orgId!='0'){
+    else if(tp.same_org.list==='allowed' && tp.sub_org.list==='allowed' && orgId!='0'){
         filters.push({"term": {"_orgIds.keyword": orgId}});
     }
 

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

@@ -113,7 +113,7 @@ function buildSort(sort){
     var meta = spec['#meta'];
     var isPublic = meta && meta.isPublic;
 
-
+/*
     if(!isPublic && orgId && orgId!=='0'){
       filters.push({
         "term":{
@@ -121,7 +121,7 @@ function buildSort(sort){
         }
       })
     }
-
+*/
     if(meta && meta.isTree && env.orgId!=='0'){
       if(meta.root){
         if(meta.root.startsWith("$")){

package/package.json

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