From bc399340dd16c78967185d9886e8607f18d62b53 Mon Sep 17 00:00:00 2001 From: smallbun <2689170096@qq.com> Date: Sat, 16 Sep 2023 23:22:42 +0800 Subject: [PATCH] =?UTF-8?q?:sparkles:=20=E7=94=A8=E6=88=B7=E7=BB=84?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E6=96=B0=E5=A2=9E=E5=88=A0=E9=99=A4=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E7=BB=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UserGroupDetail/UserGroupDetail.tsx | 41 +++++++++++++++++-- .../account/UserGroupDetail/locales/zh-CN.ts | 3 ++ 2 files changed, 40 insertions(+), 4 deletions(-) diff --git a/eiam-console/src/main/console-fe/src/pages/account/UserGroupDetail/UserGroupDetail.tsx b/eiam-console/src/main/console-fe/src/pages/account/UserGroupDetail/UserGroupDetail.tsx index ab930aa2..2fd870a0 100644 --- a/eiam-console/src/main/console-fe/src/pages/account/UserGroupDetail/UserGroupDetail.tsx +++ b/eiam-console/src/main/console-fe/src/pages/account/UserGroupDetail/UserGroupDetail.tsx @@ -15,19 +15,20 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -import { getUserGroup, updateUserGroup } from '@/services/account'; +import { getUserGroup, removeUser, updateUserGroup } from '@/services/account'; import { history } from '@@/core/history'; import { PageContainer, ProDescriptions, RouteContext } from '@ant-design/pro-components'; import { useAsyncEffect, useMount } from 'ahooks'; -import { App, Skeleton } from 'antd'; -import { useState } from 'react'; +import { App, Button, Skeleton } from 'antd'; +import React, { useState } from 'react'; import MemberList from './components/MemberList'; import { UserGroupDetailTabs } from './constant'; import queryString from 'query-string'; import { useIntl, useLocation } from '@umijs/max'; import useStyles from './style'; import AppAccess from './components/AppAccess'; +import { ExclamationCircleFilled } from '@ant-design/icons'; /** * 用户组详情 @@ -35,7 +36,7 @@ import AppAccess from './components/AppAccess'; export default () => { const intl = useIntl(); const { styles } = useStyles(); - const { message } = App.useApp(); + const { message, modal } = App.useApp(); const location = useLocation(); const query = queryString.parse(location.search); const { id } = query as { id: string }; @@ -157,6 +158,38 @@ export default () => { }), }, ]} + extra={[ + , + ]} tabActiveKey={tabActiveKey} onTabChange={(key: string) => { setTabActiveKey(key); diff --git a/eiam-console/src/main/console-fe/src/pages/account/UserGroupDetail/locales/zh-CN.ts b/eiam-console/src/main/console-fe/src/pages/account/UserGroupDetail/locales/zh-CN.ts index 4e0bbdbf..fd7aa1c9 100644 --- a/eiam-console/src/main/console-fe/src/pages/account/UserGroupDetail/locales/zh-CN.ts +++ b/eiam-console/src/main/console-fe/src/pages/account/UserGroupDetail/locales/zh-CN.ts @@ -16,6 +16,9 @@ * along with this program. If not, see . */ export default { + 'pages.account.user_group_detail.extra.delete': '删除用户组', + 'pages.account.user_group_detail.extra.delete.confirm_title': '您确定要删除此用户组?', + 'pages.account.user_group_detail.extra.delete.confirm_content': '此操作不可恢复,请谨慎操作!', 'pages.account.user_group_detail.common.username': '用户名称', 'pages.account.user_group_detail.common.phone': '手机号', 'pages.account.user_group_detail.common.org_display_path': '所属组织',