owl-cli 6.26.0 → 6.27.0

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

@@ -364,6 +364,154 @@ function filterFields(data, permissions, orgId) {
     }
 }
 
+function mergeArray(a1, a2,section_permission){
+    //a1是旧的,a2是新的
+    // $.log("diffArray,parentKey=" + parentKey);
+
+    var temp_matched = [];
+    var result = [];
+    var merged = [];
+    if(!a1){
+        a1 = [];
+    }
+    if(!a2){
+        a2 = [];
+    }
+    for(var i=0; i<a1.length; i++){
+        var r1 = a1[i];
+        var found = false;
+        for(var j=0; j<a2.length; j++){
+            var r2 = a2[j];
+            if(isEqual(r1,r2)){
+                found = true;
+                if(isScalar(r2)){
+                    temp_matched.push(r2);
+                }
+                else{
+                    r2._matched = true;
+                }
+                merged.push(r1);
+                break;
+            }
+        }
+        if(!found){
+            //r1不存在于a2中，说明r1被删除了
+            if(section_permission && section_permission.del === 'denied'){
+                //不允许删除
+                merged.push(r1);
+            }
+        }
+    }
+    for(var i=0; i<a2.length; i++){
+        r2 = a2[i];
+        if(isScalar(r2)){
+            if(temp_matched.indexOf(r2)==-1){
+                if(!section_permission || section_permission.add !== 'denied' ){
+                    merged.push(r2);
+                }
+            }
+
+        }
+        else if(!r2._matched){
+            if(!section_permission || section_permission.add !== 'denied' ){
+                merged.push(r2);
+            }
+        }
+    }
+    return merged;
+}
+
+function merge(oldObj,newObj,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 = table_permissions.sub_org;
+    }
+    if(ef_table_permissions && ef_table_permissions.update==='denied'){
+        throw "没有修改权限。"
+    }
+
+    for(var k in oldObj){
+        var vo = oldObj[k];
+        if(typeof vo === 'object'){
+            if(ef_section_permissions[k] && ef_section_permissions[k].update==='denied' || ef_section_permissions[k] && ef_section_permissions[k].read==='denied'){
+                newObj[k] = vo;
+                continue;
+            }
+
+            if(Array.isArray(vo)){
+                //暂时对于Array, 只要对于section有权限，则是对于整行来说的，而不能对于行中的某个字段
+                var vn = newObj[k];
+                var merged = mergeArray(vo,vn,ef_section_permissions[k]);
+                vn[k] = merged;
+            }
+            else {
+                var vn = newObj[k];
+                for(var sk in vo){
+                    var fk = k + "." + sk;
+                    if(ef_field_permissions[fk] && ef_field_permissions[fk].update==='denied' || ef_field_permissions[fk] && ef_field_permissions[fk].read==='denied'){
+                        vn[fk] = vo[fk];
+                    }
+                }
+            }
+        }
+        else if(vo === null){
+            if((ef_section_permissions[k] && (ef_section_permissions[k].update==='denied' || ef_section_permissions[k].read==='denied') )||
+                (ef_field_permissions[k] && (ef_field_permissions[k].update==='denied' || ef_field_permissions[k].read==='denied') )
+            ){
+                newObj[k] = null;
+            }
+        }
+        else{
+            if(ef_field_permissions[k] && (ef_field_permissions[k].update==='denied' || ef_field_permissions[k].read==='denied') ){
+                newObj[k] = oldObj[k];
+            }
+        }
+    }
+
+    for(var k in newObj){
+        //找到在new 但是 不在 old里面的，这表明是add
+        var vn = newObj[k];
+        var vo = oldObj[k];
+        if(typeof vn === 'object' ){
+
+            if(!vo && ef_section_permissions[k] && ef_section_permissions[k].add === 'denied'){
+                delete newObj[k];
+            }
+            else if(Array.isArray(vn)){
+                //do nothing
+            }
+            else{
+                for(var nk in vn){
+                    if(vn[nk] && !vo[nk]){
+                        var fk = k + "." + nk;
+                        if(ef_field_permissions[fk] && ef_field_permissions[fk].add === 'denied'){
+                            delete vn[nk];
+                        }
+                    }
+                }
+            }
+        }
+        else{
+            if(!vo && ef_field_permissions[k] && ef_field_permissions[k].add === 'denied'){
+                delete newObj[k];
+            }
+        }
+    }
+
+}
+
 
 
 

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

@@ -38,7 +38,7 @@ function isEqual(r1,r2){
 
 function diffArray(a1, a2,parentKey){
     //a1是旧的,a2是新的
-    $.log("diffArray,parentKey=" + parentKey);
+    // $.log("diffArray,parentKey=" + parentKey);
 
     var temp_matched = [];
     var result = [];
@@ -94,8 +94,17 @@ function diffArray(a1, a2,parentKey){
     return result;
 }
 
+
+
 function diff(obj1, obj2,parentKey){
     var result = []
+    if(!obj1){
+        obj1 = {};
+    }
+    if(!obj2){
+        obj2 = {};
+    }
+
     var keys1 = Object.keys(obj1);
     var keys2 = Object.keys(obj2);
     keys1.sort();
@@ -203,4 +212,5 @@ function diff(obj1, obj2,parentKey){
 
     }
     return result;
-}
+}
+

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

@@ -60,11 +60,9 @@
     else {
       modelObject._orgIds = [modelObject._orgId].concat(getParentOrgIds(modelObject._orgId));
       diffResult = diff(oldObj,modelObject,"");
-
-
-      checkUpdatePermission(modelObject,diffResult,permissions,orgId);
-
-      var newdata = @projectCodeService.update( modelObject,env);
+      // checkUpdatePermission(modelObject,diffResult,permissions,orgId);
+      var merged = merge(oldObj,modelObject,permissions,orgId);
+      var newdata = @projectCodeService.update( merged,env);
     }
 
 

package/package.json

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