aldehyde 0.2.188 → 0.2.189
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/lib/login/login.js
CHANGED
|
@@ -9,8 +9,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
9
9
|
};
|
|
10
10
|
import React from "react";
|
|
11
11
|
import "./index.css";
|
|
12
|
-
import { Button, Form, Input } from "antd";
|
|
13
|
-
import { LockOutlined, UserOutlined, } from "@ant-design/icons";
|
|
12
|
+
import { Button, Col, Form, Input, Row } from "antd";
|
|
13
|
+
import { LockOutlined, SafetyCertificateOutlined, UserOutlined, } from "@ant-design/icons";
|
|
14
14
|
import HCserviceV3 from "../tmpl/hcservice-v3";
|
|
15
15
|
import { LocaleContext } from "../locale/LocaleProvider";
|
|
16
16
|
import Vertify from "./vertify/index";
|
|
@@ -68,8 +68,8 @@ class Login extends React.PureComponent {
|
|
|
68
68
|
yield this.formRef.current
|
|
69
69
|
.validateFields()
|
|
70
70
|
.then((values) => __awaiter(this, void 0, void 0, function* () {
|
|
71
|
-
if (needKaptcha && !vertify)
|
|
72
|
-
|
|
71
|
+
// if (needKaptcha && !vertify)
|
|
72
|
+
// return this.setState({ showSlideVertify: false });
|
|
73
73
|
const { programCode } = this.props;
|
|
74
74
|
let json = { username: values.username, password: values.password };
|
|
75
75
|
let res = yield HCserviceV3.login(json, kaptchaToken, values.kaptchaText, pubkey, programCode);
|
|
@@ -123,6 +123,17 @@ class Login extends React.PureComponent {
|
|
|
123
123
|
React.createElement(Input, { style: autoSaveUser
|
|
124
124
|
? {}
|
|
125
125
|
: { "-webkit-text-security": "disc" }, type: autoSaveUser ? "password" : "text", placeholder: translate("${密码}"), onKeyDown: this.handleKeyDown, autoComplete: autoSaveUser ? "on" : "off", prefix: React.createElement(LockOutlined, { className: "site-form-item-icon" }) })),
|
|
126
|
+
needKaptcha ? (React.createElement(Row, { gutter: 8 },
|
|
127
|
+
React.createElement(Col, { span: 12 },
|
|
128
|
+
React.createElement(Form.Item, { name: "kaptchaText", rules: [
|
|
129
|
+
{
|
|
130
|
+
required: true,
|
|
131
|
+
message: translate("${请输入}${验证码}!"),
|
|
132
|
+
},
|
|
133
|
+
] },
|
|
134
|
+
React.createElement(Input, { prefix: React.createElement(SafetyCertificateOutlined, { className: "site-form-item-icon" }), placeholder: translate("${验证码}"), onKeyDown: this.handleKeyDown }))),
|
|
135
|
+
React.createElement(Col, { span: 12 },
|
|
136
|
+
React.createElement("img", { style: { cursor: "pointer" }, height: 30, width: 90, title: translate("${点击刷新}"), onClick: this.changeKaptcha, src: kaptchaImg })))) : (""),
|
|
126
137
|
React.createElement(Form.Item, null,
|
|
127
138
|
React.createElement(Button, { type: "primary", style: { width: "100%" }, loading: loading, onClick: this.handleSubmit }, translate("${登录}")))),
|
|
128
139
|
showSlideVertify ? (React.createElement("div", { style: { width: "100%", height: "100%", background: "white" } },
|
package/lib/login/login.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"login.js","sourceRoot":"","sources":["../../../../src/aldehyde/login/login.tsx"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,KAAwB,MAAM,OAAO,CAAC;AAC7C,OAAO,aAAa,CAAC;AACrB,OAAO,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"login.js","sourceRoot":"","sources":["../../../../src/aldehyde/login/login.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Login.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/login2/Login.tsx"],"names":[],"mappings":"AACA,OAAO,KAA8B,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"Login.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/login2/Login.tsx"],"names":[],"mappings":"AACA,OAAO,KAA8B,MAAM,OAAO,CAAC;AAOnD,KAAK,aAAa,GAAG;IACnB,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACnC,KAAK,CAAC,EAAE,GAAG,CAAC;IACZ,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,CAAC;AAQF,QAAA,MAAM,KAAK,UAAW,aAAa,sBAmLlC,CAAC;AAEF,eAAe,KAAK,CAAC"}
|
package/lib/login2/Login.js
CHANGED
|
@@ -7,12 +7,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
7
7
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
8
8
|
});
|
|
9
9
|
};
|
|
10
|
-
import { Button, Form, Input } from "antd";
|
|
10
|
+
import { Button, Col, Form, Input, Row } from "antd";
|
|
11
11
|
import React, { useEffect, useState } from "react";
|
|
12
12
|
import HCserviceV3 from "../tmpl/hcservice-v3";
|
|
13
13
|
import { useLocale } from "../locale/useLocale";
|
|
14
14
|
import { useParams } from "react-router-dom";
|
|
15
15
|
import Units from "../units";
|
|
16
|
+
import { SafetyCertificateOutlined } from "@ant-design/icons";
|
|
16
17
|
const Login = (props) => {
|
|
17
18
|
// locale
|
|
18
19
|
const { translate } = useLocale();
|
|
@@ -25,26 +26,47 @@ const Login = (props) => {
|
|
|
25
26
|
return;
|
|
26
27
|
Units.setProgramCode(routeProgramCode);
|
|
27
28
|
}, [routeProgramCode]);
|
|
29
|
+
const [loading, setLoading] = useState(false);
|
|
30
|
+
const [needKaptcha, setNeedKaptcha] = useState(false);
|
|
31
|
+
const [kaptchaImg, setKaptchaImg] = useState(null);
|
|
32
|
+
const [kaptchaToken, setKaptchaToken] = useState(null);
|
|
28
33
|
// form
|
|
29
34
|
const [form] = Form.useForm();
|
|
30
35
|
const submit = () => __awaiter(void 0, void 0, void 0, function* () {
|
|
31
36
|
try {
|
|
32
|
-
const { username, password } = yield form.validateFields();
|
|
37
|
+
const { username, password, kaptchaText } = yield form.validateFields();
|
|
33
38
|
setLoading(true);
|
|
34
39
|
const { programCode, onFinish } = props;
|
|
35
40
|
const pubkey = yield HCserviceV3.getRasPubkey(null, programCode ? programCode : routeProgramCode);
|
|
36
|
-
const res = yield HCserviceV3.login({ username, password },
|
|
41
|
+
const res = yield HCserviceV3.login({ username, password }, kaptchaToken, kaptchaText, pubkey, programCode ? programCode : routeProgramCode);
|
|
37
42
|
if (res.status === "success") {
|
|
38
43
|
onFinish(res.token);
|
|
39
44
|
}
|
|
45
|
+
else if (res.status === "error") {
|
|
46
|
+
setNeedKaptcha(true);
|
|
47
|
+
yield getKaptchaToken();
|
|
48
|
+
}
|
|
40
49
|
setLoading(false);
|
|
41
50
|
}
|
|
42
51
|
catch (err) {
|
|
43
52
|
console.error(err);
|
|
44
53
|
}
|
|
45
54
|
});
|
|
55
|
+
const getKaptchaToken = () => __awaiter(void 0, void 0, void 0, function* () {
|
|
56
|
+
let res = yield HCserviceV3.getKaptchaToken(routeProgramCode);
|
|
57
|
+
if (res) {
|
|
58
|
+
let kaptchaImg;
|
|
59
|
+
if (res.img && res.img.indexOf("data:") == 0) {
|
|
60
|
+
kaptchaImg = res.img;
|
|
61
|
+
}
|
|
62
|
+
else {
|
|
63
|
+
kaptchaImg = `data:image/png;base64,${res.img}`;
|
|
64
|
+
}
|
|
65
|
+
setKaptchaImg(kaptchaImg);
|
|
66
|
+
setKaptchaToken(res.kaptchaToken);
|
|
67
|
+
}
|
|
68
|
+
});
|
|
46
69
|
// button
|
|
47
|
-
const [loading, setLoading] = useState(false);
|
|
48
70
|
return (React.createElement(Form, { name: "login", form: form, wrapperCol: { span: 24 }, initialValues: { remember: true }, autoComplete: "off" },
|
|
49
71
|
React.createElement(Form.Item, { name: "username", rules: [{ required: true, message: translate("请输入用户名") }] },
|
|
50
72
|
React.createElement(Input, { placeholder: translate("请输入用户名"), style: {
|
|
@@ -62,13 +84,45 @@ const Login = (props) => {
|
|
|
62
84
|
fontSize: "15px",
|
|
63
85
|
lineHeight: "15px",
|
|
64
86
|
} })),
|
|
87
|
+
needKaptcha ? (React.createElement(Row, { gutter: 8 },
|
|
88
|
+
React.createElement(Col, { span: 16 },
|
|
89
|
+
React.createElement(Form.Item, { style: {
|
|
90
|
+
borderRadius: "50px",
|
|
91
|
+
background: "#EEF3FB",
|
|
92
|
+
height: "50px",
|
|
93
|
+
fontSize: "15px",
|
|
94
|
+
lineHeight: "15px",
|
|
95
|
+
}, name: "kaptchaText", rules: [
|
|
96
|
+
{
|
|
97
|
+
required: true,
|
|
98
|
+
message: translate("${请输入}${验证码}!"),
|
|
99
|
+
},
|
|
100
|
+
] },
|
|
101
|
+
React.createElement(Input, { style: {
|
|
102
|
+
borderRadius: "50px",
|
|
103
|
+
background: "#EEF3FB",
|
|
104
|
+
height: "50px",
|
|
105
|
+
fontSize: "15px",
|
|
106
|
+
lineHeight: "15px",
|
|
107
|
+
}, prefix: React.createElement(SafetyCertificateOutlined, { className: "site-form-item-icon" }), placeholder: translate("${验证码}") }))),
|
|
108
|
+
React.createElement(Col, { span: 8 },
|
|
109
|
+
React.createElement("img", { style: {
|
|
110
|
+
borderRadius: "30px",
|
|
111
|
+
background: "#EEF3FB",
|
|
112
|
+
height: "50px",
|
|
113
|
+
fontSize: "15px",
|
|
114
|
+
lineHeight: "15px",
|
|
115
|
+
cursor: "pointer"
|
|
116
|
+
},
|
|
117
|
+
// height={50}
|
|
118
|
+
width: 110, title: translate("${点击刷新}"), onClick: getKaptchaToken, src: kaptchaImg })))) : (""),
|
|
65
119
|
React.createElement(Form.Item, { wrapperCol: { span: 24 } },
|
|
66
120
|
React.createElement(Button, { type: "primary", onClick: submit, shape: "round", loading: loading, style: {
|
|
67
121
|
width: "100%",
|
|
68
122
|
height: "50px",
|
|
69
123
|
fontSize: "15px",
|
|
70
124
|
lineHeight: "15px",
|
|
71
|
-
} }, "
|
|
125
|
+
} }, translate("登录")))));
|
|
72
126
|
};
|
|
73
127
|
export default Login;
|
|
74
128
|
//# sourceMappingURL=Login.js.map
|
package/lib/login2/Login.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Login.js","sourceRoot":"","sources":["../../../../src/aldehyde/login2/Login.tsx"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"Login.js","sourceRoot":"","sources":["../../../../src/aldehyde/login2/Login.tsx"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -86,8 +86,8 @@ class Login extends React.PureComponent<LoginProps, LoginState> {
|
|
|
86
86
|
await this.formRef.current
|
|
87
87
|
.validateFields()
|
|
88
88
|
.then(async (values) => {
|
|
89
|
-
if (needKaptcha && !vertify)
|
|
90
|
-
|
|
89
|
+
// if (needKaptcha && !vertify)
|
|
90
|
+
// return this.setState({ showSlideVertify: false });
|
|
91
91
|
|
|
92
92
|
const { programCode } = this.props;
|
|
93
93
|
let json = { username: values.username, password: values.password };
|
|
@@ -178,7 +178,7 @@ class Login extends React.PureComponent<LoginProps, LoginState> {
|
|
|
178
178
|
prefix={<LockOutlined className="site-form-item-icon" />}
|
|
179
179
|
/>
|
|
180
180
|
</Form.Item>
|
|
181
|
-
{
|
|
181
|
+
{needKaptcha ? (
|
|
182
182
|
<Row gutter={8}>
|
|
183
183
|
<Col span={12}>
|
|
184
184
|
<Form.Item
|
|
@@ -212,7 +212,7 @@ class Login extends React.PureComponent<LoginProps, LoginState> {
|
|
|
212
212
|
</Row>
|
|
213
213
|
) : (
|
|
214
214
|
""
|
|
215
|
-
)}
|
|
215
|
+
)}
|
|
216
216
|
<Form.Item>
|
|
217
217
|
<Button
|
|
218
218
|
type="primary"
|
|
@@ -1,9 +1,10 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import {Button, Col, Form, Input, Row} from "antd";
|
|
2
2
|
import React, { useEffect, useState } from "react";
|
|
3
3
|
import HCserviceV3 from "../tmpl/hcservice-v3";
|
|
4
4
|
import { useLocale } from "../locale/useLocale";
|
|
5
5
|
import { useParams } from "react-router-dom";
|
|
6
6
|
import Units from "../units";
|
|
7
|
+
import {SafetyCertificateOutlined} from "@ant-design/icons";
|
|
7
8
|
|
|
8
9
|
type LoginPropType = {
|
|
9
10
|
onFinish?: (token: string) => void;
|
|
@@ -15,6 +16,7 @@ type LoginPropType = {
|
|
|
15
16
|
type FormType = {
|
|
16
17
|
username: string;
|
|
17
18
|
password: string;
|
|
19
|
+
kaptchaText:string;
|
|
18
20
|
};
|
|
19
21
|
|
|
20
22
|
const Login = (props: LoginPropType) => {
|
|
@@ -28,15 +30,18 @@ const Login = (props: LoginPropType) => {
|
|
|
28
30
|
const { programCode: routeProgramCode } = useParams();
|
|
29
31
|
useEffect(() => {
|
|
30
32
|
if (routeProgramCode === undefined) return;
|
|
31
|
-
|
|
32
33
|
Units.setProgramCode(routeProgramCode);
|
|
33
34
|
}, [routeProgramCode]);
|
|
35
|
+
const [loading, setLoading] = useState<boolean>(false);
|
|
36
|
+
const [needKaptcha, setNeedKaptcha] = useState<boolean>(false);
|
|
37
|
+
const [kaptchaImg, setKaptchaImg] = useState<string>(null);
|
|
38
|
+
const [kaptchaToken, setKaptchaToken] = useState<string>(null);
|
|
34
39
|
|
|
35
|
-
|
|
40
|
+
// form
|
|
36
41
|
const [form] = Form.useForm<FormType>();
|
|
37
42
|
const submit = async () => {
|
|
38
43
|
try {
|
|
39
|
-
const { username, password } = await form.validateFields();
|
|
44
|
+
const { username, password,kaptchaText } = await form.validateFields();
|
|
40
45
|
|
|
41
46
|
setLoading(true);
|
|
42
47
|
const { programCode, onFinish } = props;
|
|
@@ -46,13 +51,16 @@ const Login = (props: LoginPropType) => {
|
|
|
46
51
|
);
|
|
47
52
|
const res = await HCserviceV3.login(
|
|
48
53
|
{ username, password },
|
|
49
|
-
|
|
50
|
-
|
|
54
|
+
kaptchaToken,
|
|
55
|
+
kaptchaText,
|
|
51
56
|
pubkey,
|
|
52
57
|
programCode ? programCode : routeProgramCode
|
|
53
58
|
);
|
|
54
59
|
if (res.status === "success") {
|
|
55
60
|
onFinish(res.token);
|
|
61
|
+
}else if (res.status === "error") {
|
|
62
|
+
setNeedKaptcha(true);
|
|
63
|
+
await getKaptchaToken();
|
|
56
64
|
}
|
|
57
65
|
setLoading(false);
|
|
58
66
|
} catch (err) {
|
|
@@ -60,9 +68,22 @@ const Login = (props: LoginPropType) => {
|
|
|
60
68
|
}
|
|
61
69
|
};
|
|
62
70
|
|
|
63
|
-
|
|
64
|
-
const [loading, setLoading] = useState<boolean>(false);
|
|
71
|
+
const getKaptchaToken = async () => {
|
|
65
72
|
|
|
73
|
+
let res = await HCserviceV3.getKaptchaToken(routeProgramCode);
|
|
74
|
+
if (res) {
|
|
75
|
+
let kaptchaImg;
|
|
76
|
+
if (res.img && res.img.indexOf("data:") == 0) {
|
|
77
|
+
kaptchaImg = res.img;
|
|
78
|
+
} else {
|
|
79
|
+
kaptchaImg = `data:image/png;base64,${res.img}`;
|
|
80
|
+
}
|
|
81
|
+
setKaptchaImg(kaptchaImg);
|
|
82
|
+
setKaptchaToken(res.kaptchaToken);
|
|
83
|
+
}
|
|
84
|
+
};
|
|
85
|
+
|
|
86
|
+
// button
|
|
66
87
|
return (
|
|
67
88
|
<Form
|
|
68
89
|
name="login"
|
|
@@ -102,6 +123,62 @@ const Login = (props: LoginPropType) => {
|
|
|
102
123
|
}}
|
|
103
124
|
/>
|
|
104
125
|
</Form.Item>
|
|
126
|
+
{needKaptcha ? (
|
|
127
|
+
<Row gutter={8}>
|
|
128
|
+
<Col span={16}>
|
|
129
|
+
<Form.Item
|
|
130
|
+
style={{
|
|
131
|
+
borderRadius: "50px",
|
|
132
|
+
background: "#EEF3FB",
|
|
133
|
+
height: "50px",
|
|
134
|
+
fontSize: "15px",
|
|
135
|
+
lineHeight: "15px",
|
|
136
|
+
}}
|
|
137
|
+
name="kaptchaText"
|
|
138
|
+
rules={[
|
|
139
|
+
{
|
|
140
|
+
required: true,
|
|
141
|
+
message: translate("${请输入}${验证码}!"),
|
|
142
|
+
},
|
|
143
|
+
]}
|
|
144
|
+
>
|
|
145
|
+
<Input
|
|
146
|
+
style={{
|
|
147
|
+
borderRadius: "50px",
|
|
148
|
+
background: "#EEF3FB",
|
|
149
|
+
height: "50px",
|
|
150
|
+
fontSize: "15px",
|
|
151
|
+
lineHeight: "15px",
|
|
152
|
+
}}
|
|
153
|
+
prefix={
|
|
154
|
+
<SafetyCertificateOutlined className="site-form-item-icon" />
|
|
155
|
+
}
|
|
156
|
+
placeholder={translate("${验证码}")}
|
|
157
|
+
//onKeyDown={this.handleKeyDown}
|
|
158
|
+
/>
|
|
159
|
+
</Form.Item>
|
|
160
|
+
</Col>
|
|
161
|
+
<Col span={8}>
|
|
162
|
+
<img
|
|
163
|
+
style={{
|
|
164
|
+
borderRadius: "30px",
|
|
165
|
+
background: "#EEF3FB",
|
|
166
|
+
height: "50px",
|
|
167
|
+
fontSize: "15px",
|
|
168
|
+
lineHeight: "15px",
|
|
169
|
+
cursor: "pointer"
|
|
170
|
+
}}
|
|
171
|
+
// height={50}
|
|
172
|
+
width={110}
|
|
173
|
+
title={translate("${点击刷新}")}
|
|
174
|
+
onClick={getKaptchaToken}
|
|
175
|
+
src={kaptchaImg}
|
|
176
|
+
></img>
|
|
177
|
+
</Col>
|
|
178
|
+
</Row>
|
|
179
|
+
) : (
|
|
180
|
+
""
|
|
181
|
+
)}
|
|
105
182
|
|
|
106
183
|
<Form.Item wrapperCol={{ span: 24 }}>
|
|
107
184
|
<Button
|
|
@@ -116,7 +193,7 @@ const Login = (props: LoginPropType) => {
|
|
|
116
193
|
lineHeight: "15px",
|
|
117
194
|
}}
|
|
118
195
|
>
|
|
119
|
-
登录
|
|
196
|
+
{translate("登录")}
|
|
120
197
|
</Button>
|
|
121
198
|
</Form.Item>
|
|
122
199
|
</Form>
|