owl-cli 6.51.0 → 6.53.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.
|
@@ -141,27 +141,26 @@ function diff(obj1, obj2,parentKeys){
|
|
|
141
141
|
result.push({
|
|
142
142
|
type:'changed',
|
|
143
143
|
fieldKey : k1,
|
|
144
|
-
parentKeys: parentKeys,
|
|
144
|
+
parentKeys: JSON.stringify(parentKeys),
|
|
145
145
|
oldv : '' +v1,
|
|
146
146
|
newv : '' + v2
|
|
147
147
|
})
|
|
148
148
|
}
|
|
149
149
|
else{
|
|
150
|
-
|
|
151
|
-
if(v1!==v2 && v1===null){
|
|
150
|
+
if(v2!=null && v1==null){
|
|
152
151
|
result.push({
|
|
153
152
|
type:'added',
|
|
154
153
|
fieldKey : k1,
|
|
155
|
-
parentKeys: parentKeys,
|
|
154
|
+
parentKeys: JSON.stringify(parentKeys),
|
|
156
155
|
oldv : null,
|
|
157
156
|
newv : ''+v2
|
|
158
157
|
})
|
|
159
158
|
}
|
|
160
|
-
else if(v1!==null && v2
|
|
159
|
+
else if(v1!==null && v2==null){
|
|
161
160
|
result.push({
|
|
162
161
|
type:'deleted',
|
|
163
162
|
fieldKey : k1,
|
|
164
|
-
parentKeys: parentKeys,
|
|
163
|
+
parentKeys: JSON.stringify(parentKeys),
|
|
165
164
|
oldv : v1,
|
|
166
165
|
newv : v2
|
|
167
166
|
})
|
|
@@ -180,7 +179,7 @@ function diff(obj1, obj2,parentKeys){
|
|
|
180
179
|
type:'changed',
|
|
181
180
|
fieldKey : k1,
|
|
182
181
|
fieldType:'array',
|
|
183
|
-
parentKeys: parentKeys,
|
|
182
|
+
parentKeys: JSON.stringify(parentKeys),
|
|
184
183
|
diff : ret
|
|
185
184
|
});
|
|
186
185
|
}
|
|
@@ -191,7 +190,7 @@ function diff(obj1, obj2,parentKeys){
|
|
|
191
190
|
result.push({
|
|
192
191
|
type:'deleted',
|
|
193
192
|
fieldKey : k1,
|
|
194
|
-
parentKeys: parentKeys,
|
|
193
|
+
parentKeys: JSON.stringify(parentKeys),
|
|
195
194
|
oldv : '' + v1,
|
|
196
195
|
newv : v2
|
|
197
196
|
})
|
|
@@ -207,13 +206,16 @@ function diff(obj1, obj2,parentKeys){
|
|
|
207
206
|
else{
|
|
208
207
|
//v1 == null;
|
|
209
208
|
if(v2!=null){
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
209
|
+
if(v2!=''){
|
|
210
|
+
result.push({
|
|
211
|
+
type:'added',
|
|
212
|
+
fieldKey : k1,
|
|
213
|
+
parentKeys: JSON.stringify(parentKeys),
|
|
214
|
+
oldv : v1,
|
|
215
|
+
newv : v2
|
|
216
|
+
})
|
|
217
|
+
}
|
|
218
|
+
|
|
217
219
|
}
|
|
218
220
|
}
|
|
219
221
|
|
|
@@ -231,7 +233,7 @@ function diff(obj1, obj2,parentKeys){
|
|
|
231
233
|
result.push({
|
|
232
234
|
type:'added',
|
|
233
235
|
fieldKey : k2,
|
|
234
|
-
parentKeys: parentKeys,
|
|
236
|
+
parentKeys: JSON.stringify(parentKeys),
|
|
235
237
|
oldv : v1==null?null:'' + v1,
|
|
236
238
|
newv : '' +v2
|
|
237
239
|
})
|
|
@@ -242,18 +244,20 @@ function diff(obj1, obj2,parentKeys){
|
|
|
242
244
|
type:'added',
|
|
243
245
|
fieldKey : k2,
|
|
244
246
|
fieldType:'array',
|
|
245
|
-
parentKeys: parentKeys,
|
|
247
|
+
parentKeys: JSON.stringify(parentKeys),
|
|
246
248
|
diff : v2
|
|
247
249
|
});
|
|
248
250
|
}
|
|
249
|
-
else{
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
251
|
+
else {
|
|
252
|
+
if (v2 != null && v2 != '') {
|
|
253
|
+
result.push({
|
|
254
|
+
type: 'added',
|
|
255
|
+
fieldKey: k2,
|
|
256
|
+
parentKeys: JSON.stringify(parentKeys),
|
|
257
|
+
oldv: null,
|
|
258
|
+
newv: v2
|
|
259
|
+
});
|
|
260
|
+
}
|
|
257
261
|
}
|
|
258
262
|
}
|
|
259
263
|
}
|