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

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

@@ -472,7 +472,7 @@ class studentsList extends Component{
     const { course_group_name, invite_code } = this.state;
 
     const courseId = this.props.match.params.coursesId    
-    let exportUrl = "/api/courses/${courseId}/export_member_scores_excel.xlsx?"
+    let exportUrl = `/api/courses/${courseId}/export_member_scores_excel.xlsx?`
     const params = {}
     if (course_group_id) {
       params.group_id = course_group_id

public/react/src/modules/page/MainContent.js

@@ -75,7 +75,7 @@ class MainContent extends Component {
 		      			{/* 左侧任务说明等功能的区域 */}
 		      			<LeftViewContainer {...newProps}></LeftViewContainer>
 		      		</div>
-					<div id="can-drag" className="can-drag" style={{display: 'none'}}></div>
+					{showIframeContent && vnc_url && <div id="can-drag" className="can-drag" style={{display: 'none'}}></div>}
 		      		<div className="b-label -layout" style={{left: '687px'}}>
 		      			<div className="resize-helper ">
 		      				<Button variant="fab" aria-label="Swap" mini onClick={this.onResizeButtonClick}>

public/react/src/modules/page/VNCDisplay.js

@@ -13,6 +13,7 @@ class VNCDisplay extends Component {
         // When this function is called we have
         // successfully connected to a server
         function connectedToServer(e) {
+            $('#top_bar').hide()
             status("Connected to " + desktopName);
         }
         // This function is called when we are disconnected
@@ -120,6 +121,9 @@ class VNCDisplay extends Component {
             canvas
          */
         rfb.scaleViewport = readQueryVariable('scale', false);
+        rfb.resizeSession = true
+        window.__rfb == rfb;
+
 	}
 	
   	render() {
@@ -127,7 +131,7 @@ class VNCDisplay extends Component {
 
   		
 	    return (
-	      	<div className="">
+	      	<div className="" style={{height: '100%'}}>
                 <style>{`
                     #top_bar {
                         background-color: #6e84a3;
@@ -148,6 +152,7 @@ class VNCDisplay extends Component {
                         cursor: pointer;
                     }
                     #screen {
+                        height: 100%;
                         flex: 1; /* fill remaining space */
                         overflow: hidden;
                     }