✨ 用户组优化

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 () => {
             <ProDescriptions.Item
               dataIndex="name"
               label={intl.formatMessage({
-                id: 'pages.account.user_group_detail.pro_descriptions.name',
+                id: 'pages.account.user_group_detail.descriptions.name',
               })}
               fieldProps={{
                 maxLength: 8,
@@ -116,14 +116,14 @@ export default () => {
             <ProDescriptions.Item
               dataIndex="code"
               label={intl.formatMessage({
-                id: 'pages.account.user_group_detail.pro_descriptions.code',
+                id: 'pages.account.user_group_detail.descriptions.code',
               })}
               copyable
               editable={false}
             />
             <ProDescriptions.Item
               label={intl.formatMessage({
-                id: 'pages.account.user_group_detail.pro_descriptions.remark',
+                id: 'pages.account.user_group_detail.descriptions.remark',
               })}
               className={styles.descriptionRemark}
               dataIndex="remark"
@@ -151,9 +151,9 @@ 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 && <MemberList id={id} />}
       {/*授权应用*/}
-      {type === UserGroupDetailTabs.access_policy && <AccessStrategy userGroupId={id} />}
+      {type === UserGroupDetailTabs.app_access && <AppAccess userGroupId={id} />}
     </PageContainer>
   );
 };

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 }}

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 <http://www.gnu.org/licenses/>.
  */
-import AccessStrategy from './AccessStrategy';
+import AppAccess from './AppAccess';
 
-export default AccessStrategy;
+export default AppAccess;

eiam-console/src/main/console-fe/src/pages/account/UserGroupDetail/constant.ts

@@ -19,8 +19,8 @@
  * UserGroupDetailTabs
  */
 export enum UserGroupDetailTabs {
-  //access_policy
+  //app_access
-  access_policy = 'access-policy',
+  app_access = 'app-access',
   //权限
   permission_info = 'permission-info',
   //member

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.descriptions.name': '名称',
-  'pages.account.user_group_detail.pro_descriptions.code': '编码',
+  'pages.account.user_group_detail.descriptions.code': '编码',
-  'pages.account.user_group_detail.pro_descriptions.remark': '备注',
+  '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.app_access_title': '已授权应用',
-  'pages.account.user_group_detail.access_strategy.metas.popconfirm.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.access_strategy.metas.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': '添加成员',