gitee
/
eiam
mirror of https://gitee.com/topiam/eiam
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

⚡ 优化代码

pull/65/head
awenes 2023-10-05 09:48:23 +08:00
parent f9a8028db0
commit b0f797b5ca
2 changed files with 39 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
eiam-console/src/main/console-fe/src/pages/account/UserList/components/User/User.tsx
View File

@ -40,7 +40,7 @@ import {
Tooltip, Tooltip,
Typography, Typography,
Tag, Tag,
Popover Popover,
} from 'antd'; } from 'antd';
import React, { useRef, useState } from 'react'; import React, { useRef, useState } from 'react';
import CreateUser from '../CreateUser'; import CreateUser from '../CreateUser';
@ -185,43 +185,42 @@ export default (props: UserListProps) => {
search: false, search: false,
ellipsis: true, ellipsis: true,
render: (_, record) => [ render: (_, record) => [
<Popover <Popover
key="pop" key="pop"
title={ title={
<Tag color={'geekblue'} key={record.primaryOrgDisplayPath}> <Tag color={'geekblue'} key={record.orgDisplayPath}>
{record.primaryOrgDisplayPath} {record.primaryOrgDisplayPath}
</Tag>
}
content={
<Space direction="vertical" size="small" style={{ display: 'flex' }}>
{record.orgDisplayPath.split(',')?.map((p: string) => {
return (
<Tag color={'green'} key={p}>
{p}
</Tag> </Tag>
} );
content={ })}
<Space direction="vertical" size="small" style={{ display: 'flex' }}> </Space>
{record.orgDisplayPath.split(",")?.map((p: string) => { }
return ( >
<Tag color={'green'} key={p}> <Space key="primary_path">
{p} {
</Tag> <Tag color={'geekblue'} key={record.primaryOrgDisplayPath}>
) {record.primaryOrgDisplayPath}
})} </Tag>
</Space> }
}> </Space>
<Space key="primary_path"> <Space key="path" direction="vertical" size="small" style={{ display: 'flex' }}>
{ {record.orgDisplayPath.split(',')?.map((p: string) => {
<Tag color={'geekblue'} key={record.primaryOrgDisplayPath}> return (
{record.primaryOrgDisplayPath} <Tag color={'green'} key={p}>
</Tag> {p}
} </Tag>
</Space> );
<Space key="path" direction="vertical" size="small" style={{ display: 'flex' }}> })}
{ </Space>
record.orgDisplayPath.split(",")?.map((p: string) => { </Popover>,
return (
<Tag color={'green'} key={p}>
{p}
</Tag>
)
})
}
</Space>
</Popover>
], ],
}, },
{ {

4
eiam-console/src/main/console-fe/src/services/account.ts
View File

@ -273,7 +273,9 @@ export async function removeUser(id: string): Promise<API.ApiResult<boolean>> {
/** /**
* Remove Batch User * Remove Batch User
*/ */
export async function removeBatchUser(ids: (number | string)[]): Promise<API.ApiResult<boolean>> { export async function removeBatchUser(
ids: (number | string | Key)[],
): Promise<API.ApiResult<boolean>> {
return request<API.ApiResult<boolean>>(`/api/v1/user/batch_delete`, { return request<API.ApiResult<boolean>>(`/api/v1/user/batch_delete`, {
method: 'DELETE', method: 'DELETE',
params: { ids: ids }, params: { ids: ids },