{title}
{value?.length || 0}
diff --git a/web/app/components/workflow/nodes/_base/components/selector.tsx b/web/app/components/workflow/nodes/_base/components/selector.tsx
index b39122ed57..5a1019a4dc 100644
--- a/web/app/components/workflow/nodes/_base/components/selector.tsx
+++ b/web/app/components/workflow/nodes/_base/components/selector.tsx
@@ -14,6 +14,7 @@ type Props = {
DropDownIcon?: any
noLeft?: boolean
options: Item[]
+ allOptions?: Item[]
value: string
placeholder?: string
onChange: (value: any) => void
@@ -30,6 +31,7 @@ const TypeSelector: FC
= ({
DropDownIcon = ChevronSelectorVertical,
noLeft,
options: list,
+ allOptions,
value,
placeholder = '',
onChange,
@@ -41,7 +43,7 @@ const TypeSelector: FC = ({
showChecked,
}) => {
const noValue = value === '' || value === undefined || value === null
- const item = list.find(item => item.value === value)
+ const item = allOptions ? allOptions.find(item => item.value === value) : list.find(item => item.value === value)
const [showOption, { setFalse: setHide, toggle: toggleShow }] = useBoolean(false)
const ref = React.useRef(null)
useClickAway(() => {
diff --git a/web/app/components/workflow/nodes/llm/components/config-prompt-item.tsx b/web/app/components/workflow/nodes/llm/components/config-prompt-item.tsx
index a6d9525453..58478591dd 100644
--- a/web/app/components/workflow/nodes/llm/components/config-prompt-item.tsx
+++ b/web/app/components/workflow/nodes/llm/components/config-prompt-item.tsx
@@ -13,6 +13,9 @@ import { PromptRole } from '@/models/debug'
const i18nPrefix = 'workflow.nodes.llm'
type Props = {
+ className?: string
+ headerClassName?: string
+ canNotChooseSystemRole?: boolean
readOnly: boolean
id: string
canRemove: boolean
@@ -47,7 +50,12 @@ const roleOptions = [
},
]
+const roleOptionsWithoutSystemRole = roleOptions.filter(item => item.value !== PromptRole.system)
+
const ConfigPromptItem: FC = ({
+ className,
+ headerClassName,
+ canNotChooseSystemRole,
readOnly,
id,
canRemove,
@@ -68,19 +76,28 @@ const ConfigPromptItem: FC = ({
setInstanceId(`${id}-${uniqueId()}`)
}, [id])
return (
-
-
+ {payload.role === PromptRole.system
+ ? (
+ SYSTEM
+
)
+ : (
+
+ )}
+
{t(`${i18nPrefix}.roleDescription.${payload.role}`)}
diff --git a/web/app/components/workflow/nodes/llm/components/config-prompt.tsx b/web/app/components/workflow/nodes/llm/components/config-prompt.tsx
index d08fa000f3..6c56aa656c 100644
--- a/web/app/components/workflow/nodes/llm/components/config-prompt.tsx
+++ b/web/app/components/workflow/nodes/llm/components/config-prompt.tsx
@@ -3,12 +3,17 @@ import type { FC } from 'react'
import React, { useCallback } from 'react'
import { useTranslation } from 'react-i18next'
import produce from 'immer'
+import { ReactSortable } from 'react-sortablejs'
+import { v4 as uuid4 } from 'uuid'
+import cn from 'classnames'
import type { PromptItem, ValueSelector, Var } from '../../../types'
import { PromptRole } from '../../../types'
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 AddButton from '@/app/components/workflow/nodes/_base/components/add-button'
+import { DragHandle } from '@/app/components/base/icons/src/vender/line/others'
+
const i18nPrefix = 'workflow.nodes.llm'
type Props = {
@@ -39,6 +44,18 @@ const ConfigPrompt: FC
= ({
hasSetBlockStatus,
}) => {
const { t } = useTranslation()
+ const payloadWithIds = (isChatModel && Array.isArray(payload))
+ ? payload.map((item, i) => {
+ const id = uuid4()
+ return {
+ id: item.id || id,
+ p: {
+ ...item,
+ id: item.id || id,
+ },
+ }
+ })
+ : []
const {
availableVars,
availableNodes,
@@ -94,37 +111,69 @@ const ConfigPrompt: FC = ({
onChange(newPrompt)
}, [onChange, payload])
- // console.log(getInputVars((payload as PromptItem).text))
+ const canChooseSystemRole = (() => {
+ if (isChatModel && Array.isArray(payload))
+ return !payload.find(item => item.role === PromptRole.system)
+ return false
+ })()
return (
{(isChatModel && Array.isArray(payload))
? (
- {
- (payload as PromptItem[]).map((item, index) => {
- return (
-
1}
- readOnly={readOnly}
- id={`${payload.length}-${index}`}
- handleChatModeMessageRoleChange={handleChatModeMessageRoleChange(index)}
- isChatModel={isChatModel}
- isChatApp={isChatApp}
- payload={item}
- onPromptChange={handleChatModePromptChange(index)}
- onRemove={handleRemove(index)}
- isShowContext={isShowContext}
- hasSetBlockStatus={hasSetBlockStatus}
- availableVars={availableVars}
- availableNodes={availableNodes}
- />
- )
- })
+ {
+ if ((payload as PromptItem[])?.[0].role === PromptRole.system && list[0].p.role !== PromptRole.system)
+ return
- }
+ onChange(list.map(item => item.p))
+ }}
+ handle='.handle'
+ ghostClass="opacity-50"
+ animation={150}
+ >
+ {
+ (payload as PromptItem[]).map((item, index) => {
+ const canDrag = (() => {
+ if (readOnly)
+ return false
+
+ if (index === 0 && item.role === PromptRole.system)
+ return false
+
+ return true
+ })()
+ return (
+
+ {canDrag && }
+ 1 && !(index === 0 && item.role === PromptRole.system)}
+ readOnly={readOnly}
+ id={item.id!}
+ handleChatModeMessageRoleChange={handleChatModeMessageRoleChange(index)}
+ isChatModel={isChatModel}
+ isChatApp={isChatApp}
+ payload={item}
+ onPromptChange={handleChatModePromptChange(index)}
+ onRemove={handleRemove(index)}
+ isShowContext={isShowContext}
+ hasSetBlockStatus={hasSetBlockStatus}
+ availableVars={availableVars}
+ availableNodes={availableNodes}
+ />
+
+
+ )
+ })
+
+ }
+