From c68a3dbd6f082ce2ae8ddb4c3f932c27ac1907f5 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Mon, 11 Jan 2021 18:14:59 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=88=90=E5=91=98=E8=AE=BF?= =?UTF-8?q?=E9=97=AE=E7=89=B9=E6=AE=8A=E5=BC=80=E6=BA=90=E8=AE=B8=E5=8F=AF?= =?UTF-8?q?=E8=AF=81=E9=A1=B9=E7=9B=AE=E4=B8=8D=E7=94=A8=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Main/IndexItem.js | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/forge/Main/IndexItem.js b/src/forge/Main/IndexItem.js index 30979954..8841a7ae 100644 --- a/src/forge/Main/IndexItem.js +++ b/src/forge/Main/IndexItem.js @@ -23,15 +23,22 @@ class IndexItem extends Component { state: login }) } - - projectHref=(link , user_apply_signatures,project_id,is_secret , id)=>{ + /** + * link:跳转到详情的地址 + * user_apply_signatures:是否已经发送访问特殊开源项目的文件 + * project_id:项目id + * is_secret:是否是特殊开源许可证项目 + * id:创建者login + * is_member:是否是项目成员(如果是项目成员可以直接进入项目) + * */ + projectHref=(link , user_apply_signatures,project_id,is_secret , id,is_member)=>{ const { user , showLoginDialog } = this.props; if(is_secret && (!user || (user && !user.login))){ showLoginDialog(); return; } let signa = user_apply_signatures && user_apply_signatures[0]; - if((is_secret && (!signa || (signa && signa.status !== "passed"))) && user.login !== id ){ + if((is_secret && !is_member && (!signa || (signa && signa.status !== "passed"))) && user.login !== id ){ this.setState({ visible:true, user_apply_signatures:user_apply_signatures.length>0 ? user_apply_signatures[0] : undefined, @@ -72,7 +79,7 @@ class IndexItem extends Component { }
- this.projectHref(`/projects/${item.author.login}/${item.identifier}`,item.user_apply_signatures, item.id,item.is_secret,item.author.login)} className="hide-1 color-grey-3 font-18 task-hide fwt-500 " style={{ whiteSpace: "wrap", display: 'flex', width: 400 }}> + this.projectHref(`/projects/${item.author.login}/${item.identifier}`,item.user_apply_signatures, item.id,item.is_secret,item.author.login,item.is_member)} className="hide-1 color-grey-3 font-18 task-hide fwt-500 " style={{ whiteSpace: "wrap", display: 'flex', width: 400 }}> {item.author.name}/{item.name} { item.forked_from_project_id ?