From 94a0a84303ecd2ace0320e1164a72606604e1aef Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Fri, 27 Mar 2020 15:01:28 +0800 Subject: [PATCH 01/14] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E9=83=A8=E5=88=86bug?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/workspace.xml | 205 +++++++++++++++++++++++--------- src/forge/Merge/MessageCount.js | 4 +- src/forge/Order/order.css | 1 + 3 files changed, 152 insertions(+), 58 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 9013af44a..589e44def 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -3,9 +3,8 @@ - - - + + @@ -105,7 +153,6 @@ - + @@ -152,13 +202,12 @@ - + @@ -256,17 +243,18 @@ - + - + - + @@ -279,7 +267,7 @@ - + @@ -487,26 +475,6 @@ - - - - - - - - - - - - - - - - - - - - @@ -525,16 +493,6 @@ - - - - - - - - - - @@ -655,7 +613,7 @@ - + @@ -674,19 +632,10 @@ - - - - - - - - - - + @@ -696,7 +645,7 @@ - + @@ -706,14 +655,68 @@ - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/forge/Merge/MergeDetail.js b/src/forge/Merge/MergeDetail.js index 225e031b2..9a9754098 100644 --- a/src/forge/Merge/MergeDetail.js +++ b/src/forge/Merge/MergeDetail.js @@ -235,14 +235,23 @@ class MergeDetail extends Component{

{ data && data.issue.subject} -

- 编辑 +
+ { + data && data.issue.user_permission ? + 编辑 + : '' + }

{ data && data.issue.description}

diff --git a/src/forge/Order/Detail.js b/src/forge/Order/Detail.js index 70b0b08f3..92f129791 100644 --- a/src/forge/Order/Detail.js +++ b/src/forge/Order/Detail.js @@ -452,10 +452,15 @@ class Detail extends Component{ return(
-
-
+
+

diff --git a/src/forge/Version/version.js b/src/forge/Version/version.js index c089a76ad..7dd0288d6 100644 --- a/src/forge/Version/version.js +++ b/src/forge/Version/version.js @@ -73,59 +73,66 @@ class version extends Component{

{ data.releases.map((item,key)=>{ return( -
-
-
-  
{item.draft}  -
-
-

-
- { - data && data.user_permission ? -
- {item.name}(编辑)  -
- : '' - } +
+ { + item && item.id ? +
+
+
+
{item.draft}  +
+
+

+
+ { + data && data.user_permission ? +
+ {item.name}(编辑)  +
+ : '' + } -
-
-
-  {item.tag_name}  -
-
-

+
+
+
+ {item.tag_name}  +
+
+

-
-
- {item.body}  -
-
-
-
-   -
-
-

-
-
- 下载附件  - -   源代码(ZIP) - 源文件(TAR.GZ) -
-
-
-
-   -
-
-

-
-
-
-
+
+
+ {item.body}  +
+
+
+
+ +
+
+

+
+
+ 下载附件 + + 源代码(ZIP) + 源文件(TAR.GZ) +
+
+
+
+ +
+
+

+
+
+
+
+
+ : + "" + }
) }) From 424fe4980e1009efad5cfaeeabf971f08b2f15c3 Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Fri, 27 Mar 2020 17:06:23 +0800 Subject: [PATCH 03/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=91=E5=B8=83=E7=9A=84=E6=A0=B7=E5=BC=8F=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/workspace.xml | 24 ++++++++++-------------- src/forge/Version/version.js | 17 ++++++++++------- 2 files changed, 20 insertions(+), 21 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 9c23ce58b..7d3b97802 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,8 +2,6 @@ - - - - + @@ -267,7 +264,7 @@ - + @@ -699,7 +696,7 @@ - + @@ -708,11 +705,10 @@ - - + + - diff --git a/src/forge/Version/version.js b/src/forge/Version/version.js index 7dd0288d6..2455f2128 100644 --- a/src/forge/Version/version.js +++ b/src/forge/Version/version.js @@ -84,13 +84,16 @@ class version extends Component{

- { - data && data.user_permission ? -
- {item.name}(编辑)  -
- : '' - } +
+ {item.name} + { + data && data.user_permission ? + (编辑) + : '' + } + +
+
From 2299e7cefbd8068e4066711bdefe092bdc79d11c Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Fri, 27 Mar 2020 17:18:17 +0800 Subject: [PATCH 04/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=84=E8=AE=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/workspace.xml | 55 ++++++++++++++++++++++----------------- src/forge/Order/Detail.js | 2 +- 2 files changed, 32 insertions(+), 25 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 7d3b97802..efce6d8f3 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,7 +2,7 @@ - + - + - - + + @@ -36,11 +36,11 @@ - + - - + + @@ -147,9 +147,9 @@ @@ -181,6 +181,13 @@ + + + + + + + @@ -240,18 +247,18 @@ - + - - + @@ -264,7 +271,7 @@ - + @@ -683,16 +690,6 @@ - - - - - - - - - - @@ -705,8 +702,8 @@ - - + + @@ -716,5 +713,15 @@ + + + + + + + + + + \ No newline at end of file diff --git a/src/forge/Order/Detail.js b/src/forge/Order/Detail.js index 92f129791..2d42fe851 100644 --- a/src/forge/Order/Detail.js +++ b/src/forge/Order/Detail.js @@ -101,7 +101,7 @@ class Detail extends Component{ issue_id:data.id, attachment_ids:fileList }).then(result=>{ - if(result){ + if(result && result.journals_count > 0){ this.props.form.setFieldsValue({ content: "" }); From b29c80fb6450e10ef0c20a328f2f1ead1d80ba6c Mon Sep 17 00:00:00 2001 From: Jasder <2053003901@@qq.com> Date: Fri, 27 Mar 2020 17:30:16 +0800 Subject: [PATCH 05/14] =?UTF-8?q?FIX=20=E4=BC=98=E5=8C=96=E7=82=B9?= =?UTF-8?q?=E8=B5=9E=E3=80=81=E5=85=B3=E6=B3=A8=E7=AD=89=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Main/Detail.js | 112 +++++++++++++++++---------------------- 1 file changed, 49 insertions(+), 63 deletions(-) diff --git a/src/forge/Main/Detail.js b/src/forge/Main/Detail.js index 9aebb40a1..05376c6c0 100644 --- a/src/forge/Main/Detail.js +++ b/src/forge/Main/Detail.js @@ -139,30 +139,16 @@ class Detail extends Component{ watchers_count:undefined , praises_count:undefined , forked_count:undefined, + watched: false, + praised: false, http_url: undefined, author:undefined, - // current_user:undefined, - branchs:undefined, branchList:undefined, branchLastCommit:undefined, } } - getUserInfo=()=>{ - const url = `/users/me.json`; - axios.get(url).then(result=>{ - if(result && result.data.login){ - this.setState({ - current_user:result.data - }) - } - }).catch(error=>{ - console.log(error) - }) - } - - componentDidMount=()=>{ this.getDetail(); } @@ -187,7 +173,8 @@ class Detail extends Component{ isDeveloper:result.data.permission && result.data.permission === "Developer", http_url: result.data.clone_url, author:result.data.author, - + praised: result.data.praised, + watched: result.data.watched, watchers_count:result.data.watchers_count, praises_count:result.data.praises_count, forked_count:result.data.forked_count, @@ -202,51 +189,51 @@ class Detail extends Component{ // 关注和取消关注 focusFunc =(flag)=>{ const { project_id } = this.state; - if(!flag){ - const url = `/projects/${project_id}/watchers/follow.json`; - axios.post(url).then(result=>{ - if(result && result.data.status === 0){ - this.getDetail(); - } - }).catch(error=>{ - console.log(error); - }) - }else{ - const url = `/projects/${project_id}/watchers/unfollow.json`; - axios.delete(url).then(result=>{ - if(result && result.data.status === 0){ - this.getDetail(); - } - }).catch(error=>{ - console.log(error); - }) - } + axios({ + method: flag? 'delete' : 'post', + url: `/projects/${project_id}/watchers/${flag? 'unfollow' : 'follow'}.json` + }) + .then(result => { + if(result && result.data.status === 0){ + this.setWatchersCount(result.data.watchers_count, result.data.watched); + } + }) + .catch(error => { + console.log(error); + }); } // 点赞和取消点赞 pariseFunc=(flag)=>{ const { project_id } = this.state; - if(!flag){ - const url = `/projects/${project_id}/praise_tread/like.json`; - axios.post(url).then(result=>{ - if(result && result.data.status === 0){ - this.getDetail(); - } - }).catch(error=>{ - console.log(error); - }) - }else{ - const url = `/projects/${project_id}/praise_tread/unlike.json`; - axios.delete(url).then(result=>{ - if(result && result.data.status === 0){ - this.getDetail(); - } - }).catch(error=>{ - console.log(error); - }) - } + axios({ + method: flag? 'delete' : 'post', + url: `/projects/${project_id}/praise_tread/${flag? 'unlike' : 'like'}.json` + }) + .then(result => { + if(result && result.data.status === 0){ + this.setPraisesCount(result.data.praises_count, result.data.praised) + } + }) + .catch(error => { + console.log(error); + }); } + setWatchersCount = (count, is_watched) => { + this.setState({ + watched: is_watched, + watchers_count: count + }) + } + + setPraisesCount = (count, is_praised) => { + this.setState({ + praised: is_praised, + praises_count: count + }) + } + // fork项目 forkFunc=()=>{ this.setState({ @@ -290,8 +277,7 @@ class Detail extends Component{ } render(){ - - const { projectDetail , watchers_count , praises_count , forked_count , isSpin , isManager } = this.state; + const { projectDetail , watchers_count , praises_count , forked_count , isSpin , isManager, watched, praised } = this.state; const url = this.props.history.location.pathname; const urlArr= url.split("/"); const urlFlag = (urlArr.length === 3); @@ -328,16 +314,16 @@ class Detail extends Component{ - this.focusFunc(projectDetail && projectDetail.watched)}> - - {projectDetail && projectDetail.watched ? '取消关注':'关注'} + this.focusFunc(watched)}> + + {watched ? '取消关注':'关注'} {watchers_count} - this.pariseFunc(projectDetail && projectDetail.praised)}> - - {projectDetail && projectDetail.praised ? '取消点赞':'点赞'} + this.pariseFunc(praised)}> + + {praised ? '取消点赞':'点赞'} {praises_count} From b23e8c7e530f5896f81a6a801cfe275ed7a6049d Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Fri, 27 Mar 2020 18:03:38 +0800 Subject: [PATCH 06/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=88=E5=B9=B6?= =?UTF-8?q?=E8=AF=B7=E6=B1=82=E7=9A=84=E6=98=BE=E7=A4=BA=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/workspace.xml | 128 ++++++++++++++++++++------------ src/forge/Merge/MessageCount.js | 94 +++++++++++++---------- 2 files changed, 133 insertions(+), 89 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index efce6d8f3..d71bc9e2c 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,7 +2,8 @@ - + + - + + + + + + + + + + + + + - - + + @@ -27,8 +40,8 @@ - - + + @@ -36,11 +49,26 @@ + + + + + + + + + + + + + + + - + @@ -79,8 +107,6 @@ - contents/file - 新建翻转课堂 nHeader 点赞 fork @@ -109,12 +135,14 @@ 创建 .map((item,key)=>{ .map((item,key) + 评论成 + 该合并请求可以进行自动合并操作 $PROJECT_DIR$ $PROJECT_DIR$/src - $PROJECT_DIR$/src/forge/Merge $PROJECT_DIR$/src/forge + $PROJECT_DIR$/src/forge/Merge @@ -144,12 +172,12 @@ @@ -186,7 +214,7 @@ - + @@ -247,16 +275,15 @@ - + - - @@ -271,7 +298,7 @@ - + @@ -636,26 +663,6 @@ - - - - - - - - - - - - - - - - - - - - @@ -690,20 +697,10 @@ - - - - - - - - - - - + @@ -715,13 +712,46 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/forge/Merge/MessageCount.js b/src/forge/Merge/MessageCount.js index e803510e8..ebe66b38a 100644 --- a/src/forge/Merge/MessageCount.js +++ b/src/forge/Merge/MessageCount.js @@ -479,7 +479,11 @@ class MessageCount extends Component{
@@ -499,7 +503,11 @@ class MessageCount extends Component{ 由 { data && data.issue.author_name} 于 { data && data.issue.created_at }创建{ data && data.issue.journals_count && data.issue.journals_count > 0 ?` · ${data.issue.journals_count} 条评论`:""} - 编辑 + { + data && data.issue.user_permission ? + 编辑 + : '' + }

@@ -529,45 +537,51 @@ class MessageCount extends Component{ { Paginations } -
- -
-

该合并请求可以进行自动合并操作

-

- {/* */} - {/* */} - }> - {this.state.mergename} - - - {/* */} -

- -
- -
- + + { + data && data.issue.user_permission ? +
+ +
+

该合并请求可以进行自动合并操作

+

+ {/* */} + {/* */} + }> + {this.state.mergename} + + + {/* */} +

+ +
+ +
+ +
+ {/* */} @@ -536,17 +536,17 @@ class CodeRepositoryView extends Component { }
-
{/* { tabIndex === STABLE_SSH_TAB_ID && this.state.sshData && } */}
-
-
-
@@ -554,13 +554,13 @@ class CodeRepositoryView extends Component { ); } } -/* +/* <%= Redmine::CodesetUtil.replace_invalid_utf8(@content) %> - , overflow: 'scroll' ref="editor" + , overflow: 'scroll' ref="editor" - */ -export default CodeRepositoryView; \ No newline at end of file +export default CodeRepositoryView; diff --git a/src/modules/test/codemirror/TestCodeMirror.js b/src/modules/test/codemirror/TestCodeMirror.js index f451bc356..08ca32f15 100644 --- a/src/modules/test/codemirror/TestCodeMirror.js +++ b/src/modules/test/codemirror/TestCodeMirror.js @@ -1,6 +1,6 @@ import React, { Component } from 'react'; -import CodeMirror from 'react-codeMirror' +import CodeMirror from 'react-codemirror' require('codemirror/lib/codemirror.css'); require('codemirror/mode/javascript/javascript'); @@ -28,13 +28,13 @@ class TestCodeMirror extends Component { componentDidMount() { var readOnlyLines = [0,1,2,3,8]; - + this.refs.editor.getCodeMirror().on('beforeChange',function(cm,change) { console.log('change.from.line', change.from.line) - if ( readOnlyLines.indexOf(change.from.line) !== -1 + if ( readOnlyLines.indexOf(change.from.line) !== -1 // 有问题：如果用回车将有内容的行挤到不可编辑的行，那么无法删除掉不可编辑行里的内容了 // 解决办法：将所需的行数固定写好，禁用掉回车键。 - // || change.from.line > ( readOnlyLines[readOnlyLines.length -1] + 1 ) + // || change.from.line > ( readOnlyLines[readOnlyLines.length -1] + 1 ) ) { change.cancel(); } @@ -60,4 +60,4 @@ class TestCodeMirror extends Component { } } -export default TestCodeMirror; \ No newline at end of file +export default TestCodeMirror; From 2b658e59faf75ef84ec5cb7e956a60f8d9387833 Mon Sep 17 00:00:00 2001 From: Jasder <2053003901@@qq.com> Date: Sun, 29 Mar 2020 18:17:47 +0800 Subject: [PATCH 09/14] =?UTF-8?q?FIX=20=E5=AE=8C=E5=96=84fork=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E6=8F=90=E7=A4=BA=E8=AF=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Main/Detail.js | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/forge/Main/Detail.js b/src/forge/Main/Detail.js index 05376c6c0..17536164d 100644 --- a/src/forge/Main/Detail.js +++ b/src/forge/Main/Detail.js @@ -242,14 +242,16 @@ class Detail extends Component{ const { project_id } = this.state; const url = `/projects/${project_id}/forks.json`; axios.post(url).then(result=>{ - if(result && result.data.status === 0){ - this.props.history.push(`/projects/${result.data.id}/coders`); - this.props.showNotification(result.data.message); - this.setState({ + if (result) { + if (result.data.status === 0) { + this.props.history.push(`/projects/${result.data.id}/coders`); + } + this.setState({ isSpin:false }) - }else{ - this.props.showNotification(result.data.message); + this.props.showNotification(result.data.message); + } else { + this.props.showNotification(`服务器开小差了`); } }).catch(error=>{ console.log(error); From 2a1f64705d8921bcebfe08e949d5820f17b57cdb Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Mon, 30 Mar 2020 10:20:20 +0800 Subject: [PATCH 10/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9placeholder?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/workspace.xml | 105 +++++++++++++++++++++++++++-------------- src/forge/New/Index.js | 4 +- 2 files changed, 72 insertions(+), 37 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index d71bc9e2c..c81ca8693 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -3,7 +3,7 @@ - + @@ -214,14 +224,14 @@ - + - + + )} -

好的存储库名称使用简单、深刻和独特的关键字

+ {/*

好的存储库名称使用简单、深刻和独特的关键字

*/} {/*
*/} Date: Mon, 30 Mar 2020 10:21:22 +0800 Subject: [PATCH 11/14] ADD truncate commit id --- src/forge/Main/CoderRootBranch.js | 9 +++++---- src/forge/Main/CoderRootCommit.js | 7 ++++--- src/forge/Main/CoderRootDirectory.js | 3 ++- src/forge/common/util.js | 6 ++++++ 4 files changed, 17 insertions(+), 8 deletions(-) create mode 100644 src/forge/common/util.js diff --git a/src/forge/Main/CoderRootBranch.js b/src/forge/Main/CoderRootBranch.js index c8a85bca2..971126330 100644 --- a/src/forge/Main/CoderRootBranch.js +++ b/src/forge/Main/CoderRootBranch.js @@ -1,6 +1,7 @@ import React , { Component } from 'react'; import { Link } from "react-router-dom"; import { Dropdown , Menu , Icon , Tooltip } from 'antd'; +import { truncateCommitId } from '../common/util'; import './list.css' import { branch } from 'recompose'; @@ -21,7 +22,7 @@ class CoderRootBranch extends Component { if(branchList && branchList.length>0){ return( - +
    { @@ -32,7 +33,7 @@ class CoderRootBranch extends Component { {item.name} {/*{item.name}*/}

    - {item.last_commit && item.last_commit.id} + {item.last_commit && truncateCommitId(item.last_commit.id)} {/*{item.last_commit && item.last_commit.id}*/} {item.last_commit && item.last_commit.message} 最后更新于{item.last_commit && item.last_commit.time_from_now} @@ -40,7 +41,7 @@ class CoderRootBranch extends Component {

创建合并请求 - + @@ -75,4 +76,4 @@ class CoderRootBranch extends Component { } -export default CoderRootBranch; \ No newline at end of file +export default CoderRootBranch; diff --git a/src/forge/Main/CoderRootCommit.js b/src/forge/Main/CoderRootCommit.js index d77e4ec2c..54315c867 100644 --- a/src/forge/Main/CoderRootCommit.js +++ b/src/forge/Main/CoderRootCommit.js @@ -1,6 +1,7 @@ import React , { Component } from 'react'; import { Table , Spin } from 'antd'; import { getImageUrl } from 'educoder'; +import { truncateCommitId } from '../common/util' import SelectBranch from '../Branch/SelectBranch'; import Top from './DetailTop'; @@ -92,7 +93,7 @@ class CoderRootCommit extends Component{ title:"SHA", dataIndex: 'sha', render: (text) => ( - {text} + {truncateCommitId(text)} ) },{ title:"备注", @@ -124,7 +125,7 @@ class CoderRootCommit extends Component{ const Pagination =()=> { if(dataCount > limit){ - return( + return(
@@ -153,4 +154,4 @@ class CoderRootCommit extends Component{ ) } } -export default CoderRootCommit; \ No newline at end of file +export default CoderRootCommit; diff --git a/src/forge/Main/CoderRootDirectory.js b/src/forge/Main/CoderRootDirectory.js index ef818de7d..6f1b397a5 100644 --- a/src/forge/Main/CoderRootDirectory.js +++ b/src/forge/Main/CoderRootDirectory.js @@ -11,6 +11,7 @@ import CloneAddress from '../Branch/CloneAddress'; import RootTable from './RootTable'; import CoderRootFileDetail from './CoderRootFileDetail'; import NullData from './NullData'; +import { truncateCommitId } from '../common/util'; import axios from 'axios'; /** @@ -233,7 +234,7 @@ class CoderRootDirectory extends Component{ :"" } - {branchLastCommit.last_commit.id} + {truncateCommitId(branchLastCommit.last_commit.id)} {branchLastCommit.last_commit.message} {branchLastCommit.last_commit.time_from_now}
diff --git a/src/forge/common/util.js b/src/forge/common/util.js new file mode 100644 index 000000000..66a5b4c1e --- /dev/null +++ b/src/forge/common/util.js @@ -0,0 +1,6 @@ + +export function truncateCommitId(str) { + if (str.length > 11) { + return str.substring(0, 10) + } +} From 4706ee05bf02a107492d3bf9caec5fa32b7a89c9 Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Mon, 30 Mar 2020 11:29:26 +0800 Subject: [PATCH 12/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=89=8D=E7=AB=AFbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/workspace.xml | 186 ++++++++++++++++++++---------------- src/forge/Order/Detail.js | 2 +- src/forge/Order/Milepost.js | 4 +- 3 files changed, 106 insertions(+), 86 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index c81ca8693..7809a8785 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -3,7 +3,8 @@ - + + - nHeader 点赞 fork .push( @@ -140,12 +160,13 @@ 请输入合并 journal-list-item issue-tag-show - 创建工单 创建 .map((item,key)=>{ .map((item,key) 评论成 该合并请求可以进行自动合并操作 + 没有 + 创建工单 $PROJECT_DIR$ @@ -178,16 +199,16 @@ @@ -224,14 +245,7 @@ - - - - - - - - + @@ -305,17 +300,18 @@ - + - + - + @@ -328,7 +324,7 @@ - + @@ -571,13 +567,6 @@ - - - - - - - @@ -588,31 +577,11 @@ - - - - - - - - - - - - - - - - - - - - @@ -633,16 +602,6 @@ - - - - - - - - - - @@ -786,7 +745,7 @@ - + @@ -803,10 +762,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + diff --git a/src/forge/Main/CoderRootFileDetail.js b/src/forge/Main/CoderRootFileDetail.js index 07dbb3402..d15dbbf5c 100644 --- a/src/forge/Main/CoderRootFileDetail.js +++ b/src/forge/Main/CoderRootFileDetail.js @@ -108,7 +108,7 @@ class CoderRootFileDetail extends Component{ render(){ const { detail , current_user , isManager , isReporter , isDeveloper } = this.props; const { readOnly ,value } = this.state; - let flag = current_user && current_user.login && (isManager || isReporter); + let flag = current_user && current_user.login && (isManager || isDeveloper); var options = { lineNumbers: true, mode: 'javascript',