|
|
@@ -1,112 +1,72 @@
|
|
1
|
|
-import { Alert, Icon } from 'antd';
|
|
2
|
|
-import { FormattedMessage, formatMessage } from 'umi-plugin-react/locale';
|
|
3
|
|
-import React, { Component } from 'react';
|
|
|
1
|
+import React, { useState } from 'react';
|
|
4
|
2
|
import { connect } from 'dva';
|
|
5
|
3
|
import md5 from "md5";
|
|
6
|
|
-import LoginComponents from './components/Login';
|
|
|
4
|
+import { Form, Input, Button } from 'antd'
|
|
7
|
5
|
import styles from './style.less';
|
|
8
|
|
-import { defineLocale } from 'moment';
|
|
9
|
6
|
|
|
10
|
|
-const { UserName, Password, Submit } = LoginComponents;
|
|
|
7
|
+const buttonItemLayout = {
|
|
|
8
|
+ wrapperCol: { span: 14, offset: 4 },
|
|
|
9
|
+}
|
|
11
|
10
|
|
|
12
|
|
-@connect(({ login, loading }) => ({
|
|
13
|
|
- userLogin: login,
|
|
14
|
|
- submitting: loading.effects['login/login'],
|
|
15
|
|
-}))
|
|
16
|
|
-class Login extends Component {
|
|
17
|
|
- loginForm = undefined;
|
|
|
11
|
+const formItemLayout = {
|
|
|
12
|
+ labelCol: { span: 6 },
|
|
|
13
|
+ wrapperCol: { span: 18 },
|
|
|
14
|
+}
|
|
18
|
15
|
|
|
19
|
|
- handleSubmit = (err, values) => {
|
|
20
|
|
- if (!err) {
|
|
21
|
|
- const { dispatch } = this.props;
|
|
22
|
|
- try {
|
|
23
|
|
- dispatch({
|
|
24
|
|
- type: 'login/login',
|
|
25
|
|
- payload: { ...values, loginPassword: md5(values.loginPassword) },
|
|
26
|
|
- });
|
|
27
|
|
- } catch (e) {
|
|
28
|
|
- console.error(e)
|
|
29
|
|
- }
|
|
30
|
|
- }
|
|
|
16
|
+const LoginForm = React.forwardRef((props, ref) => {
|
|
|
17
|
+ const { form, dispatch } = props;
|
|
|
18
|
+ const { getFieldDecorator, validateFields } = form;
|
|
31
|
19
|
|
|
32
|
|
- };
|
|
|
20
|
+ const [loading, setLoading] = useState(false)
|
|
33
|
21
|
|
|
34
|
|
- renderMessage = (content) => (
|
|
35
|
|
- <Alert
|
|
36
|
|
- style={{
|
|
37
|
|
- marginBottom: 24,
|
|
38
|
|
- }}
|
|
39
|
|
- message={content}
|
|
40
|
|
- type="error"
|
|
41
|
|
- showIcon
|
|
42
|
|
- />
|
|
43
|
|
- );
|
|
|
22
|
+ const handleSubmit = (e) => {
|
|
|
23
|
+ e.preventDefault();
|
|
|
24
|
+ validateFields((err, values) => {
|
|
|
25
|
+ if (!err) {
|
|
|
26
|
+ try {
|
|
|
27
|
+ setLoading(true)
|
|
|
28
|
+ dispatch({
|
|
|
29
|
+ type: 'login/login',
|
|
|
30
|
+ payload: { ...values, loginPassword: md5(values.loginPassword) },
|
|
|
31
|
+ }).then(() => {
|
|
|
32
|
+ setLoading(false)
|
|
|
33
|
+ });
|
|
|
34
|
+ } catch (e) {
|
|
|
35
|
+ console.error(e)
|
|
|
36
|
+ setLoading(false)
|
|
|
37
|
+ }
|
|
|
38
|
+ }
|
|
|
39
|
+ });
|
|
|
40
|
+ }
|
|
44
|
41
|
|
|
45
|
|
- render() {
|
|
46
|
|
- const { userLogin = {}, submitting } = this.props;
|
|
47
|
|
- const { status } = userLogin;
|
|
48
|
|
- // const { type, autoLogin } = this.state;
|
|
49
|
|
- return (
|
|
50
|
|
- <div className={styles.main}>
|
|
51
|
|
- <LoginComponents
|
|
52
|
|
- onTabChange={this.onTabChange}
|
|
53
|
|
- onSubmit={this.handleSubmit}
|
|
54
|
|
- onCreate={(form) => {
|
|
55
|
|
- this.loginForm = form;
|
|
56
|
|
- }}
|
|
57
|
|
- >
|
|
58
|
|
- {status === 'error' &&
|
|
59
|
|
- !submitting &&
|
|
60
|
|
- this.renderMessage(
|
|
61
|
|
- formatMessage({
|
|
62
|
|
- id: 'user-login.login.message-invalid-credentials',
|
|
63
|
|
- }),
|
|
64
|
|
- )}
|
|
65
|
|
- <UserName
|
|
66
|
|
- name="loginName"
|
|
67
|
|
- placeholder={`${formatMessage({
|
|
68
|
|
- id: 'user-login.login.userName',
|
|
69
|
|
- })}: admin or user`}
|
|
70
|
|
- rules={[
|
|
71
|
|
- {
|
|
72
|
|
- required: true,
|
|
73
|
|
- message: formatMessage({
|
|
74
|
|
- id: 'user-login.userName.required',
|
|
75
|
|
- }),
|
|
76
|
|
- },
|
|
77
|
|
- ]}
|
|
78
|
|
- />
|
|
79
|
|
- <Password
|
|
80
|
|
- name="loginPassword"
|
|
81
|
|
- placeholder={`${formatMessage({
|
|
82
|
|
- id: 'user-login.login.password',
|
|
83
|
|
- })}: ant.design`}
|
|
84
|
|
- rules={[
|
|
85
|
|
- {
|
|
86
|
|
- required: true,
|
|
87
|
|
- message: formatMessage({
|
|
88
|
|
- id: 'user-login.password.required',
|
|
89
|
|
- }),
|
|
90
|
|
- },
|
|
91
|
|
- ]}
|
|
92
|
|
- onPressEnter={(e) => {
|
|
93
|
|
- e.preventDefault();
|
|
|
42
|
+ return (
|
|
|
43
|
+ <div className={styles.main}>
|
|
|
44
|
+ <div></div>
|
|
|
45
|
+ <div>
|
|
|
46
|
+ <Form onSubmit={handleSubmit}>
|
|
|
47
|
+ <Form.Item label="用户名" {...formItemLayout} colon={false}>
|
|
|
48
|
+ {getFieldDecorator('loginName', {
|
|
|
49
|
+ rules: [{ required: true, message: '请输入用户名' }]
|
|
|
50
|
+ })(<Input />)}
|
|
|
51
|
+ </Form.Item>
|
|
|
52
|
+ <Form.Item label="密 码" {...formItemLayout} colon={false}>
|
|
|
53
|
+ {getFieldDecorator('loginPassword', {
|
|
|
54
|
+ rules: [{ required: true, message: '请输入密码' }]
|
|
|
55
|
+ })(<Input.Password visibilityToggle={false}/>)}
|
|
|
56
|
+ </Form.Item>
|
|
94
|
57
|
|
|
95
|
|
- if (this.loginForm) {
|
|
96
|
|
- this.loginForm.validateFields(this.handleSubmit);
|
|
97
|
|
- }
|
|
98
|
|
- }}
|
|
99
|
|
- />
|
|
100
|
|
- <Submit loading={submitting}>
|
|
101
|
|
- <FormattedMessage id="user-login.login.login" />
|
|
102
|
|
- </Submit>
|
|
103
|
|
- </LoginComponents>
|
|
|
58
|
+ <Button
|
|
|
59
|
+ loading={loading}
|
|
|
60
|
+ htmlType="submit"
|
|
|
61
|
+ className={styles['login-form-button']}
|
|
|
62
|
+ >登录</Button>
|
|
|
63
|
+ </Form>
|
|
104
|
64
|
</div>
|
|
105
|
|
- );
|
|
106
|
|
- }
|
|
107
|
|
-}
|
|
|
65
|
+ </div>
|
|
|
66
|
+ )
|
|
|
67
|
+});
|
|
108
|
68
|
|
|
109
|
69
|
export default connect(({ login, loading }) => ({
|
|
110
|
70
|
userLogin: login,
|
|
111
|
71
|
submitting: loading.effects['login/login'],
|
|
112
|
|
-}))(Login);
|
|
|
72
|
+}))(Form.create({})(LoginForm));
|
