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} > } title={ - this.onOpenDetail(item.id)} - > - {item.title} - + <> + this.onOpenDetail(item.id)}> + {item.title} + + + {moment(item.createdTime || item.publicTime).fromNow()} + + } - description={moment(item.createdTime || item.publicTime).fromNow()} />
{item.content}
@@ -98,6 +99,11 @@ export default class notice extends Component { )}
+ {!hasMore && ( + + )} ) } @@ -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" >