add image input

projects/app/public/locales/en/common.json

@@ -233,10 +233,11 @@
     },
     "chat": {
       "Audio Speech Error": "Audio Speech Error",
-      "Speaking": "I'm listening...",
       "Record": "Speech",
       "Restart": "Restart",
+      "Select File": "Select file",
       "Send Message": "Send Message",
+      "Speaking": "I'm listening...",
       "Stop Speak": "Stop Speak",
       "Type a message": "Input problem",
       "tts": {
@@ -589,8 +590,8 @@
   "wallet": {
     "bill": {
       "Audio Speech": "Audio Speech",
-      "bill username": "User",
-      "Whisper": "Whisper"
+      "Whisper": "Whisper",
+      "bill username": "User"
     }
   }
 }

projects/app/public/locales/zh/common.json

@@ -235,6 +235,7 @@
       "Audio Speech Error": "语音播报异常",
       "Record": "语音输入",
       "Restart": "重开对话",
+      "Select File": "选择文件",
       "Send Message": "发送",
       "Speaking": "我在听，请说...",
       "Stop Speak": "停止录音",
@@ -589,8 +590,8 @@
   "wallet": {
     "bill": {
       "Audio Speech": "语音播报",
-      "bill username": "用户",
-      "Whisper": "语音输入"
+      "Whisper": "语音输入",
+      "bill username": "用户"
     }
   }
 }

projects/app/src/components/ChatBox/MessageInput.tsx

@@ -1,12 +1,15 @@
 import { useSpeech } from '@/web/common/hooks/useSpeech';
 import { useSystemStore } from '@/web/common/system/useSystemStore';
