bugfix: workflow bugfix

web/src/views/Workflow/components/AddChatVariable/ChatVariableModal.tsx

@@ -1,5 +1,5 @@
 import { forwardRef, useImperativeHandle, useState } from 'react';
-import { Form, Input, Select, Checkbox, InputNumber } from 'antd';
+import { Form, Input, Select, InputNumber } from 'antd';
 import { useTranslation } from 'react-i18next';
 
 import type { ChatVariableModalRef } from './types'
@@ -26,6 +26,7 @@ const ChatVariableModal = forwardRef<ChatVariableModalRef, ChatVariableModalProp
   const [form] = Form.useForm<ChatVariable>();
   const [loading, setLoading] = useState(false)
   const [editIndex, setEditIndex] = useState<number | undefined>(undefined)
+  const type = Form.useWatch('type', form);
 
   // 封装取消方法，添加关闭弹窗逻辑
   const handleClose = () => {
@@ -38,7 +39,8 @@ const ChatVariableModal = forwardRef<ChatVariableModalRef, ChatVariableModalProp
   const handleOpen = (variable?: ChatVariable, index?: number) => {
     setVisible(true);
     if (variable) {
-      form.setFieldsValue(variable)
+      const { default: _, ...rest } = variable
+      form.setFieldsValue({ ...rest })
       setEditIndex(index)
     } else {
       form.resetFields();
@@ -48,7 +50,7 @@ const ChatVariableModal = forwardRef<ChatVariableModalRef, ChatVariableModalProp
   // 封装保存方法，添加提交逻辑
   const handleSave = () => {
     form.validateFields().then((values) => {
-      refresh({ ...values }, editIndex)
+      refresh({ ...values, default: values.defaultValue }, editIndex)
       handleClose()
     })
   }
@@ -89,52 +91,36 @@ const ChatVariableModal = forwardRef<ChatVariableModalRef, ChatVariableModalProp
         >
           <Select
             placeholder={t('common.pleaseSelect')}
-            onChange={() => form.setFieldValue('default', undefined)}
+            onChange={() => form.setFieldValue('defaultValue', undefined)}
             options={types.map(key => ({
               value: key,
               label: t(`workflow.config.parameter-extractor.${key}`),
             }))}
           />
         </FormItem>
-        <FormItem
-          name="default"
+        <Form.Item
+          name="defaultValue"
           label={t('workflow.config.parameter-extractor.default')}
         >
-          <Form.Item noStyle shouldUpdate={(prevValues, currentValues) => prevValues.type !== currentValues.type}>
-            {({ getFieldValue }) => {
-              const type = getFieldValue('type');
-              if (type === 'number') {
-                return <InputNumber placeholder={t('common.enter')} style={{ width: '100%' }} />;
-              }
-              if (type === 'boolean') {
-                return (
-                  <Select
-                    placeholder={t('common.pleaseSelect')}
-                    options={[
-                      { value: true, label: 'true' },
-                      { value: false, label: 'false' }
-                    ]}
-                  />
-                );
-              }
-              return <Input placeholder={t('common.enter')} />;
-            }}
-          </Form.Item>
-        </FormItem>
-
+          {type === 'number'
+            ? <InputNumber placeholder={t('common.enter')} style={{ width: '100%' }} />
+            : type === 'boolean'
+            ? <Select
+              placeholder={t('common.pleaseSelect')}
+              options={[
+                { value: true, label: 'true' },
+                { value: false, label: 'false' }
+              ]}
+            />
+            : <Input placeholder={t('common.enter')} />
+          }
+        </Form.Item>
         <FormItem
           name="description"
           label={t('workflow.config.parameter-extractor.desc')}
         >
           <Input.TextArea placeholder={t('common.enter')} />
         </FormItem>
-
-        <FormItem
-          name="required"
-          valuePropName="checked"
-        >
-          <Checkbox>{t('workflow.config.parameter-extractor.required')}</Checkbox>
-        </FormItem>
       </Form>
     </RbModal>
   );

web/src/views/Workflow/components/AddChatVariable/index.tsx

@@ -40,7 +40,7 @@ const AddChatVariable = forwardRef<AddChatVariableRef, AddChatVariableProps>(({
   }
   const handleSave = (value: ChatVariable, index?: number) => {
     const list = [...variables]
-    if (index && index > -1) {
+    if (typeof index === 'number' && index > -1) {
       list[index] = value
     } else {
       list.push(value)
@@ -75,17 +75,15 @@ const AddChatVariable = forwardRef<AddChatVariableRef, AddChatVariableProps>(({
             dataSource={variables}
             renderItem={(item, index) => (
               <List.Item>
-                <div key={index} className="rb:group rb:relative rb:p-[12px_16px] rb:bg-[#FBFDFF] rb:cursor-pointer rb:border rb:border-[#DFE4ED] rb:rounded-lg">
+                <div key={index} className="rb:relative rb:p-[12px_16px] rb:bg-[#FBFDFF] rb:cursor-pointer rb:border rb:border-[#DFE4ED] rb:rounded-lg">
                   <div className="rb:flex rb:items-center rb:justify-between">
                     <div className="rb:leading-4">
                       <span className="rb:font-medium">{item.name}</span>
                       <span className="rb:text-[12px] rb:text-[#5B6167] rb:font-regular"> ({t(`workflow.config.parameter-extractor.${item.type}`)})</span>
                     </div>
-                    <span className="rb:block rb:group-hover:hidden rb:text-[12px] rb:text-[#5B6167] rb:font-regular">{item.required ? t('workflow.config.parameter-extractor.required') : ''}</span>
-
                   </div>
                   <div className="rb:mt-1 rb:text-[12px] rb:text-[#5B6167] rb:font-regular rb:leading-5 rb:wrap-break-word rb:line-clamp-1">{item.description}</div>
-                  <Space size={12} className="rb:hidden! rb:group-hover:flex! rb:absolute rb:right-4 rb:top-[50%] rb:transform-[translateY(-50%)] rb:bg-white">
+                  <Space size={12} className="rb:flex rb:absolute rb:right-4 rb:top-[50%] rb:transform-[translateY(-50%)] rb:bg-white">
                     <div
                       className="rb:size-5 rb:cursor-pointer rb:bg-cover rb:bg-[url('@/assets/images/editBorder.svg')] rb:hover:bg-[url('@/assets/images/editBg.svg')]"
                       onClick={() => handleEdit(index)}

web/src/views/Workflow/components/AddChatVariable/types.ts

@@ -11,8 +11,8 @@ export interface VariableFormData {
   name: string;
   type: ChatVariable['type'];
   description?: string;
-  required?: boolean;
-  defaultValue?: any;
+  defaultValue?: string;
+  default?: string;
 }
 
 export interface ChatVariableModalRef {