From 4275de96fd1a2b755ce3112173ad712280178d6f Mon Sep 17 00:00:00 2001 From: Archer <545436317@qq.com> Date: Wed, 16 Jul 2025 14:35:18 +0800 Subject: [PATCH] Revert "compatible with old enums (#5219)" (#5222) This reverts commit f000fbb19d124e357ab6cfc9997dc972f06f7b60. --- packages/global/core/workflow/utils.ts | 8 +------- .../components/common/Textarea/PromptEditor/type.d.ts | 1 - projects/app/src/components/core/app/VariableEdit.tsx | 2 +- .../app/src/components/core/app/formRender/index.tsx | 7 ++----- .../app/src/components/core/app/formRender/type.d.ts | 3 --- .../WorkflowComponents/Flow/nodes/NodeHttp/index.tsx | 4 ---- .../Flow/nodes/NodeVariableUpdate.tsx | 1 - .../render/RenderInput/templates/CommonInputForm.tsx | 1 - .../RenderInput/templates/SettingQuotePrompt.tsx | 10 ++-------- .../app/detail/WorkflowComponents/utils.tsx | 2 -- projects/app/src/web/core/app/utils.ts | 6 ------ projects/app/src/web/core/workflow/adapt.ts | 2 +- 12 files changed, 7 insertions(+), 40 deletions(-) diff --git a/packages/global/core/workflow/utils.ts b/packages/global/core/workflow/utils.ts index 49b4fba83..2756f4537 100644 --- a/packages/global/core/workflow/utils.ts +++ b/packages/global/core/workflow/utils.ts @@ -341,13 +341,7 @@ export const toolSetData2FlowNodeIO = ({ }; export const formatEditorVariablePickerIcon = ( - variables: { - id: string; - key: string; - label: string; - type?: `${VariableInputEnum}`; - required?: boolean; - }[] + variables: { key: string; label: string; type?: `${VariableInputEnum}`; required?: boolean }[] ): EditorVariablePickerType[] => { return variables.map((item) => ({ ...item, diff --git a/packages/web/components/common/Textarea/PromptEditor/type.d.ts b/packages/web/components/common/Textarea/PromptEditor/type.d.ts index f6d39f85d..66cf23916 100644 --- a/packages/web/components/common/Textarea/PromptEditor/type.d.ts +++ b/packages/web/components/common/Textarea/PromptEditor/type.d.ts @@ -1,7 +1,6 @@ import type { WorkflowIOValueTypeEnum } from '@fastgpt/global/core/workflow/constants'; export type EditorVariablePickerType = { - id: string; key: string; label: string; required?: boolean; diff --git a/projects/app/src/components/core/app/VariableEdit.tsx b/projects/app/src/components/core/app/VariableEdit.tsx index 7cdeeacf6..3ea40a800 100644 --- a/projects/app/src/components/core/app/VariableEdit.tsx +++ b/projects/app/src/components/core/app/VariableEdit.tsx @@ -385,7 +385,7 @@ const TableItem = ({ onClick={() => { const formattedItem = { ...item, - list: item.enums?.map((item) => ({ label: item.value, value: item.value })) || [] + list: item.enums || [] }; reset(formattedItem); }} diff --git a/projects/app/src/components/core/app/formRender/index.tsx b/projects/app/src/components/core/app/formRender/index.tsx index eb751e467..a4b04e718 100644 --- a/projects/app/src/components/core/app/formRender/index.tsx +++ b/projects/app/src/components/core/app/formRender/index.tsx @@ -100,14 +100,11 @@ const InputRender = (props: InputRenderProps) => { } if (inputType === InputTypeEnum.select) { - const list = - props.list || props.enums?.map((item) => ({ label: item.value, value: item.value })) || []; - return ; + return ; } if (inputType === InputTypeEnum.multipleSelect) { - const list = - props.list || props.enums?.map((item) => ({ label: item.value, value: item.value })) || []; + const { list = [] } = props; return ( {...commonProps} diff --git a/projects/app/src/components/core/app/formRender/type.d.ts b/projects/app/src/components/core/app/formRender/type.d.ts index e8462c8c8..a31fcab5b 100644 --- a/projects/app/src/components/core/app/formRender/type.d.ts +++ b/projects/app/src/components/core/app/formRender/type.d.ts @@ -40,9 +40,6 @@ type SpecificProps = // select & multipleSelect inputType: InputTypeEnum.select | InputTypeEnum.multipleSelect; list?: { label: string; value: string }[]; - - // old version - enums?: { value: string }[]; } | { // JSONEditor diff --git a/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/NodeHttp/index.tsx b/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/NodeHttp/index.tsx index 3069ac83a..31e23700f 100644 --- a/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/NodeHttp/index.tsx +++ b/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/NodeHttp/index.tsx @@ -174,7 +174,6 @@ const RenderHttpMethodAndUrl = React.memo(function RenderHttpMethodAndUrl({ return ( feConfigs?.externalProviderWorkflowVariables?.map((item) => ({ key: item.key, - id: item.key, label: item.name })) || [] ); @@ -295,7 +294,6 @@ export function RenderHttpProps({ return ( feConfigs?.externalProviderWorkflowVariables?.map((item) => ({ key: item.key, - id: item.key, label: item.name })) || [] ); @@ -500,7 +498,6 @@ const RenderForm = ({ input: FlowNodeInputItemType; variables: EditorVariableLabelPickerType[]; externalProviderWorkflowVariables: { - id: string; key: string; label: string; }[]; @@ -687,7 +684,6 @@ const RenderBody = ({ typeInput: FlowNodeInputItemType | undefined; variables: EditorVariableLabelPickerType[]; externalProviderWorkflowVariables: { - id: string; key: string; label: string; }[]; diff --git a/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/NodeVariableUpdate.tsx b/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/NodeVariableUpdate.tsx index 09ac28098..f513831cc 100644 --- a/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/NodeVariableUpdate.tsx +++ b/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/NodeVariableUpdate.tsx @@ -67,7 +67,6 @@ const NodeVariableUpdate = ({ data, selected }: NodeProps) => const externalProviderWorkflowVariables = useMemo(() => { return ( feConfigs?.externalProviderWorkflowVariables?.map((item) => ({ - id: item.key, key: item.key, label: item.name })) || [] diff --git a/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/render/RenderInput/templates/CommonInputForm.tsx b/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/render/RenderInput/templates/CommonInputForm.tsx index efab444bd..c0ccac74e 100644 --- a/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/render/RenderInput/templates/CommonInputForm.tsx +++ b/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/render/RenderInput/templates/CommonInputForm.tsx @@ -51,7 +51,6 @@ const CommonInputForm = ({ item, nodeId }: RenderInputProps) => { const externalVariables = useMemo(() => { return ( feConfigs?.externalProviderWorkflowVariables?.map((item) => ({ - id: item.key, key: item.key, label: item.name })) || [] diff --git a/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/render/RenderInput/templates/SettingQuotePrompt.tsx b/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/render/RenderInput/templates/SettingQuotePrompt.tsx index b32cdd4de..6978c5a21 100644 --- a/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/render/RenderInput/templates/SettingQuotePrompt.tsx +++ b/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/render/RenderInput/templates/SettingQuotePrompt.tsx @@ -247,10 +247,7 @@ const EditModal = ({ onClose, ...props }: RenderInputProps & { onClose: () => vo ({ - ...item, - id: item.key - }))} + variables={quoteTemplateVariables} minH={160} title={t('common:core.app.Quote templates')} placeholder={t('workflow:quote_content_placeholder')} @@ -271,10 +268,7 @@ const EditModal = ({ onClose, ...props }: RenderInputProps & { onClose: () => vo /> ({ - ...item, - id: item.key - }))} + variables={quotePromptVariables} title={t('common:core.app.Quote prompt')} minH={300} placeholder={t('workflow:quote_prompt_tip', { diff --git a/projects/app/src/pageComponents/app/detail/WorkflowComponents/utils.tsx b/projects/app/src/pageComponents/app/detail/WorkflowComponents/utils.tsx index c5d237ef8..2ad07e67c 100644 --- a/projects/app/src/pageComponents/app/detail/WorkflowComponents/utils.tsx +++ b/projects/app/src/pageComponents/app/detail/WorkflowComponents/utils.tsx @@ -107,7 +107,6 @@ export const getEditorVariables = ({ const nodeVariables = currentNode.inputs .filter((input) => input.canEdit) .map((item) => ({ - id: item.key, key: item.key, label: item.label, parent: { @@ -138,7 +137,6 @@ export const getEditorVariables = ({ ) .map((output) => { return { - id: output.id, label: t((output.label as any) || ''), key: output.id, parent: { diff --git a/projects/app/src/web/core/app/utils.ts b/projects/app/src/web/core/app/utils.ts index 7cbab0403..2ce8058ab 100644 --- a/projects/app/src/web/core/app/utils.ts +++ b/projects/app/src/web/core/app/utils.ts @@ -582,35 +582,30 @@ export function filterSensitiveFormData(appForm: AppSimpleEditFormType) { export const workflowSystemVariables: EditorVariablePickerType[] = [ { - id: 'userId', key: 'userId', label: i18nT('workflow:use_user_id'), required: true, valueType: WorkflowIOValueTypeEnum.string }, { - id: 'appId', key: 'appId', label: i18nT('common:core.module.http.AppId'), required: true, valueType: WorkflowIOValueTypeEnum.string }, { - id: 'chatId', key: 'chatId', label: i18nT('common:core.module.http.ChatId'), valueType: WorkflowIOValueTypeEnum.string, required: true }, { - id: 'responseChatItemId', key: 'responseChatItemId', label: i18nT('common:core.module.http.ResponseChatItemId'), valueType: WorkflowIOValueTypeEnum.string, required: true }, { - id: 'histories', key: 'histories', label: i18nT('common:core.module.http.Histories'), required: true, @@ -618,7 +613,6 @@ export const workflowSystemVariables: EditorVariablePickerType[] = [ valueDesc: chatHistoryValueDesc }, { - id: 'cTime', key: 'cTime', label: i18nT('common:core.module.http.Current time'), required: true, diff --git a/projects/app/src/web/core/workflow/adapt.ts b/projects/app/src/web/core/workflow/adapt.ts index ec9e90b62..a9828757c 100644 --- a/projects/app/src/web/core/workflow/adapt.ts +++ b/projects/app/src/web/core/workflow/adapt.ts @@ -54,7 +54,7 @@ export const getGlobalVariableNode = ({ nodeId: VARIABLE_NODE_ID, ...template, outputs: globalVariables.map((item) => ({ - id: item.id, + id: item.key, type: FlowNodeOutputTypeEnum.static, label: item.label, key: item.key,