From 911b52e938adc92c0c69975478578597c17c9a13 Mon Sep 17 00:00:00 2001
From: dap <15891557205@163.com>
Date: Thu, 19 Dec 2024 08:19:34 +0800
Subject: [PATCH 1/5] =?UTF-8?q?chore:=20=E9=BB=98=E8=AE=A4=E5=85=A8?=
 =?UTF-8?q?=E9=83=A8=E5=B1=95=E5=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../workflow/processDefinition/process-definition-modal.vue     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/web-antd/src/views/workflow/processDefinition/process-definition-modal.vue b/apps/web-antd/src/views/workflow/processDefinition/process-definition-modal.vue
index 22b6061a..9c4d7bc7 100644
--- a/apps/web-antd/src/views/workflow/processDefinition/process-definition-modal.vue
+++ b/apps/web-antd/src/views/workflow/processDefinition/process-definition-modal.vue
@@ -54,7 +54,7 @@ async function setupCategorySelect() {
         treeData: tree,
         treeDefaultExpandAll: true,
         // 默认展开的树节点
-        treeDefaultExpandedKeys: [0],
+        // treeDefaultExpandedKeys: [0],
         treeLine: { showLeafIcon: false },
         // 筛选的字段
         treeNodeFilterProp: 'label',

From 02e0927a9cb97c3e37874e65f467a84f066f25b3 Mon Sep 17 00:00:00 2001
From: dap <15891557205@163.com>
Date: Thu, 19 Dec 2024 08:22:14 +0800
Subject: [PATCH 2/5] =?UTF-8?q?chore:=20=E4=BF=AE=E6=94=B9=E6=96=87?=
 =?UTF-8?q?=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/web-antd/src/views/workflow/components/approval-card.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/web-antd/src/views/workflow/components/approval-card.vue b/apps/web-antd/src/views/workflow/components/approval-card.vue
index 17f6915d..06dbfa74 100644
--- a/apps/web-antd/src/views/workflow/components/approval-card.vue
+++ b/apps/web-antd/src/views/workflow/components/approval-card.vue
@@ -43,7 +43,7 @@ function handleClick() {
           :is="renderDict(info.flowStatus, DictEnum.WF_BUSINESS_STATUS)"
         />
       </template>
-      <DescriptionsItem label="当前节点名称">
+      <DescriptionsItem label="当前任务名称">
         <div class="font-bold">{{ info.nodeName }}</div>
       </DescriptionsItem>
       <DescriptionsItem label="开始时间">

From 6946471d96933aaae2bcdab3b43671fc36155a13 Mon Sep 17 00:00:00 2001
From: dap <15891557205@163.com>
Date: Thu, 19 Dec 2024 08:33:53 +0800
Subject: [PATCH 3/5] =?UTF-8?q?chore:=20enter=E6=8F=90=E4=BA=A4=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web-antd/src/views/workflow/task/taskWaiting.vue | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/apps/web-antd/src/views/workflow/task/taskWaiting.vue b/apps/web-antd/src/views/workflow/task/taskWaiting.vue
index aea9c39b..71c969db 100644
--- a/apps/web-antd/src/views/workflow/task/taskWaiting.vue
+++ b/apps/web-antd/src/views/workflow/task/taskWaiting.vue
@@ -157,21 +157,25 @@ const { refreshTab } = useTabs();
             </a-button>
             <Popover placement="rightTop" title="搜索" trigger="click">
               <template #content>
-                <Form>
-                  <FormItem label="任务名称">
+                <Form
+                  :model="formData"
+                  autocomplete="off"
+                  @finish="() => reload(false)"
+                >
+                  <FormItem :colon="false" label="任务名称">
                     <Input
                       v-model:value="formData.nodeName"
                       placeholder="请输入"
                     />
                   </FormItem>
-                  <FormItem label="流程编码">
+                  <FormItem :colon="false" label="流程编码">
                     <Input
                       v-model:value="formData.flowCode"
                       placeholder="请输入"
                     />
                   </FormItem>
                   <FormItem>
-                    <a-button type="primary" @click="reload(false)">
+                    <a-button html-type="submit" type="primary">
                       搜索
                     </a-button>
                     <a-button class="ml-2" @click="reload(true)">重置</a-button>

From 2b19cea0d8764f855b37128efca673ce0523cab2 Mon Sep 17 00:00:00 2001
From: dap <15891557205@163.com>
Date: Thu, 19 Dec 2024 11:16:07 +0800
Subject: [PATCH 4/5] =?UTF-8?q?chore:=20=E6=90=9C=E7=B4=A2=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95=E5=B8=83=E5=B1=80+=E7=94=B3=E8=AF=B7=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../workflow/components/copy-component.vue    |  7 ++-
 .../src/views/workflow/task/taskWaiting.vue   | 49 ++++++++++++++++---
 2 files changed, 46 insertions(+), 10 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 edfa273a..6f199f47 100644
--- a/apps/web-antd/src/views/workflow/components/copy-component.vue
+++ b/apps/web-antd/src/views/workflow/components/copy-component.vue
@@ -1,6 +1,6 @@
 <!--抄送组件-->
 <script setup lang="ts">
-import type { User } from '#/api/core/user';
+import type { User } from '#/api/system/user/model';
 
 import type { PropType } from 'vue';
 
@@ -15,6 +15,8 @@ defineOptions({
   inheritAttrs: false,
 });
 
+const emit = defineEmits<{ finish: [User[]] }>();
+
 const [UserSelectModal, modalApi] = useVbenModal({
   connectedComponent: userSelectModal,
 });
@@ -33,12 +35,13 @@ function handleFinish(userList: User[]) {
   // 清空 直接赋值[]会丢失响应性
   userListModel.value.splice(0, userListModel.value.length);
   userListModel.value.push(...userList);
+  emit('finish', userList);
 }
 </script>
 
 <template>
   <div class="flex items-center gap-2">
-    <AvatarGroup v-if="userListModel.length > 0">
+    <AvatarGroup v-if="userListModel.length > 0" class="flex-wrap">
       <Tooltip
         v-for="user in userListModel"
         :key="user.userId"
diff --git a/apps/web-antd/src/views/workflow/task/taskWaiting.vue b/apps/web-antd/src/views/workflow/task/taskWaiting.vue
index 71c969db..59dd8e3d 100644
--- a/apps/web-antd/src/views/workflow/task/taskWaiting.vue
+++ b/apps/web-antd/src/views/workflow/task/taskWaiting.vue
@@ -1,5 +1,6 @@
 <!-- eslint-disable no-use-before-define -->
 <script setup lang="ts">
+import type { User } from '#/api/system/user/model';
 import type { FlowInfoResponse } from '#/api/workflow/instance/model';
 import type { TaskInfo } from '#/api/workflow/task/model';
 
@@ -7,6 +8,7 @@ import { computed, onMounted, ref, useTemplateRef } from 'vue';
 
 import { Page } from '@vben/common-ui';
 import { useTabs } from '@vben/hooks';
+import { getPopupContainer } from '@vben/utils';
 
 import { FilterOutlined, RedoOutlined } from '@ant-design/icons-vue';
 import {
@@ -23,7 +25,7 @@ import { cloneDeep, debounce } from 'lodash-es';
 import { flowInfo } from '#/api/workflow/instance';
 import { pageByTaskWait } from '#/api/workflow/task';
 
-import { ApprovalCard, ApprovalPanel } from '../components';
+import { ApprovalCard, ApprovalPanel, CopyComponent } from '../components';
 
 const emptyImage = Empty.PRESENTED_IMAGE_SIMPLE;
 
@@ -36,6 +38,7 @@ const defaultFormData = {
   flowName: '', // 流程定义名称
   nodeName: '', // 任务名称
   flowCode: '', // 流程定义编码
+  createByIds: [] as string[], // 创建人
 };
 const formData = ref(cloneDeep(defaultFormData));
 
@@ -63,6 +66,7 @@ async function reload(resetFields: boolean = false) {
 
   if (resetFields) {
     formData.value = cloneDeep(defaultFormData);
+    selectedUserList.value = [];
   }
 
   loading.value = true;
@@ -134,6 +138,15 @@ async function handleCardClick(item: TaskInfo) {
 }
 
 const { refreshTab } = useTabs();
+
+// 由于失去焦点浮层会消失 使用v-model选择人员完毕后强制显示
+const popoverOpen = ref(false);
+const selectedUserList = ref<User[]>([]);
+function handleFinish(userList: User[]) {
+  popoverOpen.value = true;
+  selectedUserList.value = userList;
+  formData.value.createByIds = userList.map((item) => item.userId);
+}
 </script>
 
 <template>
@@ -155,30 +168,50 @@ const { refreshTab } = useTabs();
             <a-button @click="reload(true)">
               <RedoOutlined />
             </a-button>
-            <Popover placement="rightTop" title="搜索" trigger="click">
+            <Popover
+              v-model:open="popoverOpen"
+              :get-popup-container="getPopupContainer"
+              placement="rightTop"
+              title="搜索"
+              trigger="click"
+            >
               <template #content>
                 <Form
+                  :colon="false"
+                  :label-col="{ span: 6 }"
                   :model="formData"
                   autocomplete="off"
+                  class="w-[270px]"
+                  layout="vertical"
                   @finish="() => reload(false)"
                 >
-                  <FormItem :colon="false" label="任务名称">
+                  <FormItem label="申请人">
+                    <CopyComponent
+                      v-model:user-list="selectedUserList"
+                      @finish="handleFinish"
+                    />
+                  </FormItem>
+                  <FormItem label="任务名称">
                     <Input
                       v-model:value="formData.nodeName"
                       placeholder="请输入"
                     />
                   </FormItem>
-                  <FormItem :colon="false" label="流程编码">
+                  <FormItem label="流程编码">
                     <Input
                       v-model:value="formData.flowCode"
                       placeholder="请输入"
                     />
                   </FormItem>
                   <FormItem>
-                    <a-button html-type="submit" type="primary">
-                      搜索
-                    </a-button>
-                    <a-button class="ml-2" @click="reload(true)">重置</a-button>
+                    <div class="flex">
+                      <a-button block html-type="submit" type="primary">
+                        搜索
+                      </a-button>
+                      <a-button block class="ml-2" @click="reload(true)">
+                        重置
+                      </a-button>
+                    </div>
                   </FormItem>
                 </Form>
               </template>

From b1a6c0f8805cf64689cea0ff589330587e7deb1e Mon Sep 17 00:00:00 2001
From: dap <15891557205@163.com>
Date: Thu, 19 Dec 2024 11:51:00 +0800
Subject: [PATCH 5/5] =?UTF-8?q?chore:=20=E6=B2=A1=E6=9C=89=E6=9B=B4?=
 =?UTF-8?q?=E5=A4=9A=E6=95=B0=E6=8D=AE=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/web-antd/src/views/workflow/task/taskWaiting.vue | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/apps/web-antd/src/views/workflow/task/taskWaiting.vue b/apps/web-antd/src/views/workflow/task/taskWaiting.vue
index 59dd8e3d..503c7a12 100644
--- a/apps/web-antd/src/views/workflow/task/taskWaiting.vue
+++ b/apps/web-antd/src/views/workflow/task/taskWaiting.vue
@@ -236,6 +236,12 @@ function handleFinish(userList: User[]) {
             />
           </template>
           <Empty v-else :image="emptyImage" />
+          <div
+            v-if="isLoadComplete"
+            class="flex items-center justify-center text-[14px] opacity-50"
+          >
+            没有更多数据了
+          </div>
           <!-- 遮罩loading层 -->
           <div
             v-if="loading"