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

src/forge/Head/NoticeContent.jsx

@@ -186,7 +186,7 @@ function NoticeContent({ visible, showNotification, resetUserInfo, current_user:
           noticeUnreadList.map(item => {
             return (
               <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' }}>
                     <Badge color="#FA2020" />
                   </span>

src/forge/Head/header.scss

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

src/forge/SecuritySetting/notice/myNotice/Index.scss

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

src/forge/common/static.js

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