diff --git a/src/components/workflow/modules/drawer/workflow-drawer.vue b/src/components/workflow/modules/drawer/workflow-drawer.vue index 68e2e5e..44dc5e7 100644 --- a/src/components/workflow/modules/drawer/workflow-drawer.vue +++ b/src/components/workflow/modules/drawer/workflow-drawer.vue @@ -125,6 +125,7 @@ const jobTaskChange = (_: string, option: { label: string; value: number }) => { value: item.id }; }) + .filter(item => item.value != store.id) " @update:value="jobTaskChange" /> diff --git a/src/components/workflow/modules/nodes/branch-node.vue b/src/components/workflow/modules/nodes/branch-node.vue index c6a5cb9..6420c66 100644 --- a/src/components/workflow/modules/nodes/branch-node.vue +++ b/src/components/workflow/modules/nodes/branch-node.vue @@ -97,7 +97,7 @@ const toText = (node: Workflow.NodeModelType, currentIndex: number) => { if (nodeName !== $t('workflow.node.condition.conditionNodes.otherNodeName')) { const text = `${$t('workflow.node.condition.conditionNodes.expressionType')}: ${ expressionRecord[expressionType!] - }\n${$t('workflow.node.condition.conditionNodes.nodeExpression')}: ${nodeExpression}`; + }`; return text; } return $t('workflow.node.condition.conditionNodes.otherNodeTip'); @@ -286,7 +286,7 @@ const getClass = (item: Workflow.ConditionNodeType) => { .auto-judge { white-space: pre; - min-height: 132px !important; + min-height: 79px !important; } .top-tips { diff --git a/src/components/workflow/modules/nodes/callback-node.vue b/src/components/workflow/modules/nodes/callback-node.vue index 77ca391..2ac4111 100644 --- a/src/components/workflow/modules/nodes/callback-node.vue +++ b/src/components/workflow/modules/nodes/callback-node.vue @@ -166,16 +166,16 @@ const getClass = (item: Workflow.ConditionNodeType) => { diff --git a/src/components/workflow/modules/nodes/start-node.vue b/src/components/workflow/modules/nodes/start-node.vue index 3c755a9..6d19c2d 100644 --- a/src/components/workflow/modules/nodes/start-node.vue +++ b/src/components/workflow/modules/nodes/start-node.vue @@ -98,11 +98,11 @@ const show = () => { {{ nodeData.groupName }} -
- - {{ $t(blockStrategyRecord[nodeData.blockStrategy!]) }} -
-
.........
+ + + + +
请配置工作流 diff --git a/src/components/workflow/modules/nodes/task-node.vue b/src/components/workflow/modules/nodes/task-node.vue index 8a39546..ebf2d09 100644 --- a/src/components/workflow/modules/nodes/task-node.vue +++ b/src/components/workflow/modules/nodes/task-node.vue @@ -228,16 +228,16 @@ const isShow = (taskBatchStatus: number) => {
请选择任务
{
请选择工作流
{
-
- - - -
- + + + + + + + + + + + + + + + + + + + + +