Skip to content

Commit

Permalink
feat: Add FileIcon infiniflow#1880
Browse files Browse the repository at this point in the history
  • Loading branch information
cike8899 committed Aug 15, 2024
1 parent c59c1b6 commit 167d5b5
Show file tree
Hide file tree
Showing 5 changed files with 172 additions and 42 deletions.
3 changes: 3 additions & 0 deletions web/src/components/file-icon/index.less
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
.thumbnailImg {
max-width: 20px;
}
25 changes: 25 additions & 0 deletions web/src/components/file-icon/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import { getExtension } from '@/utils/document-util';
import SvgIcon from '../svg-icon';

import { useSelectFileThumbnails } from '@/hooks/knowledge-hooks';
import styles from './index.less';

interface IProps {
name: string;
id: string;
}

const FileIcon = ({ name, id }: IProps) => {
const fileExtension = getExtension(name);
// TODO: replace this line with react query
const fileThumbnails = useSelectFileThumbnails();
const fileThumbnail = fileThumbnails[id];

return fileThumbnail ? (
<img src={fileThumbnail} className={styles.thumbnailImg}></img>
) : (
<SvgIcon name={`file-icon/${fileExtension}`} width={24}></SvgIcon>
);
};

export default FileIcon;
15 changes: 15 additions & 0 deletions web/src/components/message-input/index.less
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
.messageInputWrapper {
margin-right: 20px;
.documentCard {
:global(.ant-card-body) {
padding: 10px;
position: relative;
}
}
.deleteIcon {
position: absolute;
right: -4px;
top: -4px;
color: #d92d20;
}
}
138 changes: 122 additions & 16 deletions web/src/components/message-input/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,36 @@ import { Authorization } from '@/constants/authorization';
import { useTranslate } from '@/hooks/common-hooks';
import { useRemoveNextDocument } from '@/hooks/document-hooks';
import { getAuthorization } from '@/utils/authorization-util';
import { PlusOutlined } from '@ant-design/icons';
import { getExtension } from '@/utils/document-util';
import {
CloseCircleOutlined,
LoadingOutlined,
PlusOutlined,
UploadOutlined,
} from '@ant-design/icons';
import type { GetProp, UploadFile } from 'antd';
import { Button, Flex, Input, Upload, UploadProps } from 'antd';
import {
Button,
Card,
Flex,
Input,
List,
Space,
Spin,
Typography,
Upload,
UploadProps,
} from 'antd';
import get from 'lodash/get';
import { ChangeEventHandler, useCallback, useState } from 'react';
import FileIcon from '../file-icon';

import styles from './index.less';

type FileType = Parameters<GetProp<UploadProps, 'beforeUpload'>>[0];
const { Text } = Typography;

const getFileId = (file: UploadFile) => get(file, 'response.data.0');

