diff --git a/src/forge/Main/CoderDepot.jsx b/src/forge/Main/CoderDepot.jsx index cae7a38af..56ea54fae 100644 --- a/src/forge/Main/CoderDepot.jsx +++ b/src/forge/Main/CoderDepot.jsx @@ -45,7 +45,8 @@ function CoderDepot(props){ const [ desc , setDesc ] = useState(undefined); const [ website , setWebsite ] = useState(undefined); const [ lesson_url , setLessonUrl ] = useState(undefined); - const [ readme , setReadme ] = useState(undefined) + const [ readme , setReadme ] = useState(undefined); + const [ defaultBranch , setDefaultBranch ] = useState(undefined) const owner = props.match.params.owner; const projectsId = props.match.params.projectsId; @@ -59,15 +60,9 @@ function CoderDepot(props){ setDesc(details.description); setWebsite(details.website); setLessonUrl(details.lesson_url); + setDefaultBranch(details.default_branch); } },[details]) - - useEffect(()=>{ - if(!branchName || pathname === `/projects/${owner}/${projectsId}/tree/${branchName}`){ - console.log("dddddddddd"); - getDirInfo((details && details.default_branch)); - } - },[branchName,pathname]) useEffect(()=>{ if(treeValue){ @@ -79,17 +74,17 @@ function CoderDepot(props){ useEffect(()=>{ - if (projectsId && owner){ + if (projectsId && owner && defaultBranch){ if(pathname.indexOf(`/projects/${owner}/${projectsId}`) > -1 && pathname.indexOf(`/tree/${branchName}/`) > -1) { let url = pathname.split(`/tree/${branchName}/`)[1]; setTreeValue(url); getFileInfo(url,branchName); }else{ setTreeValue(undefined); - // getDirInfo(branchName ||(projectDetail && projectDetail.default_branch)); + getDirInfo(branchName || defaultBranch); } } - },[projectsId,owner,pathname]) + },[projectsId,owner,pathname,defaultBranch]) // 获取主目录列表 function getDirInfo(branch){ @@ -166,8 +161,8 @@ function CoderDepot(props){ // 文件相关的下拉项 const fileMenu =( - urlLink(`/projects/${owner}/${projectsId}/${branchName || (projectDetail && projectDetail.default_branch)}/uploadfile${treeValue === undefined ? "" : `/${treeValue}`}`)}>上传文件 - urlLink(`/projects/${owner}/${projectsId}/${branchName || (projectDetail && projectDetail.default_branch)}/newfile${treeValue === undefined ? "" : `/${treeValue}`}`)}>新建文件 + urlLink(`/projects/${owner}/${projectsId}/${branchName || defaultBranch}/uploadfile${treeValue === undefined ? "" : `/${treeValue}`}`)}>上传文件 + urlLink(`/projects/${owner}/${projectsId}/${branchName || defaultBranch}/newfile${treeValue === undefined ? "" : `/${treeValue}`}`)}>新建文件 ) @@ -183,7 +178,7 @@ function CoderDepot(props){ // 页面地址返回到主目录 function returnMain(){ setTreeValue(undefined); - let branch = branchName || (projectDetail && projectDetail.default_branch); + let branch = branchName || defaultBranch; props.history.push(`/projects/${owner}/${projectsId}/tree/${branch}`); }; // 子目录路径返回链接 @@ -193,7 +188,7 @@ function CoderDepot(props){ // 点击跳转到子目录 function goToSubRoot(path,type,filename){ setType(type); - props.history.push(`/projects/${owner}/${projectsId}${`/tree/${branchName || (projectDetail && projectDetail.default_branch)}`}${path?`/${path}`:""}`); + props.history.push(`/projects/${owner}/${projectsId}${`/tree/${branchName || defaultBranch}`}${path?`/${path}`:""}`); } function onEdit(readOnly){ @@ -201,7 +196,7 @@ function CoderDepot(props){ } function ChangeFile(path, readOnly){ //点击直接跳转页面 加载一次路由 - props.history.push(`/projects/${owner}/${projectsId}/tree/${branchName || (projectDetail && projectDetail.default_branch)}/${path}`); + props.history.push(`/projects/${owner}/${projectsId}/tree/${branchName || defaultBranch}/${path}`); setType("file"); setReadOnly(readOnly); }; @@ -260,7 +255,7 @@ function CoderDepot(props){ owner={owner} projectsId={projectsId} name={projectDetail && projectDetail.name} - branch={branchName || (projectDetail && projectDetail.default_branch)} + branch={branchName || defaultBranch} visible={visible} onClose={()=>setVisible(false)} list = {mainFlag ? dirInfo : undefined} @@ -285,14 +280,14 @@ function CoderDepot(props){ : - 分支:{branchName || (projectDetail && projectDetail.default_branch)} + 分支:{branchName || defaultBranch} } @@ -373,7 +368,7 @@ function CoderDepot(props){ readOnly={readOnly} md={mdFlag} onEdit={onEdit} - currentBranch={branchName || (projectDetail && projectDetail.default_branch)} + currentBranch={branchName || defaultBranch} type={projectDetail.type} > }