Skip to content

Commit 4c678cf

Browse files
committed
fix: 修复表单收集列表中的默认值显示问题
--bug=1049462 --user=刘瑞斌 【表单收集】- 单选项、多选项、选项卡的默认值显示的不是标签 https://www.tapd.cn/57709429/s/1623556
1 parent 695576b commit 4c678cf

File tree

2 files changed

+26
-2
lines changed

2 files changed

+26
-2
lines changed

ui/src/workflow/nodes/base-node/component/UserInputFieldTable.vue

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949

5050
<el-table-column prop="default_value" label="默认值">
5151
<template #default="{ row }">
52-
<span :title="row.default_value" class="ellipsis-1">{{ row.default_value }}</span>
52+
<span :title="row.default_value" class="ellipsis-1">{{ getDefaultValue(row) }}</span>
5353
</template>
5454
</el-table-column>
5555
<el-table-column label="必填">
@@ -126,6 +126,18 @@ function refreshFieldList(data: any, index: any) {
126126
props.nodeModel.graphModel.eventCenter.emit('refreshFieldList')
127127
}
128128
129+
const getDefaultValue = (row: any) => {
130+
if (row.default_value) {
131+
const default_value = row.option_list?.filter((v: any) => row.default_value.indexOf(v.value) > -1)
132+
.map((v: any) => v.label).join(',')
133+
if (default_value) {
134+
return default_value
135+
}
136+
return row.default_value
137+
}
138+
}
139+
140+
129141
onMounted(() => {
130142
if (!props.nodeModel.properties.user_input_field_list) {
131143
if (props.nodeModel.properties.input_field_list) {

ui/src/workflow/nodes/form-node/index.vue

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686

8787
<el-table-column prop="default_value" label="默认值">
8888
<template #default="{ row }">
89-
<span :title="row.default_value" class="ellipsis-1">{{ row.default_value }}</span>
89+
<span :title="row.default_value" class="ellipsis-1">{{ getDefaultValue(row) }}</span>
9090
</template>
9191
</el-table-column>
9292
<el-table-column label="必填">
@@ -197,6 +197,18 @@ const form_data = computed({
197197
set(props.nodeModel.properties, 'node_data', value)
198198
}
199199
})
200+
201+
const getDefaultValue = (row: any) => {
202+
if (row.default_value) {
203+
const default_value = row.option_list?.filter((v: any) => row.default_value.indexOf(v.value) > -1)
204+
.map((v: any) => v.label).join(',')
205+
if (default_value) {
206+
return default_value
207+
}
208+
return row.default_value
209+
}
210+
}
211+
200212
const validate = () => {
201213
return formNodeFormRef.value?.validate()
202214
}

0 commit comments

Comments
 (0)