Gitlink
/
forgeplus-react
39
0
Fork 30
Code Issues Pull Requests Releases 1 Wiki Activity

noticeurl

This commit is contained in:
caishi 2021-04-01 16:25:53 +08:00
parent c3e09f2672
commit 171f14bd2a
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/forge/Head/Header.js
View File

@ -111,7 +111,7 @@ class NewHeader extends Component {
} }
onGlobalSearch=(value,item)=>{ onGlobalSearch=(value,item)=>{
window.location.href=`${item && item.url}?value=` + value; window.location.href=`${item}?value=` + value;
} }
openNotification = (messge) => { openNotification = (messge) => {
@ -577,8 +577,8 @@ class NewHeader extends Component {
}) })
} }
let search_url = settings && settings.common && settings.common.length> 0 && settings.common.filter(item=>item.name==="搜索"); let search_url = settings && settings.common && settings.common.search;
let notice_url = settings && settings.common && settings.common.length> 0 && settings.common.filter(item=>item.name==="通知"); let notice_url = settings && settings.common && settings.common.notice;
return ( return (
<div className="newHeaders" id="nHeader"> <div className="newHeaders" id="nHeader">
<div className="headerContent"> <div className="headerContent">
@ -646,7 +646,7 @@ class NewHeader extends Component {
} }
</div> </div>
<div className="head-right"> <div className="head-right">
{search_url && search_url.length>0 ? this.SearchInput(openSearch,search_url[0]):""} {search_url ? this.SearchInput(openSearch,search_url):""}
{ {
current_user && (current_user.main_site || current_user.login) && (settings && settings.add && settings.add.length>0)? current_user && (current_user.main_site || current_user.login) && (settings && settings.add && settings.add.length>0)?
<Dropdown overlay={this.addMenu(settings && settings.add)} placement="bottomRight"> <Dropdown overlay={this.addMenu(settings && settings.add)} placement="bottomRight">
@ -654,10 +654,10 @@ class NewHeader extends Component {
</Dropdown>:"" </Dropdown>:""
} }
{this.props.user && this.props.user.login && (notice_url && notice_url.length>0) ? {this.props.user && this.props.user.login && notice_url ?
<div className="ml30 edu-menu-panel"> <div className="ml30 edu-menu-panel">
{user && user.login && {user && user.login &&
<a href={`${notice_url[0].url}`} style={{ position: 'relative' }}> <a href={`${notice_url}`} style={{ position: 'relative' }}>
<i className="iconfont icon-xiaoxilingdang color-grey-6"></i> <i className="iconfont icon-xiaoxilingdang color-grey-6"></i>
<span className="newslight" style={{ display: this.props.Headertop === undefined ? "none" : this.props.Headertop.new_message === true ? "block" : "none" }}> <span className="newslight" style={{ display: this.props.Headertop === undefined ? "none" : this.props.Headertop.new_message === true ? "block" : "none" }}>
</span> </span>