Merge branch 'fix-v2-220418' into 'v2-220418'

src/pages/srmHome/components/MessageList/index.tsx

@@ -3,7 +3,7 @@
  */
 import React, { useEffect, useState } from 'react';
 import { history } from 'umi';
-import { List, Space, Button, Spin } from 'antd';
+import { List, Space, Button, Spin, Tooltip } from 'antd';
 import { LeftOutlined, RightOutlined } from '@ant-design/icons';
 import moment from 'moment';
 import { getMessageMessageMemberPage, GetMessageMessageMemberPageResponseDetail, postMessageMessageMemberRead } from '@/services/MessageV2Api';
@@ -75,18 +75,16 @@ const TodoCard: React.FC = () => {
     if (code !== 1000) {
       return;
     }
-    if (AuthUrl('message.see')) {
-      if (url) {
-        if (/http/.test(url)) {
-          location.href = url;
-        } else {
-          history.push(url);
-        }
+    if (url) {
+      if (/http/.test(url)) {
+        location.href = url;
       } else {
-        fetchMsgList().then((res) => {
-          setList(res);
-        }).catch(() => {});
+        history.push(url);
       }
+    } else {
+      fetchMsgList().then((res) => {
+        setList(res);
+      }).catch(() => {});
     }
   }
 
@@ -114,14 +112,16 @@ const TodoCard: React.FC = () => {
           itemLayout="horizontal"
           dataSource={list}
           renderItem={(item) => (
-            <div className={styles['message-item']} onClick={() => handleRead(item.id, item.url)}>
-              <div className={styles['message-item-content']}>
-                {item.content}
-              </div>
-              <div className={styles['message-item-date']}>
-                {moment(item.sendTime).format('YYYY-MM-DD HH:mm')}
+            <Tooltip title={item.content}>
+              <div className={styles['message-item']} onClick={() => handleRead(item.id, item.url)}>
+                <div className={styles['message-item-content']}>
+                  {item.content}
+                </div>
+                <div className={styles['message-item-date']}>
+                  {moment(item.sendTime).format('YYYY-MM-DD HH:mm')}
+                </div>
               </div>
-            </div>
+            </Tooltip>
           )}
           bordered={false}
         />