From 7f3697d9d57538a57f552075abbe4f2c6d566053 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Fri, 12 May 2023 11:17:04 +0800 Subject: [PATCH] remove --- src/App.js | 10 +++++++++- src/forge/Component/ProfileModal/Profile.jsx | 11 ++++++----- src/forge/Component/ProfileModal/SupplyPhone.jsx | 2 +- src/forge/Main/Index.js | 10 ++++++++-- src/forge/SecuritySetting/Index.jsx | 4 ++-- src/forge/SecuritySetting/sub/SSH.jsx | 2 +- src/forge/Settings/Webhooks/Index.jsx | 3 ++- src/forge/Settings/Webhooks/New.jsx | 3 ++- src/forge/Team/List.jsx | 5 ++++- src/forge/users/InfosUser.js | 9 +++++++-- src/forge/users/Material/Base.jsx | 4 ++-- src/forge/users/Material/Index.jsx | 8 ++++---- src/softbot/softBotList/index.jsx | 2 +- 13 files changed, 49 insertions(+), 24 deletions(-) diff --git a/src/App.js b/src/App.js index d67c3c926..0cdf36365 100644 --- a/src/App.js +++ b/src/App.js @@ -323,13 +323,21 @@ class App extends Component { render() { const { pathType, pathName, mygetHelmetapi } = this.state; + console.log("dsf:",pathName); return ( this.Modifyloginvalue()}> {/* */} - {!pathName || (pathName && pathName.toLowerCase().indexOf("glcc") === -1) ? : } + { + ((pathName && pathName.toLowerCase()!=="explore") || !pathName) ? + (!pathName || (pathName && pathName.toLowerCase().indexOf("glcc") === -1 )) ? + + : + + :"" + } {/* */} {/* wiki预览 */} diff --git a/src/forge/Component/ProfileModal/Profile.jsx b/src/forge/Component/ProfileModal/Profile.jsx index 15d51e575..e16dba63d 100644 --- a/src/forge/Component/ProfileModal/Profile.jsx +++ b/src/forge/Component/ProfileModal/Profile.jsx @@ -9,11 +9,12 @@ function Profile({children,sureFunc,showCompeleteDialog , completeProfile, class return; } } - if(!completeProfile){ - showCompeleteDialog && showCompeleteDialog(); - }else{ - sureFunc(); - } + // if(!completeProfile){ + // showCompeleteDialog && showCompeleteDialog(); + // }else{ + // sureFunc(); + // } + sureFunc(); } return( diff --git a/src/forge/Component/ProfileModal/SupplyPhone.jsx b/src/forge/Component/ProfileModal/SupplyPhone.jsx index cc05d5904..780991acb 100644 --- a/src/forge/Component/ProfileModal/SupplyPhone.jsx +++ b/src/forge/Component/ProfileModal/SupplyPhone.jsx @@ -18,7 +18,7 @@ function SupplyPhoneModal({visible}) { function onOk(){ setModalVis(false); setTimeout(function(){ - window.open(`/settings/phone`,"_blank"); + window.open(`/settings/password`,"_blank"); },200) } diff --git a/src/forge/Main/Index.js b/src/forge/Main/Index.js index c95fe5650..215a9f836 100644 --- a/src/forge/Main/Index.js +++ b/src/forge/Main/Index.js @@ -394,7 +394,7 @@ class Index extends Component { />
- { + {/* { current_user && current_user.login && - 新建 + 新建项目 + } */} + { + current_user && current_user.login && + {this.props.history.push('/projects/deposit/new')}}> + 新建项目 + } diff --git a/src/forge/SecuritySetting/Index.jsx b/src/forge/SecuritySetting/Index.jsx index c20196954..5609cc1cd 100644 --- a/src/forge/SecuritySetting/Index.jsx +++ b/src/forge/SecuritySetting/Index.jsx @@ -106,7 +106,7 @@ function Index(props){
  • 个人信息
  • -1 ?"active":""}>基本资料
    • -
  • -1 || pathname.indexOf("/settings/phone")>-1 || pathname.indexOf("/settings/password")>-1 || pathname.indexOf("/settings/cancel")>-1) ?"active":""}>账号管理
    • +
  • -1 || pathname.indexOf("/settings/phone")>-1 || pathname.indexOf("/settings/password")>-1 || pathname.indexOf("/settings/cancel")>-1) ?"active":""}>账号管理
{notice_url &&
  • 消息通知
    • @@ -175,7 +175,7 @@ function Index(props){ )} > ( )} diff --git a/src/forge/SecuritySetting/sub/SSH.jsx b/src/forge/SecuritySetting/sub/SSH.jsx index a6c10800f..087f72ef3 100644 --- a/src/forge/SecuritySetting/sub/SSH.jsx +++ b/src/forge/SecuritySetting/sub/SSH.jsx @@ -93,7 +93,7 @@ function SSH(props) {
} { (!list || (list && list.length === 0)) &&

您还没有添加任何SSH密钥

} -

