From 5c59c40877e6cc97ae2cca7cc4830508a23abe50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Thu, 26 Mar 2020 17:15:57 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../courses/exercise/ExerciseDisplay.js       |  8 +++----
 .../courses/exercise/new/JudgeDisplay.js      |  9 +++-----
 .../courses/exercise/new/ShixunProgramming.js | 22 +++++++++----------
 3 files changed, 17 insertions(+), 22 deletions(-)

diff --git a/public/react/src/modules/courses/exercise/ExerciseDisplay.js b/public/react/src/modules/courses/exercise/ExerciseDisplay.js
index 17d8f1f18..589bbb6f0 100644
--- a/public/react/src/modules/courses/exercise/ExerciseDisplay.js
+++ b/public/react/src/modules/courses/exercise/ExerciseDisplay.js
@@ -125,7 +125,6 @@ class ExerciseDisplay extends Component{
           { exercise_questions.map((item, index) => {
             if (item.question_type == 0 || item.question_type == 1) {
 
-
                 return <SingleDisplay {...this.props} {...item} index={index} {...commonHandler}  {...this.state}
                     displayCount={exercise_questions.length} showActionButton={false} key={index}
                 ></SingleDisplay>
@@ -146,7 +145,7 @@ class ExerciseDisplay extends Component{
 
             } else if (item.question_type == 4) {
 
-
+                //
                 return <MainDisplay
                       showActionButton={false} key={index}  {...this.state}
                       {...this.props} {...item} index={index} {...commonHandler} ></MainDisplay>
@@ -163,9 +162,10 @@ class ExerciseDisplay extends Component{
               return <ShixunProgramming Testpapersettinghomepage
                                     showActionButton={false} key={index}  {...this.state}
                                     {...this.props} {...item} index={index} {...commonHandler} ></ShixunProgramming>
-
+            }else{
+              return <div></div>
             }
-            return <div></div>
+
           })}
         </div>
       )
diff --git a/public/react/src/modules/courses/exercise/new/JudgeDisplay.js b/public/react/src/modules/courses/exercise/new/JudgeDisplay.js
index 24e753a1d..92e7de752 100644
--- a/public/react/src/modules/courses/exercise/new/JudgeDisplay.js
+++ b/public/react/src/modules/courses/exercise/new/JudgeDisplay.js
@@ -1,10 +1,9 @@
 import React,{ Component } from "react";
-import {Radio} from 'antd';
-import {QuillForEditor, MarkdownToHtml } from 'educoder';
+import { Radio } from 'antd';
+import {  MarkdownToHtml,QuillForEditor } from 'educoder';
 import QestionDisplayHeader from './QestionDisplayHeader'
 
 
-
 class JudgeDisplay extends Component{
   constructor(props){
     super(props);
@@ -33,12 +32,10 @@ class JudgeDisplay extends Component{
   }
   render() {
     let { question_choices,
-        question_id, index,
+        question_id, index
      } = this.props;
 
-
     const qNumber = `question_${index}`;
-    // TODO show模式  isNew为false isEdit为false
 
     return(
         <div className="bor-bottom-greyE padding20-30" id={qNumber} _id={question_id}>
diff --git a/public/react/src/modules/courses/exercise/new/ShixunProgramming.js b/public/react/src/modules/courses/exercise/new/ShixunProgramming.js
index cf8967b58..5a0b37ee6 100644
--- a/public/react/src/modules/courses/exercise/new/ShixunProgramming.js
+++ b/public/react/src/modules/courses/exercise/new/ShixunProgramming.js
@@ -15,11 +15,10 @@ class ShixunProgramming extends Component{
   }
   render() {
     let { question_title,
-      question_id, index,
-      shixun_name, shixun_identifier
+      question_id, index, shixun_identifier
     } = this.props;
     const qNumber = `question_${index}`;
-    // TODO show模式  isNew为false isEdit为false
+
     console.log(this.props)
     // console.log(this.state)
     // question_id: 32336
@@ -37,13 +36,13 @@ class ShixunProgramming extends Component{
               
             `}</style>
 
-        <QestionDisplayHeader {...this.props} question_title={question_title}
-                              topRight={
-                                <a target="_blank" href={`/shixuns/${shixun_identifier}/challenges`} className="mr30"
-                                   style={{color: '#4CACFF'}}
-                                >实训详情</a>
-                              }
-        ></QestionDisplayHeader>
+        {/*<QestionDisplayHeader {...this.props} question_title={question_title}*/}
+        {/*                      topRight={*/}
+        {/*                        <a target="_blank" href={`/shixuns/${shixun_identifier}/challenges`} className="mr30"*/}
+        {/*                           style={{color: '#4CACFF'}}*/}
+        {/*                        >实训详情</a>*/}
+        {/*                      }*/}
+        {/*></QestionDisplayHeader>*/}
 
 
         {/*{this.props.exercise&&this.props.exercise.is_md?<div className="mainQuestionDisplay color-grey-9 markdown-body"*/}
@@ -66,5 +65,4 @@ class ShixunProgramming extends Component{
     )
   }
 }
-// RouteHOC()
-export default (ShixunProgramming);
+export default ShixunProgramming;

From f4546d75a343fbdefc221ded1df9afc4f8d330f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Thu, 26 Mar 2020 17:19:35 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/modules/courses/exercise/new/JudgeDisplay.js  |  2 +-
 .../src/modules/courses/exercise/new/MainDisplay.js   | 11 +++--------
 .../modules/courses/exercise/new/ShixunProgramming.js |  2 +-
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/public/react/src/modules/courses/exercise/new/JudgeDisplay.js b/public/react/src/modules/courses/exercise/new/JudgeDisplay.js
index 92e7de752..cbfbb4906 100644
--- a/public/react/src/modules/courses/exercise/new/JudgeDisplay.js
+++ b/public/react/src/modules/courses/exercise/new/JudgeDisplay.js
@@ -56,7 +56,7 @@ class JudgeDisplay extends Component{
             {/* 单选 or 多选 */}
             <div className="options clearfix">
                 { question_choices.map((item, optionIndex) => {
-                     // 单选
+                     console.log(item.choice_text)
                     return (
                         <div key={optionIndex} className="fl mr30 df">
                             <Radio disabled className="lineh-25" checked={item.standard_boolean}></Radio>
diff --git a/public/react/src/modules/courses/exercise/new/MainDisplay.js b/public/react/src/modules/courses/exercise/new/MainDisplay.js
index d91cfbc24..fddd29d0e 100644
--- a/public/react/src/modules/courses/exercise/new/MainDisplay.js
+++ b/public/react/src/modules/courses/exercise/new/MainDisplay.js
@@ -1,5 +1,5 @@
 import React,{ Component } from "react";
-import { MarkdownToHtml,QuillForEditor} from 'educoder';
+import { MarkdownToHtml } from 'educoder';
 import QestionDisplayHeader from './QestionDisplayHeader'
 
 
@@ -44,14 +44,9 @@ class MainDisplay extends Component{
             <React.Fragment>
               <div style={{color: '#05101A'}} className="font-16 mb5 font-bd">参考答案：</div>
 
-              {this.props.exercise&&this.props.exercise.is_md?<MarkdownToHtml content={standard_answer[0]} selector={'answer_' + qNumber}
+             <MarkdownToHtml content={standard_answer[0]} selector={'answer_' + qNumber}
                   className=""
-              ></MarkdownToHtml>:<QuillForEditor
-                readOnly={true}
-                style={{ float: 'left', display: 'inline-block' ,padding:'0px',margin: '2px 0px 0px'}}
-                value={standard_answer[0]?JSON.parse(standard_answer[0]):""}
-                // showUploadImage={this.handleShowUploadImage}
-                />}
+              ></MarkdownToHtml>
             </React.Fragment>
             }
 
diff --git a/public/react/src/modules/courses/exercise/new/ShixunProgramming.js b/public/react/src/modules/courses/exercise/new/ShixunProgramming.js
index 5a0b37ee6..14dec06b8 100644
--- a/public/react/src/modules/courses/exercise/new/ShixunProgramming.js
+++ b/public/react/src/modules/courses/exercise/new/ShixunProgramming.js
@@ -19,7 +19,7 @@ class ShixunProgramming extends Component{
     } = this.props;
     const qNumber = `question_${index}`;
 
-    console.log(this.props)
+   // console.log(this.props)
     // console.log(this.state)
     // question_id: 32336
     // q_position: 4

From 658f7453b155b893d6bb1506e78c8b01b546d8f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Thu, 26 Mar 2020 17:20:15 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/courses/exercise/new/JudgeDisplay.js    | 13 ++++---------
 .../src/modules/courses/exercise/new/MainDisplay.js | 11 ++++++++---
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/public/react/src/modules/courses/exercise/new/JudgeDisplay.js b/public/react/src/modules/courses/exercise/new/JudgeDisplay.js
index cbfbb4906..6cf637fc3 100644
--- a/public/react/src/modules/courses/exercise/new/JudgeDisplay.js
+++ b/public/react/src/modules/courses/exercise/new/JudgeDisplay.js
@@ -1,6 +1,6 @@
 import React,{ Component } from "react";
 import { Radio } from 'antd';
-import {  MarkdownToHtml,QuillForEditor } from 'educoder';
+import {  MarkdownToHtml } from 'educoder';
 import QestionDisplayHeader from './QestionDisplayHeader'
 
 
@@ -56,19 +56,14 @@ class JudgeDisplay extends Component{
             {/* 单选 or 多选 */}
             <div className="options clearfix">
                 { question_choices.map((item, optionIndex) => {
-                     console.log(item.choice_text)
+                     // 单选
                     return (
                         <div key={optionIndex} className="fl mr30 df">
                             <Radio disabled className="lineh-25" checked={item.standard_boolean}></Radio>
 
-                          {this.props.exercise&&this.props.exercise.is_md?<MarkdownToHtml content={item.choice_text} selector={'judge_' + (index + 1) + optionIndex}
+                            <MarkdownToHtml content={item.choice_text} selector={'judge_' + (index + 1) + optionIndex}
                                 className=""
-                            ></MarkdownToHtml>:<QuillForEditor
-                            readOnly={true}
-                            style={{ float: 'left', display: 'inline-block' ,padding:'0px',margin: '2px 0px 0px'}}
-                            value={item.choice_text?JSON.parse(item.choice_text):""}
-                            // showUploadImage={this.handleShowUploadImage}
-                          />}
+                            ></MarkdownToHtml>
 
                         </div>)
 
diff --git a/public/react/src/modules/courses/exercise/new/MainDisplay.js b/public/react/src/modules/courses/exercise/new/MainDisplay.js
index fddd29d0e..d91cfbc24 100644
--- a/public/react/src/modules/courses/exercise/new/MainDisplay.js
+++ b/public/react/src/modules/courses/exercise/new/MainDisplay.js
@@ -1,5 +1,5 @@
 import React,{ Component } from "react";
-import { MarkdownToHtml } from 'educoder';
+import { MarkdownToHtml,QuillForEditor} from 'educoder';
 import QestionDisplayHeader from './QestionDisplayHeader'
 
 
@@ -44,9 +44,14 @@ class MainDisplay extends Component{
             <React.Fragment>
               <div style={{color: '#05101A'}} className="font-16 mb5 font-bd">参考答案：</div>
 
-             <MarkdownToHtml content={standard_answer[0]} selector={'answer_' + qNumber}
+              {this.props.exercise&&this.props.exercise.is_md?<MarkdownToHtml content={standard_answer[0]} selector={'answer_' + qNumber}
                   className=""
-              ></MarkdownToHtml>
+              ></MarkdownToHtml>:<QuillForEditor
+                readOnly={true}
+                style={{ float: 'left', display: 'inline-block' ,padding:'0px',margin: '2px 0px 0px'}}
+                value={standard_answer[0]?JSON.parse(standard_answer[0]):""}
+                // showUploadImage={this.handleShowUploadImage}
+                />}
             </React.Fragment>
             }