owl-cli 6.64.0 → 6.66.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.
|
@@ -59,12 +59,19 @@ function diffArray(a1, a2,parentKeys){
|
|
|
59
59
|
|
|
60
60
|
for(var i=0; i<a2.length; i++){
|
|
61
61
|
var r2 = a2[i];
|
|
62
|
-
if(
|
|
63
|
-
|
|
64
|
-
|
|
62
|
+
if(isScalar(r2)){
|
|
63
|
+
delete r2._matched;
|
|
64
|
+
}
|
|
65
|
+
|
|
66
|
+
}
|
|
67
|
+
|
|
68
|
+
var newa2 = [];
|
|
69
|
+
for(var i=0; j<a2.length; j++){
|
|
70
|
+
if(a2[j]){
|
|
71
|
+
newa2.push(a2[j]);
|
|
65
72
|
}
|
|
66
|
-
delete r2._matched;
|
|
67
73
|
}
|
|
74
|
+
a2 = newa2;
|
|
68
75
|
|
|
69
76
|
for(var i=0; i<a1.length; i++){
|
|
70
77
|
var r1 = a1[i];
|
|
@@ -77,7 +84,13 @@ function diffArray(a1, a2,parentKeys){
|
|
|
77
84
|
temp_matched.push(r2);
|
|
78
85
|
}
|
|
79
86
|
else{
|
|
80
|
-
r2
|
|
87
|
+
if(r2){
|
|
88
|
+
r2._matched = true;
|
|
89
|
+
}
|
|
90
|
+
else{
|
|
91
|
+
//如果r2[j]为空，那么应该删除
|
|
92
|
+
|
|
93
|
+
}
|
|
81
94
|
}
|
|
82
95
|
|
|
83
96
|
break;
|
|
@@ -61,7 +61,26 @@
|
|
|
61
61
|
var newdata = @projectCodeService.add( modelObject,env );
|
|
62
62
|
}
|
|
63
63
|
else {
|
|
64
|
+
|
|
64
65
|
modelObject._orgIds = [modelObject._orgId].concat(getParentOrgIds(modelObject._orgId));
|
|
66
|
+
//修复_orgIds
|
|
67
|
+
var _orgIds = [];
|
|
68
|
+
if(modelObject._orgIds){
|
|
69
|
+
modelObject._orgIds.forEach(function(orgId){
|
|
70
|
+
if(typeof orgId === 'string'){
|
|
71
|
+
_orgIds.push(orgId);
|
|
72
|
+
if(_orgIds.indexOf(orgId)===-1){
|
|
73
|
+
_orgIds.push(orgId);
|
|
74
|
+
}
|
|
75
|
+
}
|
|
76
|
+
else{
|
|
77
|
+
if(_orgIds.indexOf('0')===-1) {
|
|
78
|
+
_orgIds.push('0');
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
});
|
|
82
|
+
}
|
|
83
|
+
modelObject._orgIds = _orgIds;
|
|
65
84
|
diffResult = diff(oldObj,modelObject,"");
|
|
66
85
|
if(roleId!=='internal') {
|
|
67
86
|
checkUpdatePermission(modelObject, diffResult, permissions, orgId);
|