diff --git a/public/react/src/forge/Index.js b/public/react/src/forge/Index.js index 158be3e42..437867a48 100644 --- a/public/react/src/forge/Index.js +++ b/public/react/src/forge/Index.js @@ -67,7 +67,7 @@ class Index extends Component{ > () + (props) => () } > { - this.getUserInfo(); - //this.getDetail(); + // this.getUserInfo(); + this.getDetail(); } // componentDidUpdate=(provState)=>{ diff --git a/public/react/src/forge/Merge/merge.js b/public/react/src/forge/Merge/merge.js index f6e5a6371..2baa32603 100644 --- a/public/react/src/forge/Merge/merge.js +++ b/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 = ( - - 到期日从近到远 - 到期日从远到近 - 完成度从低到高 - 完成度从高到低 + this.arrayList(e)}> + 最新创建 + 最早创建 + 最新更新 + 最早更新 ) @@ -272,8 +272,8 @@ class merge extends Component{
  • - - {this.state.issue_versions} + + {this.state.fixed_version_ids}