diff --git a/src/forge/Branch/branch.css b/src/forge/Branch/branch.css index b6dbd124e..ff65db541 100644 --- a/src/forge/Branch/branch.css +++ b/src/forge/Branch/branch.css @@ -51,7 +51,7 @@ display: flex; align-items: center; cursor: pointer; - width: 240px; + min-width: 240px; } .branch-tagBox-list .ant-popover-arrow{ display: none; diff --git a/src/forge/DevOps/About.jsx b/src/forge/DevOps/About.jsx index b25ac0d21..107b351f3 100644 --- a/src/forge/DevOps/About.jsx +++ b/src/forge/DevOps/About.jsx @@ -127,7 +127,7 @@ function About(props, ref) {

定义DevOps工作流,帮助您检测bug、发布代码…

- + 了解什么是DevOps? { diff --git a/src/forge/Order/Detail.js b/src/forge/Order/Detail.js index c22013a33..87d774a5d 100644 --- a/src/forge/Order/Detail.js +++ b/src/forge/Order/Detail.js @@ -309,8 +309,10 @@ class Detail extends Component {

- 分支: - {data && data.branch_name ? data.branch_name : "--"} + 负责人: + + {data && data.assign_user_name ? data.assign_user_name : "--"} +

标签: @@ -344,12 +346,6 @@ class Detail extends Component { 分类: {data && data.tracker ? data.tracker : "--"}

-

- 负责人: - - {data && data.assign_user_name ? data.assign_user_name : "--"} - -

开始日期: {data && data.start_date ? data.start_date : "--"} @@ -363,6 +359,10 @@ class Detail extends Component { 完成度: {data && data.done_ratio ? data.done_ratio : "--"}

+

+ 分支: + {data && data.branch_name ? data.branch_name : "--"} +

diff --git a/src/forge/Order/order_form.js b/src/forge/Order/order_form.js index 339a8c3cb..66f5803a0 100644 --- a/src/forge/Order/order_form.js +++ b/src/forge/Order/order_form.js @@ -379,19 +379,13 @@ class order_form extends Component {
- - {getFieldDecorator("branch_name", { - rules: [] - })( + + {getFieldDecorator("assigned_to_id", {rules: []})( )} @@ -460,16 +454,6 @@ class order_form extends Component { )} - - {getFieldDecorator("assigned_to_id", {rules: []})( - - )} - )} + + {getFieldDecorator("branch_name", { + rules: [] + })( + + )} +