|
|
@@ -109,7 +109,7 @@
|
|
|
// import paperRichTextJson from "../datas/paperRichText.json";
|
|
|
// import paperParseData from "../datas/paperParseData.json";
|
|
|
|
|
|
-import { calcSum, deepCopy, randomCode } from "@/plugins/utils";
|
|
|
+import { calcSum, deepCopy, objTypeOf, randomCode } from "@/plugins/utils";
|
|
|
import QuestionImportPaperEdit from "./QuestionImportPaperEdit.vue";
|
|
|
import { isAnEmptyRichText } from "@/utils/utils";
|
|
|
import {
|
|
|
@@ -273,19 +273,16 @@ export default {
|
|
|
});
|
|
|
},
|
|
|
isNull(val) {
|
|
|
+ if (val) {
|
|
|
+ if (val === "[]") return true;
|
|
|
+ if (objTypeOf(val) === "array" && !val.length) return true;
|
|
|
+ }
|
|
|
return val === null || val === "" || val === undefined;
|
|
|
},
|
|
|
mergeObjData(targetObj, cacheObj) {
|
|
|
let data = { ...targetObj };
|
|
|
Object.keys(cacheObj).forEach((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];
|
|
|
- }
|
|
|
+ data[k] = this.isNull(targetObj[k]) ? cacheObj[k] : targetObj[k];
|
|
|
});
|
|
|
return data;
|
|
|
},
|
