owl-cli 6.29.0 → 6.31.0

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

@@ -86,7 +86,7 @@ function getPermissions(roleId, tableId) {
 }
 
 function expandTablePermission(permissions) {
-    $.log("expandTablePermission,permissions=" + JSON.stringify(permissions))
+    // $.log("expandTablePermission,permissions=" + JSON.stringify(per？missions))
     var same_org = {
     };
 
@@ -120,7 +120,7 @@ function expandTablePermission(permissions) {
             same_org.del = p.permission_sub_org.del;
         }
         if(sub_org.add!='denied' && p.permission_sub_org && p.permission_sub_org.add){
-            sub_org.add = <p className="permission_sub_org"></p>.add;
+            sub_org.add = p.permission_sub_org.add;
         }
     }
 
@@ -509,10 +509,110 @@ function merge(oldObj,newObj,permissions,orgId){
             }
         }
     }
-    return newObj;
 
 }
 
+function getListPermissionFilter(tableId, roleId,orgId,userId, permissions){
+    //获得有权限的对象的filter
+    var tp = expandTablePermission(permissions);
+    var filters = [];
+    var excludeFilters = [];
+
+    if(tp.same_org.read==='allowed' && tp.sub_org.read==='denied') {
+        //只能读取本组织的数据
+        filters.push({"term": {"_orgId.keyword": orgId}});
+    }
+    else if(tp.same_org.read==='allowed' && tp.sub_org.read==='allowed'){
+        filters.push({"term": {"_orgIds.keyword": orgId}});
+    }
+
+    filters.concat([
+        {
+            "permissions.orgId.keyword":orgId,
+            "permissions.roleId.keyword":roleId,
+            "permissions.list.keyword":"allowed",
+        },
+        {
+            "permissions.orgId.keyword":orgId,
+            "permissions.roleId.keyword":"*",
+            "permissions.list.keyword":"allowed",
+        },
+        {
+            "permissions.orgId.keyword":"*",
+            "permissions.roleId.keyword":roleId,
+            "permissions.list.keyword":"allowed",
+        },
+        {
+            "permissions.orgId.keyword":"*",
+            "permissions.roleId.keyword":"*",
+            "permissions.list.keyword":"allowed",
+        },
+        {
+            "permissions.orgId.keyword":orgId,
+            "permissions.roleId.keyword":roleId,
+            "permissions.list.keyword":"allowed",
+        },
+        {
+            "permissions.orgId.keyword":orgId,
+            "permissions.roleId.keyword":"*",
+            "permissions.list.keyword":"allowed",
+        },
+        {
+            "permissions.orgId.keyword":"*",
+            "permissions.roleId.keyword":roleId,
+            "permissions.list.keyword":"allowed",
+        },
+        {
+            "permissions.userId.keyword":userId,
+            "permissions.list.keyword":"allowed",
+        },
+        {
+            "permissions.userId":"*",
+            "permissions.list.keyword":"allowed",
+        }
+    ]);
+    //获取对象本身的权限
+
+    excludeFilters.concat([
+        {
+            "permissions.orgId.keyword":orgId,
+            "permissions.roleId.keyword":roleId,
+            "permissions.list.keyword":"denied",
+        },
+        {
+            "permissions.orgId.keyword":orgId,
+            "permissions.roleId.keyword":"*",
+            "permissions.list.keyword":"denied",
+        },
+        {
+            "permissions.orgId.keyword":"*",
+            "permissions.roleId.keyword":roleId,
+            "permissions.list.keyword":"denied",
+        },
+        {
+            "permissions.orgId.keyword":orgId,
+            "permissions.roleId.keyword":roleId,
+            "permissions.list.keyword":"denied",
+        },
+        {
+            "permissions.orgId.keyword":"*",
+            "permissions.roleId.keyword":roleId,
+            "permissions.list.keyword":"denied",
+        },
+        {
+            "permissions.userId.keyword":userId,
+            "permissions.list.keyword":"denied",
+        }
+    ]);
+
+    return {
+        bool:{
+            should:filters,
+            must_not:excludeFilters
+        }
+    };
+}
+
 
 
 

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

@@ -9,7 +9,7 @@ function isScalar(o){
 }
 
 function isEqual(r1,r2){
-    var igoredKeys = ['_type','_matched'];
+    var ignoreKeys = ['_type','_matched','_v'];
     if(r1==null && r2==null){
         return true;
     }
@@ -23,6 +23,14 @@ function isEqual(r1,r2){
     var ks1 = Object.keys(r1);
     var ks2 = Object.keys(r2);
 
+    ks1 = ks1.filter(function(k){
+        return ignoreKeys.indexOf(k)===-1;
+    });
+
+    ks2 = ks2.filter(function(k){
+        return ignoreKeys.indexOf(k)===-1;
+    });
+
     if(ks1.length!==ks2.length){
         return false;
     }

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

@@ -44,7 +44,9 @@ function buildSort(sort){
   var loginId = env.loginId;
   var roleId = env.roleId;
   var orgId = env.orgId;
-
+  var spec = @spec;
+  var tableId = 'owl_' + spec._t;
+  var permissions = getPermissions(roleId,tableId);
   var m = shopId;
   ///////////////////////////////
 
@@ -137,7 +139,8 @@ function buildSort(sort){
 
   var filters = getFilters();
 
-
+  var permissionFilter = getListPermissionFilter(tableId,roleId,loginId,permissions);
+  filters.push(permissionFilter);
   if(recycleBin){
     filters.push({"term":{"del.keyword":"T"}});
     var query = {

package/package.json

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