如何生成SSH密钥？

+ {/*

如何生成SSH密钥？

*/} ) } diff --git a/src/forge/Settings/Webhooks/Index.jsx b/src/forge/Settings/Webhooks/Index.jsx index 36d3e6405..f0fb9cd19 100644 --- a/src/forge/Settings/Webhooks/Index.jsx +++ b/src/forge/Settings/Webhooks/Index.jsx @@ -122,7 +122,8 @@ function Index(props) {
-

每当特定事件（如push代码，合并请求被编辑）发生时，我们将通过webhook给您提供的远程URL发送post请求。您可以在我们的webhooks指南中了解更多信息

+ {/* 您可以在我们的webhooks指南中了解更多信息 */} +

每当特定事件（如push代码，合并请求被编辑）发生时，我们将通过webhook给您提供的远程URL发送post请求。

{ data && data.length> 0 && diff --git a/src/forge/Settings/Webhooks/New.jsx b/src/forge/Settings/Webhooks/New.jsx index 1e2d4caae..dbf729003 100644 --- a/src/forge/Settings/Webhooks/New.jsx +++ b/src/forge/Settings/Webhooks/New.jsx @@ -199,7 +199,8 @@ function New({ form , match , showNotification , history, projectDetail }) {
-

当webhook被触发时，我们将向以下URL发送通知，包括已选择事件的详细信息。更多信息可查阅webhooks指南。

+ {/* 更多信息可查阅webhooks指南 */} +

当webhook被触发时，我们将向以下URL发送通知，包括已选择事件的详细信息。

diff --git a/src/forge/Team/List.jsx b/src/forge/Team/List.jsx index ed5f3d7ce..50e985af0 100644 --- a/src/forge/Team/List.jsx +++ b/src/forge/Team/List.jsx @@ -184,10 +184,13 @@ function List(props){

- { organizeDetail && organizeDetail.can_create_project ? + {/* { organizeDetail && organizeDetail.can_create_project ? + 新建项目 + :""} */} + { organizeDetail && organizeDetail.can_create_project ? + {props.history.push(`/projects/deposit/new/${OIdentifier}`)}} className="addBtn mr30">+ 新建项目 :""} 排序 diff --git a/src/forge/users/InfosUser.js b/src/forge/users/InfosUser.js index 6a6ca1cf2..8ad62eb43 100644 --- a/src/forge/users/InfosUser.js +++ b/src/forge/users/InfosUser.js @@ -203,7 +203,7 @@ class InfosUser extends Component { onChange={this.changeSearchValue} />

- {current_user && user && current_user.login === user.login && ( + {/* {current_user && user && current_user.login === user.login && ( - )} + )} */} + {this.props.history.push('/projects/deposit/new')}}> + + 新建项目 + + diff --git a/src/forge/users/Material/Base.jsx b/src/forge/users/Material/Base.jsx index 8675819df..3eb31c2cb 100644 --- a/src/forge/users/Material/Base.jsx +++ b/src/forge/users/Material/Base.jsx @@ -63,7 +63,7 @@ export default Form.create()( )} - 更改手机号 + {/* 更改手机号 */} {getFieldDecorator("email",{ rules:[{required:true,message:"请输入邮箱账号"}] @@ -71,7 +71,7 @@ export default Form.create()( )} - 更改邮箱 + {/* 更改邮箱 */} {getFieldDecorator("show_email",{ rules:[], diff --git a/src/forge/users/Material/Index.jsx b/src/forge/users/Material/Index.jsx index bcd84e408..9fda86320 100644 --- a/src/forge/users/Material/Index.jsx +++ b/src/forge/users/Material/Index.jsx @@ -9,7 +9,7 @@ function Index(props){ const { pathname } = props && props.location; const [ key , setKey ] = useState("0"); - const [ type, setType] = useState('0'); + const [ type, setType] = useState('1'); useEffect(()=>{ if(pathname){ @@ -40,10 +40,10 @@ function Index(props){ {key === "0" ? 基本资料 : - {props.history.push('/settings/phone')}}>手机号管理 - {props.history.push('/settings/emails')}}>邮箱管理 + {/* {props.history.push('/settings/phone')}}>手机号管理 */} + {/* {props.history.push('/settings/emails')}}>邮箱管理 */} {props.history.push('/settings/password')}}>密码管理 - {props.history.push('/settings/cancel')}}>账号注销 + {/* {props.history.push('/settings/cancel')}}>账号注销 */} }
diff --git a/src/softbot/softBotList/index.jsx b/src/softbot/softBotList/index.jsx index b1ab1423b..3df46970f 100644 --- a/src/softbot/softBotList/index.jsx +++ b/src/softbot/softBotList/index.jsx @@ -68,7 +68,7 @@ function SoftBot(props){ return
- + {/* */}
欢迎来到Bot市场
快来挑选一个心仪的Bot加入到您的项目吧!