From 6795015d00d631a9ff2d479171b54c88bbb1b768 Mon Sep 17 00:00:00 2001 From: zhsama Date: Sun, 28 Sep 2025 15:42:38 +0800 Subject: [PATCH] refactor: enhance type definitions and update import paths in form input and trigger components --- .../workflow/nodes/_base/components/form-input-item.tsx | 7 +++++-- .../_base/components/variable/var-reference-picker.tsx | 3 ++- .../nodes/trigger-plugin/components/trigger-form/index.tsx | 4 ++-- .../nodes/trigger-plugin/components/trigger-form/item.tsx | 2 +- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/web/app/components/workflow/nodes/_base/components/form-input-item.tsx b/web/app/components/workflow/nodes/_base/components/form-input-item.tsx index 44a0081592..240871fc13 100644 --- a/web/app/components/workflow/nodes/_base/components/form-input-item.tsx +++ b/web/app/components/workflow/nodes/_base/components/form-input-item.tsx @@ -10,6 +10,7 @@ import { useFetchDynamicOptions } from '@/service/use-plugins' import { useTriggerPluginDynamicOptions } from '@/service/use-triggers' import type { ToolWithProvider, ValueSelector, Var } from '@/app/components/workflow/types' +import type { TriggerWithProvider } from '@/app/components/workflow/block-selector/types' import type { Tool } from '@/app/components/tools/types' import FormInputTypeSwitch from './form-input-type-switch' import useAvailableVarList from '@/app/components/workflow/nodes/_base/hooks/use-available-var-list' @@ -26,6 +27,8 @@ import cn from '@/utils/classnames' import { Listbox, ListboxButton, ListboxOption, ListboxOptions } from '@headlessui/react' import { ChevronDownIcon } from '@heroicons/react/20/solid' import { RiCheckLine, RiLoader4Line } from '@remixicon/react' +import type { Trigger } from '@/app/components/tools/types' + type Props = { readOnly: boolean nodeId: string @@ -33,8 +36,8 @@ type Props = { value: ResourceVarInputs onChange: (value: any) => void inPanel?: boolean - currentTool?: Tool - currentProvider?: ToolWithProvider + currentTool?: Tool | Trigger + currentProvider?: ToolWithProvider | TriggerWithProvider showManageInputField?: boolean onManageInputField?: () => void extraParams?: Record diff --git a/web/app/components/workflow/nodes/_base/components/variable/var-reference-picker.tsx b/web/app/components/workflow/nodes/_base/components/variable/var-reference-picker.tsx index 0e8ceaa1a6..c39d41b4fb 100644 --- a/web/app/components/workflow/nodes/_base/components/variable/var-reference-picker.tsx +++ b/web/app/components/workflow/nodes/_base/components/variable/var-reference-picker.tsx @@ -22,6 +22,7 @@ import { getNodeInfoById, isConversationVar, isENV, isRagVariableVar, isSystemVa import ConstantField from './constant-field' import cn from '@/utils/classnames' import type { CommonNodeType, Node, NodeOutPutVar, ToolWithProvider, ValueSelector, Var } from '@/app/components/workflow/types' +import type { TriggerWithProvider } from '@/app/components/workflow/block-selector/types' import type { CredentialFormSchemaSelect } from '@/app/components/header/account-setting/model-provider-page/declarations' import { type CredentialFormSchema, type FormOption, FormTypeEnum } from '@/app/components/header/account-setting/model-provider-page/declarations' import { BlockEnum } from '@/app/components/workflow/types' @@ -79,7 +80,7 @@ type Props = { popupFor?: 'assigned' | 'toAssigned' zIndex?: number currentTool?: Tool - currentProvider?: ToolWithProvider + currentProvider?: ToolWithProvider | TriggerWithProvider preferSchemaType?: boolean } diff --git a/web/app/components/workflow/nodes/trigger-plugin/components/trigger-form/index.tsx b/web/app/components/workflow/nodes/trigger-plugin/components/trigger-form/index.tsx index ce27788bab..fbdbfb6b96 100644 --- a/web/app/components/workflow/nodes/trigger-plugin/components/trigger-form/index.tsx +++ b/web/app/components/workflow/nodes/trigger-plugin/components/trigger-form/index.tsx @@ -2,9 +2,9 @@ import type { CredentialFormSchema } from '@/app/components/header/account-setting/model-provider-page/declarations' import type { Trigger } from '@/app/components/tools/types' import type { FC } from 'react' -import type { PluginTriggerVarInputs } from '../../types' +import type { PluginTriggerVarInputs } from '@/app/components/workflow/nodes/trigger-plugin/types' import TriggerFormItem from './item' -import type { TriggerWithProvider } from '../../../../block-selector/types' +import type { TriggerWithProvider } from '@/app/components/workflow/block-selector/types' type Props = { readOnly: boolean diff --git a/web/app/components/workflow/nodes/trigger-plugin/components/trigger-form/item.tsx b/web/app/components/workflow/nodes/trigger-plugin/components/trigger-form/item.tsx index df6950c10a..50fd9d7f11 100644 --- a/web/app/components/workflow/nodes/trigger-plugin/components/trigger-form/item.tsx +++ b/web/app/components/workflow/nodes/trigger-plugin/components/trigger-form/item.tsx @@ -89,7 +89,7 @@ const TriggerFormItem: FC = ({ value={value} onChange={onChange} inPanel={inPanel} - currentResource={currentTrigger} + currentTool={currentTrigger} currentProvider={currentProvider} providerType='trigger' extraParams={extraParams}