From d894010da06e623b42a1aa28962c57530c7ed6ee Mon Sep 17 00:00:00 2001
From: jxxghp <jxxghp@gmail.com>
Date: Wed, 16 Aug 2023 14:30:30 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E4=BC=98=E5=8C=96=E7=AB=99=E7=82=B9?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=8C=89=E9=92=AE=E4=BD=8D=E7=BD=AE=20fix=20?=
 =?UTF-8?q?#23?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/@core/components/DialogCloseBtn.vue |  2 +-
 src/components/cards/SiteCard.vue       | 21 +++++++++++----------
 src/views/site/SiteCardListView.vue     |  1 +
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/@core/components/DialogCloseBtn.vue b/src/@core/components/DialogCloseBtn.vue
index 70dad1dc..1bd12764 100644
--- a/src/@core/components/DialogCloseBtn.vue
+++ b/src/@core/components/DialogCloseBtn.vue
@@ -11,7 +11,7 @@ function onClick() {
 <template>
   <IconBtn
     class="absolute right-3 top-3"
-    @click="onClick"
+    @click.stop="onClick"
   >
     <VIcon icon="mdi-close" />
   </IconBtn>
diff --git a/src/components/cards/SiteCard.vue b/src/components/cards/SiteCard.vue
index 096da309..48d85078 100644
--- a/src/components/cards/SiteCard.vue
+++ b/src/components/cards/SiteCard.vue
@@ -14,6 +14,9 @@ const cardProps = defineProps({
   height: String,
 })
 
+// 定义触发的自定义事件
+const emit = defineEmits(['remove'])
+
 // 密码输入
 const isPasswordVisible = ref(false)
 
@@ -180,11 +183,13 @@ async function updateSiteCookie() {
 // 调用API删除站点信息
 async function deleteSiteInfo() {
   try {
+    siteInfoDialog.value = false
     const result: { [key: string]: any } = await api.delete(`site/${cardProps.site?.id}`)
-    if (result.success)
+    if (result.success) {
       $toast.success(`${cardProps.site?.name} 删除成功！`)
-    else
-      $toast.error(`${cardProps.site?.name} 删除失败：${result.message}`)
+      emit('remove')
+    }
+    else { $toast.error(`${cardProps.site?.name} 删除失败：${result.message}`) }
   }
   catch (error) {
     $toast.error(`${cardProps.site?.name} 删除失败！`)
@@ -349,11 +354,6 @@ onMounted(() => {
         </template>
         浏览
       </VBtn>
-      <VBtn @click.stop="deleteSiteInfo">
-        <template #prepend>
-          <VIcon icon="mdi-trash-can-outline" color="error" />
-        </template>
-      </VBtn>
     </VCardActions>
   </VCard>
   <!-- 更新站点Cookie & UA弹窗 -->
@@ -414,6 +414,7 @@ onMounted(() => {
     <!-- Dialog Content -->
     <VCard :title="`编辑站点 - ${cardProps.site?.name}`">
       <VCardText class="pt-2">
+        <DialogCloseBtn @click="siteInfoDialog = false" />
         <VForm @submit.prevent="() => {}">
           <VRow>
             <VCol
@@ -518,8 +519,8 @@ onMounted(() => {
       </VCardText>
 
       <VCardActions>
-        <VBtn @click="siteInfoDialog = false">
-          取消
+        <VBtn color="error" @click="deleteSiteInfo">
+          删除
         </VBtn>
         <VSpacer />
         <VBtn @click="updateSiteInfo">
diff --git a/src/views/site/SiteCardListView.vue b/src/views/site/SiteCardListView.vue
index c1fe96d9..6e5c3e58 100644
--- a/src/views/site/SiteCardListView.vue
+++ b/src/views/site/SiteCardListView.vue
@@ -45,6 +45,7 @@ onBeforeMount(fetchData)
       v-for="data in dataList"
       :key="data.id"
       :site="data"
+      @remove="fetchData"
     />
   </div>
   <NoDataFound