Merge branch 'release/v0.2.8' of github.com:SuanmoSuanyangTechnology/MemoryBear into release/v0.2.8

web/src/components/Chat/ChatToolbar.tsx

@@ -49,6 +49,7 @@ interface FormValues {
   memory?: boolean;
 }
 
+const max_file_count = 1;
 const ChatToolbar = forwardRef<ChatToolbarRef, ChatToolbarProps>(({
   features,
   extra,
@@ -136,8 +137,8 @@ const ChatToolbar = forwardRef<ChatToolbarRef, ChatToolbarProps>(({
       key: 'url',
       label: t('memoryConversation.addRemoteFile'),
       onClick: () => {
-        if ((queryValues?.files?.length || 0) >= file_upload.max_file_count) {
+        if ((queryValues?.files?.length || 0) >= max_file_count) {
-          messageApi.warning(t('common.fileNumTip', { num: file_upload.max_file_count }))
+          messageApi.warning(t('common.fileNumTip', { num: max_file_count }))
           return
         }
         uploadFileListModalRef.current?.handleOpen()
@@ -153,7 +154,7 @@ const ChatToolbar = forwardRef<ChatToolbarRef, ChatToolbarProps>(({
           onChange={fileChange}
           requestConfig={uploadRequestConfig}
           featureConfig={file_upload}
-          disabled={(queryValues?.files?.length || 0) >= file_upload.max_file_count}
+          disabled={(queryValues?.files?.length || 0) >= max_file_count}
         />
       )
     })
@@ -185,7 +186,7 @@ const ChatToolbar = forwardRef<ChatToolbarRef, ChatToolbarProps>(({
         {file_upload?.audio_enabled && file_upload?.allowed_transfer_methods?.includes('local_file') && (
           <Flex align="center">
             <AudioRecorder
-              disabled={(queryValues?.files?.length || 0) >= file_upload.max_file_count}
+              disabled={(queryValues?.files?.length || 0) >= max_file_count}
               action={uploadAction}
               requestConfig={uploadRequestConfig}
               onRecordingComplete={handleRecordingComplete}

web/src/i18n/en.ts

@@ -460,6 +460,7 @@ export const en = {
       nameInvalid: 'Name cannot start or end with a space',
       notAllSpaces: 'Cannot be all spaces',
       view: 'View',
+      callbackUrlInvalid: 'Please enter a valid URL',
     },
     model: {
       searchPlaceholder: 'search model…',

web/src/i18n/zh.ts

@@ -1093,6 +1093,7 @@ export const zh = {
       nameInvalid: '不能是空格开头或结尾',
       notAllSpaces: '不能是纯空格',
       view: '查看',
+      callbackUrlInvalid: '请输入有效的 URL',
     },
     model: {
       searchPlaceholder: '搜索模型…',

web/src/views/ApplicationConfig/components/FeaturesConfig/FeaturesConfigModal.tsx

@@ -24,7 +24,7 @@ interface FeaturesConfigModalProps {
   refresh: (value: FeaturesConfigForm) => void;
   source?: Application['type'];
 }
-
+const max_file_count = 1;
 /**
  * Modal for copying applications
  */
@@ -133,7 +133,7 @@ const FeaturesConfigModal = forwardRef<FeaturesConfigModalRef, FeaturesConfigMod
                     </div>
                     <div>
                       <div className="rb:text-[12px] rb:text-[#5B6167] rb:py-1">{t('application.maxCount')}</div>
-                      {fu.max_file_count} {t('application.unix')}
+                      {max_file_count} {t('application.unix')}
                     </div>
                   </Flex>
                   <Button block onClick={handleOpenSettings}>{t('application.setting')}</Button>

web/src/views/ApplicationConfig/components/FeaturesConfig/FileUploadSettingModal.tsx

@@ -102,7 +102,7 @@ const defaultValues: FileUpload = {
     "mp4",
     "mov",
   ],
-  max_file_count: 5,
+  max_file_count: 1,
   allowed_transfer_methods: 'both'
 }
 
@@ -167,8 +167,8 @@ const FileUploadSettingModal = forwardRef<FileUploadSettingModalRef, FileUploadS
           </Radio.Group>
         </Form.Item>
 
-        <div className="rb:text-[12px] rb:text-[#5B6167] rb:mb-1">{t('application.maxCount')}</div>
+        {/* <div className="rb:text-[12px] rb:text-[#5B6167] rb:mb-1">{t('application.maxCount')}</div> */}
-        <Form.Item label={t('application.maxCount')} name="max_file_count">
+        <Form.Item label={t('application.maxCount')} name="max_file_count" hidden>
           <InputNumber min={1} max={20} precision={0} className="rb:w-full!" placeholder={t('common.pleaseEnter')} />
         </Form.Item>
 

web/src/views/Conversation/components/UploadFileListModal.tsx

@@ -19,7 +19,10 @@
  * @component
  */
 import { forwardRef, useImperativeHandle, useState, useMemo } from 'react';
-import { Form, Input, Select, Button, Flex } from 'antd';
+import { Form, Input, Select,
+  // Button,
+  Flex
+} from 'antd';
 import { useTranslation } from 'react-i18next';
 
 import type { UploadFileListModalRef } from '../types'
@@ -105,9 +108,11 @@ const UploadFileListModal = forwardRef<UploadFileListModalRef, UploadFileListMod
       onOk={handleSave}
       confirmLoading={loading}
     >
-      <Form form={form} layout="vertical">
+      <Form form={form} layout="vertical" initialValues={{ files: [{ type: undefined, url: undefined }] }}>
         <Form.List name="files">
-          {(fields, { add, remove }) => (
+          {(fields,
+            // { add, remove }
+          ) => (
             <>
               {/* Render each file entry with type selector and URL input */}
               {fields.map(({ key, name, ...restField }) => (
@@ -131,23 +136,23 @@ const UploadFileListModal = forwardRef<UploadFileListModalRef, UploadFileListMod
                     name={[name, 'url']}
                     rules={[
                       { required: true, message: t('common.pleaseEnter') },
-                      { type: 'url'}
+                      { type: 'url', message: t('common.callbackUrlInvalid') },
                     ]}
                     className="rb:mb-0! rb:flex-1!"
                   >
                     <Input placeholder={t('memoryConversation.fileUrl')} />
                   </FormItem>
-                  <div
+                  {/* <div
                     className="rb:w-5 rb:h-5 rb:cursor-pointer rb:bg-cover rb:bg-[url('@/assets/images/delete.svg')] rb:hover:bg-[url('@/assets/images/delete_hover.svg')]"
                     onClick={() => remove(name)}
-                  ></div>
+                  ></div> */}
                 </Flex>
               ))}
-              <Form.Item noStyle>
+              {/* <Form.Item noStyle>
                 <Button type="dashed" onClick={() => add()} block>
                   + {t('common.add')}
                 </Button>
-              </Form.Item>
+              </Form.Item> */}
             </>
           )}
         </Form.List>

web/src/views/Workflow/components/Editor/plugin/InitialValuePlugin.tsx

@@ -18,8 +18,8 @@ const InitialValuePlugin: React.FC<InitialValuePluginProps> = ({ value, options
   const isUserInputRef = useRef(false);
 
   useEffect(() => {
-    // 监听编辑器变化，标记是否为用户输入
+    const removeListener = editor.registerUpdateListener(({ editorState, tags }) => {
-    const removeListener = editor.registerUpdateListener(({ editorState }) => {
+      if (tags.has('programmatic')) return;
       editorState.read(() => {
         const root = $getRoot();
         const textContent = root.getTextContent();
@@ -107,7 +107,7 @@ const InitialValuePlugin: React.FC<InitialValuePluginProps> = ({ value, options
           });
           root.append(paragraph);
         }
-        }, { discrete: true });
+        }, { discrete: true, tag: 'programmatic' });
       });
     }