|
@@ -278,7 +278,14 @@ export default {
|
|
|
mergeObjData(targetObj, cacheObj) {
|
|
mergeObjData(targetObj, cacheObj) {
|
|
|
let data = { ...targetObj };
|
|
let data = { ...targetObj };
|
|
|
Object.keys(cacheObj).forEach((k) => {
|
|
Object.keys(cacheObj).forEach((k) => {
|
|
|
- data[k] = this.isNull(cacheObj[k]) ? targetObj[k] : cacheObj[k];
|
|
|
|
|
|
|
+ if (k === "quesAnswer") {
|
|
|
|
|
+ data[k] =
|
|
|
|
|
+ this.isNull(targetObj[k]) || targetObj[k] === "[]"
|
|
|
|
|
+ ? cacheObj[k]
|
|
|
|
|
+ : targetObj[k];
|
|
|
|
|
+ } else {
|
|
|
|
|
+ data[k] = this.isNull(targetObj[k]) ? cacheObj[k] : targetObj[k];
|
|
|
|
|
+ }
|
|
|
});
|
|
});
|
|
|
return data;
|
|
return data;
|
|
|
},
|
|
},
|
