From 392d87eca7b990bad5e2db95da8b5c322357874b Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期六, 22 三月 2025 14:43:43 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/settings/SecuritySettings.jsx | 19 ++++++++-----------
1 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/rsf-admin/src/page/settings/SecuritySettings.jsx b/rsf-admin/src/page/settings/SecuritySettings.jsx
index 9ef9bd9..42aeaad 100644
--- a/rsf-admin/src/page/settings/SecuritySettings.jsx
+++ b/rsf-admin/src/page/settings/SecuritySettings.jsx
@@ -14,7 +14,7 @@
InputAdornment,
IconButton,
} from '@mui/material';
-import { updateUserInfo } from '@/api/auth';
+import { requestResetPassword } from '@/api/auth';
import Visibility from '@mui/icons-material/Visibility';
import VisibilityOff from '@mui/icons-material/VisibilityOff';
@@ -38,23 +38,20 @@
}
}, [userInfo, setValue])
- const onSubmit = (data) => {
- console.log(data);
- return false;
-
+ const onSubmit = (params) => {
setLoading(true);
- updateUserInfo({ id: userInfo.id, ...data }).then(res => {
+ requestResetPassword(params).then(res => {
setLoading(false);
const { code, msg, data } = res;
if (code === 200) {
notify(msg, { type: 'success', messageArgs: { _: msg } });
reset();
+ } else if (code === 10001) {
+ setError('oldPassword', {
+ message: msg,
+ });
} else {
notify(msg, { type: 'error', messageArgs: { _: msg } });
- setError('oldPassword', {
- type: 'server', // make no sense
- message: res.msg,
- });
}
}).catch((error) => {
setLoading(false);
@@ -118,7 +115,7 @@
rules={{
required: translate('ra.validation.required'),
pattern: {
- value: /^(?=.*[A-Za-z])(?=.*\d)[A-Za-z\d]{6,13}$/,
+ value: /^(?=.*[A-Za-z])(?=.*\d)[A-Za-z\d\.]{6,13}$/,
message: translate('page.settings.resetPwd.tip.pwdInputLimit'),
},
validate: (value) => {
--
Gitblit v1.9.1