owl-cli 6.68.0 → 6.70.0

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

@@ -409,6 +409,16 @@ function mergeArray(a1, a2,section_permission){
     if(!a2){
         a2 = [];
     }
+    var newa2 = [];
+    for(var i=0; i<a2.length; i++){
+        if(a2[i]!==null){
+            if(!isScalar(a2[i])){
+                delete a2[i]._matched;
+            }
+            newa2.push(a2[i]);
+        }
+    }
+    a2 = newa2;
     for(var i=0; i<a1.length; i++){
         var r1 = a1[i];
         var found = false;
@@ -420,7 +430,10 @@ function mergeArray(a1, a2,section_permission){
                     temp_matched.push(r2);
                 }
                 else{
-                    r2._matched = true;
+                    if(r2!=null){
+                        r2._matched = true;
+                    }
+
                 }
                 merged.push(r1);
                 break;
@@ -486,7 +499,7 @@ function merge(oldObj,newObj,permissions,orgId){
                 //暂时对于Array, 只要对于section有权限，则是对于整行来说的，而不能对于行中的某个字段
                 var vn = newObj[k];
                 var merged = mergeArray(vo,vn,ef_section_permissions[k]);
-                vn[k] = merged;
+                newObj[k] = merged;
             }
             else {
                 var vn = newObj[k];

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

@@ -57,8 +57,6 @@ function diffArray(a1, a2,parentKeys){
         a2 = [];
     }
 
-
-
     var newa2 = [];
     for(var j=0; j<a2.length; j++){
         if(a2[j]!==null){
@@ -73,7 +71,6 @@ function diffArray(a1, a2,parentKeys){
         if(!isScalar(r2)){
             delete r2._matched;
         }
-
     }
 
     for(var i=0; i<a1.length; i++){
@@ -124,11 +121,33 @@ function diffArray(a1, a2,parentKeys){
                 r:r2
             });
         }
-
     }
     return result;
 }
 
+function isArrayEqual(a1,a2){
+    if(a1==null && a2==null){
+        return true;
+    }
+    if(a1==null && a2!=null){
+        return false;
+    }
+
+    if(a1!==null && a2===null){
+        return false;
+    }
+
+    if(a1.length!==a2.length){
+        return false;
+    }
+    for(var i=0; i<a1.length; i++){
+        if(a1[i]!==a2[i]){
+            return false;
+        }
+    }
+    return true;
+}
+
 
 
 function diff(obj1, obj2,parentKeys){
@@ -202,16 +221,16 @@ function diff(obj1, obj2,parentKeys){
         else{
             //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){
+                if(Array.isArray(v1)){
+                    var ret = isArrayEqual(v1,v2);
+                    if(!ret){
                         result.push({
                             type:'changed',
                             fieldKey : k1,
                             fieldType:'array',
                             parentKeys: JSON.stringify(parentKeys),
-                            diff : ret
+                            oldv : '' + JSON.stringify(v1),
+                            newv : '' + JSON.stringify(v2)
                         });
                     }
                 }
@@ -223,7 +242,7 @@ function diff(obj1, obj2,parentKeys){
                             fieldKey : k1,
                             parentKeys: JSON.stringify(parentKeys),
                             oldv : '' + v1,
-                            newv : v2
+                            newv : ''
                         })
                     }
                     else{
@@ -237,19 +256,18 @@ function diff(obj1, obj2,parentKeys){
             else{
                 //v1 == null;
                 if(v2!=null){
-                    if(v2!=''){
+                    if(v2!==''){
                         result.push({
                             type:'added',
                             fieldKey : k1,
                             parentKeys: JSON.stringify(parentKeys),
-                            oldv : v1,
-                            newv : v2
+                            oldv : '',
+                            newv : JSON.stringify(v2)
                         })
                     }
 
                 }
             }
-
         }
     }
 
@@ -265,7 +283,7 @@ function diff(obj1, obj2,parentKeys){
                 type:'added',
                 fieldKey : k2,
                 parentKeys: JSON.stringify(parentKeys),
-                oldv : v1==null?null:'' + v1,
+                oldv : '',
                 newv : '' +v2
             })
         }
@@ -276,7 +294,8 @@ function diff(obj1, obj2,parentKeys){
                     fieldKey : k2,
                     fieldType:'array',
                     parentKeys: JSON.stringify(parentKeys),
-                    diff : v2
+                    // diff : v2
+                    newv:JSON.stringify(v2)
                 });
             }
             else {
@@ -286,7 +305,7 @@ function diff(obj1, obj2,parentKeys){
                         fieldKey: k2,
                         parentKeys: JSON.stringify(parentKeys),
                         oldv: null,
-                        newv: v2
+                        newv: '' + v2
                     });
                 }
             }

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

@@ -97,6 +97,23 @@ var @projectCodeService = (function (pigeon) {
             }
             return curData
         },
+        deleteValue:function(fullkey,data){
+            var path = fullkey.split('.')
+            var curData = data
+            for (var i = 0; i < path.length-1; i++) {
+                var curKey = path[i]
+                if (typeof(curData) == 'object' && curData != null) {
+                    curData = curData[curKey]
+                }
+                else {
+                    return null
+                }
+            }
+            if(curData){
+                let lastKey = path[path.length-1];
+                delete curData[lastKey];
+            }
+        },
 
         setValue: function (fullkey, value, data) {
             var path = fullkey.split('.')
@@ -362,12 +379,32 @@ var @projectCodeService = (function (pigeon) {
 
         getNormalizedDoc: function (data) {
             var obj = JSON.parse(JSON.stringify(data))
+
+            var fields = formSpecs.fields;
+            for(var i=0; i<fields.length; i++){
+                var field= fields[i];
+                 if (field['_ft'] === 'subform' || field['_ft'] === 'array') {
+                   var meta = field.meta;
+                   if(meta.index==='no'){
+                       delete obj[field.key]
+                   }
+                }
+                else if (field['_ft'] === 'field') {
+                   if(field.index==='no'){
+                       delete obj[field.key]
+                   }
+                }
+            }
             f.tranverseFields(formSpecs, function (field, ctx) {
                 if (ctx.parentField && ctx.parentField._ft == 'array') {
                     var items = f.getValue(ctx.parentField.key, obj)
                     if (items) {
                         for (var i = 0; i < items.length; i++) {
                             var item = items[i]
+                            if(field.index==='no'){
+                                delete item[field.origKey]
+                                continue;
+                            }
                             var value = item[field.origKey]
                             value = f.normalizeValue(value, field)
                             item[field.origKey] = value
@@ -375,9 +412,15 @@ var @projectCodeService = (function (pigeon) {
                     }
                 }
                 else {
-                    var value = f.getValue(field.key, obj)
-                    value = f.normalizeValue(value, field)
-                    f.setValue(field.key, value, obj)
+                    if(field.index==='no'){
+                        f.deleteValue(field.key,obj);
+                    }
+                    else{
+                        var value = f.getValue(field.key, obj)
+                        value = f.normalizeValue(value, field)
+                        f.setValue(field.key, value, obj)
+                    }
+
                 }
             }, {})
             return obj

package/package.json

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