Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun

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

@@ -43,7 +43,7 @@ class CompetitionCommon extends Component{
 			// 		})
 			// 	}
 			// }).catch((error) => {
-			// 	console.log(error)
+			// 	//console.log(error)
 			// })
 		}
 	}
@@ -51,8 +51,8 @@ class CompetitionCommon extends Component{
 	componentDidUpdate = (prevProps) => {
 		if (prevProps.user != this.props.user) {
 
-			console.log("componentDidUpdatess");
+			//console.log("componentDidUpdatess");
-			console.log(this.props.user);
+			//console.log(this.props.user);
 			if (this.props.user && this.props.user.login != "") {
 				const zul = `/competitions/${this.props.match.params.identifier}/competition_staff.json`;
 				axios.get((zul)).then((result) => {
@@ -64,7 +64,7 @@ class CompetitionCommon extends Component{
 						}
 					}
 				}).catch((error) => {
-					//console.log(error);
+					////console.log(error);
 				})
 			}
 		}
@@ -103,7 +103,7 @@ class CompetitionCommon extends Component{
 				}
 			}
 		}).catch((error) => {
-			console.log(error)
+			//console.log(error)
 		})
 
 		//this.props.user  有可能为空
@@ -119,7 +119,7 @@ class CompetitionCommon extends Component{
 					}
 				}
 			}).catch((error) => {
-				//console.log(error);
+				////console.log(error);
 			})
 		}
 
@@ -161,7 +161,7 @@ class CompetitionCommon extends Component{
 
 					}
 				}).catch((error) => {
-				console.log(error)
+				//console.log(error)
 			})
 		}
 	}
@@ -192,7 +192,7 @@ class CompetitionCommon extends Component{
 
 				}
 			}).catch((error) => {
-				console.log(error)
+				//console.log(error)
 			})
 		}else{
 			if (module_url.substring(0, 7) == 'http://' || module_url.substring(0, 8) == 'https://') {
@@ -309,7 +309,7 @@ class CompetitionCommon extends Component{
 				})
 			}
 		}).catch((error) => {
-			console.log(error)
+			//console.log(error)
 		})
 
 	}

public/react/src/modules/courses/exercise/new/SingleEditor.js

@@ -16,8 +16,8 @@ const $ = window.$
 const { Option } = Select;
 
 const tagArray = [
-    'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 
+  'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I',
-    'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 
+  'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R',
     'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z'
 ]
 class SingleEditor extends Component{
@@ -186,7 +186,7 @@ class SingleEditor extends Component{
       // TODO 新建，然后删除CD选项，再输入题干，会调用到这里，且index是3
       return;
     }
-    let question_choices  = this.state.question_choices.slice(0);    
+    let question_choices = this.state.question_choices.slice(0);
     question_choices[index] = value;
     this.setState({ question_choices })
   }
@@ -208,8 +208,8 @@ class SingleEditor extends Component{
   render() {
     let { question_title, question_score, question_type, question_choices, standard_answers } = this.state;
     let { question_id, index, exerciseIsPublish,
-    // question_title, 
+      // question_title,
-    // question_type, 
+      // question_type,
     // question_score,
         isNew } = this.props;
 
@@ -254,7 +254,7 @@ class SingleEditor extends Component{
 
             ></TPMMDEditor>
 
-            {question_choices.map( (item, index) => {
+          {question_choices.map( (item, index) => {
               const bg = standard_answers[index] ? 'check-option-bg' : ''
               return <div className="df optionRow " >
               {/* 点击设置答案 */}
@@ -268,7 +268,7 @@ class SingleEditor extends Component{
                   </span>
                 {/* </Tooltip> */}
                 <div style={{ flex: '0 0 1038px'}}>
-                <DMDEditor 
+                  <DMDEditor
                   ref={`optionEditor${index}`}
                   toMDMode={this.toMDMode} toShowMode={this.toShowMode}
                   height={166} className={'optionMdEditor'} noStorage={true}
@@ -294,14 +294,15 @@ class SingleEditor extends Component{
             <div className="mb20">
               {/* {!exerciseIsPublish && <ActionBtn style="grey" className="middle mr20" onClick={this.addOption}>新增选项</ActionBtn>} */}
 
-              <span style={{color: '#FF6800'}}>{!exerciseIsPublish ? '温馨提示：点击选项标题，可以直接设置答案；选择多个答案即为多选题' : '　'}</span>
+              <span
+                style={{color: '#FF6800'}}>{!exerciseIsPublish ? '温馨提示：点击选项输入框可设置答案；选中的选项即为正确答案，选择多个答案即为多选题' : '　'}</span>
               { answerTagArray && !!answerTagArray.length ?
               <React.Fragment>
                 <span className="fr color-orange">{answerTagArray.join(' ')}</span>
                 <span className="fr">标准答案：</span>
               </React.Fragment>
-              : 
+                :
-                <span className="fr color-orange">请点击正确选项</span>
+                <span className="fl color-orange">温馨提示：点击选项输入框可设置答案；选中的选项即为正确答案，选择多个答案即为多选题</span>
               }
             </div>
 

public/react/src/modules/page/component/monaco/TPIMonaco.js

@@ -226,6 +226,7 @@ class TPIMonaco extends Component {
             // https://github.com/Microsoft/monaco-editor/issues/539
             window.monaco.editor.setModelLanguage(editor_monaco.getModel(), lang)
         } else if (prevProps.isEditablePath != this.props.isEditablePath) {
+            // 当前文件是否可编辑
             if (this.props.isEditablePath || this.props.shixun && this.props.shixun.code_edit_permission == true) {
                 editor_monaco.updateOptions({readOnly: false})
             } else {
@@ -250,6 +251,7 @@ class TPIMonaco extends Component {
         } 
     }
     componentWillUnmount() {
+        // 注意销毁，不然会出现不能编辑的bug
         this.editor_monaco && this.editor_monaco.dispose()
     }