bug fix

src/modules/card/elements/text/ElemText.vue

@@ -32,7 +32,9 @@ export default {
     styles() {
       return {
         fontWeight: this.data.fontWeight,
-        fontFamily: this.data.fontFamily,
+        fontFamily: this.data.fontFamily.includes("宋体")
+          ? `${this.data.fontFamily},宋体-简`
+          : `${this.data.fontFamily},宋体,宋体-简`,
         fontSize: this.data.fontSize,
         color: this.data.color,
         textAlign: this.data.textAlign || null,

src/modules/paper-export/elements/field-text/ElemFieldText.vue

@@ -33,7 +33,9 @@ export default {
     styles() {
       return {
         fontWeight: this.data.fontWeight,
-        fontFamily: this.data.fontFamily,
+        fontFamily: this.data.fontFamily.includes("宋体")
+          ? `${this.data.fontFamily},宋体-简`
+          : `${this.data.fontFamily},宋体,宋体-简`,
         fontSize: this.data.fontSize,
         color: this.data.color,
         textAlign: this.data.textAlign || null,

src/modules/paper-export/views/paperTemplateBuildMixins.js

@@ -141,7 +141,7 @@ export default {
             let element = getRichTextModel({
               contType: "option",
               content: this.mergeRichStruct(
-                item.elements.forEach((el) => el.content)
+                item.elements.map((el) => el.content)
               ),
             });
             item.elements = [element];
@@ -295,7 +295,8 @@ export default {
         });
       });
 
-      this.groups = groups;
+      // 去掉最后一题的间隔行
+      this.groups = groups.slice(0, -1);
     },
     buildPrePages() {
       let pages = deepCopy(this.paperTempJson.pages);

src/modules/question/components/QuestionImportDialog.vue

@@ -281,7 +281,12 @@ export default {
         if (error.response?.data.desc) {
           this.errorMsgModalIsShow = true;
           this.excelErrorMsgs = error.response.data.desc.split("\n");
-          if (this.excelErrorMsgs.some((item) => item.includes("no login"))) {
+          if (
+            this.excelErrorMsgs.some(
+              (item) =>
+                item.includes("no login") || item.includes("token is wrong")
+            )
+          ) {
             this.excelErrorMsgs = ["登陆失效，请重新登录！"];
           }
         }