From 841a9fea0b0bf2e4118500934dc08cfce146dd5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Fri, 20 Dec 2019 11:31:22 +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

---
 .../tpm/shixunchild/Challenges/Challenges.js  | 24 +++++++------
 .../Challenges/Challengesjupyter.js           | 35 ++++++++++++-------
 2 files changed, 36 insertions(+), 23 deletions(-)

diff --git a/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js b/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js
index b1340c0de..239b46fd8 100644
--- a/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js
+++ b/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js
@@ -459,8 +459,19 @@ class Challenges extends Component {
                     }
                   </style>
 
+                  {ChallengesDataList === undefined || ChallengesDataList&&ChallengesDataList.description=== ""||ChallengesDataList&&ChallengesDataList.description===null||ChallengesDataList&&ChallengesDataList.description===undefined?<style>
+                    {
+                      `
+									#shixunchallengesid{
+								    	max-height: 300px;
+									    overflow: hidden;
+									}
+									`
+                    }
+                  </style>:""}
+
 
-                  {this.state.isopentitletype==="greater"&&this.state.opentitletype===true?
+                  {ChallengesDataList === undefined || ChallengesDataList&&ChallengesDataList.description=== ""||ChallengesDataList&&ChallengesDataList.description===null||ChallengesDataList&&ChallengesDataList.description===undefined?"":this.state.isopentitletype==="greater"&&this.state.opentitletype===true?
                   <style>
                     {
                       `
@@ -471,16 +482,7 @@ class Challenges extends Component {
                       `
                     }
                   </style>:""}
-                  {ChallengesDataList === undefined || ChallengesDataList&&ChallengesDataList.description=== ""||ChallengesDataList&&ChallengesDataList.description===null||ChallengesDataList&&ChallengesDataList.description===undefined?<style>
-                    {
-                      `
-									#shixunchallengesid{
-								    	max-height: 300px;
-									    overflow: hidden;
-									}
-									`
-                    }
-                  </style>:""}
+
 
                 <div className="justify break_full_word new_li "
                      id="challenge_editorMd_description">
diff --git a/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js b/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js
index 6ed139bc4..ca1e9d2ff 100644
--- a/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js
+++ b/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js
@@ -47,6 +47,7 @@ class Challengesjupyter extends Component {
 							isopentitletype:"Less",
 						})
 					}
+					this.getjianjiesize()
 				}
 			}
 		}).catch((error) => {
@@ -142,8 +143,8 @@ class Challengesjupyter extends Component {
 			}, 600)
 
 		});
+		setTimeout(this.getjianjiesize(), 1000);
 
-		this.getjianjiesize()
 	}
 
 	updatamakedowns = () => {
@@ -257,18 +258,16 @@ class Challengesjupyter extends Component {
 						</div>
 
 						<div>
+							<style>
+								{
+									`
+                    .markdown-body img{
+                      min-height: 200px;
+                    }
+                    `
+								}
+							</style>
 
-							{this.state.isopentitletype==="greater"&&this.state.opentitletype===true?
-								<style>
-									{
-										`
-                      #shixunchallengesid{
-                          max-height:260px;
-                          overflow: hidden;
-                      }
-                      `
-									}
-								</style>:""}
 							{ChallengesDataList === undefined || ChallengesDataList&&ChallengesDataList.description=== ""||ChallengesDataList&&ChallengesDataList.description===null||ChallengesDataList&&ChallengesDataList.description===undefined?<style>
 								{
 									`
@@ -279,6 +278,18 @@ class Challengesjupyter extends Component {
 									`
 								}
 							</style>:""}
+							{ChallengesDataList === undefined || ChallengesDataList&&ChallengesDataList.description=== ""||ChallengesDataList&&ChallengesDataList.description===null||ChallengesDataList&&ChallengesDataList.description===undefined?"":this.state.isopentitletype==="greater"&&this.state.opentitletype===true?
+								<style>
+									{
+										`
+                      #shixunchallengesid{
+                          max-height:260px;
+                          overflow: hidden;
+                      }
+                      `
+									}
+								</style>:""}
+
 							<div className={"pd20"} id={"shixunchallengesid"}>
 								<p id="ReactMarkdown" style={{overflow:'hidden'}}>
 									{/*{ChallengesDataList === undefined ? "" :ChallengesDataList&&ChallengesDataList.description===null?"":*/}