From 5f52ad6496fd807466a59d99a1be0af28198cd5d Mon Sep 17 00:00:00 2001
From: Mila <Mila@pollex.com.tw>
Date: 星期一, 24 一月 2022 12:20:21 +0800
Subject: [PATCH] update: 待 api 全部呼叫完畢再執行 loadingFinish

---
 PAMapp/shared/services/httpClient.ts |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/PAMapp/shared/services/httpClient.ts b/PAMapp/shared/services/httpClient.ts
index e524ddf..bafed6e 100644
--- a/PAMapp/shared/services/httpClient.ts
+++ b/PAMapp/shared/services/httpClient.ts
@@ -16,8 +16,11 @@
   withCredentials: true
 });
 
+let apiNumber = 0;
+
 http.interceptors.request.use(
   (config: AxiosRequestConfig) => {
+    apiNumber += 1;
     loadingStart();
     addHttpHeader(config);
     return config;
@@ -26,11 +29,17 @@
 
 http.interceptors.response.use(
   (response: AxiosResponse) => {
-    loadingFinish();
+    apiNumber -= 1;
+    if (apiNumber === 0) {
+      loadingFinish();
+    }
     return response;
   },
   (error: AxiosError) => {
-    loadingFinish();
+    apiNumber -= 1;
+    if (apiNumber === 0) {
+      loadingFinish();
+    }
     showErrorMessageBox(error)
     return Promise.reject(error);
   }

--
Gitblit v1.8.0