diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index aba950566..f01b417b0 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,7 +1,19 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -10,6 +22,36 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -23,67 +65,19 @@
-
+
-
-
-
-
-
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -94,8 +88,8 @@
-
-
+
+
@@ -106,8 +100,8 @@
-
-
+
+
@@ -116,13 +110,10 @@
-
+
-
-
-
-
-
+
+
@@ -131,16 +122,6 @@
- Educoder
- title
- textcount
- forks
- commentCtx
- 上传文件
- subFileType
- .ide
- .idea
- deleteUser
axios.delete
style=
width75f
@@ -157,10 +138,20 @@
创建工单
可读权限
sub_entries
- 可读
- icon-bianji
- readOnly
isRe
+ icon-bianji
+ 可读
+ journals_count >
+ readOnly
+ Fork
+ forked
+ .OptionsUl
+ deletedetail
+ tyle=
+ overflo
+ orderid
+ <span className="span_title">里程碑</span>
+ <span className="span_title">里程碑
$PROJECT_DIR$
@@ -179,7 +170,6 @@
-
@@ -187,35 +177,40 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
-
+
-
@@ -223,35 +218,11 @@
{ data && data.issue.description}
-
+
{data&&data.issue_status==="关闭"?"关闭中!":"开启中!"}
- 请求从{data && data.pull_request.head}分支合并到{data && pull_request.base}分支
- {/* 由 { data && data.issue.author_name} 于 { data && data.issue.created_at }创建{ data && data.issue.journals_count && data.issue.journals_count > 0 ?` · ${data.issue.journals_count} 条评论`:""} */}
+
+ 由 { data && data.issue.author_name} 于 { data && data.issue.created_at }创建{ data && data.issue.journals_count && data.issue.journals_count > 0 ?` · ${data.issue.journals_count} 条评论`:""}
+
+
+
+ 请求从 {data && data.pull_request.head} 分支合并到 {data && data.pull_request.base} 分支
+
@@ -314,9 +319,9 @@ class MergeDetail extends Component{
指派给
{data && data.issue.assign_user_name}
-
+
里程碑
- {data&&data.issue.version===null?"未添加里程碑":data&&data.issue.version.length===0?data.issue.version:'未添加里程碑'}
+ {data&&data.issue.version===null?"未添加里程碑":data&&data.issue.version.length===0?data.issue.version:'未添加里程碑'}
diff --git a/src/forge/Merge/MergeItem.js b/src/forge/Merge/MergeItem.js
index ea55f1bf4..b7bea6e03 100644
--- a/src/forge/Merge/MergeItem.js
+++ b/src/forge/Merge/MergeItem.js
@@ -1,7 +1,29 @@
import React , { Component } from 'react';
import { Link } from 'react-router-dom';
+import {Popconfirm} from "antd";
class MergeItem extends Component{
+ constructor(props){
+ super(props);
+ this.state={
+ //显示 隐藏
+ isdisplay:false,
+ orderid:'',
+ }
+ }
+
+ onMouseMove=(type)=>{
+ this.setState({
+ isdisplay:true,
+ orderid:type
+ })
+ }
+
+ onMouseOut=()=>{
+ this.setState({
+ isdisplay:false
+ })
+ }
set_issue_tags =(issue_tags)=>{
if(issue_tags && issue_tags.length > 0){
@@ -46,7 +68,18 @@ class MergeItem extends Component{
{/*{item.issue_type || "--"}*/}
{item.version || "--"}
{item.assign_user_name || "--"}
- { item.journals_count ? {item.journals_count} : "" }
+
+
+
+ { item.journals_count ? {item.journals_count} : "" }
+
+
+
+
里程碑
- {
+ {
data && data.issue.version ? data.issue.version : "--"
}
diff --git a/src/forge/Order/Detail.js b/src/forge/Order/Detail.js
index 6f2dba645..aa2360656 100644
--- a/src/forge/Order/Detail.js
+++ b/src/forge/Order/Detail.js
@@ -574,9 +574,9 @@ class Detail extends Component{
data && data.issue_tags ? {data.issue_tags[0].name} : "--"
}
-
+
里程碑
- {
+ {
data && data.version ? data.version : "--"
}
diff --git a/src/forge/Order/OrderItem.js b/src/forge/Order/OrderItem.js
index af851218d..ba09be430 100644
--- a/src/forge/Order/OrderItem.js
+++ b/src/forge/Order/OrderItem.js
@@ -77,7 +77,8 @@ class OrderItem extends Component{
{item.assign_user_name || "--"}
{item.priority|| "--"}
{item.done_ratio || "--"}
-
+
+
{ item.journals_count ? {item.journals_count} : "" }
@@ -91,7 +92,8 @@ class OrderItem extends Component{
协作者
+
{
@@ -224,16 +234,7 @@ class Collaborator extends Component{
-
+
{
total_count && total_count > LIMIT ?
diff --git a/src/forge/Settings/setting.css b/src/forge/Settings/setting.css
index 95b03efec..f0ca416d0 100644
--- a/src/forge/Settings/setting.css
+++ b/src/forge/Settings/setting.css
@@ -62,7 +62,7 @@
}
.collaboratorItem{
display: flex;
- border-bottom: 1px solid #f4f4f4;
+ border-top: 1px solid #f4f4f4;
padding:15px;
}
.collaboratorItem>span{