Browse Source

文字新增对齐

zhangjie 2 years ago
parent
commit
fcfda50000

+ 1 - 1
src/constants/constants.js

@@ -175,5 +175,5 @@ export const EMPTY_RICH_TEXT = { sections: [] };
 
 export const PAPER_TEMPLATE_TYPE = {
   PAPER_EXPORT: "试卷导出模板",
-  SYNTHESIZE_PAPER_EXPORT: "综合卷导出模版",
+  // SYNTHESIZE_PAPER_EXPORT: "综合卷导出模版",
 };

+ 9 - 0
src/modules/card/elements/text/EditText.vue

@@ -27,6 +27,14 @@
           >是否加粗</el-checkbox
         >
       </el-form-item>
+      <el-form-item label="对齐:">
+        <el-radio-group v-model="modalForm.textAlign">
+          <el-radio-button label="left">左</el-radio-button>
+          <el-radio-button label="center">居中</el-radio-button>
+          <el-radio-button label="right">右</el-radio-button>
+          <el-radio-button label="justify">两端</el-radio-button>
+        </el-radio-group>
+      </el-form-item>
       <el-form-item prop="contentStr" label="内容:">
         <el-input
           ref="contentTextarea"
@@ -54,6 +62,7 @@ const initModalForm = {
   fontFamily: "",
   fontWeight: 400,
   rotation: 0,
+  textAlign: null,
   content: [],
   contentStr: "",
 };

+ 1 - 0
src/modules/card/elements/text/ElemText.vue

@@ -32,6 +32,7 @@ export default {
         fontFamily: this.data.fontFamily,
         fontSize: this.data.fontSize,
         color: this.data.color,
+        textAlign: this.data.textAlign || null,
       };
     },
     elemStyles() {

+ 1 - 0
src/modules/card/elements/text/model.js

@@ -7,6 +7,7 @@ const MODEL = {
   w: 200,
   h: 50,
   sign: "",
+  textAlign: null,
   fontWeight: 400,
   fontFamily: "宋体",
   fontSize: "14px",

+ 1 - 1
src/modules/paper-export/components/ModifyPaperTemplateInfo.vue

@@ -50,7 +50,7 @@ import { PAPER_TEMPLATE_TYPE } from "@/constants/constants";
 const initModalForm = {
   id: null,
   name: "",
-  type: "GENERIC",
+  type: "PAPER_EXPORT",
 };
 
 export default {

+ 3 - 0
src/modules/paper/components/BuildPaperManual.vue

@@ -187,6 +187,9 @@ export default {
       this.$refs.SelectQuestionDialog.open();
     },
     questionSelected(questions) {
+      questions.forEach((q) => {
+        q.score = this.curDetail.scorePerQuestion;
+      });
       this.curDetail.questions.push(...questions);
     },
     toEditQuestion(question) {

+ 1 - 1
src/modules/paper/components/ModifyDetailStruct.vue

@@ -61,7 +61,7 @@ const initModalForm = {
   id: null,
   detailName: "",
   courseId: "",
-  description: "",
+  description: { sections: [] },
   questionType: null,
   sourceDetailId: null,
   scorePerQuestion: 1,

+ 2 - 1
src/modules/paper/components/SelectQuestionDialog.vue

@@ -244,7 +244,8 @@ export default {
     initData() {
       this.filter = Object.assign({}, this.filter, {
         courseId: this.courseId,
-        ...this.sourceDetail,
+        questionType: this.sourceDetail.questionType,
+        sourceDetailId: this.sourceDetail.sourceDetailId,
       });
 
       this.curSelectedQuestions = [];