From 7934f07cea2e519e47ae879c459b2979234cfa94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com> Date: Fri, 19 Nov 2021 11:11:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=BA=93=E3=80=81=E6=98=93?= =?UTF-8?q?=E4=BF=AE=E9=A1=B5=E9=9D=A2=E6=9C=AA=E7=99=BB=E5=BD=95=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E5=88=9B=E5=BB=BA=E4=BF=AE=E6=94=B9=E8=B7=B3=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E6=A1=86=E4=BB=A3=E7=A0=81=E5=B1=82=E9=9D=A2=E4=BC=98?= =?UTF-8?q?=E5=8C=96=EF=BC=8C=E4=B9=8B=E5=90=8E=E5=8F=AF=E5=AE=9E=E7=8E=B0?= =?UTF-8?q?=E5=A4=8D=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Component/HeadSearch.jsx | 2 +- src/forge/Main/CoderDepot.jsx | 17 ++--------------- src/forge/Order/order.js | 27 ++------------------------- src/modules/login/LoginDialog.js | 2 +- src/modules/tpm/TPMIndexHOC.js | 8 +++++--- 5 files changed, 11 insertions(+), 45 deletions(-) diff --git a/src/forge/Component/HeadSearch.jsx b/src/forge/Component/HeadSearch.jsx index 10b829a23..0e44a2cd2 100644 --- a/src/forge/Component/HeadSearch.jsx +++ b/src/forge/Component/HeadSearch.jsx @@ -32,7 +32,7 @@ export default ({history}) => { /> : - { + { setOpenSearch(true) }} /> } diff --git a/src/forge/Main/CoderDepot.jsx b/src/forge/Main/CoderDepot.jsx index 192b3e793..a00deb206 100644 --- a/src/forge/Main/CoderDepot.jsx +++ b/src/forge/Main/CoderDepot.jsx @@ -23,7 +23,6 @@ import Nodata from '../Nodata'; import Invite from './sub/Invite'; import CheckProfile from '../Component/ProfileModal/Profile'; import RenderHtml from '../../components/render-html'; -import LoginDialog from '../../modules/login/LoginDialog' /** * projectDetail.type:0是托管项目，1是镜像项目，2是同步镜像项目(为2时不支持在线创建、在线上传、在线修改、在线删除、创建合并请求等功能) */ @@ -70,7 +69,6 @@ function CoderDepot(props){ const [ pullsFlag , setPullsFlag ] = useState(true); const [ issuesFlag , setIssuesFlag ] = useState(true); const [ releaseVersions , setReleaseVersions] = useState(undefined); - const [ isRender , setIsRender] = useState(false);//是否显示登录弹框 const owner = props.match.params.owner; const projectsId = props.match.params.projectsId; @@ -340,16 +338,11 @@ function CoderDepot(props){ }) } - //修改登录方法 - function Modifyloginvalue(){ - setIsRender(false); - } - function createIssue(){ if(baseOper){ - window.open(`/${owner}/${projectsId}/issues/new`,'_blank') + window.open(`/${owner}/${projectsId}/issues/new`,'_blank'); }else{ - setIsRender(true); + props.showLoginDialog(`/${owner}/${projectsId}/issues/new`); } } @@ -363,12 +356,6 @@ function CoderDepot(props){ return( - {isRender && } setOpenModal(false)} onOk={okUpdate}/> { diff --git a/src/forge/Order/order.js b/src/forge/Order/order.js index 18961412d..3508b2824 100644 --- a/src/forge/Order/order.js +++ b/src/forge/Order/order.js @@ -7,7 +7,6 @@ import moment from 'moment'; import NoneData from "../Nodata"; import OrderItem from "./OrderItem"; import CheckProfile from '../Component/ProfileModal/Profile'; -import LoginDialog from '../../modules/login/LoginDialog'; import axios from "axios"; @@ -73,7 +72,6 @@ class order extends Component { page: 1, limit: 15, }, - isRender:false,//是否显示登录弹框 }; } @@ -344,21 +342,14 @@ class order extends Component { console.log(error); }); }; - - islogin=()=>{ - this.props.showLoginDialog(); - } createIssue = () => { const { data } = this.state; const { projectsId , owner } = this.props.match.params; if(data && data.user_admin_or_member){ - window.open(`/${owner}/${projectsId}/issues/new`,'_blank') + window.open(`/${owner}/${projectsId}/issues/new`,'_blank'); }else{ - console.log('aaa'); - this.setState({ - isRender:true, - }) + this.props.showLoginDialog(`/${owner}/${projectsId}/issues/new`); } } @@ -520,16 +511,8 @@ class order extends Component { ); - //修改登录方法 - Modifyloginvalue = () => { - this.setState({ - isRender: false, - }) - } - render() { const { current_user } = this.props; - const { projectsId , owner } = this.props.match.params; const { issue_chosen, issues, @@ -546,12 +529,6 @@ class order extends Component { return (
- {this.state.isRender && this.Modifyloginvalue()} - goPage={`/${owner}/${projectsId}/issues/new`} - />}
  • diff --git a/src/modules/login/LoginDialog.js b/src/modules/login/LoginDialog.js index 6380ad163..7e1dee6b5 100644 --- a/src/modules/login/LoginDialog.js +++ b/src/modules/login/LoginDialog.js @@ -396,7 +396,7 @@ class LoginDialog extends Component { isRender: false }) this.props.Modifyloginvalue(response.data); - this.props.goPage ? window.location.href = this.props.goPage : window.location.reload() + this.props.gopage ? (window.location.href = this.props.gopage) : window.location.reload() // window.location.reload(); } }).catch((error) => { diff --git a/src/modules/tpm/TPMIndexHOC.js b/src/modules/tpm/TPMIndexHOC.js index a7873ecc6..b24f52ea9 100644 --- a/src/modules/tpm/TPMIndexHOC.js +++ b/src/modules/tpm/TPMIndexHOC.js @@ -29,7 +29,8 @@ export function TPMIndexHOC(WrappedComponent) { email:undefined, completeProfile:false, showCP:false, - showNotice:true + showNotice:true, + gopage: undefined, } } @@ -196,10 +197,11 @@ export function TPMIndexHOC(WrappedComponent) { }) } - showLoginDialog = () => { + showLoginDialog = (gopage) => { this.setState({ isRender: true, - isloginCancel: "iscancel" + isloginCancel: "iscancel", + gopage: gopage, }) } //验证登录是否成功方法