From 6ec8f4ced9b340e14266956a387b1ebef172eaac Mon Sep 17 00:00:00 2001
From: dap <15891557205@163.com>
Date: Thu, 19 Dec 2024 15:17:20 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=E5=BC=B9=E7=AA=97=E5=85=B3=E9=97=AD?=
 =?UTF-8?q?=E5=90=8E=E4=BB=8D=E7=84=B6=E6=98=BE=E7=A4=BA=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E6=B5=AE=E5=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/workflow/components/copy-component.vue      | 4 ++--
 .../src/views/workflow/components/user-select-modal.vue   | 8 ++++++++
 apps/web-antd/src/views/workflow/task/taskWaiting.vue     | 2 ++
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/apps/web-antd/src/views/workflow/components/copy-component.vue b/apps/web-antd/src/views/workflow/components/copy-component.vue
index 0f4048d9..6b95687a 100644
--- a/apps/web-antd/src/views/workflow/components/copy-component.vue
+++ b/apps/web-antd/src/views/workflow/components/copy-component.vue
@@ -22,7 +22,7 @@ const props = withDefaults(defineProps<{ ellipseNumber?: number }>(), {
   ellipseNumber: 3,
 });
 
-const emit = defineEmits<{ finish: [User[]] }>();
+const emit = defineEmits<{ cancel: []; finish: [User[]] }>();
 
 const [UserSelectModal, modalApi] = useVbenModal({
   connectedComponent: userSelectModal,
@@ -80,6 +80,6 @@ const displayedList = computed(() => {
       </Tooltip>
     </AvatarGroup>
     <a-button size="small" @click="handleOpen">选择人员</a-button>
-    <UserSelectModal @finish="handleFinish" />
+    <UserSelectModal @cancel="$emit('cancel')" @finish="handleFinish" />
   </div>
 </template>
diff --git a/apps/web-antd/src/views/workflow/components/user-select-modal.vue b/apps/web-antd/src/views/workflow/components/user-select-modal.vue
index f4be1015..957edf3f 100644
--- a/apps/web-antd/src/views/workflow/components/user-select-modal.vue
+++ b/apps/web-antd/src/views/workflow/components/user-select-modal.vue
@@ -20,6 +20,13 @@ const props = withDefaults(defineProps<{ mode?: 'multiple' | 'single' }>(), {
 });
 
 const emit = defineEmits<{
+  /**
+   * 取消的事件
+   */
+  cancel: [];
+  /**
+   * 选择完成的事件
+   */
   finish: [User[]];
 }>();
 
@@ -27,6 +34,7 @@ const [BasicModal, modalApi] = useVbenModal({
   title: '选择人员',
   class: 'w-[1050px]',
   fullscreenButton: false,
+  onClosed: () => emit('cancel'),
   onConfirm: handleSubmit,
   async onOpened() {
     const { userList = [] } = modalApi.getData() as { userList: User[] };
diff --git a/apps/web-antd/src/views/workflow/task/taskWaiting.vue b/apps/web-antd/src/views/workflow/task/taskWaiting.vue
index 7302e328..fe55da58 100644
--- a/apps/web-antd/src/views/workflow/task/taskWaiting.vue
+++ b/apps/web-antd/src/views/workflow/task/taskWaiting.vue
@@ -187,8 +187,10 @@ function handleFinish(userList: User[]) {
                   @finish="() => reload(false)"
                 >
                   <FormItem label="申请人">
+                    <!-- 弹窗关闭后仍然显示表单浮层 -->
                     <CopyComponent
                       v-model:user-list="selectedUserList"
+                      @cancel="() => (popoverOpen = true)"
                       @finish="handleFinish"
                     />
                   </FormItem>