From 8b47f1e9202cce319fc518bc874fee8427336770 Mon Sep 17 00:00:00 2001 From: guange <8863824@gmail.com> Date: Fri, 3 Jan 2020 11:11:15 +0800 Subject: [PATCH 01/11] =?UTF-8?q?tpm=E4=B9=9F=E5=8A=A0=E4=B8=8Agiturl?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/services/jupyter_service.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/services/jupyter_service.rb b/app/services/jupyter_service.rb index 2d43a0987..bbe0330bb 100644 --- a/app/services/jupyter_service.rb +++ b/app/services/jupyter_service.rb @@ -8,7 +8,8 @@ module JupyterService uri = "#{shixun_tomcat}/bridge/jupyter/get" tpiID = "tpm#{shixun.id}" mount = shixun.data_sets.present? - params = {tpiID: tpiID, identifier: shixun.identifier, needMount: mount, gitUrl: '', + gitUrl = "#{edu_setting('git_address_domain')}/#{shixun.repo_path}" + params = {tpiID: tpiID, identifier: shixun.identifier, needMount: mount, gitUrl: gitUrl, :containers => "#{Base64.urlsafe_encode64(shixun_container_limit(shixun))}"} logger.info "test_juypter: uri->#{uri}, params->#{params}" From d8acfc40f28ad17add579cf460428fa244257621 Mon Sep 17 00:00:00 2001 From: guange <8863824@gmail.com> Date: Fri, 3 Jan 2020 15:23:35 +0800 Subject: [PATCH 02/11] =?UTF-8?q?git=E6=B7=BB=E5=8A=A0=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E6=A0=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/services/git_service.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/services/git_service.rb b/app/services/git_service.rb index 544e830a4..f5a74f244 100644 --- a/app/services/git_service.rb +++ b/app/services/git_service.rb @@ -6,7 +6,7 @@ class GitService class << self - ['add_repository', 'fork_repository', 'delete_repository', 'file_tree', 'update_file', 'file_content', 'commits'].each do |method| + ['add_repository', 'fork_repository', 'delete_repository', 'file_tree', 'update_file', 'file_content', 'commits', 'add_tree'].each do |method| define_method method do |params| post(method, params) end From 85458609a6cae93a514b31bf1d34a453b299f2ae Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Fri, 3 Jan 2020 19:44:41 +0800 Subject: [PATCH 03/11] 1 --- app/controllers/shixuns_controller.rb | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/app/controllers/shixuns_controller.rb b/app/controllers/shixuns_controller.rb index 7b3cb7588..38085a5ac 100644 --- a/app/controllers/shixuns_controller.rb +++ b/app/controllers/shixuns_controller.rb @@ -893,7 +893,8 @@ class ShixunsController < ApplicationController content = upload_file.tempfile.read author_name = current_user.real_name author_email = current_user.git_mail - update_file_content(content, @repo_path, @path, author_email, author_name, "upload file by browser") + message = params[:message] || "upload file by browser" + update_file_content(content, @repo_path, @path, author_email, author_name, message) render_ok end @@ -901,14 +902,16 @@ class ShixunsController < ApplicationController def upload_git_folder author_name = current_user.real_name author_email = current_user.git_mail - git_add_folder(@path, author_name, author_email, "upload folder by browser") + message = params[:message] || "upload folder by browser" + git_add_folder(@path, author_name, author_email, message) render_ok end def delete_git_file author_name = current_user.real_name author_email = current_user.git_mail - git_delete_file(@path, author_name, author_email, "delete filer by browser") + message = params[:message] || "delete filer by browser" + git_delete_file(@path, author_name, author_email, message) render_ok end From 479534bd2d28b7d9dc12916f9ac3b60c46645305 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Fri, 3 Jan 2020 19:48:46 +0800 Subject: [PATCH 04/11] 1 --- app/controllers/shixuns_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/shixuns_controller.rb b/app/controllers/shixuns_controller.rb index 38085a5ac..f86ade58f 100644 --- a/app/controllers/shixuns_controller.rb +++ b/app/controllers/shixuns_controller.rb @@ -910,7 +910,7 @@ class ShixunsController < ApplicationController def delete_git_file author_name = current_user.real_name author_email = current_user.git_mail - message = params[:message] || "delete filer by browser" + message = params[:message] || "delete file by browser" git_delete_file(@path, author_name, author_email, message) render_ok end From 2a1882613c27b51cead94dbd6cc5410eac2416d9 Mon Sep 17 00:00:00 2001 From: tangjiang <465264938@qq.com> Date: Fri, 3 Jan 2020 20:49:55 +0800 Subject: [PATCH 05/11] show test case --- public/react/src/modules/page/MainContent.js | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/public/react/src/modules/page/MainContent.js b/public/react/src/modules/page/MainContent.js index 175ea7bc0..282f65e78 100644 --- a/public/react/src/modules/page/MainContent.js +++ b/public/react/src/modules/page/MainContent.js @@ -14,9 +14,11 @@ import ChooseEvaluateView from './main/ChooseEvaluateView' import { CircularProgress } from 'material-ui/Progress'; import Button from 'material-ui/Button'; import VNCContainer from './VNCContainer' +import { connect } from 'react-redux'; import './tpiPage.css'; import './tpiPageForMobile.css'; +import actions from '../../redux/actions'; const $ = window.$; class MainContent extends Component { componentDidMount() { @@ -32,11 +34,15 @@ class MainContent extends Component { // console.log('onResizeButtonClick') } onRunCodeTest = () => { + const {onRunCodeTest, isCollpaseTsetCase} = this.props; const vncContainer = this.refs['vncContainer'] if (vncContainer) { vncContainer.showCodeEvaluate && vncContainer.showCodeEvaluate() } - this.props.onRunCodeTest(); + // console.log('1111111111'); + // this.props.onRunCodeTest(); + isCollpaseTsetCase(true); + onRunCodeTest(); } hideCodeEvaluate = () => { const vncContainer = this.refs['vncContainer'] @@ -195,4 +201,12 @@ class MainContent extends Component { } } -export default MainContent; +const mapStateToProps = (state) => ({}); +const mapDispatchToProps = (dispatch) => ({ + isCollpaseTsetCase: (flag) => dispatch(actions.isCollpaseTsetCase(flag)) +}); + +export default connect( + mapStateToProps, + mapDispatchToProps +)(MainContent); From afcc3d845f4d26b0c1d2fc1e59ebafee537a4575 Mon Sep 17 00:00:00 2001 From: tangjiang <465264938@qq.com> Date: Fri, 3 Jan 2020 21:26:52 +0800 Subject: [PATCH 06/11] update style --- public/react/src/modules/page/VNCDisplay.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/react/src/modules/page/VNCDisplay.js b/public/react/src/modules/page/VNCDisplay.js index 98c4cb5e7..b9ec77988 100644 --- a/public/react/src/modules/page/VNCDisplay.js +++ b/public/react/src/modules/page/VNCDisplay.js @@ -168,7 +168,7 @@ class VNCDisplay extends Component {
Loading
Send CtrlAltDel
-
+
{this.props.children} From 3b2ffb723b981114bbb3e8277bd359f15adae9a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Fri, 3 Jan 2020 22:39:59 +0800 Subject: [PATCH 07/11] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=A6=96=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/public/css/edu-all.css | 2 +- public/stylesheets/educoder/edu-all.css | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/public/react/public/css/edu-all.css b/public/react/public/css/edu-all.css index 66adaf482..061cee521 100644 --- a/public/react/public/css/edu-all.css +++ b/public/react/public/css/edu-all.css @@ -174,7 +174,7 @@ em.vertical-line{display: inline-block;width: 2px;background: #999;height: 10px} .user_navlist_white a:hover{color: #4cacff} .headIcon{height: 100%;box-sizing: border-box; margin: 0px!important;} .black_nav_list{padding: 4px 0px;box-sizing: border-box;height: 100%;} -.black_nav_list li{line-height: 42px;height: 42px;color: #fff;cursor: pointer;} +.black_nav_list li{line-height: 40px;height: 40px;color: #fff;cursor: pointer;} .black_nav_span{display: block;margin:0px 20px;border-bottom: 1px solid #4B4B4B;padding-left: 8px;color: #FAFAFA} .welcome_shixun_index:last-child .black_nav_span{border-bottom: none} .black_nav_list li:hover{background: #fff;} diff --git a/public/stylesheets/educoder/edu-all.css b/public/stylesheets/educoder/edu-all.css index 8be6e00ab..b596b6c15 100644 --- a/public/stylesheets/educoder/edu-all.css +++ b/public/stylesheets/educoder/edu-all.css @@ -178,7 +178,7 @@ em.vertical-line{display: inline-block;width: 2px;background: #999;height: 10px} .user_navlist_white a:hover{color: #4cacff} .headIcon{height: 100%;box-sizing: border-box; margin: 0px!important;} .black_nav_list{padding: 4px 0px;box-sizing: border-box;height: 100%;} -.black_nav_list li{line-height: 42px;height: 42px;color: #fff;cursor: pointer;} +.black_nav_list li{line-height: 40px;height: 40px;color: #fff;cursor: pointer;} .black_nav_span{display: block;margin:0px 20px;border-bottom: 1px solid #4B4B4B;padding-left: 8px;color: #FAFAFA} .welcome_shixun_index:last-child .black_nav_span{border-bottom: none} .black_nav_list li:hover{background: #fff;} From bcbb47d7b32c7b310470f9c935f5a1e34f43c3fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Fri, 3 Jan 2020 22:43:37 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E5=B0=8F=E5=B1=8F=E5=B9=95=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/modules/tpm/shixuns/ShixunSearchBar.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/react/src/modules/tpm/shixuns/ShixunSearchBar.js b/public/react/src/modules/tpm/shixuns/ShixunSearchBar.js index 65f78502a..02d4d3864 100644 --- a/public/react/src/modules/tpm/shixuns/ShixunSearchBar.js +++ b/public/react/src/modules/tpm/shixuns/ShixunSearchBar.js @@ -239,7 +239,7 @@ render() { { shixunhoverData.map((item,key)=>{ return( - + =8?"bottomLeft":"bottomCenter"}>
  • {item.name}
    • From 06f320ca455ae4f0bc6f8c08563184def04e3743 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Fri, 3 Jan 2020 22:46:59 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/modules/tpm/TPMIndexHOC.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/public/react/src/modules/tpm/TPMIndexHOC.js b/public/react/src/modules/tpm/TPMIndexHOC.js index e44dac83b..4116aef3a 100644 --- a/public/react/src/modules/tpm/TPMIndexHOC.js +++ b/public/react/src/modules/tpm/TPMIndexHOC.js @@ -35,14 +35,14 @@ if (!window['indexHOCLoaded']) { // $('head').append($('') // .attr('href', `${_url_origin}/stylesheets/educoder/antd.min.css?1525440977`)); $('head').append($('') - .attr('href', `${_url_origin}/stylesheets/css/edu-common.css?2020`)); + .attr('href', `${_url_origin}/stylesheets/css/edu-common.css?2021`)); $('head').append($('') - .attr('href', `${_url_origin}/stylesheets/educoder/edu-main.css?2020`)); + .attr('href', `${_url_origin}/stylesheets/educoder/edu-main.css?2021`)); // index.html有加载 $('head').append($('') - .attr('href', `${_url_origin}/stylesheets/educoder/edu-all.css?2020`)); + .attr('href', `${_url_origin}/stylesheets/educoder/edu-all.css?2021`)); // $('head').append($('') From 99ec5fb0331a45fbb701cf6a428de33b599dc7b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Fri, 3 Jan 2020 22:50:55 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E8=AF=95=E5=8D=B7=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../react/src/modules/courses/exercise/new/SingleDisplay.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/react/src/modules/courses/exercise/new/SingleDisplay.js b/public/react/src/modules/courses/exercise/new/SingleDisplay.js index 4b8d9ee95..6b84df8ce 100644 --- a/public/react/src/modules/courses/exercise/new/SingleDisplay.js +++ b/public/react/src/modules/courses/exercise/new/SingleDisplay.js @@ -102,7 +102,7 @@ class SingleDisplay extends Component{ display: "flex", flexDirection:"row", }} key={optionIndex}> - {prefix} + {prefix} @@ -116,7 +116,7 @@ class SingleDisplay extends Component{ display: "flex", flexDirection:"row", }} key={optionIndex}> - {prefix} + {prefix} From 1e8e4457a984f313dffa5572469e6014f98bf811 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Fri, 3 Jan 2020 22:55:19 +0800 Subject: [PATCH 11/11] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/modules/tpm/NewHeader.js | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js index fabe180bf..5884eb4ef 100644 --- a/public/react/src/modules/tpm/NewHeader.js +++ b/public/react/src/modules/tpm/NewHeader.js @@ -1039,17 +1039,17 @@ submittojoinclass=(value)=>{ ` } -
  • - -
    -
    - 题库 -
    -
    -     -
    • + {/*
  • */} + {/* */} + {/*
    */} + {/*
    */} + {/* 题库*/} + {/*
    */} + {/*
    */} + {/*     */} + {/*
    • */}