xiatian 4 years ago
parent
commit
2e68eef257

+ 1 - 1
src/components/ckeditor.vue

@@ -57,7 +57,7 @@ export default {
   mounted() {
   mounted() {
     var removePluginStr = "bidi,image";
     var removePluginStr = "bidi,image";
     var removeButtonStr =
     var removeButtonStr =
-      "Anchor,Table,Styles,Format,ShowBlocks,Iframe,PageBreak,Smiley,Flash,Language,JustifyBlock,JustifyRight,JustifyCenter,JustifyLeft,CreateDiv,CopyFormatting,ImageButton,Button,HiddenField,Select,Textarea,TextField,Radio,Checkbox,Form,BGColor,SelectAll,Replace,Find,Templates,Print,Preview,NewPage,Save,Underline,Subscript,Superscript,HorizontalRule,Unlink,Link,Scayt,Cut,Copy,Paste,PasteText,PasteFromWord,Maximize,Italic,Bold,NumberedList,BulletedList,Indent,Outdent,Blockquote,About,RemoveFormat,Strike";
+      "Table,Styles,Format,ShowBlocks,Iframe,PageBreak,Smiley,Flash,Language,JustifyBlock,JustifyRight,JustifyCenter,JustifyLeft,CreateDiv,CopyFormatting,ImageButton,Button,HiddenField,Select,Textarea,TextField,Radio,Checkbox,Form,BGColor,SelectAll,Replace,Find,Templates,Print,Preview,NewPage,Save,Underline,Subscript,Superscript,HorizontalRule,Unlink,Link,Scayt,Cut,Copy,Paste,PasteText,PasteFromWord,Maximize,Italic,Bold,NumberedList,BulletedList,Indent,Outdent,Blockquote,About,RemoveFormat,Strike";
     if (!this.extrabuttons || this.extrabuttons.indexOf("Font") == -1) {
     if (!this.extrabuttons || this.extrabuttons.indexOf("Font") == -1) {
       removeButtonStr = removeButtonStr + ",Font";
       removeButtonStr = removeButtonStr + ",Font";
     }
     }

+ 1 - 1
src/modules/questions/component/ckeditor.vue

@@ -82,7 +82,7 @@ export default {
       ],
       ],
       removePlugins: "bidi,colorbutton,image",
       removePlugins: "bidi,colorbutton,image",
       removeButtons:
       removeButtons:
-        "Anchor,Table,Font,FontSize,Styles,Format,ShowBlocks,Iframe,PageBreak,Smiley,Flash,Language,JustifyBlock,JustifyRight,JustifyCenter,JustifyLeft,CreateDiv,CopyFormatting,ImageButton,Button,HiddenField,Select,Textarea,TextField,Radio,Checkbox,Form,BGColor,SelectAll,Replace,Find,Templates,Print,Preview,NewPage,Save,HorizontalRule,Unlink,Link,Scayt,Cut,Copy,Paste,PasteText,PasteFromWord,Maximize,NumberedList,BulletedList,Indent,Outdent,Blockquote,About,RemoveFormat,Strike",
+        "Table,Font,FontSize,Styles,Format,ShowBlocks,Iframe,PageBreak,Smiley,Flash,Language,JustifyBlock,JustifyRight,JustifyCenter,JustifyLeft,CreateDiv,CopyFormatting,ImageButton,Button,HiddenField,Select,Textarea,TextField,Radio,Checkbox,Form,BGColor,SelectAll,Replace,Find,Templates,Print,Preview,NewPage,Save,HorizontalRule,Unlink,Link,Scayt,Cut,Copy,Paste,PasteText,PasteFromWord,Maximize,NumberedList,BulletedList,Indent,Outdent,Blockquote,About,RemoveFormat,Strike",
     };
     };
     if (this.display !== "inline") {
     if (this.display !== "inline") {
       window.CKEDITOR.replace(this.id, config);
       window.CKEDITOR.replace(this.id, config);

+ 1 - 6
src/modules/questions/views/EditPaper.vue

@@ -674,12 +674,7 @@
           </el-row>
           </el-row>
           <!-- end by weiwenhai -->
           <!-- end by weiwenhai -->
           <div>
           <div>
-            <el-row
-              v-if="
-                !quesModel.parentType ||
-                quesModel.parentType != 'MATCHING_QUESTION'
-              "
-            >
+            <el-row>
               <el-col>
               <el-col>
                 <el-form-item label="题目">
                 <el-form-item label="题目">
                   <ckeditor v-model="quesModel.quesBody"></ckeditor>
                   <ckeditor v-model="quesModel.quesBody"></ckeditor>