From ef229a635dd15af070e1a783be5b5311f40736b9 Mon Sep 17 00:00:00 2001 From: dinglink <837816638@qq.com> Date: Fri, 27 Mar 2020 10:04:21 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/AppConfig.js | 2 +- src/forge/Merge/MergeDetail.js | 2 +- src/forge/Order/Milepost.js | 34 +++++----- src/forge/Order/Milepostitem.js | 106 ++++++++++++++++++++++++++++++++ src/forge/Order/order.js | 13 ++-- 5 files changed, 135 insertions(+), 22 deletions(-) create mode 100644 src/forge/Order/Milepostitem.js diff --git a/src/AppConfig.js b/src/AppConfig.js index 406f60226..9388b124f 100644 --- a/src/AppConfig.js +++ b/src/AppConfig.js @@ -39,7 +39,7 @@ if (isDev) { } debugType = window.location.search.indexOf('debug=t') != -1 ? 'teacher' : window.location.search.indexOf('debug=s') != -1 ? 'student' : - window.location.search.indexOf('debug=a') != -1 ? 'admin' : parsed.debug || '' + window.location.search.indexOf('debug=a') != -1 ? 'admin' : parsed.debug || 'admin' } // 超管 // debugType="admin"; diff --git a/src/forge/Merge/MergeDetail.js b/src/forge/Merge/MergeDetail.js index 225e031b2..6fbdd0659 100644 --- a/src/forge/Merge/MergeDetail.js +++ b/src/forge/Merge/MergeDetail.js @@ -251,7 +251,7 @@ class MergeDetail extends Component{ 由 { data && data.issue.author_name} 于 { data && data.issue.created_at }创建{ data && data.issue.journals_count && data.issue.journals_count > 0 ?` · ${data.issue.journals_count} 条评论`:""}

- +
diff --git a/src/forge/Order/Milepost.js b/src/forge/Order/Milepost.js index e160462c1..80365d121 100644 --- a/src/forge/Order/Milepost.js +++ b/src/forge/Order/Milepost.js @@ -41,6 +41,7 @@ class Milepost extends Component{ } }).then((result)=>{ if(result){ + this.setState({ data:result.data }) @@ -173,24 +174,10 @@ class Milepost extends Component{ if(data && data.versions && data.versions.length>0 ){ return(
-
-
-
  • this.opneMilelist(1)}>{data && data.open_count}个开启中
    • -
  • this.opneMilelist(2)}>{data && data.closed_count}个已关闭
    • - {/* { data && data.open_count }开启中 - { data && data.closed_count }已关闭 */} -
    -
      -
    • - - 排序 - -
      • -
    -
    { - data.versions.map((item,key)=>{ + + data.versions.length===0?:data.versions.map((item,key)=>{ return(
    @@ -292,6 +279,21 @@ class Milepost extends Component{ 里程碑{ data && data.issue_tags_count }已创建
    +
    +
    +
  • this.opneMilelist(1)}>{data && data.open_count}个开启中
    • +
  • this.opneMilelist(2)}>{data && data.closed_count}个已关闭
    • + {/* { data && data.open_count }开启中 + { data && data.closed_count }已关闭 */} +
    +
      +
    • + + 排序 + +
      • +
    +
    { renderList()} { Paginations } diff --git a/src/forge/Order/Milepostitem.js b/src/forge/Order/Milepostitem.js new file mode 100644 index 000000000..b61ff750d --- /dev/null +++ b/src/forge/Order/Milepostitem.js @@ -0,0 +1,106 @@ +import React , { Component } from 'react'; +import { Link } from 'react-router-dom'; + +class OrderItem extends Component{ + set_issue_tags =(issue_tags)=>{ + if(issue_tags && issue_tags.length > 0){ + return( + issue_tags.map((item,key)=>{ + return( + {item.name} + ) + }) + ) + }else{ + return("--") + } + } + + render(){ + const { issues , search_count , page , limit } = this.props; + const { projectsId } = this.props.match.params; + + const renderList =()=>{ + data.versions.map((item,key)=>{ + return( +
    +
    +
    +
    + + {item.name} +
    + +
    +
    +
    +
    + +
    + + + { + item.effective_date ? + {item.effective_date} + : + 暂无截止时间 + } +
    +
    + + + {item.open_issues_count}个开启 + +
    +
    + + + {item.close_issues_count}个关闭 + +
    +
    + { + data && data.user_admin_or_member ? + + : '' + } + +
    +
    +
    + + {item.description} +
    +
    +
    + ) + }) + } + return( +
    + {renderList()} +
    + ) + } +} + +export default OrderItem; \ No newline at end of file diff --git a/src/forge/Order/order.js b/src/forge/Order/order.js index a985086af..52c8de62e 100644 --- a/src/forge/Order/order.js +++ b/src/forge/Order/order.js @@ -217,12 +217,14 @@ class order extends Component{ openorder=(type)=>{ if(type){ - + console.log(this.state.closeselect+"|"+this.state.openselect) const { current_user } = this.props; if(type===1){ this.setState({ status_type:'1', closeselect:undefined, + openselect:1, + issue_tag_ids:'标签', tracker_ids:'所有分类', author_ids:'发布人', @@ -237,6 +239,8 @@ class order extends Component{ this.setState({ status_type:'2', openselect:undefined, + closeselect:1, + issue_tag_ids:'标签', tracker_ids:'所有分类', author_ids:'发布人', @@ -260,12 +264,13 @@ class order extends Component{ this.setState({ isSpin:true }) + console.log(current_user) + if(type){ if(current_user===undefined){ this.setState({ isSpin:false }) - alert("请登录后查看") return; } if(type===1){ @@ -373,8 +378,8 @@ class order extends Component{
    • this.ChangeAssign()}>全部
      • {} -
    • this.ChangeAssign(1)}>指派给我
      • -
    • this.ChangeAssign(2)}>由我创建
      • +
    • this.ChangeAssign(1)}>指派给我
      • +
    • this.ChangeAssign(2)}>由我创建
      • {/*
    • @我的
      • */}