Revert "compatible with old enums (#5219)" (#5222)

This reverts commit f000fbb1.

Revert "compatible with old enums (#5219)" (#5222)
This reverts commit f000fbb1.
4275de96 · Archer · GitHub · d102adca · 4275de96 · 4275de96
Commit 4275de96 authored Jul 16, 2025 by Archer Committed by GitHub Jul 16, 2025
12 changed files
--- 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: {
+  variables: { key: string; label: string; type?: `${VariableInputEnum}`; required?: boolean }[]
-    id: string;
-    key: string;
-    label: string;
-    type?: `${VariableInputEnum}`;
-    required?: boolean;
-  }[]
 ): EditorVariablePickerType[] => {
  return variables.map((item) => ({
    ...item,

--- a/packages/web/components/common/Textarea/PromptEditor/type.d.ts
+++ b/packages/web/components/common/Textarea/PromptEditor/type.d.ts
 import type { WorkflowIOValueTypeEnum } from '@fastgpt/global/core/workflow/constants';
 export type EditorVariablePickerType = {
-  id: string;
  key: string;
  label: string;
  required?: boolean;

--- 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);
            }}

--- 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 =
+      return <MySelect {...commonProps} list={props.list || []} h={10} />;
-        props.list || props.enums?.map((item) => ({ label: item.value, value: item.value })) || [];
-      return <MySelect {...commonProps} list={list} h={10} />;
    }
    if (inputType === InputTypeEnum.multipleSelect) {
-      const list =
+      const { list = [] } = props;
-        props.list || props.enums?.map((item) => ({ label: item.value, value: item.value })) || [];
      return (
        <MultipleSelect<string>
          {...commonProps}

--- 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

--- 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;
  }[];

--- 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<FlowNodeItemType>) => 
  const externalProviderWorkflowVariables = useMemo(() => {
    return (
      feConfigs?.externalProviderWorkflowVariables?.map((item) => ({
-        id: item.key,
        key: item.key,
        label: item.name
      })) || []

--- 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
      })) || []

--- 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
            </Flex>
            <PromptEditor
-              variables={quoteTemplateVariables.map((item) => ({
+              variables={quoteTemplateVariables}
-                ...item,
-                id: item.key
-              }))}
              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
              />
            </Flex>
            <PromptEditor
-              variables={quotePromptVariables.map((item) => ({
+              variables={quotePromptVariables}
-                ...item,
-                id: item.key
-              }))}
              title={t('common:core.app.Quote prompt')}
              minH={300}
              placeholder={t('workflow:quote_prompt_tip', {

--- 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: {

--- 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,

--- 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,