From 8238d4258ef20093112d0e713ffeab44962cc600 Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Sun, 31 Mar 2024 13:33:16 +0800
Subject: [PATCH] =?UTF-8?q?fix:=202857=20=E3=80=90=E5=9B=BE=E5=AE=A1?=
 =?UTF-8?q?=E5=AE=A1=E6=89=B9=E7=AE=A1=E7=90=86--=E8=A7=A3=E6=95=A3?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=8C=85=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components.d.ts                             |  1 +
 src/views/worksheet/aside/ListItem.vue      | 18 +++++++++++-------
 src/views/worksheet/aside/WorkSheetList.vue |  7 +++++--
 src/views/worksheet/content/Content.vue     |  1 +
 4 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/components.d.ts b/components.d.ts
index e07d992..d6fb45b 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -34,6 +34,7 @@ declare module 'vue' {
     NModal: typeof import('naive-ui')['NModal']
     NNotificationProvider: typeof import('naive-ui')['NNotificationProvider']
     NotPassed: typeof import('./src/components/NotPassed.vue')['default']
+    NPopconfirm: typeof import('naive-ui')['NPopconfirm']
     NPopover: typeof import('naive-ui')['NPopover']
     NPopselect: typeof import('naive-ui')['NPopselect']
     NProgress: typeof import('naive-ui')['NProgress']
diff --git a/src/views/worksheet/aside/ListItem.vue b/src/views/worksheet/aside/ListItem.vue
index cb9350c..acb324e 100644
--- a/src/views/worksheet/aside/ListItem.vue
+++ b/src/views/worksheet/aside/ListItem.vue
@@ -28,15 +28,16 @@ const props = defineProps({
     default: () => [],
   },
 });
-const isDismissTask = ref(false)
 const svgName = computed(() => {
   return props.selected ? "taskpack-select" : "taskpack";
 });
 
+const popconfirmTarget: any = ref(null)
+const popconfirmRef: any = ref(null)
 
 function handleDismissTask() {
-  isDismissTask.value = true
   emit('dismisClick',  props.mouseOverTask.id)
+  popconfirmRef.value[0]?.setShow(false); // 关闭 popconfirm
 }
 
 onMounted(async () => {
@@ -44,7 +45,7 @@ onMounted(async () => {
 </script>
 
 <template>
-  <div class="list-item" :class="{ 'list-item-selected': selected }">
+  <div class="list-item" :class="{ 'list-item-selected': selected }" ref="popconfirmTarget">
     <div v-for="(item, index) in showFieldList" :key="index">
       <div v-if="item.id === 'name'" class="list-item-header">
         <div class="id-wrap">
@@ -54,12 +55,15 @@ onMounted(async () => {
               {{ listItem.name }}
             </n-ellipsis>
             <span class="list-item-header-selected">({{ listItem.pictureCount }})</span>
-            <n-popover placement="bottom" trigger="hover" >
+            <n-popconfirm id="taskPopconfirmRef" ref="popconfirmRef" :show-icon="false" :show-arrow="false"
+              placement="bottom" trigger="click">
               <template #trigger>
-                <span class="dismiss-task-pack"  v-show="mouseOverTask?.id" style="cursor: pointer;" @click.stop="handleDismissTask">...</span>
+                <span class="dismiss-task-pack" v-show="mouseOverTask?.id" style="cursor: pointer;">...</span>
               </template>
-              <span>解散任务包</span>
-            </n-popover>
+              <template #action>
+                <span @click="handleDismissTask" style="cursor: pointer;">解散任务包</span>
+              </template>
+            </n-popconfirm>
           </span>
         </div>
       </div>
diff --git a/src/views/worksheet/aside/WorkSheetList.vue b/src/views/worksheet/aside/WorkSheetList.vue
index 4292eb4..f797a21 100644
--- a/src/views/worksheet/aside/WorkSheetList.vue
+++ b/src/views/worksheet/aside/WorkSheetList.vue
@@ -126,14 +126,17 @@ async function search(word: string) {
 function overTaskHandelr(item: any) {
   overTask.value = item
 }
-function leaveTaskHandler() {
-  overTask.value = null;
+function leaveTaskHandler(event) {
+  if(event?.relatedTarget?.id !=="taskPopconfirmRef"){
+    overTask.value = null;
+  }
 }
 const message = useMessage()
 function dismisClick(packageId:string) {
   deletePackage({packageId: packageId}).then((res) => {
     if(res.code==="OK"){
       message.success("解散任务包成功")
+      reset()
       loadMore()
     }
   })
diff --git a/src/views/worksheet/content/Content.vue b/src/views/worksheet/content/Content.vue
index 678d613..1f614c0 100644
--- a/src/views/worksheet/content/Content.vue
+++ b/src/views/worksheet/content/Content.vue
@@ -194,6 +194,7 @@ watch(
     if (isEmpty(packageid)) {
       listData.value.length = 0;
       totalCount.value = 0;
+      taskDetailInfo.value = {}
       return;
     }
     queryDetail(packageid)