From 1bab0b01f7c8d3f6c94a6e88bf4787ea5e7a648a Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Tue, 29 Dec 2020 16:18:20 +0800 Subject: [PATCH] debug --- src/forge/Main/IndexItem.js | 25 +++++++++++++++---------- src/forge/Upload/single.jsx | 2 +- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/src/forge/Main/IndexItem.js b/src/forge/Main/IndexItem.js index fa783767..884e0c16 100644 --- a/src/forge/Main/IndexItem.js +++ b/src/forge/Main/IndexItem.js @@ -24,16 +24,21 @@ class IndexItem extends Component { }) } - projectHref=(link , user_apply_signatures,project_id,is_secret)=>{ - let signa = user_apply_signatures && user_apply_signatures[0]; - if(is_secret && (signa && signa.status !== "passed")){ - this.setState({ - visible:true, - user_apply_signatures:user_apply_signatures.length>0 ? user_apply_signatures[0] : undefined, - project_id - }) + projectHref=(link , user_apply_signatures,project_id,is_secret , id)=>{ + const { user , showLoginDialog } = this.props; + if(user && user.login){ + let signa = user_apply_signatures && user_apply_signatures[0]; + if((is_secret && (!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, + project_id + }) + }else{ + this.props.history.push(link); + } }else{ - this.props.history.push(link); + showLoginDialog && showLoginDialog(); } } hideModal=()=>{ @@ -67,7 +72,7 @@ class IndexItem extends Component { }
- this.projectHref(`/projects/${item.author.login}/${item.identifier}`,item.user_apply_signatures, item.id,item.is_secret)} 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)} 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 ? diff --git a/src/forge/Upload/single.jsx b/src/forge/Upload/single.jsx index 45e3f1a5..e9b43a05 100644 --- a/src/forge/Upload/single.jsx +++ b/src/forge/Upload/single.jsx @@ -54,7 +54,7 @@ function Single({ children , showNotification , className , load , size }) { if(!size) return; const isLt100M = file.size / 1024 / 1024 < size; if (!isLt100M) { - this.props.showNotification(`文件大小必须小于${size}MB!`); + showNotification(`文件大小必须小于${size}MB!`); } return isLt100M; }