mirror of
https://git.mirrors.martin98.com/https://github.com/langgenius/dify.git
synced 2025-08-17 13:45:57 +08:00
fix: remove middle editor may cause render placement error (#3356)
This commit is contained in:
parent
c889717d24
commit
d87d4b9b56
@ -0,0 +1,107 @@
|
|||||||
|
'use client'
|
||||||
|
import type { FC } from 'react'
|
||||||
|
import React, { useEffect, useState } from 'react'
|
||||||
|
import { uniqueId } from 'lodash-es'
|
||||||
|
import { useTranslation } from 'react-i18next'
|
||||||
|
import type { PromptItem } from '../../../types'
|
||||||
|
import Editor from '@/app/components/workflow/nodes/_base/components/prompt/editor'
|
||||||
|
import TypeSelector from '@/app/components/workflow/nodes/_base/components/selector'
|
||||||
|
import TooltipPlus from '@/app/components/base/tooltip-plus'
|
||||||
|
import { HelpCircle } from '@/app/components/base/icons/src/vender/line/general'
|
||||||
|
import { PromptRole } from '@/models/debug'
|
||||||
|
|
||||||
|
const i18nPrefix = 'workflow.nodes.llm'
|
||||||
|
|
||||||
|
type Props = {
|
||||||
|
readOnly: boolean
|
||||||
|
id: string
|
||||||
|
canRemove: boolean
|
||||||
|
isChatModel: boolean
|
||||||
|
isChatApp: boolean
|
||||||
|
payload: PromptItem
|
||||||
|
handleChatModeMessageRoleChange: (role: PromptRole) => void
|
||||||
|
onPromptChange: (p: string) => void
|
||||||
|
onRemove: () => void
|
||||||
|
isShowContext: boolean
|
||||||
|
hasSetBlockStatus: {
|
||||||
|
context: boolean
|
||||||
|
history: boolean
|
||||||
|
query: boolean
|
||||||
|
}
|
||||||
|
availableVars: any
|
||||||
|
availableNodes: any
|
||||||
|
}
|
||||||
|
|
||||||
|
const roleOptions = [
|
||||||
|
{
|
||||||
|
label: 'system',
|
||||||
|
value: PromptRole.system,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: 'user',
|
||||||
|
value: PromptRole.user,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: 'assistant',
|
||||||
|
value: PromptRole.assistant,
|
||||||
|
},
|
||||||
|
]
|
||||||
|
|
||||||
|
const ConfigPromptItem: FC<Props> = ({
|
||||||
|
readOnly,
|
||||||
|
id,
|
||||||
|
canRemove,
|
||||||
|
handleChatModeMessageRoleChange,
|
||||||
|
isChatModel,
|
||||||
|
isChatApp,
|
||||||
|
payload,
|
||||||
|
onPromptChange,
|
||||||
|
onRemove,
|
||||||
|
isShowContext,
|
||||||
|
hasSetBlockStatus,
|
||||||
|
availableVars,
|
||||||
|
availableNodes,
|
||||||
|
}) => {
|
||||||
|
const { t } = useTranslation()
|
||||||
|
const [instanceId, setInstanceId] = useState(uniqueId())
|
||||||
|
useEffect(() => {
|
||||||
|
setInstanceId(`${id}-${uniqueId()}`)
|
||||||
|
}, [id])
|
||||||
|
return (
|
||||||
|
|
||||||
|
<Editor
|
||||||
|
instanceId={instanceId}
|
||||||
|
key={instanceId}
|
||||||
|
title={
|
||||||
|
<div className='relative left-1 flex items-center'>
|
||||||
|
<TypeSelector
|
||||||
|
value={payload.role as string}
|
||||||
|
options={roleOptions}
|
||||||
|
onChange={handleChatModeMessageRoleChange}
|
||||||
|
triggerClassName='text-xs font-semibold text-gray-700 uppercase'
|
||||||
|
itemClassName='text-[13px] font-medium text-gray-700'
|
||||||
|
/>
|
||||||
|
<TooltipPlus
|
||||||
|
popupContent={
|
||||||
|
<div className='max-w-[180px]'>{t(`${i18nPrefix}.roleDescription.${payload.role}`)}</div>
|
||||||
|
}
|
||||||
|
>
|
||||||
|
<HelpCircle className='w-3.5 h-3.5 text-gray-400' />
|
||||||
|
</TooltipPlus>
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
value={payload.text}
|
||||||
|
onChange={onPromptChange}
|
||||||
|
readOnly={readOnly}
|
||||||
|
showRemove={canRemove}
|
||||||
|
onRemove={onRemove}
|
||||||
|
isChatModel={isChatModel}
|
||||||
|
isChatApp={isChatApp}
|
||||||
|
isShowContext={isShowContext}
|
||||||
|
hasSetBlockStatus={hasSetBlockStatus}
|
||||||
|
nodesOutputVars={availableVars}
|
||||||
|
availableNodes={availableNodes}
|
||||||
|
/>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
export default React.memo(ConfigPromptItem)
|
@ -6,11 +6,9 @@ import produce from 'immer'
|
|||||||
import type { PromptItem, ValueSelector, Var } from '../../../types'
|
import type { PromptItem, ValueSelector, Var } from '../../../types'
|
||||||
import { PromptRole } from '../../../types'
|
import { PromptRole } from '../../../types'
|
||||||
import useAvailableVarList from '../../_base/hooks/use-available-var-list'
|
import useAvailableVarList from '../../_base/hooks/use-available-var-list'
|
||||||
|
import ConfigPromptItem from './config-prompt-item'
|
||||||
import Editor from '@/app/components/workflow/nodes/_base/components/prompt/editor'
|
import Editor from '@/app/components/workflow/nodes/_base/components/prompt/editor'
|
||||||
import AddButton from '@/app/components/workflow/nodes/_base/components/add-button'
|
import AddButton from '@/app/components/workflow/nodes/_base/components/add-button'
|
||||||
import TypeSelector from '@/app/components/workflow/nodes/_base/components/selector'
|
|
||||||
import TooltipPlus from '@/app/components/base/tooltip-plus'
|
|
||||||
import { HelpCircle } from '@/app/components/base/icons/src/vender/line/general'
|
|
||||||
const i18nPrefix = 'workflow.nodes.llm'
|
const i18nPrefix = 'workflow.nodes.llm'
|
||||||
|
|
||||||
type Props = {
|
type Props = {
|
||||||
@ -58,21 +56,6 @@ const ConfigPrompt: FC<Props> = ({
|
|||||||
}
|
}
|
||||||
}, [onChange, payload])
|
}, [onChange, payload])
|
||||||
|
|
||||||
const roleOptions = [
|
|
||||||
{
|
|
||||||
label: 'system',
|
|
||||||
value: PromptRole.system,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: 'user',
|
|
||||||
value: PromptRole.user,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: 'assistant',
|
|
||||||
value: PromptRole.assistant,
|
|
||||||
},
|
|
||||||
]
|
|
||||||
|
|
||||||
const handleChatModeMessageRoleChange = useCallback((index: number) => {
|
const handleChatModeMessageRoleChange = useCallback((index: number) => {
|
||||||
return (role: PromptRole) => {
|
return (role: PromptRole) => {
|
||||||
const newPrompt = produce(payload as PromptItem[], (draft) => {
|
const newPrompt = produce(payload as PromptItem[], (draft) => {
|
||||||
@ -117,37 +100,20 @@ const ConfigPrompt: FC<Props> = ({
|
|||||||
{
|
{
|
||||||
(payload as PromptItem[]).map((item, index) => {
|
(payload as PromptItem[]).map((item, index) => {
|
||||||
return (
|
return (
|
||||||
<Editor
|
<ConfigPromptItem
|
||||||
instanceId={`${nodeId}-chat-workflow-llm-prompt-editor-${item.role}-${index}`}
|
key={`${payload.length}-${index}`}
|
||||||
key={index}
|
canRemove={payload.length > 1}
|
||||||
title={
|
|
||||||
<div className='relative left-1 flex items-center'>
|
|
||||||
<TypeSelector
|
|
||||||
value={item.role as string}
|
|
||||||
options={roleOptions}
|
|
||||||
onChange={handleChatModeMessageRoleChange(index)}
|
|
||||||
triggerClassName='text-xs font-semibold text-gray-700 uppercase'
|
|
||||||
itemClassName='text-[13px] font-medium text-gray-700'
|
|
||||||
/>
|
|
||||||
<TooltipPlus
|
|
||||||
popupContent={
|
|
||||||
<div className='max-w-[180px]'>{t(`${i18nPrefix}.roleDescription.${item.role}`)}</div>
|
|
||||||
}
|
|
||||||
>
|
|
||||||
<HelpCircle className='w-3.5 h-3.5 text-gray-400' />
|
|
||||||
</TooltipPlus>
|
|
||||||
</div>
|
|
||||||
}
|
|
||||||
value={item.text}
|
|
||||||
onChange={handleChatModePromptChange(index)}
|
|
||||||
readOnly={readOnly}
|
readOnly={readOnly}
|
||||||
showRemove={(payload as PromptItem[]).length > 1}
|
id={`${payload.length}-${index}`}
|
||||||
onRemove={handleRemove(index)}
|
handleChatModeMessageRoleChange={handleChatModeMessageRoleChange(index)}
|
||||||
isChatModel={isChatModel}
|
isChatModel={isChatModel}
|
||||||
isChatApp={isChatApp}
|
isChatApp={isChatApp}
|
||||||
|
payload={item}
|
||||||
|
onPromptChange={handleChatModePromptChange(index)}
|
||||||
|
onRemove={handleRemove(index)}
|
||||||
isShowContext={isShowContext}
|
isShowContext={isShowContext}
|
||||||
hasSetBlockStatus={hasSetBlockStatus}
|
hasSetBlockStatus={hasSetBlockStatus}
|
||||||
nodesOutputVars={availableVars}
|
availableVars={availableVars}
|
||||||
availableNodes={availableNodes}
|
availableNodes={availableNodes}
|
||||||
/>
|
/>
|
||||||
)
|
)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user