- {/*
*/}
- {item.sender &&

}
-
-
{item.status === 1 ? : }
- {/* {item.sender &&
{item.sender.name}
} */}
- {item.sender &&
{item.notification_url && window.open("https://"+`${item.notification_url}`);readNotice([item.id])}} dangerouslySetInnerHTML={{__html: "" + item.sender.name +" " + item.content +" 中@我"}}>
}
+ {item.sender &&

{window.open(`/${item.sender && item.sender.login}`);}}/>}
+ {item.status === 1 ?
:
}
+
{turnToMess(item)}}>
+ {item.sender && " + item.sender.name+ " "+ item.content +" 中@我"}}>}
- {item.time_ago}
- {item.status === 1 && readNotice([item.id])}>标记为已读}
- deleteNotice([item.id])}>删除
+ {item.time_ago}
+ {!isBatchDelete && item.status === 1 && readNotice([item.id])}>标记为已读}
+ {!isBatchDelete && deleteNotice([item.id])}>删除}
)
diff --git a/src/forge/SecuritySetting/notice/myNotice/Index.scss b/src/forge/SecuritySetting/notice/myNotice/Index.scss
index b10f28a77..39a23b528 100644
--- a/src/forge/SecuritySetting/notice/myNotice/Index.scss
+++ b/src/forge/SecuritySetting/notice/myNotice/Index.scss
@@ -88,6 +88,16 @@ button:active {
background: #F3F4F6;
}
+ & img{
+ cursor: pointer;
+ }
+
+ & .atme-umread-redDot{
+ position: relative;
+ top: -13px;
+ right: -5px;
+ }
+
& b{
font-weight: 400;
text-shadow: 0.5px 0 #333;
@@ -139,7 +149,7 @@ button:active {
.mynotice-cont{
padding:0;
-
+ cursor: default;
& .visible-checkbox{
margin-right: 10px;
}
@@ -147,18 +157,9 @@ button:active {
display: none;
}
.atme-notice-text{
- display: flex;
- position: relative;
- margin-left: 12px;
+ margin-left: 6px;
+ max-width: 48rem;
word-break: break-all;
- & .at-badge{
- position:absolute;
- }
-
- & .atme-cont{
- max-width: 48rem;
- margin-left: 12px;
- }
}
}
@@ -176,6 +177,12 @@ button:active {
}
}
+.batchDel{
+ & .currentImg, & .atme-notice-text{
+ pointer-events: none;
+ }
+}
+
.baselineDiv{
align-items: baseline;
}