pr排序

public/react/src/forge/Index.js

@@ -67,7 +67,7 @@ class Index extends Component{
         ></Route>
         <Route path="/projects/:projectsId"
           render={
-            (props) => (<ProjectDetail {...this.props} {...props} {...this.state} current_user={current_user}/>)
+            (props) => (<ProjectDetail {...this.props} {...props} {...this.state} />)
           }
         ></Route>
         <Route exact path="/projects"

public/react/src/forge/Main/Detail.js

@@ -161,8 +161,8 @@ class Detail extends Component{
 
 
   componentDidMount=()=>{
-     this.getUserInfo();
+    // this.getUserInfo();
-    //this.getDetail();
+    this.getDetail();
   }
 
   // componentDidUpdate=(provState)=>{

public/react/src/forge/Merge/merge.js

@@ -44,7 +44,7 @@ class merge extends Component{
       openselect:1,
       closeselect:undefined,
       issue_tag_ids:'标签筛选',
-      issue_versions:'里程碑筛选',
+      fixed_version_ids:'里程碑筛选',
       assigned_to_ids:'指派人筛选',
       paix:'排序'
 
@@ -101,10 +101,10 @@ class merge extends Component{
         issue_tag_ids:name
       })
     }
-    if(id+'s'==="issue_versions"){
+    if(id+'s'==="fixed_version_ids"){
       this.setState({
         [id]:e.key,
-        issue_versions:name 
+        fixed_version_ids:name 
       })
     }
     if(id+'s'==="assigned_to_ids"){
@@ -220,11 +220,11 @@ class merge extends Component{
     const { projectsId } = this.props.match.params;
 
     const menu = (
-      <Menu onClick={this.arrayList}>
+      <Menu onClick={(e)=>this.arrayList(e)}>
-        <Menu.Item key={'created_on'} value="desc">到期日从近到远</Menu.Item>
+        <Menu.Item key={'created_on'} value="desc">最新创建</Menu.Item>
-        <Menu.Item key={'created_on'} value="asc">到期日从远到近</Menu.Item>
+        <Menu.Item key={'created_on'} value="asc">最早创建</Menu.Item>
-        <Menu.Item key={'updated_on'} value="desc">完成度从低到高</Menu.Item>
+        <Menu.Item key={'updated_on'} value="desc">最新更新</Menu.Item>
-        <Menu.Item key={'updated_on'} value="asc">完成度从高到低</Menu.Item>
+        <Menu.Item key={'updated_on'} value="asc">最早更新</Menu.Item>
       </Menu>
     )
 
@@ -272,8 +272,8 @@ class merge extends Component{
                 </Dropdown>
               </li>
               <li>
-                <Dropdown className="topWrapperSelect" overlay={this.renderMenu(issue_chosen && issue_chosen.issue_version,'里程碑','issue_version')} trigger={['click']} placement="bottomCenter">
+                <Dropdown className="topWrapperSelect" overlay={this.renderMenu(issue_chosen && issue_chosen.issue_version,'里程碑','fixed_version_id')} trigger={['click']} placement="bottomCenter">
-                  <span>{this.state.issue_versions}<Icon type="caret-down" className="ml5" /></span>
+                  <span>{this.state.fixed_version_ids}<Icon type="caret-down" className="ml5" /></span>
                 </Dropdown>
               </li>
               <li>