Merge pull request #247 from little3201/develop

fix: 修改catch中结果处理

Author: little3201

src/mocks/calendar-events.ts

@@ -30,7 +30,7 @@ export const calendarEventHandlers = [
       const res = {
         title: '法定假期',
         startDate: new Date().toISOString().split('T')[0] || '',
-        endDate: new Date(new Date().getTime() + Math.random() * 7 * 86400000).toISOString().split('T')[0] || '',
+        endDate: new Date(Date.now() + Math.random() * 7 * 86400000).toISOString().split('T')[0] || '',
         type: 'primary'
       }
       return HttpResponse.json(res)

src/mocks/connections.ts

@@ -3,7 +3,7 @@ import { SERVER_URL } from 'src/constants'
 import type { Connection } from 'src/types'
 
 
-const databases: Connection[] = [
+const datas: Connection[] = [
 ]
 
 for (let i = 1; i < 18; i++) {
@@ -16,15 +16,15 @@ for (let i = 1; i < 18; i++) {
     params: '',
     type: 'MYSQL'
   }
-  databases.push(row)
+  datas.push(row)
 }
 
-const datas: string[] = [
+const tables: string[] = [
 ]
 
 for (let i = 1; i < 8; i++) {
   const row: string = 'table_name' + i
-  datas.push(row)
+  tables.push(row)
 }
 
 export const connectionsHandlers = [
@@ -35,24 +35,23 @@ export const connectionsHandlers = [
     // Construct a JSON response with the list of all Row
     // as the response body.
     const data = {
-      content: Array.from(databases.slice(Number(page) * Number(size), (Number(page) + 1) * Number(size))),
-      totalElements: databases.length
+      content: datas.slice(Number(page) * Number(size), (Number(page) + 1) * Number(size)),
+      totalElements: datas.length
     }
 
     return HttpResponse.json(data)
   }),
   http.get(`/api${SERVER_URL.CONNECTION}/:id/tables`, ({ params }) => {
     const { id } = params
     if (id) {
-      return HttpResponse.json(datas)
+      return HttpResponse.json(tables)
     }
     return Response.error()
   }),
   http.get(`/api${SERVER_URL.CONNECTION}/:id`, ({ params }) => {
     const { id } = params
     if (id) {
-      const array = databases.filter(item => item.id === Number(id))
-      return HttpResponse.json(array[0])
+      return HttpResponse.json(datas.find(item => item.id === Number(id)))
     } else {
       return HttpResponse.json()
     }
@@ -62,7 +61,7 @@ export const connectionsHandlers = [
     const newData = await request.json() as Connection
 
     // Push the new Row to the map of all Row.
-    databases.push(newData)
+    datas.push(newData)
 
     // Don't forget to declare a semantic "201 Created"
     // response and send back the newly created Row!
@@ -89,7 +88,7 @@ export const connectionsHandlers = [
     const { id } = params
 
     // Let's attempt to grab the Row by its ID.
-    const deletedData = databases.filter(item => item.id === Number(id))
+    const deletedData = datas.filter(item => item.id === Number(id))
 
     // Respond with a "404 Not Found" response if the given
     // Row ID does not exist.

src/pages/exploiters/connections/IndexPage.vue

@@ -140,7 +140,7 @@ async function onRequest(props: Parameters<NonNullable<QTableProps['onRequest']>
     rows.value = res.data.content
     pagination.value.rowsNumber = res.data.totalElements
   } catch (error) {
-    return Promise.resolve(error)
+    return error
   } finally {
     loading.value = false
   }
@@ -157,7 +157,7 @@ async function saveRow(id?: number) {
       const res = await fetchConnection(id)
       form.value = res.data
     } catch (error) {
-      return Promise.resolve(error)
+      return error
     }
   }
   visible.value = true
@@ -173,7 +173,7 @@ async function removeRow(id: number) {
     await removeConnection(id)
     refresh()
   } catch (error) {
-    return Promise.resolve(error)
+    return error
   } finally {
     loading.value = false
   }
@@ -190,7 +190,7 @@ async function onSubmit() {
     // Close the dialog after submitting
     visible.value = false
   } catch (error) {
-    return Promise.resolve(error)
+    return error
   }
 }
 </script>

src/pages/exploiters/schemes/FieldForm.vue

@@ -115,7 +115,7 @@ async function loadFields(schemeId: number, tableName: string) {
     const res = await retrieveFields(schemeId, tableName)
     fields.value = res.data
   } catch (error) {
-    return Promise.resolve(error)
+    return error
   } finally {
     loading.value = false
   }

src/pages/exploiters/schemes/IndexPage.vue

@@ -308,7 +308,7 @@ async function onRequest(props: Parameters<NonNullable<QTableProps['onRequest']>
     rows.value = res.data.content
     pagination.value.rowsNumber = res.data.totalElements
   } catch (error) {
-    return Promise.resolve(error)
+    return error
   } finally {
     loading.value = false
   }
@@ -330,7 +330,7 @@ async function saveRow(row?: Scheme) {
       tables.value = tableRes.data
     }
   } catch (error) {
-    return Promise.resolve(error)
+    return error
   }
   visible.value = true
 }
@@ -360,7 +360,7 @@ async function previewRow(id: number) {
     const res = await previewScheme(id)
     renderedSamples.value = res.data
   } catch (error) {
-    return Promise.resolve(error)
+    return error
   }
   previewVisible.value = true
 }
@@ -371,7 +371,7 @@ async function syncRow(id: number) {
     await syncFields(id)
     refresh()
   } catch (error) {
-    return Promise.resolve(error)
+    return error
   } finally {
     syncLoading.value = false
   }
@@ -383,7 +383,7 @@ async function removeRow(id: number) {
     await removeScheme(id)
     refresh()
   } catch (error) {
-    return Promise.resolve(error)
+    return error
   } finally {
     loading.value = false
   }
@@ -399,7 +399,7 @@ async function onSubmit() {
     refresh()
     visible.value = false
   } catch (error) {
-    return Promise.resolve(error)
+    return error
   }
 }
 
@@ -422,7 +422,7 @@ async function configSubmit(form: Scheme) {
       }
     }
   } catch (error) {
-    return Promise.resolve(error)
+    return error
   } finally { configLoading.value = false }
 }
 

