youngkingdom/dify
1
0
Fork 0
mirror of https://github.com/langgenius/dify.git synced 2026-05-06 10:28:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

merge main

Browse Source
This commit is contained in:
Joel
2024-10-28 10:51:02 +08:00
parent c777d55a1c aa11141660
commit 765eb282f3
858 changed files with 16206 additions and 17932 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
web/app/components/base/prompt-editor/constants.tsx
View File

@ -1,4 +1,4 @@
import type { ValueSelector } from '../../workflow/types'
import { SupportUploadFileTypes, type ValueSelector } from '../../workflow/types'
export const CONTEXT_PLACEHOLDER_TEXT = '{{#context#}}'
export const HISTORY_PLACEHOLDER_TEXT = '{{#histories#}}'
@ -49,3 +49,10 @@ export const getInputVars = (text: string): ValueSelector[] => {
}
return []
}
export const FILE_EXTS: Record<string, string[]> = {
[SupportUploadFileTypes.image]: ['JPG', 'JPEG', 'PNG', 'GIF', 'WEBP', 'SVG'],
[SupportUploadFileTypes.document]: ['TXT', 'MD', 'MARKDOWN', 'PDF', 'HTML', 'XLSX', 'XLS', 'DOCX', 'CSV', 'EML', 'MSG', 'PPTX', 'PPT', 'XML', 'EPUB'],
[SupportUploadFileTypes.audio]: ['MP3', 'M4A', 'WAV', 'WEBM', 'AMR'],
[SupportUploadFileTypes.video]: ['MP4', 'MOV', 'MPEG', 'MPGA'],
}

9
web/app/components/base/prompt-editor/index.tsx
View File

@ -59,8 +59,9 @@ import {
UPDATE_HISTORY_EVENT_EMITTER,
} from './constants'
import { useEventEmitterContextContext } from '@/context/event-emitter'
import cn from '@/utils/classnames'
export type PromptEditorProps = {
export interface PromptEditorProps {
instanceId?: string
compact?: boolean
className?: string
@ -78,6 +79,7 @@ export type PromptEditorProps = {
variableBlock?: VariableBlockType
externalToolBlock?: ExternalToolBlockType
workflowVariableBlock?: WorkflowVariableBlockType
isSupportFileVar?: boolean
}
const PromptEditor: FC<PromptEditorProps> = ({
@ -98,6 +100,7 @@ const PromptEditor: FC<PromptEditorProps> = ({
variableBlock,
externalToolBlock,
workflowVariableBlock,
isSupportFileVar,
}) => {
const { eventEmitter } = useEventEmitterContextContext()
const initialConfig = {
@ -147,7 +150,7 @@ const PromptEditor: FC<PromptEditorProps> = ({
<div className='relative min-h-5'>
<RichTextPlugin
contentEditable={<ContentEditable className={`${className} outline-none ${compact ? 'leading-5 text-[13px]' : 'leading-6 text-sm'} text-gray-700`} style={style || {}} />}
placeholder={<Placeholder value={placeholder} className={placeholderClassName} compact={compact} />}
placeholder={<Placeholder value={placeholder} className={cn('truncate', placeholderClassName)} compact={compact} />}
ErrorBoundary={LexicalErrorBoundary}
/>
<ComponentPickerBlock
@ -158,6 +161,7 @@ const PromptEditor: FC<PromptEditorProps> = ({
variableBlock={variableBlock}
externalToolBlock={externalToolBlock}
workflowVariableBlock={workflowVariableBlock}
isSupportFileVar={isSupportFileVar}
/>
<ComponentPickerBlock
triggerString='{'
@ -167,6 +171,7 @@ const PromptEditor: FC<PromptEditorProps> = ({
variableBlock={variableBlock}
externalToolBlock={externalToolBlock}
workflowVariableBlock={workflowVariableBlock}
isSupportFileVar={isSupportFileVar}
/>
{
contextBlock?.show && (

13
web/app/components/base/prompt-editor/plugins/component-picker-block/index.tsx
View File

@ -32,7 +32,7 @@ import type { PickerBlockMenuOption } from './menu'
import VarReferenceVars from '@/app/components/workflow/nodes/_base/components/variable/var-reference-vars'
import { useEventEmitterContextContext } from '@/context/event-emitter'
type ComponentPickerProps = {
interface ComponentPickerProps {
triggerString: string
contextBlock?: ContextBlockType
queryBlock?: QueryBlockType
@ -40,6 +40,7 @@ type ComponentPickerProps = {
variableBlock?: VariableBlockType
externalToolBlock?: ExternalToolBlockType
workflowVariableBlock?: WorkflowVariableBlockType
isSupportFileVar?: boolean
}
const ComponentPicker = ({
triggerString,
@ -49,6 +50,7 @@ const ComponentPicker = ({
variableBlock,
externalToolBlock,
workflowVariableBlock,
isSupportFileVar,
}: ComponentPickerProps) => {
const { eventEmitter } = useEventEmitterContextContext()
const { refs, floatingStyles, isPositioned } = useFloating({
@ -133,11 +135,10 @@ const ComponentPicker = ({
// See https://github.com/facebook/lexical/blob/ac97dfa9e14a73ea2d6934ff566282d7f758e8bb/packages/lexical-react/src/shared/LexicalMenu.ts#L493
<div className='w-0 h-0'>
<div
className='p-1 w-[260px] bg-white rounded-lg border-[0.5px] border-gray-200 shadow-lg overflow-y-auto overflow-x-hidden'
className='p-1 w-[260px] bg-white rounded-lg border-[0.5px] border-gray-200 shadow-lg'
style={{
...floatingStyles,
visibility: isPositioned ? 'visible' : 'hidden',
maxHeight: 'calc(1 / 3 * 100vh)',
}}
ref={refs.setFloating}
>
@ -147,7 +148,7 @@ const ComponentPicker = ({
{
// Divider
index !== 0 && options.at(index - 1)?.group !== option.group && (
<div className='h-px bg-gray-100 my-1 w-screen -translate-x-1'></div>
<div className='h-px bg-gray-100 my-1 w-full -translate-x-1'></div>
)
}
{option.renderMenuOption({
@ -168,7 +169,7 @@ const ComponentPicker = ({
<>
{
(!!options.length) && (
<div className='h-px bg-gray-100 my-1 w-screen -translate-x-1'></div>
<div className='h-px bg-gray-100 my-1 w-full -translate-x-1'></div>
)
}
<div className='p-1'>
@ -178,6 +179,8 @@ const ComponentPicker = ({
onChange={(variables: string[]) => {
handleSelectWorkflowVariable(variables)
}}
maxHeightClass='max-h-[34vh]'
isSupportFileVar={isSupportFileVar}
/>
</div>
</>

2
web/app/components/base/prompt-editor/utils.ts
View File

@ -296,7 +296,7 @@ export function $splitNodeContainingQuery(match: MenuTextMatch): TextNode | null
}
export function textToEditorState(text: string) {
const paragraph = text.split('\n')
const paragraph = text ? text.split('\n') : ['']
return JSON.stringify({
root: {