diff --git a/src/forge/Main/CoderRootBranch.js b/src/forge/Main/CoderRootBranch.js index 5264ce38..e19b1be3 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} @@ -40,7 +40,7 @@ export default ((props)=>{

    - 创建合并请求 + 创建合并请求 diff --git a/src/forge/Main/CoderRootCommit.js b/src/forge/Main/CoderRootCommit.js index ec8f3225..916af5b2 100644 --- a/src/forge/Main/CoderRootCommit.js +++ b/src/forge/Main/CoderRootCommit.js @@ -33,8 +33,8 @@ class CoderRootCommit extends Component{ this.setState({ isSpining:true }) - 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/Main/CoderRootDirectory.js b/src/forge/Main/CoderRootDirectory.js index 74535dcb..28876b88 100644 --- a/src/forge/Main/CoderRootDirectory.js +++ b/src/forge/Main/CoderRootDirectory.js @@ -91,11 +91,11 @@ class CoderRootDirectory extends Component { // 页面地址返回到主目录 returnMain = (branch) => { - const { projectsId } = this.props.match.params; + const { projectsId , owner } = this.props.match.params; this.setState({ readOnly:true }) - this.props.history.push(`/projects/${projectsId}/coders`); + this.props.history.push(`/projects/${owner}/${projectsId}/coders`); this.getProjectRoot(branch); }; @@ -130,9 +130,9 @@ class CoderRootDirectory extends Component { }; ChangeFile = (arr, readOnly) => { - const { projectsId } = this.props.match.params; + const { projectsId , owner } = this.props.match.params; //点击直接跳转页面 加载一次路由 - this.props.history.push(`/projects/${projectsId}/coders?url=${arr.path}`); + this.props.history.push(`/projects/${owner}/${projectsId}/coders?url=${arr.path}`); this.setState({ readOnly: readOnly, chooseType:"file" @@ -160,10 +160,10 @@ class CoderRootDirectory extends Component { : type, }); }); - const { projectsId } = this.props.match.params; + const { projectsId , owner } = this.props.match.params; //点击直接跳转页面 加载一次路由 this.props.history.push( - `/projects/${projectsId}/coders?url=${str.substr(1)}` + `/projects/${owner}/${projectsId}/coders?url=${str.substr(1)}` ); } else { list.push({ @@ -246,8 +246,8 @@ class CoderRootDirectory extends Component { this.setState({ chooseType:type }) - const { projectsId } = this.props.match.params; - this.props.history.push(`/projects/${projectsId}/coders?url=${path}`); + const { projectsId, owner } = this.props.match.params; + this.props.history.push(`/projects/${owner}/${projectsId}/coders?url=${path}`); if(filename.substring(filename.length - 3) === ".md"){ this.setState({ md:true @@ -329,8 +329,8 @@ class CoderRootDirectory extends Component { chooseType:"dir", readOnly:true }) - const { projectsId } = this.props.match.params; - this.props.history.push(`/projects/${projectsId}/coders?url=${url}`); + const { projectsId , owner } = this.props.match.params; + this.props.history.push(`/projects/${owner}/${projectsId}/coders?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 b3cd31d7..e9a5f367 100644 --- a/src/forge/Main/CoderRootIndex.js +++ b/src/forge/Main/CoderRootIndex.js @@ -116,7 +116,7 @@ class CoderRootIndex extends Component{ () + (props) => () } > diff --git a/src/forge/Main/Detail.js b/src/forge/Main/Detail.js index 29f24c79..b2d1074f 100644 --- a/src/forge/Main/Detail.js +++ b/src/forge/Main/Detail.js @@ -496,7 +496,7 @@ class Detail extends Component { {/* 任务详情 */} () + (props) => () } > {/* 里程碑 */} diff --git a/src/forge/Main/DetailTop.js b/src/forge/Main/DetailTop.js index 6d2d1732..6e890da4 100644 --- a/src/forge/Main/DetailTop.js +++ b/src/forge/Main/DetailTop.js @@ -4,23 +4,23 @@ import { Link } from 'react-router-dom'; class DetailTop extends Component { render() { const { coderCount } = this.props; - const { projectsId } = this.props.match.params; + const { projectsId, owner } = this.props.match.params; 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/Newfile/UserSubmitComponent.js b/src/forge/Newfile/UserSubmitComponent.js index cf6485c0..5460d998 100644 --- a/src/forge/Newfile/UserSubmitComponent.js +++ b/src/forge/Newfile/UserSubmitComponent.js @@ -32,13 +32,13 @@ class UserSubmitComponent extends Component { // 提交变更 subMitFrom = () => { const { filepath, content, editor_type } = this.props; - const { branch, projectsId } = this.props.match.params; + const { branch, projectsId , owner } = this.props.match.params; const { submitType, filename } = this.state; this.setState({ isSpin: true }); let path = editor_type === "upload" ? filepath : filepath.substr(1); this.props.form.validateFieldsAndScroll((err, values) => { if (!err) { - const url = `/repositories/${projectsId}/create_file.json`; + const url = `/${owner}/${projectsId}/create_file.json`; axios.post(url, { filepath: filename ? filename : path, branch: branch, @@ -55,8 +55,8 @@ class UserSubmitComponent extends Component { getTopCount && getTopCount(values.branchname); } let url = values.branchname - ? `/projects/${projectsId}/coders?branch=${values.branchname}` - : `/projects/${projectsId}/coders`; + ? `/projects/${owner}/${projectsId}/coders?branch=${values.branchname}` + : `/projects/${owner}/${projectsId}/coders`; this.props.history.push(url); } }) @@ -74,9 +74,9 @@ class UserSubmitComponent extends Component { UpdateFile = () => { this.setState({ isSpin: true }); const { branch, detail, content, filepath } = this.props; - const { projectsId } = this.props.match.params; + const { projectsId , owner } = this.props.match.params; const { submitType } = this.state; - const url = `/repositories/${projectsId}/update_file.json`; + const url = `/${owner}/${projectsId}/update_file.json`; this.props.form.validateFieldsAndScroll((err, values) => { if (!err) { axios @@ -92,8 +92,8 @@ class UserSubmitComponent extends Component { this.setState({ isSpin: false }); if (result.data && result.data.status === 1) { let url = values.branchname - ? `/projects/${projectsId}/coders?branch=${values.branchname}` - : `/projects/${projectsId}/coders`; + ? `/projects/${owner}/${projectsId}/coders?branch=${values.branchname}` + : `/projects/${owner}/${projectsId}/coders`; this.props.history.push(url); this.props.showNotification("修改成功!"); @@ -113,7 +113,7 @@ class UserSubmitComponent extends Component { const { submitType, filename, isSpin } = this.state; const { getFieldDecorator } = this.props.form; - const { branch, projectsId } = this.props.match.params; + const { branch, projectsId , owner } = this.props.match.params; const { current_user, filepath, projectDetail } = this.props; const { editor_type } = this.props; @@ -228,7 +228,7 @@ class UserSubmitComponent extends Component {

    diff --git a/src/forge/Order/OrderItem.js b/src/forge/Order/OrderItem.js index 742a4b4f..88eb6fc5 100644 --- a/src/forge/Order/OrderItem.js +++ b/src/forge/Order/OrderItem.js @@ -45,7 +45,7 @@ class OrderItem extends Component { } render() { const { item , checkbox , mile } = this.props; - const { projectsId } = this.props.match.params; + const { projectsId , owner } = this.props.match.params; const { current_user } = this.props return ( @@ -54,7 +54,7 @@ class OrderItem extends Component { {current_user && current_user.login && checkbox}

    - {item.name} + {item.name} {TagInfo(item.priority,"mr10")}

    @@ -91,12 +91,12 @@ class OrderItem extends Component {

  • {item.done_ratio || "--"}
  • - {item.journals_count} + {item.journals_count} { current_user && current_user.login ?
    - +
    this.deletedetail(item.id)}> diff --git a/src/forge/Order/UpdateMilepost.js b/src/forge/Order/UpdateMilepost.js index e89acf57..51efa0b2 100644 --- a/src/forge/Order/UpdateMilepost.js +++ b/src/forge/Order/UpdateMilepost.js @@ -36,9 +36,9 @@ class UpdateMilepost extends Component { } getmeil = () => { - const { projectsId } = this.props.match.params; + const { projectsId , owner } = this.props.match.params; const { meilid } = this.props.match.params; - const url = `/projects/${projectsId}/versions/${meilid}/edit.json`; + const url = `/${owner}/${projectsId}/milestones/${meilid}/edit.json`; axios.get(url, { params: { projectsId, meilid @@ -64,9 +64,9 @@ class UpdateMilepost extends Component { this.setState({ isSpin: true }) this.props.form.validateFieldsAndScroll((err, values) => { if (!err) { - const { projectsId } = this.props.match.params; + const { projectsId , owner } = this.props.match.params; const { meilid } = this.props.match.params; - const url = `/projects/${projectsId}/versions/${meilid}.json`; + const url = `/${owner}/${projectsId}/milestones/${meilid}.json`; let time = this.state.selectedValue && this.state.selectedValue.format("YYYY-MM-DD"); @@ -79,7 +79,7 @@ class UpdateMilepost extends Component { }).then(result => { if (result) { this.setState({ isSpin: false }) - this.props.history.push(`/projects/${projectsId}/orders/Milepost`); + this.props.history.push(`/projects/${owner}/${projectsId}/orders/Milepost`); } diff --git a/src/forge/Order/order_form.js b/src/forge/Order/order_form.js index 76d57f92..b3e5b958 100644 --- a/src/forge/Order/order_form.js +++ b/src/forge/Order/order_form.js @@ -44,7 +44,6 @@ class order_form extends Component { } componentDidMount = () => { this.getSelectList(); - }; get_detail = () => { this.setState({ @@ -87,13 +86,8 @@ class order_form extends Component { }); }; getSelectList = () => { - let {projectsId, owner} = this.props.match.params; + let {projectsId, owner , milepostId} = this.props.match.params; - if (this.props.match.params.milepostId) { - this.props.form.setFieldsValue({ - fixed_version_id: this.props.match.params.milepostId, - }); - } const url = `/${owner}/${projectsId}/issues/new.json`; axios.get(url).then((result) => { if (result) { @@ -102,11 +96,13 @@ class order_form extends Component { branches: result.data.branches, isSpin:false }); + if(this.props.form_type !== "new"){ this.get_detail(); }else{ this.props.form.setFieldsValue({ - ...this.state + ...this.state, + fixed_version_id: milepostId || "" }); } } diff --git a/src/forge/Version/New.jsx b/src/forge/Version/New.jsx index de9cff48..d42b780d 100644 --- a/src/forge/Version/New.jsx +++ b/src/forge/Version/New.jsx @@ -47,7 +47,7 @@ export default Form.create()( useEffect(() => { if (versionId) { - const url = `/projects/${projectsId}/version_releases/${versionId}/edit.json`; + const url = `/${owner}/${projectsId}/releases/${versionId}/edit.json`; axios.get(url).then(result => { if (result) { setFieldsValue(result.data); @@ -59,8 +59,8 @@ export default Form.create()( }, [versionId]); useEffect(() => { - if (repo_id) { - const url = `/repositories/${repo_id}/tags.json`; + if (projectsId) { + const url = `/${owner}/${projectsId}/tags.json`; axios .get(url,{params:{ limit:1000 @@ -75,7 +75,7 @@ export default Form.create()( console.log(error); }); } - }, [repo_id]); + }, [projectsId]); function renderTagList(list) { if (list) { @@ -93,7 +93,7 @@ export default Form.create()( validateFields((err, value) => { if(err)return; if (versionId) { - let url = `/projects/${projectsId}/version_releases/${versionId}.json`; + let url = `/${owner}/${projectsId}/releases/${versionId}.json`; axios .put(url, { ...value, @@ -103,11 +103,11 @@ export default Form.create()( .then(result => { if (result) { showNotification("版本修改成功！"); - history.push(`/projects/${projectsId}/coders/version`); + history.push(`/projects/${owner}/${projectsId}/coders/version`); } }); } else { - let url = `/projects/${projectsId}/version_releases.json`; + let url = `/${owner}/${projectsId}/releases.json`; axios.post(url, { ...value, body: desc, @@ -116,7 +116,7 @@ export default Form.create()( .then(result => { if (result) { showNotification("版本发布成功！"); - history.push(`/projects/${projectsId}/coders/version`); + history.push(`/projects/${owner}/${projectsId}/coders/version`); } }); } @@ -143,7 +143,7 @@ export default Form.create()(
    -

    创建发行版

    +

    {versionId?"编辑":"创建"}发行版

    {helper( @@ -233,7 +233,7 @@ export default Form.create()(