|
@@ -270,10 +270,13 @@ export default {
|
|
|
return detail;
|
|
return detail;
|
|
|
});
|
|
});
|
|
|
},
|
|
},
|
|
|
|
|
+ isNull(val) {
|
|
|
|
|
+ return val === null || val === "" || val === undefined;
|
|
|
|
|
+ },
|
|
|
mergeObjData(targetObj, cacheObj) {
|
|
mergeObjData(targetObj, cacheObj) {
|
|
|
let data = { ...targetObj };
|
|
let data = { ...targetObj };
|
|
|
Object.keys(cacheObj).forEach((k) => {
|
|
Object.keys(cacheObj).forEach((k) => {
|
|
|
- data[k] = cacheObj[k] || targetObj[k];
|
|
|
|
|
|
|
+ data[k] = this.isNull(cacheObj[k]) ? targetObj[k] : cacheObj[k];
|
|
|
});
|
|
});
|
|
|
return data;
|
|
return data;
|
|
|
},
|
|
},
|