src/pages/exploiters/scripts/IndexPage.vue

@@ -99,7 +99,7 @@ async function onRequest() {
     const res = await retrieveScripts()
     rows.value = res.data
   } catch (error) {
-    return Promise.resolve(error)
+    return error
   } finally {
     loading.value = false
   }
@@ -115,7 +115,7 @@ async function loadOne(id: number) {
     const res = await fetchScript(id)
     form.value = res.data
   } catch (error) {
-    return Promise.resolve(error)
+    return error
   }
 }
 

src/pages/exploiters/templates/fragments/IndexPage.vue

@@ -204,7 +204,7 @@ async function onRequest(props: Parameters<NonNullable<QTableProps['onRequest']>
     rows.value = res.data.content
     pagination.value.rowsNumber = res.data.totalElements
   } catch (error) {
-    return Promise.resolve(error)
+    return error
   } finally {
     loading.value = false
   }
@@ -218,7 +218,7 @@ async function enableRow(id: number) {
   try {
     await enableFragment(id)
   } catch (error) {
-    return Promise.resolve(error)
+    return error
   }
 }
 
@@ -245,7 +245,7 @@ async function loadOne(id: number) {
     const res = await fetchFragment(id)
     form.value = res.data
   } catch (error) {
-    return Promise.resolve(error)
+    return error
   }
 }
 
@@ -255,7 +255,7 @@ async function removeRow(id: number) {
     await removeFragment(id)
     refresh()
   } catch (error) {
-    return Promise.resolve(error)
+    return error
   } finally {
     loading.value = false
   }
