diff --git a/eiam-console/src/main/console-fe/package.json b/eiam-console/src/main/console-fe/package.json index ad3770ce..5c3e62bc 100644 --- a/eiam-console/src/main/console-fe/package.json +++ b/eiam-console/src/main/console-fe/package.json @@ -47,7 +47,7 @@ "@ant-design/charts": "^1.4.2", "@ant-design/icons": "^5.2.6", "@ant-design/maps": "^1.0.7", - "@ant-design/pro-components": "^2.6.16", + "@ant-design/pro-components": "^2.6.18", "ahooks": "^3.7.8", "antd": "^5.8.6", "antd-img-crop": "^4.12.2", @@ -89,14 +89,14 @@ "@types/google-libphonenumber": "^7.4.26", "@types/history": "^4.7.11", "@types/js-yaml": "^4.0.5", - "@types/lodash": "^4.14.197", + "@types/lodash": "^4.14.198", "@types/numeral": "^2.0.2", "@types/qs": "^6.9.8", "@types/react": "^18.2.21", "@types/react-dom": "^18.2.7", "@types/react-helmet": "^6.1.6", - "@umijs/lint": "^4.0.79", - "@umijs/max": "^4.0.79", + "@umijs/lint": "^4.0.80", + "@umijs/max": "^4.0.80", "cross-env": "^7.0.3", "cross-port-killer": "^1.4.0", "eslint": "^8.48.0", diff --git a/eiam-console/src/main/console-fe/src/pages/setting/Message/Message.tsx b/eiam-console/src/main/console-fe/src/pages/setting/Message/Message.tsx index ccbf1cea..a4062ee6 100644 --- a/eiam-console/src/main/console-fe/src/pages/setting/Message/Message.tsx +++ b/eiam-console/src/main/console-fe/src/pages/setting/Message/Message.tsx @@ -35,7 +35,7 @@ export default (): React.ReactNode => { const { type } = query as { type: TabType; }; - if (!type) { + if (!type || !TabType[type]) { setActiveKey(TabType.mail_template); history.replace({ pathname: location.pathname, diff --git a/eiam-console/src/main/console-fe/src/services/app.ts b/eiam-console/src/main/console-fe/src/services/app.ts index 0d095409..f96d967b 100644 --- a/eiam-console/src/main/console-fe/src/services/app.ts +++ b/eiam-console/src/main/console-fe/src/services/app.ts @@ -21,18 +21,6 @@ import type { SortOrder } from 'antd/es/table/interface'; import { request } from '@umijs/max'; import type { UploadFile } from 'antd/es/upload/interface'; -/** - * Get Application Template FormSchema - */ -export async function getAppTemplateFormSchema( - code: string, -): Promise>> { - return request>(`/api/v1/app/template/form_schema`, { - method: 'GET', - params: { code: code }, - }); -} - /** * 获取应用列表 */ @@ -65,15 +53,6 @@ export async function updateApp(params: Record): Promise> { - return request>(`/api/v1/app/get/${id}`, { - method: 'GET', - }); -} - /** * Get Config */ diff --git a/eiam-portal/src/main/portal-fe/package.json b/eiam-portal/src/main/portal-fe/package.json index 07511d18..a05715f9 100644 --- a/eiam-portal/src/main/portal-fe/package.json +++ b/eiam-portal/src/main/portal-fe/package.json @@ -48,7 +48,7 @@ "@ant-design/charts": "^1.4.2", "@ant-design/icons": "^5.2.6", "@ant-design/maps": "^1.0.7", - "@ant-design/pro-components": "^2.6.16", + "@ant-design/pro-components": "^2.6.18", "ahooks": "^3.7.8", "antd": "^5.8.6", "antd-img-crop": "^4.12.2", @@ -84,14 +84,14 @@ "@types/google-libphonenumber": "^7.4.26", "@types/history": "^4.7.11", "@types/js-yaml": "^4.0.5", - "@types/lodash": "^4.14.197", + "@types/lodash": "^4.14.198", "@types/numeral": "^2.0.2", "@types/qs": "^6.9.8", "@types/react": "^18.2.21", "@types/react-dom": "^18.2.7", "@types/react-helmet": "^6.1.6", - "@umijs/lint": "^4.0.79", - "@umijs/max": "^4.0.79", + "@umijs/lint": "^4.0.80", + "@umijs/max": "^4.0.80", "cross-env": "^7.0.3", "cross-port-killer": "^1.4.0", "eslint": "^8.48.0", diff --git a/eiam-portal/src/main/portal-fe/src/pages/Account/components/ModifyPassword.tsx b/eiam-portal/src/main/portal-fe/src/pages/Account/components/ModifyPassword.tsx index ed952b13..67edece0 100644 --- a/eiam-portal/src/main/portal-fe/src/pages/Account/components/ModifyPassword.tsx +++ b/eiam-portal/src/main/portal-fe/src/pages/Account/components/ModifyPassword.tsx @@ -70,7 +70,7 @@ const ModifyPassword = (props: { destroyOnClose: true, maskClosable: false, onCancel: async () => { - await setVisible(false); + setVisible(false); }, }} onFinish={async (formData: Record) => { @@ -89,7 +89,7 @@ const ModifyPassword = (props: { ), ); if (success && result) { - await setVisible(false); + setVisible(false); message.success(intl.formatMessage({ id: 'page.account.modify_password.success' })); setRefresh(true); return Promise.resolve();