fix: [bpm] 审批人自选时下一个节点审批人显示问题

pull/368/head
jason 2026-06-20 10:26:27 +08:00
parent d78476ed84
commit 71627271d0
6 changed files with 15 additions and 6 deletions

View File

@ -855,9 +855,10 @@ defineExpose({ loadTodoTask });
name="nextAssignees" name="nextAssignees"
v-if="nextAssigneesActivityNode.length > 0" v-if="nextAssigneesActivityNode.length > 0"
> >
<div class="-mb-8 -mt-3.5 ml-2.5"> <div class="ml-2.5 mt-2.5">
<ProcessInstanceTimeline <ProcessInstanceTimeline
ref="nextAssigneesTimelineRef" ref="nextAssigneesTimelineRef"
embedded
:activity-nodes="nextAssigneesActivityNode" :activity-nodes="nextAssigneesActivityNode"
:show-status-icon="false" :show-status-icon="false"
:enable-approve-user-select="true" :enable-approve-user-select="true"

View File

@ -23,12 +23,14 @@ defineOptions({ name: 'BpmProcessInstanceTimeline' });
const props = withDefaults( const props = withDefaults(
defineProps<{ defineProps<{
activityNodes: BpmProcessInstanceApi.ApprovalNodeInfo[]; // activityNodes: BpmProcessInstanceApi.ApprovalNodeInfo[]; //
embedded?: boolean; // 使 label
enableApproveUserSelect?: boolean; // enableApproveUserSelect?: boolean; //
showStatusIcon?: boolean; // showStatusIcon?: boolean; //
}>(), }>(),
{ {
showStatusIcon: true, // true showStatusIcon: true, // true
enableApproveUserSelect: false, // false enableApproveUserSelect: false, // false
embedded: false, // false
}, },
); );
@ -240,7 +242,7 @@ defineExpose({ setCustomApproveUsers, batchSetCustomApproveUsers });
<template> <template>
<div> <div>
<Timeline class="pt-5"> <Timeline :class="embedded ? 'pt-2' : 'pt-5'">
<!-- 遍历每个审批节点 --> <!-- 遍历每个审批节点 -->
<Timeline.Item <Timeline.Item
v-for="(activity, index) in activityNodes" v-for="(activity, index) in activityNodes"

View File

@ -858,9 +858,10 @@ defineExpose({ loadTodoTask });
name="nextAssignees" name="nextAssignees"
v-if="nextAssigneesActivityNode.length > 0" v-if="nextAssigneesActivityNode.length > 0"
> >
<div class="-mb-8 -mt-3.5 ml-2.5"> <div class="ml-2.5">
<ProcessInstanceTimeline <ProcessInstanceTimeline
ref="nextAssigneesTimelineRef" ref="nextAssigneesTimelineRef"
embedded
:activity-nodes="nextAssigneesActivityNode" :activity-nodes="nextAssigneesActivityNode"
:show-status-icon="false" :show-status-icon="false"
:enable-approve-user-select="true" :enable-approve-user-select="true"

View File

@ -30,12 +30,14 @@ defineOptions({ name: 'BpmProcessInstanceTimeline' });
const props = withDefaults( const props = withDefaults(
defineProps<{ defineProps<{
activityNodes: BpmProcessInstanceApi.ApprovalNodeInfo[]; // activityNodes: BpmProcessInstanceApi.ApprovalNodeInfo[]; //
embedded?: boolean; // 使 label
enableApproveUserSelect?: boolean; // enableApproveUserSelect?: boolean; //
showStatusIcon?: boolean; // showStatusIcon?: boolean; //
}>(), }>(),
{ {
showStatusIcon: true, // true showStatusIcon: true, // true
enableApproveUserSelect: false, // false enableApproveUserSelect: false, // false
embedded: false, // false
}, },
); );
@ -247,7 +249,7 @@ defineExpose({ setCustomApproveUsers, batchSetCustomApproveUsers });
<template> <template>
<div> <div>
<Timeline class="pt-5"> <Timeline :class="embedded ? 'pt-2' : 'pt-5'">
<!-- 遍历每个审批节点 --> <!-- 遍历每个审批节点 -->
<TimelineItem <TimelineItem
v-for="(activity, index) in activityNodes" v-for="(activity, index) in activityNodes"

View File

@ -861,9 +861,10 @@ defineExpose({ loadTodoTask });
prop="nextAssignees" prop="nextAssignees"
v-if="nextAssigneesActivityNode.length > 0" v-if="nextAssigneesActivityNode.length > 0"
> >
<div class="-mb-8 -mt-3.5 ml-2.5"> <div>
<ProcessInstanceTimeline <ProcessInstanceTimeline
ref="nextAssigneesTimelineRef" ref="nextAssigneesTimelineRef"
embedded
:activity-nodes="nextAssigneesActivityNode" :activity-nodes="nextAssigneesActivityNode"
:show-status-icon="false" :show-status-icon="false"
:enable-approve-user-select="true" :enable-approve-user-select="true"

View File

@ -30,12 +30,14 @@ defineOptions({ name: 'BpmProcessInstanceTimeline' });
const props = withDefaults( const props = withDefaults(
defineProps<{ defineProps<{
activityNodes: BpmProcessInstanceApi.ApprovalNodeInfo[]; // activityNodes: BpmProcessInstanceApi.ApprovalNodeInfo[]; //
embedded?: boolean; // 使 label
enableApproveUserSelect?: boolean; // enableApproveUserSelect?: boolean; //
showStatusIcon?: boolean; // showStatusIcon?: boolean; //
}>(), }>(),
{ {
showStatusIcon: true, // true showStatusIcon: true, // true
enableApproveUserSelect: false, // false enableApproveUserSelect: false, // false
embedded: false, // false
}, },
); );
@ -247,7 +249,7 @@ defineExpose({ setCustomApproveUsers, batchSetCustomApproveUsers });
<template> <template>
<div> <div>
<ElTimeline class="pt-5"> <ElTimeline :class="embedded ? 'pt-2' : 'pt-5'">
<!-- 遍历每个审批节点 --> <!-- 遍历每个审批节点 -->
<ElTimelineItem <ElTimelineItem
v-for="(activity, index) in activityNodes" v-for="(activity, index) in activityNodes"