diff --git a/src/forge/Main/Diff.jsx b/src/forge/Main/Diff.jsx index 86cf9384..17535e43 100644 --- a/src/forge/Main/Diff.jsx +++ b/src/forge/Main/Diff.jsx @@ -42,6 +42,12 @@ const Infos = styled.div` } } `; +function turnbar(str){ + if(str && str.length>0 && str.indexOf("/")>-1){ + return str.replaceAll('/','%2F'); + } + return str; +} //提交详情页 export default (props) => { const {match , history } = props; @@ -81,7 +87,7 @@ export default (props) => { {commit && commit.message &&
{commit.message}
} - {data.branch} + {data.branch} diff --git a/src/forge/Merge/Files.jsx b/src/forge/Merge/Files.jsx index a3015fce..172038b2 100644 --- a/src/forge/Merge/Files.jsx +++ b/src/forge/Merge/Files.jsx @@ -100,7 +100,10 @@ function Files({ data,history,owner,projectsId , parentsSha }){ {item.addition+item.deletion}处 - {history.push(`/${owner}/${projectsId}${item.isDeleted ? `/commits/${truncateCommitId(parentsSha)}`:`/tree/${truncateCommitId(item.sha)}/${item.name}`}`)}}>查看文件 + { + !item.isSubmodule && + {history.push(`/${owner}/${projectsId}${item.isDeleted ? `/commits/${truncateCommitId(parentsSha)}`:`/tree/${truncateCommitId(item.sha)}/${item.name}`}`)}}>查看文件 + } { diff --git a/src/forge/Merge/MessageCount.js b/src/forge/Merge/MessageCount.js index fc021f81..6409bd7f 100644 --- a/src/forge/Merge/MessageCount.js +++ b/src/forge/Merge/MessageCount.js @@ -361,7 +361,7 @@ class MessageCount extends Component { to={`/${data.pull_request.is_original ? data.pull_request.fork_project_user : data.issue.project_author_name}/${data.pull_request.is_original?data.project_identifier:projectsId}/tree/${turnbar(data.pull_request && data.pull_request.head)}`} className="ver-middle" > - {data.pull_request.is_original ? data.pull_request.fork_project_user : data.issue.project_author_name}: {turnbar(data.pull_request && data.pull_request.head)} + {data.pull_request.is_original ? data.pull_request.fork_project_user : data.issue.project_author_name}: {data.pull_request && data.pull_request.head} diff --git a/src/forge/Merge/merge.css b/src/forge/Merge/merge.css index 088874c1..d5ce68d1 100644 --- a/src/forge/Merge/merge.css +++ b/src/forge/Merge/merge.css @@ -208,4 +208,8 @@ form .ant-cascader-picker, form .ant-select { } .linesContent.add{ background: rgba(48, 232, 132, 0.15); -} \ No newline at end of file +} + +.mergeRequest .folders{ + width: 72rem; + } \ No newline at end of file diff --git a/src/forge/Merge/merge_footer.js b/src/forge/Merge/merge_footer.js index 6502827c..5e3a7556 100644 --- a/src/forge/Merge/merge_footer.js +++ b/src/forge/Merge/merge_footer.js @@ -119,7 +119,7 @@ class MergeFooter extends Component { return ( !footer_type && !comparesData || (comparesData && ((comparesData.commits && comparesData.commits.length===0)||(comparesData && !comparesData.diff)) )?"": -
+