-import { Box, Flex, Spinner, Textarea } from '@chakra-ui/react';
-import React, { useRef, useEffect } from 'react';
+import { Box, Flex, Image, Spinner, Textarea } from '@chakra-ui/react';
+import React, { useRef, useEffect, useCallback, useState, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import MyTooltip from '../MyTooltip';
 import MyIcon from '../Icon';
 import styles from './index.module.scss';
 import { useRouter } from 'next/router';
+import { useSelectFile } from '@/web/common/file/hooks/useSelectFile';
+import { compressImgAndUpload } from '@/web/common/file/controller';
+import { useToast } from '@/web/common/hooks/useToast';
 
 const MessageInput = ({
   onChange,
@@ -38,6 +41,60 @@ const MessageInput = ({
   const { t } = useTranslation();
   const textareaMinH = '22px';
   const havInput = !!TextareaDom.current?.value;
+  const { toast } = useToast();
+  const [imgBase64Array, setImgBase64Array] = useState<string[]>([]);
+  const [fileList, setFileList] = useState<File[]>([]);
+  const [imgSrcArray, setImgSrcArray] = useState<string[]>([]);
+
+  const { File, onOpen: onOpenSelectFile } = useSelectFile({
+    fileType: '.jpg,.png',
+    multiple: true
+  });
+
+  useEffect(() => {
+    fileList.forEach((file) => {
+      const reader = new FileReader();
+      reader.readAsDataURL(file);
+      reader.onload = async () => {
+        setImgBase64Array((prev) => [...prev, reader.result as string]);
+      };
+    });
+  }, [fileList]);
+
+  const onSelectFile = useCallback((e: File[]) => {
+    if (!e || e.length === 0) {
+      return;
+    }
+    setFileList(e);
+  }, []);
+
+  const handleSend = useCallback(async () => {
+    try {
+      for (const file of fileList) {
+        const src = await compressImgAndUpload({
+          file,
+          maxW: 1000,
+          maxH: 1000,
+          maxSize: 1024 * 1024 * 2
+        });
+        imgSrcArray.push(src);
+      }
+    } catch (err: any) {
+      toast({
+        title: typeof err === 'string' ? err : '文件上传异常',
+        status: 'warning'
+      });
+    }
+
+    const textareaValue = TextareaDom.current?.value || '';
+    const inputMessage =
+      imgSrcArray.length === 0
+        ? textareaValue
+        : `\`\`\`img-block\n${JSON.stringify(imgSrcArray)}\n\`\`\`\n${textareaValue}`;
+    onSendMessage(inputMessage);
+    setImgBase64Array([]);
+    setImgSrcArray([]);
+  }, [TextareaDom, fileList, imgSrcArray, onSendMessage, toast]);
 
   useEffect(() => {
     if (!stream) {
@@ -60,7 +117,7 @@ const MessageInput = ({
     <>
       <Box m={['0 auto', '10px auto']} w={'100%'} maxW={['auto', 'min(800px, 100%)']} px={[0, 5]}>
         <Box
-          py={'18px'}
+          py={imgBase64Array.length > 0 ? '8px' : '18px'}
           position={'relative'}
           boxShadow={isSpeaking ? `0 0 10px rgba(54,111,255,0.4)` : `0 0 10px rgba(0,0,0,0.2)`}
           {...(isPc
@@ -93,11 +150,74 @@ const MessageInput = ({
             <Spinner size={'sm'} mr={4} />
             {t('chat.Converting to text')}
           </Box>
+          {/* file uploader */}
+          <Flex
+            position={'absolute'}
+            alignItems={'center'}
+            left={['12px', '14px']}
+            bottom={['15px', '13px']}
+            h={['26px', '32px']}
+            zIndex={10}
+            cursor={'pointer'}
+            onClick={onOpenSelectFile}
+          >
+            <MyTooltip label={t('core.chat.Select File')}>
+              <MyIcon name={'core/chat/fileSelect'} />
+            </MyTooltip>
+            <File onSelect={onSelectFile} />
+          </Flex>
+          {/* file preview */}
+          <Flex w={'96%'} wrap={'wrap'} ml={4}>
+            {imgBase64Array.length > 0 &&
+              imgBase64Array.map((src, index) => (
+                <Box
+                  key={index}
+                  border={'1px solid rgba(0,0,0,0.12)'}
+                  mr={2}
+                  mb={2}
+                  rounded={'md'}
+                  position={'relative'}
+                  _hover={{
+                    '.close-icon': { display: 'block' }
+                  }}
+                >
+                  <MyIcon
+                    name={'closeSolid'}
+                    w={'16px'}
+                    h={'16px'}
+                    color={'myGray.700'}
+                    cursor={'pointer'}
+                    _hover={{ color: 'myBlue.600' }}
+                    position={'absolute'}
+                    right={-2}
+                    top={-2}
+                    onClick={() => {
+                      setImgBase64Array((prev) => {
+                        prev.splice(index, 1);
+                        return [...prev];
+                      });
+                    }}
+                    className="close-icon"
+                    display={['', 'none']}
+                  />
+                  <Image
+                    alt={'img'}
+                    src={src}
+                    w={'80px'}
+                    h={'80px'}
+                    rounded={'md'}
+                    objectFit={'cover'}
+                  />
+                </Box>
+              ))}
+          </Flex>
           {/* input area */}
           <Textarea
             ref={TextareaDom}
             py={0}
             pr={['45px', '55px']}
+            pl={['36px', '40px']}
+            mt={imgBase64Array.length > 0 ? 4 : 0}
             border={'none'}
             _focusVisible={{
               border: 'none'
@@ -124,13 +244,28 @@ const MessageInput = ({
             onKeyDown={(e) => {
               // enter send.(pc or iframe && enter and unPress shift)
               if ((isPc || window !== parent) && e.keyCode === 13 && !e.shiftKey) {
-                onSendMessage(TextareaDom.current?.value || '');
+                handleSend();
                 e.preventDefault();
               }
               // 全选内容
               // @ts-ignore
               e.key === 'a' && e.ctrlKey && e.target?.select();
             }}
+            onPaste={(e) => {
+              const clipboardData = e.clipboardData;
+              if (clipboardData) {
+                const items = clipboardData.items;
+                const files: File[] = [];
+                for (let i = 0; i < items.length; i++) {
+                  const item = items[i];
+                  if (item.kind === 'file') {
+                    const file = item.getAsFile();
+                    files.push(file as File);
+                  }
+                }
+                setFileList(files);
+              }
+            }}
           />
           <Flex
             position={'absolute'}
@@ -195,7 +330,7 @@ const MessageInput = ({
                     return onStop();
                   }
                   if (havInput) {
-                    onSendMessage(TextareaDom.current?.value || '');
+                    return handleSend();
                   }
                 }}
               >

projects/app/src/components/ChatBox/index.tsx

@@ -17,18 +17,7 @@ import { useToast } from '@/web/common/hooks/useToast';
 import { useAudioPlay } from '@/web/common/utils/voice';
 import { getErrText } from '@fastgpt/global/common/error/utils';
 import { useCopyData } from '@/web/common/hooks/useCopyData';
-import {
-  Box,
-  Card,
-  Flex,
-  Input,
-  Textarea,
-  Button,
-  useTheme,
-  BoxProps,
-  FlexProps,
-  Spinner
-} from '@chakra-ui/react';
+import { Box, Card, Flex, Input, Button, useTheme, BoxProps, FlexProps } from '@chakra-ui/react';
 import { feConfigs } from '@/web/common/system/staticData';
 import { eventBus } from '@/web/common/utils/eventbus';
 import { adaptChat2GptMessages } from '@fastgpt/global/core/chat/adapt';
@@ -633,7 +622,7 @@ const ChatBox = (
                         borderRadius={'8px 0 8px 8px'}
                         textAlign={'left'}
                       >
-                        <Box as={'p'}>{item.value}</Box>
+                        <Markdown source={item.value} isChatting={false} />
                       </Card>
                     </Box>
                   </>

projects/app/src/components/Icon/index.tsx

@@ -112,7 +112,8 @@ const iconPaths = {
   'core/chat/recordFill': () => import('./icons/core/chat/recordFill.svg'),
   'core/chat/stopSpeechFill': () => import('./icons/core/chat/stopSpeechFill.svg'),
   'core/chat/stopSpeech': () => import('./icons/core/chat/stopSpeech.svg'),
-  'core/chat/speaking': () => import('./icons/core/chat/speaking.svg')
+  'core/chat/speaking': () => import('./icons/core/chat/speaking.svg'),
+  'core/chat/fileSelect': () => import('./icons/core/chat/fileSelect.svg')
 };
 
 export type IconName = keyof typeof iconPaths;

projects/app/src/components/Markdown/chat/Image.tsx

@@ -0,0 +1,18 @@
+import { Box, Flex } from '@chakra-ui/react';
+import MdImage from '../img/Image';
+
+const ImageBlock = ({ images }: { images: string }) => {
+  return (
+    <Flex w={'100%'} wrap={'wrap'}>
+      {JSON.parse(images).map((src: string) => {
+        return (
+          <Box key={src} mr={2} mb={2} rounded={'md'} flex={'0 0 auto'} w={'100px'} h={'100px'}>
+            <MdImage src={src} />
+          </Box>
+        );
+      })}
+    </Flex>
+  );
+};
+
+export default ImageBlock;

projects/app/src/components/Markdown/index.tsx

@@ -16,12 +16,14 @@ const MdImage = dynamic(() => import('./img/Image'));
 const ChatGuide = dynamic(() => import('./chat/Guide'));
 const EChartsCodeBlock = dynamic(() => import('./img/EChartsCodeBlock'));
 const QuoteBlock = dynamic(() => import('./chat/Quote'));
+const ImageBlock = dynamic(() => import('./chat/Image'));
 
 export enum CodeClassName {
   guide = 'guide',
   mermaid = 'mermaid',
   echarts = 'echarts',
-  quote = 'quote'
+  quote = 'quote',
+  img = 'img'
 }
 
 function Code({ inline, className, children }: any) {
@@ -41,6 +43,9 @@ function Code({ inline, className, children }: any) {
   if (codeType === CodeClassName.quote) {
     return <QuoteBlock code={String(children)} />;
   }
+  if (codeType === CodeClassName.img) {
+    return <ImageBlock images={String(children)} />;
+  }
   return (
     <CodeLight className={className} inline={inline} match={match}>
       {children}

projects/app/src/web/common/hooks/useSpeech.ts

@@ -12,7 +12,7 @@ export const useSpeech = (props?: { shareId?: string }) => {
   const { toast } = useToast();
   const [isSpeaking, setIsSpeaking] = useState(false);
   const [isTransCription, setIsTransCription] = useState(false);
-  const [audioSecond, setAudioSecone] = useState(0);
+  const [audioSecond, setAudioSecond] = useState(0);
   const intervalRef = useRef<any>();
   const startTimestamp = useRef(0);
 
@@ -59,11 +59,11 @@ export const useSpeech = (props?: { shareId?: string }) => {
 
       mediaRecorder.current.onstart = () => {
         startTimestamp.current = Date.now();
-        setAudioSecone(0);
+        setAudioSecond(0);
         intervalRef.current = setInterval(() => {
           const currentTimestamp = Date.now();
           const duration = (currentTimestamp - startTimestamp.current) / 1000;
-          setAudioSecone(duration);
+          setAudioSecond(duration);
         }, 1000);
       };