From 6ca8b81230c8ac2136016ae799807f6b7a4c5c21 Mon Sep 17 00:00:00 2001
From: shuai <lishuailing@sifou.com>
Date: Mon, 28 Nov 2022 16:27:18 +0800
Subject: [PATCH 1/2] feat: email form error

---
 .../pages/Users/AccountForgot/components/sendEmail.tsx | 10 +---------
 .../pages/Users/ChangeEmail/components/sendEmail.tsx   | 10 +---------
 ui/src/pages/Users/Login/index.tsx                     |  2 +-
 3 files changed, 3 insertions(+), 19 deletions(-)

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<IProps> = ({ 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 037b98c1..9ccda773 100644
--- a/ui/src/pages/Users/ChangeEmail/components/sendEmail.tsx
+++ b/ui/src/pages/Users/ChangeEmail/components/sendEmail.tsx
@@ -85,17 +85,9 @@ const Index: FC = () => {
         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);
-        //   }
-        // }
-        // setFormData({ ...formData });
         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 });

From 4eaab3d005643d83e31df7b0af97a6db6bd0bd04 Mon Sep 17 00:00:00 2001
From: "haitao(lj)" <haitao@sifou.com>
Date: Mon, 28 Nov 2022 16:48:26 +0800
Subject: [PATCH 2/2] fix(question): initFormData not cleared correctly in form
 Ask

---
 ui/src/pages/Questions/Ask/index.tsx | 54 ++++++++++++++--------------
 1 file changed, 27 insertions(+), 27 deletions(-)

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<string>;
   edit_summary: Type.FormValue<string>;
 }
-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<FormDataItem>(initFormData);
   const [checked, setCheckState] = useState(false);