Skip to content

armgit / dify

Public Imported from GitHub
0

Build Agentic workflows, RAG pipelines, with rich AI model and tool support on one collaborative workspace. Deploy on cloud, VPC, or self-hosted, so teams move from prototype to production without rebuilding the stack.

refactor(web): migrate workflow numeric configuration inputs (#42052)

yyh603176c17dfb
diff --git a/oxlint-suppressions.json b/oxlint-suppressions.json
index 40f35d90bf2..2d3cd5afd74 100644
--- a/oxlint-suppressions.json
+++ b/oxlint-suppressions.json
@@ -3328,14 +3328,6 @@
"count": 1
}
},
- "web/app/components/workflow/nodes/_base/components/memory-config.tsx": {
- "no-restricted-imports": {
- "count": 1
- },
- "unicorn/prefer-number-properties": {
- "count": 1
- }
- },
"web/app/components/workflow/nodes/_base/components/next-step/operator.tsx": {
"jsx-a11y/click-events-have-key-events": {
"count": 2
@@ -3796,21 +3788,11 @@
"count": 1
}
},
- "web/app/components/workflow/nodes/iteration/panel.tsx": {
- "no-restricted-imports": {
- "count": 1
- }
- },
"web/app/components/workflow/nodes/iteration/use-single-run-form-params.ts": {
"typescript/no-explicit-any": {
"count": 6
}
},
- "web/app/components/workflow/nodes/knowledge-base/components/index-method.tsx": {
- "no-restricted-imports": {
- "count": 1
- }
- },
"web/app/components/workflow/nodes/knowledge-base/components/option-card.tsx": {
"jsx-a11y/click-events-have-key-events": {
"count": 1
diff --git a/packages/dify-ui/src/number-field/index.tsx b/packages/dify-ui/src/number-field/index.tsx
index 672370d6465..087317b1b63 100644
--- a/packages/dify-ui/src/number-field/index.tsx
+++ b/packages/dify-ui/src/number-field/index.tsx
@@ -60,7 +60,7 @@ const numberFieldInputVariants = cva(
variants: {
size: {
medium: 'px-3 py-1.75 system-sm-regular',
- large: 'px-4 py-2 system-md-regular',
+ large: 'px-4 py-1.75 system-md-regular',
},
},
defaultVariants: {
@@ -106,7 +106,7 @@ function NumberFieldUnit({ className, size = 'medium', ...props }: NumberFieldUn
}
const numberFieldControlsVariants = cva(
- 'flex shrink-0 flex-col items-stretch border-l border-divider-subtle bg-transparent text-text-tertiary',
+ 'flex w-6 shrink-0 flex-col items-stretch border-l border-divider-subtle bg-transparent text-text-tertiary',
)
type NumberFieldControlsProps = React.ComponentProps<'div'>
@@ -117,7 +117,7 @@ function NumberFieldControls({ className, ...props }: NumberFieldControlsProps)
const numberFieldControlButtonVariants = cva(
[
- 'flex touch-manipulation items-center justify-center px-1.5 text-text-tertiary outline-hidden transition-colors select-none',
+ 'flex touch-manipulation items-center justify-center text-text-tertiary outline-hidden transition-colors select-none',
'hover:bg-components-input-bg-hover focus-visible:bg-components-input-bg-hover',
'focus-visible:inset-ring-2 focus-visible:inset-ring-state-accent-solid',
'disabled:cursor-not-allowed disabled:hover:bg-transparent disabled:focus-visible:bg-transparent disabled:focus-visible:ring-0',
@@ -140,22 +140,22 @@ const numberFieldControlButtonVariants = cva(
{
size: 'medium',
direction: 'increment',
- className: 'pt-1',
+ className: 'pt-0.75',
},
{
size: 'medium',
direction: 'decrement',
- className: 'pb-1',
+ className: 'pb-0.75',
},
{
size: 'large',
direction: 'increment',
- className: 'pt-1.5',
+ className: 'pt-1.25',
},
{
size: 'large',
direction: 'decrement',
- className: 'pb-1.5',
+ className: 'pb-1.25',
},
],
defaultVariants: {
diff --git a/web/app/components/workflow/nodes/_base/components/__tests__/memory-config.spec.tsx b/web/app/components/workflow/nodes/_base/components/__tests__/memory-config.spec.tsx
new file mode 100644
index 00000000000..3a7903f31c4
--- /dev/null
+++ b/web/app/components/workflow/nodes/_base/components/__tests__/memory-config.spec.tsx
@@ -0,0 +1,87 @@
+import type { Memory } from '../../../../types'
+import { render, screen } from '@testing-library/react'
+import userEvent from '@testing-library/user-event'
+import { useState } from 'react'
+import MemoryConfig from '../memory-config'
+
+function MemorySettings({ readonly = false, onChange = (_memory?: Memory) => {} }) {
+ const [memory, setMemory] = useState<Memory | undefined>({
+ window: { enabled: true, size: 50 },
+ query_prompt_template: '{{#sys.query#}}',
+ role_prefix: { user: 'Human', assistant: 'Assistant' },
+ })
+ return (
+ <MemoryConfig
+ config={{ data: memory }}
+ readonly={readonly}
+ canSetRoleName
+ onChange={(value) => {
+ setMemory(value)
+ onChange(value)
+ }}
+ />
+ )
+}
+
+describe('memory settings', () => {
+ it('keeps a valid window while clearing, and synchronizes integer edits with the slider', async () => {
+ const user = userEvent.setup()
+ const onChange = vi.fn()
+ render(<MemorySettings onChange={onChange} />)
+ const input = screen.getByRole('textbox', { name: 'workflow.nodes.common.memory.windowSize' })
+ const slider = screen.getByRole('slider', { name: 'workflow.nodes.common.memory.windowSize' })
+
+ await user.clear(input)
+ expect(onChange).not.toHaveBeenCalled()
+ await user.tab()
+ expect(input).toHaveValue('50')
+
+ await user.clear(input)
+ await user.type(input, '8.9')
+ await user.tab()
+ expect(input).toHaveValue('9')
+ expect(slider).toHaveAttribute('aria-valuenow', '9')
+ expect(onChange).toHaveBeenLastCalledWith(
+ expect.objectContaining({ window: { enabled: true, size: 9 } }),
+ )
+
+ await user.click(slider)
+ await user.keyboard('{ArrowRight}')
+ expect(input).toHaveValue('10')
+ })
+
+ it('clamps the window to its business limit without changing the role prefixes', async () => {
+ const user = userEvent.setup()
+ const onChange = vi.fn()
+ render(<MemorySettings onChange={onChange} />)
+ const input = screen.getByRole('textbox', { name: 'workflow.nodes.common.memory.windowSize' })
+ await user.clear(input)
+ await user.type(input, '999')
+ await user.tab()
+ expect(input).toHaveValue('100')
+ expect(onChange).toHaveBeenLastCalledWith(
+ expect.objectContaining({
+ window: { enabled: true, size: 100 },
+ role_prefix: { user: 'Human', assistant: 'Assistant' },
+ }),
+ )
+ })
+
+ it('connects role labels to editable inputs and preserves readonly settings', async () => {
+ const user = userEvent.setup()
+ const { rerender } = render(<MemorySettings />)
+ const input = screen.getByRole('textbox', { name: 'workflow.nodes.common.memory.user' })
+ await user.click(screen.getByText('workflow.nodes.common.memory.user'))
+ expect(input).toHaveFocus()
+ await user.clear(input)
+ await user.type(input, 'User')
+ expect(input).toHaveValue('User')
+
+ rerender(<MemorySettings readonly />)
+ await user.type(input, ' changed')
+ expect(input).toHaveValue('User')
+ expect(
+ screen.getByRole('textbox', { name: 'workflow.nodes.common.memory.windowSize' }),
+ ).toBeDisabled()
+ })
+})
diff --git a/web/app/components/workflow/nodes/_base/components/memory-config.tsx b/web/app/components/workflow/nodes/_base/components/memory-config.tsx
index 427847d36f0..25f5ac26420 100644
--- a/web/app/components/workflow/nodes/_base/components/memory-config.tsx
+++ b/web/app/components/workflow/nodes/_base/components/memory-config.tsx
@@ -3,6 +3,8 @@ import type { FC } from 'react'
import type { Memory } from '../../../types'
import { cn } from '@langgenius/dify-ui/cn'
import { Fieldset, FieldsetLegend } from '@langgenius/dify-ui/fieldset'
+import { Input } from '@langgenius/dify-ui/input'
+import { NumberField, NumberFieldGroup, NumberFieldInput } from '@langgenius/dify-ui/number-field'
import {
Slider,
SliderControl,
@@ -14,9 +16,8 @@ import {
import { Switch } from '@langgenius/dify-ui/switch'
import { produce } from 'immer'
import * as React from 'react'
-import { useCallback } from 'react'
+import { useCallback, useId } from 'react'
import { useTranslation } from 'react-i18next'
-import Input from '@/app/components/base/input'
import Field from '@/app/components/workflow/nodes/_base/components/field'
import { MemoryRole } from '../../../types'
@@ -31,22 +32,22 @@ type RoleItemProps = {
onChange: (value: string) => void
}
const RoleItem: FC<RoleItemProps> = ({ readonly, title, value, onChange }) => {
- const handleChange = useCallback(
- (e: React.ChangeEvent<HTMLInputElement>) => {
- onChange(e.target.value)
- },
- [onChange],
- )
+ const inputId = useId()
return (
<div className="flex items-center justify-between">
- <div className="text-[13px] font-normal text-text-secondary">{title}</div>
- <Input
- readOnly={readonly}
- value={value}
- onChange={handleChange}
- className="h-8 w-50"
- type="text"
- />
+ <label htmlFor={inputId} className="text-[13px] font-normal text-text-secondary">
+ {title}
+ </label>
+ <div className="w-full">
+ <Input
+ id={inputId}
+ readOnly={readonly}
+ value={value}
+ onValueChange={onChange}
+ className="h-8 w-50"
+ type="text"
+ />
+ </div>
</div>
)
}
@@ -75,6 +76,8 @@ const MemoryConfig: FC<Props> = ({
}) => {
const { t } = useTranslation()
const payload = config.data
+ const windowInputId = useId()
+ const windowSize = payload?.window?.size ?? WINDOW_SIZE_DEFAULT
const windowSizeLabel = t(($) => $[`${i18nPrefix}.windowSize`], { ns: 'workflow' })
const handleMemoryEnabledChange = useCallback(
(enabled: boolean) => {
@@ -96,36 +99,17 @@ const MemoryConfig: FC<Props> = ({
)
const handleWindowSizeChange = useCallback(
- (size: number | string) => {
+ (size: number | null) => {
+ if (size === null) return
const newPayload = produce(payload || defaultMemory, (draft) => {
if (!draft.window) draft.window = { enabled: true, size: WINDOW_SIZE_DEFAULT }
- let limitedSize: null | string | number = size
- if (limitedSize === '') {
- limitedSize = null
- } else {
- limitedSize = Number.parseInt(limitedSize as string, 10)
- if (isNaN(limitedSize)) limitedSize = WINDOW_SIZE_DEFAULT
-
- if (limitedSize < WINDOW_SIZE_MIN) limitedSize = WINDOW_SIZE_MIN
-
- if (limitedSize > WINDOW_SIZE_MAX) limitedSize = WINDOW_SIZE_MAX
- }
-
- draft.window.size = limitedSize as number
+ draft.window.size = size
})
onChange(newPayload)
},
[payload, defaultMemory, onChange],
)
- const handleBlur = useCallback(() => {
- const payload = config.data
- if (!payload) return
-
- if (payload.window.size === '' || payload.window.size === null)
- handleWindowSizeChange(WINDOW_SIZE_DEFAULT)
- }, [handleWindowSizeChange, config])
-
const handleRolePrefixChange = useCallback(
(role: MemoryRole) => {
return (value: string) => {
@@ -168,15 +152,18 @@ const MemoryConfig: FC<Props> = ({
size="md"
disabled={readonly}
/>
- <div className="system-xs-medium-uppercase text-text-tertiary">
+ <label
+ htmlFor={windowInputId}
+ className="system-xs-medium-uppercase text-text-tertiary"
+ >
{windowSizeLabel}
- </div>
+ </label>
</div>
- <Fieldset className="flex h-8 items-center space-x-2">
+ <Fieldset className="flex h-8 items-center gap-2">
<FieldsetLegend className="sr-only">{windowSizeLabel}</FieldsetLegend>
<Slider
className="w-36"
- value={(payload.window?.size || WINDOW_SIZE_DEFAULT) as number}
+ value={windowSize}
min={WINDOW_SIZE_MIN}
max={WINDOW_SIZE_MAX}
step={1}
@@ -191,19 +178,21 @@ const MemoryConfig: FC<Props> = ({
</SliderTrack>
</SliderControl>
</Slider>
- <Input
- aria-label={windowSizeLabel}
- value={(payload.window?.size || WINDOW_SIZE_DEFAULT) as number}
- wrapperClassName="w-12"
- className="appearance-none pr-0"
- type="number"
+ <NumberField
+ id={windowInputId}
+ value={windowSize}
+ className="w-12"
min={WINDOW_SIZE_MIN}
max={WINDOW_SIZE_MAX}
step={1}
- onChange={(e) => handleWindowSizeChange(e.target.value)}
- onBlur={handleBlur}
+ format={{ maximumFractionDigits: 0 }}
+ onValueChange={handleWindowSizeChange}
disabled={readonly || !payload.window?.enabled}
- />
+ >
+ <NumberFieldGroup>
+ <NumberFieldInput className="pr-0" />
+ </NumberFieldGroup>
+ </NumberField>
</Fieldset>
</div>
{canSetRoleName && (
diff --git a/web/app/components/workflow/nodes/iteration/__tests__/integration.spec.tsx b/web/app/components/workflow/nodes/iteration/__tests__/integration.spec.tsx
index af9d480276b..c1040ccb82b 100644
--- a/web/app/components/workflow/nodes/iteration/__tests__/integration.spec.tsx
+++ b/web/app/components/workflow/nodes/iteration/__tests__/integration.spec.tsx
@@ -1,7 +1,7 @@
import type { IterationNodeType } from '../types'
import type { PanelProps } from '@/types/workflow'
import { toast } from '@langgenius/dify-ui/toast'
-import { fireEvent, render, screen } from '@testing-library/react'
+import { render, screen } from '@testing-library/react'
import userEvent from '@testing-library/user-event'
import { ErrorHandleMode } from '@/app/components/workflow/types'
import { BlockEnum, VarType } from '../../../types'
@@ -189,7 +189,11 @@ describe('iteration path', () => {
await user.click(screen.getByRole('button', { name: 'pick-input-var' }))
await user.click(screen.getByRole('button', { name: 'pick-output-var' }))
await user.click(screen.getAllByRole('switch')[0]!)
- fireEvent.change(screen.getByRole('spinbutton'), { target: { value: '7' } })
+ const parallelInput = screen.getByRole('textbox', {
+ name: 'workflow.nodes.iteration.MaxParallelismTitle',
+ })
+ await user.clear(parallelInput)
+ await user.type(parallelInput, '7')
await user.click(screen.getByRole('combobox'))
await user.click(
screen.getByRole('option', { name: 'workflow.nodes.iteration.ErrorMethod.continueOnError' }),
@@ -223,6 +227,44 @@ describe('iteration path', () => {
render(<Panel id="iteration-node" data={createData()} panelProps={panelProps} />)
- expect(screen.queryByRole('spinbutton')).not.toBeInTheDocument()
+ expect(
+ screen.queryByRole('textbox', { name: 'workflow.nodes.iteration.MaxParallelismTitle' }),
+ ).not.toBeInTheDocument()
+ })
+
+ it('does not save an empty parallel count and restores the configured value on blur', async () => {
+ const user = userEvent.setup()
+ const changeParallelNums = vi.fn()
+ mockUseConfig.mockReturnValue(
+ createConfigResult({
+ inputs: createData({ is_parallel: true }),
+ changeParallelNums,
+ }),
+ )
+ render(<Panel id="iteration-node" data={createData()} panelProps={panelProps} />)
+ const input = screen.getByRole('textbox', {
+ name: 'workflow.nodes.iteration.MaxParallelismTitle',
+ })
+ await user.clear(input)
+ await user.tab()
+ expect(changeParallelNums).not.toHaveBeenCalled()
+ expect(input).toHaveValue('3')
+ })
+
+ it('disables both parallel count controls in readonly mode', () => {
+ mockUseConfig.mockReturnValue(
+ createConfigResult({
+ inputs: createData({ is_parallel: true }),
+ readOnly: true,
+ }),
+ )
+ render(<Panel id="iteration-node" data={createData()} panelProps={panelProps} />)
+ expect(
+ screen.getByRole('textbox', { name: 'workflow.nodes.iteration.MaxParallelismTitle' }),
+ ).toBeDisabled()
+ expect(
+ screen.getByRole('slider', { name: 'workflow.nodes.iteration.MaxParallelismTitle' }),
+ ).toBeDisabled()
+ expect(screen.getByRole('button', { name: 'Increment value' })).toBeDisabled()
})
})
diff --git a/web/app/components/workflow/nodes/iteration/panel.tsx b/web/app/components/workflow/nodes/iteration/panel.tsx
index 9237f7ac4aa..f2e183e98df 100644
--- a/web/app/components/workflow/nodes/iteration/panel.tsx
+++ b/web/app/components/workflow/nodes/iteration/panel.tsx
@@ -2,6 +2,14 @@ import type { FC } from 'react'
import type { IterationNodeType } from './types'
import type { NodePanelProps } from '@/app/components/workflow/types'
import { Fieldset, FieldsetLegend } from '@langgenius/dify-ui/fieldset'
+import {
+ NumberField,
+ NumberFieldControls,
+ NumberFieldDecrement,
+ NumberFieldGroup,
+ NumberFieldIncrement,
+ NumberFieldInput,
+} from '@langgenius/dify-ui/number-field'
import {
Select,
SelectContent,
@@ -22,7 +30,6 @@ import {
import { Switch } from '@langgenius/dify-ui/switch'
import * as React from 'react'
import { useTranslation } from 'react-i18next'
-import Input from '@/app/components/base/input'
import Field from '@/app/components/workflow/nodes/_base/components/field'
import { ErrorHandleMode } from '@/app/components/workflow/types'
import { MAX_PARALLEL_LIMIT } from '@/config'
@@ -138,20 +145,29 @@ const Panel: FC<NodePanelProps<IterationNodeType>> = ({ id, data }) => {
</div>
}
>
- <Fieldset className="row flex">
+ <Fieldset className="flex gap-4">
<FieldsetLegend className="sr-only">{maxParallelismLabel}</FieldsetLegend>
- <Input
- aria-label={maxParallelismLabel}
- type="number"
- wrapperClassName="w-18 mr-4"
+ <NumberField
+ className="w-18 shrink-0"
max={MAX_PARALLEL_LIMIT}
min={MIN_ITERATION_PARALLEL_NUM}
value={inputs.parallel_nums}
- onChange={(e) => {
- changeParallelNums(Number(e.target.value))
+ disabled={readOnly}
+ format={{ maximumFractionDigits: 0 }}
+ onValueChange={(value) => {
+ if (value !== null) changeParallelNums(value)
}}
- />
+ >
+ <NumberFieldGroup>
+ <NumberFieldInput aria-label={maxParallelismLabel} className="px-2" />
+ <NumberFieldControls>
+ <NumberFieldIncrement />
+ <NumberFieldDecrement />
+ </NumberFieldControls>
+ </NumberFieldGroup>
+ </NumberField>
<Slider
+ disabled={readOnly}
value={inputs.parallel_nums}
onValueChange={changeParallelNums}
max={MAX_PARALLEL_LIMIT}
diff --git a/web/app/components/workflow/nodes/knowledge-base/components/__tests__/index-method.spec.tsx b/web/app/components/workflow/nodes/knowledge-base/components/__tests__/index-method.spec.tsx
index 41a7b6a0f86..e7217579cb3 100644
--- a/web/app/components/workflow/nodes/knowledge-base/components/__tests__/index-method.spec.tsx
+++ b/web/app/components/workflow/nodes/knowledge-base/components/__tests__/index-method.spec.tsx
@@ -1,9 +1,28 @@
-import { fireEvent, render, screen } from '@testing-library/react'
+import { render, screen } from '@testing-library/react'
+import userEvent from '@testing-library/user-event'
+import { useState } from 'react'
import { ChunkStructureEnum, IndexMethodEnum } from '../../types'
import IndexMethod from '../index-method'
+function KeywordSettings({ onChange }: { onChange: (value: number) => void }) {
+ const [value, setValue] = useState(5)
+ return (
+ <IndexMethod
+ chunkStructure={ChunkStructureEnum.general}
+ indexMethod={IndexMethodEnum.ECONOMICAL}
+ keywordNumber={value}
+ onIndexMethodChange={vi.fn()}
+ onKeywordNumberChange={(value) => {
+ setValue(value)
+ onChange(value)
+ }}
+ />
+ )
+}
+
describe('IndexMethod', () => {
- it('should render both index method options for general chunks and notify option changes', () => {
+ it('should render both index method options for general chunks and notify option changes', async () => {
+ const user = userEvent.setup()
const onIndexMethodChange = vi.fn()
render(
@@ -20,32 +39,34 @@ describe('IndexMethod', () => {
expect(screen.getByText('datasetSettings.form.indexMethodEconomy')).toBeInTheDocument()
expect(screen.getByText('datasetCreation.stepTwo.recommend')).toBeInTheDocument()
- fireEvent.click(screen.getByText('datasetSettings.form.indexMethodEconomy'))
+ await user.click(screen.getByText('datasetSettings.form.indexMethodEconomy'))
expect(onIndexMethodChange).toHaveBeenCalledWith(IndexMethodEnum.ECONOMICAL)
})
- it('should update the keyword number when the economical option is active', () => {
+ it('shares integer keyword edits with the slider and retains the value when cleared', async () => {
+ const user = userEvent.setup()
const onKeywordNumberChange = vi.fn()
- const { container } = render(
- <IndexMethod
- chunkStructure={ChunkStructureEnum.general}
- indexMethod={IndexMethodEnum.ECONOMICAL}
- keywordNumber={5}
- onIndexMethodChange={vi.fn()}
- onKeywordNumberChange={onKeywordNumberChange}
- />,
- )
-
- fireEvent.change(container.querySelector('input') as HTMLInputElement, {
- target: { value: '7' },
- })
-
- expect(onKeywordNumberChange).toHaveBeenCalledWith(7, expect.anything())
+ render(<KeywordSettings onChange={onKeywordNumberChange} />)
+ const input = screen.getByRole('textbox', { name: 'datasetSettings.form.numberOfKeywords' })
+ await user.clear(input)
+ await user.tab()
+ expect(onKeywordNumberChange).not.toHaveBeenCalled()
+ expect(input).toHaveValue('5')
+ await user.clear(input)
+ await user.type(input, '7.8')
+ await user.tab()
+ expect(input).toHaveValue('8')
+ expect(onKeywordNumberChange).toHaveBeenLastCalledWith(8)
+ expect(
+ screen.getByRole('slider', { name: 'datasetSettings.form.numberOfKeywords' }),
+ ).toHaveAttribute('aria-valuenow', '8')
+ await user.click(screen.getByRole('button', { name: 'Increment value' }))
+ expect(input).toHaveValue('9')
})
it('should disable keyword controls when readonly is enabled', () => {
- const { container } = render(
+ render(
<IndexMethod
chunkStructure={ChunkStructureEnum.general}
indexMethod={IndexMethodEnum.ECONOMICAL}
@@ -56,7 +77,10 @@ describe('IndexMethod', () => {
/>,
)
- expect(container.querySelector('input')).toBeDisabled()
+ expect(
+ screen.getByRole('textbox', { name: 'datasetSettings.form.numberOfKeywords' }),
+ ).toBeDisabled()
+ expect(screen.getByRole('button', { name: 'Increment value' })).toBeDisabled()
})
it('should hide the economical option for non-general chunk structures', () => {
diff --git a/web/app/components/workflow/nodes/knowledge-base/components/index-method.tsx b/web/app/components/workflow/nodes/knowledge-base/components/index-method.tsx
index 82ddcc976ca..e7a88756d54 100644
--- a/web/app/components/workflow/nodes/knowledge-base/components/index-method.tsx
+++ b/web/app/components/workflow/nodes/knowledge-base/components/index-method.tsx
@@ -1,5 +1,13 @@
import { cn } from '@langgenius/dify-ui/cn'
import { Fieldset, FieldsetLegend } from '@langgenius/dify-ui/fieldset'
+import {
+ NumberField,
+ NumberFieldControls,
+ NumberFieldDecrement,
+ NumberFieldGroup,
+ NumberFieldIncrement,
+ NumberFieldInput,
+} from '@langgenius/dify-ui/number-field'
import {
Slider,
SliderControl,
@@ -8,11 +16,10 @@ import {
SliderThumb,
SliderTrack,
} from '@langgenius/dify-ui/slider'
-import { memo, useCallback } from 'react'
+import { memo, useCallback, useId } from 'react'
import { useTranslation } from 'react-i18next'
import { Economic, HighQuality } from '@/app/components/base/icons/src/vender/knowledge'
import { Infotip } from '@/app/components/base/infotip'
-import Input from '@/app/components/base/input'
import { Field } from '@/app/components/workflow/nodes/_base/components/layout'
import { ChunkStructureEnum, IndexMethodEnum } from '../types'
import OptionCard from './option-card'
@@ -34,6 +41,7 @@ const IndexMethod = ({
readonly = false,
}: IndexMethodProps) => {
const { t } = useTranslation()
+ const keywordInputId = useId()
const keywordNumberLabel = t(($) => $['form.numberOfKeywords'], { ns: 'datasetSettings' })
const isHighQuality = indexMethod === IndexMethodEnum.QUALIFIED
const isEconomy = indexMethod === IndexMethodEnum.ECONOMICAL
@@ -46,9 +54,8 @@ const IndexMethod = ({
)
const handleInputChange = useCallback(
- (e: React.ChangeEvent<HTMLInputElement>) => {
- const value = Number(e.target.value)
- if (!Number.isNaN(value)) onKeywordNumberChange(value)
+ (value: number | null) => {
+ if (value !== null) onKeywordNumberChange(value)
},
[onKeywordNumberChange],
)
@@ -100,9 +107,12 @@ const IndexMethod = ({
<Fieldset className="flex items-center">
<FieldsetLegend className="sr-only">{keywordNumberLabel}</FieldsetLegend>
<div className="flex grow items-center">
- <div className="truncate system-xs-medium text-text-secondary">
+ <label
+ htmlFor={keywordInputId}
+ className="truncate system-xs-medium text-text-secondary"
+ >
{keywordNumberLabel}
- </div>
+ </label>
<Infotip aria-label={keywordNumberLabel} className="ml-0.5 size-3.5">
{keywordNumberLabel}
</Infotip>
@@ -121,15 +131,23 @@ const IndexMethod = ({
</SliderTrack>
</SliderControl>
</Slider>
- <Input
- aria-label={keywordNumberLabel}
+ <NumberField
+ id={keywordInputId}
disabled={readonly}
- className="shrink-0"
- wrapperClassName="shrink-0 w-[72px]"
- type="number"
+ className="w-18 shrink-0"
+ min={0}
+ format={{ maximumFractionDigits: 0 }}
value={keywordNumber}
- onChange={handleInputChange}
- />
+ onValueChange={handleInputChange}
+ >
+ <NumberFieldGroup>
+ <NumberFieldInput className="px-2" />
+ <NumberFieldControls>
+ <NumberFieldIncrement />
+ <NumberFieldDecrement />
+ </NumberFieldControls>
+ </NumberFieldGroup>
+ </NumberField>
</Fieldset>
</OptionCard>
)}
diff --git a/web/app/components/workflow/nodes/trigger-webhook/panel.tsx b/web/app/components/workflow/nodes/trigger-webhook/panel.tsx
index 685bbc1b45a..c4c0b52bd5a 100644
--- a/web/app/components/workflow/nodes/trigger-webhook/panel.tsx
+++ b/web/app/components/workflow/nodes/trigger-webhook/panel.tsx
@@ -279,7 +279,6 @@ const Panel: FC<NodePanelProps<WebhookTriggerNodeType>> = ({ id, data }) => {
<NumberFieldGroup>
<NumberFieldInput
aria-label={t(($) => $[`${i18nPrefix}.statusCode`], { ns: 'workflow' })}
- className="h-8"
/>
<NumberFieldControls>
<NumberFieldIncrement />
diff --git a/web/app/components/workflow/types.ts b/web/app/components/workflow/types.ts
index 0989272e46e..6ffba0b4713 100644
--- a/web/app/components/workflow/types.ts
+++ b/web/app/components/workflow/types.ts
@@ -282,7 +282,7 @@ export type Memory = {
role_prefix?: RolePrefix
window: {
enabled: boolean
- size: number | string | null
+ size: number | null
}
query_prompt_template: string
}
diff --git a/web/vite.config.ts b/web/vite.config.ts
index 1adf7ad8f35..43b2b7a31cb 100644
--- a/web/vite.config.ts
+++ b/web/vite.config.ts
@@ -105,6 +105,9 @@ export default defineConfig(({ command, mode, isPreview }) => {
}),
optimizeDeps: {
include: [
+ '@base-ui/react/fieldset',
+ '@base-ui/react/number-field',
+ '@base-ui/react/slider',
'vite-plus/test/browser',
'dayjs/plugin/relativeTime',
'react-textarea-autosize',