diff --git a/src/forge/Main/CoderRootDirectory.js b/src/forge/Main/CoderRootDirectory.js index 5843d043b..d7e13973a 100644 --- a/src/forge/Main/CoderRootDirectory.js +++ b/src/forge/Main/CoderRootDirectory.js @@ -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) => ( - this.goToSubRoot(item.path,item.type)} className="ml12"> + this.goToSubRoot(item.path,item.type)} className="ml12 task-hide" style={{ display: "block", maxWidth: "345px" }}> {text} ), @@ -484,7 +484,7 @@ class CoderRootDirectory extends Component { )}
- {subFileType && (isManager || isDeveloper) && ( + {subFileType && parseInt(projectDetail.type) !== 2 && (isManager || isDeveloper) && (
- + :"" } @@ -406,12 +406,16 @@ class Detail extends Component { { projectDetail && projectDetail.issues_count ? {projectDetail.issues_count} :""} -
  • -1 ? "active" : ""}> + { + projectDetail && parseInt(projectDetail.type) !== 2 && +
  • -1 ? "active" : ""}> 合并请求 { projectDetail && projectDetail.pull_requests_count ? {projectDetail.pull_requests_count} : "" }
  • + } +
  • -1 || url.indexOf("meilpost") > -1) ? "active" : ""}> 里程碑 diff --git a/src/forge/Merge/MergeItem.js b/src/forge/Merge/MergeItem.js index 00c6d2c13..74e46cd39 100644 --- a/src/forge/Merge/MergeItem.js +++ b/src/forge/Merge/MergeItem.js @@ -98,7 +98,7 @@ class MergeItem extends Component { {/* {item.is_fork ? item.pull_request_base : `${item.author_name}:${item.pull_request_base}`} */} diff --git a/src/forge/Merge/MessageCount.js b/src/forge/Merge/MessageCount.js index 215abad6e..4500d5320 100644 --- a/src/forge/Merge/MessageCount.js +++ b/src/forge/Merge/MessageCount.js @@ -258,7 +258,7 @@ class MessageCount extends Component {
    {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 { {/* {data.pull_request.is_fork ? data.pull_request.base : `${data.pull_request.pull_request_user}:${data.pull_request.base}`} */}