owl-cli 6.11.0 → 6.13.0

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

@@ -174,8 +174,8 @@ function filterFields(data,permissions,orgId){
         ef_field_permissions = field_permissions.sub_org;
     }
 
-    data.field_permissions = ef_field_permissions;
-    data.section_permissions = ef_section_permissions;
+    var invisibleFields = [];
+    data['invisibleFields'] = invisibleFields;
 
     var valid_fields = ['_orgId','_orgIds',"_v", "del"];
     var curSectionKey = '';
@@ -188,6 +188,7 @@ function filterFields(data,permissions,orgId){
                 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)){
@@ -197,7 +198,8 @@ function filterFields(data,permissions,orgId){
                             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[rk];
+                                delete r[fk];
+                                invisibleFields.push(rk);
                             }
                         }
 
@@ -207,6 +209,7 @@ 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')){
                     delete data[k];
+                    invisibleFields.push(k);
                 }
             }
         }

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

@@ -0,0 +1,183 @@
+function isScalar(o){
+    if(o==null){
+        return true;
+    }
+    if(typeof o==='object'){
+        return false;
+    }
+    return true;
+}
+
+function isEqual(r1,r2){
+    var igoredKeys = ['_type','_matched'];
+    if(r1==null && r2==null){
+        return true;
+    }
+    if(r1==null || r2==null){
+        return false;
+    }
+    //now assert a1!=null && r2!=null
+    var ks1 = r1.keys();
+    var ks2 = r2.keys();
+    if(ks1.length!==ks2.length){
+        return false;
+    }
+    for(var i=0; i<ks1.length; i++){
+        var k = ks1[i];
+        if(r1[k]!==r2[k]){
+            return false;
+        }
+    }
+    return true;
+
+}
+
+function diffArray(a1, a2,parentKey){
+    //a1是旧的,a2是新的
+
+    var result = [];
+    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;
+                r2._matched = true;
+                break;
+            }
+        }
+        if(!found){
+            //r1不存在于a2中，说明r1被删除了
+            r1._type='deleted'
+            result.push(r1)
+        }
+    }
+    for(var i=0; i<a2.length; i++){
+        r2 = a2[i];
+        if(!r2._matched){
+            r2._type = 'added';
+            result.push(r2);
+        }
+
+    }
+    return result;
+}
+
+function diff(obj1, obj2,parentKey){
+    var result = []
+    var keys1 = obj1.keys();
+    var keys2 = obj2.keys();
+    key1s.sort();
+    key2s.sort();
+
+    //找到减少的
+    和发生了变化的
+    for(var i=0; i<keys1.length; i++){
+        var k1 = keys1[i];
+        var v1 = obj1[k1];
+        var v2 = obj2[k1];
+
+
+        //如果v1,v2 是scalar,则直接比较
+        if(isScalar(v1)){
+            if(v1!==v2 && v2!=null && v1!==null){
+                result.push({
+                    type:'changed',
+                    fieldKey : k1,
+                    parentKey: parentKey,
+                    oldv : v1,
+                    newv : v2
+                })
+            }
+            else{
+                if(v1!==v2 && v1===null){
+                    result.push({
+                        type:'added',
+                        fieldKey : k1,
+                        parentKey: parentKey,
+                        oldv : v1,
+                        newv : v2
+                    })
+                }
+                else if(v1!==null && v2===null){
+                    result.push({
+                        type:'deleted',
+                        fieldKey : k1,
+                        parentKey: parentKey,
+                        oldv : v1,
+                        newv : v2
+                    })
+                }
+            }
+        }
+        else{
+            if(Array.isArray(v1)){
+                var ret = diffArray(v1,v2,parentKey + "." + k1);
+                if(ret && ret.length>0){
+                    result.push({
+                        type:'changed',
+                        fieldKey : k1,
+                        fieldType:'array',
+                        parentKey: parentKey,
+                        diff : ret
+                    });
+                }
+            }
+            else{
+                var ret1 = diff(v1,v2,parentKey + "." + k1);
+                result = [].concat(result,ret1);
+            }
+        }
+
+    }
+
+    for(var i=0; i<keys2.length; i++){
+        var k2 = keys2[i];
+        if(keys1.indexOf(k2)>-1){
+            //在keys1中存在，那么这个k2已经在上一步处理过了
+            continue;
+        }
+        var v2 = obj2[k2];
+        if(isScalar(v2)){
+            result.push({
+                type:'added',
+                fieldKey : k2,
+                parentKey: parentKey,
+                oldv : v1,
+                newv : v2
+            })
+        }
+        else{
+            if(Array.isArray(v2)){
+                result.push({
+                    type:'added',
+                    fieldKey : k2,
+                    fieldType:'array',
+                    parentKey: parentKey,
+                    diff : v2
+                });
+            }
+            else{
+               for(var kv in v2){
+                   result.push({
+                       type:'added',
+                       fieldKey : kv,
+                       parentKey: parentKey+"." + k2,
+                       oldv:null,
+                       newv:v2[kv]
+                   });
+               }
+            }
+        }
+
+
+    }
+    return result;
+}

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

@@ -6,6 +6,7 @@
 //#import session.js
 //#import $@projectCode:services/modelService.jsx
 //#import @handlers/include/checklogin.jsx
+//#import @handlers/include/diff.jsx
 (function(){
 
   var env = checklogin();
@@ -55,9 +56,12 @@
       var newdata = @projectCodeService.update( modelObject,env);
     }
 
+    var diffResult = diff(oldObj,modelObject);
+
     var ret = {
       state: 'ok',
-      object: newdata
+      object: newdata,
+      diffResult:diffResult
     };
     out.print( JSON.stringify( ret ) );
   } catch ( e ) {

package/package.json

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