From 0c0b706279144b5220d1109bd3a554762cc0c5f0 Mon Sep 17 00:00:00 2001
From: liaozan <378024053@qq.com>
Date: Fri, 8 Apr 2022 10:31:57 +0800
Subject: [PATCH] feat: axios loading

---
 initializer-ui/src/App.vue                |  2 +-
 initializer-ui/src/components/starter.vue | 19 ++++++-------------
 initializer-ui/src/utils/request.ts       |  8 ++++----
 3 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/initializer-ui/src/App.vue b/initializer-ui/src/App.vue
index 3d09499..ae33f4b 100644
--- a/initializer-ui/src/App.vue
+++ b/initializer-ui/src/App.vue
@@ -3,4 +3,4 @@
 </template>
 
 <script lang="ts" setup>
-import Starter from "./components/starter.vue";</script>
\ No newline at end of file
+import Starter from "./components/starter.vue"</script>
\ No newline at end of file
diff --git a/initializer-ui/src/components/starter.vue b/initializer-ui/src/components/starter.vue
index 2525c33..254c009 100644
--- a/initializer-ui/src/components/starter.vue
+++ b/initializer-ui/src/components/starter.vue
@@ -30,7 +30,7 @@
 </template>
 
 <script lang="ts" setup>
-import {reactive, ref, computed} from 'vue'
+import {computed, reactive, ref} from 'vue'
 import type {TreeProps} from 'ant-design-vue';
 import {FormInstance, message} from "ant-design-vue";
 import request, {isLoading} from "../utils/request";
@@ -91,16 +91,10 @@ const onPreview = async () => {
 }
 
 const onDownload = async (id: number) => {
-  try {
-    loading.value = true
-    let res = await request.get(`/archetype/download/${id}`, {responseType: 'blob'})
-    const {headers, data} = res
-    const fileName = headers['content-disposition'].replace(/\w+;\sfilename="(.*)"/, '$1')
-    downloadGeneratedProject(data, fileName)
-  } catch (e) {
-    console.log('err:', e)
-    loading.value = false
-  }
+  let res = await request.get(`/archetype/download/${id}`, {responseType: 'blob'})
+  const {headers, data} = res
+  const fileName = headers['content-disposition'].replace(/\w+;\sfilename="(.*)"/, '$1')
+  downloadGeneratedProject(data, fileName)
 }
 
 const downloadGeneratedProject = (data: BlobPart, fileName: string) => {
@@ -113,7 +107,6 @@ const downloadGeneratedProject = (data: BlobPart, fileName: string) => {
   link.click()
   URL.revokeObjectURL(link.href)
   document.body.removeChild(link)
-  loading.value = false
 }
 
 const fetchFileList = async (id: number) => {
@@ -174,4 +167,4 @@ const createTreeData = (fileNodeList: FileNode[]): any => {
     border-radius: 6px;
   }
 }
-</style>
+</style>
\ No newline at end of file
diff --git a/initializer-ui/src/utils/request.ts b/initializer-ui/src/utils/request.ts
index 230ab01..7267984 100644
--- a/initializer-ui/src/utils/request.ts
+++ b/initializer-ui/src/utils/request.ts
@@ -1,7 +1,7 @@
-import type { AxiosRequestConfig, AxiosResponse } from "axios";
+import type {AxiosRequestConfig, AxiosResponse} from "axios";
 import axios from "axios";
 import {message} from "ant-design-vue";
-import { ref } from 'vue'
+import {ref} from 'vue'
 
 export const isLoading = ref(false)
 
@@ -20,7 +20,7 @@ axios.interceptors.response.use((config: AxiosResponse) => {
             case 0:
                 return Promise.resolve(data)
             default:
-                message.error(data.message)
+                message.error(data.message).then()
                 return Promise.reject(data)
         }
     } else {
@@ -28,4 +28,4 @@ axios.interceptors.response.use((config: AxiosResponse) => {
     }
 })
 
-export default axios
+export default axios
\ No newline at end of file
-- 
GitLab