路由：tree后面的参数branch内容含有/

src/forge/Component/DrawerPanel.jsx

@@ -71,7 +71,7 @@ function DrawerPanel({visible,onClose,branch,owner,projectsId,history, name , li
     let dataref = event.node.props.dataRef;
     if(dataref.type==="file"){
       onClose();
-      history.push(`/projects/${owner}/${projectsId}/tree/${branch}/${dataref.path}`);
+      history.push(`/projects/${owner}/${projectsId}/tree/${branch.replaceAll("/","%2F")}/${dataref.path}`);
     }
   }
 

src/forge/DevOps/Dispose/List.jsx

@@ -66,7 +66,7 @@ function List({ list, operate , projectsId , owner , showModal , deleteFunc }){
       ellipsis:true,
       render:(value,item)=>{
         return(
-          <Link to={`/projects/${owner}/${projectsId}/tree/${item.branch}/${value}`} className="color-blue">{value}</Link>
+          <Link to={`/projects/${owner}/${projectsId}/tree/${item.branch.replaceAll("/","%2F")}/${value}`} className="color-blue">{value}</Link>
         )
       }
     },

src/forge/Main/CoderDepot.jsx

@@ -50,7 +50,8 @@ function CoderDepot(props){
 
   const owner = props.match.params.owner;
   const projectsId = props.match.params.projectsId;
-  const branchName = props.match.params.branchName;
+  let branchName = props.match.params.branchName;
+  branchName = branchName && branchName.replaceAll("%2F",'/');
   const details = props.projectDetail;
   let pathname = props.history.location.pathname;
 
@@ -75,8 +76,9 @@ function CoderDepot(props){
 
   useEffect(()=>{
     if (projectsId && owner && defaultBranch){
-      if(pathname.indexOf(`/projects/${owner}/${projectsId}`) > -1 && pathname.indexOf(`/tree/${branchName}/`) > -1) {
+      let b = branchName && branchName.replaceAll("/","%2F");
-        let url = pathname.split(`/tree/${branchName}/`)[1];
+      if(pathname.indexOf(`/projects/${owner}/${projectsId}`) > -1 && pathname.indexOf(`/tree/${b}/`) > -1) {
+        let url = pathname.split(`/tree/${b}/`)[1];
         setTreeValue(url);
         getFileInfo(url,branchName);
         setType("file");
@@ -92,6 +94,7 @@ function CoderDepot(props){
   function getDirInfo(branch){
     setIsSpin(true);
     const url = `/${owner}/${projectsId}/entries.json`;
+
     axios.get(url, { 
       params: { ref: branch } 
     }).then((result) => {
@@ -158,17 +161,20 @@ function CoderDepot(props){
 
   // 切换分支或者标签
   function changeBranch(value){
-    let url = `/projects/${owner}/${projectsId}${value && `/tree/${value}`}${treeValue ? `/${treeValue}`:""}`;
+    let url = `/projects/${owner}/${projectsId}${value && `/tree/${value.replaceAll("/","%2F")}`}${treeValue ? `/${treeValue}`:""}`;
     props.history.push(url);
   }
     
   // 文件相关的下拉项
-  const fileMenu =(
+  function fileMenu(){
+    let b = branchName || defaultBranch;
+    return (
     <Menu>
-      <Menu.Item><a onClick={()=>urlLink(`/projects/${owner}/${projectsId}/${branchName || defaultBranch}/uploadfile${treeValue === undefined ? "" : `/${treeValue}`}`)}>上传文件</a></Menu.Item>
+      <Menu.Item><a onClick={()=>urlLink(`/projects/${owner}/${projectsId}/${b.replaceAll("/","%2F")}/uploadfile${treeValue === undefined ? "" : `/${treeValue}`}`)}>上传文件</a></Menu.Item>
-      <Menu.Item><a onClick={()=>urlLink(`/projects/${owner}/${projectsId}/${branchName || defaultBranch}/newfile${treeValue === undefined ? "" : `/${treeValue}`}`)}>新建文件</a></Menu.Item>
+      <Menu.Item><a onClick={()=>urlLink(`/projects/${owner}/${projectsId}/${b.replaceAll("/","%2F")}/newfile${treeValue === undefined ? "" : `/${treeValue}`}`)}>新建文件</a></Menu.Item>
     </Menu>
-  )
+    )
+  }
 
   function getPathUrl(array,index){
     if(array && array.length>0 && index){
@@ -183,16 +189,18 @@ function CoderDepot(props){
   function returnMain(){
     setTreeValue(undefined);
     let branch = branchName || defaultBranch;
-    props.history.push(`/projects/${owner}/${projectsId}/tree/${branch}`);
+    props.history.push(`/projects/${owner}/${projectsId}/tree/${branch.replaceAll("/","%2F")}`);
   };
   // 子目录路径返回链接
   function returnUlr(url){
-    props.history.push(`/projects/${owner}/${projectsId}/tree${branchName?`/${branchName}`:""}/${url}`);
+    let enBranch = branchName && branchName.replaceAll("/","%2F");
+    props.history.push(`/projects/${owner}/${projectsId}/tree${enBranch?`/${enBranch}`:""}/${url}`);
   }
   // 点击跳转到子目录
   function goToSubRoot(path,type,filename){
+    let enBranch = branchName || defaultBranch;
     setType(type);
-    props.history.push(`/projects/${owner}/${projectsId}${`/tree/${branchName || defaultBranch}`}${path?`/${path}`:""}`);
+    props.history.push(`/projects/${owner}/${projectsId}${`/tree/${enBranch.replaceAll("/","%2F")}`}${path?`/${path}`:""}`);
   }
 
   function onEdit(readOnly){
@@ -317,7 +325,7 @@ function CoderDepot(props){
                         <a onClick={()=>urlLink(`/projects/${owner}/${projectsId}/issues/new`)} >+ 任务</a>
                       </div>
                       { fileOperate &&
-                        <Dropdown overlay={fileMenu} className="mr20" trigger={['click']}>
+                        <Dropdown overlay={fileMenu()} className="mr20" trigger={['click']}>
                           <Button type="default">文件 <i className="iconfont icon-sanjiaoxing-down ml3 font-14 color-grey-9"></i></Button>
                         </Dropdown>
                       }

src/forge/Main/CoderRootBranch.js

@@ -32,7 +32,7 @@ export default ((props)=>{
               return(
                 <li key={key}>
                   <div>
-                    <Link to={`/projects/${owner}/${projectsId}/tree/${item.name}`} className="color-blue font-15" style={{"maxWidth":"100px"}}>{item.name}</Link>
+                    <Link to={`/projects/${owner}/${projectsId}/tree/${item.name.replaceAll("/","%2F")}`} className="color-blue font-15" style={{"maxWidth":"100px"}}>{item.name}</Link>
                     <p className="f-wrap-alignCenter mt15">
                       <Link to={`/projects/${owner}/${projectsId}/commits/${truncateCommitId(`${item.last_commit.sha}`)}`} className="mr5 commitKey" style={{marginLeft:0}}>{item.last_commit && truncateCommitId(item.last_commit.sha)}</Link>
                       <span className="color-grey-3 hide-1 messages leftPoint">{item.last_commit && item.last_commit.message}</span>

src/forge/Merge/MergeItem.js

@@ -99,33 +99,43 @@ class MergeItem extends Component {
                     </span>
                     <span className="color-grey-8">{item.pr_time}</span>
                     <span className="ml15">
-                      <Tag className="pr-branch-tag">
+                      {
-                        <Link
+                        item.pull_request_head &&
-                          to={`/projects/${item.is_original ? item.fork_project_user : owner}/${ item.is_original ? item.fork_project_identifier : projectsId }/tree/${item.pull_request_head}`}
+                        <Tag className="pr-branch-tag">
-                          className="maxW200px hide-1 ver-middle"
+                          <Link
-                        >
+                            to={`/projects/${item.is_original ? item.fork_project_user : owner}/${ item.is_original ? item.fork_project_identifier : projectsId }/tree/${item.pull_request_head.replaceAll("/","%2F")}`}
-                          {item.is_original
+                            className="maxW200px hide-1 ver-middle"
-                            ? item.fork_project_user
+                          >
-                            : project_author_name}
+                            {item.is_original
-                          :{item.pull_request_head}
+                              ? item.fork_project_user
-                        </Link>
+                              : project_author_name}
-                      </Tag>
+                            :{item.pull_request_head}
-                      <span className="mr8 ver-middle">
+                          </Link>
-                        <i
+                        </Tag>
-                          className={
+                      }
-                            "iconfont icon-youjiang color-grey-c font-16"
+                      {
-                          }
+                        item.pull_request_base && 
-                        ></i>
+                        <span className="mr8 ver-middle">
-                      </span>
+                          <i
-                      <Tag className="pr-branch-tag">
+                            className={
-                        <Link
+                              "iconfont icon-youjiang color-grey-c font-16"
-                          to={`/projects/${owner}/${projectsId}/tree/${item.pull_request_base}`}
+                            }
-                          className="maxW200px hide-1 ver-middle"
+                          ></i>
-                        >
+                        </span>
-                          {/* {item.is_fork ? item.pull_request_base : `${item.author_name}:${item.pull_request_base}`} */}
+                      }
-                          {project_author_name}:{item.pull_request_base}
+                      {
-                        </Link>
+                        item.pull_request_base && 
-                      </Tag>
+                        <Tag className="pr-branch-tag">
+                          <Link
+                            to={`/projects/${owner}/${projectsId}/tree/${item.pull_request_base.replaceAll("/","%2F")}`}
+                            className="maxW200px hide-1 ver-middle"
+                          >
+                            {/* {item.is_fork ? item.pull_request_base : `${item.author_name}:${item.pull_request_base}`} */}
+                            {project_author_name}:{item.pull_request_base}
+                          </Link>
+                        </Tag>
+                      }
+                      
                     </span>
                   </AlignCenter>
                 </p>

src/forge/Merge/MessageCount.js

@@ -337,10 +337,10 @@ class MessageCount extends Component {
                       <div className="mt15">
                         <Tag className="pr-branch-tag">
                           <Link
-                            to={`/projects/${owner}/${data.pull_request.is_original?data.project_identifier:projectsId}/tree/${data.pull_request.head}`}
+                            to={`/projects/${owner}/${data.pull_request.is_original?data.project_identifier:projectsId}/tree/${data.pull_request.head && data.pull_request.head.replaceAll("/","%2F")}`}
                             className="ver-middle"
                           >
-                            {data.pull_request.is_original ? data.pull_request.fork_project_user : data.issue.project_author_name}:{data.pull_request.head}
+                            {data.pull_request.is_original ? data.pull_request.fork_project_user : data.issue.project_author_name}:{data.pull_request.head && data.pull_request.head.replaceAll("/","%2F")}
                           </Link>
                         </Tag>
                         <span className="mr8 ver-middle">

src/forge/Newfile/UserSubmitComponent.js

@@ -59,7 +59,7 @@ class UserSubmitComponent extends Component {
         const url = `/${owner}/${projectsId}/create_file.json`;
         axios.post(url, {
           filepath: filename ? filename : path,
-          branch: branch,
+          branch: branch && branch.replaceAll("%2F","/"),
           new_branch: submitType === "1" ? values.branchname : undefined,
           content,
           message: values.desc,
@@ -72,7 +72,7 @@ class UserSubmitComponent extends Component {
               const { getTopCount } = this.props;
               getTopCount && getTopCount(values.branchname);
             }
-            let url = `/projects/${owner}/${projectsId}${values.branchname ? `/tree/${values.branchname}`: (branch ? `/tree/${branch}` : "")}`;
+            let url = `/projects/${owner}/${projectsId}${values.branchname ? `/tree/${values.branchname.replaceAll('/',"%2F")}`: (branch ? `/tree/${branch.replaceAll('/',"%2F")}` : "")}`;
             this.props.history.push(url);
           }
         })
@@ -93,12 +93,13 @@ class UserSubmitComponent extends Component {
     const { projectsId , owner } = this.props.match.params;
     const { submitType } = this.state;
     const url = `/${owner}/${projectsId}/update_file.json`;
+    let b = currentBranch || branch;
     this.props.form.validateFieldsAndScroll((err, values) => {
       if (!err) {
         axios
           .put(url, {
             filepath: detail.path,
-            branch: submitType === "1" ? undefined : (currentBranch || branch),
+            branch: submitType === "1" ? undefined : b.replaceAll('%2F',"/"),
             new_branch: submitType === "1" ? values.branchname : undefined,
             content: content,
             sha: detail.sha,
@@ -107,7 +108,8 @@ class UserSubmitComponent extends Component {
           .then((result) => {
             this.setState({ isSpin: false });
             if (result.data && result.data.status === 1) {
-              let url = `/projects/${owner}/${projectsId}${(values.branchname ? `/tree/${values.branchname}` : ((currentBranch || branch) ? `/tree/${currentBranch || branch}`:""))}`;
+              let b = currentBranch || branch;
+              let url = `/projects/${owner}/${projectsId}${(values.branchname ? `/tree/${values.branchname.replaceAll('/',"%2F")}` : (b ? `/tree/${b.replaceAll('/',"%2F")}`:""))}`;
               this.props.history.push(url);
               this.props.showNotification("文件修改成功!");
             }
@@ -130,6 +132,7 @@ class UserSubmitComponent extends Component {
 
     const { current_user, filepath, projectDetail , currentBranch } = this.props;
     const { editor_type } = this.props;
+    let b = currentBranch || branch;
     return (
       <div>
         <span className="df" style={{ alignItems: "center" }}>
@@ -188,7 +191,7 @@ class UserSubmitComponent extends Component {
                 >
                   <Radio value="0" className="mb10">
                     <i className="iconfont icon-banbenku font-16 mr5"></i>
-                    直接提交至<span className="color-orange">{currentBranch || branch}</span>分支
+                    直接提交至<span className="color-orange">{b.replaceAll('%2F',"/")}</span>分支
                   </Radio>
                   <Radio value="1">
                     <Icon type="pull-request" className="mr5" />