mirror of https://github.com/langgenius/dify.git
fix: update placeholder handling in ContentItem and remove unused error messages from HumanInputNode
This commit is contained in:
parent
501c3bcc94
commit
0e2b59d661
|
|
@ -31,9 +31,11 @@ const ContentItem = ({
|
|||
}, [formInputFields, fieldName])
|
||||
|
||||
const placeholder = useMemo(() => {
|
||||
return formInputField?.placeholder.type === 'variable'
|
||||
? resolvedPlaceholderValues?.[fieldName]
|
||||
: formInputField?.placeholder.value
|
||||
if (!formInputField)
|
||||
return ''
|
||||
return formInputField.placeholder.type === 'variable'
|
||||
? resolvedPlaceholderValues?.[fieldName] || ''
|
||||
: formInputField.placeholder.value
|
||||
}, [formInputField, resolvedPlaceholderValues, fieldName])
|
||||
|
||||
if (!isInputField(content)) {
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@ import type { NodeDefault, Var } from '../../types'
|
|||
import type { HumanInputNodeType } from './types'
|
||||
import { BlockClassificationEnum } from '@/app/components/workflow/block-selector/types'
|
||||
import { BlockEnum, VarType } from '@/app/components/workflow/types'
|
||||
// import { DeliveryMethodType, UserActionButtonType } from './types'
|
||||
import { genNodeMetaData } from '@/app/components/workflow/utils'
|
||||
|
||||
const i18nPrefix = 'nodes.humanInput.errorMsg'
|
||||
|
|
@ -40,15 +39,6 @@ const nodeDefault: NodeDefault<HumanInputNodeType> = {
|
|||
if (!errorMessages && payload.delivery_methods.length > 0 && !payload.delivery_methods.some(method => method.enabled))
|
||||
errorMessages = t(`${i18nPrefix}.noDeliveryMethodEnabled`, { ns: 'workflow' })
|
||||
|
||||
if (!errorMessages && !payload.form_content)
|
||||
errorMessages = t(`${i18nPrefix}.noFormContent`, { ns: 'workflow' })
|
||||
|
||||
if (!errorMessages && payload.form_content) {
|
||||
const regex = /\{\{#\$output\.[^#]+#\}\}/
|
||||
if (!regex.test(payload.form_content))
|
||||
errorMessages = t(`${i18nPrefix}.noFormInputField`, { ns: 'workflow' })
|
||||
}
|
||||
|
||||
if (!errorMessages && !payload.user_actions.length)
|
||||
errorMessages = t(`${i18nPrefix}.noUserActions`, { ns: 'workflow' })
|
||||
|
||||
|
|
|
|||
|
|
@ -558,8 +558,6 @@
|
|||
"nodes.humanInput.editor.previewTip": "In preview mode, action buttons are not functional.",
|
||||
"nodes.humanInput.errorMsg.noDeliveryMethod": "Please select at least one delivery method",
|
||||
"nodes.humanInput.errorMsg.noDeliveryMethodEnabled": "Please enable at least one delivery method",
|
||||
"nodes.humanInput.errorMsg.noFormContent": "Please add form content",
|
||||
"nodes.humanInput.errorMsg.noFormInputField": "Please add at least one form input field",
|
||||
"nodes.humanInput.errorMsg.noUserActions": "Please add at least one user action",
|
||||
"nodes.humanInput.formContent.hotkeyTip": "Press <Key/> to insert variable, <CtrlKey/><Key/> to insert input field",
|
||||
"nodes.humanInput.formContent.preview": "Preview",
|
||||
|
|
|
|||
|
|
@ -558,8 +558,6 @@
|
|||
"nodes.humanInput.editor.previewTip": "在预览模式下,操作按钮无法使用。",
|
||||
"nodes.humanInput.errorMsg.noDeliveryMethod": "请至少选择一种提交方式",
|
||||
"nodes.humanInput.errorMsg.noDeliveryMethodEnabled": "请至少启用一种提交方式",
|
||||
"nodes.humanInput.errorMsg.noFormContent": "请添加表单内容",
|
||||
"nodes.humanInput.errorMsg.noFormInputField": "请至少添加一个表单输入字段",
|
||||
"nodes.humanInput.errorMsg.noUserActions": "请添加至少一个用户操作",
|
||||
"nodes.humanInput.formContent.hotkeyTip": "按 <Key/> 插入变量,按 <CtrlKey/><Key/> 插入输入字段",
|
||||
"nodes.humanInput.formContent.preview": "预览",
|
||||
|
|
|
|||
Loading…
Reference in New Issue