From f4adcd3dffed0f3cea08ea464093e9e283f81b80 Mon Sep 17 00:00:00 2001
From: gaoyunqi <gaoyunqi@gdyd.com>
Date: Wed, 27 Mar 2024 16:42:01 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=A1=A8=E5=8D=95=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E5=99=A8magic-api=E8=B0=83=E7=94=A8=E4=B8=8D=E4=BC=9A=E5=BC=B9?=
 =?UTF-8?q?=E6=A1=86=EF=BC=8C=E8=80=8C=E6=98=AF=E4=BB=A5=E5=9B=BE=E6=A0=87?=
 =?UTF-8?q?=E9=97=AA=E7=83=81=E7=9A=84=E5=BD=A2=E5=BC=8F=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/magicApi/index.ts                     |  1 +
 src/components/SecondDev/AjaxErrorIcon.vue    | 37 +++++++++++++++++++
 src/hooks/core/useGlobalFlag.ts               | 20 ++++++++++
 src/utils/http/axios/index.ts                 | 15 ++++++--
 .../components/components/DataFirstModal.vue  | 16 +++++++-
 .../dev/components/CodeFirstModal.vue         | 15 +++++++-
 .../dev/components/DataFirstModal.vue         | 15 +++++++-
 types/axios.d.ts                              |  2 +
 8 files changed, 114 insertions(+), 7 deletions(-)
 create mode 100644 src/components/SecondDev/AjaxErrorIcon.vue
 create mode 100644 src/hooks/core/useGlobalFlag.ts

diff --git a/src/api/magicApi/index.ts b/src/api/magicApi/index.ts
index 1e4139e..dde64ba 100644
--- a/src/api/magicApi/index.ts
+++ b/src/api/magicApi/index.ts
@@ -22,6 +22,7 @@ export const requestMagicApi = (
     },
     {
       errorMessageMode: mode,
+      ignoreErrorInEditor: true
     },
   );
 };
diff --git a/src/components/SecondDev/AjaxErrorIcon.vue b/src/components/SecondDev/AjaxErrorIcon.vue
new file mode 100644
index 0000000..c771517
--- /dev/null
+++ b/src/components/SecondDev/AjaxErrorIcon.vue
@@ -0,0 +1,37 @@
+<template>
+    <WarningOutlined class="alert-icon" v-show="hasAjaxError" :style="{ color: '#c00', cursor: 'pointer' }" @click.native="showHint" />
+</template>
+
+<style scoped>
+    @keyframes opacityChange {
+        0% {
+            opacity: 1;
+        }
+        50% {
+            opacity: 0.3;
+        }
+        100% {
+            opacity: 1;
+        }
+    }
+
+    .alert-icon{
+        animation: opacityChange 3s infinite;
+    }
+</style>
+
+<script setup>
+    import { WarningOutlined } from '@ant-design/icons-vue';
+    import { Modal } from 'ant-design-vue';
+    import useGlobalFlag from '/@/hooks/core/useGlobalFlag';
+
+    const globalFlag = useGlobalFlag();
+    const { hasAjaxError } = globalFlag;
+
+    function showHint() {
+        Modal.error({
+            title: '接口调用错误',
+            content: 'magic-api调用出现错误，为了避免干扰正常操作，这些操作不会在表单设计器中显式提示，请使用浏览器的调试工具查看具体报错信息。'
+        });
+    }
+</script>
diff --git a/src/hooks/core/useGlobalFlag.ts b/src/hooks/core/useGlobalFlag.ts
new file mode 100644
index 0000000..3df4b63
--- /dev/null
+++ b/src/hooks/core/useGlobalFlag.ts
@@ -0,0 +1,20 @@
+import { ref } from 'vue';
+
+const isEditorOpen = ref(false);
+const hasAjaxError = ref(false);
+
+function ajaxError() {
+    hasAjaxError.value = true;
+    setTimeout(() => {
+        hasAjaxError.value = false;
+    }, 10000);
+}
+
+export default function() {
+    return {
+        isEditorOpen,
+        hasAjaxError,
+        ajaxError
+    }
+}
+
diff --git a/src/utils/http/axios/index.ts b/src/utils/http/axios/index.ts
index 62a7ad6..e03717b 100644
--- a/src/utils/http/axios/index.ts
+++ b/src/utils/http/axios/index.ts
@@ -22,10 +22,12 @@ import { useGo } from '/@/hooks/web/usePage';
 import { validateScript } from '/@/utils/event/design';
 import { notification } from 'ant-design-vue';
 import { throttle } from 'lodash-es';
+import useGlobalFlag from '/@/hooks/core/useGlobalFlag';
 
 const globSetting = useGlobSetting();
 const urlPrefix = globSetting.urlPrefix;
 const { createMessage, createErrorModal } = useMessage();
