From 83a120bb8eb99ee6f0e52a2c7d9499216ab1bddc Mon Sep 17 00:00:00 2001 From: caicai8 <1149225589@qq.com> Date: Thu, 27 Feb 2020 13:45:33 +0800 Subject: [PATCH 1/2] null --- public/react/src/forge/Main/NullData.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/public/react/src/forge/Main/NullData.js b/public/react/src/forge/Main/NullData.js index 6e018e35b..a550b5bcc 100644 --- a/public/react/src/forge/Main/NullData.js +++ b/public/react/src/forge/Main/NullData.js @@ -36,8 +36,8 @@ class NullData extends Component { git init
git add README.md
git commit -m "first commit"
- git remote add origin -
+ git remote add origin  + {http_url}
git push -u origin master @@ -48,8 +48,7 @@ class NullData extends Component { 
                             
-                                 git remote add origin 
-                                
                              
+                                git remote add origin {http_url}
                              
                                 git push -u origin master
From 6b3da7d25b8f5326a4269118b4d78457de11ecfa Mon Sep 17 00:00:00 2001 From: dingyongkang <837816638@qq.com> Date: Thu, 27 Feb 2020 15:18:19 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=87=8C=E7=A8=8B=E7=A2=91=E9=A2=84?= =?UTF-8?q?=E8=A7=88=E7=9A=84=E4=BF=AE=E6=94=B9=20=E5=8F=8A=E9=83=A8?= =?UTF-8?q?=E5=88=86bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/forge/Order/Milepost.js | 20 +-- .../react/src/forge/Order/MilepostDetail.js | 139 +++++++++++++++--- public/react/src/forge/Order/Tags.js | 1 + .../react/src/forge/Order/UpdateMilepost.js | 9 +- public/react/src/forge/Order/newMilepost.js | 10 +- public/react/src/forge/Order/order.js | 2 +- 6 files changed, 148 insertions(+), 33 deletions(-) diff --git a/public/react/src/forge/Order/Milepost.js b/public/react/src/forge/Order/Milepost.js index 3ee0f18da..69fa5e807 100644 --- a/public/react/src/forge/Order/Milepost.js +++ b/public/react/src/forge/Order/Milepost.js @@ -20,6 +20,7 @@ class Milepost extends Component{ status:'open', openselect:1, closeselect:undefined, + order_name:undefined } } @@ -30,13 +31,13 @@ class Milepost extends Component{ - getList=(page,status,order_type)=>{ + getList=(page,status,order_type,order_name)=>{ const { projectsId } = this.props.match.params; const { limit } = this.state; const url = `/projects/${projectsId}/versions.json`; axios.get(url,{ params:{ - projectsId,page,limit,status,order_type + projectsId,page,limit,status,order_type,order_name } }).then((result)=>{ if(result){ @@ -50,6 +51,7 @@ class Milepost extends Component{ } opneMilelist=(type)=>{ + const { order_name} = this.state; if(type){ const { current_user } = this.props; if(type===1){ @@ -58,14 +60,14 @@ class Milepost extends Component{ openselect:current_user.user_id, closeselect:undefined }) - this.getList(1,'open','desc'); + this.getList(1,'open','desc',order_name); }else{ this.setState({ status:'closed', openselect:undefined, closeselect:current_user.user_id }) - this.getList(1,'closed','desc'); + this.getList(1,'closed','desc',order_name); } } @@ -124,7 +126,7 @@ class Milepost extends Component{ order_name:e.key, order_type:e.item.props.value }) - this.getList(1,this.state.status,e.item.props.value); + this.getList(1,this.state.status,e.item.props.value,e.key); } @@ -147,12 +149,12 @@ class Milepost extends Component{ const { projectsId } = this.props.match.params; const menu = ( - 到期日从近到远 - 到期日从远到近 + 到期日从近到远 + 到期日从远到近 完成度从低到高 完成度从高到低 - 工单从多到少 - 工单从少到多 + 工单从多到少 + 工单从少到多 ) diff --git a/public/react/src/forge/Order/MilepostDetail.js b/public/react/src/forge/Order/MilepostDetail.js index 345ffcc68..bccfd38bb 100644 --- a/public/react/src/forge/Order/MilepostDetail.js +++ b/public/react/src/forge/Order/MilepostDetail.js @@ -42,8 +42,15 @@ class MilepostDetail extends Component{ //设置选择高亮 openselect:1, closeselect:undefined, - miledata:undefined + miledata:undefined, // status_type: undefined + issue_tag_ids:'标签', + tracker_ids:'所有分类', + author_ids:'发布人', + assigned_to_ids:'指派人', + priority_ids:'优先度', + done_ratios:'完成度', + paix:'排序' } } @@ -120,7 +127,70 @@ class MilepostDetail extends Component{ }) } - getOption=(e,id)=>{ + getOption=(e,id,name)=>{ + if(id+'s'==="issue_tag_ids"){ + this.setState({ + [id]:e.key, + issue_tag_ids:name + }) + } + if(id+'s'==="tracker_ids"){ + this.setState({ + [id]:e.key, + tracker_ids:name + }) + } + if(id+'s'==="author_ids"){ + this.setState({ + [id]:e.key, + author_ids:name + }) + } + if(id+'s'==="assigned_to_ids"){ + this.setState({ + [id]:e.key, + assigned_to_ids:name + }) + } + if(id+'s'==="priority_ids"){ + this.setState({ + [id]:e.key, + priority_ids:name + }) + } + if(id+'s'==="done_ratios"){ + this.setState({ + [id]:e.key, + done_ratios:name + }) + } + + if(e.key==="created_on"){ + if(e.item.props.value==="desc"){ + this.setState({ + [id]:e.key, + paix:'最新创建' + }) + }else{ + this.setState({ + [id]:e.key, + paix:'最早创建' + }) + } + }else if(e.key==="updated_on"){ + if(e.item.props.value==="desc"){ + this.setState({ + [id]:e.key, + paix:'最新更新' + }) + }else{ + this.setState({ + [id]:e.key, + paix:'最早更新' + }) + } + } + this.setState({ [id]:e.key }) @@ -135,11 +205,11 @@ class MilepostDetail extends Component{ renderMenu =(array,name,id)=>{ return( - this.getOption(e,id)}>{name} + this.getOption(e,id,name)}>{name} { array && array.length > 0 && array.map((item,key)=>{ return( - this.getOption(e,id)}>{item.name} + this.getOption(e,id,item.name)}>{item.name} ) }) } @@ -198,6 +268,15 @@ class MilepostDetail extends Component{ const { issue_chosen , issues , limit , page , search_count , data , miledata , isSpin,openselect,closeselect } = this.state; const { projectsId,meilid } = this.props.match.params; + const menu = ( + this.getOption(e)}> + 最新创建 + 最早创建 + 最新更新 + 最早更新 + + ) + const Paginations = ( { @@ -212,40 +291,62 @@ class MilepostDetail extends Component{

{miledata&&miledata.name}

-
- 编辑里程碑 +
+ 编辑里程碑 创建工单
-

-

  • this.openorder(1)}>{data && data.open_issues_count}个开启中
    • -
  • this.openorder(2)}>{data && data.close_issues_count}个已关闭
    • - {/* {data && data.open_count}个开启中 - {data && data.close_count}个已关闭 */} -

    + {/*

    +

    */}
    -
      - +
        +
      • this.openorder(1)}>{data && data.open_issues_count}个开启中
        • +
      • this.openorder(2)}>{data && data.close_issues_count}个已关闭
        • {/*
      • @我的
        • */}
        -
      • +
      • - 标签 + {this.state.issue_tag_ids} + +
        • + {/*
      • */} + {/**/} + {/*类型*/} + {/**/} + {/*
        • */} +
      • + + {this.state.tracker_ids}
      • - - 类型 + + {this.state.author_ids}
      • - 指派人 + {this.state.assigned_to_ids} + +
        • +
      • + + {this.state.priority_ids} + +
        • +
      • + + {this.state.done_ratios} + +
        • +
      • + + {this.state.paix}
      diff --git a/public/react/src/forge/Order/Tags.js b/public/react/src/forge/Order/Tags.js index 99050a715..627383c6f 100644 --- a/public/react/src/forge/Order/Tags.js +++ b/public/react/src/forge/Order/Tags.js @@ -82,6 +82,7 @@ class Tags extends Component{ a: '1', }, textcolor:'#F17013', + display:'none' }); this.getList() } diff --git a/public/react/src/forge/Order/UpdateMilepost.js b/public/react/src/forge/Order/UpdateMilepost.js index 4975fb39f..9dd1e2a90 100644 --- a/public/react/src/forge/Order/UpdateMilepost.js +++ b/public/react/src/forge/Order/UpdateMilepost.js @@ -71,7 +71,12 @@ class UpdateMilepost extends Component{ const { projectsId } = this.props.match.params; const { meilid } = this.props.match.params; const url = `/projects/${projectsId}/versions/${meilid}.json`; - let time=this.state.selectedValue.format("YYYY-MM-DD") + let time=undefined; + if(this.state.selectedValue===undefined){ + + }else{ + time=this.state.selectedValue.format("YYYY-MM-DD") + } axios.put(url,{ ...values, project_id:projectsId, @@ -227,7 +232,7 @@ class UpdateMilepost extends Component{
    - 更新里程碑 + 更新里程碑
    diff --git a/public/react/src/forge/Order/newMilepost.js b/public/react/src/forge/Order/newMilepost.js index 1e4571487..96ca4e201 100644 --- a/public/react/src/forge/Order/newMilepost.js +++ b/public/react/src/forge/Order/newMilepost.js @@ -42,7 +42,13 @@ class NewMilepost extends Component{ if(!err){ const { projectsId } = this.props.match.params; const url = `/projects/${projectsId}/versions`; - let time=this.state.selectedValue.format("YYYY-MM-DD") + let time=undefined; + if(this.state.selectedValue===undefined){ + + }else{ + time=this.state.selectedValue.format("YYYY-MM-DD") + } + axios.post(url,{ ...values, project_id:projectsId, @@ -193,7 +199,7 @@ class NewMilepost extends Component{
    - 创建里程碑 + 创建里程碑
    diff --git a/public/react/src/forge/Order/order.js b/public/react/src/forge/Order/order.js index 32aae9fa8..57ac4546b 100644 --- a/public/react/src/forge/Order/order.js +++ b/public/react/src/forge/Order/order.js @@ -149,7 +149,7 @@ class order extends Component{ paix:'最早创建' }) } - }else{ + }else if(e.key==="updated_on"){ if(e.item.props.value==="desc"){ this.setState({ [id]:e.key,