From 14ff9e24b4f61cfd4689651ce1f6111e15739d03 Mon Sep 17 00:00:00 2001
From: "sylor_huang@126.com" <sylor_huang@126.com>
Date: Mon, 27 Apr 2020 18:49:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=8E=E9=87=8C=E7=A8=8B?=
 =?UTF-8?q?=E7=A2=91=E6=96=B0=E5=BB=BA=E5=B7=A5=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/Main/Detail.js          |  7 ++++++-
 src/forge/Merge/MergeItem.js      |  2 +-
 src/forge/Order/MilepostDetail.js |  2 +-
 src/forge/Order/New.js            | 17 +++++++++++++++--
 src/forge/Order/OrderItem.js      |  2 +-
 src/forge/Order/order.css         |  7 ++++---
 6 files changed, 28 insertions(+), 9 deletions(-)

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{
             ></Route>
 
 
+            {/* 里程碑页面新建任务 */}
+            <Route path="/projects/:projectsId/orders/:milepostId/new"
+              render={
+                (props) => (<OrderNew {...this.props} {...props} {...this.state}/>)
+              }
+            ></Route>
             {/* 新建任务 */}
-
             <Route path="/projects/:projectsId/orders/new"
               render={
                 (props) => (<OrderNew {...this.props} {...props} {...this.state}/>)
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{
                     }
                   </p>
                 </div>
-                  <ul className="topWrapper_select" onMouseMove={()=>this.onMouseMove(item.id)} onMouseOut={()=>this.onMouseOut()}>
+                  <ul className="topWrapper_select no-cursor" onMouseMove={()=>this.onMouseMove(item.id)} onMouseOut={()=>this.onMouseOut()}>
                   <li>{this.set_issue_tags(item.issue_tags)}</li>
                   {/*<li>{item.issue_type || "--"}</li>*/}
                   <li>{item.version || "--"}</li>
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{
           <p>{data&&data.name}</p>
           <div className="milepostdiv">
           <Link to={`/projects/${projectsId}/orders/${meilid}/meilpost`} className="topWrapper_btn" style={{marginRight:15}} >编辑里程碑</Link>
-          <Link to={`/projects/${projectsId}/orders/new`} className="topWrapper_btn">创建任务</Link>
+          <Link to={`/projects/${projectsId}/orders/${meilid}/new`} className="topWrapper_btn">创建任务</Link>
           </div>
         </div>
         <div className="grid-item mr10">
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: [],
+
                   })(
-                    <Select value={fixed_version_id}>
+                    <Select>
                       <Option value={""}>{issue_chosen && issue_chosen.issue_version.length > 0 ? '未选择里程碑': '请添加里程碑'}</Option>
                       { this.renderSelect(issue_chosen && issue_chosen.issue_version) }
                     </Select>
diff --git a/src/forge/Order/OrderItem.js b/src/forge/Order/OrderItem.js
index 26fbc0c7d..63e8f4aaa 100644
--- a/src/forge/Order/OrderItem.js
+++ b/src/forge/Order/OrderItem.js
@@ -70,7 +70,7 @@ class OrderItem extends Component{
                     }
                   </p>
                 </div>
-                <ul className="topWrapper_select" onMouseMove={()=>this.onMouseMove(item.id)} onMouseOut={()=>this.onMouseOut()} >
+                <ul className="topWrapper_select no-cursor" onMouseMove={()=>this.onMouseMove(item.id)} onMouseOut={()=>this.onMouseOut()} >
                   <li>{this.set_issue_tags(item.issue_tags)}</li>
                   {/*<li>{item.issue_type || "--"}</li>*/}
                   <li>{item.tracker || "--"}</li>
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;