owl-cli 7.29.0 → 7.31.0

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

@@ -585,76 +585,53 @@ function merge(oldObj,newObj,permissions,orgId){
         throw "没有修改权限。"
     }
 
-    for(var k in oldObj){
+    for(var k in newObj){
         var vo = oldObj[k];
+        var vn = newObj[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;
+                // newObj[k] = vo;
                 continue;
             }
 
-            if(Array.isArray(vo)){
+            if(Array.isArray(vo) || Array.isArray(vn)){
                 //暂时对于Array, 只要对于section有权限，则是对于整行来说的，而不能对于行中的某个字段
-                var vn = newObj[k];
+                // var vn = newObj[k];
                 // var merged = mergeArray(vo,vn,ef_section_permissions[k]);
-                var merged = vn;
-                newObj[k] = merged;
+                // var merged = vn;
+                // newObj[k] = merged;
+                oldObj[k] = vn; //mergeArray(vo,vn,ef_section_permissions[k]);
             }
             else {
-                var vn = newObj[k];
-                for(var sk in vo){
+                // var vn = newObj[k];
+                for(var sk in vn){
                     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];
+                        // vn[fk] = vo[fk];
+                        vo[sk] = vn[sk]
                     }
                 }
             }
         }
-        else if(vo === null){
+        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;
+                // newObj[k] = null;
+                continue;
             }
         }
         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
+                continue;
+                // newObj[k] = oldObj[k];
             }
             else{
-                for(var nk in vn){
-                    if(vn[nk] && (!vo || !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];
+                oldObj[k] = vn;
             }
         }
     }
-    return newObj;
-
+    return oldObj;
 }
 
 function getObjectPermissionFilter(tableId, roleId,orgId,userId){

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

@@ -60,10 +60,11 @@
       var newdata = @projectCodeService.add( modelObject,env );
     }
     else {
+      modelObject._orgId = oldObj._orgId;
       modelObject._orgIds = [modelObject._orgId].concat(getParentOrgIds(modelObject._orgId));
-      modelObject._orgId = orgId;
+    
       //修复_orgIds
-      var _orgIds = [orgId];
+      var _orgIds = [modelObject._orgId];
       if(modelObject._orgIds){
         modelObject._orgIds.forEach(function(orgId){
           if(typeof orgId === 'string'){

package/package.json

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