Merge branches 'dev_aliyun' and 'issues25489' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js

@@ -2668,18 +2668,18 @@ class Studentshavecompletedthelist extends Component {
 								</div>
 								:
 								<div>
-									{/*{testpapergradingboll === true ? <ModulationModal*/}
+									{testpapergradingboll === true ? <ModulationModal
-									{/*	visible={testpapergradingboll}*/}
+										visible={testpapergradingboll}
-									{/*	Cancel={() => this.Adjustments()}*/}
+										Cancel={() => this.Adjustments()}
-									{/*	Saves={(value, num) => this.Testpapergrading(value, num)}*/}
+										Saves={(value, num) => this.Testpapergrading(value, num)}
-									{/*/> : ""}*/}
+									/> : ""}
-									{
+									{/*{*/}
-										testpapergradingboll === true ? <ModulationModal_exercise
+									{/*	testpapergradingboll === true ? <ModulationModal_exercise*/}
-											visible={testpapergradingboll}
+									{/*		visible={testpapergradingboll}*/}
-											Cancel={() => this.Adjustments()}
+									{/*		Cancel={() => this.Adjustments()}*/}
-											Saves={(value, num) => this.Testpapergrading(value, num)}
+									{/*		Saves={(value, num) => this.Testpapergrading(value, num)}*/}
-										/> : ""
+									{/*	/> : ""*/}
-									}
+									{/*}*/}
 									<div className="edu-back-white" >
 										<ul className="clearfix" style={{padding: '10px 30px 10px 30px'}}>
 

public/react/src/modules/osshackathon/Osshackathon.css

@@ -42,6 +42,9 @@
     font-weight:400;
     color:rgba(5,16,26,1);
     line-height:24px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
 }
 
 .ant-input::-webkit-input-placeholder{

public/react/src/modules/osshackathon/Osshackathon.js

@@ -39,14 +39,16 @@ class Osshackathon extends Component {
 				search:search,
 			}}).then((result)=>{
 			if(result.status==200){
-				console.log(result)
 				this.setState({
 						data:result.data,
 				  	spinning:false
 				})
+			}else{
+				this.setState({
+					spinning:false
+				})
 			}
 		}).catch((error)=>{
-			console.log(error);
 			this.setState({
 				spinning:true
 			})
@@ -92,6 +94,15 @@ class Osshackathon extends Component {
 
 	Signupentry=(id)=>{
 	//	用户报名
+		if(this.props.checkIfLogin()===false){
+			this.props.showLoginDialog()
+			return
+		}
+		if(this.props.checkIfProfileCompleted()===false){
+			this.props.showProfileCompleteDialog()
+			return
+		}
+
 		this.props.confirm({
 			content: `是否确认报名?`,
 			onOk: () => {
@@ -157,7 +168,7 @@ class Osshackathon extends Component {
 			.then((response) => {
 				if (response.data.status == 0) {
 					// {"status":1,"message":"删除成功"}
-					this.getosshackathonlist()
+					this.getosshackathonlist();
 					this.props.showNotification(`删除成功`);
 				}
 			})
@@ -172,6 +183,9 @@ class Osshackathon extends Component {
 		this.setState({
 			search:value
 		})
+		if(value.length>300){
+			this.props.showNotification(`搜索字数大于300个字`);
+		}
 		let {page,limit,search}=this.state;
 		this.getosshackathon(page,limit,value)
 	}
@@ -280,7 +294,7 @@ class Osshackathon extends Component {
 							return(
 								<Card className={"OsshackathonCard mb20"} key={key}>
 									<Row>
-										<Col span={6} className={"OsshackathonCardtitle"}>
+										<Col span={20} className={"OsshackathonCardtitle"}>
 											{item.name}
 										</Col>
 
@@ -319,7 +333,7 @@ class Osshackathon extends Component {
 							return(
 								<Card className={"OsshackathonCard mb20"}>
 									<Row>
-										<Col span={6} className={"OsshackathonCardtitle"}>
+										<Col span={20} className={"OsshackathonCardtitle"}>
 											{item.name}
 										</Col>
 										<Col span={4} className={"fr textcenter width14bai"}>
@@ -346,7 +360,7 @@ class Osshackathon extends Component {
 												</Row>
 											</div>
 										</Col>
-										<Col span={18} pull={6} className={"minheight50px "}>
+										<Col span={18} pull={6} className={"minheight50px ml5"}>
 											{item.description}
 										</Col>
 									</Row>

public/react/src/modules/osshackathon/Osshackathonmodel.js

@@ -100,7 +100,7 @@ class Osshackathonmodel extends Component{
 	render() {
 		let {textareavaltype}=this.state;
 		// console.log(this.props.tabkey)
-    console.log(this.props.Osshackathonmodeltype)
+    // console.log(this.props.Osshackathonmodeltype)
 
 		return (
 			<div>
@@ -139,7 +139,7 @@ class Osshackathonmodel extends Component{
 				<Modal
 					keyboard={false}
 					className={"HomeworkModal"}
-					title={"新建项目"}
+					title={this.props.modelid===undefined?"新建项目":"编辑项目"}
 					visible={this.props.Osshackathonmodeltype}
 					closable={false}
 					footer={null}