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

app/assets/javascripts/common.js

@@ -1,5 +1,6 @@
 function createMDEditor(element, opts){
   var defaults = {
+    height: 600,
     path: '/editormd/lib/',
     syncScrolling: "single",
     tex: true,

public/react/src/modules/courses/members/CourseGroupChooser.js

@@ -41,7 +41,7 @@ function CourseGroupChooser({ course_groups, isAdminOrCreator = true, item, inde
      console.log('arg_course_groups', arg_course_groups)
      
 
-    const urlStyle = {"lef":"tunset", minWidth: '262px'};
+    const urlStyle = {"left":"unset", minWidth: '262px'};
     if (alwaysShow == true) {
         urlStyle.display = 'block'
     }

public/react/src/modules/courses/members/modal/CourseGroupChooserModal.js

@@ -70,17 +70,22 @@ function CourseGroupChooserModal({ course_groups = [], isAdminOrCreator, item, i
                     text-align: center;
                     margin-bottom: 20px;
                 }
-                .courseGroupChooserModal .drop_down_menu {
+                .courseGroupChooserModal .drop_down_menu  {
                     position: relative;
                     top: auto;
                     box-shadow: none;
+                    padding-top: 12px;
+                }
+                .courseGroupChooserModal .drop_down_menu .mainGroup{
+                    background: #f2f9ff;
                     padding: 0 20px;
+                }
+                .courseGroupChooserModal .drop_down_menu li:hover,.courseGroupChooserModal  .drop_down_normal li:hover{
                     background: #f2f9ff;
-                    padding-top: 12px;
                 }
                 .courseGroupChooserModal .drop_down_menu .mainGroup.ant-checkbox-group {
                     width: 100%;
-                    max-height: 300px
+                    height: 300px;
                 }
                 .courseGroupChooserModal .drop_down_search {
                     margin: 0;

public/react/src/modules/page/main/ActionView.js

@@ -74,6 +74,8 @@ class ActionView extends Component {
   	render() {
   		const { onRunCodeTest, onShowPrevStage, onShowNextStage, gameBuilding
   			, game, classes, st, shixun, record, challenge, time_limit, real_time_limit } = this.props;
+
+  		console.log(shixun)
 	    return (
 	      	<div className="-flex -layout-h" id="game_operate_action">
 			  	<style>{`
@@ -150,7 +152,7 @@ class ActionView extends Component {
 
 				
 				
-				{(!shixun.vnc || shixun.vnc_evaluate) && <div id="code_test" className="act_btn">
+				{(shixun&&shixun.vnc || shixun&&shixun.vnc_evaluate) && <div id="code_test" className="act_btn">
 					{
 						st === 1 && game.status === 2 ? 
 							<Tooltip title={ "已通关的选择题任务无法再次测评" }>

public/react/src/modules/page/main/CodeRepositoryViewContainer.js

@@ -34,23 +34,26 @@ function getNewTreeData(treeData, curKey, child, level) {
 }
 
 function fileData2TreeData(repoFilesData) {
-	const fileTreeData = [];
-    repoFilesData.forEach((item) => {
-        if (item.kind === 'file') {
-            fileTreeData.push({
-                key: item.path,
-                name: item.name,
-                isLeaf: true
-            })
-        } else {
-            fileTreeData.push({
-                key: item.path,
-                name: item.name,
-                // isLeaf: false
-            })
-        }
-    })
-    return fileTreeData;
+	if(repoFilesData!=null){
+		const fileTreeData = [];
+		repoFilesData.forEach((item) => {
+			if (item.kind === 'file') {
+				fileTreeData.push({
+					key: item.path,
+					name: item.name,
+					isLeaf: true
+				})
+			} else {
+				fileTreeData.push({
+					key: item.path,
+					name: item.name,
+					// isLeaf: false
+				})
+			}
+		})
+		return fileTreeData;
+	}
+
 }
 
 class CodeRepositoryViewContainer extends Component {

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

@@ -1653,8 +1653,6 @@ export default class TPMsettings extends Component {
 													// onMouseEnter={operateauthority?this.bigopen:""}
 													onSelect={operateauthority?this.bigopens:""}
 													// open={opers}
-
-													showSearch
 													optionFilterProp="children"
 													filterOption={(input, option) =>
 														option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0

public/react/src/modules/user/usersInfo/InfosTopics.js

@@ -84,36 +84,33 @@ class InfosTopics extends Component{
 
 
 			if(user_id===undefined){
-				user_id=this.props.match.params&&this.props.match.params.username;
+				user_id=1
 			}
 
 
-			if(user_id!=undefined){
-				let {per_page}=this.state;
-				let url=`/users/${user_id}/question_banks.json`;
-
-				axios.get(encodeURI(url),{params:{
-						type,
-						object_type:category,
-						course_list_id,
-						sort_by,
-						sort_direction,
-						page,
-						per_page
-					}
-				}).then((response) => {
-					this.setState({
-						data:response.data,
-						checkBoxValues:[],
-						isSpin:false
-					})
-				}).catch((error) => {
-					this.setState({
-						isSpin:false
-					})
-				});
-			}
+			let {per_page}=this.state;
+			let url=`/users/${user_id}/question_banks.json`;
 
+			axios.get(encodeURI(url),{params:{
+					type,
+					object_type:category,
+					course_list_id,
+					sort_by,
+					sort_direction,
+					page,
+					per_page
+				}
+			}).then((response) => {
+				this.setState({
+					data:response.data,
+					checkBoxValues:[],
+					isSpin:false
+				})
+			}).catch((error) => {
+				this.setState({
+					isSpin:false
+				})
+			});
 
 	}