From 6319afa2188ce388d5988c22f0dddc77d13c8480 Mon Sep 17 00:00:00 2001
From: chndfang <chndfang@outlook.com>
Date: Tue, 13 May 2025 22:37:34 +0800
Subject: [PATCH] fix

---
 src/components/editor-toolbar.vue | 7 +++++--
 src/services/editor.service.ts    | 8 ++++++++
 src/services/http.ts              | 6 +++++-
 vite.config.ts                    | 4 ++--
 4 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/src/components/editor-toolbar.vue b/src/components/editor-toolbar.vue
index 4beffe6..efdea3c 100644
--- a/src/components/editor-toolbar.vue
+++ b/src/components/editor-toolbar.vue
@@ -3,6 +3,7 @@ import { MapAreaType } from '@api/map';
 import { saveSceneByGroupId, saveSceneById } from '@api/scene';
 import type { EditorService } from '@core/editor.service';
 import { isEmpty } from 'lodash-es';
+import { computed } from 'vue';
 import { inject, type InjectionKey, ref, type ShallowRef, watch } from 'vue';
 
 type Props = {
@@ -34,6 +35,8 @@ watch(editor.value.mouseBrush, (v) => {
   editor.value.addArea(p1, p2, mode.value);
   mode.value = undefined;
 });
+
+const canDelete = computed<boolean>(() => editor.value.current.value?.name === 'area');
 </script>
 
 <template>
@@ -77,8 +80,8 @@ watch(editor.value.mouseBrush, (v) => {
     <a-button
       class="icon-btn tool-btn ml-12"
       size="large"
-      @click="editor.delete(undefined, true)"
-      :disabled="!editor.selected.value.length"
+      @click="editor.deleteById(editor.current.value?.id)"
+      :disabled="!canDelete"
     >
       <i class="mask trash" />
     </a-button>
diff --git a/src/services/editor.service.ts b/src/services/editor.service.ts
index 31ccdf3..7dea483 100644
--- a/src/services/editor.service.ts
+++ b/src/services/editor.service.ts
@@ -189,6 +189,14 @@ export class EditorService extends Meta2d {
     this.render();
   }
 
+  public deleteById(id?: string): void {
+    const pen = this.getPenById(id);
+    console.log(pen);
+
+    if (pen?.name !== 'area') return;
+    this.delete([pen], true, true);
+  }
+
   public updatePen(id: string, pen: Partial<MapPen>, record = true): void {
     this.setValue({ ...pen, id }, { render: true, history: record, doEvent: true });
   }
diff --git a/src/services/http.ts b/src/services/http.ts
index b9049c5..f249e62 100644
--- a/src/services/http.ts
+++ b/src/services/http.ts
@@ -24,7 +24,11 @@ http.interceptors.response.use(
     message.error(hint);
     return Promise.reject(hint);
   },
-  (error) => Promise.reject(error.message),
+  (error) => {
+    const hint = error.response.data?.message || error.message;
+    message.error(hint ?? '未知异常');
+    return Promise.reject(hint);
+  },
 );
 
 type HttpInstance = Omit<AxiosInstance, 'get' | 'post'> & {
diff --git a/vite.config.ts b/vite.config.ts
index e0dfc5b..49de61a 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -43,8 +43,8 @@ export default ({ mode }: Record<string, unknown>) =>
       port: 8888,
       host: true,
       proxy: {
-        // '/api/': {
-        //   target: 'http://82.157.33.186:26981/jeecg-boot',
+        // '/mocks/': {
+        //   target: 'http://82.156.39.91:18085/jeecg-boot',
         //   rewrite: (path) => path.replace(/^\/api/, ''),
         //   changeOrigin: true,
         // },