diff --git a/src/App.js b/src/App.js
index 17be118b0..d03337319 100644
--- a/src/App.js
+++ b/src/App.js
@@ -3,7 +3,7 @@ import './App.css';
import { ConfigProvider } from 'antd'
import zhCN from 'antd/lib/locale-provider/zh_CN';
import {
- BrowserRouter as Router,
+ // BrowserRouter as Router,
Route,
Switch
} from 'react-router-dom';
@@ -108,6 +108,12 @@ class App extends Component {
initAxiosInterceptors(this.props);
let pathname = window.location.pathname ? window.location.pathname.split('/')[1] : '';
pathname && this.getPathnameType(pathname);
+
+ this.unlisten = this.props.history.listen((location,action) => {
+ // 最新路由的 location 对象,可以通过比较 pathname 是否相同来判断路由的变化情况
+ let newPathname = location.pathname.split('/')[1];
+ newPathname&&this.getPathnameType(newPathname);
+ });
}
getPathnameType = (pathname) => {
@@ -124,6 +130,8 @@ class App extends Component {
}
}
+
+
HideAddcoursestypess = (i) => {
this.setState({
Addcoursestype: false,
@@ -146,7 +154,14 @@ class App extends Component {
window.addEventListener('error', (event) => {
const msg = `${event.type}: ${event.message}`;
});
+
+
}
+
+ componentWillUnmount() {
+ this.unlisten && this.unlisten(); // 执行解绑
+ }
+
//修改登录方法
Modifyloginvalue = () => {
this.setState({
@@ -225,121 +240,121 @@ class App extends Component {
-
+
{
item.id ?
-
+
{item.image_url? 提交{item.contributions}次
- {i.user && i.user.name}
+ {i.user && i.user.name}
{i.time_ago}
取消转移【{project && project.name}】仓库 正在将【{project && project.name}】仓库转移给【{owner && owner.name}】 正在将【{project && project.name}】仓库转移给【{owner && owner.name}】 【{project && project.name}】仓库成功转移给【{owner && owner.name}】 【{project && project.name}】仓库成功转移给【{owner && owner.name}】 拒绝转移【{project && project.name}】仓库
- {i.applied_user && i.applied_user.name}
+ {i.applied_user && i.applied_user.name}
{i.time_ago}
- {i.user && i.user.name}
+ {i.user && i.user.name}
{i.time_ago}
请求将仓库【{i.project && i.project.name}】
- 转移给【{i.owner && i.owner.name}】,是否接受?
+
{item.user_name}
diff --git a/src/forge/Component/Contributors.jsx b/src/forge/Component/Contributors.jsx
index 1e26354a5..dd7d40e39 100644
--- a/src/forge/Component/Contributors.jsx
+++ b/src/forge/Component/Contributors.jsx
@@ -52,8 +52,8 @@ function Contributors({contributors,owner,projectsId}){
- {data.name}
+
+ {data.name}
setVisibleFunc(true,item.login,key)}/>
+
{ url &&
}
{name}
diff --git a/src/forge/Head/Header.js b/src/forge/Head/Header.js
index 7364ebd38..628c3f3f0 100644
--- a/src/forge/Head/Header.js
+++ b/src/forge/Head/Header.js
@@ -385,16 +385,16 @@ class NewHeader extends Component {
if (new_link && (new_link.indexOf("courses") > -1 || new_link.indexOf("contests") > -1)) {
if (user_login) {
if (new_link.indexOf("courses") > -1) {
- new_link = new_link.replace(/courses/g, "users/" + user_login + "/courses")
+ new_link = new_link.replace(/courses/g, user_login + "/courses")
} else if (new_link.indexOf("contests") > -1) {
- new_link = new_link.replace(/contests/g, "users/" + user_login + "/contests")
+ new_link = new_link.replace(/contests/g, user_login + "/contests")
}
} else {
is_hidden = true
}
}
if (user_login && (new_link && new_link.indexOf("homes") > -1)) {
- new_link = new_link.replace(/homes/g, "users/" + user_login + "/user_activities")
+ new_link = new_link.replace(/homes/g, user_login + "/user_activities")
}
var waiLian = (new_link && str.filter(item=>new_link.indexOf(item)>-1) );
@@ -442,7 +442,7 @@ class NewHeader extends Component {
:
:""}
:
diff --git a/src/forge/Main/Detail.js b/src/forge/Main/Detail.js
index 583b4db3d..4f930ce42 100644
--- a/src/forge/Main/Detail.js
+++ b/src/forge/Main/Detail.js
@@ -413,11 +413,10 @@ class Detail extends Component {
}
textFunc = (forked_from_project_id,fork_info)=>{
- let type = fork_info && fork_info.fork_project_user_type;
return forked_from_project_id && fork_info ?
:
-
+
}
diff --git a/src/forge/Main/sub/Contribute.jsx b/src/forge/Main/sub/Contribute.jsx
index f65b45248..76d56dc89 100644
--- a/src/forge/Main/sub/Contribute.jsx
+++ b/src/forge/Main/sub/Contribute.jsx
@@ -52,7 +52,7 @@ function Contribute(props){
diff --git a/src/forge/Merge/MessageCount.js b/src/forge/Merge/MessageCount.js
index f3e58657a..427dda900 100644
--- a/src/forge/Merge/MessageCount.js
+++ b/src/forge/Merge/MessageCount.js
@@ -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}
diff --git a/src/forge/Newfile/UserSubmitComponent.js b/src/forge/Newfile/UserSubmitComponent.js
index 5cba3cf62..25504f64a 100644
--- a/src/forge/Newfile/UserSubmitComponent.js
+++ b/src/forge/Newfile/UserSubmitComponent.js
@@ -150,7 +150,7 @@ class UserSubmitComponent extends Component {
return (
{
return(
-
+
+
+
由
{data && data.author_name}
diff --git a/src/forge/Order/OrderItem.js b/src/forge/Order/OrderItem.js
index 3c5e5cf85..1369b5976 100644
--- a/src/forge/Order/OrderItem.js
+++ b/src/forge/Order/OrderItem.js
@@ -67,7 +67,7 @@ class OrderItem extends Component {
(
-
+
{text}
),
diff --git a/src/forge/Settings/Setting.js b/src/forge/Settings/Setting.js
index ba6e7a5a7..02295ce0d 100644
--- a/src/forge/Settings/Setting.js
+++ b/src/forge/Settings/Setting.js
@@ -351,7 +351,7 @@ class Setting extends Component {
{
is_transfering ?
此仓库正在转移给【
- {transfer && {transfer.name}}
+ {transfer && {transfer.name}}
】,请联系对方接收此仓库。
:
`将此仓库转移给其他用户或组织`
diff --git a/src/forge/Source/Index.jsx b/src/forge/Source/Index.jsx
index 8ba925878..e158d7fba 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(
+
+
+ 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/TeamGroupItems.jsx b/src/forge/Team/TeamGroupItems.jsx
index b482942c7..f7f12b2d2 100644
--- a/src/forge/Team/TeamGroupItems.jsx
+++ b/src/forge/Team/TeamGroupItems.jsx
@@ -86,7 +86,7 @@ function TeamGroupItems({organizeDetail,limit, count , history}){
{
item.users && item.users.map((i,k)=>{
return(
- k < count ?