- {truncateCommitId(`${item.sha}`)}
+ {truncateCommitId(`${item.sha}`)}
{item.message}
- 浏览代码
+ 浏览代码
：提交于{item.time_from_now}
diff --git a/src/forge/Merge/Files.jsx b/src/forge/Merge/Files.jsx
index 40e617c2..82a8638c 100644
--- a/src/forge/Merge/Files.jsx
+++ b/src/forge/Merge/Files.jsx
@@ -47,7 +47,7 @@ function Files({data,history,owner,projectsId}){
{item.name}
-
+
+{item.addition}
-{item.deletion}
diff --git a/src/forge/Merge/MergeDetail.js b/src/forge/Merge/MergeDetail.js
index a7e2f33e..76c31ba0 100644
--- a/src/forge/Merge/MergeDetail.js
+++ b/src/forge/Merge/MergeDetail.js
@@ -228,7 +228,7 @@ class MergeDetail extends Component {
{
data && data.issue.user_permission ?
- 编辑
+ 编辑
: ''
}
@@ -248,8 +248,8 @@ class MergeDetail extends Component {
- - 0 ? "active" : ""}>对话内容
- - 0 ? "active" : ""}>代码提交
+ - 0 ? "active" : ""}>对话内容
+ - 0 ? "active" : ""}>代码提交
diff --git a/src/forge/Merge/MergeItem.js b/src/forge/Merge/MergeItem.js
index f21cc3f5..884c50fe 100644
--- a/src/forge/Merge/MergeItem.js
+++ b/src/forge/Merge/MergeItem.js
@@ -62,7 +62,7 @@ class MergeItem extends Component {
@@ -78,7 +78,7 @@ class MergeItem extends Component {
![]()
{item && item.author_name}
@@ -109,7 +109,7 @@ class MergeItem extends Component {
item.pull_request_head &&
{item.is_original
@@ -133,7 +133,7 @@ class MergeItem extends Component {
item.pull_request_base &&
{/* {item.is_fork ? item.pull_request_base : `${item.author_name}:${item.pull_request_base}`} */}
@@ -156,7 +156,7 @@ class MergeItem extends Component {
{item.assign_user_name ? (
{item.assign_user_name}
@@ -175,7 +175,7 @@ class MergeItem extends Component {
{item.journals_count ? (
{item.journals_count}
@@ -196,7 +196,7 @@ class MergeItem extends Component {
>
diff --git a/src/forge/Merge/MergeSubmit.js b/src/forge/Merge/MergeSubmit.js
index 8f2275d8..d4b42c3b 100644
--- a/src/forge/Merge/MergeSubmit.js
+++ b/src/forge/Merge/MergeSubmit.js
@@ -100,7 +100,7 @@ class MergeSubmit extends Component{
width:"10%",
render: (text,item) => (
-
+
})
@@ -110,7 +110,7 @@ class MergeSubmit extends Component{
title:"SHA",
dataIndex: 'sha',
render: (text) => (
- {text}
+ {text}
)
},{
title:"备注",
diff --git a/src/forge/Merge/MessageCount.js b/src/forge/Merge/MessageCount.js
index f3e58657..d1b46b86 100644
--- a/src/forge/Merge/MessageCount.js
+++ b/src/forge/Merge/MessageCount.js
@@ -361,7 +361,7 @@ class MessageCount extends Component {
{data.pull_request.is_original ? data.pull_request.fork_project_user : data.issue.project_author_name}: {turnbar(data.pull_request && data.pull_request.head)}
@@ -376,7 +376,7 @@ class MessageCount extends Component {
{data.issue.project_author_name}:{data.pull_request.base}
@@ -386,14 +386,14 @@ class MessageCount extends Component {
}
-
+
})
由
-
+
{data.issue.author_name}
@@ -408,7 +408,7 @@ class MessageCount extends Component {
审查人员：
{data.issue.assign_user_name ? (
{data.issue.assign_user_name}
@@ -448,7 +448,7 @@ class MessageCount extends Component {
type="green"
ghost
className="ml20"
- onClick={()=>{this.props.history.push(`/projects/${owner}/${projectsId}/pulls/${mergeId}/UpdateMerge`);}}
+ onClick={()=>{this.props.history.push(`/${owner}/${projectsId}/pulls/${mergeId}/UpdateMerge`);}}
>
编辑
diff --git a/src/forge/Merge/NewMerge.js b/src/forge/Merge/NewMerge.js
index 97df7fb1..956be000 100644
--- a/src/forge/Merge/NewMerge.js
+++ b/src/forge/Merge/NewMerge.js
@@ -186,7 +186,7 @@ class NewMerge extends Component {
// this.ischeckmerge();
let { id ,merge , pull } = this.state;
if(type==="pull"){
- this.props.history.push(`/projects/${owner}/${projectsId}/pulls/new/${pull}`)
+ this.props.history.push(`/${owner}/${projectsId}/pulls/new/${pull}`)
this.compareProject(id,value,merge);
}else{
this.compareProject(id,pull,value);
@@ -208,7 +208,7 @@ class NewMerge extends Component {
merge_user_login: is_fork_id ? projects_names[0].project_user_login : undefined
}
})
- this.props.history.push(`/projects/${login}/${identifier}/pulls/new`);
+ this.props.history.push(`/${login}/${identifier}/pulls/new`);
this.newMergelist(login,identifier);
};
diff --git a/src/forge/Merge/merge.js b/src/forge/Merge/merge.js
index 2b72cbee..1e1285e4 100644
--- a/src/forge/Merge/merge.js
+++ b/src/forge/Merge/merge.js
@@ -8,6 +8,7 @@ import MergeItem from "./MergeItem";
import './Index.scss';
import axios from "axios";
+import CheckProfile from '../Component/ProfileModal/Profile';
const Search = Input.Search;
/**
@@ -212,7 +213,7 @@ class merge extends Component {
checkOperation() {
const { projectsId,owner } = this.props.match.params;
- this.props.history.push(`/projects/${owner}/${projectsId}/pulls/new`);
+ this.props.history.push(`/${owner}/${projectsId}/pulls/new`);
}
render() {
const { projectsId , owner } = this.props.match.params;
@@ -256,9 +257,9 @@ class merge extends Component {
diff --git a/src/forge/Merge/merge_form.js b/src/forge/Merge/merge_form.js
index 3481cc8f..9332d9b8 100644
--- a/src/forge/Merge/merge_form.js
+++ b/src/forge/Merge/merge_form.js
@@ -165,7 +165,7 @@ class MergeForm extends Component {
this.setState({
isSpin: false,
});
- this.props.history.push(`/projects/${owner}/${projectsId}/pulls`);
+ this.props.history.push(`/${owner}/${projectsId}/pulls`);
const { getDetail } = this.props;
getDetail && getDetail();
} else {
@@ -195,7 +195,7 @@ class MergeForm extends Component {
isSpin: false,
});
this.props.history.push(
- `/projects/${owner}/${projectsId}/pulls/${mergeId}/Messagecount`
+ `/${owner}/${projectsId}/pulls/${mergeId}/Messagecount`
);
} else {
this.setState({
@@ -287,7 +287,7 @@ class MergeForm extends Component {
type="default"
className="ml30"
onClick={()=>{
- this.props.history.push(merge_type === "new" ? `/projects/${owner}/${projectsId}/pulls` : `/projects/${owner}/${projectsId}/pulls/${mergeId}/detail`)
+ this.props.history.push(merge_type === "new" ? `/${owner}/${projectsId}/pulls` : `/${owner}/${projectsId}/pulls/${mergeId}/detail`)
}}
>
取消
diff --git a/src/forge/Merge/no_data.js b/src/forge/Merge/no_data.js
index 8ad550ab..d5584797 100644
--- a/src/forge/Merge/no_data.js
+++ b/src/forge/Merge/no_data.js
@@ -12,7 +12,7 @@ class Nodata extends Component{
欢迎使用合并请求！
- 合并请求可以帮助您与他人协作编写代码。在使用之前，请先创建一个 合并请求
+ 合并请求可以帮助您与他人协作编写代码。在使用之前，请先创建一个 合并请求
diff --git a/src/forge/New/Index.js b/src/forge/New/Index.js
index 18f2aa9a..aaaab6c8 100644
--- a/src/forge/New/Index.js
+++ b/src/forge/New/Index.js
@@ -209,17 +209,16 @@ class Index extends Component {
user_id:owners_id
}).then((result) => {
if (result && result.data.id) {
- this.setState({
- isSpin: false
- })
projectsType && projectsType !== "mirror" && this.props.showNotification(`托管项目创建成功!`);
- this.props.history.push(`/projects/${result.data.login}/${result.data.identifier}`);
+ this.props.history.push(`/${result.data.login}/${result.data.identifier}`);
}
+ this.setState({
+ isSpin: false
+ })
}).catch((error) => {
this.setState({
isSpin: false
})
- console.log(error);
})
} else {
this.setState({
diff --git a/src/forge/Newfile/UserSubmitComponent.js b/src/forge/Newfile/UserSubmitComponent.js
index 5cba3cf6..65fa7ec2 100644
--- a/src/forge/Newfile/UserSubmitComponent.js
+++ b/src/forge/Newfile/UserSubmitComponent.js
@@ -86,7 +86,7 @@ class UserSubmitComponent extends Component {
const { getTopCount } = this.props;
getTopCount && getTopCount(values.branchname);
}
- let url = `/projects/${owner}/${projectsId}${values.branchname ? `/tree/${turnbar(values.branchname)}`: (branch ? `/tree/${turnbar(branch)}` : "")}`;
+ let url = `/${owner}/${projectsId}${values.branchname ? `/tree/${turnbar(values.branchname)}`: (branch ? `/tree/${turnbar(branch)}` : "")}`;
this.props.history.push(url);
}
})
@@ -123,7 +123,7 @@ class UserSubmitComponent extends Component {
this.setState({ isSpin: false });
if (result.data && result.data.status === 1) {
let b = currentBranch || branch;
- let url = `/projects/${owner}/${projectsId}${(values.branchname ? `/tree/${turnbar(values.branchname)}` : (b ? `/tree/${turnbar(b)}`:""))}`;
+ let url = `/${owner}/${projectsId}${(values.branchname ? `/tree/${turnbar(values.branchname)}` : (b ? `/tree/${turnbar(b)}`:""))}`;
this.props.history.push(url);
this.props.showNotification("文件修改成功!");
}
@@ -150,7 +150,7 @@ class UserSubmitComponent extends Component {
return (
-
+
{
- this.props.history.push(`/projects/${owner}/${projectsId}`);
+ this.props.history.push(`/${owner}/${projectsId}`);
}}
className="mr20"
>
diff --git a/src/forge/Notice/Apply.jsx b/src/forge/Notice/Apply.jsx
index 3c77edfa..aeacd67a 100644
--- a/src/forge/Notice/Apply.jsx
+++ b/src/forge/Notice/Apply.jsx
@@ -63,11 +63,11 @@ function Apply(props) {
{
list.map((i,k)=>{
return(
-
- 
+
+
- {i.user && i.user.name}
+ {i.user && i.user.name}
{i.time_ago}
diff --git a/src/forge/Notice/Index.jsx b/src/forge/Notice/Index.jsx
index 02f05a87..3f61688f 100644
--- a/src/forge/Notice/Index.jsx
+++ b/src/forge/Notice/Index.jsx
@@ -33,7 +33,7 @@ function Index(props){
useEffect(()=>{
if((username && current_user && (current_user.login !== username))){
- props.history.push(`/users/${username}`);
+ props.history.push(`/${username}`);
}
},[current_user,username])
@@ -47,14 +47,14 @@ function Index(props){
useEffect(()=>{
if(pathname && username){
- if(pathname === `/users/${username}/notice`){
+ if(pathname === `/${username}/notice`){
setMenu("notify");
changeNum(user.undo_messages);
}
- if(pathname === `/users/${username}/notice/undo`){
+ if(pathname === `/${username}/notice/undo`){
setMenu("undo");
}
- if(pathname === `/users/${username}/notice/apply`){
+ if(pathname === `/${username}/notice/apply`){
setMenu("apply");
}
}
@@ -84,19 +84,19 @@ function Index(props){
-
-
+
通知
{messagesCount ? {messagesCount}:""}
-
-
+
接收仓库
{transferCount ? {transferCount}:""}
-
-
+
成员申请
{applyCount ? {applyCount}:""}
@@ -104,19 +104,19 @@ function Index(props){
{
return ;
}}
>
{
return ;
}}
>
{
return ;
}}
diff --git a/src/forge/Notice/Notify.jsx b/src/forge/Notice/Notify.jsx
index 761366d3..31373908 100644
--- a/src/forge/Notice/Notify.jsx
+++ b/src/forge/Notice/Notify.jsx
@@ -44,13 +44,13 @@ function Notify(props){
if(status){
switch(status){
case 'canceled':
- return 取消转移【{project && project.name}】仓库
+ return 取消转移【{project && project.name}】仓库
case 'common':
- return 正在将【{project && project.name}】仓库转移给【{owner && owner.name}】
+ return 正在将【{project && project.name}】仓库转移给【{owner && owner.name}】
case 'successed':
- return 【{project && project.name}】仓库成功转移给【{owner && owner.name}】
+ return 【{project && project.name}】仓库成功转移给【{owner && owner.name}】
default:
- return 拒绝转移【{project && project.name}】仓库
+ return 拒绝转移【{project && project.name}】仓库
}
}else{
return ""
@@ -62,9 +62,9 @@ function Notify(props){
if(status){
switch(status){
case 'successed':
- return 已通过你加入【{project && project.name}】项目的申请
+ return 已通过你加入【{project && project.name}】项目的申请
default:
- return 已拒绝你加入【{project && project.name}】项目的申请
+ return 已拒绝你加入【{project && project.name}】项目的申请
}
}else{
return ""
@@ -80,12 +80,13 @@ function Notify(props){
{
list.map((i,k)=>{
+ console.log(i);
return(
- -
-
+ -
+
- {i.applied_user && i.applied_user.name}
+ {i.applied_user && i.applied_user.name}
{i.time_ago}
{ i.applied_type === "AppliedProject" ? renderApplyStatus(i.status,i.applied):renderStatus(i.status,i.applied)}
diff --git a/src/forge/Notice/UndoEvent.jsx b/src/forge/Notice/UndoEvent.jsx
index c8c579dc..18cb6d4a 100644
--- a/src/forge/Notice/UndoEvent.jsx
+++ b/src/forge/Notice/UndoEvent.jsx
@@ -68,16 +68,16 @@ function UndoEvent(props){
{
list.map((i,k)=>{
return(
-
-
-
+
-
+
- {i.user && i.user.name}
+ {i.user && i.user.name}
{i.time_ago}
- 请求将仓库【{i.project && i.project.name}】
- 转移给【{i.owner && i.owner.name}】，是否接受？
+ 请求将仓库【{i.project && i.project.name}】
+ 转移给【{i.owner && i.owner.name}】，是否接受？
{
i.status === "common" &&
diff --git a/src/forge/Order/Detail.js b/src/forge/Order/Detail.js
index 644a653d..8805004b 100644
--- a/src/forge/Order/Detail.js
+++ b/src/forge/Order/Detail.js
@@ -85,7 +85,7 @@ class Detail extends Component {
})
.then((result) => {
if (result) {
- this.props.history.push(`/projects/${owner}/${projectsId}/issues`);
+ this.props.history.push(`/${owner}/${projectsId}/issues`);
}
})
.catch((error) => {
@@ -132,7 +132,7 @@ class Detail extends Component {
.then((result) => {
if (result) {
this.props.history.push(
- `/projects/${owner}/${projectsId}/issues/${result.data.issue_id}/copyetail`
+ `/${owner}/${projectsId}/issues/${result.data.issue_id}/copyetail`
);
}
})
@@ -207,7 +207,7 @@ class Detail extends Component {
![]()
由
{data && data.author_name}
@@ -269,7 +269,7 @@ class Detail extends Component {
编辑
diff --git a/src/forge/Order/Milepost.js b/src/forge/Order/Milepost.js
index ede2d314..5f6efeeb 100644
--- a/src/forge/Order/Milepost.js
+++ b/src/forge/Order/Milepost.js
@@ -4,6 +4,7 @@ import { Dropdown, Icon, Menu, Pagination, Typography, Popconfirm, Spin } from '
import NoneData from '../Nodata';
import axios from 'axios';
import './order.css';
+import CheckProfile from '../Component/ProfileModal/Profile';
const { Text } = Typography;
@@ -187,7 +188,7 @@ class Milepost extends Component {
{
data && data.user_admin_or_member ?
-
新的里程碑
+
{this.props.history.push(`/${owner}/${projectsId}/milestones/new`)}}>新的里程碑
: ''
}
@@ -204,7 +205,7 @@ class Milepost extends Component {
- {item.name}
+ {item.name}
@@ -228,7 +229,7 @@ class Milepost extends Component {
- 编辑
+ 编辑
diff --git a/src/forge/Order/MilepostDetail.js b/src/forge/Order/MilepostDetail.js
index 30526750..c1c8bdd0 100644
--- a/src/forge/Order/MilepostDetail.js
+++ b/src/forge/Order/MilepostDetail.js
@@ -2,7 +2,8 @@ import React, { Component } from "react";
import { Link } from 'react-router-dom';
import { Dropdown, Menu, Icon, Pagination, Spin } from 'antd';
import './order.css';
-import { FlexAJ } from '../Component/layout'
+import { FlexAJ } from '../Component/layout';
+import CheckProfile from '../Component/ProfileModal/Profile';
import NoneData from '../Nodata';
import OrderItem from './OrderItem';
@@ -113,7 +114,7 @@ class MilepostDetail extends Component {
this.setState({
data: result.data,
issues: result.data.issues,
- search_count: result.data.search_count,
+ search_count: params.status_type ==="1" ? result.data.open_issues_count : result.data.close_issues_count,
isSpin: false
})
}
@@ -238,8 +239,8 @@ class MilepostDetail extends Component {
{data && data.percent && data.percent.toFixed(2)}%完成
- 编辑里程碑
- 创建易修
+ 编辑里程碑
+ {this.props.history.push(`/${owner}/${projectsId}/issues/${meilid}/new`)}} className="topWrapper_btn">创建易修
diff --git a/src/forge/Order/Milepostitem.js b/src/forge/Order/Milepostitem.js
index 48bf65c1..d79c66fe 100644
--- a/src/forge/Order/Milepostitem.js
+++ b/src/forge/Order/Milepostitem.js
@@ -31,7 +31,7 @@ class OrderItem extends Component {
- {item.name}
+ {item.name}
@@ -65,7 +65,7 @@ class OrderItem extends Component {
- 编辑
+ 编辑
diff --git a/src/forge/Order/Nav.js b/src/forge/Order/Nav.js
index 93fbc101..b5d196d6 100644
--- a/src/forge/Order/Nav.js
+++ b/src/forge/Order/Nav.js
@@ -7,8 +7,8 @@ class Nav extends Component{
const { projectsId , owner } = this.props.match.params;
return(
- 标签
- 里程碑
+ 标签
+ 里程碑
)
}
diff --git a/src/forge/Order/OrderItem.js b/src/forge/Order/OrderItem.js
index 3c5e5cf8..08178864 100644
--- a/src/forge/Order/OrderItem.js
+++ b/src/forge/Order/OrderItem.js
@@ -44,6 +44,7 @@ class OrderItem extends Component {
render() {
const { item , checkbox , mile , user_admin_or_member } = this.props;
const { projectsId , owner } = this.props.match.params;
+ const { orderid , isdisplay } = this.state;
const { current_user } = this.props;
return (
item &&
@@ -51,7 +52,7 @@ class OrderItem extends Component {
{current_user && current_user.login && checkbox}
- {item.name}
+ {item.name}
{TagInfo(item.priority,"mr10")}
@@ -67,7 +68,7 @@ class OrderItem extends Component {
-
{
item.author_name ?
-
+
{item.author_name}
: "--"
@@ -76,7 +77,7 @@ class OrderItem extends Component {
-
{
item.assign_user_name ?
-
+
{item.assign_user_name}
: "--"
@@ -88,15 +89,24 @@ class OrderItem extends Component {
- {item.done_ratio || "--"}
-
-
{item.journals_count}
+
{item.journals_count}
{
user_admin_or_member ?
-
+
-
+
+
+
-
document.getElementById("hoverBox")} title={'您确定要删除当前易修吗？'} okText="是" cancelText="否" onConfirm={() => this.deletedetail(item.id)}>
+ this.deletedetail(item.id)}
+ >
diff --git a/src/forge/Order/UpdateMilepost.js b/src/forge/Order/UpdateMilepost.js
index 88a73033..c4f38657 100644
--- a/src/forge/Order/UpdateMilepost.js
+++ b/src/forge/Order/UpdateMilepost.js
@@ -79,7 +79,7 @@ class UpdateMilepost extends Component {
}).then(result => {
if (result) {
this.setState({ isSpin: false })
- this.props.history.push(`/projects/${owner}/${projectsId}/milestones`);
+ this.props.history.push(`/${owner}/${projectsId}/milestones`);
}
diff --git a/src/forge/Order/newMilepost.js b/src/forge/Order/newMilepost.js
index b9513212..b7d1102d 100644
--- a/src/forge/Order/newMilepost.js
+++ b/src/forge/Order/newMilepost.js
@@ -63,7 +63,7 @@ class NewMilepost extends Component {
}).then(result => {
if (result) {
this.setState({ isSpin: false })
- this.props.history.push(`/projects/${owner}/${projectsId}/milestones`);
+ this.props.history.push(`/${owner}/${projectsId}/milestones`);
const { getDetail } = this.props;
getDetail && getDetail();
}
diff --git a/src/forge/Order/order.css b/src/forge/Order/order.css
index 6a0f029e..0abd116f 100644
--- a/src/forge/Order/order.css
+++ b/src/forge/Order/order.css
@@ -20,6 +20,9 @@
.overlayBox{
width: 230px;
}
+.hideOverlay{
+ display: none;
+}
.topmilepost {
box-sizing: border-box;
display: flex;
diff --git a/src/forge/Order/order.js b/src/forge/Order/order.js
index 1202f41f..290bb03e 100644
--- a/src/forge/Order/order.js
+++ b/src/forge/Order/order.js
@@ -1,12 +1,12 @@
import React, { Component } from "react";
import { Input, Dropdown, Menu, Icon, Pagination, Spin, DatePicker, Checkbox } from "antd";
-import { Link } from 'react-router-dom';
import "./order.css";
import './index.scss';
import moment from 'moment';
import NoneData from "../Nodata";
import OrderItem from "./OrderItem";
+import CheckProfile from '../Component/ProfileModal/Profile';
import axios from "axios";
@@ -351,9 +351,9 @@ class order extends Component {
if(data && data.user_admin_or_member){
const { projectsId , owner } = this.props.match.params;
return(
-
+
{window.open(`/${owner}/${projectsId}/issues/new`,'_blank')}}>
+ 创建易修
-
+
)
}
}
diff --git a/src/forge/Order/order_form.js b/src/forge/Order/order_form.js
index b6f065b2..6515dde8 100644
--- a/src/forge/Order/order_form.js
+++ b/src/forge/Order/order_form.js
@@ -165,7 +165,7 @@ class order_form extends Component {
}).then((result) => {
if (result && result.data.id) {
this.props.showNotification("任务创建成功！");
- this.props.history.push(`/projects/${owner}/${projectsId}/issues/${result.data.id}/detail`);
+ this.props.history.push(`/${owner}/${projectsId}/issues/${result.data.id}`);
this.setState({
description: "",
isSpin: false,
@@ -191,7 +191,7 @@ class order_form extends Component {
...values,
}).then((result) => {
if (result) {
- this.props.history.push(`/projects/${owner}/${projectsId}/issues/${orderId}/detail`);
+ this.props.history.push(`/${owner}/${projectsId}/issues/${orderId}`);
this.props.showNotification("任务更新成功！");
const { getDetail } = this.props;
getDetail && getDetail();
@@ -371,7 +371,7 @@ class order_form extends Component {
type="default"
className="ml30"
onClick={()=>
- this.props.history.push(form_type === "new" ? `/projects/${owner}/${projectsId || orderId}/issues` : `/projects/${owner}/${projectsId}/issues/${orderId}/detail`)}
+ this.props.history.push(form_type === "new" ? `/${owner}/${projectsId || orderId}/issues` : `/${owner}/${projectsId}/issues/${orderId}`)}
>
取消
diff --git a/src/forge/SecuritySetting/Index.jsx b/src/forge/SecuritySetting/Index.jsx
index e314c66a..d9d4e49c 100644
--- a/src/forge/SecuritySetting/Index.jsx
+++ b/src/forge/SecuritySetting/Index.jsx
@@ -18,6 +18,10 @@ const SSHNew = Loadable({
loader: () => import("./sub/New"),
loading: Loading,
});
+const Profile = Loadable({
+ loader: () => import("../users/Material/Index"),
+ loading: Loading,
+});
const SSHIndex = Loadable({
loader: () => import("./sub/SSH"),
loading: Loading,
@@ -35,6 +39,10 @@ function Index(props){
{current_user && current_user.username}
+
+ - 个人信息
+ - -1 ?"active":""}>基本资料
+
- 安全设置
- -1 ?"active":""}>SSH密钥
@@ -49,6 +57,12 @@ function Index(props){
)}
>
+ (
+
+ )}
+ >
(
diff --git a/src/forge/SecuritySetting/Index.scss b/src/forge/SecuritySetting/Index.scss
index 664ed7ab..f533f053 100644
--- a/src/forge/SecuritySetting/Index.scss
+++ b/src/forge/SecuritySetting/Index.scss
@@ -36,6 +36,8 @@
.securityUl{
padding:20px 16px;
color: #333;
+ margin-bottom: 0px;
+ padding-bottom: 0px;
li{
margin-bottom: 10px;
height: 27px;
@@ -122,50 +124,6 @@
}
}
}
-.deleteBox{
- .ant-modal-header{
- background-color: rgba(223, 0, 2, 0.06);
- border-bottom: none;
- .ant-modal-title{
- text-align: left;
- font-size: 20px;
- }
- }
- .ant-modal-body{
- padding:30px 50px;
- p{
- font-size: 16px;
- line-height: 26px;
- color:#666
- }
- .desc{
- .descMain{
- align-items: center;
- justify-content: center;
- font-size: 20px;
- margin-bottom: 10px;
- i{
- font-size: 38px!important;
- color:#DF0002
- }
- }
- }
- }
- .ant-modal-footer{
- border-top: none;
- text-align: center;
- padding-bottom: 40px;
- button{
- width: 120px;
- margin:0px 20px;
- &.ant-btn-danger{
- background-color: #fff;
- color: #DF0002;
- border-color: #D0D0D0;
- }
- }
- }
-}
.descModal{
.ant-modal-title{
text-align: left;
diff --git a/src/forge/SecuritySetting/sub/DeleteBox.jsx b/src/forge/SecuritySetting/sub/DeleteBox.jsx
index af8b6418..02d816b3 100644
--- a/src/forge/SecuritySetting/sub/DeleteBox.jsx
+++ b/src/forge/SecuritySetting/sub/DeleteBox.jsx
@@ -1,17 +1,16 @@
import React from 'react';
import { AlignCenter } from '../../Component/layout';
-import { Modal , Button } from 'antd';
+import Modals from '../../Component/PublicModal/Index';
+import { Button } from 'antd';
function DeleteBox({ visible , onCancel ,onSuccess }) {
return(
-
@@ -19,10 +18,11 @@ function DeleteBox({ visible , onCancel ,onSuccess }) {
}
>
-
您确定要删除此 SSH 密钥吗？
-
此操作将永久删除该SSH密钥，且不可恢复。如果您想再次使用该密钥，则需要您重新上传。
+
+ 您确定要删除此 SSH 密钥吗？
+
此操作将永久删除该SSH密钥，且不可恢复。如果您想再次使用该密钥，则需要您重新上传。
![]()
(
-
+
{text}
),
diff --git a/src/forge/Settings/Index.js b/src/forge/Settings/Index.js
index c8fd2f1e..3ebb5b49 100644
--- a/src/forge/Settings/Index.js
+++ b/src/forge/Settings/Index.js
@@ -49,25 +49,25 @@ class Index extends Component {
const { projectsId , owner } = this.props.match.params;
const { pathname } = this.props.history.location;
- const flag = pathname === `/projects/${owner}/${projectsId}/setting`;
+ const flag = pathname === `/${owner}/${projectsId}/settings`;
return (
-
-
+
基本设置
- -1 ? "active" : ""
+ pathname.indexOf("settings/collaborators") > -1 ? "active" : ""
}
>
-
+
协作者管理
@@ -75,11 +75,11 @@ class Index extends Component {
- -1 ? "active" : ""
+ pathname.indexOf("settings/webhooks") > -1 ? "active" : ""
}
>
-
+
Webhooks
@@ -87,21 +87,21 @@ class Index extends Component {
- -1 ? "active" : ""
+ pathname.indexOf("settings/branch") > -1 ? "active" : ""
}
>
-
+
分支设置
- -1 ? "active" : ""}
+ className={pathname.indexOf("settings/labels") > -1 ? "active" : ""}
>
-
+
项目标签
@@ -110,7 +110,7 @@ class Index extends Component {
{/*
- -1 ? "active" : ""
+ pathname.indexOf("settings/manage") > -1 ? "active" : ""
}
>
@@ -127,64 +127,64 @@ class Index extends Component {
{/* webhooks */}
(
)}
>
(
)}
>
(
)}
>
{/* 协作者 */}
(
)}
>
{/* 修改仓库信息 */}
(
)}
>
(
)}
>
(
)}
>
(
)}
>
(
)}
>
{/* 修改仓库信息 */}
(
)}
diff --git a/src/forge/Settings/Setting.js b/src/forge/Settings/Setting.js
index e4ec2766..c3150323 100644
--- a/src/forge/Settings/Setting.js
+++ b/src/forge/Settings/Setting.js
@@ -179,11 +179,9 @@ class Setting extends Component {
content: 该操作无法撤销！且将会一并删除相关的易修、合并请求、工作流、里程碑、动态等数据。
是否确认删除 {owner}/{projectName}({projectsId})？,
onOk: () => {
const url = `/${owner}/${projectsId}.json`;
- axios
- .delete(url)
- .then((result) => {
+ axios.delete(url).then((result) => {
this.props.showNotification("仓库删除成功！");
- this.props.history.push("/projects");
+ this.props.history.push(`/${owner}`);
})
.catch((error) => {
console.log(error);
@@ -223,10 +221,14 @@ class Setting extends Component {
}
// 确定转移仓库
onSuccess=(owner)=>{
+ if(owner){
+ this.setState({
+ is_transfering:true,
+ transfer:owner
+ })
+ }
this.setState({
- is_transfering:true,
- divertVisible:false,
- transfer:owner
+ divertVisible:false
})
}
@@ -351,7 +353,7 @@ class Setting extends Component {
{
is_transfering ?
此仓库正在转移给【
- {transfer && {transfer.name}}
+ {transfer && {transfer.name}}
】，请联系对方接收此仓库。
:
`将此仓库转移给其他用户或组织`
diff --git a/src/forge/Settings/Webhooks/Index.jsx b/src/forge/Settings/Webhooks/Index.jsx
index c6992243..57df13b4 100644
--- a/src/forge/Settings/Webhooks/Index.jsx
+++ b/src/forge/Settings/Webhooks/Index.jsx
@@ -62,7 +62,7 @@ function Index(props) {
if(total >= 20){
return props.showNotification("webhooks数量已到上限！请删除暂不使用的webhooks以进行添加操作");
}
- props.history.push(`/projects/${owner}/${projectsId}/setting/webhooks/new`)
+ props.history.push(`/${owner}/${projectsId}/settings/webhooks/new`)
}
return(
@@ -90,9 +90,9 @@ function Index(props) {
return(
- {i.url}
+ {i.url}
-
+
diff --git a/src/forge/Settings/Webhooks/New.jsx b/src/forge/Settings/Webhooks/New.jsx
index 0dedaa83..d90934f0 100644
--- a/src/forge/Settings/Webhooks/New.jsx
+++ b/src/forge/Settings/Webhooks/New.jsx
@@ -111,7 +111,7 @@ function New({ form , match , showNotification , history }) {
}).then(result=>{
if(result){
showNotification("webhook更新成功！");
- history.push(`/projects/${owner}/${projectsId}/setting/webhooks`);
+ history.push(`/${owner}/${projectsId}/settings/webhooks`);
}
}).catch(error=>{})
}else{
@@ -125,7 +125,7 @@ function New({ form , match , showNotification , history }) {
}).then(result=>{
if(result && result.data && result.data.id){
showNotification("webhook新建成功！");
- history.push(`/projects/${owner}/${projectsId}/setting/webhooks`);
+ history.push(`/${owner}/${projectsId}/settings/webhooks`);
}
}).catch(error=>{})
}
@@ -157,7 +157,7 @@ function New({ form , match , showNotification , history }) {
axios.delete(url).then(result=>{
if(result){
showNotification("webhook删除成功！");
- history.push(`/projects/${owner}/${projectsId}/setting/webhooks`);
+ history.push(`/${owner}/${projectsId}/settings/webhooks`);
}
}).catch(error=>{})
}
@@ -180,7 +180,7 @@ function New({ form , match , showNotification , history }) {
subTitle={`删除后未来事件将不会推送至此Webhook地址：${data && data.url}`}
/>
- Webhooks
+ Webhooks
{id ? "更新" : "添加"}Webhook
diff --git a/src/forge/Source/Index.jsx b/src/forge/Source/Index.jsx
index 8ba92587..e158d7fb 100644
--- a/src/forge/Source/Index.jsx
+++ b/src/forge/Source/Index.jsx
@@ -217,7 +217,7 @@ function Index(props){
data.map((item,key)=>{
return(
-
-
})
+
diff --git a/src/forge/Team/Group/GroupDetailProject.jsx b/src/forge/Team/Group/GroupDetailProject.jsx
index 0c843f0a..20284c9f 100644
--- a/src/forge/Team/Group/GroupDetailProject.jsx
+++ b/src/forge/Team/Group/GroupDetailProject.jsx
@@ -31,7 +31,7 @@ export default (({projects}) => {
return (
-
{item.project.name}
+
{item.project.name}
)
})
diff --git a/src/forge/Team/Group/GroupDetailSetting.jsx b/src/forge/Team/Group/GroupDetailSetting.jsx
index fa060ee3..168ba6ff 100644
--- a/src/forge/Team/Group/GroupDetailSetting.jsx
+++ b/src/forge/Team/Group/GroupDetailSetting.jsx
@@ -26,18 +26,18 @@ export default (props)=>{
function returnActive (pathname){
let a = 0;
- if(pathname === `/organize/${OIdentifier}/group/${groupId}/setting/member`){
+ if(pathname === `/${OIdentifier}/teams/${groupId}/setting/member`){
a = 1;
- }else if(pathname === `/organize/${OIdentifier}/group/${groupId}/setting/project`){
+ }else if(pathname === `/${OIdentifier}/teams/${groupId}/setting/project`){
a = 2;
}
return a;
}
const active = returnActive(pathname);
const array = {list:[
- {name:'基本设置',icon:"icon-base",href:`/organize/${OIdentifier}/group/${groupId}/setting`},
- {name:'团队成员管理',icon:"icon-zuzhichengyuan",href:`/organize/${OIdentifier}/group/${groupId}/setting/member`},
- {name:'团队项目管理',icon:"icon-zuzhixiangmu",href:`/organize/${OIdentifier}/group/${groupId}/setting/project`},
+ {name:'基本设置',icon:"icon-base",href:`/${OIdentifier}/teams/${groupId}/setting`},
+ {name:'团队成员管理',icon:"icon-zuzhichengyuan",href:`/${OIdentifier}/teams/${groupId}/setting/member`},
+ {name:'团队项目管理',icon:"icon-zuzhixiangmu",href:`/${OIdentifier}/teams/${groupId}/setting/project`},
],
active
}
@@ -51,19 +51,19 @@ export default (props)=>{
(
)}
>
(
)}
>
(
)}
diff --git a/src/forge/Team/Group/GroupDetails.jsx b/src/forge/Team/Group/GroupDetails.jsx
index 75183f35..ba569386 100644
--- a/src/forge/Team/Group/GroupDetails.jsx
+++ b/src/forge/Team/Group/GroupDetails.jsx
@@ -87,9 +87,9 @@ export default ((props) => {
if (username) {
const url = `/organizations/${OIdentifier}/teams/${groupId}/team_users/quit.json`;
axios.delete(url).then((result) => {
- if (result && result.data) {
+ if (result && result.message==='success') {
props.showNotification(`已成功退出团队！`);
- props.history.push(`/organize/${OIdentifier}`);
+ props.history.push(`/${username}`);
}
}).catch((error) => { });
}
@@ -119,7 +119,7 @@ export default ((props) => {
管理员团队对 所有仓库 具有操作权限，且对组织具有 管理员权限。
此外，该团队拥有了 创建仓库 的权限：成员可以在组织中创建新的仓库。
- {group.is_admin ?
: ""}
+ {group.is_admin ?
: ""}
:
diff --git a/src/forge/Team/Group/GroupForm.jsx b/src/forge/Team/Group/GroupForm.jsx
index 3e5407ad..dad9b64b 100644
--- a/src/forge/Team/Group/GroupForm.jsx
+++ b/src/forge/Team/Group/GroupForm.jsx
@@ -90,7 +90,7 @@ export default Form.create()(
}).then(result => {
if (result && result.data) {
showNotification("基本设置更新成功！");
- history.push(`/organize/${OIdentifier}/group/${groupId}`);
+ history.push(`/${OIdentifier}/teams/${groupId}`);
}
}).catch(error => { })
} else {
@@ -101,7 +101,7 @@ export default Form.create()(
}).then(result => {
if (result && result.data) {
showNotification("团队创建成功！");
- history.push(`/organize/${OIdentifier}/group/${result.data.id}`);
+ history.push(`/${OIdentifier}/teams/${result.data.id}`);
}
}).catch(error => { })
}
@@ -154,9 +154,9 @@ export default Form.create()(
function cancelEdit(){
if(groupId){
- history.push(`/organize/${OIdentifier}/group/${groupId}`);
+ history.push(`/${OIdentifier}/teams/${groupId}`);
}else{
- history.push(`/organize/${OIdentifier}`);
+ history.push(`/${OIdentifier}`);
}
}
diff --git a/src/forge/Team/Group/Setting/GroupMemberSetting.jsx b/src/forge/Team/Group/Setting/GroupMemberSetting.jsx
index a0d8ec78..998e7339 100644
--- a/src/forge/Team/Group/Setting/GroupMemberSetting.jsx
+++ b/src/forge/Team/Group/Setting/GroupMemberSetting.jsx
@@ -87,7 +87,7 @@ export default ((props) => {
align: "center",
render: (value, item) => {
return (
- {item.user.name}
+ {item.user.name}
)
}
},
diff --git a/src/forge/Team/Group/Setting/GroupProjectSetting.jsx b/src/forge/Team/Group/Setting/GroupProjectSetting.jsx
index 1762a864..9a4f3958 100644
--- a/src/forge/Team/Group/Setting/GroupProjectSetting.jsx
+++ b/src/forge/Team/Group/Setting/GroupProjectSetting.jsx
@@ -180,7 +180,7 @@ function GroupProjectSetting(props) {
}
>
{item.project.owner_name}/{item.project.name}}
+ title={{item.project.owner_name}/{item.project.name}}
/>
)}
diff --git a/src/forge/Team/Index.jsx b/src/forge/Team/Index.jsx
index fd4afedf..1a3bfde9 100644
--- a/src/forge/Team/Index.jsx
+++ b/src/forge/Team/Index.jsx
@@ -26,39 +26,16 @@ const SubDetailIndex = Loadable({
loader: () => import("./Sub/SubDetail"),
loading: Loading,
});
+// forge项目详情
+const ProjectDetail = Loadable({
+ loader: () => import("../Main/Detail"),
+ loading: Loading,
+});
export default withRouter(CNotificationHOC()(SnackbarHOC()(TPMIndexHOC(
((props)=>{
return (
- {/* 组织团队-设置 */}
- {
- return
- }}
- >
- {/* 组织团队-新建 */}
- {
- return
- }}
- >
- {/* 组织团队-子级（包含组织团队列表） */}
- {
- return
- }}
- >
- {/* 组织成员 */}
- {
- return
- }}
- >
{/* 新建组织 */}
}}
>
+ {/* 组织团队-新建 */}
+ {
+ return
+ }}
+ >
+ {/* 组织团队-设置 */}
+ {
+ return
+ }}
+ >
+ {/* 组织团队-子级（包含组织团队列表） */}
+ {
+ return
+ }}
+ >
+ {/* 组织成员 */}
+ {
+ return
+ }}
+ >
+
+
{/* 组织详情（包含组织设置） */}
(
+
+ )}
+ >
+
+ {/* 组织下的项目详情 */}
+ (
+
+ )}
+ >
+
+ {/* 组织详情（包含组织设置） */}
+ (
)}
diff --git a/src/forge/Team/List.jsx b/src/forge/Team/List.jsx
index 8cf96587..7e64c5de 100644
--- a/src/forge/Team/List.jsx
+++ b/src/forge/Team/List.jsx
@@ -6,6 +6,7 @@ import './Index.scss';
import Item from './ListItem';
import Right from './RightBox';
import NoData from '../Nodata';
+import CheckProfile from '../Component/ProfileModal/Profile';
import { Menu , Pagination , Dropdown , Spin } from 'antd';
import axios from 'axios';
@@ -61,8 +62,12 @@ function List(props){
)
const menu_new=(
)
@@ -106,7 +111,13 @@ function List(props){
}
-
+
- {item.name}
+ {item.name}
{ item.forked_from_project_id && }
{
item.type && item.type !== 0 ?
diff --git a/src/forge/Team/New.jsx b/src/forge/Team/New.jsx
index 1f06dc22..414a8d15 100644
--- a/src/forge/Team/New.jsx
+++ b/src/forge/Team/New.jsx
@@ -49,7 +49,7 @@ export default Form.create()(
}).then(result=>{
if(result && result.data){
showNotification("组织创建成功！");
- history.push(`/organize/${result.data.name}`);
+ history.push(`/${result.data.name}`);
}
}).catch(error=>{})
}
diff --git a/src/forge/Team/RightBox.jsx b/src/forge/Team/RightBox.jsx
index daa339f2..7616fd6c 100644
--- a/src/forge/Team/RightBox.jsx
+++ b/src/forge/Team/RightBox.jsx
@@ -1,5 +1,4 @@
import React , { useEffect , useState } from 'react';
-import { Button } from 'antd';
import styled from 'styled-components';
import Box from './Box';
import axios from 'axios';
@@ -7,6 +6,8 @@ import { getImageUrl } from 'educoder';
import { Link } from 'react-router-dom';
import Nodata from '../Nodata';
+import CheckProfile from '../Component/ProfileModal/Profile';
+
const Span = styled.span`{
color:#888;
font-size:12px;
@@ -36,7 +37,7 @@ const Img = styled.img`{
height:45px;
margin-right:12px;
}`
-function RightBox({ OIdentifier , history , admin }) {
+function RightBox({ OIdentifier , history , admin , showCompeleteDialog ,completeProfile }) {
const [ memberData, setMemberData ] = useState(undefined);
const [ groupData, setGroupData ] = useState(undefined);
@@ -67,14 +68,14 @@ function RightBox({ OIdentifier , history , admin }) {
{
memberData && memberData.organization_users && memberData.organization_users.length>0 ?
-
+
{
memberData.organization_users.map((item,key)=>{
return(
-
+
-
{item.user && item.user.name}
+
{item.user && item.user.name}
加入时间：{item.created_at}
{
(item.is_admin || item.is_member) ?
-
{item.name}
+
{item.name}
:
{item.name}
}
diff --git a/src/forge/Team/Setting/TeamSettingCommon.jsx b/src/forge/Team/Setting/TeamSettingCommon.jsx
index e52361ad..5bab8f53 100644
--- a/src/forge/Team/Setting/TeamSettingCommon.jsx
+++ b/src/forge/Team/Setting/TeamSettingCommon.jsx
@@ -62,7 +62,7 @@ export default Form.create()(
showNotification("组织信息更新成功！");
if(values.name !== organizeDetail.name){
console.log("false111");
- history.push(`/organize/${values.name}/setting`);
+ history.push(`/${values.name}/setting`);
}
updateFunc && updateFunc(values.name,values.description);
}
@@ -92,7 +92,7 @@ export default Form.create()(
}).then(result=>{
if(result && result.data){
// 删除后跳转到个人中心的组织页面
- history.push(`/users/${current_user && current_user.login}/organizes`);
+ history.push(`/${current_user && current_user.login}/organizes`);
}
})
setVisible(false);
diff --git a/src/forge/Team/Setting/TeamSettingGroup.jsx b/src/forge/Team/Setting/TeamSettingGroup.jsx
index 006d579c..8ebdb4af 100644
--- a/src/forge/Team/Setting/TeamSettingGroup.jsx
+++ b/src/forge/Team/Setting/TeamSettingGroup.jsx
@@ -3,11 +3,11 @@ import { WhiteBack , Banner } from '../../Component/layout';
import GroupItems from '../TeamGroupItems';
const limit = 8;
-function TeamSettingGroup({organizeDetail,history}){
+function TeamSettingGroup({organizeDetail,history,current_user}){
return(
组织团队管理
-
+
)
}
diff --git a/src/forge/Team/Setting/TeamSettingIndex.jsx b/src/forge/Team/Setting/TeamSettingIndex.jsx
index 718f5b5f..462a92d1 100644
--- a/src/forge/Team/Setting/TeamSettingIndex.jsx
+++ b/src/forge/Team/Setting/TeamSettingIndex.jsx
@@ -30,21 +30,21 @@ export default (( props )=>{
function returnActive (pathname){
let a = 0;
- if(pathname === `/organize/${OIdentifier}/setting/member`){
+ if(pathname === `/${OIdentifier}/setting/member`){
a = 1;
- }else if(pathname === `/organize/${OIdentifier}/setting/group`){
+ }else if(pathname === `/${OIdentifier}/setting/group`){
a = 2;
- }else if(pathname === `/organize/${OIdentifier}/setting/hooks`){
+ }else if(pathname === `/${OIdentifier}/setting/hooks`){
a = 3;
}
return a;
}
const active = returnActive(pathname);
const array = {list:[
- {name:'基本设置',icon:"icon-base",href:`/organize/${OIdentifier}/setting`},
- {name:'组织成员管理',icon:"icon-zuzhichengyuan",href:`/organize/${OIdentifier}/setting/member`},
- {name:'组织团队管理',icon:"icon-zuzhixiangmu",href:`/organize/${OIdentifier}/setting/group`},
- // {name:'管理web钩子',icon:"icon-zhongqingdianxinicon10",href:`/organize/${OIdentifier}/setting/hooks`}
+ {name:'基本设置',icon:"icon-base",href:`/${OIdentifier}/setting`},
+ {name:'组织成员管理',icon:"icon-zuzhichengyuan",href:`/${OIdentifier}/setting/member`},
+ {name:'组织团队管理',icon:"icon-zuzhixiangmu",href:`/${OIdentifier}/setting/group`},
+ // {name:'管理web钩子',icon:"icon-zhongqingdianxinicon10",href:`/${OIdentifier}/setting/hooks`}
],
active
}
@@ -58,25 +58,25 @@ export default (( props )=>{
(
)}
>
(
)}
>
(
)}
>
(
)}
diff --git a/src/forge/Team/Setting/TeamSettingMember.jsx b/src/forge/Team/Setting/TeamSettingMember.jsx
index 34f0e28e..1ead66e9 100644
--- a/src/forge/Team/Setting/TeamSettingMember.jsx
+++ b/src/forge/Team/Setting/TeamSettingMember.jsx
@@ -64,7 +64,7 @@ export default (({organizeDetail})=>{
width:"5%",
render:(value)=>{
return(
- value && })
+ value &&
)
}
},
@@ -73,7 +73,7 @@ export default (({organizeDetail})=>{
dataIndex: 'user',
width:"15%",
render:(value,item)=>{
- return {value && value.name}
+ return {value && value.name}
}
},
{
diff --git a/src/forge/Team/Sub/Detail.jsx b/src/forge/Team/Sub/Detail.jsx
index 6e048a05..f591c864 100644
--- a/src/forge/Team/Sub/Detail.jsx
+++ b/src/forge/Team/Sub/Detail.jsx
@@ -38,12 +38,12 @@ function Detail(props){
// 设置页面：顶部不需要设置按钮了
useEffect(()=>{
if(pathname){
- if(pathname.indexOf(`/organize/${OIdentifier}/setting`)>-1){
+ if(pathname.indexOf(`/${OIdentifier}/setting`)>-1){
setFlag(false);
}else{
setFlag(true);
}
- if(pathname.indexOf(`/organize/${OIdentifier}/group`)>-1 || pathname.indexOf(`/organize/${OIdentifier}/member`)>-1){
+ if(pathname.indexOf(`/${OIdentifier}/teams`)>-1 || pathname.indexOf(`/${OIdentifier}/members`)>-1){
setButtonflagFlag(true);
}else{
setButtonflagFlag(false);
@@ -77,19 +77,19 @@ function Detail(props){
{
detail &&
{flag && !buttonflag && detail.is_admin ?
- 设置
+ 设置
:""}
{buttonflag &&
- 组织成员{detail.num_users && {detail.num_users}}
- 组织团队{detail.num_teams &&{detail.num_teams}}
+ 组织成员{detail.num_users && {detail.num_users}}
+ 组织团队{detail.num_teams &&{detail.num_teams}}
}
@@ -112,33 +112,33 @@ function Detail(props){
{/* 组织团队-详情 */}
{
return
}}
>
{/* 组织成员 */}
{
return
}}
>
{/* 组织团队 */}
{
return
}}
>
{
return
}}
>
{
return
}}
diff --git a/src/forge/Team/Sub/SubDetail.jsx b/src/forge/Team/Sub/SubDetail.jsx
index 7b653c55..b4f1d036 100644
--- a/src/forge/Team/Sub/SubDetail.jsx
+++ b/src/forge/Team/Sub/SubDetail.jsx
@@ -22,7 +22,7 @@ export default ((props)=>{
// 设置页面：顶部不需要设置按钮了
useEffect(()=>{
if(pathname){
- if(pathname.indexOf(`/organize/${OIdentifier}/group/${groupId}/setting`)>-1){
+ if(pathname.indexOf(`/${OIdentifier}/teams/${groupId}/setting`)>-1){
setFlag(false);
}else{
setFlag(true);
@@ -48,19 +48,19 @@ export default ((props)=>{
- {OIdentifier}
+ {OIdentifier}
{detail ? detail.name : "新建团队"}
{
detail &&
- 组织成员{detail.num_users && {detail.num_users}}
- 组织团队{detail.num_teams &&{detail.num_teams}}
+ 组织成员{detail.num_users && {detail.num_users}}
+ 组织团队{detail.num_teams &&{detail.num_teams}}
}
desc={!flag && detail.description}
@@ -69,7 +69,7 @@ export default ((props)=>{
{/* 组织团队-设置 */}
{
return
}}
diff --git a/src/forge/Team/TeamGroup.jsx b/src/forge/Team/TeamGroup.jsx
index 38725e7d..1920caed 100644
--- a/src/forge/Team/TeamGroup.jsx
+++ b/src/forge/Team/TeamGroup.jsx
@@ -3,11 +3,11 @@ import { Banner } from '../Component/layout';
import GroupItems from './TeamGroupItems';
const limit = 14;
-function TeamGroup({organizeDetail,history}){
+function TeamGroup({organizeDetail,history,current_user}){
return(
组织团队
-
+
)
}
diff --git a/src/forge/Team/TeamGroupItems.jsx b/src/forge/Team/TeamGroupItems.jsx
index f3f5b876..5a955818 100644
--- a/src/forge/Team/TeamGroupItems.jsx
+++ b/src/forge/Team/TeamGroupItems.jsx
@@ -17,7 +17,7 @@ const ImgContent = styled.img`{
border-radius:50%;
margin:5px 10px;
}`
-function TeamGroupItems({organizeDetail,limit, count , history}){
+function TeamGroupItems({organizeDetail,limit, count , history ,current_user}){
const [ page , setPage ] = useState(1);
const [ isSpin , setIsSpin ] = useState(true);
const [ total , setTotal ] = useState(0);
@@ -48,12 +48,13 @@ function TeamGroupItems({organizeDetail,limit, count , history}){
axios.delete(url).then(result =>{
if(result && result.data){
getData();
+ history.push(`/${current_user && current_user.login}`);
}
}).catch(error=>{})
}
// 团队设置
function toGroupSetting(id){
- history.push(`/organize/${organizeDetail && organizeDetail.name}/group/${id}/setting`);
+ history.push(`/${organizeDetail && organizeDetail.name}/teams/${id}/setting`);
}
// 解散团队
function disMissGroup(id){
@@ -77,7 +78,7 @@ function TeamGroupItems({organizeDetail,limit, count , history}){
{
(item.is_admin || item.is_member) ?
- {item.nickname}
+ {item.nickname}
:
{item.nickname}
}
@@ -91,10 +92,10 @@ function TeamGroupItems({organizeDetail,limit, count , history}){
{
item.users && item.users.map((i,k)=>{
return(
- k < count ?
+ k < count ?
:
k === count ?
-
+
:""
)
})
diff --git a/src/forge/UsersList/focus_button.js b/src/forge/UsersList/focus_button.js
index 0d099fd6..a2e93bde 100644
--- a/src/forge/UsersList/focus_button.js
+++ b/src/forge/UsersList/focus_button.js
@@ -3,7 +3,7 @@ import axios from "axios";
import { Button } from "antd";
import "./list.css";
-function FocusButton({is_watch , fontClass, starText, is_block , id , successFunc}){
+function FocusButton({is_watch , fontClass, starText, is_block , id , successFunc,notReset}){
const [ isSpin , setIsSpin ] = useState(false);
const [ watchFlag , setWatchFlag ] = useState(is_watch);
// 关注和取消关注
@@ -19,7 +19,9 @@ function FocusButton({is_watch , fontClass, starText, is_block , id , successFun
}).then((result) => {
if (result && result.data.status === 0) {
successFunc && successFunc();
- setWatchFlag(!watchFlag);
+ if(notReset){
+ setWatchFlag(!watchFlag);
+ }
}
setIsSpin(false);
})
diff --git a/src/forge/UsersList/fork_users.js b/src/forge/UsersList/fork_users.js
index e38f4619..23cd5bea 100644
--- a/src/forge/UsersList/fork_users.js
+++ b/src/forge/UsersList/fork_users.js
@@ -83,7 +83,7 @@ class ForkUsers extends Component {
![]()
{
+ renderList = (users, userClass, current_user, type_title , successFunc , notReset) => {
if (users && users.length > 0) {
return users.map((item, key) => {
return (
@@ -14,7 +14,7 @@ class UserList extends Component {
@@ -53,9 +53,9 @@ class UserList extends Component {
}
}
render() {
- const { users, userClass, current_user , type_title , successFunc } = this.props;
+ const { users, userClass, current_user , type_title , successFunc , notReset , title_type } = this.props;
return (
- this.renderList(users, userClass, current_user, type_title , successFunc)
+ this.renderList(users, userClass, current_user, type_title , successFunc , notReset , title_type)
);
}
}
diff --git a/src/forge/Version/New.jsx b/src/forge/Version/New.jsx
index f2e7ae61..0678a345 100644
--- a/src/forge/Version/New.jsx
+++ b/src/forge/Version/New.jsx
@@ -103,7 +103,7 @@ export default Form.create()(
.then(result => {
if (result) {
showNotification("版本修改成功！");
- history.push(`/projects/${owner}/${projectsId}/releases`);
+ history.push(`/${owner}/${projectsId}/releases`);
}
});
} else {
@@ -116,7 +116,7 @@ export default Form.create()(
.then(result => {
if (result) {
showNotification("版本发布成功！");
- history.push(`/projects/${owner}/${projectsId}/releases`);
+ history.push(`/${owner}/${projectsId}/releases`);
}
});
}
@@ -233,7 +233,7 @@ export default Form.create()(
diff --git a/src/forge/Wiki/EditWiki.jsx b/src/forge/Wiki/EditWiki.jsx
index ae30b446..a7b4911d 100644
--- a/src/forge/Wiki/EditWiki.jsx
+++ b/src/forge/Wiki/EditWiki.jsx
@@ -126,7 +126,7 @@ export default Form.create()(({ form, history, showNotification, projectDetail,
}
function goBack() {
- history.push(`/projects/${owner}/${projectsId}/wiki`);
+ history.push(`/${owner}/${projectsId}/wiki`);
}
function changeModal(e) {
diff --git a/src/forge/Wiki/Index.jsx b/src/forge/Wiki/Index.jsx
index af883a94..f15b1968 100644
--- a/src/forge/Wiki/Index.jsx
+++ b/src/forge/Wiki/Index.jsx
@@ -103,19 +103,19 @@ export default (props) => {
function goUser(login) {
- window.location.href = `/users/${login}`;
+ window.location.href = `/${login}`;
}
function addFile() {
- history.push(`/projects/${owner}/${projectsId}/wiki/add`);
+ history.push(`/${owner}/${projectsId}/wiki/add`);
}
function goEdit() {
- history.push(`/projects/${owner}/${projectsId}/wiki/edit/${encodeURI(checkItem.name)}`);
+ history.push(`/${owner}/${projectsId}/wiki/edit/${encodeURI(checkItem.name)}`);
}
function preview() {
- window.open(`/projects/${owner}/${projectsId}/wiki/preview/${encodeURI(project.name)}/${project.id}`);
+ window.open(`/${owner}/${projectsId}/wiki/preview/${encodeURI(project.name)}/${project.id}`);
}
// 支持 Markdown，Html，Pdf格式文件
diff --git a/src/forge/Wiki/Preview.jsx b/src/forge/Wiki/Preview.jsx
index e7c6a623..93ebe2e8 100644
--- a/src/forge/Wiki/Preview.jsx
+++ b/src/forge/Wiki/Preview.jsx
@@ -61,11 +61,11 @@ export default (props) => {
}, [project, checkItem]);
function goEdit() {
- history.push(`/projects/${owner}/${projectsId}/wiki/edit/${checkItem.name}`);
+ history.push(`/${owner}/${projectsId}/wiki/edit/${checkItem.name}`);
}
function goBack() {
- history.push(`/projects/${owner}/${projectsId}/wiki`);
+ history.push(`/${owner}/${projectsId}/wiki`);
}
// 支持 Markdown，Html，Pdf格式文件
diff --git a/src/forge/Wiki/Welcome/index.jsx b/src/forge/Wiki/Welcome/index.jsx
index 78cd34e4..fc3af6ef 100644
--- a/src/forge/Wiki/Welcome/index.jsx
+++ b/src/forge/Wiki/Welcome/index.jsx
@@ -27,7 +27,7 @@ export default ({ project, isManager, history, showNotification, match, reloadLi
// }
function addFile() {
- history.push(`/projects/${owner}/${projectsId}/wiki/add`);
+ history.push(`/${owner}/${projectsId}/wiki/add`);
}
return (
diff --git a/src/forge/comments/children_comments.js b/src/forge/comments/children_comments.js
index 8a8ccbc8..450a30f1 100644
--- a/src/forge/comments/children_comments.js
+++ b/src/forge/comments/children_comments.js
@@ -113,7 +113,7 @@ class children_comments extends Component {
![]()
{item && item.user_name}
diff --git a/src/forge/comments/children_journals.js b/src/forge/comments/children_journals.js
index e293c9f3..2337ce87 100644
--- a/src/forge/comments/children_journals.js
+++ b/src/forge/comments/children_journals.js
@@ -77,7 +77,7 @@ class children_journals extends Component {
![]()
{item && item.user_name}
diff --git a/src/forge/comments/comments.js b/src/forge/comments/comments.js
index 93925da6..7de4bdbd 100644
--- a/src/forge/comments/comments.js
+++ b/src/forge/comments/comments.js
@@ -76,6 +76,8 @@ class comments extends Component {
content: "",
reply_content: undefined,
});
+ this.state.new_journal_id = result.data.id;
+ this.getjournalslist(page, limit);
this.setState({
showFiles: false,
content: "",
@@ -86,10 +88,13 @@ class comments extends Component {
journal_spin: false,
attachment_clean: false,
});
- this.state.new_journal_id = result.data.id;
- this.getjournalslist(page, limit);
}
- this.props.showNotification(result.data.message);
+ this.setState({
+ journal_spin: false
+ });
+ if(result && result.data.status !== 411){
+ this.props.showNotification(result.data.message);
+ }
})
.catch((error) => {
this.setState({
@@ -304,7 +309,7 @@ class comments extends Component {
return (
![]()
![]()
{item && item.user_name}
diff --git a/src/forge/users/CIList.jsx b/src/forge/users/CIList.jsx
index a4e0331c..f4540412 100644
--- a/src/forge/users/CIList.jsx
+++ b/src/forge/users/CIList.jsx
@@ -62,7 +62,7 @@ function CIList(props){
return(
-
- {item.name}
+ {item.name}
{ item.open_devops ?
已激活
:
@@ -79,7 +79,7 @@ function CIList(props){
:
-
+
}
)
diff --git a/src/forge/users/GeneralView/Activity.jsx b/src/forge/users/GeneralView/Activity.jsx
index ce09e885..1f6b46d1 100644
--- a/src/forge/users/GeneralView/Activity.jsx
+++ b/src/forge/users/GeneralView/Activity.jsx
@@ -11,10 +11,10 @@ function Activity({list}) {
list.map((i,k)=>{
return(
-
-
})
+ })
- {i.user_name}
+ {i.user_name}
{i.action_time}
{i.priority && TagInfo(`${i.priority}`,"")}
{i.issue_status && {i.issue_status} }
diff --git a/src/forge/users/GeneralView/ConcentrateBox.jsx b/src/forge/users/GeneralView/ConcentrateBox.jsx
index 3ee94194..78573984 100644
--- a/src/forge/users/GeneralView/ConcentrateBox.jsx
+++ b/src/forge/users/GeneralView/ConcentrateBox.jsx
@@ -2,10 +2,11 @@ import React, { useEffect, useState } from 'react';
import { Modal , Checkbox , Spin , Input } from 'antd';
import Axios from 'axios';
import { Link } from 'react-router-dom';
+import CheckProfile from '../../Component/ProfileModal/Profile';
const { Search } = Input;
const limit = 20;
-function ConcentrateBox({ visible , onCancel , onSure , username , choosed }) {
+function ConcentrateBox({ visible , onCancel , onSure , username , choosed , history , showCompeleteDialog , completeProfile }) {
const [ page , setPage ]= useState(1);
const [ total , setTotal ]= useState(0);
const [ pageSize , setPageSize ] = useState(false);
@@ -164,7 +165,16 @@ function ConcentrateBox({ visible , onCancel , onSure , username , choosed }) {
{ total > limit && page < pageSize && setPage(page+1)}>查看更多
}
- { (list && list.length === 0) && (copyList && copyList.length === 0) && 您还没有公开的{search && `“${search}”`}项目，先去新建项目
}
+ {
+ (list && list.length === 0) && (copyList && copyList.length === 0) &&
+ 您还没有公开的{search && `“${search}”`}项目，先去
+ {history.push(`/projects/deposit/new`)}}
+ className="color-blue">新建项目
+
+ }
)
diff --git a/src/forge/users/GeneralView/ConcentrateProject.jsx b/src/forge/users/GeneralView/ConcentrateProject.jsx
index bfcf290d..48875221 100644
--- a/src/forge/users/GeneralView/ConcentrateProject.jsx
+++ b/src/forge/users/GeneralView/ConcentrateProject.jsx
@@ -4,7 +4,7 @@ import { Link } from 'react-router-dom';
import axios from 'axios';
import Box from './ConcentrateBox';
-function ConcentrateProject({userLogin,current}) {
+function ConcentrateProject({userLogin,current,showCompeleteDialog,completeProfile}) {
const [ list , setList ] = useState(undefined);
const [ visible , setVisible ] = useState(false);
const [ value , setValue ] = useState([]);
@@ -45,7 +45,15 @@ function ConcentrateProject({userLogin,current}) {
}
return(
- setVisible(false)} onSure={onSure} username={userLogin} choosed={value}/>
+ setVisible(false)}
+ onSure={onSure}
+ username={userLogin}
+ choosed={value}
+ completeProfile={completeProfile}
+ showCompeleteDialog={showCompeleteDialog}
+ />
{
list && list.length>0 &&
@@ -58,8 +66,8 @@ function ConcentrateProject({userLogin,current}) {
{
list.map((i,k)=>{
return(
-
-
- {i.name}
+
-
+ {i.name}
{i.description}
{ i.category && {i.category.name} }
diff --git a/src/forge/users/GeneralView/Index.jsx b/src/forge/users/GeneralView/Index.jsx
index ded43582..24efe37c 100644
--- a/src/forge/users/GeneralView/Index.jsx
+++ b/src/forge/users/GeneralView/Index.jsx
@@ -99,7 +99,11 @@ function Index(props) {
return(
-
+
近期活动统计
diff --git a/src/forge/users/Index.jsx b/src/forge/users/Index.jsx
index ce5aeda7..04c867f7 100644
--- a/src/forge/users/Index.jsx
+++ b/src/forge/users/Index.jsx
@@ -10,19 +10,37 @@ const Infos = Loadable({
loader: () => import("./Infos"),
loading: Loading,
});
+// forge项目详情
+const ProjectDetail = Loadable({
+ loader: () => import("../Main/Detail"),
+ loading: Loading,
+});
export default withRouter(
- (CNotificationHOC()(SnackbarHOC()(TPMIndexHOC((props)=>{
- return(
-
-
- (
-
- )}
- >
-
-
+ (CNotificationHOC()(SnackbarHOC()(TPMIndexHOC((props) => {
+
+ // 个人中心新增的二级目录都需在此添加一次。将项目放组织和个人名下后，此处根据二级目录作判断，
+ let secondRouter = '';
+ if (props.location.pathname) {
+ secondRouter = props.location.pathname.split('/')[2];
+ }
+
+ let userRouterArr = ['statistics', 'projects', 'notice', 'devops', 'organizes', 'info', 'following', 'followers', 'password'];
+ return (
+
+
+ {secondRouter && (!userRouterArr.includes(secondRouter)) ? (
+
+ )}
+ > : (
+
+ )}
+ >}
+
+
)
}))))
)
\ No newline at end of file
diff --git a/src/forge/users/Index.scss b/src/forge/users/Index.scss
index 3595aa84..8139ebae 100644
--- a/src/forge/users/Index.scss
+++ b/src/forge/users/Index.scss
@@ -218,6 +218,7 @@ ul.ant-menu.menuStyle{
border-bottom: 2px solid transparent!important;
position: relative;
a{
+ font-size: 16px;
& >i{
font-size: 15px!important;
margin-right: 8px;
diff --git a/src/forge/users/Infos.js b/src/forge/users/Infos.js
index a588cb8b..1cd3969d 100644
--- a/src/forge/users/Infos.js
+++ b/src/forge/users/Infos.js
@@ -72,22 +72,22 @@ class Infos extends Component {
renderPath=(pathname)=>{
const { username } = this.props.match.params;
- if(pathname === `/users/${username}`){
+ if(pathname === `/${username}`){
this.setState({menuKey:"0",route_type:undefined});
- }else if(pathname === `/users/${username}/statistics`){
+ }else if(pathname === `/${username}/statistics`){
this.setState({menuKey:"1",route_type:undefined});
- }else if(pathname.indexOf(`/users/${username}/projects`)>-1){
+ }else if(pathname.indexOf(`/${username}/projects`)>-1){
this.setState({menuKey:"2",route_type:undefined});
- }else if(pathname.indexOf(`/users/${username}/notice`)>-1){
+ }else if(pathname.indexOf(`/${username}/notice`)>-1){
this.setState({menuKey:"3",route_type:undefined});
- }else if(pathname.indexOf(`/users/${username}/devops`)>-1){
+ }else if(pathname.indexOf(`/${username}/devops`)>-1){
this.setState({menuKey:"4",route_type:undefined});
- }else if(pathname === `/users/${username}/organizes`){
+ }else if(pathname === `/${username}/organizes`){
this.setState({menuKey:"5",route_type:undefined});
- }else if(pathname === `/users/${username}/watchers`){
- this.setState({menuKey:undefined,route_type:"watchers"});
- }else if(pathname === `/users/${username}/fan_users`){
- this.setState({menuKey:undefined,route_type:"fan_users"});
+ }else if(pathname === `/${username}/following`){
+ this.setState({menuKey:undefined,route_type:"following"});
+ }else if(pathname === `/${username}/followers`){
+ this.setState({menuKey:undefined,route_type:"followers"});
}else{
this.setState({menuKey:undefined,route_type:undefined});
}
@@ -146,7 +146,7 @@ class Infos extends Component {
project_type: type ,
route_type: undefined
})
- this.props.history.push(`/users/${user && user.login}/devops/${type}`);
+ this.props.history.push(`/${user && user.login}/devops/${type}`);
}
undo_link = () => {
@@ -155,7 +155,7 @@ class Infos extends Component {
route_type: undefined,
project_type:"notice",
},()=>{
- this.props.history.push(`/users/${user && user.login}/notice`);
+ this.props.history.push(`/${user && user.login}/notice`);
this.fetchUser();
})
}
@@ -172,7 +172,7 @@ class Infos extends Component {
route_type: undefined,
project_type:"organizes"
})
- this.props.history.push(`/users/${user && user.login}/organizes`)
+ this.props.history.push(`/${user && user.login}/organizes`)
}
resetUser=()=>{
@@ -221,12 +221,12 @@ class Infos extends Component {
{user && user.description}
- {user && current_user && user.login === current_user.login && (
+ {/* {user && current_user && user.login === current_user.login && (
- )}
+ )} */}
{current_user && user && user.login !== current_user.login && (
)}
this.route_link("watchers")}
+ to={`/${user && user.login}/following`}
+ className={`with50 text-center pull-left ${route_type === "following" ? "text-primary" : ""}`}
+ onClick={() =>this.route_link("following")}
>
{current_user && user && user.login === current_user.login ? "我关注的" : "TA关注的"}
{user && user.watching_count}
this.route_link("fan_users")}
- className={`with50 text-center pull-left ${route_type === "fan_users" ? "text-primary" : ""}`}
+ to={`/${user && user.login}/followers`}
+ onClick={() =>this.route_link("followers")}
+ className={`with50 text-center pull-left ${route_type === "followers" ? "text-primary" : ""}`}
>
{current_user && user && user.login === current_user.login ? "关注我的" : "关注TA的"}
{user && user.watched_count}
@@ -280,13 +281,13 @@ class Infos extends Component {
{ !route_type && menuKey &&