diff --git a/src/forge/Activity/Activity.js b/src/forge/Activity/Activity.js index c24e90bf6..2457cb512 100644 --- a/src/forge/Activity/Activity.js +++ b/src/forge/Activity/Activity.js @@ -27,13 +27,13 @@ const ARRAY = [ name:'1个月' } ] -const dataformat="YYYY-MM-DD HH:mm"; +// const dataformat="YYYY-MM-DD HH:mm"; class Activity extends Component{ constructor(props){ super(props); this.state={ - time:'1', + time:'30', type:undefined, state:undefined, page:1, @@ -105,6 +105,9 @@ class Activity extends Component{ ); + let name = time && ARRAY.filter(item=>item.id === parseInt(time)) ; + // console.log(name); + const second_per = (parseInt(data && data.close_issues_count)/parseInt(data && data.issues_count)*100)+'%'; @@ -155,7 +158,7 @@ class Activity extends Component{ 周期: - {time} + {name && name.length>0 && name[0].name} diff --git a/src/forge/Activity/ActivityItem.js b/src/forge/Activity/ActivityItem.js index dfecf1c9a..115e774e5 100644 --- a/src/forge/Activity/ActivityItem.js +++ b/src/forge/Activity/ActivityItem.js @@ -6,7 +6,7 @@ import { getImageUrl } from 'educoder'; class ActivityItem extends Component{ render(){ - const { projectsId } = this.props.match.params; + const { projectsId , author } = this.props.match.params; const { item } = this.props; return( @@ -14,20 +14,20 @@ class ActivityItem extends Component{ {/* 如果是版本发布 */} { item.trend_type==="VersionRelease"?  - {item.name} + {item.name} {item.trend_type}

: // 如果是工单 item.trend_type==="Issue"? - {item.name} + {item.name} {item.trend_type}

