From c946536e8e1092f8c7b94c6a8c50fd6d17601bea Mon Sep 17 00:00:00 2001
From: qlin <haizekuo@gmail.com>
Date: Fri, 29 Apr 2022 15:55:56 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20request=20skipErrorHandler=20=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E9=97=AE=E9=A2=98=20(#121)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix: request skipErrorHandler 配置问题

* fix: 处理 default 异常问题？
---
 .../src/template/request.js                   |  40 ++++---
 packages/fes-template-h5/src/app.js           |   2 +-
 packages/fes-template-h5/src/pages/index.vue  | 101 +-----------------
 3 files changed, 30 insertions(+), 113 deletions(-)

diff --git a/packages/fes-plugin-request/src/template/request.js b/packages/fes-plugin-request/src/template/request.js
index 88aa7517..7542ac4f 100644
--- a/packages/fes-plugin-request/src/template/request.js
+++ b/packages/fes-plugin-request/src/template/request.js
@@ -142,29 +142,37 @@ function skipErrorHandlerToObj(skipErrorHandler = []) {
     }, {});
 }
 
+function getErrorKey(error, response) {
+    const resCode = getResponseCode(response);
+
+    if (resCode) return resCode;
+    if (error.type) return error.type;
+    return error.response?.status;
+}
+
+function isSkipErrorHandler(config, errorKey) {
+    // 跳过所有错误类型处理
+    if (config.skipErrorHandler === true) return true;
+
+    const skipObj = skipErrorHandlerToObj(config.skipErrorHandler);
+
+    return skipObj[errorKey];
+}
+
 function handleRequestError({
     errorHandler = {},
     error,
     response,
     config
 }) {
-    // 跳过所有错误类型处理
-    if (config.skipErrorHandler === true) return;
+    const errorKey = getErrorKey(error, response);
 
-    const skipObj = skipErrorHandlerToObj(config.skipErrorHandler);
-    const resCode = getResponseCode(response);
-
-    let errorKey = 'default';
-    if (resCode && errorHandler[resCode]) {
-        errorKey = resCode;
-    } else if (error.type && errorHandler[error.type]) {
-        errorKey = error.type;
-    } else if (error.response && errorHandler[error.response.status]) {
-        errorKey = error.response.status;
-    }
-
-    if (!skipObj[errorKey] && errorHandler[errorKey]) {
-        return errorHandler[errorKey](error);
+    if (!isSkipErrorHandler(config, errorKey)) {
+        if (isFunction(errorHandler[errorKey])) {
+            errorHandler[errorKey](error, response);
+        } else if (isFunction(errorHandler.default)) {
+            errorHandler.default(error, response);
+        }
     }
 }
 
diff --git a/packages/fes-template-h5/src/app.js b/packages/fes-template-h5/src/app.js
index 0797ca30..c611c904 100644
--- a/packages/fes-template-h5/src/app.js
+++ b/packages/fes-template-h5/src/app.js
@@ -7,7 +7,7 @@ export const request = {
             console.log('500 error');
         },
         default(error) {
-            console.log(error);
+            console.log('default error', error);
             const msg = error?.data?.msg || error?.msg;
             console.log(msg);
         }
diff --git a/packages/fes-template-h5/src/pages/index.vue b/packages/fes-template-h5/src/pages/index.vue
index 7d6479dc..5fe4b9ca 100644
--- a/packages/fes-template-h5/src/pages/index.vue
+++ b/packages/fes-template-h5/src/pages/index.vue
@@ -38,108 +38,17 @@ export default {
             console.log('click Icon');
         };
         console.log(useRoute());
-        // request('/api', null, {
-        // }).then((res) => {
-        //     console.log(res);
-        // });
-        // request('/api', null, {
-        // }).then((res) => {
-        //     console.log(res);
-        // });
-        // request('/api', null, {
-        //     mergeRequest: true
-        // }).then((res) => {
-        //     console.log(res);
-        // });
-        // request('/api', null, {
-        //     mergeRequest: true
-        // }).then((res) => {
-        //     console.log(res);
-        // });
-        // request('/api', null, {
-        //     throttle: 3000,
-        //     cache: true
-        // }).then((res) => {
-        //     console.log(res);
-        // });
 
-        const get = (id) => {
-            request(
-                '/get/api',
-                { id },
-                {
-                    method: 'get'
-                }
-            );
-        };
-
-        const post = (id) => {
-            request(
-                '/api',
-                { id },
-                {
-                    responseType: 'blob'
-                }
-            ).then((data) => {
-                console.log(data);
+        const get = () => {
+            request('/api', null, {
+                skipErrorHandler: ['500']
+            }).catch((err) => {
+                console.log('skip error', err);
             });
         };
 
         get(1);
-        // get(2);
-        // get(3);
 
-        // post(1);
-        // post(2);
-        post(3);
-
-        // setTimeout(() => {
-        //     request('/api', null, {
-        //         throttle: 3000,
-        //         cache: true
-        //     }).then((res) => {
-        //         console.log(res);
-        //     });
-        // }, 1000);
-
-        // setTimeout(() => {
-        //     request('/api', null, {
-        //         throttle: 3000,
-        //         cache: true
-        //     }).then((res) => {
-        //         console.log(res);
-        //     });
-        //     request('/api', null, {
-        //         throttle: 3000,
-        //         cache: true
-        //     }).then((res) => {
-        //         console.log(res);
-        //     });
-        // }, 3200);
-
-        // request('/api', null, {
-        //     cache: true
-        // }).then((res) => {
-        //     console.log(res);
-        // });
-        // request('/api', null, {
-        //     cache: true
-        // }).then((res) => {
-        //     console.log(res);
-        // });
-        // request('/api', null, {
-        //     cache: true
-        // }).then((res) => {
-        //     console.log(res);
-        // });
-
-        // request('/api', null, {
-        //     // skipErrorHandler: [500]
-        // }).then((res) => {
-        //     console.log(res);
-        // }).catch((err) => {
-        //     console.log('inner error', err);
-        // });
         return {
             fes,
             rotate,