From 621a00a0440d754874e6d86b5cf7b3052c7326c7 Mon Sep 17 00:00:00 2001
From: likunming <likunming@163.com>
Date: Tue, 5 Nov 2024 15:16:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9noErrorAxios=E7=9A=84catch?=
 =?UTF-8?q?=E5=A4=84=E7=90=86=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/components/grid/CellEditor.vue   | 18 +++----------
 .../src/platform/components/grid/GridBody.vue | 14 +++-------
 .../components/grid/GridEditToolbar.vue       | 26 ++++---------------
 .../platform/components/grid/GridEditor.vue   | 18 +++----------
 4 files changed, 16 insertions(+), 60 deletions(-)

diff --git a/io.sc.platform.core.frontend/src/platform/components/grid/CellEditor.vue b/io.sc.platform.core.frontend/src/platform/components/grid/CellEditor.vue
index 38eade6d..2dbcad25 100644
--- a/io.sc.platform.core.frontend/src/platform/components/grid/CellEditor.vue
+++ b/io.sc.platform.core.frontend/src/platform/components/grid/CellEditor.vue
@@ -5,7 +5,7 @@
 </template>
 <script setup lang="ts">
 import { ref, reactive, inject, computed, toRaw } from 'vue';
-import { t, Tools, noErrorAxios, NotifyManager } from '@/platform';
+import { t, Tools, noErrorAxios, NotifyManager, ServerExceptionHandler } from '@/platform';
 
 const dialogRef = ref();
 const dialogFormRef = ref();
@@ -75,21 +75,11 @@ const dialog = {
                   dialogRef.value.hide();
                 })
                 .catch((error) => {
-                  const response = error?.response;
-                  const status = response?.status;
-                  const data = response?.data;
-                  if (data?.code === 1001) {
+                  if (error?.code === 1001) {
                     // 验证错误
-                    if (error.response.data.data) {
-                      dialogFormRef.value.setValidationErrors(error.response.data.data);
-                    }
+                    dialogFormRef.value.setValidationErrors(error.data);
                   } else {
-                    //其他错误
-                    if (status === 500) {
-                      NotifyManager.error(t(data?.errorMessageI18nKey));
-                    } else {
-                      NotifyManager.error(t(status));
-                    }
+                    ServerExceptionHandler.handle(error);
                   }
                   dialog.buttons[0].loading = false;
                 });
diff --git a/io.sc.platform.core.frontend/src/platform/components/grid/GridBody.vue b/io.sc.platform.core.frontend/src/platform/components/grid/GridBody.vue
index 2a6ec4ba..4740d248 100644
--- a/io.sc.platform.core.frontend/src/platform/components/grid/GridBody.vue
+++ b/io.sc.platform.core.frontend/src/platform/components/grid/GridBody.vue
@@ -69,7 +69,7 @@
 </template>
 <script setup lang="ts">
 import { computed, inject, ref, toRaw } from 'vue';
-import { Tools, noErrorAxios, NotifyManager, t } from '@/platform';
+import { Tools, noErrorAxios, NotifyManager, t, ServerExceptionHandler } from '@/platform';
 import { dndMode, dndImage, selectMode, editStatus } from './ts/grid';
 import TreeGridRow from './TreeGridRow.vue';
 import GridTd from './GridTd.vue';
@@ -245,18 +245,10 @@ const updates = (data, callback) => {
       }
     })
     .catch((error) => {
-      const response = error?.response;
-      const status = response?.status;
-      const data = response?.data;
-      if (data?.code === 1001) {
+      if (error.code === 1001) {
         NotifyManager.error('服务器验证未通过');
       } else {
-        //其他错误
-        if (status === 500) {
-          NotifyManager.error(t(data?.errorMessageI18nKey));
-        } else {
-          NotifyManager.error(t(status));
-        }
+        ServerExceptionHandler.handle(error);
       }
     });
 };
diff --git a/io.sc.platform.core.frontend/src/platform/components/grid/GridEditToolbar.vue b/io.sc.platform.core.frontend/src/platform/components/grid/GridEditToolbar.vue
index e9c6e3f5..f013eb10 100644
--- a/io.sc.platform.core.frontend/src/platform/components/grid/GridEditToolbar.vue
+++ b/io.sc.platform.core.frontend/src/platform/components/grid/GridEditToolbar.vue
@@ -42,7 +42,7 @@
 </template>
 <script setup lang="ts">
 import { computed, inject, ref, toRaw } from 'vue';
-import { Tools, NotifyManager, noErrorAxios, t } from '@/platform';
+import { Tools, NotifyManager, noErrorAxios, t, ServerExceptionHandler } from '@/platform';
 import { editStatus } from './ts/grid';
 
 const props = defineProps({
@@ -178,18 +178,10 @@ const rowSave = (args) => {
           table.bodyEditStatus = 'none';
         })
         .catch((error) => {
-          const response = error?.response;
-          const status = response?.status;
-          const data = response?.data;
-          if (data?.code === 1001) {
+          if (error.code === 1001) {
             NotifyManager.error('服务器验证未通过');
           } else {
-            //其他错误
-            if (status === 500) {
-              NotifyManager.error(t(data?.errorMessageI18nKey));
-            } else {
-              NotifyManager.error(t(status));
-            }
+            ServerExceptionHandler.handle(error);
           }
         });
     }
@@ -301,18 +293,10 @@ const updates = (data, callback) => {
       }
     })
     .catch((error) => {
-      const response = error?.response;
-      const status = response?.status;
-      const data = response?.data;
-      if (data?.code === 1001) {
+      if (error.code === 1001) {
         NotifyManager.error('服务器验证未通过');
       } else {
-        //其他错误
-        if (status === 500) {
-          NotifyManager.error(t(data?.errorMessageI18nKey));
-        } else {
-          NotifyManager.error(t(status));
-        }
+        ServerExceptionHandler.handle(error);
       }
     });
 };
diff --git a/io.sc.platform.core.frontend/src/platform/components/grid/GridEditor.vue b/io.sc.platform.core.frontend/src/platform/components/grid/GridEditor.vue
index 61139da0..d7435b26 100644
--- a/io.sc.platform.core.frontend/src/platform/components/grid/GridEditor.vue
+++ b/io.sc.platform.core.frontend/src/platform/components/grid/GridEditor.vue
@@ -5,7 +5,7 @@
 </template>
 <script setup lang="ts">
 import { ref, reactive, inject, computed } from 'vue';
-import { t, Tools, noErrorAxios, NotifyManager } from '@/platform';
+import { t, Tools, noErrorAxios, NotifyManager, ServerExceptionHandler } from '@/platform';
 
 const dialogRef = ref();
 const dialogFormRef = ref();
@@ -118,21 +118,11 @@ const save = async () => {
             }
           })
           .catch((error) => {
-            const response = error?.response;
-            const status = response?.status;
-            const data = response?.data;
-            if (data?.code === 1001) {
+            if (error?.code === 1001) {
               // 验证错误
-              if (error.response.data.data) {
-                dialogFormRef.value.setValidationErrors(error.response.data.data);
-              }
+              dialogFormRef.value.setValidationErrors(error.data);
             } else {
-              //其他错误
-              if (status === 500) {
-                NotifyManager.error(t(data?.errorMessageI18nKey));
-              } else {
-                NotifyManager.error(t(status));
-              }
+              ServerExceptionHandler.handle(error);
             }
             dialog.dialogButtons[0].loading = false;
           });