diff --git a/src/forge/Main/Detail.js b/src/forge/Main/Detail.js
index 61b2df722..505cf1d8a 100644
--- a/src/forge/Main/Detail.js
+++ b/src/forge/Main/Detail.js
@@ -1,8 +1,9 @@
import React, { Component } from 'react';
-import { Spin, Tooltip } from 'antd';
+import { Spin, Tooltip , message } from 'antd';
import { Link, Route, Switch } from 'react-router-dom';
-import { Content } from '../Component/layout';
+import { Content , FlexAJ } from '../Component/layout';
import DetailBanner from './sub/DetailBanner';
+import Invite from './sub/Invite';
import '../css/index.scss'
import './list.css';
@@ -389,6 +390,15 @@ class Detail extends Component {
})
}
+ textFunc = (forked_from_project_id,fork_info)=>{
+ return forked_from_project_id && fork_info ?
+
+ forked from
+ {fork_info.fork_project_user_name}
+ /
+ {fork_info.fork_form_name}
+
: ""
+ }
render() {
@@ -406,16 +416,6 @@ class Detail extends Component {
const { state } = this.props.history.location;
- const text = (
- projectDetail && projectDetail.forked_from_project_id && projectDetail.fork_info ?
-
- forked from
- {projectDetail.fork_info.fork_project_user_name}
- /
- {projectDetail.fork_info.fork_form_name}
- : ""
- );
-
const common = {
getDetail: this.getDetail,
changeOpenDevops:this.changeOpenDevops,
@@ -425,7 +425,7 @@ class Detail extends Component {
-
+
{project && project.author &&
@@ -435,15 +435,7 @@ class Detail extends Component {
/
{project && project.name}
- {
- projectDetail && projectDetail.forked_from_project_id && projectDetail.fork_info ?
-
-
-
-
- : ""
- }
+
{
projectDetail && projectDetail.type && projectDetail.type !== 0 ?
projectDetail.type === 2 ?
@@ -516,6 +508,19 @@ class Detail extends Component {
}
+
+
+ {
+ projectDetail && projectDetail.forked_from_project_id && projectDetail.fork_info ?
+ this.textFunc(projectDetail.forked_from_project_id,projectDetail.fork_info)
+ :""
+ }
+
+ {
+ projectDetail && projectDetail.invite_code &&
+
+ }
+
{
firstSync ? "" :
+ 邀请码: {code}
+ 可以通过邀请码邀请成员加入项目
点击复制邀请码。} placement={"bottom"}>
+ jsCopy("#devitecode")}>
+
+
+ )
+}
+export default Invite;
\ No newline at end of file
diff --git a/src/forge/users/Infos.js b/src/forge/users/Infos.js
index 77ab795a1..c19bce079 100644
--- a/src/forge/users/Infos.js
+++ b/src/forge/users/Infos.js
@@ -191,9 +191,9 @@ class Infos extends Component {
}
render() {
- const { current_user, mygetHelmetapi , resetUserInfo } = this.props;
+ const { current_user } = this.props;
const { username } = this.props.match.params;
- const { user, isSpin, project_type, route_type , undo_events , undo_messages , menuKey } = this.state;
+ const { user, isSpin, route_type , undo_events , menuKey } = this.state;
return (