Nigel
/
forgeplus-react
forked from Gitlink/forgeplus-react
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request '我的通知-消息悬停框' (#27) from durian/forgeplus-react:feature_notification_xiesi into feature_notification

This commit is contained in:
durian 2021-09-22 10:22:54 +08:00
parent 628606480a 975dfad4aa
commit 76ffd0e8b9
5 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/forge/Head/AppPullRefresh.jsx
View File

@ -36,7 +36,7 @@ class PullRefresh extends Component {
const currentScroll = wrap.scrollTop + wrap.clientHeight
// 触底
if (currentScroll >= (wrap.scrollHeight - 10)) {
if (currentScroll >= (wrap.scrollHeight - 200)) {
this.loadData()
}
}

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

@ -446,6 +446,7 @@ class NewHeader extends Component {
content={<NoticeContent visible={visible} current_user={current_user} showNotification={showNotification} resetUserInfo={resetUserInfo}/>}
visible={visible}
onVisibleChange={this.handleVisibleChange}
destroyTooltipOnHide
>
<Link to={{pathname:"/settings/notice",state:{noticeType:"notification"}}} className="message-icon">
<Badge count={current_user.message_unread_total}>

6
src/forge/SecuritySetting/Index.jsx
View File

@ -61,8 +61,8 @@ function Index(props){
</ul>
<ul className="securityUl ul-border-buttom">
<li>消息通知</li>
<li className={pathname.indexOf("/settings/notice")>-1 || pathname.indexOf("/settings/notice/privateLetter")>-1 ?"active":""}><Link to={{pathname:"/settings/notice",state:{noticeType:"notification"}}}><i className="iconfont icon-wodetongzhi"></i><span className="text-shodow-bold">我的通知</span></Link></li>
{/* <li className={pathname.indexOf("/settings/notice/noticeManager")>-1 ?"active":""}><Link to={`/settings/notice/noticeManager`}><i className="iconfont icon-tongzhiguanli"></i><span className="text-shodow-bold">通知管理</span></Link></li> */}
<li className={(pathname.indexOf("/settings/notice")>-1 && pathname.indexOf("/settings/notice/config") == -1) || pathname.indexOf("/settings/notice/privateLetter")>-1 ?"active":""}><Link to={{pathname:"/settings/notice",state:{noticeType:"notification"}}}><i className="iconfont icon-wodetongzhi"></i><span className="text-shodow-bold">我的通知</span></Link></li>
{/* <li className={pathname.indexOf("/settings/notice/config")>-1 ?"active":""}><Link to={'/settings/notice/config'}><i className="iconfont icon-tongzhiguanli"></i><span className="text-shodow-bold">通知管理</span></Link></li> */}
</ul>
<ul className="securityUl">
<li>安全设置</li>
@ -79,7 +79,7 @@ function Index(props){
)}
></Route>
<Route
path="/settings/notice/noticeManager"
path="/settings/notice/config"
render={(p) => (
<NoticeManager {...props} {...p}/>
)}

3
src/forge/SecuritySetting/Index.scss
View File

@ -44,8 +44,7 @@
height: 27px;
line-height: 27px;
position: relative;
cursor: pointer;
// border: 1px solid;
cursor: default;
a{
color: #666;

30
src/forge/SecuritySetting/notice/myNotice/Index.jsx
View File

@ -234,6 +234,21 @@ function MyNotice(props) {
</div>
</div>
)
} else{
//私信
{/* <div className="mynotice-content vertical-center-style">
<Badge count={95}><img src="https://testforgeplus.trustie.net//system/lets/letter_avatars/2/D/208_124_118/120.png" className="currentImg private-letter-img" /></Badge>
<div className="private-letter-right">
<div>
<span>蒋宇航</span>
<span className="timeSpan">4分钟前</span>
<a onClick={deleteNotice}>删除</a>
</div>
<div onClick={() => props.history.push('/settings/notice/privateLetter')}>
<span className="highlightSpan letter-length-limit">最好的OpenStack控制台，对标OpenStack社区Horizon项目,最好的OpenStack控制台，对标OpenStack社区Horizon项目，在易用性、页面性能等方面进行深度优化，提供简单控制台。</span>
</div>
</div>
</div> */}
}
})}
@ -248,21 +263,6 @@ function MyNotice(props) {
hideOnSinglePage
></Pagination>
</div>}
{/* 私信 */}
{/* <div className="mynotice-content vertical-center-style">
<Badge count={95}><img src="https://testforgeplus.trustie.net//system/lets/letter_avatars/2/D/208_124_118/120.png" className="currentImg private-letter-img" /></Badge>
<div className="private-letter-right">
<div>
<span>蒋宇航</span>
<span className="timeSpan">4分钟前</span>
<a onClick={deleteNotice}>删除</a>
</div>
<div onClick={() => props.history.push('/settings/notice/privateLetter')}>
<span className="highlightSpan letter-length-limit">最好的OpenStack控制台，对标OpenStack社区Horizon项目,最好的OpenStack控制台，对标OpenStack社区Horizon项目，在易用性、页面性能等方面进行深度优化，提供简单控制台。</span>
</div>
</div>
</div> */}
</div>
)
}