+const { isEditorOpen, ajaxError } = useGlobalFlag();
 
 const showNetworkError = function() {
     notification.error({
@@ -92,10 +94,14 @@ const transform: AxiosTransform = {
 
         // errorMessageMode=‘modal’的时候会显示modal错误弹窗，而不是消息提示，用于一些比较重要的错误
         // errorMessageMode='none' 一般是调用时明确表示不希望自动弹出错误提示
-        if (options.errorMessageMode === 'modal') {
-            createErrorModal({ title: t('错误提示'), content: timeoutMsg });
-        } else if (options.errorMessageMode === 'message') {
-            createMessage.error(timeoutMsg);
+        if (options.ignoreErrorInEditor && isEditorOpen.value) {
+            ajaxError();
+        } else {
+            if (options.errorMessageMode === 'modal') {
+                createErrorModal({ title: t('错误提示'), content: timeoutMsg });
+            } else if (options.errorMessageMode === 'message') {
+                createMessage.error(timeoutMsg);
+            }
         }
 
         throw new Error(timeoutMsg || t('请求出错，请稍候重试'));
@@ -187,6 +193,7 @@ const transform: AxiosTransform = {
         let errMessage = '';
 
         try {
+
             if (code === 'ECONNABORTED' && message.indexOf('timeout') !== -1) {
                 trNetworkError();
             } else if (err?.includes('Network Error')) {
diff --git a/src/views/form/design/components/components/DataFirstModal.vue b/src/views/form/design/components/components/DataFirstModal.vue
index 5137e39..8482ee6 100644
--- a/src/views/form/design/components/components/DataFirstModal.vue
+++ b/src/views/form/design/components/components/DataFirstModal.vue
@@ -13,6 +13,7 @@
           <a-step :title="t('表单事件')" />
         </a-steps>
         <div class="btn-box">
+          <ajax-error-icon />
           <a-button type="primary" @click="handleStepPrev" v-show="current !== 0">{{
             t('上一步')
           }}</a-button>
@@ -34,12 +35,13 @@
   </BasicModal>
 </template>
 <script lang="ts" setup>
-  import { ref, reactive, provide, watch, Ref, toRaw } from 'vue';
+  import { ref, reactive, provide, watch, Ref, toRaw, onUnmounted } from 'vue';
   import BasicConfigStep from '../BasicConfigStep.vue';
   import { FormDesignStep, FormEventStep } from '/@/components/CreateCodeStep';
   import { BasicModal, useModalInner } from '/@/components/Modal';
   import { CustomFormConfig, GeneratorConfig } from '/@/model/generator/generatorConfig';
   import { TableInfo } from '/@/components/Designer';
+  import AjaxErrorIcon from '/@/components/SecondDev/AjaxErrorIcon.vue';
   import {
     addDataFirstFormTemplate,
     updateDataFirstFormTemplate,
@@ -49,6 +51,8 @@
   import * as antd from '/@/components/Designer/src/types';
   import { useI18n } from '/@/hooks/web/useI18n';
   import DesignLogo from '/@/components/ModalPanel/src/DesignLogo.vue';
+  import useGlobalFlag from '/@/hooks/core/useGlobalFlag';
+
   const { t } = useI18n();
   const current = ref(0);
 
@@ -61,6 +65,16 @@
   const isUpdate = ref<boolean>(false);
   const formId = ref<string>('');
   const emits = defineEmits(['success', 'register', 'close']);
+  const globalFlag = useGlobalFlag();
+  const { isEditorOpen } = globalFlag;
+
+  watch(current, () => {
+    isEditorOpen.value = current.value === 1;
+  });
+
+  onUnmounted(() => {
+    isEditorOpen.value = false;
+  });
 
   let generatorConfig = reactive<GeneratorConfig>({
     databaseId: '', //数据库id
diff --git a/src/views/generator/dev/components/CodeFirstModal.vue b/src/views/generator/dev/components/CodeFirstModal.vue
index 282dace..34d7603 100644
--- a/src/views/generator/dev/components/CodeFirstModal.vue
+++ b/src/views/generator/dev/components/CodeFirstModal.vue
@@ -17,6 +17,7 @@
           <a-step :title="t('菜单设置')" />
         </a-steps>
         <div class="btn-box">
+          <ajax-error-icon />
           <a-button @click="handleStepPrev" v-show="current !== 0">{{ t('上一步') }}</a-button>
           <a-button type="primary" @click="handleSaveDraft" v-show="current > 3">{{
             t('保存草稿')
@@ -47,7 +48,7 @@
   </BasicModal>
 </template>
 <script lang="ts" setup>
-  import { ref, reactive, provide, Ref, defineAsyncComponent } from 'vue';
+  import { ref, reactive, provide, Ref, defineAsyncComponent, watch, onUnmounted } from 'vue';
   import { BasicModal, useModalInner } from '/@/components/Modal';
   import { GeneratorConfig } from '/@/model/generator/generatorConfig';
   import { TableInfo, noHaveTableAndField } from '/@/components/Designer';
@@ -70,6 +71,8 @@
   import { MenuConfig } from '/@/model/generator/menuConfig';
   import { FormJson } from '/@/model/generator/codeGenerator';
   import DesignLogo from '/@/components/ModalPanel/src/DesignLogo.vue';
+  import AjaxErrorIcon from '/@/components/SecondDev/AjaxErrorIcon.vue';
+  import useGlobalFlag from '/@/hooks/core/useGlobalFlag';
   const { t } = useI18n();
   const StructureConfigStep = defineAsyncComponent({
     loader: () => import('/@/components/CreateCodeStep/src/StructureConfigStep.vue'),
@@ -96,6 +99,8 @@
     loadingComponent: LoadingBox,
   });
 
+  const globalFlag = useGlobalFlag();
+  const { isEditorOpen } = globalFlag;
   const userStore = useUserStore();
   const templateId = ref();
   const current = ref(0);
@@ -110,6 +115,14 @@
   const mainTableName = ref('table_' + random(10000, 99999));
   const emit = defineEmits(['close', 'register', 'success']);
 
+  watch(current, () => {
+    isEditorOpen.value = current.value === 0;
+  });
+
+  onUnmounted(() => {
+    isEditorOpen.value = false;
+  });
+
   const tableInfo = ref<TableInfo[]>([]);
   let generatorConfig = reactive<GeneratorConfig>({
     databaseId: '', //数据库id
diff --git a/src/views/generator/dev/components/DataFirstModal.vue b/src/views/generator/dev/components/DataFirstModal.vue
index 1e7ba03..ca83bb4 100644
--- a/src/views/generator/dev/components/DataFirstModal.vue
+++ b/src/views/generator/dev/components/DataFirstModal.vue
@@ -16,6 +16,7 @@
           <a-step :title="t('菜单设置')" />
         </a-steps>
         <div class="btn-box">
+          <ajax-error-icon />
           <a-button @click="handleStepPrev" v-show="current !== 0">{{ t('上一步') }}</a-button>
           <a-button type="primary" @click="handleSaveDraft" v-show="current > 3">{{
             t('保存草稿')
@@ -41,7 +42,7 @@
   </BasicModal>
 </template>
 <script lang="ts" setup>
-  import { ref, reactive, provide, Ref, defineAsyncComponent } from 'vue';
+  import { ref, reactive, provide, Ref, defineAsyncComponent, watch, onUnmounted } from 'vue';
   import { BasicModal, useModalInner } from '/@/components/Modal';
   import { GeneratorConfig } from '/@/model/generator/generatorConfig';
   import { TableInfo } from '/@/components/Designer';
@@ -63,6 +64,8 @@
   import * as antd from '/@/components/Designer/src/types';
   import { useI18n } from '/@/hooks/web/useI18n';
   import DesignLogo from '/@/components/ModalPanel/src/DesignLogo.vue';
+  import useGlobalFlag from '/@/hooks/core/useGlobalFlag';
+  import AjaxErrorIcon from '/@/components/SecondDev/AjaxErrorIcon.vue';
 
   const { t } = useI18n();
   const TableConfigStep = defineAsyncComponent({
@@ -91,6 +94,8 @@
   });
 
   const userStore = useUserStore();
+  const globalFlag = useGlobalFlag();
+  const { isEditorOpen } = globalFlag;
   const templateId = ref();
   const current = ref(0);
   const isUpdate = ref(false);
@@ -103,6 +108,14 @@
   const widgetForm = ref(JSON.parse(JSON.stringify(antd.widgetForm))); //FormDesignStep -> designer和StructureConfigStep页面使用
   const tableInfo = ref<TableInfo[]>([]);
 
+  watch(current, () => {
+    isEditorOpen.value = current.value === 1;
+  });
+
+  onUnmounted(() => {
+    isEditorOpen.value = false;
+  });
+
   const emit = defineEmits(['close', 'register', 'success']);
   let generatorConfig = reactive<GeneratorConfig>({
     databaseId: null, //数据库id
diff --git a/types/axios.d.ts b/types/axios.d.ts
index a04f374..b8967fe 100644
--- a/types/axios.d.ts
+++ b/types/axios.d.ts
@@ -25,6 +25,8 @@ export interface RequestOptions {
   withToken?: boolean;
   // 请求重试机制
   retryRequest?: RetryRequest;
+  // 在表单设计器中隐藏错误信息
+  ignoreErrorInEditor?: boolean;
 }
 
 export interface RetryRequest {