{
this.fetchRepo()
@@ -72,7 +78,8 @@ class TPMRepositoryComponent extends Component {
let id = this.props.match.params.shixunId;
let url = `/shixuns/${id}/file_content.json`;
axios.post(url, {
- path: path
+ path: path,
+ secret_repository: this.props.secret_repository_tab
}).then((response) => {
trace_collapse('repository res: ', response)
@@ -138,7 +145,7 @@ class TPMRepositoryComponent extends Component {
const path = urlNewPathArray.join('/')
let id = this.props.match.params.shixunId;
- let url = `/shixuns/${id}/repository.json`;
+ let url = `/shixuns/${id}/${this.props.secret_repository_tab ? 'secret_repository' : 'repository'}.json`;
// this.props.setLoadingContent(true)
axios.post(url, {
path: path ? path : ''
diff --git a/public/react/src/modules/tpm/TPMsettings/TPMsettings.js b/public/react/src/modules/tpm/TPMsettings/TPMsettings.js
index a8917fd02..5e27cb41c 100644
--- a/public/react/src/modules/tpm/TPMsettings/TPMsettings.js
+++ b/public/react/src/modules/tpm/TPMsettings/TPMsettings.js
@@ -353,6 +353,8 @@ export default class TPMsettings extends Component {
test_set_permission: response.data.shixun.test_set_permission,
hide_code: response.data.shixun.hide_code,
code_hidden: response.data.shixun.code_hidden,
+ is_secret_repository: response.data.shixun.is_secret_repository,
+ init_is_secret_repository: response.data.shixun.is_secret_repository,
forbid_copy: response.data.shixun.forbid_copy,
vnc: response.data.shixun.vnc,
vnc_evaluate: response.data.shixun.vnc_evaluate,
@@ -439,20 +441,52 @@ export default class TPMsettings extends Component {
SelectshixunCommand=(e)=>{
// console.log( e.target.value)
- this.setState({
- webssh: e.target.value,
- });
- if(e.target.value===2){
- this.setState({
- SelectTheCommandtype: true,
- multi_webssh:false
- });
- }else{
- this.setState({
- SelectTheCommandtype: false,
- multi_webssh:false
- });
- }
+ const webssh = e.target.value
+ if (webssh == 2) {
+ this.setState({
+ webssh: webssh,
+ SelectTheCommandtype: true,
+ multi_webssh:false
+ });
+ } else {
+ if (this.state.init_is_secret_repository && !this.state.vnc) {
+ this.confirmDeleteSecretRepo({
+ onOk: () => {
+ this.setState({
+ webssh: webssh,
+ SelectTheCommandtype: false,
+ multi_webssh:false
+ });
+ }
+ })
+ } else {
+ if (!this.state.vnc) {
+ this.setState({
+ is_secret_repository: false,
+ })
+ }
+ this.setState({
+ webssh: webssh,
+ SelectTheCommandtype: false,
+ multi_webssh:false
+ });
+ }
+ }
+
+ // this.setState({
+ // webssh: webssh,
+ // });
+ // if(webssh===2){
+ // this.setState({
+ // SelectTheCommandtype: true,
+ // multi_webssh:false
+ // });
+ // }else{
+ // this.setState({
+ // SelectTheCommandtype: false,
+ // multi_webssh:false
+ // });
+ // }
}
SelectOpenpublic=(e)=>{
@@ -525,6 +559,35 @@ export default class TPMsettings extends Component {
});
}
+ confirmDeleteSecretRepo = ({title, onOk}) => {
+ confirm({
+ title: title ||
+
已创建的私密版本库及其内容，将在“保存”时被删除。
+
是否确认取消勾选？
+
+ 私密版本库:
+
+
+
+
+
}
+
禁用复制粘贴:
@@ -2239,7 +2337,7 @@ export default class TPMsettings extends Component {
VNC图形化评测:
-
+
:""}
diff --git a/public/react/src/modules/tpm/challengesnew/TPMevaluation.js b/public/react/src/modules/tpm/challengesnew/TPMevaluation.js
index 491751b6a..dd074fc0d 100644
--- a/public/react/src/modules/tpm/challengesnew/TPMevaluation.js
+++ b/public/react/src/modules/tpm/challengesnew/TPMevaluation.js
@@ -240,6 +240,7 @@ export default class TPMevaluation extends Component {
this.setState({
evaluationlist:newevaluationlist
})
+ console.log(newevaluationlist)
}
@@ -539,6 +540,14 @@ export default class TPMevaluation extends Component {
this.setevaluationlist(newevaluationlist);
}
+ // 修改测试集的匹配规则
+ changeEvaluationRule=(e,key)=>{
+ let {evaluationlist}=this.state;
+ let newevaluationlist=evaluationlist;
+ newevaluationlist[key].match_rule=e.target.value
+ this.setevaluationlist(newevaluationlist);
+ }
+
evaluationoninputvalue=(e,key,type)=>{
$.fn.autoHeight = function(){
function autoHeight(elem){
@@ -1159,6 +1168,13 @@ export default class TPMevaluation extends Component {
autoHeight="true"
onInput={(e)=>this.evaluationoninputvalue(e,key,"yq")}
>
+
+ 匹配规则：
+ this.changeEvaluationRule(e,key)}>
+ 完全匹配
+ 末尾匹配
+
+
)
})}
diff --git a/public/react/src/modules/tpm/component/TPMNav.js b/public/react/src/modules/tpm/component/TPMNav.js
index 1683c59a0..ce74be13b 100644
--- a/public/react/src/modules/tpm/component/TPMNav.js
+++ b/public/react/src/modules/tpm/component/TPMNav.js
@@ -5,7 +5,7 @@ import { BrowserRouter as Router, Route, Link } from "react-router-dom";
class TPMNav extends Component {
render() {
- const { user, match, shixun } = this.props;
+ const { user, match, shixun, secret_repository } = this.props;
let isAdminOrCreator = false;
if (user) {
isAdminOrCreator = user.admin || user.manager
@@ -30,7 +30,10 @@ class TPMNav extends Component {
4||this.props.identity===undefined ? "none" : 'block'}}
- className={`${match.url.indexOf('repository') != -1 ? 'active' : ''} fl mr40`}>版本库
+ className={`${match.url.indexOf('/repository') != -1 ? 'active' : ''} fl mr40`}>版本库
+ {secret_repository && 4||this.props.identity===undefined ? "none" : 'block'}}
+ className={`${match.url.indexOf('secret_repository') != -1 ? 'active' : ''} fl mr40`}>私密版本库}
合作者
diff --git a/public/react/src/modules/tpm/component/modal/RepositoryChooseModal.js b/public/react/src/modules/tpm/component/modal/RepositoryChooseModal.js
new file mode 100644
index 000000000..58839f334
--- /dev/null
+++ b/public/react/src/modules/tpm/component/modal/RepositoryChooseModal.js
@@ -0,0 +1,153 @@
+import React, { useState, useEffect, memo } from 'react';
+import axios from 'axios'
+import { Modal, Input } from 'antd';
+
+function RepositoryChooseModal(props) {
+ const [trees, setTrees] = useState([])
+ const [path, setPath] = useState('')
+ const [pathArray, setPathArray] = useState([{val: "根目录/", path: ""}])
+ const [modalVisible, setModalVisible] = useState(true)
+
+ useEffect(() => {
+ repository('')
+ }, [])
+ function onOk() {
+
+ }
+ function onCancel() {
+
+ }
+ /**
+ 点nav 会传入key
+ 点item 会传入 newPath
+
+ item => name, type type tree/leaf
+ */
+ const repository=(item, key, newPath)=>{
+ let newPathArray = [] //
+ //
+ if (key) {
+ for(var i=0; i<=key; i++){
+ newPathArray.push(pathArray[i])
+ }
+ } else if (item) {
+ newPathArray = pathArray.slice(0)
+ newPathArray.push({val: item.name, path: pathArray[pathArray.length - 1] + "/" + item.name})
+ }
+
+ const path = item || key ? newPathArray[newPathArray.length - 1] : ''
+
+ let id = props.match.params.shixunId;
+ let url ="/shixuns/"+id+"/repository.json";
+ axios.post(url,{
+ path: path
+ }).then((response) => {
+ if (response.data.status === 403||response.data.status === 401||response.data.status === 500) {
+
+ }else{
+ setTrees(response.data.trees)
+ setPath(path)
+ pathArray(newPathArray)
+ }
+
+ }).catch((error) => {
+ console.log(error)
+ });
+ }
+ const savegetfilepath=(value)=>{
+ const state = {}
+ let {selectpath,saveshixunfilepath,pathtype} = state
+
+ if(pathtype===1){
+ let newselectpath;
+
+ if(saveshixunfilepath==="shixunfilepathplay"){
+ newselectpath=value
+ }else{
+ const type = selectpath.split('；');
+ let types=false;
+ for(var i=0; i{
+
+ }
+ function sendgetfilepath() {
+
+ }
+ return (
+
+
+
+
+ {/*文件导航*/}
+ {
+ pathArray.length===0?"":pathArray.map((item,key)=>{
+ return(
+ goblakepath(item.path,key,item)}>{item.val}
+ )
+ })
+ }
+ {/*文件*/}
+ {trees === undefined || trees === null ? "" : trees.map((item, key) => {
+ return(
+ -
+
+
+
+ )
+ })}
+
+
+
+
+ saveselectpath(e)}
+ value={path}/>
+
+
+
onOk()}>确定
+
onCancel()}>取消
+
+
+ {this.props.secret_repository_tab &&
+
+ }
+
@@ -181,7 +188,7 @@ class Repository extends Component {
{commits===undefined?"":commits[0].time}
：{commits===undefined?"":commits[0].title}
-
提交记录
diff --git a/public/react/src/modules/tpm/shixunchild/Repository/RepositoryCodeEditor.js b/public/react/src/modules/tpm/shixunchild/Repository/RepositoryCodeEditor.js
index bd7c8355b..51f6e35f2 100644
--- a/public/react/src/modules/tpm/shixunchild/Repository/RepositoryCodeEditor.js
+++ b/public/react/src/modules/tpm/shixunchild/Repository/RepositoryCodeEditor.js
@@ -121,6 +121,7 @@ class RepositoryCodeEditor extends Component {
const path = pathArray.join('/')
this.setState({ codeSaving: true })
axios.post(url, {
+ secret_repository: this.props.secret_repository_tab,
content: this.extend_editor.getValue(),
// type: forTest === true ? 1 : 0,
path: path
diff --git a/public/react/src/modules/tpm/shixunchild/Repository/RepositoryCombinePath.js b/public/react/src/modules/tpm/shixunchild/Repository/RepositoryCombinePath.js
new file mode 100644
index 000000000..aba008e20
--- /dev/null
+++ b/public/react/src/modules/tpm/shixunchild/Repository/RepositoryCombinePath.js
@@ -0,0 +1,82 @@
+import React, { Component } from 'react';
+
+import { Redirect } from 'react-router';
+
+import { BrowserRouter as Router, Route, Link, Switch } from "react-router-dom";
+
+import PropTypes from 'prop-types';
+
+import classNames from 'classnames';
+
+import axios from 'axios';
+
+import { trace_collapse, WordsBtn } from 'educoder'
+
+import { message, Input } from 'antd';
+
+
+const $ = window.$;
+
+
+class RepositoryCombinePath extends Component {
+ constructor(props) {
+ super(props)
+ this.state = {
+ value: this.props.secret_dir_path || '',
+ isEdit: false,
+ }
+ }
+
+ onSave = () => {
+ const { shixunId, pathArray } = this.props;
+ const url = `/shixuns/${shixunId}/set_secret_dir.json`
+
+ this.setState({ codeSaving: true })
+ axios.post(url, {
+ secret_dir_path: this.state.value
+ }
+ ).then((response) => {
+ if (response.data) {
+ message.success('保存成功');
+ this.setState({isEdit: false})
+ }
+ })
+ }
+ onChange = (e) => {
+ const { value } = e.target;
+ this.setState({ value })
+ }
+ onEdit = () => {
+ this.setState({isEdit: true}, () => {
+ window.$('.combinePathEditRow input')[0].focus()
+ });
+ }
+ render() {
+ const { fileContent, match, saveCode } = this.props;
+ const { isEdit, value } = this.state;
+ return (
+
+
+
+ 第一版本库合并路径：
+
+ {!isEdit && 修改}
+ {isEdit && 保存}
+
+
+
+ );
+ }
+}
+export default RepositoryCombinePath;
diff --git a/public/react/src/modules/tpm/shixunchild/Repository/TPMRepositoryCommits.js b/public/react/src/modules/tpm/shixunchild/Repository/TPMRepositoryCommits.js
index d0499a76c..663c5fcf3 100644
--- a/public/react/src/modules/tpm/shixunchild/Repository/TPMRepositoryCommits.js
+++ b/public/react/src/modules/tpm/shixunchild/Repository/TPMRepositoryCommits.js
@@ -34,7 +34,9 @@ class TPMRepositoryCommits extends Component {
let id = this.props.match.params.shixunId;
let collaborators=`/shixuns/`+id+`/commits.json`;
- axios.post(collaborators).then((response)=> {
+ axios.post(collaborators, {
+ secret_repository: this.props.secret_repository_tab
+ }).then((response)=> {
if(response.status===200){
this.setState({