Merge branch 'dev2.4' into dev2.5

src/pages/model/detail/components/SelectFileModal.tsx

@@ -9,7 +9,8 @@ import {
   ModalHeader,
   ModalHeader,
   ModalCloseButton,
   ModalCloseButton,
   ModalBody,
   ModalBody,
-  Input
+  Input,
+  Textarea
 } from '@chakra-ui/react';
 } from '@chakra-ui/react';
 import { useToast } from '@/hooks/useToast';
 import { useToast } from '@/hooks/useToast';
 import { useSelectFile } from '@/hooks/useSelectFile';
 import { useSelectFile } from '@/hooks/useSelectFile';
@@ -66,8 +67,8 @@ const SelectFileModal = ({
             })
             })
           )
           )
         )
         )
-          .join('\n')
-          .replace(/\n+/g, '\n');
+          .join(' ')
+          .replace(/(\\n|\n)+/g, '\n');
         setFileText(fileTexts);
         setFileText(fileTexts);
         console.log(encode(fileTexts));
         console.log(encode(fileTexts));
       } catch (error: any) {
       } catch (error: any) {
@@ -142,18 +143,18 @@ const SelectFileModal = ({
               size={'sm'}
               size={'sm'}
             />
             />
           </Flex>
           </Flex>
-          <Box
+          <Textarea
             flex={'1 0 0'}
             flex={'1 0 0'}
             h={0}
             h={0}
             w={'100%'}
             w={'100%'}
-            overflowY={'auto'}
-            p={2}
-            backgroundColor={'blackAlpha.50'}
-            whiteSpace={'pre-wrap'}
+            placeholder="文件内容"
+            maxLength={-1}
+            resize={'none'}
             fontSize={'xs'}
             fontSize={'xs'}
-          >
-            {fileText}
-          </Box>
+            whiteSpace={'pre-wrap'}
+            value={fileText}
+            onChange={(e) => setFileText(e.target.value)}
+          />
         </ModalBody>
         </ModalBody>
 
 
         <Flex px={6} pt={2} pb={4}>
         <Flex px={6} pt={2} pb={4}>

src/utils/tools.ts

@@ -76,7 +76,7 @@ export const readPdfContent = (file: File) =>
       const page = await doc.getPage(pageNo);
       const page = await doc.getPage(pageNo);
       const tokenizedText = await page.getTextContent();
       const tokenizedText = await page.getTextContent();
       const pageText = tokenizedText.items.map((token: any) => token.str).join('');
       const pageText = tokenizedText.items.map((token: any) => token.str).join('');
-      return pageText.replaceAll(/\s+/g, '\n');
+      return pageText;
     };
     };
 
 
     let reader = new FileReader();
     let reader = new FileReader();