From bfbc8f9cbbfe27d535f0502617fcfaca7d331945 Mon Sep 17 00:00:00 2001 From: awenes <1121353141@qq.com> Date: Tue, 26 Sep 2023 21:41:37 +0800 Subject: [PATCH 1/3] =?UTF-8?q?:zap:=20=E4=BC=98=E5=8C=96=E9=97=A8?= =?UTF-8?q?=E6=88=B7=E7=AB=AF=E7=99=BB=E5=BD=95=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../portal-fe/src/components/Footer/index.tsx | 2 +- .../main/portal-fe/src/pages/Login/Login.tsx | 504 +++++++++--------- .../Login/components/ForgetPassword/style.ts | 4 +- .../main/portal-fe/src/pages/Login/style.ts | 8 +- 4 files changed, 251 insertions(+), 267 deletions(-) diff --git a/eiam-portal/src/main/portal-fe/src/components/Footer/index.tsx b/eiam-portal/src/main/portal-fe/src/components/Footer/index.tsx index 2117c913..96827479 100644 --- a/eiam-portal/src/main/portal-fe/src/components/Footer/index.tsx +++ b/eiam-portal/src/main/portal-fe/src/components/Footer/index.tsx @@ -24,7 +24,7 @@ const currentYear = new Date().getFullYear(); export default (props: FooterProps) => ( { - {showBanner && ( -
- -
- )} -
-
-
- {statusLoading ? ( - - - - ) : ( - <> - {/*登录*/} - {!status && !forgetPassword && ( - <> -
- logo -
- {intl.formatMessage({ id: 'pages.layout.title' })} -
+ {statusLoading || loginConfigLoading ? ( + + ) : ( +
+
+
+ {/*登录*/} + {!status && !forgetPassword && ( + <> +
+ logo +
+ {intl.formatMessage({ id: 'pages.layout.title' })}
-
- {/*登录错误*/} - {userLoginState?.status !== RESULT_STATE.SUCCESS && - currentProvider?.type === IDP_TYPE.ACCOUNT && - userLoginState?.message && ( - - )} - {/*其他登录方式*/} - {loginConfig?.idps?.map((value) => { - if ( - value.type === currentProvider?.type && - value.code === currentProvider?.code - ) { - if (value.type === IDP_TYPE.DINGTALK_OAUTH) { - dingTalkOauthOnClick(value.code); - return <>; - } - //QQ - if (value.type === IDP_TYPE.QQ_OAUTH) { - qqOauthOnClick(value.code); - return <>; - } - /* 扫码登录 */ - return ( - - ); +
+
+ {/*登录错误*/} + {userLoginState?.status !== RESULT_STATE.SUCCESS && + currentProvider?.type === IDP_TYPE.ACCOUNT && + userLoginState?.message && } + {/*其他登录方式*/} + {loginConfig?.idps?.map((value) => { + if ( + value.type === currentProvider?.type && + value.code === currentProvider?.code + ) { + if (value.type === IDP_TYPE.DINGTALK_OAUTH) { + dingTalkOauthOnClick(value.code); + return <>; } - return
; - })} - { - // 用户名密码和短信登录 - (currentProvider?.type === IDP_TYPE.ACCOUNT || - currentProvider?.type === IDP_TYPE.CAPTCHA) && ( - dom.pop(), - submitButtonProps: { - loading, - size: 'large', - htmlType: 'submit', - style: { - width: '100%', - }, + //QQ + if (value.type === IDP_TYPE.QQ_OAUTH) { + qqOauthOnClick(value.code); + return <>; + } + /* 扫码登录 */ + return ( + + ); + } + return
; + })} + { + // 用户名密码和短信登录 + (currentProvider?.type === IDP_TYPE.ACCOUNT || + currentProvider?.type === IDP_TYPE.CAPTCHA) && ( + dom.pop(), + submitButtonProps: { + loading, + size: 'large', + htmlType: 'submit', + style: { + width: '100%', }, + }, + }} + onFinish={async (values) => { + run(values); + return data; + }} + > + { + setCurrentProvider({ type: key }); }} - onFinish={async (values) => { - await run(values); - return data; + items={[ + { + label: intl.formatMessage({ + id: 'pages.login.account-login.tab', + }), + key: IDP_TYPE.ACCOUNT, + children: ( + <> + + + ), + }, + { + label: intl.formatMessage({ + id: 'pages.login.phone-login.tab', + }), + key: IDP_TYPE.CAPTCHA, + children: ( + <> + {}} onRef={captchaRef} /> + + ), + }, + ]} + /> +
- { - setCurrentProvider({ type: key }); - }} - items={[ - { - label: intl.formatMessage({ - id: 'pages.login.account-login.tab', - }), - key: IDP_TYPE.ACCOUNT, - children: ( - <> - - - ), - }, - { - label: intl.formatMessage({ - id: 'pages.login.phone-login.tab', - }), - key: IDP_TYPE.CAPTCHA, - children: ( - <> - {}} onRef={captchaRef} /> - - ), - }, - ]} - /> - - - ) - } - <> - - {!loginConfigLoading && ( - <> - {typeof loginConfig?.idps !== 'undefined' && - loginConfig?.idps?.length > 0 && ( -
- -
- )} - - { - // 不是短信和用户名密码时 - currentProvider?.type !== IDP_TYPE.CAPTCHA && - currentProvider?.type !== IDP_TYPE.ACCOUNT && ( - + +
+ + ) + } + <> + + {!loginConfigLoading && ( + <> + {typeof loginConfig?.idps !== 'undefined' && + loginConfig?.idps?.length > 0 && ( +
+ +
+ )} + + { + // 不是短信和用户名密码时 + currentProvider?.type !== IDP_TYPE.CAPTCHA && + currentProvider?.type !== IDP_TYPE.ACCOUNT && ( + + { + setCurrentProvider({ + type: IDP_TYPE.ACCOUNT, + code: undefined, + }); + }} > + + + + ) + } + {loginConfig?.idps && + loginConfig?.idps.map((value) => { + return ( + value.code !== currentProvider?.code && ( + { - setCurrentProvider({ - type: IDP_TYPE.ACCOUNT, - code: undefined, - }); + //钉钉OAuth认证，跳转页面 + if (value.type === IDP_TYPE.DINGTALK_OAUTH) { + dingTalkOauthOnClick(value.code); + return; + } + //飞书，跳转页面 + if (value.type === IDP_TYPE.FEISHU_OAUTH) { + feiShuOauthOnClick(value.code); + return; + } + //QQ + if (value.type === IDP_TYPE.QQ_OAUTH) { + qqOauthOnClick(value.code); + return; + } + //微博 + if (value.type === IDP_TYPE.WEIBO_OAUTH) { + weiBoOauthOnClick(value.code); + return; + } + //gitee + if (value.type === IDP_TYPE.GITEE_OAUTH) { + giteeOauthOnClick(value.code); + return; + } + //GITHUB，跳转页面 + if (value.type === IDP_TYPE.GITHUB_OAUTH) { + githubOauthOnClick(value.code); + return; + } + //支付宝，跳转页面 + if (value.type === IDP_TYPE.ALIPAY_OAUTH) { + alipayOauthOnClick(value.code); + return; + } + //其他方式，跳转页面 + else { + setCurrentProvider({ + type: value.type, + code: value.code, + }); + } }} > ) - } - {loginConfig?.idps && - loginConfig?.idps.map((value) => { - return ( - value.code !== currentProvider?.code && ( - - { - //钉钉OAuth认证，跳转页面 - if (value.type === IDP_TYPE.DINGTALK_OAUTH) { - dingTalkOauthOnClick(value.code); - return; - } - //飞书，跳转页面 - if (value.type === IDP_TYPE.FEISHU_OAUTH) { - feiShuOauthOnClick(value.code); - return; - } - //QQ - if (value.type === IDP_TYPE.QQ_OAUTH) { - qqOauthOnClick(value.code); - return; - } - //微博 - if (value.type === IDP_TYPE.WEIBO_OAUTH) { - weiBoOauthOnClick(value.code); - return; - } - //gitee - if (value.type === IDP_TYPE.GITEE_OAUTH) { - giteeOauthOnClick(value.code); - return; - } - //GITHUB，跳转页面 - if (value.type === IDP_TYPE.GITHUB_OAUTH) { - githubOauthOnClick(value.code); - return; - } - //支付宝，跳转页面 - if (value.type === IDP_TYPE.ALIPAY_OAUTH) { - alipayOauthOnClick(value.code); - return; - } - //其他方式，跳转页面 - else { - setCurrentProvider({ - type: value.type, - code: value.code, - }); - } - }} - > - - - - ) - ); - })} - - - )} - - -
- - )} - {/**BIND USER*/} - {status === SESSION_STATUS.require_bind_idp && ( -
- + ); + })} + + + )} + +
- )} - {/*忘记密码*/} - {!status && forgetPassword && ( - { - setForgetPassword(false); - setStatusLoading(true); - setTimeout(() => { - setStatusLoading(false); - }, 85); - }} - /> - )} - - )} + + )} + {/**BIND USER*/} + {status === SESSION_STATUS.require_bind_idp && ( +
+ +
+ )} + {/*忘记密码*/} + {!status && forgetPassword && ( + { + setForgetPassword(false); + setStatusLoading(true); + setTimeout(() => { + setStatusLoading(false); + }, 85); + }} + /> + )} +
+ {/**Footer*/} +
- {/**Footer*/} -
-
+ )}
); }; diff --git a/eiam-portal/src/main/portal-fe/src/pages/Login/components/ForgetPassword/style.ts b/eiam-portal/src/main/portal-fe/src/pages/Login/components/ForgetPassword/style.ts index 79f2347c..208aa8f7 100644 --- a/eiam-portal/src/main/portal-fe/src/pages/Login/components/ForgetPassword/style.ts +++ b/eiam-portal/src/main/portal-fe/src/pages/Login/components/ForgetPassword/style.ts @@ -21,8 +21,7 @@ const useStyle = createStyles((_, props) => { const prefixCls = `${props}`; return { main: { - width: '320px', - marginTop: '24px', + width: '328px', [`.${prefixCls}`]: { ['&-success-box']: { padding: '40px', @@ -51,7 +50,6 @@ const useStyle = createStyles((_, props) => { ['&-back']: { width: '100%', marginBottom: '24px', - marginTop: '24px', }, ['&-back-time']: { display: 'flex', diff --git a/eiam-portal/src/main/portal-fe/src/pages/Login/style.ts b/eiam-portal/src/main/portal-fe/src/pages/Login/style.ts index 3b3600e6..cfc172c6 100644 --- a/eiam-portal/src/main/portal-fe/src/pages/Login/style.ts +++ b/eiam-portal/src/main/portal-fe/src/pages/Login/style.ts @@ -38,12 +38,11 @@ const useStyle = createStyles(({ prefixCls, token }, props) => { display: 'flex', flex: 'none !important', flexDirection: 'column', - width: '430px', + padding: '32px', maxWidth: '100%', - minHeight: '475px', backgroundColor: '#fff', borderRadius: token.borderRadius, - boxShadow: '0 2px 10px 0 rgb(57 106 255 / 5%)', + boxShadow: '0px 0px 24px 0px rgba(0,0,0,0.1)', [`${antCls}-tabs-nav-list`]: { margin: 'auto', fontSize: '16px', @@ -57,7 +56,6 @@ const useStyle = createStyles(({ prefixCls, token }, props) => { }, ['&-top']: { textAlign: 'center', - padding: '39px 0 0', }, ['&-logo']: { width: '200px', @@ -68,7 +66,7 @@ const useStyle = createStyles(({ prefixCls, token }, props) => { verticalAlign: 'top', }, ['&-desc']: { - marginTop: '12px', + marginTop: '25px', marginBottom: '15px', color: token.colorTextSecondary, fontSize: token.fontSize, From 2bc10c9cb938bb982535b108871e3804b68e354b Mon Sep 17 00:00:00 2001 From: awenes <1121353141@qq.com> Date: Tue, 26 Sep 2023 21:53:32 +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 --- eiam-console/src/main/console-fe/src/app.tsx | 2 +- eiam-console/src/main/console-fe/src/pages/Welcome.tsx | 2 +- .../src/main/portal-fe/src/pages/Workplace/Workplace.tsx | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eiam-console/src/main/console-fe/src/app.tsx b/eiam-console/src/main/console-fe/src/app.tsx index 1181885b..dd9aa9f0 100644 --- a/eiam-console/src/main/console-fe/src/app.tsx +++ b/eiam-console/src/main/console-fe/src/app.tsx @@ -68,7 +68,7 @@ export async function getInitialState(): Promise<{ /** * 控制台打印 */ - console.log('%c欢迎使用 TopIAM 企业数字身份管控平台', 'font-size: 24px;'); + console.log('%c欢迎使用 TOPIAM 企业数字身份管控平台', 'font-size: 24px;'); return { fetchUserInfo, currentUser: isLoginPath() ? undefined : await fetchUserInfo(), diff --git a/eiam-console/src/main/console-fe/src/pages/Welcome.tsx b/eiam-console/src/main/console-fe/src/pages/Welcome.tsx index 501e3110..944f791f 100644 --- a/eiam-console/src/main/console-fe/src/pages/Welcome.tsx +++ b/eiam-console/src/main/console-fe/src/pages/Welcome.tsx @@ -121,7 +121,7 @@ const Welcome: React.FC = () => { color: '#1A1A1A', }} > - 欢迎使用 TopIAM 企业数字身份管控平台 + 欢迎使用 TOPIAM 企业数字身份管控平台

{ return ( - + ); From 25a0ca391ac4a03eb90e6a4b302d3010177a1172 Mon Sep 17 00:00:00 2001 From: awenes <1121353141@qq.com> Date: Tue, 26 Sep 2023 22:06:23 +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 --- README.md | 2 +- .../src/main/console-fe/src/components/Banner/Banner.tsx | 2 +- eiam-portal/src/main/portal-fe/src/components/Banner/Banner.tsx | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 982858d6..02d72d6e 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ -------------------------- -

⭐️ 如果你喜欢 TopIAM，请给它一个 Star，您的支持将是我们前行的动力。
+
⭐️ 如果你喜欢 TOPIAM，请给它一个 Star，您的支持将是我们前行的动力。
-------------------------- diff --git a/eiam-console/src/main/console-fe/src/components/Banner/Banner.tsx b/eiam-console/src/main/console-fe/src/components/Banner/Banner.tsx index 68861d2d..f585def0 100644 --- a/eiam-console/src/main/console-fe/src/components/Banner/Banner.tsx +++ b/eiam-console/src/main/console-fe/src/components/Banner/Banner.tsx @@ -22,7 +22,7 @@ import Marquee from 'react-fast-marquee'; const message = () => { return ( <> - ⭐️ 如果你喜欢 TopIAM，请给它一个 Star + ⭐️ 如果你喜欢 TOPIAM，请给它一个 Star GitHub diff --git a/eiam-portal/src/main/portal-fe/src/components/Banner/Banner.tsx b/eiam-portal/src/main/portal-fe/src/components/Banner/Banner.tsx index fdf5fad7..40d2cadf 100644 --- a/eiam-portal/src/main/portal-fe/src/components/Banner/Banner.tsx +++ b/eiam-portal/src/main/portal-fe/src/components/Banner/Banner.tsx @@ -22,7 +22,7 @@ import Marquee from 'react-fast-marquee'; const message = () => { return ( <> - ⭐️ 如果你喜欢 TopIAM，请给它一个 Star + ⭐️ 如果你喜欢 TOPIAM，请给它一个 Star GitHub