From 32d5c5f50ad068181a0a53d2a2429e6fff2fe102 Mon Sep 17 00:00:00 2001 From: awenes <1121353141@qq.com> Date: Tue, 26 Sep 2023 19:52:42 +0800 Subject: [PATCH 1/3] =?UTF-8?q?:zap:=20=E4=BC=98=E5=8C=96=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- eiam-console/src/main/console-fe/package.json | 2 +- .../console-fe/src/pages/user/Login/Login.tsx | 195 +++++++++--------- .../console-fe/src/pages/user/Login/style.ts | 3 + eiam-portal/src/main/portal-fe/package.json | 2 +- 4 files changed, 97 insertions(+), 105 deletions(-) diff --git a/eiam-console/src/main/console-fe/package.json b/eiam-console/src/main/console-fe/package.json index 42f4d3ee..31a862f7 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.25", + "@ant-design/pro-components": "^2.6.27", "ahooks": "^3.7.8", "antd": "^5.9.3", "antd-img-crop": "^4.13.0", diff --git a/eiam-console/src/main/console-fe/src/pages/user/Login/Login.tsx b/eiam-console/src/main/console-fe/src/pages/user/Login/Login.tsx index bf1380f8..086b7554 100644 --- a/eiam-console/src/main/console-fe/src/pages/user/Login/Login.tsx +++ b/eiam-console/src/main/console-fe/src/pages/user/Login/Login.tsx @@ -28,11 +28,9 @@ import queryString from 'query-string'; import { flushSync } from 'react-dom'; import classnames from 'classnames'; import useStyle from './style'; -import Banner from '@/components/Banner'; import PageLoading from '@/components/PageLoading'; const prefixCls = 'login'; -const showBanner = process.env.PREVIEW_ENV || process.env.NODE_ENV === 'development'; /** * 错误消息 @@ -152,116 +150,107 @@ const Login: React.FC = () => {
- {showBanner && } -
dom.pop(), + submitButtonProps: { + loading, + size: 'large', + style: { + width: '100%', + }, + }, + }} + onFinish={async (values) => { + run(values); + return data; }} > - dom.pop(), - submitButtonProps: { - loading, + {userLoginState?.status !== RESULT_STATE.SUCCESS && userLoginState?.message && ( + <> + +
+ + )} + <> + + ), + autoComplete: 'off', + }} + placeholder={intl.formatMessage({ + id: 'pages.login.username.placeholder', + })} + rules={[ + { + required: true, + message: , }, - }, - }} - onFinish={async (values) => { - run(values); - return data; + ]} + /> + + ), + }} + placeholder={intl.formatMessage({ + id: 'pages.login.password.placeholder', + })} + rules={[ + { + required: true, + message: , + }, + ]} + /> + +
- {userLoginState?.status !== RESULT_STATE.SUCCESS && userLoginState?.message && ( - <> - -
- - )} - <> - - ), - autoComplete: 'off', - }} - placeholder={intl.formatMessage({ - id: 'pages.login.username.placeholder', - })} - rules={[ - { - required: true, - message: , - }, - ]} - /> - - ), - }} - placeholder={intl.formatMessage({ - id: 'pages.login.password.placeholder', - })} - rules={[ - { - required: true, - message: , - }, - ]} - /> - - - -
+ + +
+
) : ( diff --git a/eiam-console/src/main/console-fe/src/pages/user/Login/style.ts b/eiam-console/src/main/console-fe/src/pages/user/Login/style.ts index 1da102b6..7d1b8e7a 100644 --- a/eiam-console/src/main/console-fe/src/pages/user/Login/style.ts +++ b/eiam-console/src/main/console-fe/src/pages/user/Login/style.ts @@ -23,6 +23,9 @@ const useStyle = createStyles(({ token, prefixCls }, prefix) => { return { main: { [`${prefixClassName}`]: { + backgroundColor: 'white', + height: '100vh', + border: '1px solid rgb(240, 240, 240)', [`${prefixClassName}-form-prefix-icon`]: { color: token.colorPrimary, fontSize: token.fontSize, diff --git a/eiam-portal/src/main/portal-fe/package.json b/eiam-portal/src/main/portal-fe/package.json index c8d074ab..fee47375 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.25", + "@ant-design/pro-components": "^2.6.27", "ahooks": "^3.7.8", "antd": "^5.9.3", "antd-img-crop": "^4.13.0", From 4a72268de0128ac405a1bf3a06c5c74dc13e8051 Mon Sep 17 00:00:00 2001 From: awenes <1121353141@qq.com> Date: Tue, 26 Sep 2023 20:23:07 +0800 Subject: [PATCH 2/3] =?UTF-8?q?:zap:=20=E4=BC=98=E5=8C=96=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/console-fe/src/pages/app/AppDetail/locales/zh-CN.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eiam-console/src/main/console-fe/src/pages/app/AppDetail/locales/zh-CN.ts b/eiam-console/src/main/console-fe/src/pages/app/AppDetail/locales/zh-CN.ts index 1739fcfb..77634599 100644 --- a/eiam-console/src/main/console-fe/src/pages/app/AppDetail/locales/zh-CN.ts +++ b/eiam-console/src/main/console-fe/src/pages/app/AppDetail/locales/zh-CN.ts @@ -45,7 +45,7 @@ export default { 'pages.app.config.detail.items.login_access.protocol_config.common.authorization_type': '授权范围', 'pages.app.config.detail.items.login_access.protocol_config.common.authorization_type.extra': - '若选择手动授权,需要在 访问授权 中进行权限分配。', + '若选择手动授权,需要在【访问授权】中进行权限分配。', 'pages.app.config.detail.items.login_access.protocol_config.common.authorization_type.rule.0.message': '请选择授权范围', 'pages.app.config.detail.items.login_access.protocol_config.common.authorization_type.option.0': From ea3e2d5184cce390fdb1f82e5f2f612d56ab92ed Mon Sep 17 00:00:00 2001 From: awenes <1121353141@qq.com> Date: Tue, 26 Sep 2023 20:33:03 +0800 Subject: [PATCH 3/3] =?UTF-8?q?:zap:=20=E4=BC=98=E5=8C=96=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/pages/app/AppDetail/AppDetail.tsx | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/eiam-console/src/main/console-fe/src/pages/app/AppDetail/AppDetail.tsx b/eiam-console/src/main/console-fe/src/pages/app/AppDetail/AppDetail.tsx index b6ec6f06..afc22345 100644 --- a/eiam-console/src/main/console-fe/src/pages/app/AppDetail/AppDetail.tsx +++ b/eiam-console/src/main/console-fe/src/pages/app/AppDetail/AppDetail.tsx @@ -89,11 +89,7 @@ export default () => { loading ? ( ) : ( - + { , ]} tabActiveKey={tabActiveKey} - onTabChange={setTabActiveKey} + onTabChange={(key) => { + setTabActiveKey(key); + history.replace({ + pathname: location.pathname, + search: queryString.stringify({ + type: key, + id, + }), + }); + }} tabList={[ { key: ConfigTabs.app_config,