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

Merge pull request '我的通知' (#26) from durian/forgeplus-react:feature_notification_xiesi into feature_notification

This commit is contained in:
tongChong 2021-09-17 14:14:55 +08:00
parent a299b9a841 78014b02bf
commit cd949d4f2a
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -186,7 +186,7 @@ function NoticeContent({ visible, showNotification, resetUserInfo, current_user:
noticeUnreadList.map(item => { noticeUnreadList.map(item => {
return ( return (
<div key={item.id + Math.random()} className="noticeCont-back" onClick={() => { readItem(item) }}> <div key={item.id + Math.random()} className="noticeCont-back" onClick={() => { readItem(item) }}>
<div className="noticeCont"> <div className={`noticeCont ${item.notification_url?'pointer':''}`}>
<span style={{ visibility: item.status === 1 ? 'visible' : 'hidden' }}> <span style={{ visibility: item.status === 1 ? 'visible' : 'hidden' }}>
<Badge color="#FA2020" /> <Badge color="#FA2020" />
</span> </span>

9
src/forge/Head/header.scss
View File

@ -200,9 +200,11 @@
} }
.noticeCont-back{ .noticeCont-back{
.pointer{
cursor: pointer;
}
&:hover{ &:hover{
background: #F3F4F6; background: #F3F4F6;
cursor: pointer;
} }
} }
@ -212,7 +214,7 @@
padding: 12px 0 10px 0; padding: 12px 0 10px 0;
line-height: 24px; line-height: 24px;
border-bottom: 1px solid #EEEEEE; border-bottom: 1px solid #EEEEEE;
cursor: default;
i{ i{
font-size: 14px !important; font-size: 14px !important;
margin-right: 6px; margin-right: 6px;
@ -227,6 +229,8 @@
.noticeCont-text{ .noticeCont-text{
display: flex; display: flex;
color:#333333; color:#333333;
flex:auto;
justify-content: space-between;
& .content-span{ & .content-span{
word-break: break-all; word-break: break-all;
@ -248,7 +252,6 @@
.timeSpan{ .timeSpan{
font-size: 12px; font-size: 12px;
color: #666666; color: #666666;
margin-left: 5px;
} }
.at-name{ .at-name{

1
src/forge/SecuritySetting/notice/myNotice/Index.scss
View File

@ -91,7 +91,6 @@ button:active {
& b{ & b{
font-weight: 400; font-weight: 400;
text-shadow: 0.5px 0 #333; text-shadow: 0.5px 0 #333;
margin: 0 6px;
} }
& .invisable-read{ & .invisable-read{

2
src/forge/common/static.js
View File

@ -36,6 +36,8 @@ export const noticeSourceType = {
PullRequestChanged:"icon-hebingqingqiuicon", // 我创建或负责的合并请求状态变更 PullRequestChanged:"icon-hebingqingqiuicon", // 我创建或负责的合并请求状态变更
PullRequestJournal:"icon-hebingqingqiuicon", // 我创建或负责的合并请求有新的评论 PullRequestJournal:"icon-hebingqingqiuicon", // 我创建或负责的合并请求有新的评论
PullRequestClosed:"icon-hebingqingqiuicon", // 提交的合并请求被拒绝 PullRequestClosed:"icon-hebingqingqiuicon", // 提交的合并请求被拒绝
PullRequestMerged:"icon-hebingqingqiuicon", // 提交的合并请求被合并
PullRequestClosed:"icon-hebingqingqiuicon", // 提交的合并请求被关闭
//里程碑 //里程碑
ProjectMilestone:"icon-lichengbeiicon", // 我管理的仓库有新的里程碑 ProjectMilestone:"icon-lichengbeiicon", // 我管理的仓库有新的里程碑
}; };