-
+
diff --git a/eiam-console/src/main/console-fe/src/locales/zh-CN/menu.ts b/eiam-console/src/main/console-fe/src/locales/zh-CN/menu.ts
index fbb062ec..c5c2b2e4 100644
--- a/eiam-console/src/main/console-fe/src/locales/zh-CN/menu.ts
+++ b/eiam-console/src/main/console-fe/src/locales/zh-CN/menu.ts
@@ -39,6 +39,8 @@ export default {
'menu.account.logout': '退出登录',
'menu.social-bind': '用户绑定',
'menu.app': '应用管理',
+ 'menu.app.list': '应用列表',
+ 'menu.app.group': '应用分组',
'menu.app.create': '创建应用',
'menu.app.config': '应用配置',
'menu.account': '账户管理',
diff --git a/eiam-console/src/main/console-fe/src/pages/account/IdentitySourceDetail/IdentitySourceDetail.tsx b/eiam-console/src/main/console-fe/src/pages/account/IdentitySourceDetail/IdentitySourceDetail.tsx
index 3f455900..c16294d8 100644
--- a/eiam-console/src/main/console-fe/src/pages/account/IdentitySourceDetail/IdentitySourceDetail.tsx
+++ b/eiam-console/src/main/console-fe/src/pages/account/IdentitySourceDetail/IdentitySourceDetail.tsx
@@ -81,7 +81,7 @@ export default () => {
history.push(`/account/identity-source`);
return;
}
- if (!type) {
+ if (!type || !IdentitySourceDetailTabs[type]) {
setTabActiveKey(IdentitySourceDetailTabs.config);
history.push({
pathname: location.pathname,
diff --git a/eiam-console/src/main/console-fe/src/pages/app/AppConfig/components/AppBasic/AppBasic.tsx b/eiam-console/src/main/console-fe/src/pages/app/AppConfig/components/AppBasic/AppBasic.tsx
index 1b1eb1ac..8ec26ef5 100644
--- a/eiam-console/src/main/console-fe/src/pages/app/AppConfig/components/AppBasic/AppBasic.tsx
+++ b/eiam-console/src/main/console-fe/src/pages/app/AppConfig/components/AppBasic/AppBasic.tsx
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see
.
*/
-import { getApp, updateApp } from '@/services/app';
+import { updateApp } from '@/services/app';
import { ProCard, ProDescriptions } from '@ant-design/pro-components';
import { useAsyncEffect } from 'ahooks';
@@ -30,6 +30,7 @@ import classNames from 'classnames';
import { LoadingOutlined, PlusOutlined } from '@ant-design/icons';
import { uploadFile } from '@/services/upload';
import { GetApp } from '@/pages/app/AppConfig/data';
+import { getApp } from '../../service';
const prefixCls = 'app-basic-info';
const AppBasic = (props: { appId: string }) => {
diff --git a/eiam-console/src/main/console-fe/src/pages/app/AppConfig/components/PermissionResource/UpdateModal.tsx b/eiam-console/src/main/console-fe/src/pages/app/AppConfig/components/PermissionResource/UpdateModal.tsx
new file mode 100644
index 00000000..6c711332
--- /dev/null
+++ b/eiam-console/src/main/console-fe/src/pages/app/AppConfig/components/PermissionResource/UpdateModal.tsx
@@ -0,0 +1,152 @@
+/*
+ * eiam-console - Employee Identity and Access Management
+ * Copyright © 2022-Present Jinan Yuanchuang Network Technology Co., Ltd. (support@topiam.cn)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see
.
+ */
+import { getPermissionResource, permissionResourceParamCheck } from '../../service';
+import { ModalForm, ProFormText, ProFormTextArea } from '@ant-design/pro-components';
+import { Form, Spin } from 'antd';
+import React, { useState } from 'react';
+import { useAsyncEffect } from 'ahooks';
+import Paragraph from 'antd/es/typography/Paragraph';
+
+type UpdateFormProps = {
+ /**
+ * ID
+ */
+ id?: string;
+ /**
+ * SYSTEM
+ */
+ appId: string;
+ /**
+ * 是否显示
+ */
+ open: boolean;
+ /**
+ * 取消方法
+ */
+ onCancel: (e?: React.MouseEvent | React.KeyboardEvent) => void;
+ /**
+ * 提交
+ */
+ onFinish?: (formData: Record
) => Promise;
+};
+const UpdateResource: React.FC = (props) => {
+ const { open, onCancel, onFinish, id, appId } = props;
+ const [loading, setLoading] = useState(false);
+ const [form] = Form.useForm();
+
+ useAsyncEffect(async () => {
+ if (open && id) {
+ setLoading(true);
+ const { success, result } = await getPermissionResource(id);
+ if (success && result) {
+ setLoading(false);
+ return;
+ }
+ }
+ }, [id, onCancel, open]);
+
+ return (
+ {
+ setLoading(true);
+ const result = await onFinish?.(values);
+ setLoading(false);
+ return result;
+ }}
+ >
+
+
+ {
+ if (!value) {
+ return Promise.resolve();
+ }
+ setLoading(true);
+ const { success, result } = await permissionResourceParamCheck(
+ appId,
+ 'NAME',
+ value,
+ id,
+ );
+ setLoading(false);
+ if (!success) {
+ return Promise.reject();
+ }
+ if (!result) {
+ return Promise.reject(new Error('资源名称已存在'));
+ }
+ },
+ validateTrigger: ['onBlur'],
+ },
+ ]}
+ />
+ {
+ return (
+ value && (
+
+ ${value}`,
+ }}
+ />
+
+ )
+ );
+ },
+ }}
+ readonly
+ extra="资源编码在当前应用中的唯一标识，不能重复，仅支持英文、数字、下划线，创建后不可修改。"
+ />
+
+
+
+ );
+};
+export default UpdateResource;
diff --git a/eiam-console/src/main/console-fe/src/pages/app/AppCreate/AppCreate.tsx b/eiam-console/src/main/console-fe/src/pages/app/AppCreate/AppCreate.tsx
index d04ea3b7..a2e044fc 100644
--- a/eiam-console/src/main/console-fe/src/pages/app/AppCreate/AppCreate.tsx
+++ b/eiam-console/src/main/console-fe/src/pages/app/AppCreate/AppCreate.tsx
@@ -21,6 +21,7 @@ import {
ModalForm,
PageContainer,
ProCard,
+ ProFormSelect,
ProFormText,
ProFormTextArea,
ProList,
@@ -38,6 +39,7 @@ import classnames from 'classnames';
import { ListTemplate } from './data.d';
import { AppType } from '@/constant';
import { createApp, getAppTemplateList } from './service';
+import { getAllAppGroupList } from '@/services/app';
const { Paragraph } = Typography;
const prefixCls = 'topiam-create-app';
@@ -106,7 +108,7 @@ const CreateApp = (props: {
onOk: () => {
successModal.destroy();
history.push(
- `/app/config?id=${result.id}&name=${values.name}&protocol=${protocol}`,
+ `/app/list/config?id=${result.id}&name=${values.name}&protocol=${protocol}`,
);
},
});
@@ -128,6 +130,23 @@ const CreateApp = (props: {
},
]}
/>
+ {
+ setLoading(true);
+ const { success, data } = await getAllAppGroupList({}, {}, {}).finally(() => {
+ setLoading(false);
+ });
+ if (success && data) {
+ return data.map((i) => {
+ return { label: i.name, value: i.id };
+ });
+ }
+ return [];
+ }}
+ />
{
);
}}
/>
- {createAppTemplate && (
- {
- setCreateAppOpen(false);
- setCreateAppTemplate(undefined);
- }}
- />
- )}
+ {createAppTemplate && (
+ {
+ setCreateAppOpen(false);
+ setCreateAppTemplate(undefined);
+ }}
+ />
+ )}
);
};
-export default () => {
- return