调整导航栏切换编辑

public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.js

@@ -119,10 +119,7 @@ class CompetitionCommon extends Component{
 	}
 	getrightdata=(id,typeid,module_url,has_url,listkey)=>{
 
-		this.setState({
-			module_id:id,
-			module_type:typeid
-		})
+
 		if(typeid==="enroll"){
 			this.props.history.replace(`/newcompetitions/${this.props.match.params.identifier}/enroll`);
       return
@@ -146,6 +143,10 @@ class CompetitionCommon extends Component{
 			return
 		}
 
+		this.setState({
+			module_id:id,
+			module_type:typeid
+		})
 	}
 
 	Competitionedit=()=>{

public/react/src/modules/competitions/Competitioncommon/CompetitionContentsMd.js

@@ -14,8 +14,8 @@ class CompetitionContentsMd extends Component{
 		}
 	}
 	componentDidUpdate =(prevState)=>{
-		if(prevState.tabkey!=this.props.tabkey){
-			this.getchartdata()
+		if(prevState!=this.props){
+			this.getchartdata();
 		}
 	}
 	componentDidMount(){
@@ -26,10 +26,15 @@ class CompetitionContentsMd extends Component{
 
 	getchartdata=()=>{
 		let {mdContentdata,chart_rules}=this.props;
+
 		// is_pdf: false
 		if(this.props.module_type==="chart"){
 			let type=true;
+			if(chart_rules===undefined){
+
+			}else{
 				chart_rules.rule_contents.map((items,keys)=>{
+					debugger
 					if(parseInt(this.props.tabkey)===items.competition_stage_id){
 						console.log(items)
 						this.contentMdRef.current.setValue(items.content);
@@ -49,6 +54,8 @@ class CompetitionContentsMd extends Component{
 					})
 
 				}
+			}
+
 
 		}else{
 			let contentFileList = mdContentdata===undefined?[]:mdContentdata.attachments===undefined?[]:mdContentdata.attachments.map((item) => {