diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 46e68133c..61518ea7d 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,7 +2,8 @@ - + + + + + + @@ -262,6 +302,11 @@ + + + + + - - - + - + @@ -328,8 +374,8 @@ - - + + @@ -391,40 +437,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -501,44 +513,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -549,25 +523,6 @@ - - - - - - - - - - - - - - - - - - - @@ -578,17 +533,6 @@ - - - - - - - - - - - @@ -596,46 +540,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -650,16 +554,6 @@ - - - - - - - - - - @@ -674,23 +568,6 @@ - - - - - - - - - - - - - - - - - @@ -698,56 +575,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -757,7 +587,7 @@ - + @@ -767,7 +597,7 @@ - + @@ -775,51 +605,51 @@ + + + + + + + + + + - + - - - - - - - - - - - - + + - + - - + + - + - - + + - + - - + + @@ -828,8 +658,231 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/forge/Activity/Activity.js b/src/forge/Activity/Activity.js index 4ff058e01..aa19a8913 100644 --- a/src/forge/Activity/Activity.js +++ b/src/forge/Activity/Activity.js @@ -138,25 +138,25 @@ class Activity extends Component{

- {data && data.issues_count}工单 + {data && data.issues_count}任务
  • {data && data.pr_count} - this.changeTrends("PullRequest","close")}>已合并请求 + this.changeTrends("PullRequest","close")}>已处理的合并请求
  • {data && data.new_pr_count} - this.changeTrends("PullRequest","create")}>新合并请求 + this.changeTrends("PullRequest","create")}>未处理的合并请求
  • {data && data.close_issues_count} - this.changeTrends("Issue","close")}>已关闭工单 + this.changeTrends("Issue","close")}>已关闭的任务
  • {data && data.open_issues_count} - this.changeTrends("Issue","create")}>创建的工单 + this.changeTrends("Issue","create")}>未处理的任务
diff --git a/src/forge/Activity/ActivityItem.js b/src/forge/Activity/ActivityItem.js index dfecf1c9a..2d75889b1 100644 --- a/src/forge/Activity/ActivityItem.js +++ b/src/forge/Activity/ActivityItem.js @@ -18,7 +18,7 @@ class ActivityItem extends Component{ {item.trend_type}

: - // 如果是工单 + // 如果是任务 item.trend_type==="Issue"? {item.name} diff --git a/src/forge/Images/milepost.png b/src/forge/Images/milepost.png new file mode 100644 index 000000000..d6f7fc8a0 Binary files /dev/null and b/src/forge/Images/milepost.png differ diff --git a/src/forge/Main/CoderRootDirectory.js b/src/forge/Main/CoderRootDirectory.js index 78fee33c4..d6fd4e87b 100644 --- a/src/forge/Main/CoderRootDirectory.js +++ b/src/forge/Main/CoderRootDirectory.js @@ -238,9 +238,10 @@ class CoderRootDirectory extends Component{ :"" } - {truncateCommitId(branchLastCommit.last_commit.id)} + {/*{truncateCommitId(branchLastCommit.last_commit.id)}*/} {branchLastCommit.last_commit.message} + {truncateCommitId(branchLastCommit.last_commit.id)} {branchLastCommit.last_commit.time_from_now} ) diff --git a/src/forge/Main/Detail.js b/src/forge/Main/Detail.js index cd5cc8f31..c07a7ffac 100644 --- a/src/forge/Main/Detail.js +++ b/src/forge/Main/Detail.js @@ -21,6 +21,7 @@ import img_focus from '../Images/focus.png'; import img_parised from '../Images/parised.png'; import img_focused from '../Images/focused.png'; import img_fork from '../Images/fork.png'; +import img_milepost from '../Images/milepost.png'; const FileNew = Loadable({ loader: () => import('../Newfile/Index'), loading: Loading, @@ -292,7 +293,7 @@ class Detail extends Component{
-
+

{ projectDetail && projectDetail.forked_from_project_id ? @@ -311,7 +312,7 @@ class Detail extends Component{ { projectDetail && projectDetail.forked_from_project_id && projectDetail.fork_info ?

- Forked from + forked from {projectDetail.fork_info.fork_project_user_name} / @@ -326,15 +327,17 @@ class Detail extends Component{
    -
  • -1 || urlFlag) ? "active" : ""}>代码
    • -
  • -1 ? "active" : ""}>工单{projectDetail&&projectDetail.issues_count===0?"":projectDetail&&projectDetail.issues_count===0?projectDetail.issues_count:""}
    • +
  • -1 || urlFlag) ? "active" : ""}>代码库
    • +
  • -1 && !(url.indexOf("Milepost")>0 || url.indexOf("meilpost")>0 || url.indexOf("tags")>0))? "active" : ""}>任务{projectDetail&&projectDetail.issues_count===0?"":projectDetail&&projectDetail.issues_count===0?projectDetail.issues_count:""}
  • -1 ? "active" : ""}>合并请求{projectDetail&&projectDetail.pull_requests_count===0?"":projectDetail&&projectDetail.pull_requests_count===0?projectDetail.pull_requests_count:""}
  • -1 ? "active" : ""}>版本发布
  • -1 ? "active" : ""}>动态
    • +
  • -1 || url.indexOf("meilpost")>-1) ? "active" : ""}>里程碑
    • { isManager &&
  • 0 ? "active" : ""}>仓库设置
    • } +
@@ -386,7 +389,7 @@ class Detail extends Component{ (props) => () } > - {/* 工单详情 */} + {/* 任务详情 */} () @@ -418,7 +421,7 @@ class Detail extends Component{ > - {/* 新建工单 */} + {/* 新建任务 */} { const {projectsId,orderId} = this.props.match.params; const url = `/projects/${projectsId}/issues/${orderId}/close_issue.json`; @@ -233,15 +233,15 @@ class MergeDetail extends Component{ return(
-
-
*/}

diff --git a/src/forge/Merge/MessageCount.js b/src/forge/Merge/MessageCount.js index 60743728f..a0942179f 100644 --- a/src/forge/Merge/MessageCount.js +++ b/src/forge/Merge/MessageCount.js @@ -156,7 +156,7 @@ class MessageCount extends Component{ } - //关闭工单 + //关闭任务 closedetail=(id)=>{ const {projectsId,orderId} = this.props.match.params; const {data } = this.state; @@ -484,14 +484,14 @@ class MessageCount extends Component{ return(

-
-
+ {/*
*/} + {/*
*/}
{ diff --git a/src/forge/Merge/UpdateMerge.js b/src/forge/Merge/UpdateMerge.js index c5708fcde..cb4a04d54 100644 --- a/src/forge/Merge/UpdateMerge.js +++ b/src/forge/Merge/UpdateMerge.js @@ -195,9 +195,9 @@ class UpdateMerge extends Component{ const { issue_tag_ids , fixed_version_id , assigned_to_id , issue_chosen , subject, textcount,get_attachments } = this.state; return(
-
-
+ {/*
*/} + {/*
*/}
@@ -207,7 +207,7 @@ class UpdateMerge extends Component{ {getFieldDecorator('title', { rules: [{ - required: true, message: '请填写工单标题' + required: true, message: '请填写任务标题' }], initialValue: subject })( @@ -219,7 +219,7 @@ class UpdateMerge extends Component{ rules: [], initialValue: textcount })( -