diff --git a/src/forge/Main/CoderRootDirectory.js b/src/forge/Main/CoderRootDirectory.js index 6137a1da..5843d043 100644 --- a/src/forge/Main/CoderRootDirectory.js +++ b/src/forge/Main/CoderRootDirectory.js @@ -10,6 +10,7 @@ import RootTable from './RootTable'; import CoderRootFileDetail from './CoderRootFileDetail'; import { truncateCommitId } from '../common/util'; import RenderHtml from '../../components/render-html'; +import Top from './DetailTop'; import axios from "axios"; /** @@ -42,7 +43,11 @@ class CoderRootDirectory extends Component { readOnly: true, zip_url:undefined, tar_url:undefined, - chooseType:undefined + chooseType:undefined, + tags_count:undefined, + commits_count:undefined, + branches_count:undefined + } } changeAddress = (address) => { @@ -122,6 +127,9 @@ class CoderRootDirectory extends Component { (last_commit.commit && last_commit.commit.author)), zip_url: result.data.zip_url, tar_url: result.data.tar_url, + tags_count: result.data.tags_count, + branches_count: result.data.branches_count, + commits_count: result.data.commits_count }); if (entries && entries.length > 0) { this.renderData(entries); @@ -440,14 +448,15 @@ class CoderRootDirectory extends Component { let array = filePath && filePath.split("/"); return ( +
- {filePath && ( diff --git a/src/forge/Main/CoderRootIndex.js b/src/forge/Main/CoderRootIndex.js index 09c1b113..c3a17214 100644 --- a/src/forge/Main/CoderRootIndex.js +++ b/src/forge/Main/CoderRootIndex.js @@ -3,7 +3,6 @@ import { Route , Switch } from 'react-router-dom'; import Loadable from 'react-loadable'; import Loading from '../../Loading'; -import Top from './DetailTop'; const CoderRootDirectory = Loadable({ @@ -40,11 +39,9 @@ const Diff = Loadable({ }) class CoderRootIndex extends Component{ - render(){ return(
- () } > - + () @@ -99,4 +96,4 @@ class CoderRootIndex extends Component{ ) } } -export default CoderRootIndex; \ No newline at end of file +export default CoderRootIndex; diff --git a/src/forge/Main/Detail.js b/src/forge/Main/Detail.js index 05899dde..a177234e 100644 --- a/src/forge/Main/Detail.js +++ b/src/forge/Main/Detail.js @@ -145,19 +145,31 @@ class Detail extends Component { author: undefined, branchs: undefined, branchList: undefined, + project: null } } componentDidMount = () => { + this.getProject(); this.getDetail(); } componentDidUpdate = (prevState) => { if ((prevState.match.params.projectsId !== this.props.match.params.projectsId)) { + this.getProject(); this.getDetail(); } } + getProject = () => { + const { projectsId } = this.props.match.params; + const url = `/projects/${projectsId}/simple.json`; + axios.get(url).then((result) => { + this.setState({ + project: result.data + }) + }) + } getDetail = () => { const { projectsId } = this.props.match.params; @@ -186,7 +198,7 @@ class Detail extends Component { // 关注和取消关注 focusFunc = (flag) => { const { project_id } = this.state; - + axios({ method: flag? 'delete' : 'post', url: `/watchers/${flag? 'unfollow' : 'follow'}.json`, @@ -262,25 +274,7 @@ class Detail extends Component { console.log(error); }) } - // 获取分支列表 - getBranch = (id) => { - const url = `/projects/${id}/branches.json`; - axios.get(url).then((result) => { - if (result && result.data.length > 0) { - const branchs = []; - result.data.map((item, key) => { - branchs.push({ - index: key, - name: item.name - }) - }) - this.setState({ - branchList: result.data, - branchs, - }) - } - }).catch((error) => { }) - } + // 同步镜像 synchronismMirror=()=>{ @@ -292,6 +286,7 @@ class Detail extends Component { axios.post(url).then(result=>{ if(result && result.data && result.data.status === 0){ this.props.showNotification("镜像同步成功!"); + this.getProject(); this.getDetail(); }else{ this.props.showNotification("镜像同步失败!"); @@ -299,14 +294,14 @@ class Detail extends Component { isSpin:false }) } - + }).catch(error=>{ console.log(error); }) } render() { - const { projectDetail, watchers_count, praises_count, forked_count, isSpin, isManager, watched, praised } = this.state; + const { projectDetail, watchers_count, praises_count, forked_count, isSpin, isManager, watched, praised, project } = this.state; const url = this.props.history.location.pathname; const urlArr = url.split("/"); const urlFlag = (urlArr.length === 3); @@ -337,19 +332,18 @@ class Detail extends Component { } return (
-

- {projectDetail && projectDetail.author && - - {projectDetail.author.name} + {project && project.author && + + {project.author.name} } / - {projectDetail && projectDetail.name} + {project && project.name} { projectDetail && projectDetail.forked_from_project_id && projectDetail.fork_info ? @@ -404,7 +398,6 @@ class Detail extends Component {

  • -1 || urlFlag) ? "active" : ""}> 代码库 - { projectDetail && projectDetail.commits_count ? {projectDetail.commits_count}:""}
  • -1 && !(url.indexOf("Milepost") > 0 || url.indexOf("meilpost") > 0 || url.indexOf("tags") > 0)) ? "active" : ""}> @@ -546,7 +539,7 @@ class Detail extends Component { () + (props) => () } > @@ -604,7 +597,6 @@ class Detail extends Component { } > -
    • ) } diff --git a/src/forge/Main/DetailTop.js b/src/forge/Main/DetailTop.js index 4d4d584f..9cc225cc 100644 --- a/src/forge/Main/DetailTop.js +++ b/src/forge/Main/DetailTop.js @@ -3,22 +3,22 @@ import { Link } from 'react-router-dom'; class DetailTop extends Component { render() { - const { projectDetail } = this.props; + const { projectDetail, tags_count, commits_count, branches_count } = this.props; const { projectsId } = this.props.match.params; const { pathname } = this.props.location; return (

    0 ? "active" : ""}> - {projectDetail && projectDetail.commits_count}个提交 + {commits_count}个提交 0 ? "active" : ""}> - {projectDetail && projectDetail.branches_count}个分支 + {branches_count}个分支 0 ? "active" : ""}> - {projectDetail && projectDetail.issue_tags_count}个标签 + {tags_count}个标签 0 ? "active" : ""}> diff --git a/src/forge/UsersList/common_users.js b/src/forge/UsersList/common_users.js index c81bbd51..cae2a3c0 100644 --- a/src/forge/UsersList/common_users.js +++ b/src/forge/UsersList/common_users.js @@ -84,7 +84,7 @@ class CommonUsers extends Component { ); return ( -

    +
    {type_title}
    diff --git a/src/forge/UsersList/fork_users.js b/src/forge/UsersList/fork_users.js index 88b1dc6d..29236935 100644 --- a/src/forge/UsersList/fork_users.js +++ b/src/forge/UsersList/fork_users.js @@ -120,7 +120,7 @@ class ForkUsers extends Component { } }; return ( -
    +
    Fork列表
    diff --git a/src/forge/UsersList/list.css b/src/forge/UsersList/list.css index 5b9f0927..2de17ea1 100644 --- a/src/forge/UsersList/list.css +++ b/src/forge/UsersList/list.css @@ -2,9 +2,9 @@ background: #fff; } .newMain{background: transparent!important;} -.background-g { +/* .background-g { background: #fafafa; -} +} */ .pt-15 { padding-top: 15px; } diff --git a/src/modules/tpm/TPMIndex.css b/src/modules/tpm/TPMIndex.css index dde8c34c..1f40ed79 100644 --- a/src/modules/tpm/TPMIndex.css +++ b/src/modules/tpm/TPMIndex.css @@ -96,7 +96,7 @@ body>.-task-title { } .newContainer { - background: #fafafa !important; + background: #EAEBEC !important; } .ant-modal-title {