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

---
 .../react/src/common/quillForEditor/index.js  |  16 ++-
 .../exercise/ExerciseReviewAndAnswer.js       |  17 +++
 .../courses/exercise/question/Progques.js     | 103 ++++++++++++++++++
 3 files changed, 130 insertions(+), 6 deletions(-)
 create mode 100644 public/react/src/modules/courses/exercise/question/Progques.js

diff --git a/public/react/src/common/quillForEditor/index.js b/public/react/src/common/quillForEditor/index.js
index 46b02b94e..7f0e56e86 100644
--- a/public/react/src/common/quillForEditor/index.js
+++ b/public/react/src/common/quillForEditor/index.js
@@ -209,12 +209,16 @@ function QuillForEditor({
 
     if (value && value.hasOwnProperty('ops')) {
       // console.log(value.ops);
-      const ops = value.ops || [];
-      ops.forEach((item, i) => {
-        if (item.insert['image']) {
-          item.insert['image'] = Object.assign({}, item.insert['image'], { style: { cursor: 'pointer' }, onclick: (url) => showUploadImage(url) });
-        }
-      });
+      try {
+				const ops = value.ops || [];
+				ops.forEach((item, i) => {
+					if (item.insert['image']) {
+						item.insert['image'] = Object.assign({}, item.insert['image'], { style: { cursor: 'pointer' }, onclick: (url) => showUploadImage(url) });
+					}
+				});
+			}catch (e) {
+
+			}
     }
 
     const current = value
diff --git a/public/react/src/modules/courses/exercise/ExerciseReviewAndAnswer.js b/public/react/src/modules/courses/exercise/ExerciseReviewAndAnswer.js
index 9f60b3481..483769f62 100644
--- a/public/react/src/modules/courses/exercise/ExerciseReviewAndAnswer.js
+++ b/public/react/src/modules/courses/exercise/ExerciseReviewAndAnswer.js
@@ -13,6 +13,7 @@ import CoursesListType from '../coursesPublic/CoursesListType';
 import QuillForEditor from "../../../common/quillForEditor";
 import Multiple from './question/multiple';
 import Single from './question/single';
+import Progques from './question/Progques';
 import FillEmpty from './question/fillEmpty';
 import SimpleAnswer from './question/simpleAnswer';
 import ShixunAnswer from './question/shixunAnswer';
@@ -1014,6 +1015,22 @@ class ExerciseReviewAndAnswer extends Component{
 												handleShowUploadImage={(u)=>this.handleShowUploadImage(u)}
                         ></ShixunAnswer>
                       }
+											{
+												//编程题
+												item.question_type == 6 &&
+												<Progques
+													{...this.props}
+													{...this.state}
+													is_md={is_md}
+													exercise={exercise}
+													questionType={item}
+													user_exercise_status={user_exercise_status}
+													id={this.state.Id}
+													index={key}
+													handleShowUploadImage={(u)=>this.handleShowUploadImage(u)}
+												></Progques>
+
+											}
 
                     {
                       //调分理由部分
diff --git a/public/react/src/modules/courses/exercise/question/Progques.js b/public/react/src/modules/courses/exercise/question/Progques.js
new file mode 100644
index 000000000..7a0c7660b
--- /dev/null
+++ b/public/react/src/modules/courses/exercise/question/Progques.js
@@ -0,0 +1,103 @@
+import React,{ Component } from "react";
+import {Checkbox,Radio, Input} from "antd";
+import {DMDEditor,markdownToHTML, MarkdownToHtml } from 'educoder'
+import QuillForEditor from "../../../../common/quillForEditor";
+
+import axios from 'axios'
+
+const tagArray = [
+	// 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I',
+	// 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R',
+	// 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z'
+]
+class Progques extends Component{
+	constructor(props){
+		super(props);
+
+	}
+
+
+	toMDMode = (that) => {
+
+
+	}
+
+	onOptionContentChange = (value, index) => {
+
+	}
+
+	onBlurEmpty=(index,number)=>{
+
+	}
+
+	render(){
+		let {
+			questionType ,
+			exercise ,
+			user_exercise_status,
+			is_md
+		}=this.props
+		let isAdmin = this.props.isAdmin();
+		let isStudent = this.props.isStudent();
+    let item=questionType;
+		let titename="";
+		if(item){
+			if(is_md===true){
+				titename=item.description;
+			}else{
+				try {
+					titename =  JSON.parse(item.description);
+				}catch (e) {
+					titename={"ops":[{"insert":item.description}]};
+				}
+				// JSON.parse 有些异常数据是undefined
+				if(titename===undefined){
+					titename={"ops":[{"insert":item.description}]};
+				}
+				try {
+					// JSON.parse 转换的时候如果是数字字符串就转成整数了
+					if(titename>=0){
+						titename={"ops":[{"insert":item.description}]};
+					}
+				}catch (e) {
+
+				}
+			}
+		}
+
+		return(
+			<div className="pl30 pr30">
+				<style>{`
+          .emptyPanel div#content_editorMd_show{
+            width: 100%;
+            border-radius: 4px;
+            // height: 35px;
+            margin-top:0px;
+            background-color:#fafafa;
+            color:#999;
+            // line-height:25px;
+          }
+          .answerStyle{
+            background:#f5f5f5;
+            border-radius:4px;
+            border: 1px solid #eaeaea;
+            padding:5px;
+            min-height:35px;
+            box-sizing:border-box;
+          }
+          .emptyPanel .quill_editor_for_react_area{
+          width: 100% !important;
+          }
+        `}</style>
+				<li className="df mb10 emptyPanel">
+					<QuillForEditor
+						readOnly={true}
+						value={titename}
+						showUploadImage={this.props.handleShowUploadImage}
+					/>
+				</li>
+			</div>
+		)
+	}
+}
+export default Progques