From 296ccd3d33e8379953b06198a456b4c84064df19 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 28 二月 2024 14:06:31 +0800
Subject: [PATCH] #
---
zy-asrs-flow/src/locales/en-US.ts | 30 ++++++---
zy-asrs-flow/src/pages/User/Login/index.jsx | 109 ++++++++++++++++++++++++++++--------
zy-asrs-flow/src/pages/User/Login/index0.jsx | 2
3 files changed, 106 insertions(+), 35 deletions(-)
diff --git a/zy-asrs-flow/src/locales/en-US.ts b/zy-asrs-flow/src/locales/en-US.ts
index 7c632b7..7f35c7c 100644
--- a/zy-asrs-flow/src/locales/en-US.ts
+++ b/zy-asrs-flow/src/locales/en-US.ts
@@ -33,16 +33,26 @@
'':'',
'':'',
'':'',
- '':'',
- '':'',
- '':'',
- '':'',
- '':'',
- '':'',
- '':'',
- '':'',
- '':'',
- '':'',
+ 'login.success':'Login successful!',
+ 'login.failure':'Login failed, please try again!',
+ 'login.accountLogin.tab':'Account Login',
+ 'login.phoneLogin.tab':'Phone Login',
+ 'login.host':'Host:',
+ 'login.rule.host':'Please select host',
+ 'login.username':'Username:',
+ 'login.rule.username':'Please enter your username',
+ 'login.password':'Password:',
+ 'login.rule.password':'Please enter your password',
+ 'login.accountLogin.errorMessage':'Incorrect username/password',
+ 'login.rememberMe':'Remember me',
+ 'login.phoneNumber.placeholder':'Phone Number',
+ 'login.phoneNumber.required':'Please input your phone number!',
+ 'login.phoneNumber.invalid':'Phone number is invalid!',
+ 'login.captcha.placeholder':'Verification Code',
+ 'login.getCaptchaSecondText':'sec(s)',
+ 'login.phoneLogin.getVerificationCode':'Get Code',
+ 'login.captcha.required':'Please input verification code!',
+ 'login.phoneLogin.none':'Mobile phone login is not enabled',
'':'',
'':'',
'':'',
diff --git a/zy-asrs-flow/src/pages/User/Login/index.jsx b/zy-asrs-flow/src/pages/User/Login/index.jsx
index 7a5c937..ba25744 100644
--- a/zy-asrs-flow/src/pages/User/Login/index.jsx
+++ b/zy-asrs-flow/src/pages/User/Login/index.jsx
@@ -99,7 +99,6 @@
}
};
-
const handleSubmit = async (values) => {
try {
const r = await request('/api/login', {
@@ -119,7 +118,7 @@
})
}
message.success(intl.formatMessage({
- id: 'pages.login.success',
+ id: 'login.success',
defaultMessage: '鐧诲綍鎴愬姛锛�',
}));
setToken(r.data.accessToken, values.autoLogin);
@@ -133,7 +132,7 @@
} catch (error) {
console.log(error);
message.error(intl.formatMessage({
- id: 'pages.login.failure',
+ id: 'login.failure',
defaultMessage: '鐧诲綍澶辫触锛岃閲嶈瘯锛�',
}));
}
@@ -167,19 +166,31 @@
activeKey={loginType}
onChange={(activeKey) => setLoginType(activeKey)}
>
- <Tabs.TabPane key={'account'} tab={'璐﹀彿瀵嗙爜鐧诲綍'} />
- <Tabs.TabPane key={'phone'} tab={'鎵嬫満鍙风櫥褰�'} />
+ <Tabs.TabPane key={'account'} tab={intl.formatMessage({
+ id: 'login.accountLogin.tab',
+ defaultMessage: '璐︽埛瀵嗙爜鐧诲綍',
+ })} />
+ <Tabs.TabPane key={'phone'} tab={intl.formatMessage({
+ id: 'login.phoneLogin.tab',
+ defaultMessage: '鎵嬫満鍙风櫥褰�',
+ })} />
</Tabs>
{loginType === 'account' && (
<>
<ProFormSelect
className="centered-select"
name="hostId"
- placeholder="鏈烘瀯锛�"
+ placeholder={intl.formatMessage({
+ id: 'login.host',
+ defaultMessage: '鏈烘瀯锛�',
+ })}
rules={[
{
required: true,
- message: '璇烽�夋嫨鏈烘瀯!',
+ message: intl.formatMessage({
+ id: 'login.rule.host',
+ defaultMessage: '璇烽�夋嫨鏈烘瀯!',
+ }),
},
]}
options={hostList}
@@ -197,11 +208,17 @@
/>
),
}}
- placeholder={'鐢ㄦ埛鍚�: '}
+ placeholder={intl.formatMessage({
+ id: 'login.username',
+ defaultMessage: '鐢ㄦ埛鍚�: ',
+ })}
rules={[
{
required: true,
- message: '璇疯緭鍏ョ敤鎴峰悕!',
+ message: intl.formatMessage({
+ id: 'login.rule.username',
+ defaultMessage: '璇疯緭鍏ョ敤鎴峰悕!',
+ }),
},
]}
/>
@@ -218,11 +235,17 @@
/>
),
}}
- placeholder={'瀵嗙爜: '}
+ placeholder={intl.formatMessage({
+ id: 'login.password',
+ defaultMessage: '瀵嗙爜: ',
+ })}
rules={[
{
required: true,
- message: '璇疯緭鍏ュ瘑鐮侊紒',
+ message: intl.formatMessage({
+ id: 'login.rule.password',
+ defaultMessage: '璇疯緭鍏ュ瘑鐮侊紒!',
+ }),
},
]}
/>
@@ -230,7 +253,10 @@
)}
{status !== 200 && loginType === 'account' && (
<LoginMessage
- content={errDesc}
+ content={intl.formatMessage({
+ id: 'login.accountLogin.errorMessage',
+ defaultMessage: '璐︽埛鎴栧瘑鐮侀敊璇�',
+ })}
/>
)}
{loginType === 'phone' && (
@@ -238,11 +264,17 @@
<ProFormSelect
className="centered-select"
name="hostId"
- placeholder="鏈烘瀯锛�"
+ placeholder={intl.formatMessage({
+ id: 'login.host',
+ defaultMessage: '鏈烘瀯锛�',
+ })}
rules={[
{
required: true,
- message: '璇烽�夋嫨鏈烘瀯!',
+ message: intl.formatMessage({
+ id: 'login.rule.host',
+ defaultMessage: '璇烽�夋嫨鏈烘瀯!',
+ }),
},
]}
options={hostList}
@@ -260,15 +292,26 @@
),
}}
name="mobile"
- placeholder={'鎵嬫満鍙�'}
+ placeholder={intl.formatMessage({
+ id: 'login.phoneNumber.placeholder',
+ defaultMessage: '鎵嬫満鍙�',
+ })}
rules={[
{
required: true,
- message: '璇疯緭鍏ユ墜鏈哄彿锛�',
+ message:
+ <FormattedMessage
+ id="login.phoneNumber.required"
+ defaultMessage="璇疯緭鍏ユ墜鏈哄彿锛�"
+ />,
},
{
pattern: /^1\d{10}$/,
- message: '鎵嬫満鍙锋牸寮忛敊璇紒',
+ message:
+ <FormattedMessage
+ id="login.phoneNumber.invalid"
+ defaultMessage="鎵嬫満鍙锋牸寮忛敊璇紒"
+ />,
},
]}
/>
@@ -287,23 +330,38 @@
captchaProps={{
size: 'large',
}}
- placeholder={'璇疯緭鍏ラ獙璇佺爜'}
+ placeholder={intl.formatMessage({
+ id: 'login.captcha.placeholder',
+ defaultMessage: '璇疯緭鍏ラ獙璇佺爜',
+ })}
captchaTextRender={(timing, count) => {
if (timing) {
- return `${count} ${'鑾峰彇楠岃瘉鐮�'}`;
+ return `${count} ${intl.formatMessage({
+ id: 'pages.getCaptchaSecondText',
+ defaultMessage: 'sec(绉�)',
+ })}`;
}
- return '鑾峰彇楠岃瘉鐮�';
+ return intl.formatMessage({
+ id: 'login.phoneLogin.getVerificationCode',
+ defaultMessage: '鑾峰彇楠岃瘉鐮�',
+ });
}}
name="captcha"
rules={[
{
required: true,
- message: '璇疯緭鍏ラ獙璇佺爜锛�',
+ message:
+ <FormattedMessage
+ id="login.captcha.required"
+ defaultMessage="璇疯緭鍏ラ獙璇佺爜锛�"
+ />,
},
]}
onGetCaptcha={async () => {
- // message.success('鑾峰彇楠岃瘉鐮佹垚鍔燂紒楠岃瘉鐮佷负锛�1234');
- message.warning('鏈紑鍚墜鏈哄彿鐧诲綍! ');
+ message.warning(intl.formatMessage({
+ id: 'login.phoneLogin.none',
+ defaultMessage: '鏈紑鍚墜鏈哄彿鐧诲綍',
+ }));
}}
/>
</>
@@ -320,7 +378,10 @@
setRememberMe(e.target.checked);
}}
>
- 鑷姩鐧诲綍
+ {intl.formatMessage({
+ id: 'login.rememberMe',
+ defaultMessage: '鑷姩鐧诲綍',
+ })}
</ProFormCheckbox>
</div>
</LoginFormPage>
diff --git a/zy-asrs-flow/src/pages/User/Login/index0.jsx b/zy-asrs-flow/src/pages/User/Login/index0.jsx
index 632355e..235e7aa 100644
--- a/zy-asrs-flow/src/pages/User/Login/index0.jsx
+++ b/zy-asrs-flow/src/pages/User/Login/index0.jsx
@@ -308,7 +308,7 @@
if (timing) {
return `${count} ${intl.formatMessage({
id: 'pages.getCaptchaSecondText',
- defaultMessage: '鑾峰彇楠岃瘉鐮�',
+ defaultMessage: '绉�',
})}`;
}
return intl.formatMessage({
--
Gitblit v1.9.1