-
-
- {project && project.author &&
-
- {project.author.name}
-
- }
- /
-
- {project && project.name}
-
- {
- projectDetail && projectDetail.type && projectDetail.type !== 0 ?
- projectDetail.type === 2 ?
-
-
-
- :
-
-
-
- :""
+
+
+
+ {project && project.author &&
+ {project.author.name}
}
-
-
+ /
+ {project && project.name}
+
+ { projectDetail && projectDetail.private && 私有}
+ {
+ projectDetail && projectDetail.type && projectDetail.type !== 0 ?
+ projectDetail.type === 2 ?
+
+
+
+ :
+
+
+
+ :""
+ }
+
{
firstSync ? "":
-
+
{
((current_user && current_user.admin) || isManager) && (projectDetail && projectDetail.type && projectDetail.type === 2) ?
同步镜像 : ""
@@ -507,7 +506,7 @@ class Detail extends Component {
}
-
+
{
diff --git a/src/forge/Main/Index.scss b/src/forge/Main/Index.scss
index ef3cbc0f..368d6c2d 100644
--- a/src/forge/Main/Index.scss
+++ b/src/forge/Main/Index.scss
@@ -102,7 +102,6 @@
}
}
}
-
// coderDepot
.Panels{
max-width: 1200px;
diff --git a/src/forge/Main/IndexItem.js b/src/forge/Main/IndexItem.js
index f11ee717..4a1b126e 100644
--- a/src/forge/Main/IndexItem.js
+++ b/src/forge/Main/IndexItem.js
@@ -35,9 +35,10 @@ class IndexItem extends Component {
-
+
{item.author.name}/{item.name}
+ { !item.is_public && 私有 }
{
item.forked_from_project_id ?
diff --git a/src/forge/Merge/MessageCount.js b/src/forge/Merge/MessageCount.js
index 9c526d6d..064e3444 100644
--- a/src/forge/Merge/MessageCount.js
+++ b/src/forge/Merge/MessageCount.js
@@ -102,6 +102,8 @@ class MessageCount extends Component {
isSpin: false,
pr_status: 2,
});
+ const { getDetail } = this.props;
+ getDetail && getDetail();
} else {
this.setState({
isSpin: false,
@@ -138,6 +140,8 @@ class MessageCount extends Component {
SpinMerge: false,
pr_status: 1,
});
+ const { getDetail } = this.props;
+ getDetail && getDetail();
} else {
this.setState({ SpinMerge: false });
}
@@ -471,17 +475,16 @@ class MessageCount extends Component {
: !ismesrge ? "block" : "none",
}}
>
-
- }
- disabled={!pull_request || (pull_request && !pull_request.mergeable) }
- >
- {this.state.mergename}
-
-
+ }
+ disabled={!pull_request || (pull_request && !pull_request.mergeable) }
+ >
+ {this.state.mergename}
+
{pull_request && pull_request.mergeable
?
diff --git a/src/forge/Newfile/UserSubmitComponent.js b/src/forge/Newfile/UserSubmitComponent.js
index 6c921c9f..3a35467c 100644
--- a/src/forge/Newfile/UserSubmitComponent.js
+++ b/src/forge/Newfile/UserSubmitComponent.js
@@ -16,6 +16,24 @@ class UserSubmitComponent extends Component {
};
}
+ componentDidMount=()=>{
+ const { descName } = this.props;
+ if(descName){
+ this.props.form.setFieldsValue({
+ desc:descName
+ })
+ }
+ }
+
+ componentDidUpdate=(preProps)=>{
+ const { descName } = this.props;
+ if(preProps && descName && preProps.descName !== descName ){
+ this.props.form.setFieldsValue({
+ desc:descName
+ })
+ }
+ }
+
changeSubmittype = (e) => {
this.setState({
submitType: e.target.value,
diff --git a/src/forge/Newfile/m_editor.js b/src/forge/Newfile/m_editor.js
index e342eec3..05a7b2ac 100644
--- a/src/forge/Newfile/m_editor.js
+++ b/src/forge/Newfile/m_editor.js
@@ -27,7 +27,7 @@ class m_editor extends Component {
render() {
const { editorValue } = this.state;
- const { readOnly, editorType, language , currentBranch } = this.props;
+ const { readOnly, editorType, language , currentBranch , descName } = this.props;
const editor_options = {
lineNumbers: "on",
wordWrap: true, //强制换行
@@ -72,6 +72,7 @@ class m_editor extends Component {
content={editorValue}
editor_type={editorType}
currentBranch={currentBranch}
+ descName={descName}
>
diff --git a/src/forge/Order/Milepost.js b/src/forge/Order/Milepost.js
index 0ae88ddf..e6e63991 100644
--- a/src/forge/Order/Milepost.js
+++ b/src/forge/Order/Milepost.js
@@ -89,8 +89,9 @@ class Milepost extends Component {
closeselect: status === "closed" ? current_user.user_id : undefined,
openselect: status === "closed" ? undefined : current_user.user_id
})
-
- this.getList(1, status, 'desc')
+ this.getList(1, status, 'desc');
+ const { getDetail } = this.props;
+ getDetail && getDetail();
}
}).catch(error => {
console.log(error);
@@ -107,7 +108,9 @@ class Milepost extends Component {
}
}).then((result) => {
if (result) {
- this.getList(1, this.state.status, 'desc')
+ this.getList(1, this.state.status, 'desc');
+ const { getDetail } = this.props;
+ getDetail && getDetail();
}
}).catch((error) => {
console.log(error);
@@ -228,8 +231,8 @@ class Milepost extends Component {
编辑
diff --git a/src/forge/Order/MilepostDetail.js b/src/forge/Order/MilepostDetail.js
index 7954630d..38303e5d 100644
--- a/src/forge/Order/MilepostDetail.js
+++ b/src/forge/Order/MilepostDetail.js
@@ -69,6 +69,27 @@ class MilepostDetail extends Component {
})
}
+ deletedetail = (id) => {
+ const { projectsId , owner } = this.props.match.params;
+ const url = `/${owner}/${projectsId}/issues/${id}.json`;
+ axios.delete(url, {
+ data: {
+ project_id: projectsId,
+ id: id,
+ },
+ })
+ .then((result) => {
+ if (result) {
+ const { page } = this.state;
+ this.getIssueList(page);
+ const { getDetail } = this.props;
+ getDetail && getDetail();
+ }
+ })
+ .catch((error) => {
+ console.log(error);
+ });
+ };
// 获取列表数据
getIssueList = ( page , item , value , update , updateValue , type ) => {
const { projectsId, meilid , owner } = this.props.match.params;
@@ -275,7 +296,15 @@ class MilepostDetail extends Component {
:
issues && issues.length>0 && issues.map((item,key)=>{
return(
-
+
)
})
}
diff --git a/src/forge/Order/OrderItem.js b/src/forge/Order/OrderItem.js
index 150b95d2..f7589c9c 100644
--- a/src/forge/Order/OrderItem.js
+++ b/src/forge/Order/OrderItem.js
@@ -92,12 +92,12 @@ class OrderItem extends Component {
{item.journals_count}
{
current_user && current_user.login ?
-
+
-
this.deletedetail(item.id)}>
+ document.getElementById("hoverBox")} title={'您确定要删除当前易修吗？'} okText="是" cancelText="否" onConfirm={() => this.deletedetail(item.id)}>
diff --git a/src/forge/Order/newMilepost.js b/src/forge/Order/newMilepost.js
index 965e5a6a..5d7b090f 100644
--- a/src/forge/Order/newMilepost.js
+++ b/src/forge/Order/newMilepost.js
@@ -64,6 +64,8 @@ class NewMilepost extends Component {
if (result) {
this.setState({ isSpin: false })
this.props.history.push(`/projects/${owner}/${projectsId}/milestones`);
+ const { getDetail } = this.props;
+ getDetail && getDetail();
}
}).catch(error => {
this.setState({ isSpin: false })
diff --git a/src/forge/Order/order.css b/src/forge/Order/order.css
index dd592aca..7a357d4f 100644
--- a/src/forge/Order/order.css
+++ b/src/forge/Order/order.css
@@ -17,7 +17,9 @@
line-height: 18px;
color: red;
}
-
+.overlayBox{
+ width: 230px;
+}
.topmilepost {
box-sizing: border-box;
display: flex;
diff --git a/src/forge/Order/order.js b/src/forge/Order/order.js
index 5cd17054..2443d105 100644
--- a/src/forge/Order/order.js
+++ b/src/forge/Order/order.js
@@ -268,11 +268,8 @@ class order extends Component {
checkedValue:[],
all:undefined
});
- this.state.select_params = {
- search: undefined,
- page: 1,
- limit: 15,
- };
+ this.state.select_params.page = 1;
+ this.state.select_params.limit = 15;
this.getIssueList(type);
};
@@ -337,6 +334,8 @@ class order extends Component {
const { status_type } = this.state;
this.getIssueList(status_type);
+ const { getDetail } = this.props;
+ getDetail && getDetail();
}
})
.catch((error) => {
diff --git a/src/forge/Order/order_form.js b/src/forge/Order/order_form.js
index 89a5766b..45433631 100644
--- a/src/forge/Order/order_form.js
+++ b/src/forge/Order/order_form.js
@@ -193,13 +193,14 @@ class order_form extends Component {
if (result) {
this.props.history.push(`/projects/${owner}/${projectsId}/issues/${orderId}/detail`);
this.props.showNotification("任务更新成功！");
+ const { getDetail } = this.props;
+ getDetail && getDetail();
}
})
.catch((error) => {
this.setState({
isSpin: false,
});
- console.log(error);
});
}
}
diff --git a/src/forge/css/index.scss b/src/forge/css/index.scss
index c1241e67..7f905ef5 100644
--- a/src/forge/css/index.scss
+++ b/src/forge/css/index.scss
@@ -7,6 +7,19 @@ ul,ol,dl{
.color-black{
color: #333;
}
+.projectallName{
+ display: flex;
+ align-items: center;
+ font-size: 22px;
+ font-weight: normal;
+ .projectN{
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ flex: 1;
+ max-width: 500px;
+ }
+}
.main{
width: 1200px;
padding:20px;
diff --git a/src/forge/users/Index.scss b/src/forge/users/Index.scss
index fa8bc294..b087fa2f 100644
--- a/src/forge/users/Index.scss
+++ b/src/forge/users/Index.scss
@@ -148,12 +148,12 @@ $flex:flex;
i{
font-size: 25px!important;
border-radius: 50%;
- background-color: #fff;
- &.icon-nan{
- color: #1890FF;
+ color: #fff;
+ &.icon-nan1{
+ background-color: #1890FF;
}
- &.icon-nv{
- color: pink;
+ &.icon-nv1{
+ background-color: pink;
}
}
}
diff --git a/src/forge/users/Infos.js b/src/forge/users/Infos.js
index 9b292d2e..34c6808e 100644
--- a/src/forge/users/Infos.js
+++ b/src/forge/users/Infos.js
@@ -207,9 +207,9 @@ class Infos extends Component {
{
user && user.gender===1?
-
+
:
-
+
}