mirror of
https://git.mirrors.martin98.com/https://github.com/langgenius/dify.git
synced 2025-08-17 00:56:01 +08:00
fix: chatflow check start node form
This commit is contained in:
parent
5f76e665a1
commit
9fe2f321ae
@ -34,6 +34,7 @@ type ChatInputAreaProps = {
|
||||
visionConfig?: FileUpload
|
||||
speechToTextConfig?: EnableType
|
||||
onSend?: OnSend
|
||||
onSendCheck?: () => boolean
|
||||
theme?: Theme | null
|
||||
}
|
||||
const ChatInputArea = ({
|
||||
@ -44,6 +45,7 @@ const ChatInputArea = ({
|
||||
visionConfig,
|
||||
speechToTextConfig = { enabled: true },
|
||||
onSend,
|
||||
onSendCheck = () => true,
|
||||
// theme,
|
||||
}: ChatInputAreaProps) => {
|
||||
const { t } = useTranslation()
|
||||
@ -80,9 +82,11 @@ const ChatInputArea = ({
|
||||
notify({ type: 'info', message: t('appAnnotation.errorMessage.queryRequired') })
|
||||
return
|
||||
}
|
||||
onSend(query, files)
|
||||
setQuery('')
|
||||
setFiles([])
|
||||
if (onSendCheck()) {
|
||||
onSend(query, files)
|
||||
setQuery('')
|
||||
setFiles([])
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -43,6 +43,7 @@ export type ChatProps = {
|
||||
onStopResponding?: () => void
|
||||
noChatInput?: boolean
|
||||
onSend?: OnSend
|
||||
onSendCheck?: () => boolean
|
||||
onRegenerate?: OnRegenerate
|
||||
chatContainerClassName?: string
|
||||
chatContainerInnerClassName?: string
|
||||
@ -72,6 +73,7 @@ const Chat: FC<ChatProps> = ({
|
||||
appData,
|
||||
config,
|
||||
onSend,
|
||||
onSendCheck,
|
||||
onRegenerate,
|
||||
chatList,
|
||||
isResponding,
|
||||
@ -281,6 +283,7 @@ const Chat: FC<ChatProps> = ({
|
||||
visionConfig={config?.file_upload}
|
||||
speechToTextConfig={config?.speech_to_text}
|
||||
onSend={onSend}
|
||||
onSendCheck={onSendCheck}
|
||||
theme={themeBuilder?.theme}
|
||||
/>
|
||||
)
|
||||
|
@ -16,3 +16,4 @@ export * from './use-workflow-variables'
|
||||
export * from './use-shortcuts'
|
||||
export * from './use-workflow-interactions'
|
||||
export * from './use-workflow-mode'
|
||||
export * from './use-check-start-node-form'
|
||||
|
@ -0,0 +1,46 @@
|
||||
import { useCallback } from 'react'
|
||||
import { useTranslation } from 'react-i18next'
|
||||
import { useStoreApi } from 'reactflow'
|
||||
import { useWorkflowStore } from '@/app/components/workflow/store'
|
||||
import { BlockEnum } from '@/app/components/workflow/types'
|
||||
import { useToastContext } from '@/app/components/base/toast'
|
||||
import type { InputVar } from '@/app/components/workflow/types'
|
||||
|
||||
export const useCheckStartNodeForm = () => {
|
||||
const { t } = useTranslation()
|
||||
const storeApi = useStoreApi()
|
||||
const workflowStore = useWorkflowStore()
|
||||
const { notify } = useToastContext()
|
||||
|
||||
const checkStartNodeForm = useCallback(() => {
|
||||
const { getNodes } = storeApi.getState()
|
||||
const nodes = getNodes()
|
||||
const startNode = nodes.find(node => node.data.type === BlockEnum.Start)
|
||||
const variables: InputVar[] = startNode?.data.variables || []
|
||||
const inputs = workflowStore.getState().inputs
|
||||
|
||||
let hasEmptyInput = ''
|
||||
const requiredVars = variables.filter(({ required }) => required)
|
||||
|
||||
if (requiredVars?.length) {
|
||||
requiredVars.forEach(({ variable, label }) => {
|
||||
if (hasEmptyInput)
|
||||
return
|
||||
|
||||
if (!inputs[variable])
|
||||
hasEmptyInput = label as string
|
||||
})
|
||||
}
|
||||
|
||||
if (hasEmptyInput) {
|
||||
notify({ type: 'error', message: t('appDebug.errorMessage.valueOfVarRequired', { key: hasEmptyInput }) })
|
||||
return false
|
||||
}
|
||||
|
||||
return true
|
||||
}, [storeApi, workflowStore, notify, t])
|
||||
|
||||
return {
|
||||
checkStartNodeForm,
|
||||
}
|
||||
}
|
@ -12,6 +12,7 @@ import {
|
||||
useStore,
|
||||
useWorkflowStore,
|
||||
} from '../../store'
|
||||
import { useCheckStartNodeForm } from '../../hooks'
|
||||
import type { StartNodeType } from '../../nodes/start/types'
|
||||
import Empty from './empty'
|
||||
import UserInput from './user-input'
|
||||
@ -61,6 +62,7 @@ const ChatWrapper = forwardRef<ChatWrapperRefType, ChatWrapperProps>(({
|
||||
}
|
||||
}, [features.opening, features.suggested, features.text2speech, features.speech2text, features.citation, features.moderation, features.file])
|
||||
const setShowFeaturesPanel = useStore(s => s.setShowFeaturesPanel)
|
||||
const { checkStartNodeForm } = useCheckStartNodeForm()
|
||||
|
||||
const {
|
||||
conversationId,
|
||||
@ -141,6 +143,7 @@ const ChatWrapper = forwardRef<ChatWrapperRefType, ChatWrapperProps>(({
|
||||
showFeatureBar
|
||||
onFeatureBarClick={setShowFeaturesPanel}
|
||||
onSend={doSend}
|
||||
onSendCheck={checkStartNodeForm}
|
||||
onRegenerate={doRegenerate}
|
||||
onStopResponding={handleStop}
|
||||
chatNode={(
|
||||
|
Loading…
x
Reference in New Issue
Block a user