p90524618
/
answer
mirror of https://gitee.com/answerdev/answer.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'github/sf-site-migration/ui' into feat/1.1.1/user-center

This commit is contained in:
LinkinStars 2023-03-30 12:19:36 +08:00
parent e92e7070f0 24d9b8a641
commit 31af841777
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ui/src/pages/Admin/Users/index.tsx
View File

@ -248,10 +248,12 @@ const Users: FC = () => {
{t('set_new_password')}
</Dropdown.Item>
) : null}
<Dropdown.Item
onClick={() => handleAction('status', user)}>
{t('change_status')}
</Dropdown.Item>
{!ucAgent?.enabled ? (
<Dropdown.Item
onClick={() => handleAction('status', user)}>
{t('change_status')}
</Dropdown.Item>
) : null}
<Dropdown.Item
onClick={() => handleAction('role', user)}>
{t('change_role')}

4
ui/src/pages/Users/Personal/components/UserInfo/index.tsx
View File

@ -114,7 +114,7 @@ const Index: FC<Props> = ({ data }) => {
)}
</>
) : null}
{ucBranding.map((b, i) => {
{ucBranding.map((b, i, a) => {
if (!b.label) {
return null;
}
@ -122,7 +122,7 @@ const Index: FC<Props> = ({ data }) => {
<div
key={b.name}
className={classnames('d-flex', 'align-items-center', {
'ms-3': i > 0,
'me-3': i < a.length - 1,
})}>
{b.icon ? (
<span