From 5f62c9b6e06b1b9b26253f33271ad423804cc279 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Tue, 7 Jan 2020 13:58:04 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../react/src/modules/tpm/TPMRepositoryComponent.js | 2 +- .../src/modules/tpm/TPMRepositoryComponentdetails.js | 2 +- .../tpm/shixunchild/Repository/RepositoryAddFile.js | 2 +- .../Repository/RepositoryAddFileupload_file.js | 8 ++++---- .../shixunchild/Repository/RepositoryCodeEditor.js | 2 +- .../tpm/shixunchild/Repository/Repositoryfile.js | 8 ++++---- .../shixunchild/Repository/TPMRepositoryCommits.js | 12 +++++++++--- 7 files changed, 21 insertions(+), 15 deletions(-) diff --git a/public/react/src/modules/tpm/TPMRepositoryComponent.js b/public/react/src/modules/tpm/TPMRepositoryComponent.js index ed485bdb4..793d035ed 100644 --- a/public/react/src/modules/tpm/TPMRepositoryComponent.js +++ b/public/react/src/modules/tpm/TPMRepositoryComponent.js @@ -80,7 +80,7 @@ class TPMRepositoryComponent extends Component { let url = `/shixuns/${id}/file_content.json`; axios.post(url, { path: path, - secret_repository: this.props.secret_repository_tab + secret_repository: this.props.secret_repository_tab===false?undefined:this.props.secret_repository_tab }).then((response) => { trace_collapse('repository res: ', response) diff --git a/public/react/src/modules/tpm/TPMRepositoryComponentdetails.js b/public/react/src/modules/tpm/TPMRepositoryComponentdetails.js index 20dcce107..54efac581 100644 --- a/public/react/src/modules/tpm/TPMRepositoryComponentdetails.js +++ b/public/react/src/modules/tpm/TPMRepositoryComponentdetails.js @@ -72,7 +72,7 @@ class TPMRepositoryComponentdetails extends Component { let url = `/shixuns/${id}/file_content.json`; axios.post(url, { path: path, - secret_repository: this.props.secret_repository_tab + secret_repository: this.props.secret_repository_tab===false?undefined:this.props.secret_repository_tab }).then((response) => { trace_collapse('repository res: ', response) diff --git a/public/react/src/modules/tpm/shixunchild/Repository/RepositoryAddFile.js b/public/react/src/modules/tpm/shixunchild/Repository/RepositoryAddFile.js index cdf616275..5ac18c2b4 100644 --- a/public/react/src/modules/tpm/shixunchild/Repository/RepositoryAddFile.js +++ b/public/react/src/modules/tpm/shixunchild/Repository/RepositoryAddFile.js @@ -118,7 +118,7 @@ class RepositoryAddFile extends Component { path:values.path, message:values.message, content:this.extend_editor.getValue(), - secret_repository:Repositoryflag + secret_repository:Repositoryflag===false?undefined:Repositoryflag }).then((result)=>{ if(result){ this.props.history.push(Repositoryflag===true?`/shixuns/${shixunId}/secret_repository`:`/shixuns/${shixunId}/repository`) diff --git a/public/react/src/modules/tpm/shixunchild/Repository/RepositoryAddFileupload_file.js b/public/react/src/modules/tpm/shixunchild/Repository/RepositoryAddFileupload_file.js index d9866d1aa..7dc3a5b64 100644 --- a/public/react/src/modules/tpm/shixunchild/Repository/RepositoryAddFileupload_file.js +++ b/public/react/src/modules/tpm/shixunchild/Repository/RepositoryAddFileupload_file.js @@ -66,10 +66,10 @@ class RepositoryAddFileupload_files extends Component { let matchpath =this.props.match.path; - let Repositoryflag =false; + let Repositoryflag =undefined; if( matchpath.indexOf("repository")>-1){ - Repositoryflag =false; + Repositoryflag =undefined; } if(matchpath.indexOf("secret_repository")>-1){ Repositoryflag =true; @@ -135,12 +135,12 @@ class RepositoryAddFileupload_files extends Component { // }; let matchpath =this.props.match.path; - let Repositoryflagtype =false; + let Repositoryflagtype =undefined; let Repositoryflag =""; if( matchpath.indexOf("repository")>-1){ Repositoryflag ="repository"; - Repositoryflagtype =false; + Repositoryflagtype =undefined; } if(matchpath.indexOf("secret_repository")>-1){ Repositoryflag ="secret_repository"; diff --git a/public/react/src/modules/tpm/shixunchild/Repository/RepositoryCodeEditor.js b/public/react/src/modules/tpm/shixunchild/Repository/RepositoryCodeEditor.js index 17fdc0557..c8d6a393f 100644 --- a/public/react/src/modules/tpm/shixunchild/Repository/RepositoryCodeEditor.js +++ b/public/react/src/modules/tpm/shixunchild/Repository/RepositoryCodeEditor.js @@ -111,7 +111,7 @@ class RepositoryCodeEditor extends Component { const path = pathArray.join('/') this.setState({ codeSaving: true }) axios.post(url, { - secret_repository: this.props.secret_repository_tab, + secret_repository: this.props.secret_repository_tab === false ? undefined : 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/Repositoryfile.js b/public/react/src/modules/tpm/shixunchild/Repository/Repositoryfile.js index f3f65ac15..195cfea8a 100644 --- a/public/react/src/modules/tpm/shixunchild/Repository/Repositoryfile.js +++ b/public/react/src/modules/tpm/shixunchild/Repository/Repositoryfile.js @@ -120,16 +120,16 @@ class Repositoryfile extends Component{ handleSubmit = (e) => { let {path}=this.state; let matchpath =this.props.match.path; - let flag =false; + let flag =undefined; if( matchpath.indexOf("repository")>-1){ - flag =false; + flag =undefined; } if(matchpath.indexOf("secret_repository")>-1){ flag =true; } if(this.props.selectupfils===true){ - console.log(path) + this.props.selectupfilspath(path); this.props.showNotification("选择文件目录成功") this.props.hideNewFolder(); @@ -141,7 +141,7 @@ class Repositoryfile extends Component{ let paths=path+values.name; axios.post(url,{ path: paths, - secret_repository:flag, + secret_repository:flag===false?undefined:flag, }).then((result)=>{ if(result){ if(result.data.status===0){ diff --git a/public/react/src/modules/tpm/shixunchild/Repository/TPMRepositoryCommits.js b/public/react/src/modules/tpm/shixunchild/Repository/TPMRepositoryCommits.js index 4abc15570..56d9f4934 100644 --- a/public/react/src/modules/tpm/shixunchild/Repository/TPMRepositoryCommits.js +++ b/public/react/src/modules/tpm/shixunchild/Repository/TPMRepositoryCommits.js @@ -23,7 +23,7 @@ class TPMRepositoryCommits extends Component { let collaborators = `/shixuns/` + id + `/commits.json`; axios.post(collaborators, { - secret_repository: this.props.secret_repository_tab + secret_repository: this.props.secret_repository_tab === false ? undefined : this.props.secret_repository_tab }).then((response) => { if (response.status === 200) { @@ -58,19 +58,25 @@ class TPMRepositoryCommits extends Component { is_jupyter={this.props.is_jupyter} > {loadingContent ? - + :
- 提交记录 + 提交记录 {/*  35 */} 返回 + {/*  35 */} + + 返回 +