Skip to content

Commit 55c9446

Browse files
committed
fix: improve label handling in form fields for better display and validation messages
1 parent 08243cb commit 55c9446

File tree

1 file changed

+29
-27
lines changed
  • ui/src/workflow/nodes/application-node

1 file changed

+29
-27
lines changed

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

Lines changed: 29 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -116,16 +116,17 @@
116116
</el-form-item>
117117
<div v-for="(field, index) in form_data.api_input_field_list" :key="'api-input-' + index">
118118
<el-form-item
119-
:label="field.variable"
119+
:label="typeof field.variable === 'object' && field.variable !== null ? field.variable.label : field.variable"
120120
:prop="'api_input_field_list.' + index + '.value'"
121121
:rules="[
122-
{
123-
required: field.is_required,
124-
message: `${$t('common.inputPlaceholder')}${field.variable}`,
125-
trigger: 'blur',
126-
},
127-
]"
122+
{
123+
required: field.is_required,
124+
message: `${$t('common.inputPlaceholder')}${typeof field.variable === 'object' && field.variable !== null ? field.variable.label : field.variable}`,
125+
trigger: 'blur',
126+
},
127+
]"
128128
>
129+
129130
<NodeCascader
130131
ref="nodeCascaderRef"
131132
:nodeModel="nodeModel"
@@ -140,26 +141,27 @@
140141

141142
<div v-for="(field, index) in form_data.user_input_field_list" :key="'user-input-' + index">
142143
<el-form-item
143-
:label="field.label"
144+
:label="typeof field.label === 'object' && field.label !== null ? field.label.label : field.label"
144145
:prop="'user_input_field_list.' + index + '.value'"
145146
:rules="[
146-
{
147-
required: field.required,
148-
message: `${$t('common.inputPlaceholder')}${field.label}`,
149-
trigger: 'blur',
150-
},
151-
]"
147+
{
148+
required: field.required,
149+
message: `${$t('common.inputPlaceholder')}${typeof field.label === 'object' && field.label !== null ? field.label.label : field.label}`,
150+
trigger: 'blur',
151+
},
152+
]"
152153
>
153154
<NodeCascader
154155
ref="nodeCascaderRef"
155156
:nodeModel="nodeModel"
156157
class="w-full"
157158
:placeholder="
158-
$t('workflow.nodes.searchKnowledgeNode.searchQuestion.placeholder')
159-
"
159+
$t('workflow.nodes.searchKnowledgeNode.searchQuestion.placeholder')
160+
"
160161
v-model="form_data.user_input_field_list[index].value"
161162
/>
162163
</el-form-item>
164+
163165
</div>
164166
<el-form-item
165167
:label="$t('workflow.nodes.aiChatNode.returnContent.label')"
@@ -169,8 +171,8 @@
169171
<div class="flex align-center">
170172
<div class="mr-4">
171173
<span>{{
172-
$t('workflow.nodes.aiChatNode.returnContent.label')
173-
}}</span>
174+
$t('workflow.nodes.aiChatNode.returnContent.label')
175+
}}</span>
174176
</div>
175177
<el-tooltip effect="dark" placement="right" popper-class="max-w-200">
176178
<template #content>
@@ -180,22 +182,22 @@
180182
</el-tooltip>
181183
</div>
182184
</template>
183-
<el-switch size="small" v-model="form_data.is_result" />
185+
<el-switch size="small" v-model="form_data.is_result"/>
184186
</el-form-item>
185187
</el-form>
186188
</el-card>
187189
</NodeContainer>
188190
</template>
189191

190192
<script setup lang="ts">
191-
import { set, groupBy, create, cloneDeep } from 'lodash'
193+
import {set, groupBy, create, cloneDeep} from 'lodash'
192194
import NodeContainer from '@/workflow/common/NodeContainer.vue'
193-
import { ref, computed, onMounted, onActivated } from 'vue'
195+
import {ref, computed, onMounted, onActivated} from 'vue'
194196
import NodeCascader from '@/workflow/common/NodeCascader.vue'
195-
import type { FormInstance } from 'element-plus'
196-
import { isWorkFlow } from '@/utils/application'
197-
import { useRoute } from 'vue-router'
198-
import { loadSharedApi } from '@/utils/dynamics-api/shared-api'
197+
import type {FormInstance} from 'element-plus'
198+
import {isWorkFlow} from '@/utils/application'
199+
import {useRoute} from 'vue-router'
200+
import {loadSharedApi} from '@/utils/dynamics-api/shared-api'
199201
200202
const route = useRoute()
201203
@@ -249,7 +251,7 @@ const update_field = () => {
249251
set(props.nodeModel.properties, 'status', 500)
250252
return
251253
}
252-
loadSharedApi({ type: 'application', systemType: apiType.value })
254+
loadSharedApi({type: 'application', systemType: apiType.value})
253255
.getApplicationDetail(props.nodeModel.properties.node_data.application_id)
254256
.then((ok: any) => {
255257
const old_api_input_field_list = cloneDeep(
@@ -337,7 +339,7 @@ const props = defineProps<{ nodeModel: any }>()
337339
338340
const validate = () => {
339341
return applicationNodeFormRef.value?.validate().catch((err) => {
340-
return Promise.reject({ node: props.nodeModel, errMessage: err })
342+
return Promise.reject({node: props.nodeModel, errMessage: err})
341343
})
342344
}
343345

0 commit comments

Comments
 (0)