@@ -128,7 +128,7 @@ class MergeFooter extends Component {
tab={
评论
- {commentsTotalCount && (
+ {commentsTotalCount > 0 && (
{commentsTotalCount}
)}
diff --git a/src/forge/Merge/MessageCount.js b/src/forge/Merge/MessageCount.js
index 6409bd7f1..abdea3dd4 100644
--- a/src/forge/Merge/MessageCount.js
+++ b/src/forge/Merge/MessageCount.js
@@ -445,7 +445,7 @@ class MessageCount extends Component {
type="green"
ghost
className="ml20"
- onClick={()=>{this.props.history.push(`/${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 8913b0d1c..c5c5e2df6 100644
--- a/src/forge/Merge/NewMerge.js
+++ b/src/forge/Merge/NewMerge.js
@@ -194,7 +194,7 @@ class NewMerge extends Component {
// this.ischeckmerge();
let { id ,merge , pull } = this.state;
if(type==="pull"){
- this.props.history.push(`/${owner}/${projectsId}/pulls/new/${pull}`)
+ this.props.history.push(`/${owner}/${projectsId}/compare/${pull}`)
this.compareProject(id,value,merge);
}else{
this.compareProject(id,pull,value);
@@ -216,7 +216,7 @@ class NewMerge extends Component {
merge_user_login: is_fork_id ? projects_names[0].project_user_login : undefined
}
})
- this.props.history.push(`/${login}/${identifier}/pulls/new`);
+ this.props.history.push(`/${login}/${identifier}/compare`);
this.newMergelist(login,identifier);
};
diff --git a/src/forge/Merge/merge.js b/src/forge/Merge/merge.js
index 399c9bd91..2e742d720 100644
--- a/src/forge/Merge/merge.js
+++ b/src/forge/Merge/merge.js
@@ -213,7 +213,7 @@ class merge extends Component {
checkOperation() {
const { projectsId,owner } = this.props.match.params;
- this.props.history.push(`/${owner}/${projectsId}/pulls/new`);
+ this.props.history.push(`/${owner}/${projectsId}/compare`);
}
render() {
const { projectsId , owner } = this.props.match.params;
diff --git a/src/forge/Merge/merge_footer.js b/src/forge/Merge/merge_footer.js
index 5e3a75560..868e736fe 100644
--- a/src/forge/Merge/merge_footer.js
+++ b/src/forge/Merge/merge_footer.js
@@ -1,169 +1,84 @@
-import React, { Component } from "react";
-import { Tabs, Spin } from "antd";
-import "../Order/order.css";
-import "./merge.css";
-import Commits from "./Commits";
-import Comments from "../comments/comments";
-import Files from "./Files";
-import axios from 'axios';
+import React, { Component } from 'react';
+import { Tabs } from 'antd';
+import Commits from './Commits';
+import Files from './Files';
+
+import '../Order/order.css';
+import './merge.css';
+
const { TabPane } = Tabs;
class MergeFooter extends Component {
- constructor(props){
+ constructor(props) {
super(props);
- this.state={
- pageData:undefined,
- commitsData:undefined,
- filesData:undefined,
- isSpin:false,
- activeKey:"1",
- commitCount:0,
- filesCount:0
- }
- }
- componentDidMount=()=>{
- const { footer_type ,data } = this.props;
- if(footer_type){
- const { projectsId , owner , mergeId } = this.props.match.params;
- this.getCommit(owner,projectsId,mergeId);
- this.getFile(owner,projectsId,mergeId);
- }
- this.setState({
- activeKey:footer_type ? "1" : "2",
- commitCount:data && data.commits_count,
- filesCount:data && data.files_count
- })
- }
- componentDidUpdate=(prevProps)=>{
- const { comparesData } = this.props;
- const { footer_type } = this.props;
- if(footer_type){
- const { data } = this.props;
- if(data !== prevProps.data){
- this.setState({
- commitCount:data && data.commits_count,
- filesCount:data && data.files_count
- })
- }
- }
- if(comparesData !== prevProps.comparesData){
- this.setState({
- activeKey:footer_type ? "1" : "2"
- })
- this.changeTab(footer_type ? "1" : "2");
- }
+ this.state = {
+ activeKey: '1',
+ };
}
- changeTab=(index)=>{
+ changeTab = (index) => {
this.setState({
- isSpin:true
- })
- this.setState({
- activeKey:index
- })
- const { footer_type , comparesData } = this.props;
- const { projectsId , owner , mergeId } = this.props.match.params;
-
- if(footer_type){
- if(index === "2"){
- this.getCommit(owner,projectsId,mergeId);
- }else if(index === "3"){
- this.getFile(owner,projectsId,mergeId);
- }else{
- this.setState({
- isSpin:false
- })
- }
- }else{
- this.setState({
- commitsData:comparesData.commits,
- filesData:comparesData.diff,
- commitCount:comparesData.commits_count,
- filesCount:comparesData.diff && comparesData.diff.files_count,
- isSpin:false
- })
- }
- }
-
- getCommit =(owner,projectsId,mergeId)=>{
- const url = `/${owner}/${projectsId}/pulls/${mergeId}/commits.json`;
- axios.get(url).then(result=>{
- if(result){
- this.setState({
- commitsData:result.data.commits,
- isSpin:false,
- commitCount:result.data.commits_count
- })
- }
- }).catch(error=>{})
- }
-
- getFile =(owner,projectsId,mergeId)=>{
- const url = `/${owner}/${projectsId}/pulls/${mergeId}/files.json`;
- axios.get(url).then(result=>{
- if(result){
- this.setState({
- filesData:result.data,
- isSpin:false,
- filesCount:result.data.files_count,
- })
- }
- }).catch(error=>{})
- }
+ activeKey: index,
+ });
+ };
render() {
- const { projectsId , owner } = this.props.match.params;
+ const { projectsId, owner } = this.props.match.params;
+ const { comparesData = {} } = this.props;
+ const { commits, diff, commits_count } = comparesData;
+ const { activeKey } = this.state;
- const { footer_type, order_id, data , comparesData } = this.props;
- let { isSpin , activeKey , filesCount, commitCount , filesData , commitsData } = this.state;
-
- return (
- !footer_type && !comparesData || (comparesData && ((comparesData.commits && comparesData.commits.length===0)||(comparesData && !comparesData.diff)) )?"":
-
-
-
- {
- footer_type &&
- 评论
- {data && parseInt(data.comments_count) > 0 && {data.comments_count}}
-
- } key="1">
-
-
- }
- {
- commitsData && commitsData.length > 0 &&
- 提交
- {commitCount > 0 && {commitCount}}
- } key="2">
-
-
- }
- {
- filesData && filesData.files && filesData.files.length>0 &&
- 文件
- {filesCount > 0 && {filesCount}}
-
- } key="3">
-
-
- }
-
-
-
+ return (commits && commits.length === 0) || !diff ? (
+ ''
+ ) : (
+
+
+ {commits && commits.length > 0 && (
+
+ 提交
+ {commits_count > 0 && (
+ {commits_count}
+ )}
+
+ }
+ key="1"
+ >
+
+
+ )}
+ {diff && diff.files && diff.files.length > 0 && (
+
+ 文件
+ {diff.files_count > 0 && (
+ {diff.files_count}
+ )}
+
+ }
+ key="3"
+ >
+
+
+ )}
+
);
}
diff --git a/src/forge/Merge/merge_form.js b/src/forge/Merge/merge_form.js
index 1f03a433e..4716bdfca 100644
--- a/src/forge/Merge/merge_form.js
+++ b/src/forge/Merge/merge_form.js
@@ -165,7 +165,8 @@ class MergeForm extends Component {
this.setState({
isSpin: false,
});
- this.props.history.push(`/${owner}/${projectsId}/pulls`);
+ const { pull_request_id } = result.data;
+ this.props.history.push(`/${owner}/${projectsId}/pulls/${pull_request_id}`);
const { getDetail } = this.props;
getDetail && getDetail();
} else {
diff --git a/src/forge/Merge/no_data.js b/src/forge/Merge/no_data.js
index d5584797f..f403bb4ea 100644
--- a/src/forge/Merge/no_data.js
+++ b/src/forge/Merge/no_data.js
@@ -12,7 +12,7 @@ class Nodata extends Component{
欢迎使用合并请求！
- 合并请求可以帮助您与他人协作编写代码。在使用之前，请先创建一个 合并请求
+ 合并请求可以帮助您与他人协作编写代码。在使用之前，请先创建一个 合并请求