interface IProps {
disabled: boolean;
Expand Down Expand Up @@ -49,7 +72,6 @@ const MessageInput = ({
};

const handleChange: UploadProps['onChange'] = ({ fileList: newFileList }) => {
console.log('🚀 ~ newFileList:', newFileList);
setFileList(newFileList);
};
const isUploadingFile = fileList.some((x) => x.status === 'uploading');
Expand All @@ -65,10 +87,13 @@ const MessageInput = ({
}, [fileList, onPressEnter, isUploadingFile]);

const handleRemove = useCallback(
(file: UploadFile) => {
async (file: UploadFile) => {
const ids = get(file, 'response.data', []);
if (ids.length) {
removeDocument(ids[0]);
await removeDocument(ids[0]);
setFileList((preList) => {
return preList.filter((x) => getFileId(x) !== ids[0]);
});
}
},
[removeDocument],
Expand All @@ -82,26 +107,43 @@ const MessageInput = ({
);

return (
<Flex gap={10} vertical>
<Flex gap={20} vertical className={styles.messageInputWrapper}>
<Input
size="large"
placeholder={t('sendPlaceholder')}
value={value}
disabled={disabled}
suffix={
<Button
type="primary"
onClick={handlePressEnter}
loading={sendLoading}
disabled={sendDisabled || isUploadingFile}
>
{t('send')}
</Button>
<Space>
<Upload
action="/v1/document/upload_and_parse"
// listType="picture-card"
fileList={fileList}
onPreview={handlePreview}
onChange={handleChange}
multiple
headers={{ [Authorization]: getAuthorization() }}
data={{ conversation_id: conversationId }}
method="post"
onRemove={handleRemove}
showUploadList={false}
>
<Button icon={<UploadOutlined />}></Button>
</Upload>
<Button
type="primary"
onClick={handlePressEnter}
loading={sendLoading}
disabled={sendDisabled || isUploadingFile}
>
{t('send')}
</Button>
</Space>
}
onPressEnter={handlePressEnter}
onChange={onInputChange}
/>
<Upload
{/* <Upload
action="/v1/document/upload_and_parse"
listType="picture-card"
fileList={fileList}
Expand All @@ -114,7 +156,71 @@ const MessageInput = ({
onRemove={handleRemove}
>
{fileList.length >= 8 ? null : uploadButton}
</Upload>
</Upload> */}
{fileList.length > 0 && (
<List
grid={{
gutter: 16,
xs: 1,
sm: 2,
md: 2,
lg: 1,
xl: 2,
xxl: 4,
}}
dataSource={fileList}
renderItem={(item) => {
const fileExtension = getExtension(item.name);

return (
<List.Item>
<Card className={styles.documentCard}>
<>
<Flex gap={10} align="center">
{item.status === 'uploading' || !item.response ? (
<Spin
indicator={
<LoadingOutlined style={{ fontSize: 24 }} spin />
}
/>
) : (
<FileIcon
id={getFileId(item)}
name={item.name}
></FileIcon>
)}
<Flex vertical style={{ width: '90%' }}>
<Text
ellipsis={{ tooltip: item.name }}
className={styles.nameText}
>
<b> {item.name}</b>
</Text>
{item.percent !== 100 ? (
'上传中'
) : !item.response ? (
'解析中'
) : (
<Space>
<span>{fileExtension?.toUpperCase()},</span>
</Space>
)}
</Flex>
</Flex>
</>

{item.status !== 'uploading' && (
<CloseCircleOutlined
className={styles.deleteIcon}
onClick={() => handleRemove(item)}
/>
)}
</Card>
</List.Item>
);
}}
/>
)}
</Flex>
);
};
Expand Down
33 changes: 7 additions & 26 deletions web/src/components/message-item/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ import {
import MarkdownContent from '@/pages/chat/markdown-content';
import { getExtension, isImage } from '@/utils/document-util';
import { Avatar, Button, Flex, List, Typography } from 'antd';
import FileIcon from '../file-icon';
import IndentedTreeModal from '../indented-tree/modal';
import NewDocumentLink from '../new-document-link';
import SvgIcon from '../svg-icon';
import styles from './index.less';

const { Text } = Typography;
Expand Down Expand Up @@ -126,23 +126,13 @@ const MessageItem = ({
bordered
dataSource={referenceDocumentList}
renderItem={(item) => {
const fileThumbnail = fileThumbnails[item.doc_id];

const fileExtension = getExtension(item.doc_name);
return (
<List.Item>
<Flex gap={'small'} align="center">
{fileThumbnail ? (
<img
src={fileThumbnail}
className={styles.thumbnailImg}
></img>
) : (
<SvgIcon
name={`file-icon/${fileExtension}`}
width={24}
></SvgIcon>
)}
<FileIcon
id={item.doc_id}
name={item.doc_name}
></FileIcon>

<NewDocumentLink
documentId={item.doc_id}
Expand All @@ -162,23 +152,14 @@ const MessageItem = ({
bordered
dataSource={documentList}
renderItem={(item) => {
// TODO:
const fileThumbnail =
documentThumbnails[item.id] || fileThumbnails[item.id];
const fileExtension = getExtension(item.name);
return (
<List.Item>
<Flex gap={'small'} align="center">
{fileThumbnail ? (
<img
src={fileThumbnail}
className={styles.thumbnailImg}
></img>
) : (
<SvgIcon
name={`file-icon/${fileExtension}`}
width={24}
></SvgIcon>
)}
<FileIcon id={item.id} name={item.name}></FileIcon>

{isImage(fileExtension) ? (
<NewDocumentLink
Expand Down

0 comments on commit 167d5b5

Please sign in to comment.