From 4053d6ff0a1eb3601d16c2355550d9ae4118ebd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=87=AA=E5=B8=A6=E5=A4=A7=E4=BD=AC=E6=B0=94=E5=9C=BA?=
 <188633308@qq.com>
Date: Fri, 2 Jul 2021 12:15:48 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E6=97=A0=E9=99=90=E6=BB=9A=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Api/Ewide.Core/Manager/UserManager.cs         |  2 +-
 web-react/src/assets/style/dark/main.less     |  7 +++++
 web-react/src/assets/style/default/main.less  |  7 +++++
 .../src/views/main/_layout/header/notice.jsx  | 27 ++++++++++++-------
 4 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/Api/Ewide.Core/Manager/UserManager.cs b/Api/Ewide.Core/Manager/UserManager.cs
index a2ec008..c596181 100644
--- a/Api/Ewide.Core/Manager/UserManager.cs
+++ b/Api/Ewide.Core/Manager/UserManager.cs
@@ -202,7 +202,7 @@ namespace Ewide.Core
                                                                 .Select(u => u.Permission).ToListAsync();
 #if DEBUG
 #else
-                await _sysCacheService.SetPermission(userId, permissions); // 缓存结果
+                await _sysCacheService.SetPermission(UserId, permissions); // 缓存结果
 #endif
             }
             return permissions;
diff --git a/web-react/src/assets/style/dark/main.less b/web-react/src/assets/style/dark/main.less
index 1060b2f..c6ea34e 100644
--- a/web-react/src/assets/style/dark/main.less
+++ b/web-react/src/assets/style/dark/main.less
@@ -688,3 +688,10 @@
     padding: 0;
   }
 }
+.yo-popover-infinite-scroll {
+  .ant-popover-inner-content {
+    overflow-y: auto;
+
+    max-height: 300px;
+  }
+}
diff --git a/web-react/src/assets/style/default/main.less b/web-react/src/assets/style/default/main.less
index 8f1100f..68cd631 100644
--- a/web-react/src/assets/style/default/main.less
+++ b/web-react/src/assets/style/default/main.less
@@ -682,3 +682,10 @@
     padding: 0;
   }
 }
+.yo-popover-infinite-scroll {
+  .ant-popover-inner-content {
+    overflow-y: auto;
+
+    max-height: 300px;
+  }
+}
diff --git a/web-react/src/views/main/_layout/header/notice.jsx b/web-react/src/views/main/_layout/header/notice.jsx
index dd89eab..b6f7d9d 100644
--- a/web-react/src/views/main/_layout/header/notice.jsx
+++ b/web-react/src/views/main/_layout/header/notice.jsx
@@ -1,5 +1,5 @@
 import React, { Component } from 'react'
-import { Badge, Divider, List, Menu, Modal, Popover, Row, Spin } from 'antd'
+import { Badge, Button, Divider, List, Menu, Modal, Popover, Row, Spin } from 'antd'
 import { AntIcon, Image } from 'components'
 import { api } from 'common/api'
 import InfiniteScroll from 'react-infinite-scroller'
@@ -69,7 +69,7 @@ export default class notice extends Component {
                 loadMore={pageIndex => this.onInfiniteOnLoad(pageIndex)}
                 hasMore={!loading && hasMore}
                 useWindow={false}
-                threshold={100}
+                threshold={50}
             >
                 <List
                     itemLayout="vertical"
@@ -79,14 +79,15 @@ export default class notice extends Component {
                             <List.Item.Meta
                                 avatar={<Image id={item.avatar} type="avatar" />}
                                 title={
-                                    <a
-                                        className="ellipsis"
-                                        onClick={() => this.onOpenDetail(item.id)}
-                                    >
-                                        {item.title}
-                                    </a>
+                                    <>
+                                        <a onClick={() => this.onOpenDetail(item.id)}>
+                                            {item.title}
+                                        </a>
+                                        <small className="text-normal ml-xs">
+                                            {moment(item.createdTime || item.publicTime).fromNow()}
+                                        </small>
+                                    </>
                                 }
-                                description={moment(item.createdTime || item.publicTime).fromNow()}
                             />
                             <div className="ellipsis-3 text-gray">{item.content}</div>
                         </List.Item>
@@ -98,6 +99,11 @@ export default class notice extends Component {
                         </div>
                     )}
                 </List>
+                {!hasMore && (
+                    <Button type="text" block>
+                        查看全部
+                    </Button>
+                )}
             </InfiniteScroll>
         )
     }
@@ -110,8 +116,9 @@ export default class notice extends Component {
                 arrowPointAtCenter={true}
                 placement="bottomRight"
                 content={this.renderList()}
-                overlayInnerStyle={{ width: 300, maxHeight: 300, overflowY: 'auto' }}
+                overlayInnerStyle={{ width: 300 }}
                 overlayStyle={{ zIndex: 999 }}
+                overlayClassName="yo-popover-infinite-scroll"
             >
                 <span className="header-action">
                     <Badge count={count}>