: // 如果是合并请求 - {item.name} + {item.name} {item.trend_type}

} diff --git a/src/forge/Branch/SelectBranch.js b/src/forge/Branch/SelectBranch.js index 0ede09f97..77edb8254 100644 --- a/src/forge/Branch/SelectBranch.js +++ b/src/forge/Branch/SelectBranch.js @@ -4,27 +4,86 @@ import { Dropdown , Icon , Menu } from 'antd'; import "./branch.css" class SelectBranch extends Component{ + constructor(props){ + super(props); + this.state={ + visible:false, + value:undefined + } + } + componentDidMount() { + document.body.addEventListener('click', e => { + if (e.target && (e.target.matches('#m-btn') || e.target.matches("#input-btn")|| e.target.matches("#ul-btn"))) { + return; + } + this.setState({ + visible:false, + value:undefined + }) + }); + } + + ChangeVisible=(visible)=>{ + this.setState({ + visible:!visible + }) + } + + InputClick=(e)=>{ + this.stopPropagations(e); + } + + stopPropagations=(e)=>{ + e.stopPropagation(); + } + + // 输入搜索内容 + changeValue=(e)=>{ + this.setState({ + value:e.target.value + }) + } + + // 选择分支 + changeBranch=(value)=>{ + const { changeBranch } = this.props; + this.setState({ + visible:false, + value:undefined + }) + changeBranch && changeBranch(value); + } render(){ - const { branchs , branch , changeBranch } = this.props; + const { visible , value } = this.state; + const { branchs , branch } = this.props; + + let branchsFilter = value ? (branchs && branchs.length>0 && branchs.filter(item=>item.name.indexOf(value)>-1)):branchs; + const menu = ( - - { - branchs && branchs.map((item,key)=>{ - return( - changeBranch(value)}>{item.name} - ) - }) - } - +
+ + +
); return( -
- 分支: - - - {branch} - +
this.ChangeVisible(visible)}> + + + 分支: + + {branch} + +
) diff --git a/src/forge/Branch/branch.css b/src/forge/Branch/branch.css index f54901088..ebff0be94 100644 --- a/src/forge/Branch/branch.css +++ b/src/forge/Branch/branch.css @@ -6,4 +6,31 @@ padding:0px 10px; height: 35px; line-height: 35px; +} +.branchOptions{ + width: 200px; + padding:10px; + box-shadow: 0px 0px 1px 1px rgba(134, 134, 134, 0.1); + border-radius: 3px; + background: #fff; + max-height: 200px; +} +.OptionsUl{ + max-height: 100px; + overflow-y: auto; +} +.OptionsUl li{ + height: 22px; + line-height: 22px; + cursor: pointer;; +} +.OptionsUl li a{ + display: block; + padding-left: 2px; +} +.OptionsInput{ + height: 32px; + padding-left: 4px; + line-height: 32px; + width: 100%; } \ No newline at end of file diff --git a/src/forge/Index.js b/src/forge/Index.js index 8ff86c728..3ba1672e2 100644 --- a/src/forge/Index.js +++ b/src/forge/Index.js @@ -68,7 +68,7 @@ class Index extends Component{ (props) => () } > - () } diff --git a/src/forge/Main/CoderRootBranch.js b/src/forge/Main/CoderRootBranch.js index 560a4aae7..a9859fd31 100644 --- a/src/forge/Main/CoderRootBranch.js +++ b/src/forge/Main/CoderRootBranch.js @@ -16,7 +16,7 @@ class CoderRootBranch extends Component { render(){ const { branchList, projectDetail } = this.props; - const { projectsId } = this.props.match.params; + const { projectsId , author } = this.props.match.params; const list =()=>{ if(branchList && branchList.length>0){ return( @@ -29,7 +29,7 @@ class CoderRootBranch extends Component { return(
  • - {item.name} + {item.name} {/*{item.name}*/}

    {item.last_commit && item.last_commit.id} @@ -39,7 +39,7 @@ class CoderRootBranch extends Component {

    - 创建合并请求 + 创建合并请求 diff --git a/src/forge/Main/CoderRootCommit.js b/src/forge/Main/CoderRootCommit.js index e2a6e7230..2aa0d353b 100644 --- a/src/forge/Main/CoderRootCommit.js +++ b/src/forge/Main/CoderRootCommit.js @@ -61,7 +61,7 @@ class CoderRootCommit extends Component{ // 切换分支 changeBranch=(value)=>{ const { branchList } = this.props; - let branchLastCommit = branchList[parseInt(value.key)]; + let branchLastCommit = branchList && branchList.filter(item=>item.name === value)[0]; const { page , limit } = this.state; this.setState({ diff --git a/src/forge/Main/CoderRootDirectory.js b/src/forge/Main/CoderRootDirectory.js index a822ed205..0bfd64ce5 100644 --- a/src/forge/Main/CoderRootDirectory.js +++ b/src/forge/Main/CoderRootDirectory.js @@ -200,11 +200,11 @@ class CoderRootDirectory extends Component{ changeBranch=(value)=>{ const { branchList } = this.props; - let branchLastCommit = branchList && branchList.length >0 && branchList[parseInt(value.key)]; + let branchLastCommit = branchList && branchList.length >0 && branchList.filter(item=>item.name === value)[0]; this.setState({ - branch:branchLastCommit.name, + branch:branchLastCommit && branchLastCommit.name, branchLastCommit, - http_url:branchLastCommit.http_url, + http_url:branchLastCommit && branchLastCommit.http_url, isSpin: true }) this.getProjectRoot(branchLastCommit.name); @@ -213,7 +213,7 @@ class CoderRootDirectory extends Component{ render(){ const { rootList , branch ,filePath , fileDetail , subFileType , readMeContent, isSpin , rootData } = this.state; const { branchLastCommit , http_url , isManager , isDeveloper } = this.props; - const { projectsId } = this.props.match.params; + const { projectsId , author } = this.props.match.params; const columns = [ { @@ -299,7 +299,7 @@ class CoderRootDirectory extends Component{ { subFileType !== "file" && isManager && isDeveloper &&

    - 新建文件 + 新建文件 上传文件

    } diff --git a/src/forge/Main/CoderRootFileDetail.js b/src/forge/Main/CoderRootFileDetail.js index 2429c1445..50113010a 100644 --- a/src/forge/Main/CoderRootFileDetail.js +++ b/src/forge/Main/CoderRootFileDetail.js @@ -51,6 +51,7 @@ class CoderRootFileDetail extends Component{ deleteFile=()=>{ const { author , branch , detail }= this.props; const { projectsId } = this.props.match.params; + const authorLogin = this.props.match.params.author; const url = `/${author.login}/${projectsId}/contents/files/delete.json`; axios.delete(url,{ @@ -61,7 +62,7 @@ class CoderRootFileDetail extends Component{ }).then(result=>{ if(result){ this.props.showNotification("删除成功!"); - this.props.history.push(`/projects/${projectsId}`); + this.props.history.push(`/projects/${projectsId}/${authorLogin}`); } }).catch(error=>{ console.log(error); diff --git a/src/forge/Main/CoderRootIndex.js b/src/forge/Main/CoderRootIndex.js index 532c14a0b..a07e7b72e 100644 --- a/src/forge/Main/CoderRootIndex.js +++ b/src/forge/Main/CoderRootIndex.js @@ -28,22 +28,22 @@ class CoderRootIndex extends Component{ return(
    - () } > - () } > - () } > - () } diff --git a/src/forge/Main/Detail.js b/src/forge/Main/Detail.js index 246852852..95634b044 100644 --- a/src/forge/Main/Detail.js +++ b/src/forge/Main/Detail.js @@ -172,11 +172,8 @@ class Detail extends Component{ // } getDetail=()=>{ - console.log("state",this.props) - const { state } = this.props.history.location; - const { current_user } = this.props - const { projectsId } = this.props.match.params; - const url = `/${state ? state : current_user && current_user.login}/${projectsId}.json`; + const { projectsId , author } = this.props.match.params; + const url = `/${author}/${projectsId}.json`; axios.get(url).then((result)=>{ if(result){ this.setState({ @@ -253,11 +250,12 @@ class Detail extends Component{ // fork项目 forkFunc=()=>{ + const { author } = this.props.match.params; const { project_id } = this.state; const url = `/projects/${project_id}/forks.json`; axios.post(url).then(result=>{ if(result && result.data.status === 0){ - this.props.history.push(`/projects/${result.data.identifier}/coder`); + this.props.history.push(`/projects/${result.data.identifier}/${author}/coder`); }else{ this.props.showNotification(result.data.message); } @@ -293,7 +291,7 @@ class Detail extends Component{ const url = this.props.history.location.pathname; const urlFlag = (url.split("/").length === 3); const { isManager , isDeveloper } = this.props; - const { projectsId } = this.props.match.params; + const { projectsId , author } = this.props.match.params; const { state } = this.props.history.location; return( @@ -305,20 +303,20 @@ class Detail extends Component{ {projectDetail && projectDetail.author && projectDetail.author.name} / - { projectDetail && projectDetail.identifier } + { projectDetail && projectDetail.identifier }

      -
    • 0 || urlFlag)? "active" : ""}>代码
      • -
    • 0 ? "active" : ""}>工单{projectDetail&&projectDetail.issues_count===0?"":projectDetail&&projectDetail.issues_count===0?projectDetail.issues_count:""}
      • -
    • 0 ? "active" : ""}>合并请求{projectDetail&&projectDetail.pull_requests_count===0?"":projectDetail&&projectDetail.pull_requests_count===0?projectDetail.pull_requests_count:""}
      • -
    • 0 ? "active" : ""}>版本发布
      • -
    • 0 ? "active" : ""}>动态
      • +
    • 0 || urlFlag)? "active" : ""}>代码
      • +
    • 0 ? "active" : ""}>工单{projectDetail&&projectDetail.issues_count===0?"":projectDetail&&projectDetail.issues_count===0?projectDetail.issues_count:""}
      • +
    • 0 ? "active" : ""}>合并请求{projectDetail&&projectDetail.pull_requests_count===0?"":projectDetail&&projectDetail.pull_requests_count===0?projectDetail.pull_requests_count:""}
      • +
    • 0 ? "active" : ""}>版本发布
      • +
    • 0 ? "active" : ""}>动态
      • { isManager && -
    • 0 ? "active" : ""}>仓库设置
      • +
    • 0 ? "active" : ""}>仓库设置
      • }
    @@ -348,55 +346,55 @@ class Detail extends Component{ {/* 新建文件 */} - () } > - () } > {/* 标签列表 */} - () } > {/* 仓库设置 */} - () } > {/* 工单详情 */} - () } > {/* 里程碑 */} - () } > {/* 新建里程碑 */} - () } > {/*里程碑详情*/ } - () } > {/*修改里程碑*/} - () } @@ -405,28 +403,28 @@ class Detail extends Component{ {/* 新建工单 */} - () } > {/* 修改详情 */} - () } > {/* 复制详情 */} - () } > {/* 动态 */} - () } @@ -434,66 +432,66 @@ class Detail extends Component{ {/* 代码Index */} - () } > - () } > - () } > - () } > - () } > - () } > - () } > - () } > - () } > - () } > - () } diff --git a/src/forge/Main/DetailTop.js b/src/forge/Main/DetailTop.js index ddf7aefe6..8ce6096e9 100644 --- a/src/forge/Main/DetailTop.js +++ b/src/forge/Main/DetailTop.js @@ -4,15 +4,15 @@ import { Link} from 'react-router-dom'; class DetailTop extends Component{ render(){ const { projectDetail } = this.props; - const { projectsId } = this.props.match.params; + const { projectsId , author } = this.props.match.params; const { pathname } = this.props.location; return(

    - 0 ? "active" : ""}> + 0 ? "active" : ""}> {projectDetail && projectDetail.commits_count}提交 - 0 ? "active" : ""}> + 0 ? "active" : ""}> {projectDetail && projectDetail.branches_count}分支 diff --git a/src/forge/Main/IndexItem.js b/src/forge/Main/IndexItem.js index 5358a0480..b9b463836 100644 --- a/src/forge/Main/IndexItem.js +++ b/src/forge/Main/IndexItem.js @@ -25,7 +25,7 @@ class IndexItem extends Component{

    {item.description}

    diff --git a/src/forge/Merge/MergeDetail.js b/src/forge/Merge/MergeDetail.js index e7ba1d72f..59dc3205c 100644 --- a/src/forge/Merge/MergeDetail.js +++ b/src/forge/Merge/MergeDetail.js @@ -164,7 +164,7 @@ class MergeDetail extends Component{ }) } render(){ - const { projectsId,mergeid} = this.props.match.params; + const { projectsId , mergeid , author } = this.props.match.params; const { data,journalsdata, showFiles } = this.state; const { getFieldDecorator } = this.props.form; const url = this.props.history.location.pathname; @@ -235,14 +235,14 @@ class MergeDetail extends Component{

    { data && data.issue.subject}

    - 编辑 + 编辑

    { data && data.issue.description}

    @@ -256,8 +256,8 @@ class MergeDetail extends Component{
      -
    • 0? "active" : ""}>对话内容
      • -
    • 0 ? "active" : ""}>代码提交
      • +
    • 0? "active" : ""}>对话内容
      • +
    • 0 ? "active" : ""}>代码提交
    diff --git a/src/forge/Merge/MergeItem.js b/src/forge/Merge/MergeItem.js index ea55f1bf4..4a99f99c8 100644 --- a/src/forge/Merge/MergeItem.js +++ b/src/forge/Merge/MergeItem.js @@ -19,7 +19,7 @@ class MergeItem extends Component{ render(){ const { issues , search_count , page , limit } = this.props; - const { projectsId } = this.props.match.params; + const { projectsId , author } = this.props.match.params; const renderList =()=>{ if(issues && issues.length > 0){ return( @@ -29,7 +29,7 @@ class MergeItem extends Component{

    # {search_count - (key + (page-1) * limit)} - {item.name} + {item.name}

    {item.format_time}发布 diff --git a/src/forge/Merge/MergeSubmit.js b/src/forge/Merge/MergeSubmit.js index 95c39cb91..d043261f6 100644 --- a/src/forge/Merge/MergeSubmit.js +++ b/src/forge/Merge/MergeSubmit.js @@ -106,7 +106,7 @@ class MergeSubmit extends Component{ render(){ - const { projectsId,mergeId} = this.props.match.params; + const { projectsId,mergeId , author} = this.props.match.params; const { data,titledata} = this.state; @@ -159,7 +159,7 @@ class MergeSubmit extends Component{

    @@ -179,7 +179,7 @@ class MergeSubmit extends Component{ 由 { data && data.issue.author_name} 于 { data && data.issue.created_at }创建{ data && data.issue.journals_count && data.issue.journals_count > 0 ?` · ${data.issue.journals_count} 条评论`:""} - 编辑 + 编辑

    @@ -188,8 +188,8 @@ class MergeSubmit extends Component{
      -
    • 0? "active" : ""}>对话内容
      • -
    • 0 ? "active" : ""}>代码提交
      • +
    • 0? "active" : ""}>对话内容
      • +
    • 0 ? "active" : ""}>代码提交
    diff --git a/src/forge/Merge/MessageCount.js b/src/forge/Merge/MessageCount.js index 3f4a08f18..909cfa64f 100644 --- a/src/forge/Merge/MessageCount.js +++ b/src/forge/Merge/MessageCount.js @@ -315,7 +315,7 @@ class MessageCount extends Component{ } render(){ - const { projectsId,mergeId} = this.props.match.params; + const { projectsId,mergeId , author } = this.props.match.params; const { data,journalsdata, page, limit, search_count, isSpin, isedit, showFiles } = this.state; const { getFieldDecorator } = this.props.form; const { current_user } = this.props; @@ -411,7 +411,7 @@ class MessageCount extends Component{
    @@ -431,7 +431,7 @@ class MessageCount extends Component{ 由 { data && data.issue.author_name} 于 { data && data.issue.created_at }创建{ data && data.issue.journals_count && data.issue.journals_count > 0 ?` · ${data.issue.journals_count} 条评论`:""} - 编辑 + 编辑

    @@ -445,8 +445,8 @@ class MessageCount extends Component{
      -
    • 0? "active" : ""}>对话内容
      • -
    • 0 ? "active" : ""}>代码提交
      • +
    • 0? "active" : ""}>对话内容
      • +
    • 0 ? "active" : ""}>代码提交
    diff --git a/src/forge/Merge/NewMerge.js b/src/forge/Merge/NewMerge.js index a9c27611a..a57ec1a06 100644 --- a/src/forge/Merge/NewMerge.js +++ b/src/forge/Merge/NewMerge.js @@ -139,7 +139,7 @@ class NewMerge extends Component{ submit=()=>{ this.props.form.validateFieldsAndScroll((err, values) => { if(!err){ - const { projectsId } = this.props.match.params; + const { projectsId , author } = this.props.match.params; const url = `/projects/${projectsId}/pull_requests.json`; if(values.issue_tag_ids.length > 0){ @@ -156,7 +156,7 @@ class NewMerge extends Component{ }).then(result=>{ if(result){ - this.props.history.push(`/projects/${projectsId}/merge`); + this.props.history.push(`/projects/${projectsId}/${author}/merge`); } }).catch(error=>{ @@ -224,7 +224,7 @@ class NewMerge extends Component{ render(){ const { getFieldDecorator } = this.props.form; - const { projectsId } = this.props.match.params; + const { projectsId , author } = this.props.match.params; const { current_user } = this.props; const { issue_tag_ids , fixed_version_id ,assigned_to_id ,issue_chosen,data,titledata} = this.state; @@ -277,7 +277,7 @@ class NewMerge extends Component{ if(this.state.mergedata&&this.state.mergedata.status===-2){ return(
    - 在这些分支直接合并请求已经存在：{this.state.mergedata&&this.state.mergedata.pull_request_name} + 在这些分支直接合并请求已经存在：{this.state.mergedata&&this.state.mergedata.pull_request_name}
    ) }else{ diff --git a/src/forge/Merge/UpdateMerge.js b/src/forge/Merge/UpdateMerge.js index b2501c23b..1c01f3e6a 100644 --- a/src/forge/Merge/UpdateMerge.js +++ b/src/forge/Merge/UpdateMerge.js @@ -134,7 +134,7 @@ class UpdateMerge extends Component{ const { fileList } = this.state; this.props.form.validateFieldsAndScroll((err, values) => { if(!err){ - const { projectsId,mergeId} = this.props.match.params; + const { projectsId , mergeId , author } = this.props.match.params; const { subject ,data} = this.state; const url = `/projects/${projectsId}/pull_requests/${mergeId}.json`; @@ -155,7 +155,7 @@ class UpdateMerge extends Component{ ...values }).then(result=>{ if(result){ - this.props.history.push(`/projects/${projectsId}/merge`); + this.props.history.push(`/projects/${projectsId}/${author}/merge`); } }).catch(error=>{ console.log(error); @@ -167,7 +167,7 @@ class UpdateMerge extends Component{ render(){ - const { projectsId,mergeId } = this.props.match.params; + const { projectsId , mergeId , author } = this.props.match.params; const { getFieldDecorator } = this.props.form; const { current_user } = this.props; const { issue_tag_ids , fixed_version_id , branch_name , status_id , tracker_id , issue_type ,assigned_to_id , priority_id , done_ratio, @@ -210,7 +210,7 @@ class UpdateMerge extends Component{ }

    保存 - 取消 + 取消

    diff --git a/src/forge/Merge/merge.js b/src/forge/Merge/merge.js index 37ba70162..eba3399bf 100644 --- a/src/forge/Merge/merge.js +++ b/src/forge/Merge/merge.js @@ -225,7 +225,7 @@ class merge extends Component{ render(){ const { issue_chosen , issues , limit , page , search_count , data , isSpin,openselect,closeselect } = this.state; - const { projectsId } = this.props.match.params; + const { projectsId , author } = this.props.match.params; const menu = ( this.arrayList(e)}> @@ -250,7 +250,7 @@ class merge extends Component{

    diff --git a/src/forge/New/Index.js b/src/forge/New/Index.js index 75b9211ca..a8c6bec10 100644 --- a/src/forge/New/Index.js +++ b/src/forge/New/Index.js @@ -114,7 +114,7 @@ class Index extends Component{ isSpin:false }) this.props.showNotification(`${projectsType === "deposit" ? "托管" :"镜像"}项目创建成功!`); - this.props.history.push(`/projects/${result.data.identifier}/coder`); + this.props.history.push(`/projects/${result.data.identifier}/${current_user && current_user.login}/coder`); } } }).catch((error)=>{ diff --git a/src/forge/Newfile/UserSubmitComponent.js b/src/forge/Newfile/UserSubmitComponent.js index 3f4716b18..bb667f4f0 100644 --- a/src/forge/Newfile/UserSubmitComponent.js +++ b/src/forge/Newfile/UserSubmitComponent.js @@ -23,7 +23,7 @@ class UserSubmitComponent extends Component{ // 提交变更 subMitFrom=()=>{ const { current_user , filepath , content } = this.props; - const { branch , projectsId } = this.props.match.params; + const { branch , projectsId , author } = this.props.match.params; const { submitType } = this.state; let path = filepath.substr(1); this.props.form.validateFieldsAndScroll((err, values) => { @@ -37,7 +37,7 @@ class UserSubmitComponent extends Component{ message:values.desc }).then((result)=>{ if(result && result.data.name){ - this.props.history.push(`/projects/${projectsId}/coder`); + this.props.history.push(`/projects/${projectsId}/${author}/coder`); } }).catch(error=>{ console.log(error); diff --git a/src/forge/Order/CopyDetail.js b/src/forge/Order/CopyDetail.js index d6d5a076f..3a31c3dd0 100644 --- a/src/forge/Order/CopyDetail.js +++ b/src/forge/Order/CopyDetail.js @@ -109,7 +109,7 @@ class CopyDetail extends Component{ //删除工单 deleteorder=(id)=>{ - const { projectsId , orderId} = this.props.match.params; + const { projectsId , orderId , author} = this.props.match.params; const url = `/projects/${projectsId}/issues/${orderId}.json`; axios.delete(url,{ data: { project_id: projectsId, @@ -117,7 +117,7 @@ class CopyDetail extends Component{ } }).then((result)=>{ if(result){ - this.props.history.push(`/projects/${projectsId}/orders`); + this.props.history.push(`/projects/${projectsId}/${author}/orders`); } }).catch((error)=>{ console.log(error); @@ -157,9 +157,9 @@ class CopyDetail extends Component{ const { fileList } = this.state; this.props.form.validateFieldsAndScroll((err, values) => { if(!err){ - const { projectsId,orderId} = this.props.match.params; + const { projectsId , orderId , author } = this.props.match.params; const { subject } = this.state; - const url = `/projects/${projectsId}/issues/${orderId}.json`; + const url = `/projects/${projectsId}/${author}/issues/${orderId}.json`; if(values.issue_tag_ids===0){ values.issue_tag_ids = "" }else{ @@ -185,7 +185,7 @@ class CopyDetail extends Component{ ...values }).then(result=>{ if(result){ - this.props.history.push(`/projects/${projectsId}/orders`); + this.props.history.push(`/projects/${projectsId}/${author}/orders`); } }).catch(error=>{ console.log(error); @@ -197,7 +197,7 @@ class CopyDetail extends Component{ render(){ - const { projectsId,orderId } = this.props.match.params; + const { projectsId , orderId , author } = this.props.match.params; const { getFieldDecorator } = this.props.form; const { current_user } = this.props; const { issue_tag_ids , fixed_version_id , branch_name , status_id , tracker_id , issue_type ,assigned_to_id , priority_id , done_ratio, @@ -259,7 +259,7 @@ class CopyDetail extends Component{

    保存 - 取消

    diff --git a/src/forge/Order/Detail.js b/src/forge/Order/Detail.js index 98bf2b974..f915dbe5b 100644 --- a/src/forge/Order/Detail.js +++ b/src/forge/Order/Detail.js @@ -144,7 +144,7 @@ class Detail extends Component{ //删除工单信息 deletedetail=(id)=>{ - const { projectsId , orderId} = this.props.match.params; + const { projectsId , orderId , author } = this.props.match.params; const url = `/projects/${projectsId}/issues/${orderId}.json`; axios.delete(url,{ data: { project_id: projectsId, @@ -152,7 +152,7 @@ class Detail extends Component{ } }).then((result)=>{ if(result){ - this.props.history.push(`/projects/${projectsId}/orders`); + this.props.history.push(`/projects/${projectsId}/${author}/orders`); } }).catch((error)=>{ console.log(error); @@ -269,14 +269,14 @@ class Detail extends Component{ //复制 copydetail=()=>{ - const {projectsId,orderId} = this.props.match.params; + const {projectsId , orderId , author} = this.props.match.params; const url = `/projects/${projectsId}/issues/${orderId}/copy.json`; axios.post(url,{ project_id:projectsId, id:orderId, }).then(result=>{ if(result){ - this.props.history.push(`/projects/${projectsId}/orders/${result.data.issue_id}/copyetail`); + this.props.history.push(`/projects/${projectsId}/${author}/orders/${result.data.issue_id}/copyetail`); } }).catch(error=>{ console.log(error); @@ -329,7 +329,7 @@ class Detail extends Component{ }; render(){ - const { projectsId,orderId} = this.props.match.params; + const { projectsId , orderId , author} = this.props.match.params; const { data,journalsdata, page, limit, search_count, isSpin, isedit, showFiles , quillValue , quillFlag } = this.state; const { current_user } = this.props; const Paginations = ( @@ -422,7 +422,7 @@ class Detail extends Component{
    @@ -449,7 +449,7 @@ class Detail extends Component{ 删除 - 编辑 + 编辑 : "" diff --git a/src/forge/Order/Milepost.js b/src/forge/Order/Milepost.js index c5639f257..c644f1579 100644 --- a/src/forge/Order/Milepost.js +++ b/src/forge/Order/Milepost.js @@ -146,7 +146,7 @@ class Milepost extends Component{ render(){ const { data , limit , page,openselect,closeselect } = this.state; - const { projectsId } = this.props.match.params; + const { projectsId , author } = this.props.match.params; const menu = ( 到期日从近到远 @@ -181,7 +181,7 @@ class Milepost extends Component{
    - {item.name} + {item.name}
    @@ -217,7 +217,7 @@ class Milepost extends Component{
    - 编辑 + 编辑
    @@ -264,7 +264,7 @@ class Milepost extends Component{
    diff --git a/src/forge/Order/UpdateMilepost.js b/src/forge/Order/UpdateMilepost.js index 3dc93f8a9..f1fe9de48 100644 --- a/src/forge/Order/UpdateMilepost.js +++ b/src/forge/Order/UpdateMilepost.js @@ -68,7 +68,7 @@ class UpdateMilepost extends Component{ submit=()=>{ this.props.form.validateFieldsAndScroll((err, values) => { if(!err){ - const { projectsId } = this.props.match.params; + const { projectsId , author } = this.props.match.params; const { meilid } = this.props.match.params; const url = `/projects/${projectsId}/versions/${meilid}.json`; let time=undefined; @@ -85,7 +85,7 @@ class UpdateMilepost extends Component{ status:'open' }).then(result=>{ if(result){ - this.props.history.push(`/projects/${projectsId}/orders/Milepost`); + this.props.history.push(`/projects/${projectsId}/${author}/orders/Milepost`); } diff --git a/src/forge/Order/newMilepost.js b/src/forge/Order/newMilepost.js index 2b97ad4e7..4a283fa95 100644 --- a/src/forge/Order/newMilepost.js +++ b/src/forge/Order/newMilepost.js @@ -40,7 +40,7 @@ class NewMilepost extends Component{ submit=()=>{ this.props.form.validateFieldsAndScroll((err, values) => { if(!err){ - const { projectsId } = this.props.match.params; + const { projectsId , author } = this.props.match.params; const url = `/projects/${projectsId}/versions`; let time=undefined; if(this.state.selectedValue===undefined){ @@ -56,7 +56,7 @@ class NewMilepost extends Component{ status:'open' }).then(result=>{ if(result){ - this.props.history.push(`/projects/${projectsId}/orders/Milepost`); + this.props.history.push(`/projects/${projectsId}/${author}/orders/Milepost`); } }).catch(error=>{ diff --git a/src/forge/Order/order.js b/src/forge/Order/order.js index ed598c927..8ff9ba675 100644 --- a/src/forge/Order/order.js +++ b/src/forge/Order/order.js @@ -311,7 +311,7 @@ class order extends Component{ render(){ const { issue_chosen , issues , limit , page , search_count , data , assigned_to_id , author_id , isSpin,openselect,closeselect } = this.state; - const { projectsId } = this.props.match.params; + const { projectsId , author } = this.props.match.params; const menu = ( this.getOption(e)}> @@ -338,7 +338,7 @@ class order extends Component{