owl-cli 6.68.0 → 6.69.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -409,6 +409,16 @@ function mergeArray(a1, a2,section_permission){
|
|
|
409
409
|
if(!a2){
|
|
410
410
|
a2 = [];
|
|
411
411
|
}
|
|
412
|
+
var newa2 = [];
|
|
413
|
+
for(var i=0; i<a2.length; i++){
|
|
414
|
+
if(a2[i]!==null){
|
|
415
|
+
if(!isScalar(a2[i])){
|
|
416
|
+
delete a2[i]._matched;
|
|
417
|
+
}
|
|
418
|
+
newa2.push(a2[i]);
|
|
419
|
+
}
|
|
420
|
+
}
|
|
421
|
+
a2 = newa2;
|
|
412
422
|
for(var i=0; i<a1.length; i++){
|
|
413
423
|
var r1 = a1[i];
|
|
414
424
|
var found = false;
|
|
@@ -420,7 +430,10 @@ function mergeArray(a1, a2,section_permission){
|
|
|
420
430
|
temp_matched.push(r2);
|
|
421
431
|
}
|
|
422
432
|
else{
|
|
423
|
-
r2
|
|
433
|
+
if(r2!=null){
|
|
434
|
+
r2._matched = true;
|
|
435
|
+
}
|
|
436
|
+
|
|
424
437
|
}
|
|
425
438
|
merged.push(r1);
|
|
426
439
|
break;
|
|
@@ -486,7 +499,7 @@ function merge(oldObj,newObj,permissions,orgId){
|
|
|
486
499
|
//暂时对于Array, 只要对于section有权限，则是对于整行来说的，而不能对于行中的某个字段
|
|
487
500
|
var vn = newObj[k];
|
|
488
501
|
var merged = mergeArray(vo,vn,ef_section_permissions[k]);
|
|
489
|
-
|
|
502
|
+
newObj[k] = merged;
|
|
490
503
|
}
|
|
491
504
|
else {
|
|
492
505
|
var vn = newObj[k];
|