diff --git a/src/forge/Main/IndexItem.js b/src/forge/Main/IndexItem.js index 0b38a7186..e803d54c5 100644 --- a/src/forge/Main/IndexItem.js +++ b/src/forge/Main/IndexItem.js @@ -34,13 +34,14 @@ class IndexItem extends Component { : "" } { - item.type && item.type !==0 && item.type ==2 ? + item.type && item.type !==0 ? + item.type ==2? : - + :"" } { diff --git a/src/forge/Merge/merge.js b/src/forge/Merge/merge.js index 37124417b..47104e400 100644 --- a/src/forge/Merge/merge.js +++ b/src/forge/Merge/merge.js @@ -273,7 +273,7 @@ class merge extends Component { return (
-

+

  • this.openorder("1")}>{data && data.open_count ? data.open_count : 0}个开启中
  • this.openorder("2")}>{data && data.close_count ? data.close_count : 0}个已关闭
  • diff --git a/src/forge/Order/Milepost.js b/src/forge/Order/Milepost.js index b8607834b..74b721ea7 100644 --- a/src/forge/Order/Milepost.js +++ b/src/forge/Order/Milepost.js @@ -177,7 +177,6 @@ class Milepost extends Component {
    { - data.versions.length === 0 ? : data.versions.map((item, key) => { return (
    @@ -272,7 +271,7 @@ class Milepost extends Component {
    -
    +
  • this.opneMilelist(1)}>{data && data.open_count}个开启中
  • this.opneMilelist(2)}>{data && data.closed_count}个已关闭
  • diff --git a/src/forge/Order/MilepostDetail.js b/src/forge/Order/MilepostDetail.js index 1b6424326..bba7e0d70 100644 --- a/src/forge/Order/MilepostDetail.js +++ b/src/forge/Order/MilepostDetail.js @@ -42,7 +42,6 @@ class MilepostDetail extends Component { //设置选择高亮 openselect: 1, closeselect: undefined, - // status_type: undefined issue_tag_ids: '标签', tracker_ids: '所有分类', author_ids: '发布人', @@ -279,7 +278,7 @@ class MilepostDetail extends Component { ) return (
    -
    +

    {data && data.name}

    @@ -303,16 +302,12 @@ class MilepostDetail extends Component {
    -
    - {/*

    -

    */} -
    + -
    -
      +
      +
      • this.openorder(1)}>{data && data.open_issues_count}个开启中
      • this.openorder(2)}>{data && data.close_issues_count}个已关闭
      • - {/*
      • @我的
      • */}
      • @@ -320,11 +315,6 @@ class MilepostDetail extends Component { {this.state.issue_tag_ids}
      • - {/*
      • */} - {/**/} - {/*类型*/} - {/**/} - {/*
      • */}
      • {this.state.tracker_ids} @@ -361,7 +351,11 @@ class MilepostDetail extends Component { search_count === 0 ? : - + issues && issues.length>0 && issues.map((item,key)=>{ + return( + + ) + }) } {Paginations} diff --git a/src/forge/Order/OrderItem.js b/src/forge/Order/OrderItem.js index 522639d77..3dd631359 100644 --- a/src/forge/Order/OrderItem.js +++ b/src/forge/Order/OrderItem.js @@ -44,7 +44,7 @@ class OrderItem extends Component { }) } render() { - const { item, key, checkbox } = this.props; + const { item, key, checkbox , mile } = this.props; const { projectsId } = this.props.match.params; const { current_user } = this.props @@ -55,8 +55,8 @@ class OrderItem extends Component { {current_user && current_user.login && checkbox}

        - {item.name} - {TagInfo(item.priority,"ml10 mr10")} + {item.name} + {TagInfo(item.priority,"mr10")}

        {item.format_time}发布 @@ -87,7 +87,7 @@ class OrderItem extends Component { }

      • {item.tracker || "--"}
      • -
      • {item.version || "--"}
      • + { !mile ?
      • {item.version || "--"}
      • :""}
      • {item.issue_status || "--"}
      • {item.done_ratio || "--"}
      • diff --git a/src/forge/Order/order.css b/src/forge/Order/order.css index 3791bd8d6..0268962b4 100644 --- a/src/forge/Order/order.css +++ b/src/forge/Order/order.css @@ -139,7 +139,22 @@ line-height: 32px; border-radius: 4px; } -.topWrapper_type { +.topWrapper_type_infos{ + border:1px solid #eee; + border-radius: 3px; + height: 35px; + line-height: 35px; +} +.topWrapper_type_infos li{ + padding:0px 10px; +} +.topWrapper_type_infos li.active{ + color: #4cacff +} +.topWrapper_type_infos li:last-child{ + border-left: 1px solid #eee; +} +.topWrapper_type,.topWrapper_type_infos { display: flex; } .topWrapper_type li {