owl-cli 6.128.0 → 6.130.0

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

@@ -27,6 +27,9 @@
         ids = [id];
     }
 
+    var tableId = 'owl_' + spec._t;
+    var permissions = getPermissions(roleId,tableId);
+
     for(var i=0;i<ids.length; i++){
         var id = ids[i];
         var oldObj = @projectCodeService.get(id,true);
@@ -39,17 +42,9 @@
             out.print(JSON.stringify(ret));
             return;
         }
-        if(roleId!=='internal' && orgId && oldObj._orgIds && oldObj._orgIds){
+        if(roleId!=='internal'  && roleId!='0'){
             //检查是否有权限修改
-            if(orgId!='0' && oldObj._orgIds.indexOf(orgId)===-1){
-                var ret = {
-                    state:'err',
-                    code: 'no permission',
-                    msg: '没有权限,id=' + id
-                }
-                out.print(JSON.stringify(ret));
-                return;
-            }
+            checkPermission(oldObj,permissions,orgId,"del");
         }
     }
 

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

@@ -116,41 +116,41 @@ function expandTablePermission(permissions) {
 
     for (var i = 0; i < permissions.length; i++) {
         var p = permissions[i];
-        if(same_org.read!='denied' && p.permission_same_org && p.permission_same_org.read){
+        if(same_org.read!='denied'  && p.permission_same_org && p.permission_same_org.read && p.permission_same_org.read!='noset'){
             same_org.read = p.permission_same_org.read;
         }
-        if(same_org.update!='denied' && p.permission_same_org && p.permission_same_org.update){
+        if(same_org.update!='denied' && p.permission_same_org && p.permission_same_org.update  && p.permission_same_org.update!='noset'){
             same_org.update = p.permission_same_org.update;
         }
-        if(same_org.del!='denied' && p.permission_same_org && p.permission_same_org.del){
+        if(same_org.del!='denied' && p.permission_same_org && p.permission_same_org.del && p.permission_same_org.del!='noset'){
             same_org.del = p.permission_same_org.del;
         }
-        if(same_org.add!='denied' && p.permission_same_org && p.permission_same_org.add){
+        if(same_org.add!='denied' && p.permission_same_org && p.permission_same_org.add  && p.permission_same_org.add!='noset'){
             same_org.add = p.permission_same_org.add;
         }
-        if(same_org.list!='denied' && p.permission_same_org && p.permission_same_org.list){
+        if(same_org.list!='denied' && p.permission_same_org && p.permission_same_org.list && p.permission_same_org.list!='noset'){
             same_org.list = p.permission_same_org.add;
         }
-        if(same_org.listall!='denied' && p.permission_same_org && p.permission_same_org.listall){
+        if(same_org.listall!='denied' && p.permission_same_org && p.permission_same_org.listall && p.permission_same_org.listall!='noset'){
             same_org.listall = p.permission_same_org.listall;
         }
 
-        if(sub_org.read!='denied' && p.permission_sub_org && p.permission_sub_org.read){
+        if(sub_org.read!='denied' && p.permission_sub_org && p.permission_sub_org.read && p.permission_sub_org.read!='noset'){
             sub_org.read = p.permission_sub_org.read;
         }
-        if(sub_org.update!='denied' && p.permission_sub_org && p.permission_sub_org.update){
+        if(sub_org.update!='denied' && p.permission_sub_org && p.permission_sub_org.update && p.permission_sub_org.update!='noset'){
             sub_org.update = p.permission_sub_org.update;
         }
-        if(sub_org.del!='denied' && p.permission_sub_org && p.permission_sub_org.del){
+        if(sub_org.del!='denied' && p.permission_sub_org && p.permission_sub_org.del && p.permission_sub_org.del!='noset'){
             same_org.del = p.permission_sub_org.del;
         }
-        if(sub_org.add!='denied' && p.permission_sub_org && p.permission_sub_org.add){
+        if(sub_org.add!='denied' && p.permission_sub_org && p.permission_sub_org.add && p.permission_sub_org.add!='noset'){
             sub_org.add = p.permission_sub_org.add;
         }
-        if(sub_org.list!='denied' && p.permission_sub_org && p.permission_sub_org.list){
+        if(sub_org.list!='denied' && p.permission_sub_org && p.permission_sub_org.list && p.permission_sub_org.list!='noset'){
             sub_org.list = p.permission_sub_org.list;
         }
-        if(sub_org.listall!='denied' && p.permission_sub_org && p.permission_sub_org.listall){
+        if(sub_org.listall!='denied' && p.permission_sub_org && p.permission_sub_org.listall && p.permission_sub_org.listall!='noset'){
             sub_org.listall = p.permission_sub_org.listall;
         }
     }
@@ -244,6 +244,20 @@ function checkObject(obj, ef_field_permissions, parentKey,action){
     }
 }
 
+function isSubOrg(data, orgId){
+    if(orgId == '0'){
+        return true;
+    }
+    var org = owl_orgsService.get(data._orgId);
+    if(!org || !org.parentPathIds){
+        return false;
+    }
+    if(org.parentPathIds.indexOf(orgId)>-1){
+        return true;
+    }
+    return false;
+}
+
 function checkPermission(data, permissions, orgId, action) {
     var section_permissions = expandSectionPermission(permissions);
     var field_permissions = expandFieldPermission(permissions);
@@ -257,16 +271,32 @@ function checkPermission(data, permissions, orgId, action) {
         ef_field_permissions = field_permissions.same_org;
         ef_table_permissions = table_permissions.same_org;
     } else {
-        ef_section_permissions = section_permissions.sub_org;
-        ef_field_permissions = field_permissions.sub_org;
-        ef_table_permissions = field_permissions.sub_org;
-
+        if(isSubOrg(data,orgId)) {
+            ef_section_permissions = section_permissions.sub_org;
+            ef_field_permissions = field_permissions.sub_org;
+            ef_table_permissions = field_permissions.sub_org;
+        }
     }
 
+    if(!ef_table_permissions){
+        throw "表没有权限。"
+    }
     var valid_fields = ['_orgId', '_orgIds', "_v", "del"];
-    if(ef_table_permissions.add === 'denied'){
+    if(ef_table_permissions.add !== 'allowed' && action==='add'){
         throw "表没有添加记录权限。"
     }
+    if(ef_table_permissions.del !== 'allowed' && action==='del'){
+        throw "表没有删除记录权限。"
+    }
+    if(ef_table_permissions.update !== 'allowed' && action==='update'){
+        throw "表没有删除记录权限。"
+    }
+    if(ef_table_permissions.read !== 'read' && action==='read'){
+        throw "表没有读取权限。"
+    }
+    if(ef_table_permissions.list !== 'read' && action==='list'){
+        throw "表没有列出权限。"
+    }
     //检查section_permission
     for (var k in data) {
         if(valid_fields.indexOf(k)>-1){
@@ -311,12 +341,17 @@ function checkUpdatePermission(data,diffresult,permissions,orgId){
         ef_field_permissions = field_permissions.same_org;
         ef_table_permissions = table_permissions.same_org;
     } else {
-        ef_section_permissions = section_permissions.sub_org;
-        ef_field_permissions = field_permissions.sub_org;
-        ef_table_permissions = table_permissions.sub_org;
+        if(isSubOrg(data,orgId)) {
+            ef_section_permissions = section_permissions.sub_org;
+            ef_field_permissions = field_permissions.sub_org;
+            ef_table_permissions = field_permissions.sub_org;
+        }
     }
 
     // $.log("ef_table_permissions=" + JSON.stringify(ef_table_permissions))
+    if(!ef_table_permissions){
+        throw "表没有权限。"
+    }
     if(ef_table_permissions.update === 'denied'){
         throw "没有修改的权限。"
     }

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

@@ -32,7 +32,7 @@
     var roleId = env.roleId
     if(orgId && oldObj && oldObj._orgIds){
       //检查是否有权限修改
-      if(roleId!=='internal' && orgId!='0' && oldObj._orgIds.indexOf(orgId)===-1){
+      if(roleId!=='internal' && roleId!='0' && orgId!='0' && oldObj._orgIds.indexOf(orgId)===-1){
         var ret = {
           state:'err',
           code: 'no permission',
@@ -54,8 +54,8 @@
       modelObject.m = env.m;
 
       //如果检查不通过，则会抛出异常
-      if(roleId!=='internal'){
-        checkPermission(modelObject,permissions,orgId,"add");
+      if(roleId!=='internal'  && roleId!='0'){
+          checkPermission(modelObject,permissions,orgId,"add");
       }
       modelObject.owl_createUserId = env.loginUserId;
       var newdata = @projectCodeService.add( modelObject,env );
@@ -81,7 +81,7 @@
       }
       modelObject._orgIds = _orgIds;
       diffResult = diff(oldObj,modelObject,"");
-      if(roleId!=='internal') {
+      if(roleId!=='internal'  && roleId!='0') {
         checkUpdatePermission(modelObject, diffResult, permissions, orgId);
       }
       var merged = merge(oldObj,modelObject,permissions,orgId);

package/package.json

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