Merge branch 'feature_notification' of https://git.trustie.net/tongChong/forgeplus-react into feature_notification

src/forge/Head/NoticeContent.jsx

@@ -198,7 +198,7 @@ function NoticeContent({ visible, showNotification, resetUserInfo, current_user:
                   <Badge color="#FA2020" />
                 </span>
                 <div className="noticeCont-text">
-                  <span className="content-span atme-cont-span" dangerouslySetInnerHTML={{ __html: item.content }}></span>
+                  <span className="content-span atme-cont-span" dangerouslySetInnerHTML={{ __html: "<b>" + item.sender.name +"</b>&nbsp;&nbsp;&nbsp;" + item.content +"  中@我"}}></span>
                   <span className="timeSpan">{item.time_ago}</span>
                 </div>
               </div>

src/forge/Head/header.scss

@@ -232,12 +232,12 @@
       text-overflow: ellipsis;
       display: -webkit-box;
       -webkit-box-orient: vertical;
-      -webkit-line-clamp: 2; /* 这里是超出几行省略 */
+      -webkit-line-clamp: 2;
       overflow: hidden;
     }
 
     & .atme-cont-span{
-      width: 275px;
+      width: 272px;
     }
 
     & .notice-cont-span{

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

@@ -192,6 +192,7 @@ function MyNotice(props) {
             </div>
           )
         } else if (noticeType === "2") {
+          console.log(item);
           //@我
           return (
             <div className="mynotice-content vertical-center-style" key={item.id}>
@@ -201,7 +202,8 @@ function MyNotice(props) {
                 {item.sender && <img src={`https://testforgeplus.trustie.net//${item.sender.image_url}`} className="currentImg" />}
                 <div className="atme-notice-text">
                   <div className="at-badge">{item.status === 1 ? <Badge color="#FA2020" /> : <span className="system-notice-blank"></span>}</div>
-                  <div className={item.notification_url?"highlightSpan float-right-little":"float-right-little"} onClick={() => {item.notification_url && window.open("https://"+`${item.notification_url}`)}} dangerouslySetInnerHTML={{__html: item.content}}></div>
+                  {item.sender && <div className="atme-sender-name boldSpan">{item.sender.name}</div>}
+                  <div className={item.notification_url?"highlightSpan atme-cont":"atme-cont"} onClick={() => {item.notification_url && window.open("https://"+`${item.notification_url}`)}} dangerouslySetInnerHTML={{__html: item.content+"  中@我"}}></div>
                 </div>
               </div>
               <div className="mynotice-cont vertical-center-style">

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

@@ -131,6 +131,11 @@ button:active {
     line-height: 18px;
     padding: 0 0;
   }
+  
+  & .highlightSpan:hover{
+    color: #466AFF;
+    cursor: pointer;
+  }
 
   .mynotice-cont{
     padding:0;
@@ -142,20 +147,20 @@ button:active {
       display: none;
     }
     .atme-notice-text{
+      display: flex;
       position: relative;
       margin-left: 12px;
-      max-width: 48rem;
       word-break: break-all;
       & .at-badge{
         position:absolute;
       }
 
-      & .highlightSpan{
+      & .atme-sender-name{
-        // margin-left: 12px;
+        padding: 0 4px;
-        &:hover{
+      }
-          color: #466AFF;
+
-          cursor: pointer;
+      & .atme-cont{
-        }
+        max-width: 42rem;
       }
     }
   }