-
{item.name}
+
{item.name}
{item.last_commit && truncateCommitId(item.last_commit.sha)}
{item.last_commit && item.last_commit.message}
diff --git a/src/forge/Main/CoderRootCommit.js b/src/forge/Main/CoderRootCommit.js
index 36585fe3..ddb47a2b 100644
--- a/src/forge/Main/CoderRootCommit.js
+++ b/src/forge/Main/CoderRootCommit.js
@@ -12,7 +12,6 @@ class CoderRootCommit extends Component{
constructor(props){
super(props)
this.state={
- branch:"master",
commitDatas:undefined,
dataCount:undefined,
limit:20,
@@ -22,11 +21,23 @@ class CoderRootCommit extends Component{
}
componentDidMount=()=>{
- const { branch , page , limit } = this.state;
+ this.Init();
+ }
+
+ componentDidUpdate=(prevProps)=>{
+ const { location } = this.props;
+ const prevlocation = prevProps && prevProps.location;
+ if (location !== prevlocation) {
+ this.Init();
+ }
+ }
+ Init =()=>{
+ const { branchName } = this.props.match.params;
+ const { page , limit } = this.state;
this.setState({
isSpining:true
})
- this.getCommitList( branch , page , limit );
+ this.getCommitList( branchName , page , limit );
}
getCommitList=(branch , page , limit)=>{
@@ -68,26 +79,28 @@ class CoderRootCommit extends Component{
// 切换分支 search:tag为根据标签搜索
changeBranch=(value)=>{
- const { page , limit } = this.state;
- const { getTopCount } = this.props;
- this.setState({
- isSpining:true,
- branch:value,
- })
- this.getCommitList(value , page , limit);
- getTopCount && getTopCount(value);
+ // const { page , limit } = this.state;
+ // const { getTopCount } = this.props;
+ // this.setState({
+ // isSpining:true,
+ // branch:value,
+ // })
+ // this.getCommitList(value , page , limit);
+ // getTopCount && getTopCount(value);
+ const { projectsId , owner } = this.props.match.params;
+ this.props.history.push(`/projects/${owner}/${projectsId}/commits/branch/${value}`);
}
ChangePage=(page)=>{
-
- const { branch , limit } = this.state;
- this.getCommitList(branch , page , limit);
+ const { branchName } = this.props.match.params;
+ const { limit } = this.state;
+ this.getCommitList(branchName , page , limit);
}
render(){
- const { branch , commitDatas , dataCount , limit , page , isSpining } = this.state;
- const { branchs , projectDetail, commit_class } = this.props;
- const { projectsId , owner } = this.props.match.params;
-
+ const { commitDatas , dataCount , limit , page , isSpining } = this.state;
+ const { projectDetail, commit_class } = this.props;
+ const { projectsId , owner , branchName } = this.props.match.params;
+ let branch = branchName || "master";
return(
@@ -98,6 +111,7 @@ class CoderRootCommit extends Component{
branch={branch}
changeBranch={this.changeBranch}
owner={owner}
+ history={this.props.history}
>
diff --git a/src/forge/Main/CoderRootDirectory.js b/src/forge/Main/CoderRootDirectory.js
index 521c72f2..41dc9b51 100644
--- a/src/forge/Main/CoderRootDirectory.js
+++ b/src/forge/Main/CoderRootDirectory.js
@@ -34,7 +34,7 @@ class CoderRootDirectory extends Component {
super(props);
this.state = {
address: "http",
- branch: "master",
+ branch: props.match.params.branchName || "master",
filePath: undefined,
subFileType: undefined,
readMeContent: undefined,
@@ -79,31 +79,16 @@ class CoderRootDirectory extends Component {
Init = () => {
let { search } = this.props.history.location;
- let branchName = undefined;
- if (search && (search.indexOf("?branch=") > -1 || search.indexOf("&branch=") > -1)) {
- branchName = search.split("branch=")[1];
-
- if(branchName && branchName.indexOf("&")){
- branchName=branchName.split("&")[0];
- }
- this.setState({
- branch: branchName,
- });
- }else{
- branchName = undefined;
- this.setState({
- branch: "master",
- });
- }
+ const { branchName } = this.props.match.params;
+ let branch = branchName || "master";
if (search && (search.indexOf("?url=") > -1 || search.indexOf("&url=") > -1)) {
let url = search.split("url=")[1];
if(url && decodeURI(url).indexOf("&")){
url=decodeURI(url).split("&")[0];
}
- this.getFileDetail(decodeURI(url),branchName);
+ this.getFileDetail(decodeURI(url),branch);
} else {
- const { branch } = this.state;
- this.getProjectRoot(branchName || branch);
+ this.getProjectRoot(branch);
}
};
@@ -194,13 +179,13 @@ class CoderRootDirectory extends Component {
this.setState({
filePath: decodeURI(path),
});
- const { projectsId ,owner } = this.props.match.params;
- const { branch , chooseType } = this.state;
+ const { projectsId , owner , branchName } = this.props.match.params;
+ const { chooseType } = this.state;
const url = `/${owner}/${projectsId}/sub_entries.json`;
axios.get(url,{
params:{
filepath:path,
- ref:ref || branch,
+ ref:ref || branchName,
type:chooseType
}
}).then((result)=>{
@@ -325,24 +310,27 @@ class CoderRootDirectory extends Component {
// 选择分支
changeBranch = (value) => {
- this.setState({
- branch: value,
- isSpin: true,
- readOnly:true
- });
- const { getTopCount } = this.props;
- getTopCount && getTopCount(value);
+ // this.setState({
+ // branch: value,
+ // isSpin: true,
+ // readOnly:true
+ // });
+ // const { getTopCount } = this.props;
+ // getTopCount && getTopCount(value);
+
+ // let { search } = this.props.history.location;
+ // if (search && search.indexOf("?url=") > -1) {
+ // let url = search.split("?url=")[1];
+ // this.setState({
+ // filePath: decodeURI(url),
+ // });
+ // this.getFileDetail(decodeURI(url), value);
+ // } else {
+ // this.getProjectRoot(value);
+ // }
+ const { projectsId , owner } = this.props.match.params;
+ this.props.history.push(`/projects/${owner}/${projectsId}/branch/${value}`);
- let { search } = this.props.history.location;
- if (search && search.indexOf("?url=") > -1) {
- let url = search.split("?url=")[1];
- this.setState({
- filePath: decodeURI(url),
- });
- this.getFileDetail(decodeURI(url), value);
- } else {
- this.getProjectRoot(value);
- }
}
// 子目录路径返回链接
@@ -421,10 +409,11 @@ class CoderRootDirectory extends Component {
}
render(){
- const { branchLastCommit , lastCommitAuthor , rootList , branch ,filePath , fileDetail , subFileType , readMeContent, isSpin , zip_url , tar_url} = this.state;
+ const { branchLastCommit , lastCommitAuthor , rootList ,filePath , fileDetail , subFileType , readMeContent, isSpin , zip_url , tar_url} = this.state;
const { isManager , isDeveloper , projectDetail , platform } = this.props;
- const { projectsId , owner } = this.props.match.params;
+ const { projectsId , owner , branchName } = this.props.match.params;
+ let branch = branchName || "master";
const columns = [
{
dataIndex: 'name',
@@ -473,6 +462,7 @@ class CoderRootDirectory extends Component {
branch={branch}
changeBranch={this.changeBranch}
owner={owner}
+ history={this.props.history}
>
:
分支：master
diff --git a/src/forge/Main/CoderRootIndex.js b/src/forge/Main/CoderRootIndex.js
index 2aa8218f..0649c5dd 100644
--- a/src/forge/Main/CoderRootIndex.js
+++ b/src/forge/Main/CoderRootIndex.js
@@ -55,12 +55,19 @@ class CoderRootIndex extends Component{
}
componentDidMount=()=>{
- let { search } = this.props.history.location;
- let branchName = undefined;
- if (search && search.indexOf("?branch=") > -1) {
- branchName = search.split("?branch=")[1];
+ this.Init();
+ }
+ componentDidUpdate=(prevProps)=>{
+ const { location } = this.props;
+ const prevlocation = prevProps && prevProps.location;
+ if (location !== prevlocation) {
+ this.Init();
}
- this.getTopCount(branchName);
+ }
+
+ Init=()=>{
+ const { branchName } = this.props.match.params;
+ this.getTopCount(branchName || "master");
}
getTopCount=(branch)=>{
@@ -99,6 +106,11 @@ class CoderRootIndex extends Component{
>
{/* diff */}
+ ()
+ }
+ >
()
@@ -132,7 +144,12 @@ class CoderRootIndex extends Component{
() => ()
}
>
- ()
+ }
+ >
+ ()
}
diff --git a/src/forge/Main/Detail.js b/src/forge/Main/Detail.js
index 2dcdcac3..431c1f4d 100644
--- a/src/forge/Main/Detail.js
+++ b/src/forge/Main/Detail.js
@@ -708,6 +708,16 @@ class Detail extends Component {
(props) => ()
}
>
+ ()
+ }
+ >
+ ()
+ }
+ >
()
diff --git a/src/forge/Main/DetailTop.js b/src/forge/Main/DetailTop.js
index 5dcd240d..260ff1e6 100644
--- a/src/forge/Main/DetailTop.js
+++ b/src/forge/Main/DetailTop.js
@@ -16,7 +16,7 @@ class DetailTop extends Component {
{(coderCount && coderCount.commits_count) || 0}个提交
- 0 ? "active" : ""}>
+ 0 ? "active" : ""}>
{(coderCount && coderCount.branches_count) || 0}个分支
diff --git a/src/forge/Main/Diff.jsx b/src/forge/Main/Diff.jsx
index 8926ec6d..8007e1fc 100644
--- a/src/forge/Main/Diff.jsx
+++ b/src/forge/Main/Diff.jsx
@@ -59,7 +59,7 @@ export default ({ match , history }) => {
{commit && commit.message &&
{commit.message}
}
-
+