Merge branch 'develop'

public/css/edu-purge.css

@@ -3409,7 +3409,7 @@ a.user_bluebg_btn {
 }
 
 .cdefault {
-  cursor: default
+  cursor: default!important;
 }
 
 

public/css/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 2340181 */
-  src: url('iconfont.woff2?t=1623836536204') format('woff2'),
+  src: url('iconfont.woff2?t=1625800786751') format('woff2'),
-       url('iconfont.woff?t=1623836536204') format('woff'),
+       url('iconfont.woff?t=1625800786751') format('woff'),
-       url('iconfont.ttf?t=1623836536204') format('truetype');
+       url('iconfont.ttf?t=1625800786751') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,10 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-file-submodule:before {
+  content: "\e866";
+}
+
 .icon-nv1:before {
   content: "\e864";
 }

public/css/iconfont.json

@@ -5,6 +5,13 @@
   "css_prefix_text": "icon-",
   "description": "",
   "glyphs": [
+    {
+      "icon_id": "17575494",
+      "name": "file-submodule",
+      "font_class": "file-submodule",
+      "unicode": "e866",
+      "unicode_decimal": 59494
+    },
     {
       "icon_id": "7539612",
       "name": "nv",

src/App.js

@@ -78,6 +78,10 @@ const Search = Loadable({
 	loading: Loading,
 })
 
+const ProjectIndex = Loadable({
+  loader: () => import("./forge/Index"),
+  loading: Loading,
+});
 class App extends Component {
 	constructor(props) {
 		super(props);
@@ -103,30 +107,9 @@ class App extends Component {
 			Addcoursestypes: false
 		})
 	};
-	ModalCancelsy = () => {
-		this.setState({
-			mydisplay: false,
-		})
-		window.location.href = "/";
-	};
-	ModalshowCancelsy = () => {
-		this.setState({
-			mydisplay: true,
-		})
-	};
 
-	disableVideoContextMenu = () => {
-		window.$("body").on("mousedown", "video", function (event) {
-			if (event.which === 3) {
-				window.$('video').bind('contextmenu', function () { return false; });
-			} else {
-				window.$('video').unbind('contextmenu');
-			}
-		});
-	}
 	componentDidMount() {
 		document.title = "loading...";
-		this.disableVideoContextMenu();
 		initAxiosInterceptors(this.props);
 		this.getAppdata();
 
@@ -204,6 +187,8 @@ class App extends Component {
 	};
 
 	render() {
+		const { mygetHelmetapi } = this.state;
+		let personal = mygetHelmetapi && mygetHelmetapi.personal;
 		return (
 			<Provider store={store}>
 				<ConfigProvider locale={zhCN}>
@@ -265,7 +250,10 @@ class App extends Component {
 								<Route exact path="/"
 									render={
 										(props) => (
-											<Projects {...this.props} {...props} {...this.state}></Projects>
+											personal && personal.length > 0 ?
+											<InfosIndex {...this.props} {...props} />
+											:
+											<ProjectIndex {...this.props} {...props} />
 										)
 									}
 								/>

src/Loading.js

@@ -9,20 +9,7 @@ class Loading extends Component {
 	}
 
 	render() {
-		return (
+		return ""
-			<div className="App" style={{ minHeight: '800px', width: "100%" }}>
-				<style>
-					{
-						`
-						 .margintop{
-						   margin-top:20%;
-						 }
-						`
-					}
-				</style>
-				<Spin size="large" className={"margintop"} />
-			</div>
-		);
 	}
 }
 

src/forge/Component/DrawerPanel.jsx

@@ -4,6 +4,12 @@ import './Component.scss';
 import axios from 'axios';
 const { TreeNode , DirectoryTree } = Tree;
 
+function turnbar(str){
+  if(str && str.length>0 && str.indexOf("/")>-1){
+    return str.replaceAll('/','%2F');
+  }
+  return str;
+}
 function DrawerPanel({visible,onClose,branch,owner,projectsId,history, name , list}){
   const [ treeData , setTreeData ] = useState(undefined);
   const [ isSpin , setIsSpin ] = useState(true);
@@ -71,7 +77,8 @@ 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.replaceAll("/","%2F")}/${dataref.path}`);
+      let value = turnbar(branch);
+      history.push(`/projects/${owner}/${projectsId}/tree/${value}/${dataref.path}`);
     }
   }
 

src/forge/DevOps/Dispose/List.jsx

@@ -10,6 +10,12 @@ import { Link } from 'react-router-dom';
 //   killed:"已撤销",
 //   pending:"准备中"
 // }
+function turnbar(str){
+  if(str && str.length>0 && str.indexOf("/")>-1){
+    return str.replaceAll('/','%2F');
+  }
+  return str;
+}
 function renderTableStatus(status) {
   switch (status) {
     case "running":
@@ -65,8 +71,9 @@ function List({ list, operate , projectsId , owner , showModal , deleteFunc }){
       width:"15%",
       ellipsis:true,
       render:(value,item)=>{
+        let v = turnbar(item.branch);
         return(
-          <Link to={`/projects/${owner}/${projectsId}/tree/${item.branch.replaceAll("/","%2F")}/${value}`} className="color-blue">{value}</Link>
+          <Link to={`/projects/${owner}/${projectsId}/tree/${v}/${value}`} className="color-blue">{value}</Link>
         )
       }
     },

src/forge/Index.js

@@ -26,10 +26,6 @@ const ProjectDetail = Loadable({
   loading: Loading,
 });
 
-const Infos = Loadable({
-  loader: () => import("./users/Infos"),
-  loading: Loading,
-});
 class Index extends Component {
 
   componentDidUpdate=()=>{
@@ -74,12 +70,8 @@ class Index extends Component {
             )}
           ></Route>
           <Route
-            exact
             path="/"
             render={(props) => (
-              this.props.current_user && this.props.current_user.login ?
-              <Infos {...this.props} {...props} />
-              :
               <ProjectIndex {...this.props} {...props} />
             )}
           ></Route>

src/forge/Main/CoderDepot.jsx

@@ -19,12 +19,27 @@ import LanguagePower from '../Component/LanguagePower';
 import DrawerPanel from '../Component/DrawerPanel';
 import UpdateDescModal from './sub/UpdateDescModal';
 import Nodata from '../Nodata';
-
+import Invite from './sub/Invite';
 /**
  * projectDetail.type:0是托管项目，1是镜像项目，2是同步镜像项目(为2时不支持在线创建、在线上传、在线修改、在线删除、创建合并请求等功能)
  */
+
+function turnbar(str){
+  if(str && str.length>0 && str.indexOf("/")>-1){
+    return str.replaceAll('/','%2F');
+  }
+  return str;
+}
+function returnbar(str){
+  if(str && str.length>0 && str.indexOf("%2F")>-1){
+    return str.replaceAll('%2F','/');
+  }
+  return str;
+}
+
 function CoderDepot(props){
   const [ projectDetail , setProjectDetail ]= useState(undefined);
+  const [ inviteCode , setInviteCode ] = useState(undefined);
   const [ treeValue , setTreeValue ] = useState(undefined);
   const [ treeValuePath , setTreeValuePath ] = useState(undefined);
   const [ lastCommit,setLastCommit ] = useState(undefined);
@@ -46,12 +61,13 @@ function CoderDepot(props){
   const [ website , setWebsite ] = useState(undefined);
   const [ lesson_url , setLessonUrl ] = useState(undefined);
   const [ readme , setReadme ] = useState(undefined);
-  const [ defaultBranch , setDefaultBranch ] = useState(undefined)
+  const [ defaultBranch , setDefaultBranch ] = useState(undefined);
+  const [ editReadme , setEditReadme ] = useState(false);
 
   const owner = props.match.params.owner;
   const projectsId = props.match.params.projectsId;
   let branchName = props.match.params.branchName;
-  branchName = branchName && branchName.replaceAll("%2F",'/');
+  branchName = returnbar(branchName);
   const details = props.projectDetail;
   let pathname = props.history.location.pathname;
 
@@ -62,6 +78,7 @@ function CoderDepot(props){
       setWebsite(details.website);
       setLessonUrl(details.lesson_url);
       setDefaultBranch(details.default_branch);
+      setInviteCode(details.invite_code);
     }
   },[details])
 
@@ -76,7 +93,7 @@ function CoderDepot(props){
 
   useEffect(()=>{
     if (projectsId && owner && defaultBranch){
-      let b = branchName && branchName.replaceAll("/","%2F");
+      let b = turnbar(branchName) ;
       if(pathname.indexOf(`/projects/${owner}/${projectsId}`) > -1 && pathname.indexOf(`/tree/${b}/`) > -1) {
         let url = pathname.split(`/tree/${b}/`)[1];
         setTreeValue(url);
@@ -110,6 +127,7 @@ function CoderDepot(props){
         setMainFlag(true);
         setReadOnly(true);
         setReadme(result.data.readme);
+        setEditReadme(false);
         setHide(true);
       }
       setTimeout(function(){setIsSpin(false);},500);
@@ -152,7 +170,7 @@ function CoderDepot(props){
         setLastCommit(c && c.commit);
         setLastCommitAuthor(c && c.committer);
         setMainFlag(false);
-        setReadOnly(true);
+        setReadOnly(!editReadme);
         setHide(true);
       }
       setTimeout(function(){setIsSpin(false);},500)
@@ -161,17 +179,19 @@ function CoderDepot(props){
 
   // 切换分支或者标签
   function changeBranch(value){
-    let url = `/projects/${owner}/${projectsId}${value && `/tree/${value.replaceAll("/","%2F")}`}${treeValue ? `/${treeValue}`:""}`;
+    let checkvalue = turnbar(value);
+    let url = `/projects/${owner}/${projectsId}${value && `/tree/${checkvalue}`}${treeValue ? `/${treeValue}`:""}`;
     props.history.push(url);
   }
     
   // 文件相关的下拉项
   function fileMenu(){
     let b = branchName || defaultBranch;
+    let checkvalue = turnbar(b);
     return (
     <Menu>
-      <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}/${checkvalue}/uploadfile${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.Item><a onClick={()=>urlLink(`/projects/${owner}/${projectsId}/${checkvalue}/newfile${treeValue === undefined ? "" : `/${treeValue}`}`)}>新建文件</a></Menu.Item>
     </Menu>
     )
   }
@@ -189,28 +209,35 @@ function CoderDepot(props){
   function returnMain(){
     setTreeValue(undefined);
     let branch = branchName || defaultBranch;
-    props.history.push(`/projects/${owner}/${projectsId}/tree/${branch.replaceAll("/","%2F")}`);
+    let checkvalue = turnbar(branch);
+    props.history.push(`/projects/${owner}/${projectsId}/tree/${checkvalue}`);
   };
   // 子目录路径返回链接
   function returnUlr(url){
-    let enBranch = branchName && branchName.replaceAll("/","%2F");
+    let enBranch = turnbar(branchName);
     props.history.push(`/projects/${owner}/${projectsId}/tree${enBranch?`/${enBranch}`:""}/${url}`);
   }
   // 点击跳转到子目录
   function goToSubRoot(path,type,filename){
-    let enBranch = branchName || defaultBranch;
+    if(type!=="submodule"){
-    setType(type);
+      let enBranch = branchName || defaultBranch;
-    props.history.push(`/projects/${owner}/${projectsId}${`/tree/${enBranch.replaceAll("/","%2F")}`}${path?`/${path}`:""}`);
+      let checkvalue = turnbar(enBranch);
+      setType(type);
+      props.history.push(`/projects/${owner}/${projectsId}${`/tree/${checkvalue}`}${path?`/${path}`:""}`);
+    }
   }
 
   function onEdit(readOnly){
     setReadOnly(readOnly);
+    setEditReadme(false);
   }
   function ChangeFile(path, readOnly){
     //点击直接跳转页面 加载一次路由
-    props.history.push(`/projects/${owner}/${projectsId}/tree/${branchName || defaultBranch}/${path}`);
+    let enBranch = branchName || defaultBranch;
+    let checkvalue = turnbar(enBranch);
+    props.history.push(`/projects/${owner}/${projectsId}/tree/${checkvalue}/${path}`);
     setType("file");
-    setReadOnly(readOnly);
+    setEditReadme(true);
   };
 
   function changeHide(hide){
@@ -255,7 +282,7 @@ function CoderDepot(props){
   const mdFlag = n && n.substring(n.length-3,n.length) === ".md";
 
   const { current_user } = props;
-  const fileOperate = type === "dir" && projectDetail && projectDetail.type !== 2 && (projectDetail.permission !=="Reporter" || (current_user && current_user.admin));
+  const fileOperate = type === "dir" && projectDetail && projectDetail.type !== 2 && ((projectDetail.permission && projectDetail.permission !=="Reporter") || (current_user && current_user.admin));
   return(
     <WhiteBack>
       <UpdateDescModal desc={desc} website={website} lesson_url={lesson_url} visible={openModal} onCancel={()=>setOpenModal(false)} onOk={okUpdate}/>
@@ -430,6 +457,13 @@ function CoderDepot(props){
                         </p>
                       }
                     </div>
+                    {
+                      inviteCode && 
+                      <div>
+                        <Divider />
+                        <Invite code={inviteCode} className={"detailsCode"}/>
+                      </div>
+                    }
                     {
                       lesson_url &&
                       <div>

src/forge/Main/CoderDepotCatalogue.jsx

@@ -2,12 +2,18 @@ import React from 'react';
 import { Link } from 'react-router-dom';
 import { truncateCommitId } from '../common/util';
 
+const typeIco = {
+  "submodule":"icon-file-submodule font-17",
+  "file":'icon-wenjia font-15',
+  "dir":"icon-wenjianjia1 font-15"
+}
+
 function CoderDepotCatalogue({item , goToSubRoot , owner , projectsId }){
   return(
     <li>
       <span>
-        <a onClick={()=>goToSubRoot(item.path,item.type,item.name)}>
+        <a onClick={()=>goToSubRoot(item.path,item.type,item.name)} className={item.type === "submodule" && "submoduleStyle"}>
-          <i className={item.type === 'dir' ? "iconfont icon-wenjianjia1 color-green-file font-15 mr5":"iconfont icon-wenjia color-green-file font-15 mr5"}></i>{item.name}
+          <i className={`iconfont ${typeIco[`${item.type}`]} color-green-file mr5`}></i>{item.name}
         </a>
       </span>
       <span title="init project">

src/forge/Main/CoderRootBranch.js

@@ -6,6 +6,12 @@ import { getBranch } from '../GetData/getData';
 import Nodata from '../Nodata';
 import './list.css';
 
+function turnbar(str){
+  if(str && str.length>0 && str.indexOf("/")>-1){
+    return str.replaceAll('/','%2F');
+  }
+  return str;
+}
 export default ((props)=>{
   const [ data , setData ] =useState(undefined);
   const [ isSpin , setIsSpin ] =useState(true);
@@ -32,7 +38,7 @@ export default ((props)=>{
               return(
                 <li key={key}>
                   <div>
-                    <Link to={`/projects/${owner}/${projectsId}/tree/${item.name.replaceAll("/","%2F")}`} className="color-blue font-15" style={{"maxWidth":"100px"}}>{item.name}</Link>
+                    <Link to={`/projects/${owner}/${projectsId}/tree/${turnbar(item.name)}`} 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/Main/Detail.js

@@ -1,9 +1,8 @@
 import React, { Component } from 'react';
-import { Spin, Tooltip } from 'antd';
+import { Spin, Tooltip , Button } from 'antd';
 import { Link, Route, Switch } from 'react-router-dom';
-import { Content , FlexAJ , AlignTop } from '../Component/layout';
+import { Content , AlignTop } from '../Component/layout';
 import DetailBanner from './sub/DetailBanner';
-import Invite from './sub/Invite';
 import '../css/index.scss'
 import './list.css';
 
@@ -177,6 +176,7 @@ class Detail extends Component {
       firstSync:false,
       secondSync:false,
       open_devops:false,
+      forkSpin:false,
       // 默认分支
       defaultBranch:undefined,
 
@@ -359,6 +359,9 @@ class Detail extends Component {
   forkFunc = () => {
     const { platform } = this.state;
     if(!platform)return;
+    this.setState({
+      forkSpin:true
+    })
     const { current_user } = this.props
     const { projectsId , owner } = this.props.match.params;
     const url = `/${owner}/${projectsId}/forks.json`;
@@ -367,8 +370,13 @@ class Detail extends Component {
         this.props.history.push(`/projects/${current_user && current_user.login}/${result.data.identifier}`);
         this.props.showNotification(result.data.message);
       }
+      this.setState({
+        forkSpin:false
+      })
     }).catch(error => {
-      console.log(error);
+      this.setState({
+        forkSpin:false
+      })
     })
   }
 
@@ -406,7 +414,7 @@ class Detail extends Component {
     const { projectDetail, watchers_count, praises_count, 
       forked_count, firstSync , secondSync , 
       isManager, watched, praised, 
-      project , open_devops , platform , defaultBranch , bannerList } = this.state;
+      project , open_devops , platform , defaultBranch , bannerList , forkSpin } = this.state;
     const url = this.props.history.location.pathname;
     const urlArr = url.split("/");
     const urlFlag = (urlArr.length === 3);
@@ -459,7 +467,7 @@ class Detail extends Component {
                       ((current_user && current_user.admin) || isManager) && (projectDetail && projectDetail.type && projectDetail.type === 2) ?
                       <a className="synchronism ml30" onClick={this.synchronismMirror}>同步镜像</a> : ""
                     }
-                    <span className="detail_tag_btn">
+                    <Button className="detail_tag_btn">
                       <a className="detail_tag_btn_name" style={{cursor:platform?"pointer":"default"}} onClick={() => this.focusFunc(watched)}>
                         <i className={watched ? "iconfont icon-shixing color-orange font-16 mr3":"iconfont icon-kongxing color-grey-9 font-16 mr3"}></i>
                         <span>{watched ? '取消关注' : '关注'}</span>
@@ -474,8 +482,8 @@ class Detail extends Component {
                         <span className="detail_tag_btn_count">{watchers_count}</span>
                         :""
                       }
-                    </span>
+                    </Button>
-                    <span className="detail_tag_btn">
+                    <Button className="detail_tag_btn">
                       <a className="detail_tag_btn_name" style={{cursor:platform?"pointer":"default"}} onClick={() => this.pariseFunc(praised)}>
                         <i className={praised ? "iconfont icon-weibiaoti105 color-orange font-14 mr3":"iconfont icon-guanzhu color-grey-9 font-14 mr3"}></i>
                         <span>{praised ? '取消点赞' : '点赞'}</span>
@@ -489,8 +497,8 @@ class Detail extends Component {
                         <span className="detail_tag_btn_count">{praises_count}</span>
                         :""
                       }
-                    </span>
+                    </Button>
-                    <span className="detail_tag_btn">
+                    <Button className="detail_tag_btn" loading={forkSpin}>
                       <Tooltip title="复刻是fork的中文名，即复制代码仓库" placement="bottom">
                         <a className="detail_tag_btn_name" style={{cursor:platform?"pointer":"default"}} onClick={this.forkFunc}>
                           <i className="iconfont icon-fork color-grey-9 mr3"></i>复刻
@@ -506,13 +514,9 @@ class Detail extends Component {
                         <span className="detail_tag_btn_count">{forked_count}</span>
                         :""
                       }
-                    </span>
+                    </Button>
                   </span>
                 }
-                {
-                  projectDetail && projectDetail.invite_code &&
-                  <Invite code={projectDetail.invite_code} className={"mt8 textRight"}/>
-                }
               </div>
             </AlignTop>
             {

src/forge/Main/Index.scss

@@ -360,4 +360,13 @@
   span{
     margin-top: 1px;
   }
+}
+.submoduleStyle{
+  cursor: default;
+  i{
+    cursor: default;
+  }
+  &:hover{
+    color: #05101a;
+  }
 }

src/forge/Main/list.css

@@ -264,7 +264,10 @@
   border:1px solid #f1f1f1;
   display: flex;
   align-items: center;
-  margin-left: 30px
+  margin-left: 30px;
+  padding:0px;
+  background-color: transparent;
+  box-shadow: none;
 }
 .ant-tooltip {
   max-width: fit-content!important;

src/forge/Main/sub/Invite.jsx

@@ -1,5 +1,6 @@
 import React from 'react';
 import { Tooltip , message } from 'antd';
+import './sub.scss';
 
 function Invite({code,className}) {
 
@@ -14,10 +15,13 @@ function Invite({code,className}) {
   }
   return(
     <div className={className}>
-      <span>邀请码: <span id="devitecode">{code}</span></span>
+      <span className="font-16 color-grey-6">邀请码</span>
-      <Tooltip title={<p className="edu-txt-center">可以通过邀请码邀请成员加入项目<br/>点击复制邀请码。</p>}  placement={"bottom"}>
+      <div>
-        <i className="iconfont icon-fuzhi2 font-16 color-blue ml8" onClick={()=>jsCopy("#devitecode")}></i>
+        <span id="devitecode">{code}</span>
-      </Tooltip>
+        <Tooltip title={<p className="edu-txt-center">可以通过邀请码邀请成员加入项目<br/>点击复制邀请码。</p>}  placement={"bottom"}>
+          <i className="iconfont icon-fuzhi2 font-16 color-blue ml8" onClick={()=>jsCopy("#devitecode")}></i>
+        </Tooltip>
+      </div>
     </div>
   )
 }

src/forge/Main/sub/sub.scss

@@ -22,4 +22,9 @@
     height: 20px;
     line-height: 20px;
   }
+}
+
+.detailsCode{
+  display: flex;
+  justify-content: space-between;
 }

src/forge/Merge/MergeItem.js

@@ -5,6 +5,12 @@ import { AlignCenter } from '../Component/layout';
 import { getImageUrl } from "educoder";
 import "./merge.css";
 
+function turnbar(str){
+  if(str && str.length>0 && str.indexOf("/")>-1){
+    return str.replaceAll('/','%2F');
+  }
+  return str;
+}
 class MergeItem extends Component {
   constructor(props) {
     super(props);
@@ -103,7 +109,7 @@ class MergeItem extends Component {
                         item.pull_request_head &&
                         <Tag className="pr-branch-tag">
                           <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")}`}
+                            to={`/projects/${item.is_original ? item.fork_project_user : owner}/${ item.is_original ? item.fork_project_identifier : projectsId }/tree/${turnbar(item.pull_request_head)}`}
                             className="maxW200px hide-1 ver-middle"
                           >
                             {item.is_original
@@ -127,7 +133,7 @@ class MergeItem extends Component {
                         item.pull_request_base && 
                         <Tag className="pr-branch-tag">
                           <Link
-                            to={`/projects/${owner}/${projectsId}/tree/${item.pull_request_base.replaceAll("/","%2F")}`}
+                            to={`/projects/${owner}/${projectsId}/tree/${turnbar(item.pull_request_base)}`}
                             className="maxW200px hide-1 ver-middle"
                           >
                             {/* {item.is_fork ? item.pull_request_base : `${item.author_name}:${item.pull_request_base}`} */}

src/forge/Merge/MessageCount.js

@@ -24,6 +24,12 @@ import MergeFooter from "./merge_footer";
 const Option = Select.Option;
 const TextArea = Input.TextArea;
 
+function turnbar(str){
+  if(str && str.length>0 && str.indexOf("/")>-1){
+    return str.replaceAll('/','%2F');
+  }
+  return str;
+}
 class MessageCount extends Component {
   constructor(props) {
     super(props);
@@ -355,10 +361,10 @@ class MessageCount extends Component {
                       <div className="mt15">
                         <Tag className="pr-branch-tag">
                           <Link
-                            to={`/projects/${data.pull_request.is_original ? data.pull_request.fork_project_user : data.issue.project_author_name}/${data.pull_request.is_original?data.project_identifier:projectsId}/tree/${data.pull_request.head && data.pull_request.head.replaceAll("/","%2F")}`}
+                            to={`/projects/${data.pull_request.is_original ? data.pull_request.fork_project_user : data.issue.project_author_name}/${data.pull_request.is_original?data.project_identifier:projectsId}/tree/${turnbar(data.pull_request && data.pull_request.head)}`}
                             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.head.replaceAll("/","%2F")}
+                            {data.pull_request.is_original ? data.pull_request.fork_project_user : data.issue.project_author_name}: {turnbar(data.pull_request && data.pull_request.head)}
                           </Link>
                         </Tag>
                         <span className="mr8 ver-middle">

src/forge/Merge/NewMerge.js

@@ -105,6 +105,18 @@ class NewMerge extends Component {
       }
       axios.get(url).then(result=>{
         if(result){
+          if (result.data.status === 0) {
+            this.setState({
+              isSpin: false,
+              show_message: false,
+            });
+          } else {
+            this.setState({
+              isSpin: false,
+              show_message: true,
+              default_message: result.data.message,
+            });
+          }
           this.setState({
             comparesData:result.data
           })
@@ -143,7 +155,7 @@ class NewMerge extends Component {
           merge:"master"
         })
       }
-      this.ischeckmerge();
+      // this.ischeckmerge();
     }
   }
 
@@ -169,7 +181,7 @@ class NewMerge extends Component {
   selectBrach = (type, value) => {
     const { projectsId , owner } = this.props.match.params;
     this.state[type] = value;
-    this.ischeckmerge();
+    // this.ischeckmerge();
     let { id ,merge , pull } = this.state;
     if(type==="pull"){
       this.props.history.push(`/projects/${owner}/${projectsId}/pulls/new/${pull}`)
@@ -199,7 +211,6 @@ class NewMerge extends Component {
   };
 
   //判断2分支是否可以合并
-
   ischeckmerge = () => {
     this.setState({ isSpin: true });
     const { projectsId , owner } = this.props.match.params;

src/forge/New/Index.js

@@ -68,24 +68,30 @@ class Index extends Component {
 
   getOwner=()=>{
     const { OIdentifier } = this.props.match.params;
+    const { user_id } = this.props && this.props.current_user;
     const url = `/owners.json`;
     axios.get(url).then(result=>{
       if(result && result.data){
         let owner = result.data.owners;
+        this.setState({
+          OwnerList: owner,
+        })
         if(OIdentifier){
           owner = owner.filter(item=>item.name === OIdentifier);
           this.props.form.setFieldsValue({
             user_id:OIdentifier
           })
-          owner && this.setState({
+        }else if(user_id){
-            owners_id:owner[0].id,
+          owner = owner.filter(item=>item.id === user_id);
-            owners_name:owner[0].name
+          this.props.form.setFieldsValue({
+            user_id:owner && owner[0].name
           })
         }
-        this.setOptionsList(owner, 'owners');
+        owner && this.setState({
-        this.setState({
+          owners_id:owner[0].id,
-          OwnerList: owner,
+          owners_name:owner[0].name
         })
+        this.setOptionsList(owner, 'owners');
       }
     }).catch(error=>{})
   }
@@ -175,14 +181,12 @@ class Index extends Component {
           ignore_id,
           user_id:owners_id
         }).then((result) => {
-          if (result) {
+          if (result && result.data.id) {
-            if (result.data.id) {
+            this.setState({
-              this.setState({
+              isSpin: false
-                isSpin: false
+            })
-              })
+            this.props.showNotification(`${projectsType && projectsType === "mirror" ? "镜像" : "托管"}项目创建成功!`);
-              this.props.showNotification(`${projectsType && projectsType === "mirror" ? "镜像" : "托管"}项目创建成功!`);
+            this.props.history.push(`/projects/${result.data.login}/${result.data.identifier}`);
-              this.props.history.push(`/projects/${owners_name}/${result.data.identifier}`);
-            }
           }
         }).catch((error) => {
           this.setState({

src/forge/Newfile/UserSubmitComponent.js

@@ -6,6 +6,20 @@ import "./index.css";
 
 import axios from "axios";
 const TextArea = Input.TextArea;
+
+
+function turnbar(str){
+  if(str && str.length>0 && str.indexOf("/")>-1){
+    return str.replaceAll('/','%2F');
+  }
+  return str;
+}
+function returnbar(str){
+  if(str && str.length>0 && str.indexOf("%2F")>-1){
+    return str.replaceAll('%2F','/');
+  }
+  return str;
+}
 class UserSubmitComponent extends Component {
   constructor(props) {
     super(props);
@@ -59,7 +73,7 @@ class UserSubmitComponent extends Component {
         const url = `/${owner}/${projectsId}/create_file.json`;
         axios.post(url, {
           filepath: filename ? filename : path,
-          branch: branch && branch.replaceAll("%2F","/"),
+          branch: returnbar(branch),
           new_branch: submitType === "1" ? values.branchname : undefined,
           content,
           message: values.desc,
@@ -72,7 +86,7 @@ class UserSubmitComponent extends Component {
               const { getTopCount } = this.props;
               getTopCount && getTopCount(values.branchname);
             }
-            let url = `/projects/${owner}/${projectsId}${values.branchname ? `/tree/${values.branchname.replaceAll('/',"%2F")}`: (branch ? `/tree/${branch.replaceAll('/',"%2F")}` : "")}`;
+            let url = `/projects/${owner}/${projectsId}${values.branchname ? `/tree/${turnbar(values.branchname)}`: (branch ? `/tree/${turnbar(branch)}` : "")}`;
             this.props.history.push(url);
           }
         })
@@ -99,7 +113,7 @@ class UserSubmitComponent extends Component {
         axios
           .put(url, {
             filepath: detail.path,
-            branch: submitType === "1" ? undefined : b.replaceAll('%2F',"/"),
+            branch: submitType === "1" ? undefined : returnbar(b),
             new_branch: submitType === "1" ? values.branchname : undefined,
             content: content,
             sha: detail.sha,
@@ -109,7 +123,7 @@ class UserSubmitComponent extends Component {
             this.setState({ isSpin: false });
             if (result.data && result.data.status === 1) {
               let b = currentBranch || branch;
-              let url = `/projects/${owner}/${projectsId}${(values.branchname ? `/tree/${values.branchname.replaceAll('/',"%2F")}` : (b ? `/tree/${b.replaceAll('/',"%2F")}`:""))}`;
+              let url = `/projects/${owner}/${projectsId}${(values.branchname ? `/tree/${turnbar(values.branchname)}` : (b ? `/tree/${turnbar(b)}`:""))}`;
               this.props.history.push(url);
               this.props.showNotification("文件修改成功!");
             }
@@ -191,7 +205,7 @@ class UserSubmitComponent extends Component {
                 >
                   <Radio value="0" className="mb10">
                     <i className="iconfont icon-banbenku font-16 mr5"></i>
-                    直接提交至<span className="color-orange">{b.replaceAll('%2F',"/")}</span>分支
+                    直接提交至<span className="color-orange">{returnbar(b)}</span>分支
                   </Radio>
                   <Radio value="1">
                     <Icon type="pull-request" className="mr5" />