From e22dc426293f42c1e84832ee630156161d36c10e Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期一, 24 一月 2022 12:45:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/Phase3' into Phase3
---
PAMapp/shared/services/httpClient.ts | 13 +++++++++++--
PAMapp/assets/scss/vendors/elementUI/_select.scss | 3 +++
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/PAMapp/assets/scss/vendors/elementUI/_select.scss b/PAMapp/assets/scss/vendors/elementUI/_select.scss
index 515da4a..815b184 100644
--- a/PAMapp/assets/scss/vendors/elementUI/_select.scss
+++ b/PAMapp/assets/scss/vendors/elementUI/_select.scss
@@ -31,6 +31,9 @@
line-height: 1;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
+ &:before {
+ content: "\e910";
+ }
}
}
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