diff --git a/src/forge/Main/Detail.js b/src/forge/Main/Detail.js
index 401c9e65d..49a98b93d 100644
--- a/src/forge/Main/Detail.js
+++ b/src/forge/Main/Detail.js
@@ -439,8 +439,13 @@ class Detail extends Component{
>
+ {/* 里程碑页面新建任务 */}
+ ()
+ }
+ >
{/* 新建任务 */}
-
()
diff --git a/src/forge/Merge/MergeItem.js b/src/forge/Merge/MergeItem.js
index 1abefe4b7..1a7ff3a1d 100644
--- a/src/forge/Merge/MergeItem.js
+++ b/src/forge/Merge/MergeItem.js
@@ -64,7 +64,7 @@ class MergeItem extends Component{
}
- this.onMouseMove(item.id)} onMouseOut={()=>this.onMouseOut()}>
+ this.onMouseMove(item.id)} onMouseOut={()=>this.onMouseOut()}>
- {this.set_issue_tags(item.issue_tags)}
{/*- {item.issue_type || "--"}
*/}
- {item.version || "--"}
diff --git a/src/forge/Order/MilepostDetail.js b/src/forge/Order/MilepostDetail.js
index 884ef2d98..b6c624301 100644
--- a/src/forge/Order/MilepostDetail.js
+++ b/src/forge/Order/MilepostDetail.js
@@ -287,7 +287,7 @@ class MilepostDetail extends Component{
{data&&data.name}
编辑里程碑
- 创建任务
+ 创建任务
diff --git a/src/forge/Order/New.js b/src/forge/Order/New.js
index b9644ccb9..be83b0f8c 100644
--- a/src/forge/Order/New.js
+++ b/src/forge/Order/New.js
@@ -56,7 +56,19 @@ class New extends Component{
}
getSelectList=()=>{
- const { projectsId } = this.props.match.params;
+ let projectsId = ""
+ if(this.props.match.params.milepostId){
+ projectsId = this.props.match.params.projectsId;
+ this.props.form.setFieldsValue({
+ fixed_version_id: this.props.match.params.milepostId
+ });
+ // this.setState({
+ // fixed_version_id: this.props.match.params.milepostId
+ // })
+ }else{
+ projectsId = this.props.match.params.projectsId;
+ }
+
const url = `/projects/${projectsId}/issues/new.json`;
axios.get(url).then((result)=>{
if(result){
@@ -222,8 +234,9 @@ class New extends Component{
>
{getFieldDecorator('fixed_version_id', {
rules: [],
+
})(
-
- this.onMouseMove(item.id)} onMouseOut={()=>this.onMouseOut()} >
+ this.onMouseMove(item.id)} onMouseOut={()=>this.onMouseOut()} >
- {this.set_issue_tags(item.issue_tags)}
{/*- {item.issue_type || "--"}
*/}
- {item.tracker || "--"}
diff --git a/src/forge/Order/order.css b/src/forge/Order/order.css
index 21898e86c..699098e0e 100644
--- a/src/forge/Order/order.css
+++ b/src/forge/Order/order.css
@@ -175,7 +175,7 @@
}
.topWrapper_select li{
text-align: center;
- /* cursor: pointer; */
+ cursor: pointer;
color: #666;
width:90px;
text-align: center;
@@ -185,10 +185,11 @@
-o-text-overflow: ellipsis;
text-overflow: ellipsis;
}
-/* .topWrapper_select li:active{
+.topWrapper_select li:active{
background: #f4f4f4;
border-radius: 4px;
-} */
+}
+.no-cursor li{cursor: default !important;}
.ant-dropdown-menu .ant-dropdown-menu-item{
text-align: center;
padding:6px 30px;