AI/dify
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/langgenius/dify.git synced 2025-08-12 01:59:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: select field not work when it is not required (#5101)

Browse Source
This commit is contained in:
非法操作 2024-06-12 17:46:53 +08:00 committed by GitHub
parent ea69dc2a7e
commit e04fc9b304
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/core/tools/tool_manager.py
View File

@ -210,7 +210,7 @@ class ToolManager:
if parameter_rule.type == ToolParameter.ToolParameterType.SELECT:
# check if tool_parameter_config in options
options = list(map(lambda x: x.value, parameter_rule.options))
if parameter_value not in options:
if parameter_value is not None and parameter_value not in options:
raise ValueError(
f"tool parameter {parameter_rule.name} value {parameter_value} not in options {options}")

25
web/app/components/base/select/index.tsx
View File

@ -3,7 +3,7 @@ import type { FC } from 'react'
import React, { Fragment, useEffect, useState } from 'react'
import { Combobox, Listbox, Transition } from '@headlessui/react'
import classNames from 'classnames'
import { CheckIcon, ChevronDownIcon, ChevronUpIcon } from '@heroicons/react/20/solid'
import { CheckIcon, ChevronDownIcon, ChevronUpIcon, XMarkIcon } from '@heroicons/react/20/solid'
import { useTranslation } from 'react-i18next'
import {
PortalToFollowElem,
@ -184,11 +184,24 @@ const SimpleSelect: FC<ISelectProps> = ({
<div className={`relative h-9 ${wrapperClassName}`}>
<Listbox.Button className={`w-full h-full rounded-lg border-0 bg-gray-100 py-1.5 pl-3 pr-10 sm:text-sm sm:leading-6 focus-visible:outline-none focus-visible:bg-gray-200 group-hover:bg-gray-200 ${disabled ? 'cursor-not-allowed' : 'cursor-pointer'} ${className}`}>
<span className={classNames('block truncate text-left', !selectedItem?.name && 'text-gray-400')}>{selectedItem?.name ?? localPlaceholder}</span>
<span className="pointer-events-none absolute inset-y-0 right-0 flex items-center pr-2">
<ChevronDownIcon
className="h-5 w-5 text-gray-400"
aria-hidden="true"
/>
<span className="absolute inset-y-0 right-0 flex items-center pr-2">
{selectedItem
? (
<XMarkIcon
onClick={(e) => {
e.stopPropagation()
setSelectedItem(null)
}}
className="h-5 w-5 text-gray-400 cursor-pointer"
aria-hidden="false"
/>
)
: (
<ChevronDownIcon
className="h-5 w-5 text-gray-400"
aria-hidden="true"
/>
)}
</span>
</Listbox.Button>
{!disabled && (