youngkingdom/dify
1
0
Fork 0
mirror of https://github.com/langgenius/dify.git synced 2026-05-01 16:08:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore: choose tools show

Browse Source
This commit is contained in:
Joel
2026-01-22 15:47:28 +08:00
parent 219f4a2f3b
commit 2c95622890
7 changed files with 39 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
web/app/components/workflow/block-selector/all-tools.tsx
View File

@ -277,6 +277,7 @@ const AllTools = ({
viewType={isSupportGroupView ? activeView : ViewType.flat}
hasSearchText={hasSearchText}
selectedTools={selectedTools}
hideSelectedInfo={hideFeaturedTool}
/>
</>
)}

3
web/app/components/workflow/block-selector/tool/tool-list-flat-view/list.tsx
View File

@ -18,6 +18,7 @@ type Props = {
letters: string[]
toolRefs: any
selectedTools?: ToolValue[]
hideSelectedInfo?: boolean
}
const ToolViewFlatView: FC<Props> = ({
@ -31,6 +32,7 @@ const ToolViewFlatView: FC<Props> = ({
onSelectMultiple,
toolRefs,
selectedTools,
hideSelectedInfo,
}) => {
const firstLetterToolIds = useMemo(() => {
const res: Record<string, string> = {}
@ -61,6 +63,7 @@ const ToolViewFlatView: FC<Props> = ({
canNotSelectMultiple={canNotSelectMultiple}
onSelectMultiple={onSelectMultiple}
selectedTools={selectedTools}
hideSelectedInfo={hideSelectedInfo}
/>
</div>
))}

3
web/app/components/workflow/block-selector/tool/tool-list-tree-view/item.tsx
View File

@ -14,6 +14,7 @@ type Props = {
canNotSelectMultiple?: boolean
onSelectMultiple?: (type: BlockEnum, tools: ToolDefaultValue[]) => void
selectedTools?: ToolValue[]
hideSelectedInfo?: boolean
}
const Item: FC<Props> = ({
@ -24,6 +25,7 @@ const Item: FC<Props> = ({
canNotSelectMultiple,
onSelectMultiple,
selectedTools,
hideSelectedInfo,
}) => {
return (
<div>
@ -41,6 +43,7 @@ const Item: FC<Props> = ({
canNotSelectMultiple={canNotSelectMultiple}
onSelectMultiple={onSelectMultiple}
selectedTools={selectedTools}
hideSelectedInfo={hideSelectedInfo}
/>
))}
</div>

3
web/app/components/workflow/block-selector/tool/tool-list-tree-view/list.tsx
View File

@ -15,6 +15,7 @@ type Props = {
canNotSelectMultiple?: boolean
onSelectMultiple?: (type: BlockEnum, tools: ToolDefaultValue[]) => void
selectedTools?: ToolValue[]
hideSelectedInfo?: boolean
}
const ToolListTreeView: FC<Props> = ({
@ -24,6 +25,7 @@ const ToolListTreeView: FC<Props> = ({
canNotSelectMultiple,
onSelectMultiple,
selectedTools,
hideSelectedInfo,
}) => {
const { t } = useTranslation()
const getI18nGroupName = useCallback((name: string) => {
@ -54,6 +56,7 @@ const ToolListTreeView: FC<Props> = ({
canNotSelectMultiple={canNotSelectMultiple}
onSelectMultiple={onSelectMultiple}
selectedTools={selectedTools}
hideSelectedInfo={hideSelectedInfo}
/>
))}
</div>

4
web/app/components/workflow/block-selector/tool/tool.tsx
View File

@ -40,6 +40,7 @@ type Props = {
onSelectMultiple?: (type: BlockEnum, tools: ToolDefaultValue[]) => void
selectedTools?: ToolValue[]
isShowLetterIndex?: boolean
hideSelectedInfo?: boolean
}
const Tool: FC<Props> = ({
@ -51,6 +52,7 @@ const Tool: FC<Props> = ({
canNotSelectMultiple,
onSelectMultiple,
selectedTools,
hideSelectedInfo,
}) => {
const { t } = useTranslation()
const { allowed: isMCPToolAllowed } = useMCPToolAvailability()
@ -226,7 +228,7 @@ const Tool: FC<Props> = ({
</div>
<div className="ml-2 flex items-center">
{!isShowCanNotChooseMCPTip && !canNotSelectMultiple && (notShowProvider ? notShowProviderSelectInfo : selectedInfo)}
{!isShowCanNotChooseMCPTip && !canNotSelectMultiple && (notShowProvider ? notShowProviderSelectInfo : (!hideSelectedInfo && selectedInfo))}
{isShowCanNotChooseMCPTip && <McpToolNotSupportTooltip />}
{hasAction && (
<FoldIcon className={cn('h-4 w-4 shrink-0 text-text-tertiary group-hover/item:text-text-tertiary', isFold && 'text-text-quaternary')} />

4
web/app/components/workflow/block-selector/tools.tsx
View File

@ -21,6 +21,7 @@ type ToolsProps = {
className?: string
indexBarClassName?: string
selectedTools?: ToolValue[]
hideSelectedInfo?: boolean
}
const Tools = ({
onSelect,
@ -34,6 +35,7 @@ const Tools = ({
className,
indexBarClassName,
selectedTools,
hideSelectedInfo,
}: ToolsProps) => {
// const tools: any = []
const language = useGetLanguage()
@ -107,6 +109,7 @@ const Tools = ({
canNotSelectMultiple={canNotSelectMultiple}
onSelectMultiple={onSelectMultiple}
selectedTools={selectedTools}
hideSelectedInfo={hideSelectedInfo}
indexBar={<IndexBar letters={letters} itemRefs={toolRefs} className={indexBarClassName} />}
/>
)
@ -118,6 +121,7 @@ const Tools = ({
canNotSelectMultiple={canNotSelectMultiple}
onSelectMultiple={onSelectMultiple}
selectedTools={selectedTools}
hideSelectedInfo={hideSelectedInfo}
/>
)
)}

34
web/app/components/workflow/skill/editor/skill-editor/plugins/tool-block/component.tsx
View File

@ -395,6 +395,10 @@ const ToolBlockComponent: FC<ToolBlockComponentProps> = ({
setToolValue(prev => (prev ? { ...prev, credential_id: id } : prev))
}
const needAuthorization = useMemo(() => {
return !(!currentProvider || currentProvider.type !== CollectionType.builtIn || !currentProvider.allow_delete)
}, [currentProvider])
const toolSettingsContent = currentProvider && currentTool && toolValue && (
<>
<ToolHeader
@ -404,18 +408,24 @@ const ToolBlockComponent: FC<ToolBlockComponentProps> = ({
description={toolDescriptionText}
onClose={() => setIsSettingOpen(false)}
/>
<ToolAuthorizationSection
currentProvider={currentProvider}
credentialId={toolValue.credential_id}
onAuthorizationItemClick={handleAuthorizationItemClick}
/>
<ToolSettingsSection
currentProvider={currentProvider}
currentTool={currentTool}
value={toolValue}
onChange={handleToolValueChange}
nodeId={undefined}
/>
{needAuthorization && (
<>
<ToolAuthorizationSection
currentProvider={currentProvider}
credentialId={toolValue.credential_id}
onAuthorizationItemClick={handleAuthorizationItemClick}
/>
</>
)}
{!needAuthorization && (
<ToolSettingsSection
currentProvider={currentProvider}
currentTool={currentTool}
value={toolValue}
onChange={handleToolValueChange}
nodeId={undefined}
/>
)}
</>
)