From b1243642039b62102ba90ccecdb51f1a38bd18f7 Mon Sep 17 00:00:00 2001 From: hucong <1422588487@qq.com> Date: Mon, 1 Nov 2021 14:40:41 +0800 Subject: [PATCH 1/5] =?UTF-8?q?pr=E4=B8=AD=E7=94=A8=E6=88=B7=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Merge/MergeItem.js | 10 +++++----- src/forge/Merge/MessageCount.js | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/forge/Merge/MergeItem.js b/src/forge/Merge/MergeItem.js index 61477c14..3e88eeb9 100644 --- a/src/forge/Merge/MergeItem.js +++ b/src/forge/Merge/MergeItem.js @@ -112,9 +112,9 @@ class MergeItem extends Component { to={`/${item.is_original ? item.fork_project_user : owner}/${ item.is_original ? item.fork_project_identifier : projectsId }/tree/${turnbar(item.pull_request_head)}`} className="maxW200px task-hide ver-middle" style={{maxWidth:"200px"}} > - {item.is_original - ? item.fork_project_user - : project_author_name} + {item.is_fork + ? item.pull_request_base + : item.author_name} :{item.pull_request_head} @@ -136,8 +136,8 @@ class MergeItem extends Component { to={`/${owner}/${projectsId}/tree/${turnbar(item.pull_request_base)}`} className="maxW200px task-hide ver-middle" style={{maxWidth:"200px"}} > - {/* {item.is_fork ? item.pull_request_base : `${item.author_name}:${item.pull_request_base}`} */} - {project_author_name}:{item.pull_request_base} + {item.is_fork ? item.pull_request_base : `${item.author_name}:${item.pull_request_base}`} + {/* {project_author_name}:{item.pull_request_base} */} } diff --git a/src/forge/Merge/MessageCount.js b/src/forge/Merge/MessageCount.js index 6d01e8a3..d7f665dd 100644 --- a/src/forge/Merge/MessageCount.js +++ b/src/forge/Merge/MessageCount.js @@ -365,10 +365,10 @@ class MessageCount extends Component {
- {data.pull_request.is_original ? data.pull_request.fork_project_user : data.issue.project_author_name}: {data.pull_request && data.pull_request.head} + {data.pull_request.is_fork ? data.pull_request_base.fork_project_user : data.issue.author_name}: {data.pull_request && data.pull_request.head} @@ -383,7 +383,7 @@ class MessageCount extends Component { to={`/${owner}/${projectsId}/tree/${data.pull_request.base}`} className="ver-middle task-hide" style={{maxWidth:"200px"}} title={`${data.issue.project_author_name}:${data.pull_request.base}`} > - {data.issue.project_author_name}:{data.pull_request.base} + {data.issue.author_name}:{data.pull_request.base}
From 010edf3cb2ddded5d372adaada660d771fc577dc Mon Sep 17 00:00:00 2001 From: hucong <1422588487@qq.com> Date: Fri, 5 Nov 2021 18:31:14 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E7=9B=AE=E5=BD=95=E8=B7=B3=E8=BD=AC?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Main/sub/ReadmeCatelogue.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/forge/Main/sub/ReadmeCatelogue.jsx b/src/forge/Main/sub/ReadmeCatelogue.jsx index 6dab7d79..754f3cc2 100644 --- a/src/forge/Main/sub/ReadmeCatelogue.jsx +++ b/src/forge/Main/sub/ReadmeCatelogue.jsx @@ -36,7 +36,7 @@ function ReadmeCatelogue({ menuList , hash }) { { menu && menu.length>0?
- + { menu.map((item,key)=>{ return( From e04fb111943a13695a4440ca60e5eb6c16c0fe38 Mon Sep 17 00:00:00 2001 From: hucong <1422588487@qq.com> Date: Fri, 5 Nov 2021 19:03:24 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E7=9B=AE=E5=BD=95=E8=B7=B3=E8=BD=AC?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Main/CoderDepotReadme.jsx | 3 +-- src/forge/Main/sub/ReadmeCatelogue.jsx | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/forge/Main/CoderDepotReadme.jsx b/src/forge/Main/CoderDepotReadme.jsx index 315f7080..96c9b05a 100644 --- a/src/forge/Main/CoderDepotReadme.jsx +++ b/src/forge/Main/CoderDepotReadme.jsx @@ -41,7 +41,7 @@ function CoderDepotReadme({ operate , history , readme , ChangeFile }){ return(
- +
@@ -64,7 +64,6 @@ function CoderDepotReadme({ operate , history , readme , ChangeFile }){
{ - content &&
diff --git a/src/forge/Main/sub/ReadmeCatelogue.jsx b/src/forge/Main/sub/ReadmeCatelogue.jsx index 754f3cc2..25af450a 100644 --- a/src/forge/Main/sub/ReadmeCatelogue.jsx +++ b/src/forge/Main/sub/ReadmeCatelogue.jsx @@ -36,7 +36,7 @@ function ReadmeCatelogue({ menuList , hash }) { { menu && menu.length>0?
- + { menu.map((item,key)=>{ return( From 3678b8eb725ca39bbf245757920ba810d370d866 Mon Sep 17 00:00:00 2001 From: hucong <1422588487@qq.com> Date: Mon, 8 Nov 2021 13:58:46 +0800 Subject: [PATCH 4/5] issue --- src/forge/Main/CoderDepotReadme.jsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/forge/Main/CoderDepotReadme.jsx b/src/forge/Main/CoderDepotReadme.jsx index 96c9b05a..438b2d64 100644 --- a/src/forge/Main/CoderDepotReadme.jsx +++ b/src/forge/Main/CoderDepotReadme.jsx @@ -64,6 +64,7 @@ function CoderDepotReadme({ operate , history , readme , ChangeFile }){
{ + content &&
From b1775e5158aa7915db7d485228d5745f67281378 Mon Sep 17 00:00:00 2001 From: hucong <1422588487@qq.com> Date: Mon, 8 Nov 2021 14:05:39 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E7=9B=AE=E5=BD=95=E8=B7=B3=E8=BD=AC?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Main/sub/ReadmeCatelogue.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/forge/Main/sub/ReadmeCatelogue.jsx b/src/forge/Main/sub/ReadmeCatelogue.jsx index 25af450a..754f3cc2 100644 --- a/src/forge/Main/sub/ReadmeCatelogue.jsx +++ b/src/forge/Main/sub/ReadmeCatelogue.jsx @@ -36,7 +36,7 @@ function ReadmeCatelogue({ menuList , hash }) { { menu && menu.length>0?
- + { menu.map((item,key)=>{ return(