owl-cli 6.16.0 → 6.18.0

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

@@ -4,23 +4,23 @@
 //#import $owl_orgs:services/modelService.jsx
 //#import $owl_permission:services/modelService.jsx
 
-function getParentOrgIds(orgId){
-    if(orgId=='0'){
+function getParentOrgIds(orgId) {
+    if (orgId == '0') {
         return ['0'];
     }
 
     var org = owl_orgsService.get(orgId);
-    if(org){
+    if (org) {
         return org.parentPathIds;
     }
     return [orgId];
 }
 
-function checklogin(){
+function checklogin() {
     var magic = $.getSystemProperty("magic");
     var magicParams = $.params.ma;
     var m = '0';//默认是 平台
-    if(magic === magicParams){
+    if (magic === magicParams) {
         //代表是内部操作
         var user = {
             uid: 'internal',
@@ -30,45 +30,42 @@ function checklogin(){
         }
 
         return user;
-    }
-    else{
+    } else {
         var isid = SessionService.getSessionId(request);
         var now = new Date().getTime();
         var sessionId = 'owl_backend_session_' + isid;
         var session = owl_backend_sessionService.get(sessionId);
-        if(session && session.lastModified > now - 7*24*3600*1000){
+        if (session && session.lastModified > now - 7 * 24 * 3600 * 1000) {
             var loginUserId = session.userId
             var roleId = session.roleId;
             var orgId = session.orgId;
             var orgIds = [orgId].concat(getParentOrgIds(orgId));
-            if(loginUserId){
+            if (loginUserId) {
                 var env = {
                     now: new Date().getTime(),
                     loginId: loginUserId,
-                    shopId:m,
-                    warehouseId:"",
-                    roleId:roleId,
-                    orgId:orgId,
-                    orgIds:orgIds,
-                    m:m
+                    shopId: m,
+                    warehouseId: "",
+                    roleId: roleId,
+                    orgId: orgId,
+                    orgIds: orgIds,
+                    m: m
                 }
                 return env;
-            }
-            else{
+            } else {
                 var ret = {
-                    state:'err',
-                    code:'no login',
-                    msg:"not login!"
+                    state: 'err',
+                    code: 'no login',
+                    msg: "not login!"
                 }
                 out.print(JSON.stringify(ret));
                 return null;
             }
-        }
-        else{
+        } else {
             var ret = {
-                state:'err',
-                code:'no login',
-                msg:"not login!"
+                state: 'err',
+                code: 'no login',
+                msg: "not login!"
             }
             out.print(JSON.stringify(ret));
             return null;
@@ -76,42 +73,87 @@ function checklogin(){
     }
 }
 
-function getPermissions(roleId,tableId){
+function getPermissions(roleId, tableId) {
     var searchArgs = {
-        roleId:roleId,
-        tableId:tableId
+        roleId: roleId,
+        tableId: tableId
     }
-    var sr = owl_permissionService.search("0",searchArgs,null,0,10000,null);
-    if(sr.state==='ok'){
+    var sr = owl_permissionService.search("0", searchArgs, null, 0, 10000, null);
+    if (sr.state === 'ok') {
         return sr.list;
     }
     return [];
 }
 
-function expandSectionPermission(permissions){
+function expandTablePermission(permissions) {
+    var same_org = {
+    };
+
+    var sub_org = {
+
+    };
+
+    for (var i = 0; i < permissions.length; i++) {
+        var p = permissions[i];
+        if(same_org.read!='denied' && p.same_org.read){
+            same_org.read = p.same_org.read;
+        }
+        if(same_org.update!='denied' && p.same_org.update){
+            same_org.update = p.same_org.update;
+        }
+        if(same_org.del!='denied' && p.same_org.del){
+            same_org.del = p.same_org.del;
+        }
+        if(same_org.add!='denied' && p.same_org.add){
+            same_org.add = p.same_org.add;
+        }
+
+
+        if(sub_org.read!='denied' && p.sub_org.read){
+            sub_org.read = p.sub_org.read;
+        }
+        if(sub_org.update!='denied' && p.sub_org.update){
+            sub_org.update = p.sub_org.update;
+        }
+        if(sub_org.del!='denied' && p.sub_org.del){
+            same_org.del = p.same_org.del;
+        }
+        if(sub_orgadd!='denied' && p.sub_org.add){
+            sub_org.add = p.sub_org.add;
+        }
+    }
+
+    return {
+        same_org:same_org,
+        sub_org:sub_org
+    }
+
+}
+
+function expandSectionPermission(permissions) {
     var same_org = {
-        "*":"allowed"
+        "*": "allowed"
     };
     var sub_org = {
-        "*":"allowed"
+        "*": "allowed"
     };
 
-    for(var i=0; i<permissions.length; i++){
+    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++){
+        if (sections_same_org) {
+            for (var j = 0; j < sections_same_org.length; j++) {
                 var sec = sections_same_org[j];
-                if(sec.sectionKey){
+                if (sec.sectionKey) {
                     same_org[sec.sectionKey] = sec;
                 }
             }
         }
-        if(sections_sub_org){
-            for(var j=0; j<sections_sub_org.length; j++){
+        if (sections_sub_org) {
+            for (var j = 0; j < sections_sub_org.length; j++) {
                 var sec = sections_sub_org[j];
-                if(sec.sectionKey ){
+                if (sec.sectionKey) {
                     sub_org[sec.sectionKey] = sec;
                 }
             }
@@ -119,35 +161,35 @@ function expandSectionPermission(permissions){
     }
 
     return {
-        same_org:same_org,
+        same_org: same_org,
         sub_org: sub_org
     }
 }
 
-function expandFieldPermission(permissions){
+function expandFieldPermission(permissions) {
     var same_org = {
-        "*":{read:"allowed"}
+        "*": {read: "allowed"}
     }
     var sub_org = {
-        "*":{read:"allowed"}
+        "*": {read: "allowed"}
     }
-    for(var i=0; i<permissions.length; i++){
+    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++){
+        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'){
+                if (f.sectionKey && f.sectionKey != 'main') {
                     fieldKey = f.sectionKey + "." + f.fieldKey;
                 }
                 same_org[fieldKey] = f;
             }
         }
-        if(p.fields_sub_org){
-            for(var j=0; j<p.fields_sub_org.length; j++){
+        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'){
+                if (f.sectionKey && f.sectionKey != 'main') {
                     fieldKey = f.sectionKey + "." + f.fieldKey;
                 }
                 sub_org[fieldKey] = f;
@@ -155,21 +197,123 @@ function expandFieldPermission(permissions){
         }
     }
     return {
-        same_org:same_org,
-        sub_org:sub_org
+        same_org: same_org,
+        sub_org: sub_org
     }
 }
-function filterFields(data,permissions,orgId){
-    //根据权限，将没有权限的字段删除掉
+
+function checkObject(obj, ef_field_permissions, parentKey,action){
+    for(var k in obj){
+        var ek = parentKey + "." + k;
+        if(ef_field_permissions && ef_field_permissions[ek] && ef_field_permissions[ek][action]==='denied'){
+            throw "没有"+action + "权限，ek=" + ek;
+        }
+
+    }
+}
+
+function checkPermission(data, permissions, orgId, action) {
     var section_permissions = expandSectionPermission(permissions);
     var field_permissions = expandFieldPermission(permissions);
+    var table_permissions = expandTablePermission(permissions);
+
     var ef_section_permissions = null;
     var ef_field_permissions = null;
-    if(data._orgId === orgId){
+    var ef_table_permissions = null;
+    if (data._orgId === orgId) {
         ef_section_permissions = section_permissions.same_org;
         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;
+
     }
-    else{
+
+    var valid_fields = ['_orgId', '_orgIds', "_v", "del"];
+    if(ef_table_permissions.add === 'denied'){
+        throw "表没有添加记录权限。"
+    }
+    //检查section_permission
+    for (var k in data) {
+        if(valid_fields.indexOf(k)>-1){
+            continue;
+        }
+        var v = data[k];
+        //if v is section
+        if (typeof v === 'object') {
+            //ef_field_permissions
+            if (ef_section_permissions && ef_section_permissions[k] && ef_section_permissions[k][action] === 'denied') {
+                throw "section没有" + action + "权限,sectionKey=" + k
+            }
+            if(Array.isArray(v)){
+                for(var i=0; i<v.length; i++){
+                    var r = v[i];
+                    checkObject(r,ef_field_permissions,k,action);
+                }
+            }
+            else{
+                checkObject(v,ef_field_permissions,k,action);
+            }
+        }
+        else {
+            if(ef_section_permissions && ef_section_permissions[k] && ef_field_permissions[k].add === 'denied'){
+                throw "字段没有" + action + "权限, key=" + k
+            }
+        }
+
+    }
+}
+
+function checkUpdatePermission(data,diffresult,permissions,orgId){
+    var section_permissions = expandSectionPermission(permissions);
+    var field_permissions = expandFieldPermission(permissions);
+    var table_permissions = expandTablePermission(permissions);
+
+    var ef_section_permissions = null;
+    var ef_field_permissions = null;
+    var ef_table_permissions = null;
+    if (data._orgId === orgId) {
+        ef_section_permissions = section_permissions.same_org;
+        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(ef_table_permissions.update === 'denied'){
+        throw "没有修改的权限。"
+    }
+    if(diffresult && diffresult.length>0){
+        for(var i=0; i<diffresult.length; i++){
+            var r = diffresult[i];
+            if(r.parentKey && r.parentKey.length>0){
+                if(ef_section_permissions[r.parentKey] && ef_section_permissions[r.parentKey].update ==='denied'){
+                    throw "没有修改的权限,sectionKey=" + r.parentKey
+                }
+                else if(ef_field_permissions[r.parentKey+"." + r.fieldKey] &&ef_field_permissions[r.parentKey+"." + r.fieldKey.update]==='denied' ){
+                    throw "没有修改字段的权限,fieldKey=" + r.parentKey+"." + r.fieldKey;
+                }
+            }
+
+        }
+    }
+
+    //啥都不做代表检查通过
+}
+
+function filterFields(data, permissions, orgId) {
+    //根据权限，将没有读权限的字段删除掉
+    var section_permissions = expandSectionPermission(permissions);
+    var field_permissions = expandFieldPermission(permissions);
+    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;
     }
@@ -177,27 +321,26 @@ function filterFields(data,permissions,orgId){
     var invisibleFields = [];
     data['invisibleFields'] = invisibleFields;
 
-    var valid_fields = ['_orgId','_orgIds',"_v", "del"];
+    var valid_fields = ['_orgId', '_orgIds', "_v", "del"];
     var curSectionKey = '';
-    for(var k in data){
-        if(valid_fields.indexOf(k)>=0){
+    for (var k in data) {
+        if (valid_fields.indexOf(k) >= 0) {
             continue;
-        }
-        else{
-            if(typeof data[k] === 'object'){
-                if((ef_section_permissions[k] && ef_section_permissions[k].read === 'denied') ||
-                    ((!ef_section_permissions[k] || !ef_section_permissions[k].read) && (ef_section_permissions["*"] && ef_section_permissions["*"].read === 'denied'))){
+        } else {
+            if (typeof data[k] === 'object') {
+                if ((ef_section_permissions[k] && ef_section_permissions[k].read === 'denied') ||
+                    ((!ef_section_permissions[k] || !ef_section_permissions[k].read) && (ef_section_permissions["*"] && ef_section_permissions["*"].read === 'denied'))) {
                     delete data[k];
                     invisibleFields.push(k);
                 }
                 var section = data[k];
-                if(Array.isArray(section)){
-                    for(var i=0; i<section.length; i++){
+                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] && ef_field_permissions[rk].read === 'denied') ||
-                                ((!ef_field_permissions[rk] || !ef_field_permissions[rk].read) && (ef_field_permissions[k+".*"] && ef_field_permissions[k+".*"].read === 'denied'))){
+                        for (var fk in r) {
+                            var rk = k + "." + fk;
+                            if ((ef_field_permissions[rk] && ef_field_permissions[rk].read === 'denied') ||
+                                ((!ef_field_permissions[rk] || !ef_field_permissions[rk].read) && (ef_field_permissions[k + ".*"] && ef_field_permissions[k + ".*"].read === 'denied'))) {
                                 delete r[fk];
                                 invisibleFields.push(rk);
                             }
@@ -205,9 +348,8 @@ function filterFields(data,permissions,orgId){
 
                     }
                 }
-            }
-            else {
-                if((ef_field_permissions[k] && ef_field_permissions[k].read === 'denied') || ((!ef_field_permissions[k] || !ef_field_permissions[k].read) && ef_field_permissions["*"].read === 'denied')){
+            } else {
+                if ((ef_field_permissions[k] && ef_field_permissions[k].read === 'denied') || ((!ef_field_permissions[k] || !ef_field_permissions[k].read) && ef_field_permissions["*"].read === 'denied')) {
                     delete data[k];
                     invisibleFields.push(k);
                 }
@@ -218,3 +360,5 @@ function filterFields(data,permissions,orgId){
 
 
 
+
+

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

@@ -16,9 +16,13 @@ function isEqual(r1,r2){
     if(r1==null || r2==null){
         return false;
     }
+    if(isScalar(r1) || isScalar(r2)){
+        return r1===r2;
+    }
     //now assert a1!=null && r2!=null
     var ks1 = Object.keys(r1);
     var ks2 = Object.keys(r2);
+
     if(ks1.length!==ks2.length){
         return false;
     }
@@ -35,6 +39,7 @@ function isEqual(r1,r2){
 function diffArray(a1, a2,parentKey){
     //a1是旧的,a2是新的
 
+    var temp_matched = [];
     var result = [];
     if(!a1){
         a1 = [];
@@ -49,21 +54,39 @@ function diffArray(a1, a2,parentKey){
             var r2 = a2[j];
             if(isEqual(r1,r2)){
                 found = true;
-                r2._matched = true;
+                if(isScalar(r2)){
+                    temp_matched.push(r2);
+                }
+                else{
+                    r2._matched = true;
+                }
+
                 break;
             }
         }
         if(!found){
             //r1不存在于a2中，说明r1被删除了
-            r1._type='deleted'
-            result.push(r1)
+            result.push({
+                type:'deleted',
+                r:r1
+            });
         }
     }
     for(var i=0; i<a2.length; i++){
         r2 = a2[i];
-        if(!r2._matched){
-            r2._type = 'added';
-            result.push(r2);
+        if(isScalar(r2)){
+            if(temp_matched.indexOf(r2)==-1){
+                result.push({
+                    type:'added',
+                    r:r2
+                });
+            }
+        }
+        else if(!r2._matched){
+            result.push({
+                type:'added',
+                r:r2
+            });
         }
 
     }
@@ -164,15 +187,15 @@ function diff(obj1, obj2,parentKey){
                 });
             }
             else{
-               for(var kv in v2){
-                   result.push({
-                       type:'added',
-                       fieldKey : kv,
-                       parentKey: parentKey+"." + k2,
-                       oldv:null,
-                       newv:v2[kv]
-                   });
-               }
+                for(var kv in v2){
+                    result.push({
+                        type:'added',
+                        fieldKey : kv,
+                        parentKey: parentKey+"." + k2,
+                        oldv:null,
+                        newv:v2[kv]
+                    });
+                }
             }
         }
 

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

@@ -29,6 +29,7 @@
     var id = modelObject.id;
     var action = $.params.action;
     var oldObj = @projectCodeService.get(id);
+    var roleId = env.roleId
     if(orgId && oldObj && oldObj._orgIds){
       //检查是否有权限修改
       if(orgId!='0' && oldObj._orgIds.indexOf(orgId)===-1){
@@ -41,22 +42,32 @@
         return;
       }
     }
-
-    if (!id || action=='add') {
+    var diffResult = {}
+    var tableId = 'owl_' + spec._t;
+    var permissions = getPermissions(roleId,tableId);
+    if (!id || action==='add') {
       //adding
       if(!modelObject._orgId){
         modelObject._orgId = orgId;
       }
       modelObject._orgIds = [modelObject._orgId].concat(getParentOrgIds(modelObject._orgId));
       modelObject.m = env.m;
+
+      //如果检查不通过，则会抛出异常
+      checkPermission(modelObject,permissions,orgId,"add");
       var newdata = @projectCodeService.add( modelObject,env );
     }
     else {
       modelObject._orgIds = [modelObject._orgId].concat(getParentOrgIds(modelObject._orgId));
+      diffResult = diff(oldObj,modelObject,"");
+
+
+      checkUpdatePermission(modelObject,diffResult,permissions,orgId);
+
       var newdata = @projectCodeService.update( modelObject,env);
     }
 
-    var diffResult = diff(oldObj,modelObject);
+
 
     var ret = {
       state: 'ok',

package/package.json

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