-
+
- e.target.checked?setOnlyUnread(1):setOnlyUnread(2)}>仅看未读{noticeType === "1" ? `私信(12)` : noticeType==="0"?`消息(${notice_unread_count})`:`消息(${at_unread_count})`}
+ e.target.checked ? setOnlyUnread(1) : setOnlyUnread()}>仅看未读{noticeType === "1" ? `私信(12)` : noticeType === "0" ? `消息(${noticeUnreadCount})` : `消息(${atUnreadCount})`}
- {noticeType === "2" ?
: ""}
+ {noticeType === "2" && messageList.length > 0 ?
: ""}
-
+ {messageList.length===0 ?
:""}
+
+ {messageList && messageList.length>0 &&
+
}
- {message_list.map(item => {
+ {messageList.map(item => {
// 系统消息
- // 消息类别
- // const iconName = item.source.startsWith("Issue")?"icon-yixiuicon1":item.source.startsWith("Project")?"icon-daimakuicon1":item.source.startsWith("Project")?"icon-daimakuicon1":
- if(noticeType ==="0" && item.type === "notification"){
- return(
+ if (noticeType === "0") {
+ // 消息类别
+ return (
-
- {item.status === 1?
:
}
-
-
window.location.href=(`${item.notification_url}`)}>{item.content}
+
+ {item.status === 1 ? : }
+
+ window.open("https://"+`${item.notification_url}`)}>{item.content}
-
{item.time_ago}
-
标记为已读
+
{item.time_ago}
+ {item.status === 1 &&
readNotice([item.id])}>标记为已读}
)
- } else if(noticeType ==="2" && item.type === "atme"){
+ } else if (noticeType === "2") {
//@我
- return(
+ return (
-
-

-
- {item.status === 1? :}
- {item.content}
-
+ {/*
*/}
+
+ {item.sender &&

}
+
+
{item.status === 1 ? : }
+
{item.content}
+
-
{item.time_ago}
-
标记为已读 删除
+
{item.time_ago}
+ {item.status === 1 &&
readNotice([item.id])}>标记为已读}
+
deleteNotice([item.id])}>删除
)
}
})}
+
+ {/* 分页 */}
+
+
{setCurrentPage(page)}}
+ total = {messTotalCount}
+ hideOnSinglePage
+ >
+
+
+ {/* 私信 */}
+ {/*
+

+
+
+
props.history.push('/settings/notice/privateLetter')}>
+ 最好的OpenStack控制台,对标OpenStack社区Horizon项目,最好的OpenStack控制台,对标OpenStack社区Horizon项目,在易用性、页面性能等方面进行深度优化,提供简单控制台。
+
+
+
*/}
)
}
diff --git a/src/forge/SecuritySetting/notice/myNotice/Index.scss b/src/forge/SecuritySetting/notice/myNotice/Index.scss
index 1a5ee3fb..b4a02b35 100644
--- a/src/forge/SecuritySetting/notice/myNotice/Index.scss
+++ b/src/forge/SecuritySetting/notice/myNotice/Index.scss
@@ -6,7 +6,7 @@
}
.ant-menu-item{
padding:0px;
- // margin-right:34px!important;
+ margin-right:34px!important;
height: 34px;
width: 64px;
text-align: center;
@@ -82,18 +82,18 @@ button:active {
padding: 15px 0 15px 10px;
border-bottom: 1px solid #EEEEEE;
color: #333333;
-
&:hover{
background: #F3F4F6;
}
- & a{
+ & .invisable-read{
display: none;
}
- &:hover a{
+ &:hover .invisable-read{
display: block;
color: #466AFF;
+ cursor: pointer;
}
&:hover .timeSpan{
@@ -128,9 +128,24 @@ button:active {
.mynotice-cont{
padding:0;
- & .atme-checkbox{
+ & .visible-checkbox{
margin-right: 10px;
}
+ & .invisible-checkbox{
+ display: none;
+ }
+ .atme-notice-text{
+ position: relative;
+ margin-left: 12px;
+ max-width: 48rem;
+ & .at-badge{
+ position:absolute;
+ }
+
+ & .highlightSpan{
+ margin-left: 12px;
+ }
+ }
}
& .ant-badge-count, .ant-badge-dot, .ant-badge .ant-scroll-number-custom-component {
@@ -194,10 +209,7 @@ button:active {
max-width: 52rem;
}
-.at-length{
- max-width: 48rem;
- margin-left: 18px;
-}
+
#numberSpan{
color: #466AFF;
}
@@ -207,6 +219,28 @@ button:active {
align-items: center;
}
+.stretch-style{
+ display: flex;
+ align-items: baseline;
+}
+
.float-left-little{
margin-right: 10px;
-}
\ No newline at end of file
+}
+
+.paging{
+ float: right;
+ margin: 12px;
+}
+
+// .invisible_checkGroup{
+// & .ant-checkbox-inner{
+// display: none;
+// }
+// }
+// .notice01{
+// & .ant-checkbox-group{
+// display: flex;
+// flex-direction: column;
+// }
+// }
\ No newline at end of file