diff --git a/ui/src/pages/Questions/Ask/index.tsx b/ui/src/pages/Questions/Ask/index.tsx index 648eb79c..6b2dca45 100644 --- a/ui/src/pages/Questions/Ask/index.tsx +++ b/ui/src/pages/Questions/Ask/index.tsx @@ -27,35 +27,35 @@ interface FormDataItem { answer: Type.FormValue; edit_summary: Type.FormValue; } -const initFormData = { - title: { - value: '', - isInvalid: false, - errorMsg: '', - }, - tags: { - value: [], - isInvalid: false, - errorMsg: '', - }, - content: { - value: '', - isInvalid: false, - errorMsg: '', - }, - answer: { - value: '', - isInvalid: false, - errorMsg: '', - }, - edit_summary: { - value: '', - isInvalid: false, - errorMsg: '', - }, -}; const Ask = () => { + const initFormData = { + title: { + value: '', + isInvalid: false, + errorMsg: '', + }, + tags: { + value: [], + isInvalid: false, + errorMsg: '', + }, + content: { + value: '', + isInvalid: false, + errorMsg: '', + }, + answer: { + value: '', + isInvalid: false, + errorMsg: '', + }, + edit_summary: { + value: '', + isInvalid: false, + errorMsg: '', + }, + }; const { t } = useTranslation('translation', { keyPrefix: 'ask' }); const [formData, setFormData] = useState(initFormData); const [checked, setCheckState] = useState(false); diff --git a/ui/src/pages/Users/AccountForgot/components/sendEmail.tsx b/ui/src/pages/Users/AccountForgot/components/sendEmail.tsx index 7d6f11be..8c6aa161 100644 --- a/ui/src/pages/Users/AccountForgot/components/sendEmail.tsx +++ b/ui/src/pages/Users/AccountForgot/components/sendEmail.tsx @@ -84,17 +84,9 @@ const Index: FC = ({ visible = false, callback }) => { setModalState(false); }) .catch((err) => { - // if (err.isError && err.key) { - // formData[err.key].isInvalid = true; - // formData[err.key].errorMsg = err.value; - // if (err.key.indexOf('captcha') < 0) { - // setModalState(false); - // } - // } - if (err.isError) { const data = handleFormError(err, formData); - if (err.list.filter((v) => v.error_field.indexOf('captcha') < 0)) { + if (!err.list.find((v) => v.error_field.indexOf('captcha') >= 0)) { setModalState(false); } setFormData({ ...data }); diff --git a/ui/src/pages/Users/ChangeEmail/components/sendEmail.tsx b/ui/src/pages/Users/ChangeEmail/components/sendEmail.tsx index 51901ca9..6f884ca0 100644 --- a/ui/src/pages/Users/ChangeEmail/components/sendEmail.tsx +++ b/ui/src/pages/Users/ChangeEmail/components/sendEmail.tsx @@ -86,7 +86,7 @@ const Index: FC = () => { .catch((err) => { if (err.isError) { const data = handleFormError(err, formData); - if (err.list.filter((v) => v.error_field.indexOf('captcha') < 0)) { + if (!err.list.find((v) => v.error_field.indexOf('captcha') >= 0)) { setModalState(false); } setFormData({ ...data }); diff --git a/ui/src/pages/Users/Login/index.tsx b/ui/src/pages/Users/Login/index.tsx index 2f5b9180..6b9b233e 100644 --- a/ui/src/pages/Users/Login/index.tsx +++ b/ui/src/pages/Users/Login/index.tsx @@ -131,7 +131,7 @@ const Index: React.FC = () => { // } if (err.isError) { const data = handleFormError(err, formData); - if (err.list.filter((v) => v.error_field.indexOf('captcha') < 0)) { + if (!err.list.find((v) => v.error_field.indexOf('captcha') >= 0)) { setModalState(false); } setFormData({ ...data });