Skip to content

Commit c000ee4

Browse files
feat: Add workflow condition style
1 parent c98874e commit c000ee4

File tree

2 files changed

+26
-1
lines changed

2 files changed

+26
-1
lines changed

ui/src/styles/app.scss

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,9 @@ h5 {
211211
.p-8-12 {
212212
padding: calc(var(--app-base-px)) calc(var(--app-base-px) + 4px);
213213
}
214+
.p-12-16 {
215+
padding: calc(var(--app-base-px) + 4px) calc(var(--app-base-px) * 2);
216+
}
214217
.p-12-24 {
215218
padding: calc(var(--app-base-px) + 4px) calc(var(--app-base-px) * 3);
216219
}

ui/src/workflow/common/NodeContainer.vue

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,27 @@
3737
><ArrowDownBold />
3838
</el-icon>
3939
</el-button>
40+
<el-dropdown
41+
v-if="showOperate(nodeModel.type)"
42+
:teleported="false"
43+
trigger="click"
44+
placement="bottom-start"
45+
>
46+
<el-button text>{{ condition }}</el-button>
47+
<template #dropdown>
48+
<div style="width: 280px" class="p-12-16">
49+
<h5>执行条件</h5>
50+
<p class="mt-8 lighter">
51+
<span>前置</span>
52+
<el-select v-model="condition" size="small" style="width: 60px; margin: 0 8px">
53+
<el-option label="所有" value="AND" />
54+
<el-option label="任一" value="OR" />
55+
</el-select>
56+
<span>连线节点执行完,执行当前节点</span>
57+
</p>
58+
</div>
59+
</template>
60+
</el-dropdown>
4061
<el-dropdown v-if="showOperate(nodeModel.type)" :teleported="false" trigger="click">
4162
<el-button text>
4263
<el-icon class="color-secondary"><MoreFilled /></el-icon>
@@ -128,7 +149,8 @@ const height = ref<{
128149
})
129150
const showAnchor = ref<boolean>(false)
130151
const anchorData = ref<any>()
131-
// const showNode = ref<boolean>(true)
152+
const condition = ref('AND')
153+
132154
const showNode = computed({
133155
set: (v) => {
134156
set(props.nodeModel.properties, 'showNode', v)

0 commit comments

Comments
 (0)