From 0b3444b37ef1b3c779a948d75bbabf710d2854b9 Mon Sep 17 00:00:00 2001 From: hucong <1422588487@qq.com> Date: Thu, 30 Sep 2021 16:59:58 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=BA=93=E4=BA=8C?= =?UTF-8?q?=E7=BA=A7=E9=A1=B5=E9=9D=A2readme=E7=9A=84=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Main/CoderDepot.jsx | 43 ++++++++++++++++++++++------------- 1 file changed, 27 insertions(+), 16 deletions(-) diff --git a/src/forge/Main/CoderDepot.jsx b/src/forge/Main/CoderDepot.jsx index a7e136919..7215e9ab8 100644 --- a/src/forge/Main/CoderDepot.jsx +++ b/src/forge/Main/CoderDepot.jsx @@ -67,14 +67,14 @@ function CoderDepot(props){ const [ editReadme , setEditReadme ] = useState(false); const [ pullsFlag , setPullsFlag ] = useState(true); const [ issuesFlag , setIssuesFlag ] = useState(true); - const [ releaseVersions , setReleaseVersions] = useState(undefined); - const details = props.projectDetail; const owner = props.match.params.owner; const projectsId = props.match.params.projectsId; let branchName = props.match.params.branchName; branchName = returnbar(branchName); + const details = props.projectDetail; let pathname = props.history.location.pathname; + const { bannerList } = props; useEffect(()=>{ @@ -90,6 +90,7 @@ function CoderDepot(props){ } },[bannerList]) + useEffect(()=>{ if(details){ setProjectDetail(details); @@ -99,7 +100,7 @@ function CoderDepot(props){ setDefaultBranch(details.default_branch); setInviteCode(details.invite_code); } - }) + },[details]) useEffect(()=>{ if(treeValue){ @@ -118,30 +119,40 @@ function CoderDepot(props){ setTreeValue(url); getFileInfo(url,branchName); setType("file"); + getReadmeInfo(url,branchName); }else{ setTreeValue(undefined); getDirInfo(branchName || defaultBranch); setType("dir"); + getReadmeInfo('', branchName || defaultBranch); } } },[projectsId,owner,pathname,defaultBranch]) - useEffect(()=>{ - axios.get(`/${owner}/${projectsId}/releases.json`).then((result)=>{ - if(result && result.data){ - const release = { - "list":result.data.releases, - "total_count":result.data.releases.length - } - setReleaseVersions(release); + // 获取readme信息 + function getReadmeInfo(path, ref) { + axios.get(`/${owner}/${projectsId}/readme.json`, { + params:{ + owner: owner, + repo: projectsId, + filepath:path, + ref:ref || branchName + } + }).then((result) => { + console.log('getReadmeInfo', result) + if (result) { + setReadme(result.data); + } else { + setReadme(undefined); } }) - },[]) + } // 获取主目录列表 function getDirInfo(branch){ setIsSpin(true); const url = `/${owner}/${projectsId}/entries.json`; + axios.get(url, { params: { ref: branch } }).then((result) => { @@ -156,7 +167,7 @@ function CoderDepot(props){ setLastCommitAuthor(c && c.committer); setMainFlag(true); setReadOnly(true); - setReadme(result.data.readme); + // setReadme(result.data.readme); setEditReadme(false); setHide(true); } @@ -201,7 +212,7 @@ function CoderDepot(props){ setLastCommit(c && c.commit); setLastCommitAuthor(c && c.committer); setMainFlag(false); - setReadme(result.data.readme) + // setReadme(result.data.readme); setReadOnly(true); setReadOnly(!editReadme); setHide(true); @@ -532,13 +543,13 @@ function CoderDepot(props){ } {/* 发布 */} { - releaseVersions && + projectDetail && projectDetail.release_versions && Date: Thu, 30 Sep 2021 17:33:40 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=8F=91=E8=A1=8C=E7=89=88=E5=A2=9E?= =?UTF-8?q?=E5=88=A0=E6=94=B9=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Main/version/version.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/forge/Main/version/version.js b/src/forge/Main/version/version.js index bbc145b9c..e72ea3291 100644 --- a/src/forge/Main/version/version.js +++ b/src/forge/Main/version/version.js @@ -74,8 +74,8 @@ function version(props) {
{item.name} - {data && data.user_permission && type !== 2 && } - {data && data.user_permission && type !== 2 && {deleteRelease(item.version_id)}}>} + {data && data.user_admin_permission && type !== 2 && } + {data && data.user_admin_permission && type !== 2 && {deleteRelease(item.version_id)}}>}
@@ -84,14 +84,14 @@ function version(props) { id={item.id} url={(item.image_url && getImageUrl(`/${item.image_url}`)) || "https://dss3.bdstatic.com/70cFv8Sh_Q1YnxGkpoWK1HF6hhy/it/u=3025493530,1989042357&fm=26&gp=0.jpg"} name={item.user_name} - login={item.user_name} + login={item.login} /> 发布于{item.created_at} { item.bodyshow &&
- +
} @@ -113,7 +113,7 @@ function version(props) { return ( { - data && data.user_permission && type !== 2 && + data && data.user_admin_permission && type !== 2 &&
@@ -126,7 +126,7 @@ function version(props) { } else if (releases && releases.length === 0) { return ( ) From 71670f1214bb85042537db48ed03fd0ab28867e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com> Date: Thu, 30 Sep 2021 17:41:50 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E7=94=A8=E6=88=B7=E8=B7=B3=E8=BD=AC?= =?UTF-8?q?=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Main/version/version.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/forge/Main/version/version.js b/src/forge/Main/version/version.js index e72ea3291..c28cc4b85 100644 --- a/src/forge/Main/version/version.js +++ b/src/forge/Main/version/version.js @@ -84,7 +84,7 @@ function version(props) { id={item.id} url={(item.image_url && getImageUrl(`/${item.image_url}`)) || "https://dss3.bdstatic.com/70cFv8Sh_Q1YnxGkpoWK1HF6hhy/it/u=3025493530,1989042357&fm=26&gp=0.jpg"} name={item.user_name} - login={item.login} + login={item.user_login} /> 发布于{item.created_at} From 3d3c0b50951ec7639e83580267f0696eb9d4fc2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com> Date: Thu, 30 Sep 2021 19:42:34 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=BA=93=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E5=88=9B=E5=BB=BA=E5=8F=91=E8=A1=8C=E7=89=88=E6=9D=83?= =?UTF-8?q?=E9=99=90=E6=8E=A7=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Component/Releases.jsx | 5 +++-- src/forge/Main/CoderDepot.jsx | 14 ++++++-------- src/forge/Main/CoderRootCommit.js | 2 +- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/forge/Component/Releases.jsx b/src/forge/Component/Releases.jsx index 3ed27867b..260e6bd2d 100644 --- a/src/forge/Component/Releases.jsx +++ b/src/forge/Component/Releases.jsx @@ -2,7 +2,7 @@ import React from 'react'; import { AlignTop } from '../Component/layout'; import { Link } from 'react-router-dom'; -function Releases({owner,projectsId,releaseVersions , baseOperate , projectType}){ +function Releases({ owner, projectsId, releaseVersions, distribution }) { return(
@@ -27,7 +27,8 @@ function Releases({owner,projectsId,releaseVersions , baseOperate , projectType} }) :
- 您暂未发布任何版本{baseOperate && projectType !==2 && 创建新版本} + 您暂未发布任何版本 + {distribution && 创建新版本}
} diff --git a/src/forge/Main/CoderDepot.jsx b/src/forge/Main/CoderDepot.jsx index 7215e9ab8..2efec3940 100644 --- a/src/forge/Main/CoderDepot.jsx +++ b/src/forge/Main/CoderDepot.jsx @@ -74,7 +74,8 @@ function CoderDepot(props){ branchName = returnbar(branchName); const details = props.projectDetail; let pathname = props.history.location.pathname; - + //distribution：判断此用户是否可以创建发行版 + const distribution = details && details.type != 2 && (details.permission === "Admin" || details.permission === "Owner" || details.permission === "Manager"); const { bannerList } = props; useEffect(()=>{ @@ -139,7 +140,6 @@ function CoderDepot(props){ ref:ref || branchName } }).then((result) => { - console.log('getReadmeInfo', result) if (result) { setReadme(result.data); } else { @@ -197,7 +197,6 @@ function CoderDepot(props){ } }).then((result) => { if (result) { - console.log(result) let en = result.data.entries; if(en.type){ setDirInfo(undefined); @@ -547,12 +546,11 @@ function CoderDepot(props){ } diff --git a/src/forge/Main/CoderRootCommit.js b/src/forge/Main/CoderRootCommit.js index 8cfa73203..3b41fd372 100644 --- a/src/forge/Main/CoderRootCommit.js +++ b/src/forge/Main/CoderRootCommit.js @@ -154,7 +154,7 @@ class CoderRootCommit extends Component{
{item.message}
 -

+