owl-cli 6.22.0 → 6.24.0

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

@@ -285,25 +285,28 @@ function checkUpdatePermission(data,diffresult,permissions,orgId){
         ef_table_permissions = table_permissions.sub_org;
     }
 
-    $.log("ef_table_permissions=" + JSON.stringify(ef_table_permissions))
+    // $.log("ef_table_permissions=" + JSON.stringify(ef_table_permissions))
     if(ef_table_permissions.update === 'denied'){
         throw "没有修改的权限。"
     }
     if(diffresult && diffresult.length>0){
         for(var i=0; i<diffresult.length; i++){
             var r = diffresult[i];
+            var pk = "main";
             if(r.parentKey && r.parentKey.length>0){
-                if(ef_section_permissions[r.parentKey] && ef_section_permissions[r.parentKey].update ==='denied'){
+                pk = r.parentKey.substring(1);
+                if(ef_section_permissions[pk] && ef_section_permissions[pk].update ==='denied'){
                     throw "没有修改的权限,sectionKey=" + r.parentKey
                 }
-                else if(ef_field_permissions[r.parentKey+"." + r.fieldKey] &&ef_field_permissions[r.parentKey+"." + r.fieldKey.update]==='denied' ){
-                    throw "没有修改字段的权限,fieldKey=" + r.parentKey+"." + r.fieldKey;
-                }
+
+            }
+            var rk = pk + "." + r.fieldKey;
+            if(ef_field_permissions[rk] && ef_field_permissions[rk].update ==='denied' ){
+                throw "没有修改字段的权限,fieldKey=" + rk;
             }
 
         }
     }
-
     //啥都不做代表检查通过
 }
 

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

@@ -38,6 +38,7 @@ function isEqual(r1,r2){
 
 function diffArray(a1, a2,parentKey){
     //a1是旧的,a2是新的
+    $.log("diffArray,parentKey=" + parentKey);
 
     var temp_matched = [];
     var result = [];
@@ -140,7 +141,7 @@ function diff(obj1, obj2,parentKey){
             }
         }
         else{
-            if(Array.isArray(v1)){
+            if(Array.isArray(v1) || Array.isArray(v2)){
                 var ret = diffArray(v1,v2,parentKey + "." + k1);
                 if(ret && ret.length>0){
                     result.push({

package/defaultTemplate/api/src/services/modelService.jsx

@@ -407,7 +407,7 @@ var @projectCodeService = (function (pigeon) {
                 $.log(data.id + ',index error:' + JSON.stringify(s))
             }
             else {
-                $.log('index ok...')
+                // $.log('index ok...')
             }
         },
 
@@ -456,7 +456,7 @@ var @projectCodeService = (function (pigeon) {
 
                 if(meta && meta.enableJDBC){
                     var sqls = insertObject(data);
-                    $.log(sqls.join(";\n"));
+                    // $.log(sqls.join(";\n"));
                 }
                 // $.log("add,meta.push=" +meta.push + ",id=" + data.id);
                 if(meta && meta.push){
@@ -571,14 +571,14 @@ var @projectCodeService = (function (pigeon) {
                 var meta = spec['#meta'];
                 if(meta && meta.enableJDBC){
                     var sqls = updateObject(obj);
-                    $.log(sqls.join(";\n"));
+                    // $.log(sqls.join(";\n"));
                 }
                 if(meta){
-                    $.log("updating meta.push=" + meta.push + ", id=" + obj.id);
+                    // $.log("updating meta.push=" + meta.push + ", id=" + obj.id);
                 }
 
                 if(meta && meta.push){
-                    $.log("send owlchange," + obj.id)
+                    // $.log("send owlchange," + obj.id)
                     KafkaUtil.send('owlchange',JSON.stringify(obj),obj.id);
                 }
                 EventBusService.fire(spec['_t'] + '_update_after', {old: oldObj, data: obj, env: env})
@@ -631,11 +631,11 @@ var @projectCodeService = (function (pigeon) {
 
             if(meta && meta.enableJDBC){
                 var sqls = deleteObject(data);
-                $.log(sqls.join(";\n"));
+                // $.log(sqls.join(";\n"));
             }
 
             if(meta){
-                $.log("del meta.push=" + meta.push + ", id=" + data.id);
+                // $.log("del meta.push=" + meta.push + ", id=" + data.id);
             }
 
             if(meta && meta.push){

package/package.json

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