Null369
/
forgeplus-react
forked from Gitlink/forgeplus-react
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change some bugs

This commit is contained in:
sylor_huang@126.com 2020-06-30 18:15:48 +08:00
parent 582ae7765d
commit cb4c062f3d
4 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/forge/Main/CoderRootDirectory.js
View File

@ -243,7 +243,7 @@ class CoderRootDirectory extends Component {
message: item.commit && item.commit.message,
...item,
});
if (item.name === "README.md") {
if (item.name === "README.md" || item.name === "readme.md") {
readMeContent.push({ ...item });
readMeFile.push({ ...item });
}
@ -350,7 +350,7 @@ class CoderRootDirectory extends Component {
dataIndex: 'name',
width:"30%",
render: (text,item) => (
<a onClick={()=>this.goToSubRoot(item.path,item.type)} className="ml12">
<a onClick={()=>this.goToSubRoot(item.path,item.type)} className="ml12 task-hide" style={{ display: "block", maxWidth: "345px" }}>
<i className={ item.type === "file" ? "iconfont icon-wenjia font-15 color-green-file mr5":"iconfont icon-wenjianjia1 color-green-file font-15 mr5"}></i>{text}
</a>
),
@ -484,7 +484,7 @@ class CoderRootDirectory extends Component {
)}
</div>
<div className="f-wrap-alignCenter">
{subFileType && (isManager || isDeveloper) && (
{subFileType && parseInt(projectDetail.type) !== 2 && (isManager || isDeveloper) && (
<div>
<span>
<Link

8
src/forge/Main/Detail.js
View File

@ -356,7 +356,7 @@ class Detail extends Component {
{
projectDetail && checkLogin && projectDetail.type && projectDetail.type === 2 ?
<Tooltip placement={'right'} title={mirror}>
<i className="iconfont icon-jingxiang font-18 fl mt6 ml10" style={{ color: "#8D90E3" }}></i>
<i className="iconfont icon-banbenku font-18 fl mt6 ml10" style={{ color: "#8D90E3" }}></i>
</Tooltip>:""
}
</span>
@ -406,12 +406,16 @@ class Detail extends Component {
{ projectDetail && projectDetail.issues_count ? <span>{projectDetail.issues_count}</span> :""}
</Link>
</li>
<li className={url.indexOf("merge") > -1 ? "active" : ""}>
{
projectDetail && parseInt(projectDetail.type) !== 2 &&
<li className={url.indexOf("merge") > -1 ? "active" : ""}>
<Link to={{ pathname: `/projects/${projectsId}/merge`, state }}>
<img alt="" src={img_3} width="13" />合并请求
{ projectDetail && projectDetail.pull_requests_count ? <span>{projectDetail.pull_requests_count}</span> : "" }
</Link>
</li>
}
<li className={(url.indexOf("Milepost") > -1 || url.indexOf("meilpost") > -1) ? "active" : ""}>
<Link to={{ pathname: `/projects/${projectsId}/orders/Milepost`, state }}>
<img alt="" src={img_milepost} width="16" />里程碑

4
src/forge/Merge/MergeItem.js
View File

@ -98,7 +98,7 @@ class MergeItem extends Component {
<span className="ml15">
<Tag className="pr-branch-tag">
<Link
to={`projects/${
to={`/projects/${
item.is_original ? item.fork_project_id : projectsId
}/coders?branch=${item.pull_request_head}`}
className="maxW200px hide-1 ver-middle"
@ -118,7 +118,7 @@ class MergeItem extends Component {
</span>
<Tag className="pr-branch-tag">
<Link
to={`projects/${projectsId}/coders?branch=${item.pull_request_base}`}
to={`/projects/${projectsId}/coders?branch=${item.pull_request_base}`}
className="maxW200px hide-1 ver-middle"
>
{/* {item.is_fork ? item.pull_request_base : `${item.author_name}:${item.pull_request_base}`} */}

4
src/forge/Merge/MessageCount.js
View File

@ -258,7 +258,7 @@ class MessageCount extends Component {
<div className="mt15">
<Tag className="pr-branch-tag">
<Link
to={`projects/${data.pull_request.is_original?data.pull_request.fork_project_id:projectsId}/coders?branch=${data.pull_request.head}`}
to={`/projects/${data.pull_request.is_original?data.pull_request.fork_project_id:projectsId}/coders?branch=${data.pull_request.head}`}
className="ver-middle"
>
{data.pull_request.is_original ? data.pull_request.fork_project_user : data.issue.project_author_name}:{data.pull_request.head}
@ -273,7 +273,7 @@ class MessageCount extends Component {
</span>
<Tag className="pr-branch-tag">
<Link
to={`projects/${projectsId}/coders?branch=${data.pull_request.base}`}
to={`/projects/${projectsId}/coders?branch=${data.pull_request.base}`}
className="ver-middle"
>
{/* {data.pull_request.is_fork ? data.pull_request.base : `${data.pull_request.pull_request_user}:${data.pull_request.base}`} */}