youngkingdom/dify
1
0
Fork 0
mirror of https://github.com/langgenius/dify.git synced 2026-03-25 08:18:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feat/mcp-frontend' into deploy/dev

Browse Source
This commit is contained in:
Joel
2025-07-01 11:18:52 +08:00
parent 2cf454229a ebbb3735ef
commit c2f03815ce
5 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
web/app/components/plugins/plugin-detail-panel/tool-selector/schema-modal.tsx
View File

@ -44,6 +44,7 @@ const SchemaModal: FC<Props> = ({
<MittProvider> <MittProvider>
<VisualEditorContextProvider> <VisualEditorContextProvider>
<VisualEditor <VisualEditor
className='w-full'
schema={schema} schema={schema}
rootName={rootName} rootName={rootName}
readOnly readOnly

2
web/app/components/tools/provider-list.tsx
View File

@ -74,7 +74,7 @@ const ProviderList = () => {
className='relative flex grow flex-col overflow-y-auto bg-background-body' className='relative flex grow flex-col overflow-y-auto bg-background-body'
> >
<div className={cn( <div className={cn(
'sticky top-0 z-20 flex flex-wrap items-center justify-between gap-y-2 bg-background-body px-12 pb-2 pt-4 leading-[56px]', 'sticky top-0 z-10 flex flex-wrap items-center justify-between gap-y-2 bg-background-body px-12 pb-2 pt-4 leading-[56px]',
currentProviderId && 'pr-6', currentProviderId && 'pr-6',
)}> )}>
<TabSliderNew <TabSliderNew

1
web/app/components/workflow/nodes/_base/components/form-input-item.tsx
View File

@ -231,7 +231,6 @@ const FormInputItem: FC<Props> = ({
value={varInput?.value as any} value={varInput?.value as any}
isExpand isExpand
isInNode isInNode
height={100}
language={CodeLanguage.json} language={CodeLanguage.json}
onChange={handleValueChange} onChange={handleValueChange}
className='w-full' className='w-full'

6
web/app/components/workflow/nodes/llm/components/json-schema-config-modal/visual-editor/index.tsx
View File

@ -2,8 +2,10 @@ import type { FC } from 'react'
import type { SchemaRoot } from '../../../types' import type { SchemaRoot } from '../../../types'
import SchemaNode from './schema-node' import SchemaNode from './schema-node'
import { useSchemaNodeOperations } from './hooks' import { useSchemaNodeOperations } from './hooks'
import cn from '@/utils/classnames'
export type VisualEditorProps = { export type VisualEditorProps = {
className?: string
schema: SchemaRoot schema: SchemaRoot
rootName?: string rootName?: string
readOnly?: boolean readOnly?: boolean
@ -11,11 +13,11 @@ export type VisualEditorProps = {
} }
const VisualEditor: FC<VisualEditorProps> = (props) => { const VisualEditor: FC<VisualEditorProps> = (props) => {
const { schema, readOnly } = props const { className, schema, readOnly } = props
useSchemaNodeOperations(props) useSchemaNodeOperations(props)
return ( return (
<div className='h-full overflow-auto rounded-xl bg-background-section-burn p-1 pl-2'> <div className={cn('h-full overflow-auto rounded-xl bg-background-section-burn p-1 pl-2', className)}>
<SchemaNode <SchemaNode
name={props.rootName || 'structured_output'} name={props.rootName || 'structured_output'}
schema={schema} schema={schema}

12
web/app/components/workflow/nodes/tool/components/copy-id.tsx
View File

@ -26,7 +26,7 @@ const CopyFeedbackNew = ({ content }: Props) => {
}, 100) }, 100)
return ( return (
<div className='group flex items-center gap-0.5 pb-0.5' onClick={e => e.stopPropagation()}> <div className='inline-flex pb-0.5' onClick={e => e.stopPropagation()}>
<Tooltip <Tooltip
popupContent={ popupContent={
(isCopied (isCopied
@ -35,12 +35,16 @@ const CopyFeedbackNew = ({ content }: Props) => {
} }
> >
<div <div
className='system-2xs-regular cursor-pointer text-text-quaternary group-hover:text-text-tertiary' className='group/copy flex items-center gap-0.5 '
onClick={onClickCopy} onClick={onClickCopy}
onMouseLeave={onMouseLeave} onMouseLeave={onMouseLeave}
>{content}</div> >
<div
className='system-2xs-regular cursor-pointer text-text-quaternary group-hover:text-text-tertiary'
>{content}</div>
<RiFileCopyLine className='hidden h-3 w-3 text-text-tertiary group-hover/copy:block' />
</div>
</Tooltip> </Tooltip>
<RiFileCopyLine className='hidden h-3 w-3 text-text-tertiary group-hover:block' />
</div> </div>
) )
} }