owl-cli 6.2.0 → 6.5.0

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

@@ -15,6 +15,7 @@
   var warehouseId = env.warehouseId;
   var m = shopId;
   var roleId = env.roleId
+  var orgId = env.orgId;
 
   var spec = @spec;
   var tableId = 'owl_' + spec._t;
@@ -26,6 +27,10 @@
   var id = params.id;
 
   var obj = @projectCodeService.get(id,true);
+  if(roleId!='0' || orgId!='0'){
+    filterFields(obj,permissions,orgId);
+  }
+
   var ret = {
     state:'ok',
     obj:obj

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

@@ -14,7 +14,6 @@ function getParentOrgIds(orgId){
         return org.parentPathIds;
     }
     return [orgId];
-
 }
 
 function checklogin(){
@@ -39,14 +38,13 @@ function checklogin(){
         var session = owl_backend_sessionService.get(sessionId);
         if(session && session.lastModified > now - 7*24*3600*1000){
             var loginUserId = session.userId
-            var roleId = session.role;
+            var roleId = session.roleId;
             var orgId = session.orgId;
             var orgIds = [orgId].concat(getParentOrgIds(orgId));
             if(loginUserId){
                 var env = {
                     now: new Date().getTime(),
                     loginId: loginUserId,
-                    roleId:roleId,
                     shopId:m,
                     warehouseId:"",
                     roleId:roleId,
@@ -90,6 +88,127 @@ function getPermissions(roleId,tableId){
     return [];
 }
 
+function expandSectionPermission(permissions){
+    var same_org = {
+        "*":"allowed"
+    };
+    var sub_org = {
+        "*":"allowed"
+    };
+
+    for(var i=0; i<permissions.length; i++){
+        var p = permissions[i];
+        var sections_same_org = p.sections_same_org;
+        var sections_sub_org = p.sections_sub_org;
+        if(sections_same_org){
+            for(var j=0; j<sections_same_org.length; j++){
+                var sec = sections_same_org[j];
+                if(sec.sectionKey && sec.read){
+                    same_org[sec.sectionKey] = sec.read;
+                }
+            }
+        }
+        if(sections_sub_org){
+            for(var j=0; j<sections_sub_org.length; j++){
+                var sec = sections_sub_org[j];
+                if(sec.sectionKey  && sec.read){
+                    sub_org[sec.sectionKey] = sec.read;
+                }
+            }
+        }
+    }
+
+    return {
+        same_org:same_org,
+        sub_org: sub_org
+    }
+}
+
+function expandFieldPermission(permissions){
+    var same_org = {
+        "*":"allowed"
+    }
+    var sub_org = {
+        "*":"allowed"
+    }
+    for(var i=0; i<permissions.length; i++){
+        var p = permissions[i];
+        if(p.fields_same_org){
+            for(var j=0; j<p.fields_same_org.length; j++){
+                var f = p.fields_same_org[j];
+                var fieldKey = f.fieldKey;
+                if(f.sectionKey && f.sectionKey!='main'){
+                    fieldKey = f.sectionKey + "." + f.fieldKey;
+                }
+                same_org[fieldKey] = f.read;
+            }
+        }
+        if(p.fields_sub_org){
+            for(var j=0; j<p.fields_sub_org.length; j++){
+                var f = p.fields_sub_org[j];
+                var fieldKey = f.fieldKey;
+                if(f.sectionKey && f.sectionKey!='main'){
+                    fieldKey = f.sectionKey + "." + f.fieldKey;
+                }
+                sub_org[fieldKey] = f.read;
+            }
+        }
+    }
+    return {
+        same_org:same_org,
+        sub_org:sub_org
+    }
+
+
+}
+function filterFields(data,permissions,orgId){
+    //根据权限，将没有权限的字段删除掉
+    var section_permissions = expandSectionPermission(permissions);
+    var field_permissions = expandFieldPermission(permissions);
+    var valid_fields = ['_orgId','_orgIds',"_v", "del"];
+    var curSectionKey = '';
+    for(var k in data){
+        if(valid_fields.indexOf(k)>=0){
+            continue;
+        }
+        else{
+            var ef_section_permissions = null;
+            var ef_field_permissions = null;
+            if(data._orgId === orgId){
+                ef_section_permissions = section_permissions.same_org;
+                ef_field_permissions = field_permissions.same_org;
+            }
+            else{
+                ef_section_permissions = section_permissions.sub_org;
+                ef_field_permissions = field_permissions.sub_org;
+            }
+            if(typeof data[k] === 'object'){
+                if(ef_section_permissions[k].read === 'denied' || (!ef_section_permissions[k].read && ef_section_permissions["*"].read === 'denied')){
+                    delete data[k];
+                }
+                var section = data[k];
+                if(Array.isArray(section)){
+                    for(var i=0; i<section.length; i++){
+                        var r = section[i];
+                        for(var fk in r){
+                            var rk = k+ "." + fk;
+                            if(ef_field_permissions[rk].read === 'denied' || (!ef_field_permissions[rk].read && ef_field_permissions[k+".*"].read === 'denied')){
+                                delete r[rk];
+                            }
+                        }
+
+                    }
+                }
+            }
+            else {
+                if(ef_field_permissions[k].read === 'denied' || (!ef_field_permissions[k].read && ef_field_permissions["*"].read === 'denied')){
+                    delete data[k];
+                }
+            }
+        }
+    }
+
+}
 
 
 

package/package.json

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