owl-cli 6.40.0 → 6.42.0

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

@@ -644,14 +644,13 @@ function getObjectPermissionFilter(tableId, roleId,orgId,userId){
     return [filters,excludeFilters]
 }
 function getListPermissionFilter(tableId, roleId,orgId,userId, permissions){
-    if(userId==='0'){
+    if(userId==='0' && orgId==='0' && roleId==='0'){
         return null;
     }
+
     //获得有权限的对象的filter
     var tp = expandTablePermission(permissions);
-    // $.log("tp=" + JSON.stringify(tp));
-    var filters = [];
-    var excludeFilters = [];
+
 
     //如果有listAll
 

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

@@ -1,6 +1,6 @@
 function isScalar(o){
     if(o==null){
-        return true;
+        return false;
     }
     if(typeof o==='object'){
         return false;
@@ -44,9 +44,9 @@ function isEqual(r1,r2){
 
 }
 
-function diffArray(a1, a2,parentKey){
+function diffArray(a1, a2,parentKeys){
     //a1是旧的,a2是新的
-    // $.log("diffArray,parentKey=" + parentKey);
+    // $.log("diffArray,parentKeys=" + parentKeys);
 
     var temp_matched = [];
     var result = [];
@@ -56,6 +56,12 @@ function diffArray(a1, a2,parentKey){
     if(!a2){
         a2 = [];
     }
+
+    for(var i=0; i<a2.length; i++){
+        var r2 = a2[i];
+        delete r2._matched;
+    }
+
     for(var i=0; i<a1.length; i++){
         var r1 = a1[i];
         var found = false;
@@ -92,6 +98,7 @@ function diffArray(a1, a2,parentKey){
             }
         }
         else if(!r2._matched){
+            delete r2._matched;
             result.push({
                 type:'added',
                 r:r2
@@ -104,7 +111,10 @@ function diffArray(a1, a2,parentKey){
 
 
 
-function diff(obj1, obj2,parentKey){
+function diff(obj1, obj2,parentKeys){
+    if(!parentKeys){
+        parentKeys = [];
+    }
     var result = []
     if(!obj1){
         obj1 = {};
@@ -131,51 +141,83 @@ function diff(obj1, obj2,parentKey){
                 result.push({
                     type:'changed',
                     fieldKey : k1,
-                    parentKey: parentKey,
-                    oldv : v1,
-                    newv : v2
+                    parentKeys: parentKeys,
+                    oldv : '' +v1,
+                    newv : '' + v2
                 })
             }
             else{
+
                 if(v1!==v2 && v1===null){
                     result.push({
                         type:'added',
                         fieldKey : k1,
-                        parentKey: parentKey,
-                        oldv : v1,
-                        newv : v2
+                        parentKeys: parentKeys,
+                        oldv : null,
+                        newv : ''+v2
                     })
                 }
                 else if(v1!==null && v2===null){
                     result.push({
                         type:'deleted',
                         fieldKey : k1,
-                        parentKey: parentKey,
+                        parentKeys: parentKeys,
                         oldv : v1,
                         newv : v2
                     })
                 }
+
             }
         }
         else{
-            if(Array.isArray(v1) || Array.isArray(v2)){
-                var ret = diffArray(v1,v2,parentKey + "." + k1);
-                if(ret && ret.length>0){
-                    result.push({
-                        type:'changed',
-                        fieldKey : k1,
-                        fieldType:'array',
-                        parentKey: parentKey,
-                        diff : ret
-                    });
+            //v1 == null 或者 v1是object
+            if(v1!=null){
+                if(Array.isArray(v1) && Array.isArray(v2)){
+                    var newParentKeys = [].concat(parentKeys,[k1]);
+                    var ret = diffArray(v1,v2,newParentKeys);
+                    if(ret && ret.length>0){
+                        result.push({
+                            type:'changed',
+                            fieldKey : k1,
+                            fieldType:'array',
+                            parentKeys: parentKeys,
+                            diff : ret
+                        });
+                    }
+                }
+                else{
+                    //v1 不是null ,也不是array, 所以是Object
+                    if(v2===null){
+                        result.push({
+                            type:'deleted',
+                            fieldKey : k1,
+                            parentKeys: parentKeys,
+                            oldv : '' + v1,
+                            newv : v2
+                        })
+                    }
+                    else{
+                        var newParentKeys = [].concat(parentKeys,[k1]);
+                        var ret1 = diff(v1,v2,newParentKeys);
+                        result = [].concat(result,ret1);
+                    }
+
                 }
             }
             else{
-                var ret1 = diff(v1,v2,parentKey + "." + k1);
-                result = [].concat(result,ret1);
+                //v1 == null;
+                if(v2!=null){
+                    result.push({
+                        type:'added',
+                        fieldKey : k1,
+                        parentKeys: parentKeys,
+                        oldv : v1,
+                        newv : v2
+                    })
+                }
             }
-        }
 
+        }
     }
 
     for(var i=0; i<keys2.length; i++){
@@ -189,9 +231,9 @@ function diff(obj1, obj2,parentKey){
             result.push({
                 type:'added',
                 fieldKey : k2,
-                parentKey: parentKey,
-                oldv : v1,
-                newv : v2
+                parentKeys: parentKeys,
+                oldv : v1==null?null:'' + v1,
+                newv : '' +v2
             })
         }
         else{
@@ -200,25 +242,20 @@ function diff(obj1, obj2,parentKey){
                     type:'added',
                     fieldKey : k2,
                     fieldType:'array',
-                    parentKey: parentKey,
+                    parentKeys: parentKeys,
                     diff : v2
                 });
             }
             else{
-                for(var kv in v2){
-                    result.push({
-                        type:'added',
-                        fieldKey : kv,
-                        parentKey: parentKey+"." + k2,
-                        oldv:null,
-                        newv:v2[kv]
-                    });
-                }
+                result.push({
+                    type:'added',
+                    fieldKey : k2,
+                    parentKeys: parentKeys,
+                    oldv:null,
+                    newv:v2
+                });
             }
         }
-
-
     }
     return result;
-}
-
+}

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

@@ -140,7 +140,10 @@ function buildSort(sort){
   var filters = getFilters();
 
   var permissionFilter = getListPermissionFilter(tableId,roleId,orgId,loginId,permissions);
-  filters.push(permissionFilter);
+  if(permissionFilter){
+    filters.push(permissionFilter);
+  }
+
   if(recycleBin){
     filters.push({"term":{"del.keyword":"T"}});
     var query = {

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

@@ -65,8 +65,6 @@
       var newdata = @projectCodeService.update( merged,env);
     }
 
-
-
     var ret = {
       state: 'ok',
       object: newdata,

package/package.json

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