From 30789138e2d8b3317342042bd88dbdba337b5e42 Mon Sep 17 00:00:00 2001
From: DacongDA <dacongda1@sina.com>
Date: Tue, 11 Mar 2025 21:03:04 +0800
Subject: [PATCH] feat: fix faceId loop error caused by async (#3651)

---
 web/src/common/modal/FaceRecognitionModal.js | 22 ++++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/web/src/common/modal/FaceRecognitionModal.js b/web/src/common/modal/FaceRecognitionModal.js
index 3a324d5a..c5f5ba1f 100644
--- a/web/src/common/modal/FaceRecognitionModal.js
+++ b/web/src/common/modal/FaceRecognitionModal.js
@@ -289,20 +289,20 @@ const FaceRecognitionModal = (props) => {
             <p>{i18next.t("general:Click to Upload")}</p>
           </Dragger >
           {
-            modelsLoaded ? <Button style={{width: "100%"}} onClick={() => {
+            modelsLoaded ? <Button style={{width: "100%"}} onClick={async() => {
               let maxScore = 0;
-              files.forEach((file, fileIndex) => {
+              for (const file of files) {
+                const fileIndex = files.indexOf(file);
                 const img = new Image();
                 img.src = file.base64;
-                faceapi.detectAllFaces(img, new faceapi.TinyFaceDetectorOptions()).withFaceLandmarks().withFaceDescriptors().then(res2 => {
-                  if (res2[0]?.detection.score > 0.9 && res2[0]?.detection.score > maxScore) {
-                    maxScore = res2[0]?.detection.score;
-                    setCurrentFaceId(res2[0]);
-                    setCurrentFaceIndex(fileIndex);
-                  }
-                });
-              });
-              if (currentFaceId?.length === 0) {
+                const faceIds = await faceapi.detectAllFaces(img, new faceapi.TinyFaceDetectorOptions()).withFaceLandmarks().withFaceDescriptors();
+                if (faceIds[0]?.detection.score > 0.9 && faceIds[0]?.detection.score > maxScore) {
+                  maxScore = faceIds[0]?.detection.score;
+                  setCurrentFaceId(faceIds[0]);
+                  setCurrentFaceIndex(fileIndex);
+                }
+              }
+              if (maxScore < 0.9) {
                 message.error(i18next.t("login:Face recognition failed"));
               }
             }}> {i18next.t("application:Generate faceId")}</Button> : null