@@ -271,7 +271,7 @@ async function onSubmit() {
     refresh()
     visible.value = false
   } catch (error) {
-    return Promise.resolve(error)
+    return error
   }
 }
 
@@ -285,7 +285,7 @@ async function onUpload(files: readonly File[]) {
     refresh()
     return res.data
   } catch (error) {
-    return Promise.resolve(error)
+    return error
   }
 }
 </script>

src/pages/exploiters/templates/modules/IndexPage.vue

@@ -211,7 +211,7 @@ async function onRequest(props: Parameters<NonNullable<QTableProps['onRequest']>
     rows.value = res.data.content
     pagination.value.rowsNumber = res.data.totalElements
   } catch (error) {
-    return Promise.resolve(error)
+    return error
   } finally {
     loading.value = false
   }
@@ -225,7 +225,7 @@ async function enableRow(id: number) {
   try {
     await enableModule(id)
   } catch (error) {
-    return Promise.resolve(error)
+    return error
   }
 }
 
@@ -241,7 +241,7 @@ async function configRow(id: number) {
     relations.value = moduleSamplesRes.data.map((item: ModuleSample) => item.sampleId)
     samples.value = samplesRes.data.content
   } catch (error) {
-    return Promise.resolve(error)
+    return error
   }
 }
 
@@ -267,7 +267,7 @@ async function loadOne(id: number) {
     const res = await fetchModule(id)
     form.value = res.data
   } catch (error) {
-    return Promise.resolve(error)
+    return error
   }
 }
 
@@ -277,7 +277,7 @@ async function removeRow(id: number) {
     await removeModule(id)
     refresh()
   } catch (error) {
-    return Promise.resolve(error)
+    return error
   } finally {
     loading.value = false
   }
@@ -293,7 +293,7 @@ async function onSubmit() {
     refresh()
     visible.value = false
   } catch (error) {
-    return Promise.resolve(error)
+    return error
   }
 }
 
@@ -307,7 +307,7 @@ async function onUpload(files: readonly File[]) {
     refresh()
     return res.data
   } catch (error) {
-    return Promise.resolve(error)
+    return error
   }
 }
 </script>

src/pages/exploiters/templates/samples/IndexPage.vue

@@ -230,7 +230,7 @@ async function onRequest(props: Parameters<NonNullable<QTableProps['onRequest']>
     rows.value = res.data.content
     pagination.value.rowsNumber = res.data.totalElements
   } catch (error) {
-    return Promise.resolve(error)
+    return error
   } finally {
     loading.value = false
   }
@@ -244,7 +244,7 @@ async function enableRow(id: number) {
   try {
     await enableSample(id)
   } catch (error) {
-    return Promise.resolve(error)
+    return error
   }
 }
 
@@ -279,7 +279,7 @@ async function configRow(row: Sample) {
     relations.value = sampleFragmentRes.data.map((item: SampleFragment) => item.fragmentId)
     fragments.value = fragmentRes.data.content
   } catch (error) {
-    return Promise.resolve(error)
+    return error
   }
 }
 
@@ -293,7 +293,7 @@ async function loadOne(id: number) {
     const res = await fetchSample(id)
     form.value = res.data
   } catch (error) {
-    return Promise.resolve(error)
+    return error
   }
 }
 
@@ -303,7 +303,7 @@ async function removeRow(id: number) {
     await removeSample(id)
     refresh()
   } catch (error) {
-    return Promise.resolve(error)
+    return error
   } finally {
     loading.value = false
   }
@@ -319,7 +319,7 @@ async function onSubmit() {
     refresh()
     visible.value = false
   } catch (error) {
-    return Promise.resolve(error)
+    return error
   }
 }
 
@@ -333,7 +333,7 @@ async function onUpload(files: readonly File[]) {
     refresh()
     return res.data
   } catch (error) {
-    return Promise.resolve(error)
+    return error
   }
 }
 </script>