Oak-Team
/
oak-general-business
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 38 Wiki Activity

文案修改

This commit is contained in:
wenjiarui 2023-08-17 21:07:05 +08:00
parent 31c97e6e65
commit bd1cbe3733
6 changed files with 25 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/aspects/user.js
View File

@ -308,7 +308,7 @@ function updateUserPassword(params, context, innerLogic) {
case 12: case 12:
_2.sent(); _2.sent();
return [2 /*return*/, { return [2 /*return*/, {
result: '当前密码不正确，请检查后输入', result: '原密码不正确，请检查后输入',
times: count1, times: count1,
}]; }];
case 13: case 13:

2
lib/components/changePassword/byMobile/web.js
View File

@ -75,7 +75,7 @@ function Render(props) {
], validateTrigger: "onChange", help: validateHelp2, validateStatus: validateStatus, hasFeedback: true }, { children: (0, jsx_runtime_1.jsx)(antd_1.Input.Password, { value: password2, onChange: function (e) { ], validateTrigger: "onChange", help: validateHelp2, validateStatus: validateStatus, hasFeedback: true }, { children: (0, jsx_runtime_1.jsx)(antd_1.Input.Password, { value: password2, onChange: function (e) {
var strValue = e.target.value; var strValue = e.target.value;
setPassword2(strValue); setPassword2(strValue);
}, iconRender: function (visible) { return (visible ? (0, jsx_runtime_1.jsx)(icons_1.EyeTwoTone, {}) : (0, jsx_runtime_1.jsx)(icons_1.EyeInvisibleOutlined, {})); }, placeholder: '请再次输入密码' }) })), (0, jsx_runtime_1.jsx)(antd_1.Form.Item, tslib_1.__assign({ wrapperCol: { offset: 4 } }, { children: (0, jsx_runtime_1.jsxs)(antd_1.Space, { children: [(0, jsx_runtime_1.jsx)(antd_1.Button, tslib_1.__assign({ type: "primary", onClick: function () { return tslib_1.__awaiter(_this, void 0, void 0, function () { }, iconRender: function (visible) { return (visible ? (0, jsx_runtime_1.jsx)(icons_1.EyeTwoTone, {}) : (0, jsx_runtime_1.jsx)(icons_1.EyeInvisibleOutlined, {})); }, placeholder: '请再次输入新密码' }) })), (0, jsx_runtime_1.jsx)(antd_1.Form.Item, tslib_1.__assign({ wrapperCol: { offset: 4 } }, { children: (0, jsx_runtime_1.jsxs)(antd_1.Space, { children: [(0, jsx_runtime_1.jsx)(antd_1.Button, tslib_1.__assign({ type: "primary", onClick: function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
return tslib_1.__generator(this, function (_a) { return tslib_1.__generator(this, function (_a) {
switch (_a.label) { switch (_a.label) {
case 0: return [4 /*yield*/, onConfirmByMobile(mobile, captcha, password)]; case 0: return [4 /*yield*/, onConfirmByMobile(mobile, captcha, password)];

24
lib/components/changePassword/byPassword/web.js
View File

@ -19,16 +19,16 @@ function Render(props) {
var _g = tslib_1.__read((0, react_1.useState)(''), 2), validateHelp1 = _g[0], setValidateHelp1 = _g[1]; var _g = tslib_1.__read((0, react_1.useState)(''), 2), validateHelp1 = _g[0], setValidateHelp1 = _g[1];
var _h = tslib_1.__read((0, react_1.useState)(''), 2), validateStatus = _h[0], setValidateStatus = _h[1]; var _h = tslib_1.__read((0, react_1.useState)(''), 2), validateStatus = _h[0], setValidateStatus = _h[1];
var reset = function () { var reset = function () {
setPassword2(''); setPassword2(function () { return ''; });
setPassword(''); setPassword(function () { return ''; });
setPrevPassword(''); setPrevPassword(function () { return ''; });
setValidateHelp0(''); setValidateHelp0(function () { return ''; });
setValidateStatus0(''); setValidateStatus0(function () { return ''; });
setValidateHelp(''); setValidateHelp(function () { return ''; });
setValidateHelp1(''); setValidateHelp1(function () { return ''; });
setValidateStatus(''); setValidateStatus(function () { return ''; });
}; };
return ((0, jsx_runtime_1.jsxs)(antd_1.Form, tslib_1.__assign({ colon: true, labelCol: { span: 4 }, wrapperCol: { span: 8 } }, { children: [failTimes > 5 && (0, jsx_runtime_1.jsx)(antd_1.Alert, { message: "\u60A8\u4ECA\u65E5\u5C1D\u8BD5\u6B21\u6570\u8FC7\u591A\uFF0C\u8BF7\u7A0D\u5019\u518D\u8FDB\u884C\u64CD\u4F5C\u6216\u4F7F\u7528\u624B\u673A\u53F7\u9A8C\u8BC1", type: "error" }), (0, jsx_runtime_1.jsx)(antd_1.Form.Item, tslib_1.__assign({ label: '输入原密码', name: "prevPassword", help: validateHelp0, rules: [ return ((0, jsx_runtime_1.jsxs)(antd_1.Form, tslib_1.__assign({ colon: true, labelCol: { span: 4 }, wrapperCol: { span: 8 } }, { children: [failTimes >= 5 && (0, jsx_runtime_1.jsx)(antd_1.Alert, { message: "\u60A8\u4ECA\u65E5\u5C1D\u8BD5\u6B21\u6570\u8FC7\u591A\uFF0C\u8BF7\u7A0D\u5019\u518D\u8FDB\u884C\u64CD\u4F5C\u6216\u4F7F\u7528\u624B\u673A\u53F7\u9A8C\u8BC1", type: "error", style: { marginBottom: 20 } }), (0, jsx_runtime_1.jsx)(antd_1.Form.Item, tslib_1.__assign({ label: '输入原密码', name: "prevPassword", help: validateHelp0, rules: [
{ {
required: true, required: true,
message: '请输入原密码', message: '请输入原密码',
@ -84,15 +84,13 @@ function Render(props) {
], validateTrigger: "onChange", help: validateHelp, validateStatus: validateStatus, hasFeedback: true }, { children: (0, jsx_runtime_1.jsx)(antd_1.Input.Password, { value: password2, onChange: function (e) { ], validateTrigger: "onChange", help: validateHelp, validateStatus: validateStatus, hasFeedback: true }, { children: (0, jsx_runtime_1.jsx)(antd_1.Input.Password, { value: password2, onChange: function (e) {
var strValue = e.target.value; var strValue = e.target.value;
setPassword2(strValue); setPassword2(strValue);
}, iconRender: function (visible) { return (visible ? (0, jsx_runtime_1.jsx)(icons_1.EyeTwoTone, {}) : (0, jsx_runtime_1.jsx)(icons_1.EyeInvisibleOutlined, {})); }, placeholder: '请再次输入新密码' }) })), (0, jsx_runtime_1.jsx)(antd_1.Form.Item, tslib_1.__assign({ wrapperCol: { offset: 4 } }, { children: (0, jsx_runtime_1.jsxs)(antd_1.Space, { children: [(0, jsx_runtime_1.jsx)(antd_1.Button, tslib_1.__assign({ type: "primary", onClick: function () { return tslib_1.__awaiter(_this, void 0, void 0, function () { }, iconRender: function (visible) { return (visible ? (0, jsx_runtime_1.jsx)(icons_1.EyeTwoTone, {}) : (0, jsx_runtime_1.jsx)(icons_1.EyeInvisibleOutlined, {})); }, placeholder: '请再次输入密码' }) })), (0, jsx_runtime_1.jsx)(antd_1.Form.Item, tslib_1.__assign({ wrapperCol: { offset: 4 } }, { children: (0, jsx_runtime_1.jsxs)(antd_1.Space, { children: [(0, jsx_runtime_1.jsx)(antd_1.Button, tslib_1.__assign({ htmlType: "reset", type: "primary", onClick: function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
return tslib_1.__generator(this, function (_a) { return tslib_1.__generator(this, function (_a) {
switch (_a.label) { switch (_a.label) {
case 0: return [4 /*yield*/, onConfirm(prevPassword, password)]; case 0: return [4 /*yield*/, onConfirm(prevPassword, password)];
case 1: case 1:
_a.sent(); _a.sent();
setPrevPassword(''); reset();
setValidateHelp0('');
setValidateStatus0('');
return [2 /*return*/]; return [2 /*return*/];
} }
}); });

1
lib/components/changePassword/index.js
View File

@ -43,7 +43,6 @@ exports.default = OakComponent({
})]; })];
case 1: case 1:
result = (_a.sent()).result; result = (_a.sent()).result;
console.log(result);
this.setState({ this.setState({
channels: result channels: result
}); });

25
src/components/changePassword/byPassword/web.tsx
View File

@ -38,18 +38,18 @@ export default function Render(
const [validateStatus, setValidateStatus] = useState('' as '' | "success" | "warning" | "error" | "validating" | undefined); const [validateStatus, setValidateStatus] = useState('' as '' | "success" | "warning" | "error" | "validating" | undefined);
const reset = () => { const reset = () => {
setPassword2(''); setPassword2(() => '');
setPassword(''); setPassword(() => '');
setPrevPassword(''); setPrevPassword(() => '');
setValidateHelp0(''); setValidateHelp0(() => '');
setValidateStatus0(''); setValidateStatus0(() => '');
setValidateHelp(''); setValidateHelp(() => '');
setValidateHelp1(''); setValidateHelp1(() => '');
setValidateStatus(''); setValidateStatus(() => '');
}; };
return ( return (
<Form colon labelCol={{ span: 4 }} wrapperCol={{ span: 8 }}> <Form colon labelCol={{ span: 4 }} wrapperCol={{ span: 8 }}>
{failTimes > 5 && <Alert message="您今日尝试次数过多，请稍候再进行操作或使用手机号验证" type="error" />} {failTimes >= 5 && <Alert message="您今日尝试次数过多，请稍候再进行操作或使用手机号验证" type="error" style={{ marginBottom: 20 }} />}
<Form.Item <Form.Item
label={'输入原密码'} label={'输入原密码'}
name="prevPassword" name="prevPassword"
@ -148,18 +148,17 @@ export default function Render(
setPassword2(strValue) setPassword2(strValue)
}} }}
iconRender={(visible) => (visible ? <EyeTwoTone /> : <EyeInvisibleOutlined />)} iconRender={(visible) => (visible ? <EyeTwoTone /> : <EyeInvisibleOutlined />)}
placeholder={'请再次输入新密码'} placeholder={'请再次输入密码'}
/> />
</Form.Item> </Form.Item>
<Form.Item wrapperCol={{ offset: 4 }}> <Form.Item wrapperCol={{ offset: 4 }}>
<Space> <Space>
<Button <Button
htmlType="reset"
type="primary" type="primary"
onClick={async () => { onClick={async () => {
await onConfirm(prevPassword, password); await onConfirm(prevPassword, password);
setPrevPassword(''); reset();
setValidateHelp0('');
setValidateStatus0('');
}} }}
disabled={!(failTimes < 5 && prevPassword && password && password.length >= 8 && password === password2)} disabled={!(failTimes < 5 && prevPassword && password && password.length >= 8 && password === password2)}
> >

1
src/components/changePassword/index.ts
View File

@ -35,7 +35,6 @@ export default OakComponent({
const { result } = await this.features.cache.exec('getChangePasswordChannels', { const { result } = await this.features.cache.exec('getChangePasswordChannels', {
userId, userId,
}); });
console.log(result);
this.setState({ this.setState({
channels: result channels: result
}); });