owl-cli 6.28.0 → 6.30.0

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

@@ -86,7 +86,7 @@ function getPermissions(roleId, tableId) {
 }
 
 function expandTablePermission(permissions) {
-    $.log("expandTablePermission,permissions=" + JSON.stringify(permissions))
+    // $.log("expandTablePermission,permissions=" + JSON.stringify(per？missions))
     var same_org = {
     };
 
@@ -509,6 +509,7 @@ function merge(oldObj,newObj,permissions,orgId){
             }
         }
     }
+    return newObj;
 
 }
 

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

@@ -9,7 +9,7 @@ function isScalar(o){
 }
 
 function isEqual(r1,r2){
-    var igoredKeys = ['_type','_matched'];
+    var ignoreKeys = ['_type','_matched','_v'];
     if(r1==null && r2==null){
         return true;
     }
@@ -23,6 +23,14 @@ function isEqual(r1,r2){
     var ks1 = Object.keys(r1);
     var ks2 = Object.keys(r2);
 
+    ks1 = ks1.filter(function(k){
+        return ignoreKeys.indexOf(k)===-1;
+    });
+
+    ks2 = ks2.filter(function(k){
+        return ignoreKeys.indexOf(k)===-1;
+    });
+
     if(ks1.length!==ks2.length){
         return false;
     }

package/package.json

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