From c4efa0df80721d001c71bdd7c3c3313b3fafbd77 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, 19 Mar 2020 19:07:40 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=AE=9E=E8=AE=AD=E5=85=AC?=
 =?UTF-8?q?=E5=BC=8F=E4=BF=9D=E5=AD=98=E5=9C=A8=E5=AE=9E=E8=AE=AD=E7=9A=84?=
 =?UTF-8?q?=E7=AE=80=E4=BB=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tpm/shixunchild/Challenges/Challenges.js  | 39 ++++++++++---------
 .../Challenges/Challengesjupyter.js           |  7 +++-
 .../shixunchild/Challenges/Showmarkdown.js    | 38 ++++++++++++++++++
 3 files changed, 63 insertions(+), 21 deletions(-)
 create mode 100644 public/react/src/modules/tpm/shixunchild/Challenges/Showmarkdown.js

diff --git a/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js b/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js
index 5aa95f4a1..9c08f5a25 100644
--- a/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js
+++ b/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js
@@ -14,7 +14,8 @@ import '../shixunchildCss/Challenges.css';
 
 import AccountProfile from"../../../user/AccountProfile";
 
-const $ = window.$;
+import Showmarkdown from "./Showmarkdown";
+
 
 class Challenges extends Component {
   constructor(props) {
@@ -118,16 +119,16 @@ class Challenges extends Component {
 
   }
   updatamakedown = (id) => {
-    setTimeout(() => {
-      var shixunDescr = window.editormd.markdownToHTML(id, {
-        htmlDecode: "style,script,iframe",
-        taskList: true,
-        tex: true,
-        flowChart: true,
-        sequenceDiagram: true
-      });
-      $("#" + id + " p:first").addClass("ReactMarkdown");
-    }, 200)
+    // setTimeout(() => {
+    //   var shixunDescr = window.editormd.markdownToHTML(id, {
+    //     htmlDecode: "style,script,iframe",
+    //     taskList: true,
+    //     tex: true,
+    //     flowChart: true,
+    //     sequenceDiagram: true
+    //   });
+    //   $("#" + id + " p:first").addClass("ReactMarkdown");
+    // }, 200)
   }
 
   // 关卡的上移下移操作
@@ -404,9 +405,9 @@ class Challenges extends Component {
   render() {
     let { ChallengesDataList, startbtns, sumidtype ,startshixunCombattype,shixunsreplace,shixunsmessage,hidestartshixunsreplacevalue,operationstrue,AccountProfiletype} = this.state;
     let { loadingContent } = this.props;
-    if (ChallengesDataList != undefined) {
-      this.updatamakedown("ReactMarkdown")
-    }
+    // if (ChallengesDataList != undefined) {
+    //   this.updatamakedown("ReactMarkdown")
+    // }
     let id = this.props.match.params.shixunId;
 		const antIcon = <Icon type="loading" style={{ fontSize: 24 }} spin />;
 
@@ -535,11 +536,11 @@ class Challenges extends Component {
                                                                                                                   src={getImageUrl("images/educoder/nodata.png")} />}
                       <p className="edu-nodata-p mb80">暂时还没有相关数据哦！</p>
                     </div>
-                    :<p className={"markdown-body"} style={{overflow:'hidden'}}>
-                    {ChallengesDataList === undefined ? "" :ChallengesDataList&&ChallengesDataList.description===null?"":
-                      <div className={"markdown-body"} dangerouslySetInnerHTML={{__html: markdownToHTML(ChallengesDataList.description).replace(/▁/g,"▁▁▁")}}></div>
-                    }
-                  </p>}
+                    :   ChallengesDataList === undefined ? "" :ChallengesDataList&&ChallengesDataList.description===null?"":
+                      <Showmarkdown
+                        descriptions={ChallengesDataList.description}
+                      />
+                  }
                 </div>
                 </div>
                 <style>
diff --git a/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js b/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js
index 21b935edd..1841cee3c 100644
--- a/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js
+++ b/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js
@@ -7,7 +7,8 @@ import 'antd/lib/pagination/style/index.css';
 import '../shixunchildCss/Challenges.css';
 import axios from 'axios';
 import {addjypertime} from "../../../../redux/actions/jupyter";
-const $ = window.$;
+import Showmarkdown from "./Showmarkdown";
+
 const { Countdown } = Statistic;
 class Challengesjupyter extends Component {
 	constructor(props) {
@@ -627,7 +628,9 @@ class Challengesjupyter extends Component {
 										</div>
 										:<p className={"markdown-body"} style={{overflow:'hidden'}}>
 											{ChallengesDataList === undefined ? "" :ChallengesDataList&&ChallengesDataList.description===null?"":
-												<div className={"markdown-body"} dangerouslySetInnerHTML={{__html: markdownToHTML(ChallengesDataList.description).replace(/▁/g,"▁▁▁")}}></div>
+												<Showmarkdown
+													descriptions={ChallengesDataList.description}
+												/>
 											}
 										</p>}
 								</p>
diff --git a/public/react/src/modules/tpm/shixunchild/Challenges/Showmarkdown.js b/public/react/src/modules/tpm/shixunchild/Challenges/Showmarkdown.js
new file mode 100644
index 000000000..f0ad12cfa
--- /dev/null
+++ b/public/react/src/modules/tpm/shixunchild/Challenges/Showmarkdown.js
@@ -0,0 +1,38 @@
+import React, { Component } from 'react';
+import {markdownToHTML} from 'educoder';
+
+class Showmarkdown extends Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+
+    }
+  }
+  componentDidMount() {
+
+    if (this.props.descriptions) {
+      setTimeout(()=>{
+        var shixunDescr = window.editormd.markdownToHTML("memo_content_editorMd", {
+          htmlDecode: "style,script,iframe",  // you can filter tags decode
+          taskList: true,
+          tex: true,  // 默认不解析
+          flowChart: true,  // 默认不解析
+          sequenceDiagram: true // 默认不解析
+        });
+      }, 200)
+    }
+  }
+
+  render() {
+
+    return(
+      <div id="memo_content_editorMd" className="new_li">
+          <textarea style={{'display': 'none'}}>
+             {this.props.descriptions}
+          </textarea>
+     </div>
+    )
+  }
+}
+
+export default Showmarkdown;
\ No newline at end of file