From b59409e2fccebb496735409bd3b42d4f4f2147ac Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Mon, 25 Apr 2022 14:38:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=8E=E5=90=84=E6=96=B0=E5=BB=BA=E5=90=88?=
 =?UTF-8?q?=E5=B9=B6=E8=AF=B7=E6=B1=82=E7=82=B9=E5=87=BB=E6=97=B6=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC=E7=9A=84=E9=93=BE=E6=8E=A5=E8=A6=81=E6=98=AF=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E5=88=86=E6=94=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/Main/CoderDepot.jsx  |  2 +-
 src/forge/Main/tree/Index.jsx  |  6 +++---
 src/forge/Merge/CreateMerge.js |  6 ++++--
 src/forge/Merge/merge.js       |  8 +++++---
 src/forge/Merge/no_data.js     |  4 ++--
 src/forge/Settings/Branch.js   | 15 ++++-----------
 6 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/src/forge/Main/CoderDepot.jsx b/src/forge/Main/CoderDepot.jsx
index 6d45159ba..4183131b0 100644
--- a/src/forge/Main/CoderDepot.jsx
+++ b/src/forge/Main/CoderDepot.jsx
@@ -436,7 +436,7 @@ function CoderDepot(props){
                       <div className="addOptionBtn">
                         {
                           baseOperate &&
-                          <CheckProfile {...props} sureFunc={()=>urlLink(`/${owner}/${projectsId}/compare/master...${turnbar(branchName || defaultBranch)}`)} >+ 合并请求</CheckProfile>
+                          <CheckProfile {...props} sureFunc={()=>urlLink(`/${owner}/${projectsId}/compare/${turnbar(branchName || defaultBranch)}...${turnbar(branchName || defaultBranch)}`)} >+ 合并请求</CheckProfile>
                         }
                         {
                           issuesFlag &&
diff --git a/src/forge/Main/tree/Index.jsx b/src/forge/Main/tree/Index.jsx
index 2829331b9..f7aa7bd8b 100644
--- a/src/forge/Main/tree/Index.jsx
+++ b/src/forge/Main/tree/Index.jsx
@@ -14,8 +14,8 @@ function Index(props) {
   const [ isSpin , setIsSpin ] = useState(true);
 
   const { projectsId , owner } = props.match.params;
-  const { isManager , isDeveloper , projectDetail } = props;
-
+  const { isManager , isDeveloper , projectDetail , defaultBranch } = props;
+  
   useEffect(()=>{
     getList();
   },[])
@@ -85,7 +85,7 @@ function Index(props) {
                             <div className="treeabout">
                               {
                                 (isManager || isDeveloper) && (projectDetail && projectDetail.type!==2) &&
-                                <Link to={`/${owner}/${projectsId}/compare/master...${turnbar(i.name)}`} className="btn-83">+ 合并请求</Link>
+                                <Link to={`/${owner}/${projectsId}/compare/${turnbar(defaultBranch)}...${turnbar(i.name)}`} className="btn-83">+ 合并请求</Link>
                               }
                               <Dropdown overlay={menu(i.zip_url,i.tar_url)} trigger={['click']} placement="bottomRight">
                                 <a className="btn-83 ml15">下载<i className="iconfont icon-sanjiaoxing-down font-14"></i></a>
diff --git a/src/forge/Merge/CreateMerge.js b/src/forge/Merge/CreateMerge.js
index e6d0d0376..3aeaa4a24 100644
--- a/src/forge/Merge/CreateMerge.js
+++ b/src/forge/Merge/CreateMerge.js
@@ -291,14 +291,16 @@ class CreateMerge extends Component {
     });
     // 加上是否需要切换url判断
     if(isChangeProject){
+      const { defaultBranch } = this.props;
+      let branch = turnbar(defaultBranch) || "master";
       if (login === pullOwner) {
         // 如果切换后, 仓库与源仓库一致了
         this.props.history.push(
-          `/${login}/${identifier}/compare/master...${turnbar(pullBranch)}`
+          `/${login}/${identifier}/compare/${branch}...${turnbar(pullBranch)}`
         );
       } else {
         this.props.history.push(
-          `/${login}/${identifier}/compare/master...${pullOwner}:${turnbar(pullBranch)}`
+          `/${login}/${identifier}/compare/${branch}...${pullOwner}:${turnbar(pullBranch)}`
         );
       }
     }
diff --git a/src/forge/Merge/merge.js b/src/forge/Merge/merge.js
index 0f6f1ac81..769d2d472 100644
--- a/src/forge/Merge/merge.js
+++ b/src/forge/Merge/merge.js
@@ -6,6 +6,7 @@ import "../Order/index.scss";
 import NoneData from "./no_data";
 import MergeItem from "./MergeItem";
 import './Index.scss';
+import { turnbar } from "educoder";
 
 import axios from "axios";
 import CheckProfile from '../Component/ProfileModal/Profile';
@@ -210,10 +211,11 @@ class merge extends Component {
     
     this.getIssueList();
   };
-
   checkOperation() {
+    const { defaultBranch } = this.props;
     const { projectsId,owner } = this.props.match.params;
-    this.props.history.push(`/${owner}/${projectsId}/compare/master...master`);
+    let branch = turnbar(defaultBranch) || "master";
+    this.props.history.push(`/${owner}/${projectsId}/compare/${branch}...${branch}`);
   }
   render() {
     const { projectsId , owner } = this.props.match.params;
@@ -414,7 +416,7 @@ class merge extends Component {
             ) : (
               ""
             )}
-            { data && data.issues && data.issues.length === 0 ? <NoneData _html="暂时还没有相关数据!" user_admin_or_developer={data.user_admin_or_developer} projectsId={projectsId} owner={owner} /> :""}
+            { data && data.issues && data.issues.length === 0 ? <NoneData _html="暂时还没有相关数据!" user_admin_or_developer={data.user_admin_or_developer} projectsId={projectsId} owner={owner} defaultBranch={this.props && turnbar(this.props.defaultBranch) }/> :""}
           </Spin>
         </div>
       </div>
diff --git a/src/forge/Merge/no_data.js b/src/forge/Merge/no_data.js
index 76258f8ca..e41e1dfa1 100644
--- a/src/forge/Merge/no_data.js
+++ b/src/forge/Merge/no_data.js
@@ -2,7 +2,7 @@ import React , { Component } from 'react';
 import { Link } from "react-router-dom";
 class Nodata extends Component{
   render(){
-    const { _html, projectsId , owner , user_admin_or_developer} = this.props;
+    const { _html, projectsId , owner , user_admin_or_developer , defaultBranch} = this.props;
     return(
       <div className="none_panels">
         <div>
@@ -12,7 +12,7 @@ class Nodata extends Component{
           <h3>欢迎使用合并请求！</h3>
         
           <div className="color-grey-8">
-          合并请求可以帮助您与他人协作编写代码。{ user_admin_or_developer && <span>在使用之前，请先创建一个 <Link className="color-blue" to={`/${owner}/${projectsId}/compare/master...master`}>合并请求</Link></span> }
+          合并请求可以帮助您与他人协作编写代码。{ user_admin_or_developer && <span>在使用之前，请先创建一个 <Link className="color-blue" to={`/${owner}/${projectsId}/compare/${defaultBranch}...${defaultBranch}`}>合并请求</Link></span> }
           </div>
         </div>
       </div>
diff --git a/src/forge/Settings/Branch.js b/src/forge/Settings/Branch.js
index 3e19f37e7..f7e83101d 100644
--- a/src/forge/Settings/Branch.js
+++ b/src/forge/Settings/Branch.js
@@ -21,24 +21,17 @@ export default ((props)=>{
 
   const [ count , setCount ] = useState(0);
   const [ page , setPage ] = useState(1);
-  let defaultBranch = props.defaultBranch;
-
 
   useEffect(()=>{
-    if(defaultBranch){
-      setBranch(defaultBranch);
-      setProtectBranch(defaultBranch);
+    if(props.defaultBranch){
+      setBranch(props.defaultBranch);
+      setProtectBranch(props.defaultBranch);
     }
-  },[defaultBranch]);
+  },[props.defaultBranch]);
   
   const { projectsId , owner } = props.match.params;
   const projectDetail = props.projectDetail;
 
-  useEffect(()=>{
-    if(defaultBranch){
-      setBranch(defaultBranch);
-    }
-  },[defaultBranch]);
 
   useEffect(()=>{
     if(owner){