调整

public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js

@@ -59,7 +59,7 @@ class Challenges extends Component {
               isopentitletype:"Less",
             })
           }
-
+          this.getjianjiesize()
         }
       }
     }).catch((error) => {
@@ -67,31 +67,54 @@ class Challenges extends Component {
     });
   }
 
-  componentDidMount() {
+  getjianjiesize=()=>{
-   this.ChallengesList()
+    let {ChallengesDataList}=this.state;
-
-  }
-  componentDidUpdate = (prevProps,prevState) => {
-
-      //防止陷入无限循环
-    if(prevState.ChallengesDataList!=this.state.ChallengesDataList){
     let boxoffsetHeigh;
     let box=document.getElementById("shixunchallengesid");
+
     if(box){
       boxoffsetHeigh=box.offsetHeight
-        if(boxoffsetHeigh<300){
+      if(ChallengesDataList === undefined || ChallengesDataList&&ChallengesDataList.description=== ""||ChallengesDataList&&ChallengesDataList.description===null||ChallengesDataList&&ChallengesDataList.description===undefined){
+
+      }else{
+        if(this.state.isopentitletype==="greater"){
+
+        }else{
+          if(boxoffsetHeigh>=300){
             this.setState({
-            isopentitletype:"Less",
+              opentitletype:true,
+              isopentitletype:"greater",
               boxoffsetHeigh:boxoffsetHeigh
             })
           }else{
             this.setState({
-            opentitletype:true,
+              isopentitletype:"Less",
-            isopentitletype:"greater",
               boxoffsetHeigh:boxoffsetHeigh
             })
           }
-         console.log(boxoffsetHeigh)
+        }
+
+      }
+
+    }
+  }
+
+  componentDidMount() {
+    if(this.state.isopentitletype==="greater"){
+
+    }else {
+      this.ChallengesList()
+    }
+
+  }
+  componentDidUpdate = (prevProps,prevState) => {
+
+      //防止陷入无限循环
+    if(prevState.ChallengesDataList!=this.state.ChallengesDataList){
+      if(this.state.isopentitletype==="greater"){
+
+      }else{
+        this.getjianjiesize()
       }
     }
 
@@ -333,7 +356,6 @@ class Challenges extends Component {
   opentitle=()=>{
     this.setState({
       opentitletype:!this.state.opentitletype,
-
     })
   }
 
@@ -415,27 +437,50 @@ class Challenges extends Component {
                   this.props.identity < 5?<a className="fr font-14 color-blue mr20" href="/forums/2943"
                      target="_blank">实训制作指南</a> : "":""}
               </div>
-              {this.state.opentitletype===true?<style>
+
+              <div>
+                <div className={"pd20"} id={"shixunchallengesid"}>
+                <style>
+                  {
+                    `
+                    .editormd-html-preview, .editormd-preview-container {
+                          width: 100% !important;
+                      }
+                    `
+                  }
+                </style>
+                  <style>
+                    {
+                      `
+                    .markdown-body img{
+                      min-height: 200px;
+                    }
+                    `
+                    }
+                  </style>
+
+
+                  {this.state.isopentitletype==="greater"&&this.state.opentitletype===true?
+                  <style>
                     {
                       `
                       #shixunchallengesid{
-								    	max-height: 300px;
+                          max-height:260px;
                           overflow: hidden;
                       }
                       `
                     }
                   </style>:""}
-              <div>
+                  {ChallengesDataList === undefined || ChallengesDataList&&ChallengesDataList.description=== ""||ChallengesDataList&&ChallengesDataList.description===null||ChallengesDataList&&ChallengesDataList.description===undefined?<style>
-                <div className={"pd20"} id={"shixunchallengesid"}>
-                <style>
                     {
                       `
-                    .editormd-html-preview, .editormd-preview-container {
+									#shixunchallengesid{
-                          width: 100% !important;
+								    	max-height: 300px;
+									    overflow: hidden;
 									}
 									`
                     }
-                </style>
+                  </style>:""}
 
                 <div className="justify break_full_word new_li "
                      id="challenge_editorMd_description">

public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js

@@ -53,29 +53,49 @@ class Challengesjupyter extends Component {
 			//console.log(error)
 		});
 	}
-	componentDidUpdate = (prevProps,prevState) => {
 
-		//防止陷入无限循环
+
-		if(prevState.ChallengesDataList!=this.state.ChallengesDataList){
+	getjianjiesize=()=>{
+		let {ChallengesDataList}=this.state;
 		let boxoffsetHeigh;
 		let box=document.getElementById("shixunchallengesid");
+
 		if(box){
 			boxoffsetHeigh=box.offsetHeight
-				if(boxoffsetHeigh<300){
+			if(ChallengesDataList === undefined || ChallengesDataList&&ChallengesDataList.description=== ""||ChallengesDataList&&ChallengesDataList.description===null||ChallengesDataList&&ChallengesDataList.description===undefined){
+
+			}else{
+				if(this.state.isopentitletype==="greater"){
+
+				}else{
+					if(boxoffsetHeigh>=300){
 						this.setState({
-						isopentitletype:"Less",
+							opentitletype:true,
+							isopentitletype:"greater",
 							boxoffsetHeigh:boxoffsetHeigh
 						})
 					}else{
 						this.setState({
-						isopentitletype:"greater",
+							isopentitletype:"Less",
-						opentitletype:true,
 							boxoffsetHeigh:boxoffsetHeigh
 						})
 					}
+				}
+
+			}
 
 		}
 	}
+	componentDidUpdate = (prevProps,prevState) => {
+
+		//防止陷入无限循环
+		if(prevState.ChallengesDataList!=this.state.ChallengesDataList){
+			if(this.state.isopentitletype==="greater"){
+
+			}else{
+				this.getjianjiesize()
+			}
+		}
 
 	}
 	componentDidMount() {
@@ -122,6 +142,8 @@ class Challengesjupyter extends Component {
 			}, 600)
 
 		});
+
+		this.getjianjiesize()
 	}
 
 	updatamakedowns = () => {
@@ -233,7 +255,21 @@ class Challengesjupyter extends Component {
 								</a>
 							</Tooltip>
 						</div>
-						{this.state.opentitletype===true?<style>
+
+						<div>
+
+							{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>
 								{
 									`
 									#shixunchallengesid{
@@ -243,8 +279,6 @@ class Challengesjupyter extends Component {
 									`
 								}
 							</style>:""}
-						<div>
-
 							<div className={"pd20"} id={"shixunchallengesid"}>
 								<p id="ReactMarkdown" style={{overflow:'hidden'}}>
 									{/*{ChallengesDataList === undefined ? "" :ChallengesDataList&&ChallengesDataList.description===null?"":*/}