From d2107ca2152b881a5a57485ad03d1fa22808128f Mon Sep 17 00:00:00 2001 From: smallbun <2689170096@qq.com> Date: Sat, 16 Sep 2023 23:19:46 +0800 Subject: [PATCH] =?UTF-8?q?:sparkles:=20=E7=94=A8=E6=88=B7=E7=BB=84?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../account/UserGroupDetail/UserGroupDetail.tsx | 14 +++++++------- .../AppAccess.tsx} | 2 +- .../{AccessStrategy => AppAccess}/index.tsx | 4 ++-- .../{AccessStrategy => AppAccess}/style.ts | 0 .../src/pages/account/UserGroupDetail/constant.ts | 4 ++-- .../account/UserGroupDetail/locales/zh-CN.ts | 15 +++++++-------- 6 files changed, 19 insertions(+), 20 deletions(-) rename eiam-console/src/main/console-fe/src/pages/account/UserGroupDetail/components/{AccessStrategy/AccessStrategy.tsx => AppAccess/AppAccess.tsx} (98%) rename eiam-console/src/main/console-fe/src/pages/account/UserGroupDetail/components/{AccessStrategy => AppAccess}/index.tsx (91%) rename eiam-console/src/main/console-fe/src/pages/account/UserGroupDetail/components/{AccessStrategy => AppAccess}/style.ts (100%) 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 6cc303e0..ab930aa2 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 @@ -27,7 +27,7 @@ import { UserGroupDetailTabs } from './constant'; import queryString from 'query-string'; import { useIntl, useLocation } from '@umijs/max'; import useStyles from './style'; -import AccessStrategy from '@/pages/account/UserGroupDetail/components/AccessStrategy'; +import AppAccess from './components/AppAccess'; /** * 用户组详情 @@ -106,7 +106,7 @@ export default () => { { { tab: intl.formatMessage({ id: 'pages.account.user_group_detail.tab_list.member' }), }, { - key: UserGroupDetailTabs.access_policy, + key: UserGroupDetailTabs.app_access, tab: intl.formatMessage({ - id: 'pages.account.user_group_detail.tab_list.access_policy', + id: 'pages.account.user_group_detail.tab_list.app_access', }), }, ]} @@ -169,7 +169,7 @@ export default () => { {/*成员信息*/} {type === UserGroupDetailTabs.member && } {/*授权应用*/} - {type === UserGroupDetailTabs.access_policy && } + {type === UserGroupDetailTabs.app_access && } ); }; diff --git a/eiam-console/src/main/console-fe/src/pages/account/UserGroupDetail/components/AccessStrategy/AccessStrategy.tsx b/eiam-console/src/main/console-fe/src/pages/account/UserGroupDetail/components/AppAccess/AppAccess.tsx similarity index 98% rename from eiam-console/src/main/console-fe/src/pages/account/UserGroupDetail/components/AccessStrategy/AccessStrategy.tsx rename to eiam-console/src/main/console-fe/src/pages/account/UserGroupDetail/components/AppAccess/AppAccess.tsx index 48aa39b0..520b4756 100644 --- a/eiam-console/src/main/console-fe/src/pages/account/UserGroupDetail/components/AccessStrategy/AccessStrategy.tsx +++ b/eiam-console/src/main/console-fe/src/pages/account/UserGroupDetail/components/AppAccess/AppAccess.tsx @@ -52,7 +52,7 @@ export default (props: { userGroupId: string }) => { xxl: 5, }} headerTitle={intl.formatMessage({ - id: 'pages.account.user_group_detail.access_strategy', + id: 'pages.account.user_group_detail.app_access_title', })} request={getAppAccessPolicyList} params={{ subjectId: userGroupId, subjectType: AccessPolicyType.USER_GROUP }} diff --git a/eiam-console/src/main/console-fe/src/pages/account/UserGroupDetail/components/AccessStrategy/index.tsx b/eiam-console/src/main/console-fe/src/pages/account/UserGroupDetail/components/AppAccess/index.tsx similarity index 91% rename from eiam-console/src/main/console-fe/src/pages/account/UserGroupDetail/components/AccessStrategy/index.tsx rename to eiam-console/src/main/console-fe/src/pages/account/UserGroupDetail/components/AppAccess/index.tsx index 1e72b733..0d673bc3 100644 --- a/eiam-console/src/main/console-fe/src/pages/account/UserGroupDetail/components/AccessStrategy/index.tsx +++ b/eiam-console/src/main/console-fe/src/pages/account/UserGroupDetail/components/AppAccess/index.tsx @@ -15,6 +15,6 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -import AccessStrategy from './AccessStrategy'; +import AppAccess from './AppAccess'; -export default AccessStrategy; +export default AppAccess; diff --git a/eiam-console/src/main/console-fe/src/pages/account/UserGroupDetail/components/AccessStrategy/style.ts b/eiam-console/src/main/console-fe/src/pages/account/UserGroupDetail/components/AppAccess/style.ts similarity index 100% rename from eiam-console/src/main/console-fe/src/pages/account/UserGroupDetail/components/AccessStrategy/style.ts rename to eiam-console/src/main/console-fe/src/pages/account/UserGroupDetail/components/AppAccess/style.ts diff --git a/eiam-console/src/main/console-fe/src/pages/account/UserGroupDetail/constant.ts b/eiam-console/src/main/console-fe/src/pages/account/UserGroupDetail/constant.ts index 423ba8ba..2da419f0 100644 --- a/eiam-console/src/main/console-fe/src/pages/account/UserGroupDetail/constant.ts +++ b/eiam-console/src/main/console-fe/src/pages/account/UserGroupDetail/constant.ts @@ -19,8 +19,8 @@ * UserGroupDetailTabs */ export enum UserGroupDetailTabs { - //access_policy - access_policy = 'access-policy', + //app_access + app_access = 'app-access', //权限 permission_info = 'permission-info', //member 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 a0e5f938..4e0bbdbf 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 @@ -20,17 +20,16 @@ export default { 'pages.account.user_group_detail.common.phone': '手机号', 'pages.account.user_group_detail.common.org_display_path': '所属组织', 'pages.account.user_group_detail.use_mount.message': '未选择用户组', - 'pages.account.user_group_detail.pro_descriptions.name': '名称', - 'pages.account.user_group_detail.pro_descriptions.code': '编码', - 'pages.account.user_group_detail.pro_descriptions.remark': '备注', + 'pages.account.user_group_detail.descriptions.name': '名称', + 'pages.account.user_group_detail.descriptions.code': '编码', + 'pages.account.user_group_detail.descriptions.remark': '备注', 'pages.account.user_group_detail.tab_list.rule': '规则配置', 'pages.account.user_group_detail.tab_list.member': '成员信息', - 'pages.account.user_group_detail.tab_list.access_policy': '授权应用', + 'pages.account.user_group_detail.tab_list.app_access': '应用权限', 'pages.account.user_group_detail.tab_list.permission_info': '权限管理', - 'pages.account.user_group_detail.access_strategy': '已授权应用', - 'pages.account.user_group_detail.access_strategy.metas.popconfirm.title': - '您确定要取消应用授权？', - 'pages.account.user_group_detail.access_strategy.metas.popconfirm.remove': '取消授权', + 'pages.account.user_group_detail.app_access_title': '已授权应用', + 'pages.account.user_group_detail.app_access.remove.popconfirm.title': '您确定要取消应用授权？', + 'pages.account.user_group_detail.app_access.remove.popconfirm.remove': '取消授权', 'pages.account.user_group_detail.add_member.columns.username': '用户名称', 'pages.account.user_group_detail.add_member.columns.full_name': '用户姓名', 'pages.account.user_group_detail.add_member.drawer_form.title': '添加成员',