perf: optimize global variables (labring#2863)

* feat: add global variable types

* add global variables to debug

* fix select dnd

* unify InputTypeConfig params

packages/global/core/app/type.d.ts

@@ -13,6 +13,7 @@ import { StoreEdgeItemType } from '../workflow/type/edge';
 import { PermissionSchemaType, PermissionValueType } from '../../support/permission/type';
 import { AppPermission } from '../../support/permission/app/controller';
 import { ParentIdType } from '../../common/parentFolder/type';
+import { FlowNodeInputTypeEnum } from 'core/workflow/node/constant';
 
 export type AppSchema = {
   _id: string;
@@ -114,11 +115,17 @@ export type VariableItemType = {
   id: string;
   key: string;
   label: string;
-  type: `${VariableInputEnum}`;
+  type: VariableInputEnum;
   required: boolean;
-  maxLen: number;
-  enums: { value: string }[];
-  valueType: WorkflowIOValueTypeEnum;
+  description: string;
+  valueType?: WorkflowIOValueTypeEnum;
+  defaultValue?: any;
+
+  // numberInput
+  max?: number;
+  min?: number;
+  // select
+  enums?: { value: string; label: string }[];
 };
 // tts
 export type AppTTSConfigType = {

packages/global/core/workflow/constants.ts

@@ -267,29 +267,58 @@ export enum NodeOutputKeyEnum {
 export enum VariableInputEnum {
   input = 'input',
   textarea = 'textarea',
+  numberInput = 'numberInput',
   select = 'select',
+  switch = 'switch',
   custom = 'custom'
 }
-export const variableMap = {
+export const variableMap: Record<
+  VariableInputEnum,
+  {
+    icon: string;
+    label: string;
+    value: VariableInputEnum;
+    defaultValueType: WorkflowIOValueTypeEnum;
+    description?: string;
+  }
+> = {
   [VariableInputEnum.input]: {
-    icon: 'core/app/variable/input',
-    title: i18nT('common:core.module.variable.input type'),
-    desc: ''
+    icon: 'core/workflow/inputType/input',
+    label: i18nT('common:core.workflow.inputType.input'),
+    value: VariableInputEnum.input,
+    defaultValueType: WorkflowIOValueTypeEnum.string
   },
   [VariableInputEnum.textarea]: {
-    icon: 'core/app/variable/textarea',
-    title: i18nT('common:core.module.variable.textarea type'),
-    desc: i18nT('app:variable.textarea_type_desc')
+    icon: 'core/workflow/inputType/textarea',
+    label: i18nT('common:core.workflow.inputType.textarea'),
+    value: VariableInputEnum.textarea,
+    defaultValueType: WorkflowIOValueTypeEnum.string,
+    description: i18nT('app:variable.textarea_type_desc')
+  },
+  [VariableInputEnum.numberInput]: {
+    icon: 'core/workflow/inputType/numberInput',
+    label: i18nT('common:core.workflow.inputType.number input'),
+    value: VariableInputEnum.numberInput,
+    defaultValueType: WorkflowIOValueTypeEnum.number
+  },
+  [VariableInputEnum.switch]: {
+    icon: 'core/workflow/inputType/switch',
+    label: i18nT('common:core.workflow.inputType.switch'),
+    value: VariableInputEnum.switch,
+    defaultValueType: WorkflowIOValueTypeEnum.boolean
   },
   [VariableInputEnum.select]: {
-    icon: 'core/app/variable/select',
-    title: i18nT('common:core.module.variable.select type'),
-    desc: ''
+    icon: 'core/workflow/inputType/option',
+    label: i18nT('common:core.workflow.inputType.select'),
+    value: VariableInputEnum.select,
+    defaultValueType: WorkflowIOValueTypeEnum.string
   },
   [VariableInputEnum.custom]: {
-    icon: 'core/app/variable/external',
-    title: i18nT('common:core.module.variable.Custom type'),
-    desc: i18nT('app:variable.select type_desc')
+    icon: 'core/workflow/inputType/customVariable',
+    label: i18nT('common:core.workflow.inputType.custom'),
+    value: VariableInputEnum.custom,
+    defaultValueType: WorkflowIOValueTypeEnum.string,
+    description: i18nT('app:variable.select type_desc')
   }
 };
 

packages/global/core/workflow/utils.ts

@@ -230,7 +230,9 @@ export const appData2FlowNodeIO = ({
             FlowNodeInputTypeEnum.textarea,
             FlowNodeInputTypeEnum.reference
           ],
+          [VariableInputEnum.numberInput]: [FlowNodeInputTypeEnum.numberInput],
           [VariableInputEnum.select]: [FlowNodeInputTypeEnum.select],
+          [VariableInputEnum.switch]: [FlowNodeInputTypeEnum.switch],
           [VariableInputEnum.custom]: [
             FlowNodeInputTypeEnum.input,
             FlowNodeInputTypeEnum.reference
@@ -246,7 +248,7 @@ export const appData2FlowNodeIO = ({
           description: '',
           valueType: WorkflowIOValueTypeEnum.any,
           required: item.required,
-          list: item.enums.map((enumItem) => ({
+          list: item.enums?.map((enumItem) => ({
             label: enumItem.value,
             value: enumItem.value
           }))

packages/web/components/common/Icon/constants.ts

@@ -275,6 +275,7 @@ export const iconPaths = {
   'core/workflow/versionHistories': () => import('./icons/core/workflow/versionHistories.svg'),
   date: () => import('./icons/date.svg'),
   delete: () => import('./icons/delete.svg'),
+  drag: () => import('./icons/drag.svg'),
   edit: () => import('./icons/edit.svg'),
   empty: () => import('./icons/empty.svg'),
   export: () => import('./icons/export.svg'),

packages/web/i18n/en/common.json

@@ -750,7 +750,6 @@
   "core.module.variable.select type": "Dropdown Single Select",
   "core.module.variable.text max length": "Max Length",
   "core.module.variable.textarea type": "Paragraph",
-  "core.module.variable.variable name": "Variable Name",
   "core.module.variable.variable name is required": "Variable Name Cannot Be Empty",
   "core.module.variable.variable option is required": "Options Cannot Be All Empty",
   "core.module.variable.variable option is value is required": "Option Content Cannot Be Empty",

packages/web/i18n/en/workflow.json

@@ -3,6 +3,7 @@
   "Code": "Code",
   "Confirm_sync_node": "It will be updated to the latest node configuration and fields that do not exist in the template will be deleted (including all custom fields).\n\nIf the fields are complex, it is recommended that you copy a node first and then update the original node to facilitate parameter copying.",
   "Quote_prompt_setting": "Quote prompt",
+  "Variable_name": "Variable name",
   "add_new_input": "Add New Input",
   "add_new_output": "New output",
   "append_application_reply_to_history_as_new_context": "Append the application's reply to the history as new context",
@@ -179,6 +180,7 @@
   "user_question": "User Question",
   "user_question_tool_desc": "User input questions (questions need to be improved)",
   "value_type": "Value type",
+  "variable_description": "Variable description",
   "variable_picker_tips": "Type node name or variable name to search",
   "variable_update": "Variable Update",
   "workflow.My edit": "My Edit",

packages/web/i18n/zh/common.json

@@ -755,7 +755,6 @@
   "core.module.variable.select type": "下拉单选",
   "core.module.variable.text max length": "最大长度",
   "core.module.variable.textarea type": "段落",
-  "core.module.variable.variable name": "变量名",
   "core.module.variable.variable name is required": "变量名不能为空",
   "core.module.variable.variable option is required": "选项不能全空",
   "core.module.variable.variable option is value is required": "选项内容不能为空",

packages/web/i18n/zh/workflow.json

@@ -3,6 +3,7 @@
   "Code": "代码",
   "Confirm_sync_node": "将会更新至最新的节点配置，不存在模板中的字段将会被删除（包括所有自定义字段）。\n如果字段较为复杂，建议您先复制一份节点，再更新原来的节点，便于参数复制。",
   "Quote_prompt_setting": "引用提示词配置",
+  "Variable_name": "变量名",
   "add_new_input": "新增输入",
   "add_new_output": "新增输出",
   "append_application_reply_to_history_as_new_context": "将该应用回复内容拼接到历史记录中，作为新的上下文返回",
@@ -180,6 +181,7 @@
   "user_question": "用户问题",
   "user_question_tool_desc": "用户输入的问题（问题需要完善）",
   "value_type": "数据类型",
+  "variable_description": "变量描述",
   "variable_picker_tips": "可输入节点名或变量名搜索",
   "variable_update": "变量更新",
   "workflow.My edit": "我的编辑",