Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

public/react/src/modules/courses/coursesPublic/Addcourses.js

@@ -275,12 +275,13 @@ class Addcourses extends Component{
         });
 				if(response.data.course_id!=undefined){
 					this.submitasyn(response.data.course_id)
-				}else{
-          // 无返回课程id则是选择的教师或者助教身份，成功后跳转到课堂首页
-          // console.log(this.props);
-          // console.log(this.props.history.push);
-			    window.location.href="/courses";
         }
+        // else{
+        //   // 无返回课程id则是选择的教师或者助教身份，成功后跳转到课堂首页
+        //   // console.log(this.props);
+        //   // console.log(this.props.history.push);
+			  //   window.location.href="/courses";
+        // }
 				if(Addcoursestype===true){
 					this.props.hideAddcoursestype();
 				}

public/react/src/modules/developer/newOrEditTask/leftpane/editorTab/AddTestDemo.js

@@ -151,8 +151,6 @@ const AddTestDemo = (props) => {
         <Form>
           <FormItem
             label={<span className={'label_text'}>输入</span>}
-            validateStatus={testCaseValidate.input.validateStatus}
-            help={testCaseValidate.input.errMsg}
             colon={ false }
           >
             <TextArea
@@ -164,8 +162,6 @@ const AddTestDemo = (props) => {
           </FormItem>
           <FormItem
             label={<span className={'label_text'}>输出</span>}
-            validateStatus={testCaseValidate.output.validateStatus}
-            help={testCaseValidate.output.errMsg}
             colon={ false }
           >
             <TextArea

public/react/src/modules/question/component/Listjihe.js

@@ -333,11 +333,11 @@ class Listjihe extends Component {
 					</div>
 					{
 						items.item_type==="PROGRAM"?
-							<a onClick={()=>this.seturls(`/problems/${items.program_attr.identifier}/edit`)} >
-							<div className="ml10 w100s flex1 mt2"  style={{wordBreak: "break-word",fontWeight:"bold"}} dangerouslySetInnerHTML={{__html: markdownToHTML(items&&items.name).replace(/▁/g, "▁▁▁")}}></div>
+							<a onClick={()=>this.seturls(`/problems/${items.program_attr.identifier}/edit`)}  className="ml10 flex1 mt2">
+							<div  style={{wordBreak: "break-word",fontWeight:"bold"}} dangerouslySetInnerHTML={{__html: markdownToHTML(items&&items.name).replace(/▁/g, "▁▁▁")}}></div>
 							</a>
 						:
-							<div className="ml10 w100s flex1 markdown-body mt3" style={{wordBreak: "break-word",fontWeight:"bold"}}>
+							<div className="ml10 flex1 markdown-body mt2" style={{wordBreak: "break-word",fontWeight:"bold"}}>
 
 								{	items===undefined||items===null||items===""?"":
 									items.name === undefined || items.name === null || items.name === "" ?

public/react/src/modules/tpm/NewHeader.js

@@ -1268,7 +1268,8 @@ submittojoinclass=(value)=>{
 								{shixuntype===true?"":<li><Link to={`/users/${this.props.current_user===undefined?"":this.props.current_user.login}/shixuns`}>我的实训项目</Link></li>}
 								{pathstype===true?"":<li><Link to={`/users/${this.props.current_user===undefined?"":this.props.current_user.login}/paths`}>{this.props.user&&this.props.user.main_site===false?"我的课程":"我的实践课程"}</Link></li>}
                 {this.props.user&&this.props.user.main_site===true?<li><Link to={`/users/${this.props.current_user===undefined?"":this.props.current_user.login}/projects`}>我的开发项目</Link></li>:""}
-                { Periofters === true &&<li><Link to ={`/problemset`}>我的题库</Link></li> }
+                { Periofters === true &&<li><Link to ={`/problemset`}>我的试题库</Link></li> }
+								{ Periofters === true &&<li><Link to ={`/paperlibrary`}>我的试卷库</Link></li> }
 								{/*<li><Link to={`/users/${this.props.current_user===undefined?"":this.props.current_user.login}/package`}>我的众包</Link></li>*/}
 								<li style={{display: this.props.Headertop === undefined ? 'none'  : this.props.Headertop.customer_management_url===null || this.props.Headertop.customer_management_url===""? 'none' : 'block'}}>
 									<a href={this.props.Headertop === undefined ? ''  : this.props.Headertop.customer_management_url}>客户管理</a>

public/react/src/redux/actions/ojForUser.js

@@ -26,7 +26,6 @@ import { notification } from "antd";
 export const startProgramQuestion = (id, props) => {
   return (dispatch, getState) => {
     const {searchParams} = getState().ojFormReducer;
-    console.log(searchParams);
     fetchStartProgram(id).then(res => {
       const { status, data } = res;
       if (status === 200) {
@@ -50,7 +49,7 @@ export const startProgramQuestion = (id, props) => {
           // console.log(path);
           // props.history.push(`/myproblems/${identifier}`);
           props.history.push({
-            pathname: `/myproblems/${identifier}.json?${searchParams}`,
+            pathname: `/myproblems/${identifier}`,
           });
         }
       }

public/react/src/redux/actions/ojForm.js

@@ -142,7 +142,7 @@ export const validateOjForm = (props, type, cb) => {
         let validateResult = emptyValidate(key, value);
         const errMsg = validateResult[key].errMsg;
         if (errMsg) {
-          hasSuccess = false;
+          // hasSuccess = false;
         } else {
           // 唯一性校验
           const bool = testCases.some((item, j) => {
@@ -154,7 +154,7 @@ export const validateOjForm = (props, type, cb) => {
           });
 
           if (bool) {
-            hasSuccess = false;
+            // hasSuccess = false;
             validateResult = {
               [key]: {
                 validateStatus: 'error',
@@ -168,13 +168,13 @@ export const validateOjForm = (props, type, cb) => {
       tcValidResult.push(tempObj);
     });
 
-    if (testCases.length === 0) {
-      hasSuccess = false;
-      notification['error']({
-        message: '提示',
-        description: '测试用例必须输入!'
-      });
-    }
+    // if (testCases.length === 0) {
+    //   hasSuccess = false;
+    //   notification['error']({
+    //     message: '提示',
+    //     description: '测试用例必须输入!'
+    //   });
+    // }
 
     // if (!code) {
     //   hasSuccess = false;