!363 Merge remote-tracking branch 'yudao/master'

Merge pull request !363 from Jason/master

apps/web-antd/src/views/bpm/processInstance/detail/modules/time-line.vue

@@ -273,10 +273,7 @@ defineExpose({ setCustomApproveUsers, batchSetCustomApproveUsers });
           </div>
         </template>
 
-        <div
+        <div class="ml-2 flex flex-col items-start gap-2">
-          class="ml-2 flex flex-col items-start gap-2"
-          :id="`activity-task-${activity.id}-${index}`"
-        >
           <!-- 第一行：节点名称、时间 -->
           <div class="flex w-full">
             <div class="font-bold">
@@ -350,12 +347,12 @@ defineExpose({ setCustomApproveUsers, batchSetCustomApproveUsers });
             </div>
           </div>
 
-          <div v-else class="mt-1 flex flex-wrap items-center gap-2">
+          <div v-else class="mt-1 flex w-full flex-wrap items-center gap-2">
             <!-- 情况一：遍历每个审批节点下的【进行中】task 任务 -->
             <div
               v-for="(task, idx) in activity.tasks"
               :key="idx"
-              class="flex flex-col gap-2 pr-2"
+              class="flex w-full flex-col gap-2 pr-2"
             >
               <div
                 class="relative flex flex-wrap gap-2"
@@ -416,11 +413,10 @@ defineExpose({ setCustomApproveUsers, batchSetCustomApproveUsers });
               </div>
 
               <!-- 审批意见,附件和签名 -->
-              <teleport defer :to="`#activity-task-${activity.id}-${index}`">
+              <div
-                <div
+                v-if="shouldShowReasonAndAttachment(task, activity.nodeType)"
-                  v-if="shouldShowReasonAndAttachment(task, activity.nodeType)"
+                class="mt-1 w-full rounded-md bg-gray-100 p-2 text-sm text-gray-500"
-                  class="mt-1 w-full rounded-md bg-gray-100 p-2 text-sm text-gray-500"
+              >
-                >
                   <div v-if="task.reason">审批意见：{{ task.reason }}</div>
                   <div
                     v-if="(task.attachments?.length || 0) > 0"
@@ -486,7 +482,6 @@ defineExpose({ setCustomApproveUsers, batchSetCustomApproveUsers });
                     :preview="{ src: task.signPicUrl }"
                   />
                 </div>
-              </teleport>
             </div>
 
             <!-- 情况二：遍历每个审批节点下的【候选的】task 任务 -->

apps/web-antdv-next/src/views/bpm/processInstance/detail/modules/time-line.vue

@@ -271,10 +271,7 @@ defineExpose({ setCustomApproveUsers, batchSetCustomApproveUsers });
           </div>
         </template>
 
-        <div
+        <div class="ml-2 flex flex-col items-start gap-2">
-          class="ml-2 flex flex-col items-start gap-2"
-          :id="`activity-task-${activity.id}-${index}`"
-        >
           <!-- 第一行：节点名称、时间 -->
           <div class="flex w-full">
             <div class="font-bold">
@@ -348,12 +345,12 @@ defineExpose({ setCustomApproveUsers, batchSetCustomApproveUsers });
             </div>
           </div>
 
-          <div v-else class="mt-1 flex flex-wrap items-center gap-2">
+          <div v-else class="mt-1 flex w-full flex-wrap items-center gap-2">
             <!-- 情况一：遍历每个审批节点下的【进行中】task 任务 -->
             <div
               v-for="(task, idx) in activity.tasks"
               :key="idx"
-              class="flex flex-col gap-2 pr-2"
+              class="flex w-full flex-col gap-2 pr-2"
             >
               <div
                 class="relative flex flex-wrap gap-2"
@@ -414,11 +411,10 @@ defineExpose({ setCustomApproveUsers, batchSetCustomApproveUsers });
               </div>
 
               <!-- 审批意见和签名 -->
-              <teleport defer :to="`#activity-task-${activity.id}-${index}`">
+              <div
-                <div
+                v-if="shouldShowApprovalReason(task, activity.nodeType)"
-                  v-if="shouldShowApprovalReason(task, activity.nodeType)"
+                class="mt-1 w-full rounded-md bg-gray-100 p-2 text-sm text-gray-500"
-                  class="mt-1 w-full rounded-md bg-gray-100 p-2 text-sm text-gray-500"
+              >
-                >
                   审批意见：{{ task.reason }}
                 </div>
                 <div
@@ -437,7 +433,6 @@ defineExpose({ setCustomApproveUsers, batchSetCustomApproveUsers });
                     :preview="{ src: task.signPicUrl }"
                   />
                 </div>
-              </teleport>
             </div>
 
             <!-- 情况二：遍历每个审批节点下的【候选的】task 任务 -->

apps/web-ele/src/views/bpm/processInstance/detail/modules/time-line.vue

@@ -280,10 +280,7 @@ defineExpose({ setCustomApproveUsers, batchSetCustomApproveUsers });
           </div>
         </template>
 
-        <div
+        <div class="ml-2 flex flex-col items-start gap-2">
-          class="ml-2 flex flex-col items-start gap-2"
-          :id="`activity-task-${activity.id}-${index}`"
-        >
           <!-- 第一行：节点名称、时间 -->
           <div class="flex w-full items-center">
             <div class="font-bold">
@@ -355,12 +352,12 @@ defineExpose({ setCustomApproveUsers, batchSetCustomApproveUsers });
             </div>
           </div>
 
-          <div v-else class="mt-1 flex flex-wrap items-center gap-2">
+          <div v-else class="mt-1 flex w-full flex-wrap items-center gap-2">
             <!-- 情况一：遍历每个审批节点下的【进行中】task 任务 -->
             <div
               v-for="(task, idx) in activity.tasks"
               :key="idx"
-              class="flex flex-col gap-2 pr-2"
+              class="flex w-full flex-col gap-2 pr-2"
             >
               <div
                 class="relative flex flex-wrap gap-2"
@@ -421,11 +418,10 @@ defineExpose({ setCustomApproveUsers, batchSetCustomApproveUsers });
               </div>
 
               <!-- 审批意见,附件和签名 -->
-              <teleport defer :to="`#activity-task-${activity.id}-${index}`">
+              <div
-                <div
+                v-if="shouldShowReasonAndAttachment(task, activity.nodeType)"
-                  v-if="shouldShowReasonAndAttachment(task, activity.nodeType)"
+                class="mt-1 w-full rounded-md bg-gray-100 p-2 text-sm text-gray-500"
-                  class="mt-1 w-full rounded-md bg-gray-100 p-2 text-sm text-gray-500"
+              >
-                >
                   <div v-if="task.reason">审批意见：{{ task.reason }}</div>
                   <div
                     v-if="(task.attachments?.length || 0) > 0"
@@ -489,7 +485,6 @@ defineExpose({ setCustomApproveUsers, batchSetCustomApproveUsers });
                     :preview-src-list="[task.signPicUrl]"
                   />
                 </div>
-              </teleport>
             </div>
 
             <!-- 情况二：遍历每个审批节点下的【候选的】task 任务 -->