AI/dify
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/langgenius/dify.git synced 2025-08-15 16:05:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feat/llm-struct-output' of https://github.com/langgenius/dify into feat/llm-struct-output

Browse Source
This commit is contained in:
twwu 2025-04-01 14:07:05 +08:00
commit 934d0a32cd
7 changed files with 74 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
web/app/components/base/icons/assets/vender/solid/general/arrow-down-round-fill.svg Normal file
View File

@ -0,0 +1,5 @@
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<g id="arrow-down-round-fill">
<path id="Vector" d="M6.02913 6.23572C5.08582 6.23572 4.56482 7.33027 5.15967 8.06239L7.13093 10.4885C7.57922 11.0403 8.42149 11.0403 8.86986 10.4885L10.8411 8.06239C11.4359 7.33027 10.9149 6.23572 9.97158 6.23572H6.02913Z" fill="#101828" fill-opacity="0.3"/>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 399 B

37
web/app/components/base/icons/src/vender/solid/general/ArrowDownRoundFill.json Normal file
View File

@ -0,0 +1,37 @@
{
"icon": {
"type": "element",
"isRootNode": true,
"name": "svg",
"attributes": {
"width": "16",
"height": "16",
"viewBox": "0 0 16 16",
"fill": "none",
"xmlns": "http://www.w3.org/2000/svg"
},
"children": [
{
"type": "element",
"name": "g",
"attributes": {
"id": "arrow-down-round-fill"
},
"children": [
{
"type": "element",
"name": "path",
"attributes": {
"id": "Vector",
"d": "M6.02913 6.23572C5.08582 6.23572 4.56482 7.33027 5.15967 8.06239L7.13093 10.4885C7.57922 11.0403 8.42149 11.0403 8.86986 10.4885L10.8411 8.06239C11.4359 7.33027 10.9149 6.23572 9.97158 6.23572H6.02913Z",
"fill": "currentColor",
"fill-opacity": "0.3"
},
"children": []
}
]
}
]
},
"name": "ArrowDownRoundFill"
}

20
web/app/components/base/icons/src/vender/solid/general/ArrowDownRoundFill.tsx Normal file
View File

@ -0,0 +1,20 @@
// GENERATE BY script
// DON NOT EDIT IT MANUALLY
import * as React from 'react'
import data from './ArrowDownRoundFill.json'
import IconBase from '@/app/components/base/icons/IconBase'
import type { IconData } from '@/app/components/base/icons/IconBase'
const Icon = (
{
ref,
...props
}: React.SVGProps<SVGSVGElement> & {
ref?: React.RefObject<React.MutableRefObject<HTMLOrSVGElement>>;
},
) => <IconBase {...props} ref={ref} data={data as IconData} />
Icon.displayName = 'ArrowDownRoundFill'
export default Icon

1
web/app/components/base/icons/src/vender/solid/general/index.ts
View File

@ -1,4 +1,5 @@
export { default as AnswerTriangle } from './AnswerTriangle'
export { default as ArrowDownRoundFill } from './ArrowDownRoundFill'
export { default as CheckCircle } from './CheckCircle'
export { default as CheckDone01 } from './CheckDone01'
export { default as Download02 } from './Download02'

14
web/app/components/workflow/nodes/_base/components/collapse/index.tsx
View File

@ -1,6 +1,6 @@
import type { ReactNode } from 'react'
import { useState } from 'react'
import { RiArrowDropRightLine } from '@remixicon/react'
import { ArrowDownRoundFill } from '@/app/components/base/icons/src/vender/solid/general'
import cn from '@/utils/classnames'
export { default as FieldCollapse } from './field-collapse'
@ -27,9 +27,9 @@ const Collapse = ({
return (
<>
<div className='flex items-center'>
<div className='group/collapse flex items-center'>
<div
className='flex grow items-center'
className='ml-4 flex grow items-center'
onClick={() => {
if (!disabled) {
setCollapsedLocal(!collapsedMerged)
@ -37,19 +37,19 @@ const Collapse = ({
}
}}
>
{trigger}
<div className='h-4 w-4 shrink-0'>
{
!disabled && (
<RiArrowDropRightLine
<ArrowDownRoundFill
className={cn(
'h-4 w-4 text-text-tertiary',
!collapsedMerged && 'rotate-90',
'h-4 w-4 cursor-pointer text-text-quaternary group-hover/collapse:text-text-secondary',
collapsedMerged && 'rotate-[270deg]',
)}
/>
)
}
</div>
{trigger}
</div>
{operations}
</div>

4
web/app/components/workflow/nodes/_base/components/variable/object-child-tree-panel/show/field.tsx
View File

@ -43,12 +43,12 @@ const Field: FC<Props> = ({
onClick={toggleFold}
/>
)}
<div className={cn('system-sm-medium h-6 truncate leading-6 text-text-secondary', isRoot && rootClassName)}>{name}</div>
<div className={cn('system-sm-medium ml-[7px] h-6 truncate leading-6 text-text-secondary', isRoot && rootClassName)}>{name}</div>
<div className='system-xs-regular ml-3 shrink-0 leading-6 text-text-tertiary'>{getFieldType(payload)}</div>
{required && <div className='system-2xs-medium-uppercase ml-3 leading-6 text-text-warning'>{t('app.structOutput.required')}</div>}
</div>
{payload.description && (
<div className='flex'>
<div className='ml-[7px] flex'>
<div className='system-xs-regular w-0 grow truncate text-text-tertiary'>{payload.description}</div>
</div>
)}

4
web/app/components/workflow/nodes/_base/components/variable/object-child-tree-panel/tree-indent-line.tsx
View File

@ -14,9 +14,9 @@ const TreeIndentLine: FC<Props> = ({
}) => {
const depthArray = Array.from({ length: depth }, (_, index) => index)
return (
<div className={cn('ml-2.5 mr-2.5 flex space-x-[12px]', className)}>
<div className={cn('flex', className)}>
{depthArray.map(d => (
<div key={d} className={cn('w-px bg-divider-regular')}></div>
<div key={d} className={cn('ml-2.5 mr-2.5 w-px bg-divider-regular')}></div>
))}
</div>
)