From a896fcce74762647c92e4f0c66fa90c9dbe0a0a7 Mon Sep 17 00:00:00 2001
From: CaptainB <bin@fit2cloud.com>
Date: Tue, 3 Dec 2024 16:19:19 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E6=94=B6=E9=9B=86=E5=88=97=E8=A1=A8=E4=B8=AD=E7=9A=84=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E5=80=BC=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1049462 --user=刘瑞斌 【表单收集】- 单选项、多选项、选项卡的默认值显示的不是标签 https://www.tapd.cn/57709429/s/1623556
---
 .../base-node/component/UserInputFieldTable.vue    | 14 +++++++++++++-
 ui/src/workflow/nodes/form-node/index.vue          | 14 +++++++++++++-
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/ui/src/workflow/nodes/base-node/component/UserInputFieldTable.vue b/ui/src/workflow/nodes/base-node/component/UserInputFieldTable.vue
index c27c33851..cea5dbd0c 100644
--- a/ui/src/workflow/nodes/base-node/component/UserInputFieldTable.vue
+++ b/ui/src/workflow/nodes/base-node/component/UserInputFieldTable.vue
@@ -49,7 +49,7 @@
 
     <el-table-column prop="default_value" label="默认值">
       <template #default="{ row }">
-        <span :title="row.default_value" class="ellipsis-1">{{ row.default_value }}</span>
+        <span :title="row.default_value" class="ellipsis-1">{{ getDefaultValue(row) }}</span>
       </template>
     </el-table-column>
     <el-table-column label="必填">
@@ -126,6 +126,18 @@ function refreshFieldList(data: any, index: any) {
   props.nodeModel.graphModel.eventCenter.emit('refreshFieldList')
 }
 
+const getDefaultValue = (row: any) => {
+  if (row.default_value) {
+    const default_value = row.option_list?.filter((v: any) => row.default_value.indexOf(v.value) > -1)
+      .map((v: any) => v.label).join(',')
+    if (default_value) {
+      return default_value
+    }
+    return row.default_value
+  }
+}
+
+
 onMounted(() => {
   if (!props.nodeModel.properties.user_input_field_list) {
     if (props.nodeModel.properties.input_field_list) {
diff --git a/ui/src/workflow/nodes/form-node/index.vue b/ui/src/workflow/nodes/form-node/index.vue
index 7adaf57ff..b400d968e 100644
--- a/ui/src/workflow/nodes/form-node/index.vue
+++ b/ui/src/workflow/nodes/form-node/index.vue
@@ -84,7 +84,7 @@
 
             <el-table-column prop="default_value" label="默认值">
               <template #default="{ row }">
-                <span :title="row.default_value" class="ellipsis-1">{{ row.default_value }}</span>
+                <span :title="row.default_value" class="ellipsis-1">{{ getDefaultValue(row) }}</span>
               </template>
             </el-table-column>
             <el-table-column label="必填">
@@ -196,6 +196,18 @@ const form_data = computed({
     set(props.nodeModel.properties, 'node_data', value)
   }
 })
+
+const getDefaultValue = (row: any) => {
+  if (row.default_value) {
+    const default_value = row.option_list?.filter((v: any) => row.default_value.indexOf(v.value) > -1)
+      .map((v: any) => v.label).join(',')
+    if (default_value) {
+      return default_value
+    }
+    return row.default_value
+  }
+}
+
 const validate = () => {
   return formNodeFormRef.value?.validate()
 }