admin/dify
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: not set empty tool config to default value (#29338)

Browse Source
This commit is contained in:
Joel
2025-12-09 17:14:04 +08:00
committed by GitHub
parent f5d676f3f1
commit d79d0a47a7
1 changed files with 4 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
web/app/components/app/configuration/config/agent/agent-tools/setting-built-in-tool.tsx
View File

@@ -16,7 +16,7 @@ import Description from '@/app/components/plugins/card/base/description'
import TabSlider from '@/app/components/base/tab-slider-plain' import TabSlider from '@/app/components/base/tab-slider-plain'
import Button from '@/app/components/base/button' import Button from '@/app/components/base/button'
import Form from '@/app/components/header/account-setting/model-provider-page/model-modal/Form' import Form from '@/app/components/header/account-setting/model-provider-page/model-modal/Form'
import { addDefaultValue, toolParametersToFormSchemas } from '@/app/components/tools/utils/to-form-schema' import { toolParametersToFormSchemas } from '@/app/components/tools/utils/to-form-schema'
import type { Collection, Tool } from '@/app/components/tools/types' import type { Collection, Tool } from '@/app/components/tools/types'
import { CollectionType } from '@/app/components/tools/types' import { CollectionType } from '@/app/components/tools/types'
import { fetchBuiltInToolList, fetchCustomToolList, fetchModelToolList, fetchWorkflowToolList } from '@/service/tools' import { fetchBuiltInToolList, fetchCustomToolList, fetchModelToolList, fetchWorkflowToolList } from '@/service/tools'
@@ -73,15 +73,8 @@ const SettingBuiltInTool: FC<Props> = ({
const [currType, setCurrType] = useState('info') const [currType, setCurrType] = useState('info')
const isInfoActive = currType === 'info' const isInfoActive = currType === 'info'
useEffect(() => { useEffect(() => {
if (!collection) if (!collection || hasPassedTools)
return return
if (hasPassedTools) {
if (currTool) {
const formSchemas = toolParametersToFormSchemas(currTool.parameters)
setTempSetting(addDefaultValue(setting, formSchemas))
}
return
}
(async () => { (async () => {
setIsLoading(true) setIsLoading(true)
@@ -99,15 +92,11 @@ const SettingBuiltInTool: FC<Props> = ({
}()) }())
}) })
setTools(list) setTools(list)
const currTool = list.find(tool => tool.name === toolName)
if (currTool) {
const formSchemas = toolParametersToFormSchemas(currTool.parameters)
setTempSetting(addDefaultValue(setting, formSchemas))
}
} }
catch { } catch { }
setIsLoading(false) setIsLoading(false)
})() })()
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [collection?.name, collection?.id, collection?.type]) }, [collection?.name, collection?.id, collection?.type])
useEffect(() => { useEffect(() => {
@@ -256,7 +245,7 @@ const SettingBuiltInTool: FC<Props> = ({
{!readonly && !isInfoActive && ( {!readonly && !isInfoActive && (
<div className='flex shrink-0 justify-end space-x-2 rounded-b-[10px] bg-components-panel-bg py-2'> <div className='flex shrink-0 justify-end space-x-2 rounded-b-[10px] bg-components-panel-bg py-2'>
<Button className='flex h-8 items-center !px-3 !text-[13px] font-medium ' onClick={onHide}>{t('common.operation.cancel')}</Button> <Button className='flex h-8 items-center !px-3 !text-[13px] font-medium ' onClick={onHide}>{t('common.operation.cancel')}</Button>
<Button className='flex h-8 items-center !px-3 !text-[13px] font-medium' variant='primary' disabled={!isValid} onClick={() => onSave?.(addDefaultValue(tempSetting, formSchemas))}>{t('common.operation.save')}</Button> <Button className='flex h-8 items-center !px-3 !text-[13px] font-medium' variant='primary' disabled={!isValid} onClick={() => onSave?.(tempSetting)}>{t('common.operation.save')}</Button>
</div> </div>
)} )}
</div> </div>