diff --git a/src/forge/DevOps/Dispose.jsx b/src/forge/DevOps/Dispose.jsx index 56e6f388..1b4f8bac 100644 --- a/src/forge/DevOps/Dispose.jsx +++ b/src/forge/DevOps/Dispose.jsx @@ -15,6 +15,7 @@ function Dispose(props){ const [ first , setFirst ] = useState(false); let projectsId = props.match.params.projectsId; + let owner = props.match.params.owner; useEffect(()=>{ if(projectsId){ @@ -71,7 +72,7 @@ function Dispose(props){ } if(first){ // 为true，则是编辑否则是新建 - url = `/repositories/${projectsId}/update_file.json`; + url = `/${owner}/${projectsId}/update_file.json`; axios.put(url,{ ...params, sha:info && info.sha @@ -83,7 +84,7 @@ function Dispose(props){ console.log(error); }) }else{ - url = `/repositories/${projectsId}/create_file.json`; + url = `/${owner}/${projectsId}/create_file.json`; axios.post(url,params).then(result=>{ if(result){ setVisible(true); @@ -94,7 +95,7 @@ function Dispose(props){ } } function suresubmit(){ - props.history.push(`/projects/${projectsId}/ops/list`); + props.history.push(`/projects/${owner}/${projectsId}/ops/list`); } return( diff --git a/src/forge/Main/CoderRootBranch.js b/src/forge/Main/CoderRootBranch.js index 34224ac4..f2fe27b3 100644 --- a/src/forge/Main/CoderRootBranch.js +++ b/src/forge/Main/CoderRootBranch.js @@ -32,7 +32,7 @@ export default ((props)=>{ return(
  • - {item.name} + {item.name}

    {item.last_commit && truncateCommitId(item.last_commit.sha)} {item.last_commit && item.last_commit.message} diff --git a/src/forge/Main/CoderRootDirectory.js b/src/forge/Main/CoderRootDirectory.js index 0d79eaa1..40d9081d 100644 --- a/src/forge/Main/CoderRootDirectory.js +++ b/src/forge/Main/CoderRootDirectory.js @@ -95,7 +95,7 @@ class CoderRootDirectory extends Component { this.setState({ readOnly:true }) - this.props.history.push(`/projects/${owner}/${projectsId}/coders`); + this.props.history.push(`/projects/${owner}/${projectsId}`); this.getProjectRoot(branch); }; @@ -132,7 +132,7 @@ class CoderRootDirectory extends Component { ChangeFile = (arr, readOnly) => { const { projectsId , owner } = this.props.match.params; //点击直接跳转页面 加载一次路由 - this.props.history.push(`/projects/${owner}/${projectsId}/coders?url=${arr.path}`); + this.props.history.push(`/projects/${owner}/${projectsId}?url=${arr.path}`); this.setState({ readOnly: readOnly, chooseType:"file" @@ -163,7 +163,7 @@ class CoderRootDirectory extends Component { const { projectsId , owner } = this.props.match.params; //点击直接跳转页面 加载一次路由 this.props.history.push( - `/projects/${owner}/${projectsId}/coders?url=${str.substr(1)}` + `/projects/${owner}/${projectsId}?url=${str.substr(1)}` ); } else { list.push({ @@ -247,7 +247,7 @@ class CoderRootDirectory extends Component { chooseType:type }) const { projectsId, owner } = this.props.match.params; - this.props.history.push(`/projects/${owner}/${projectsId}/coders?url=${path}`); + this.props.history.push(`/projects/${owner}/${projectsId}?url=${path}`); if(filename.substring(filename.length - 3) === ".md"){ this.setState({ md:true @@ -330,7 +330,7 @@ class CoderRootDirectory extends Component { readOnly:true }) const { projectsId , owner } = this.props.match.params; - this.props.history.push(`/projects/${owner}/${projectsId}/coders?url=${url}`); + this.props.history.push(`/projects/${owner}/${projectsId}?url=${url}`); } onEdit=(readOnly)=>{ @@ -478,13 +478,13 @@ class CoderRootDirectory extends Component { {subFileType && (projectDetail && parseInt(projectDetail.type)) !== 2 && (isManager || isDeveloper) && (

    - + 上传文件 新建文件 diff --git a/src/forge/Main/CoderRootIndex.js b/src/forge/Main/CoderRootIndex.js index 8598769e..51762c99 100644 --- a/src/forge/Main/CoderRootIndex.js +++ b/src/forge/Main/CoderRootIndex.js @@ -82,22 +82,22 @@ class CoderRootIndex extends Component{ {/* 新建文件 */} - () } > - () } > - () } > - () } @@ -108,38 +108,33 @@ class CoderRootIndex extends Component{ () => () } > - () + } + > + () } > - () - } - > - - () } > - () } > - () } > - () - } - > () diff --git a/src/forge/Main/Detail.js b/src/forge/Main/Detail.js index 775145a0..ceaba628 100644 --- a/src/forge/Main/Detail.js +++ b/src/forge/Main/Detail.js @@ -121,7 +121,23 @@ const DevIndex = Loadable({ /** * permission：Manager:管理员，Reporter：报告人员(只有读取权限)，Developer：开发人员（除不能设置仓库信息外） */ - +function checkPathname(pathname){ + let name = ""; + if(pathname){ + if(pathname.indexOf("/issues")>-1 ||pathname.indexOf("Milepost") > 0){ + name = "issues"; + }else if(pathname.indexOf("/pulls")>-1){ + name="pulls" + }else if(pathname.indexOf("/milestones")>-1){ + name="milestones" + }else if(pathname.indexOf("/activity")>-1){ + name="activity" + }else if(pathname.indexOf("/setting")>-1){ + name="setting" + } + } + return name; +} class Detail extends Component { constructor(props) { super(props); @@ -295,7 +311,7 @@ class Detail extends Component { const url = `/${owner}/${projectsId}/forks.json`; axios.post(url).then(result => { if (result && result.data.status === 0) { - this.props.history.push(`/projects/${current_user && current_user.login}/${result.data.identifier}/coders`); + this.props.history.push(`/projects/${current_user && current_user.login}/${result.data.identifier}`); this.props.showNotification(result.data.message); } }).catch(error => { @@ -318,11 +334,14 @@ class Detail extends Component { }) } + + render() { const { projectDetail, watchers_count, praises_count, forked_count, firstSync , secondSync , isManager, watched, praised, project } = this.state; const url = this.props.history.location.pathname; const urlArr = url.split("/"); const urlFlag = (urlArr.length === 3); + let pathname = checkPathname(url); const { projectsId , owner } = this.props.match.params; @@ -336,9 +355,10 @@ class Detail extends Component { forked from {projectDetail.fork_info.fork_project_user_name} / - {projectDetail.fork_info.fork_form_name} + {projectDetail.fork_info.fork_form_name} : "" ); + const common = { getDetail: this.getDetail @@ -356,11 +376,11 @@ class Detail extends Component { } / - {project && project.name} + {project && project.name} { projectDetail && projectDetail.forked_from_project_id && projectDetail.fork_info ? - @@ -418,12 +438,12 @@ class Detail extends Component { firstSync ? "" :
      -
    • -1 || urlFlag) ? "active" : ""}> - +
    • + 代码库
      • -
    • -1 && !(url.indexOf("Milepost") > 0 || url.indexOf("meilpost") > 0 || url.indexOf("tags") > 0)) ? "active" : ""}> +
    • 任务 {projectDetail && projectDetail.issues_count ? {projectDetail.issues_count} : ""} @@ -431,7 +451,7 @@ class Detail extends Component {
      • { projectDetail && parseInt(projectDetail.type) !== 2 && -
    • -1 ? "active" : ""}> +
    • 合并请求 {projectDetail && projectDetail.pull_requests_count ? {projectDetail.pull_requests_count} : ""} @@ -444,13 +464,13 @@ class Detail extends Component { {projectDetail && projectDetail.ops_count ? {projectDetail.ops_count} : ""}
      • */} -
    • -1 ? "active" : ""}> +
    • 里程碑 {projectDetail && projectDetail.versions_count ? {projectDetail.versions_count} :""}
      • -
    • -1 ? "active" : ""}> +
    • 动态 @@ -588,11 +608,6 @@ class Detail extends Component { (props) => () } > - () - } - > () diff --git a/src/forge/Main/DetailTop.js b/src/forge/Main/DetailTop.js index 01d9211c..bf6fc4c4 100644 --- a/src/forge/Main/DetailTop.js +++ b/src/forge/Main/DetailTop.js @@ -8,19 +8,19 @@ class DetailTop extends Component { const { pathname } = this.props.location; return (

      - 0 ? "active" : ""}> + 0 ? "active" : ""}> {(coderCount && coderCount.commits_count) || 0}个提交 - 0 ? "active" : ""}> + 0 ? "active" : ""}> {(coderCount && coderCount.branches_count) || 0}个分支 - 0 ? "active" : ""}> + 0 ? "active" : ""}> {(coderCount && coderCount.tags_count) || 0}个标签 - 0 ? "active" : ""}> + 0 ? "active" : ""}> {(coderCount && coderCount.version_releasesed_count) || 0}个发行版 diff --git a/src/forge/Main/IndexItem.js b/src/forge/Main/IndexItem.js index 3c76e16a..1195ebbb 100644 --- a/src/forge/Main/IndexItem.js +++ b/src/forge/Main/IndexItem.js @@ -25,7 +25,7 @@ class IndexItem extends Component {

      - + {item.author.name}/{item.name} { item.forked_from_project_id ? diff --git a/src/forge/Merge/MergeItem.js b/src/forge/Merge/MergeItem.js index d558591f..2585b9d4 100644 --- a/src/forge/Merge/MergeItem.js +++ b/src/forge/Merge/MergeItem.js @@ -98,7 +98,7 @@ class MergeItem extends Component { {item.is_original @@ -116,7 +116,7 @@ class MergeItem extends Component { {/* {item.is_fork ? item.pull_request_base : `${item.author_name}:${item.pull_request_base}`} */} @@ -156,7 +156,7 @@ class MergeItem extends Component { {item.journals_count ? ( {item.journals_count} @@ -177,7 +177,7 @@ class MergeItem extends Component { >
      diff --git a/src/forge/Merge/MergeSubmit.js b/src/forge/Merge/MergeSubmit.js index 76f16c38..9ebb3bb2 100644 --- a/src/forge/Merge/MergeSubmit.js +++ b/src/forge/Merge/MergeSubmit.js @@ -37,8 +37,8 @@ class MergeSubmit extends Component{ getDetail=()=>{ - const { projectsId , mergeId} = this.props.match.params; - const url = `/projects/${projectsId}/pull_requests/${mergeId}.json`; + const { projectsId , mergeId, owner} = this.props.match.params; + const url = `/projects/${owner}/${projectsId}/pull_requests/${mergeId}.json`; axios.get(url).then((result)=>{ if(result){ this.setState({ @@ -53,8 +53,8 @@ class MergeSubmit extends Component{ //获取提交列表 getCommitList=(branch , page , limit)=>{ - const { projectsId } = this.props.match.params; - const url = `/repositories/${projectsId}/commits.json`; + const { projectsId , owner } = this.props.match.params; + const url = `/${owner}/${projectsId}/commits.json`; axios.get(url,{ params:{ sha:branch, diff --git a/src/forge/Merge/MessageCount.js b/src/forge/Merge/MessageCount.js index 12432313..c837ccb4 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}`} */} diff --git a/src/forge/Merge/merge.js b/src/forge/Merge/merge.js index 9ae71994..0eeb07f6 100644 --- a/src/forge/Merge/merge.js +++ b/src/forge/Merge/merge.js @@ -407,7 +407,7 @@ class merge extends Component {
      {data && data.search_count && data.search_count > 0 ? ( -
      +
      { diff --git a/src/forge/Newfile/UserSubmitComponent.js b/src/forge/Newfile/UserSubmitComponent.js index a76c70ab..e2bf44df 100644 --- a/src/forge/Newfile/UserSubmitComponent.js +++ b/src/forge/Newfile/UserSubmitComponent.js @@ -55,8 +55,8 @@ class UserSubmitComponent extends Component { getTopCount && getTopCount(values.branchname); } let url = values.branchname - ? `/projects/${owner}/${projectsId}/coders?branch=${values.branchname}` - : `/projects/${owner}/${projectsId}/coders`; + ? `/projects/${owner}/${projectsId}?branch=${values.branchname}` + : `/projects/${owner}/${projectsId}`; this.props.history.push(url); } }) @@ -92,8 +92,8 @@ class UserSubmitComponent extends Component { this.setState({ isSpin: false }); if (result.data && result.data.status === 1) { let url = values.branchname - ? `/projects/${owner}/${projectsId}/coders?branch=${values.branchname}` - : `/projects/${owner}/${projectsId}/coders`; + ? `/projects/${owner}/${projectsId}?branch=${values.branchname}` + : `/projects/${owner}/${projectsId}`; this.props.history.push(url); this.props.showNotification("修改成功!"); @@ -219,7 +219,7 @@ class UserSubmitComponent extends Component {
      { search_count > limit? -
      +
      :"" } diff --git a/src/forge/Order/order.css b/src/forge/Order/order.css index 5db5aaf0..1d225f43 100644 --- a/src/forge/Order/order.css +++ b/src/forge/Order/order.css @@ -211,6 +211,9 @@ padding: 6px 30px; cursor: pointer; } +.setItemStyle{ + min-height:440px; +} .setItemStyle .issueItem{ padding:16px 0px; } @@ -221,9 +224,6 @@ border-bottom: 1px solid #eee; padding: 16px 20px; } -.issueItem:last-child{ - border-bottom: none; -} .issueNo { padding: 0px 5px; border-radius: 4px; diff --git a/src/forge/Order/order.js b/src/forge/Order/order.js index 7e2715f2..51a94f3e 100644 --- a/src/forge/Order/order.js +++ b/src/forge/Order/order.js @@ -826,7 +826,7 @@ class order extends Component { )} { search_count > select_params.limit ? -
      +
      { if (result) { showNotification("版本修改成功！"); - history.push(`/projects/${owner}/${projectsId}/coders/releases`); + history.push(`/projects/${owner}/${projectsId}/releases`); } }); } else { @@ -116,7 +116,7 @@ export default Form.create()( .then(result => { if (result) { showNotification("版本发布成功！"); - history.push(`/projects/${owner}/${projectsId}/coders/releases`); + history.push(`/projects/${owner}/${projectsId}/releases`); } }); } @@ -233,7 +233,7 @@ export default Form.create()(