vnc zip_path

public/react/public/js/js_min_all.js

@@ -177,6 +177,7 @@ $(function(){
     //var nCol = 0;
     lab.live('mousedown touchstart',function(){
     		$('#game_webssh').css('pointer-events', 'none')
+    		$('#contentIframe').css('pointer-events', 'none')
             dragging   = true;
             leftOffset = $(".labelN").offset().left;
             wrapWidth = $(".labelN").width();
@@ -186,6 +187,7 @@ $(function(){
     cen.live('mousedown ',function(){
     		// 使得iframe不捕获事件
     		$('#game_webssh').css('pointer-events', 'none')
+    		$('#contentIframe').css('pointer-events', 'none')
             flag   = true;
             topOffset = $(".centerH").offset().top;
             wrapHeight = $(".centerH").height();
@@ -262,6 +264,8 @@ $(function(){
     doc.live("mouseup touchend", function(e) {
     	// 使得iframe可以继续捕获事件
     	$('#game_webssh').css('pointer-events', 'inherit')
+    	$('#contentIframe').css('pointer-events', 'inherit')
+        
         flag = false;
         dragging = false;
         e.cancelBubble = true;

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

@@ -181,6 +181,8 @@ class Index extends Component {
 	    					challenge={context.challenge}
 	    					myshixun={context.myshixun}
 	    					shixun={context.shixun}
+	    					vnc_url={context.vnc_url}
+							
 	    					loading={context.loading}
 							discusses_count={context.discusses_count}
 							hide_code={context.hide_code}

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

@@ -17,17 +17,15 @@ import Button from 'material-ui/Button';
 import './tpiPage.css';
 import './tpiPageForMobile.css';
 const $ = window.$;
-const showIframeContent = window.location.search.indexOf('vnc=1') != -1;
+// const showIframeContent = window.location.search.indexOf('vnc=1') != -1;
 class MainContent extends Component {
 	componentDidMount() {
 		// ios下图标位置有问题
-		if (!showIframeContent) {
 		setTimeout(()=>{
 			if (window.$('.b-label>.resize-helper').position().top < 100) {
 				window.$('.b-label>.resize-helper').css('top', '200px')
 			}
 		}, 4000)
-		}
     $("body").css("padding-right","0px!important")
 	}
 	onResizeButtonClick = () => {
@@ -35,7 +33,7 @@ class MainContent extends Component {
 	}
   	render() {
   		const { challenge, output_sets, onRunCodeTest, latest_output, record, st, readRepoTimeout,
-  				onTestSetHeaderClick, loading, codeLoading } = this.props
+  				onTestSetHeaderClick, loading, codeLoading, shixun, vnc_url } = this.props
 
   		// if (output_sets && output_sets.test_sets) {
   		// 	const test_sets_array = JSON.parse("[" + output_sets.test_sets + "]");
@@ -48,6 +46,7 @@ class MainContent extends Component {
   		} else {
   			games_repository_contents_style = {overflow: 'hidden', height: '445px'}
   		}
+			const showIframeContent = shixun && shixun.vnc == true
 	    return (
 	      	<div className="page--body -margin-t-64 -flex">
 		      	<div className="-layout -stretch -fit labelN" id="game_show_content">
@@ -68,19 +67,21 @@ class MainContent extends Component {
 		      		<div className="split-panel--second -layout -vertical -flex -relative -flex-basic50"
 		      			id="game_right_contents" style={{width: '996px'}}>
 								{/* 
-								  iframe模式下需要这两个样式来调整
-									.page--body {  z-index: 9999;		}
-									.resize-helper  { top: 10px }
+								  iframe模式下可以使用样式控制不接收鼠标事件
+
+									.page--body {  z-index: ${showIframeContent ? '7999': '1'} ;		}
+									.b-label>.resize-helper  { top: ${showIframeContent ? '10px': '50%'} }
+
 								 */}
 								<style>{`
 									#contentIframe {
 										height: 100%;
 										background: #fff;
 									}
-									.page--body {  z-index: ${showIframeContent ? '7999': '1'} ;		}
-									.b-label>.resize-helper  { top: ${showIframeContent ? '10px': '50%'} }
+									.page--body {  z-index: 9999;		}
+									.resize-helper  { top: 10px }
 								`}</style>
-								{ showIframeContent ? <iframe src="http://106.75.27.125:42288/vnc.html" id="contentIframe" ></iframe> : 
+								{ showIframeContent ? <iframe src={vnc_url ||"http://106.75.27.125:42288/vnc.html"} id="contentIframe" ></iframe> : 
 								<React.Fragment>
 		      			{/* 旧版本、评测等待提示--更新提示块*/}
 		      			{/*<div className="tip-panel-animate clearfix user_bg_shadow bor-grey-e">

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

@@ -229,6 +229,10 @@ class MainContentContainer extends Component {
     // arg_path 点击文件目录树时，传入的点击节点对应的path
 	fetchRepositoryCode( props, arg_path, type, isRetry) {
     const { challenge, showSnackbar, game, shixun, hide_code } = props ? props : this.props;
+		if (shixun.vnc == true) {
+			// vnc模式下不需要加载代码
+			return true;
+		}
 		if (hide_code) {	// 隐藏code的实训
 			this.setState({ codeLoading: false });
 			return;
@@ -269,6 +273,7 @@ class MainContentContainer extends Component {
 		const that = this;
 
 		// test
+		// console.log('---- fetch code')
 		// const _code = '"#include<math.h>\n\n// \u6c42n\u7684\u7b97\u672f\u5e73\u65b9\u6839\ndouble SquareRoot(float n)\n{\n    // \u8bf7\u5728\u6b64\u6dfb\u52a0\u4ee3\u7801\uff0c\u8865\u5168\u51fd\u6570SquareRoot\n    /********** Begin *********/\n\n\n    /********** End **********/\n}"'
 		// this.oldRepositoryCode = _code;
 		// this.updateRepositoryCode(_code, updateCodeMirror)

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

@@ -412,7 +412,7 @@ class CodeRepositoryView extends Component {
                         
                         {/* onClick={showFilesDrawer.bind(this, true)} */}
                         { myshixun_manager == true && <Tooltip title={ "下载代码"} disableFocusListener={true}>
-                            <a href={`/myshixuns/${myshixun.identifier}/archive`} className="iconButton" target='_blank'>
+                            <a href={shixun.zip_path || `/myshixuns/${myshixun.identifier}/archive`} className="iconButton" target='_blank'>
                                 <i className="iconfont icon-xiazai1 font-18 "></i>
                             </a>
                         </Tooltip> }