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(() => { 选择人员 - + 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)" > +