feat: translate FileManager #345 (#558)

### What problem does this PR solve?
#345
feat: translate FileManager
feat: batch delete files from the file table in the knowledge base

### Type of change

- [x] New Feature (non-breaking change which adds functionality)
This commit is contained in:
balibabu 2024-04-26 17:22:23 +08:00 committed by GitHub
parent f69ff39fa0
commit eb62c669ae
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
20 changed files with 212 additions and 69 deletions

View File

@ -27,7 +27,7 @@ export default defineConfig({
devtool: 'source-map', devtool: 'source-map',
proxy: { proxy: {
'/v1': { '/v1': {
target: 'http://192.168.200.233:9380/', target: 'http://123.60.95.134:9380/',
changeOrigin: true, changeOrigin: true,
// pathRewrite: { '^/v1': '/v1' }, // pathRewrite: { '^/v1': '/v1' },
}, },

View File

@ -160,12 +160,12 @@ export const useRemoveDocument = () => {
const { knowledgeId } = useGetKnowledgeSearchParams(); const { knowledgeId } = useGetKnowledgeSearchParams();
const removeDocument = useCallback( const removeDocument = useCallback(
(documentId: string) => { (documentIds: string[]) => {
try { try {
return dispatch<any>({ return dispatch<any>({
type: 'kFModel/document_rm', type: 'kFModel/document_rm',
payload: { payload: {
doc_id: documentId, doc_id: documentIds,
kb_id: knowledgeId, kb_id: knowledgeId,
}, },
}); });

View File

@ -14,5 +14,5 @@ export interface IModalProps<T> {
hideModal(): void; hideModal(): void;
visible: boolean; visible: boolean;
loading?: boolean; loading?: boolean;
onOk?(payload?: T): Promise<void> | void; onOk?(payload?: T): Promise<any> | void;
} }

View File

@ -1,5 +1,5 @@
import { ReactComponent as StarIon } from '@/assets/svg/chat-star.svg'; import { ReactComponent as StarIon } from '@/assets/svg/chat-star.svg';
// import { ReactComponent as FileIcon } from '@/assets/svg/file-management.svg'; import { ReactComponent as FileIcon } from '@/assets/svg/file-management.svg';
import { ReactComponent as KnowledgeBaseIcon } from '@/assets/svg/knowledge-base.svg'; import { ReactComponent as KnowledgeBaseIcon } from '@/assets/svg/knowledge-base.svg';
import { ReactComponent as Logo } from '@/assets/svg/logo.svg'; import { ReactComponent as Logo } from '@/assets/svg/logo.svg';
import { useTranslate } from '@/hooks/commonHooks'; import { useTranslate } from '@/hooks/commonHooks';
@ -25,7 +25,7 @@ const RagHeader = () => {
() => [ () => [
{ path: '/knowledge', name: t('knowledgeBase'), icon: KnowledgeBaseIcon }, { path: '/knowledge', name: t('knowledgeBase'), icon: KnowledgeBaseIcon },
{ path: '/chat', name: t('chat'), icon: StarIon }, { path: '/chat', name: t('chat'), icon: StarIon },
// { path: '/file', name: 'File Management', icon: FileIcon }, { path: '/file', name: t('fileManager'), icon: FileIcon },
], ],
[t], [t],
); );

View File

@ -22,6 +22,7 @@ export default {
languagePlaceholder: 'select your language', languagePlaceholder: 'select your language',
copy: 'Copy', copy: 'Copy',
copied: 'Copied', copied: 'Copied',
comingSoon: 'Coming Soon',
}, },
login: { login: {
login: 'Sign in', login: 'Sign in',
@ -52,6 +53,7 @@ export default {
home: 'Home', home: 'Home',
setting: '用户设置', setting: '用户设置',
logout: '登出', logout: '登出',
fileManager: 'File Management',
}, },
knowledgeList: { knowledgeList: {
welcome: 'Welcome back', welcome: 'Welcome back',
@ -459,6 +461,7 @@ export default {
renamed: 'Renamed', renamed: 'Renamed',
operated: 'Operated', operated: 'Operated',
updated: 'Updated', updated: 'Updated',
uploaded: 'Uploaded',
200: 'The server successfully returns the requested data.', 200: 'The server successfully returns the requested data.',
201: 'Create or modify data successfully.', 201: 'Create or modify data successfully.',
202: 'A request has been queued in the background (asynchronous task).', 202: 'A request has been queued in the background (asynchronous task).',
@ -480,6 +483,24 @@ export default {
networkAnomaly: 'network anomaly', networkAnomaly: 'network anomaly',
hint: 'hint', hint: 'hint',
}, },
fileManager: {
name: 'Name',
uploadDate: 'Upload Date',
knowledgeBase: 'Knowledge Base',
size: 'Size',
action: 'Action',
addToKnowledge: 'Add to Knowledge Base',
pleaseSelect: 'Please select',
newFolder: 'New Folder',
file: 'File',
uploadFile: 'Upload File',
directory: 'Directory',
uploadTitle: 'Click or drag file to this area to upload',
uploadDescription:
'Support for a single or bulk upload. Strictly prohibited from uploading company data or other banned files.',
local: 'Local uploads',
s3: 'S3 uploads',
},
footer: { footer: {
profile: 'All rights reserved @ React', profile: 'All rights reserved @ React',
}, },

View File

@ -22,6 +22,7 @@ export default {
languagePlaceholder: '請選擇語言', languagePlaceholder: '請選擇語言',
copy: '複製', copy: '複製',
copied: '複製成功', copied: '複製成功',
comingSoon: '即將推出',
}, },
login: { login: {
login: '登入', login: '登入',
@ -52,6 +53,7 @@ export default {
home: '首頁', home: '首頁',
setting: '用戶設置', setting: '用戶設置',
logout: '登出', logout: '登出',
fileManager: '文件管理',
}, },
knowledgeList: { knowledgeList: {
welcome: '歡迎回來', welcome: '歡迎回來',
@ -218,7 +220,7 @@ export default {
<i>'ragflow'</i> <i>'ragflow'</i>
</p> </p>
`, `,
table: `支持<p><b>excel</b>和<b>csv/txt</b>格式文件。</p><p>以下是一些提示: <ul> <li>对于Csv或Txt文件列之间的分隔符为 <em><b>tab</b></em>。</li> <li>第一行必须是列标题。</li> <li>列标题必须是有意义的术语,以便我们的法学硕士能够理解。列举一些同义词时最好使用斜杠<i>'/'</i>来分隔,甚至更好使用方括号枚举值,例如 <i>“性別/性別(男性,女性)”</i>.<p>以下是标题的一些示例:<ol> <li>供应商/供货商<b>'tab'</b>顏色(黃色、紅色、棕色)<b>'tab'</b>性別(男、女)<b>'tab'</B>尺码m、l、xl、xxl</li> <li>姓名/名字<b>'tab'</b>電話/手機/微信<b>'tab'</b>最高学历高中职高硕士本科博士初中中技中专专科专升本mpambaemba</li> </ol> </p> </li> <li>表中的每一行都将被视为一个块。</li> </ul>`, table: `支持<p><b>excel</b>和<b>csv/txt</b>格式文件。</p><p>以下是一些提示: <ul> <li>对于Csv或Txt文件列之间的分隔符为 <em><b>tab</b></em>。</li> <li>第一行必须是列标题。</li> <li>列标题必须是有意义的术语,以便我们的大語言模型能够理解。列举一些同义词时最好使用斜杠<i>'/'</i>来分隔,甚至更好使用方括号枚举值,例如 <i>“性別/性別(男性,女性)”</i>.<p>以下是标题的一些示例:<ol> <li>供应商/供货商<b>'tab'</b>顏色(黃色、紅色、棕色)<b>'tab'</b>性別(男、女)<b>'tab'</B>尺码m、l、xl、xxl</li> <li>姓名/名字<b>'tab'</b>電話/手機/微信<b>'tab'</b>最高学历高中职高硕士本科博士初中中技中专专科专升本mpambaemba</li> </ol> </p> </li> <li>表中的每一行都将被视为一个块。</li> </ul>`,
picture: ` picture: `
<p></p><p> <p></p><p>
OCR OCR
@ -424,6 +426,7 @@ export default {
renamed: '重命名成功', renamed: '重命名成功',
operated: '操作成功', operated: '操作成功',
updated: '更新成功', updated: '更新成功',
uploaded: '上傳成功',
200: '服務器成功返回請求的數據。', 200: '服務器成功返回請求的數據。',
201: '新建或修改數據成功。', 201: '新建或修改數據成功。',
202: '一個請求已經進入後台排隊(異步任務)。', 202: '一個請求已經進入後台排隊(異步任務)。',
@ -444,6 +447,23 @@ export default {
networkAnomaly: '網絡異常', networkAnomaly: '網絡異常',
hint: '提示', hint: '提示',
}, },
fileManager: {
name: '名稱',
uploadDate: '上傳日期',
knowledgeBase: '知識庫',
size: '大小',
action: '操作',
addToKnowledge: '添加到知識庫',
pleaseSelect: '請選擇',
newFolder: '新建文件夾',
uploadFile: '上傳文件',
uploadTitle: '點擊或拖拽文件至此區域即可上傳',
uploadDescription: '支持單次或批量上傳。嚴禁上傳公司數據或其他違禁文件。',
file: '文件',
directory: '文件夾',
local: '本地上傳',
s3: 'S3 上傳',
},
footer: { footer: {
profile: '“保留所有權利 @ react”', profile: '“保留所有權利 @ react”',
}, },

View File

@ -22,6 +22,7 @@ export default {
languagePlaceholder: '请选择语言', languagePlaceholder: '请选择语言',
copy: '复制', copy: '复制',
copied: '复制成功', copied: '复制成功',
comingSoon: '即将推出',
}, },
login: { login: {
login: '登录', login: '登录',
@ -52,6 +53,7 @@ export default {
home: '首页', home: '首页',
setting: '用户设置', setting: '用户设置',
logout: '登出', logout: '登出',
fileManager: '文件管理',
}, },
knowledgeList: { knowledgeList: {
welcome: '欢迎回来', welcome: '欢迎回来',
@ -225,7 +227,7 @@ export default {
<ul> <ul>
<li> csv txt <em><b>TAB</b></em></li> <li> csv txt <em><b>TAB</b></em></li>
<li></li> <li></li>
<li>便 <li>便
使<i>'/'</i> 使<i>'/'</i>
使 <i>'gender/sex(male,female)'</i>.<p> 使 <i>'gender/sex(male,female)'</i>.<p>
<ol> <ol>
@ -298,7 +300,7 @@ export default {
systemTip: systemTip:
'当LLM回答问题时你需要LLM遵循的说明比如角色设计、答案长度和答案语言等。', '当LLM回答问题时你需要LLM遵循的说明比如角色设计、答案长度和答案语言等。',
topN: 'Top N', topN: 'Top N',
topNTip: `并非所有相似度得分高于“相似度阈值”的块都会被提供给法学硕士。 LLM 只能看到这些“Top N”块。`, topNTip: `并非所有相似度得分高于“相似度阈值”的块都会被提供给大语言模型。 LLM 只能看到这些“Top N”块。`,
variable: '变量', variable: '变量',
variableTip: `如果您使用对话 API变量可能会帮助您使用不同的策略与客户聊天。 variableTip: `如果您使用对话 API变量可能会帮助您使用不同的策略与客户聊天。
便LLM一个提示 便LLM一个提示
@ -315,7 +317,7 @@ export default {
improvise: '即兴创作', improvise: '即兴创作',
precise: '精确', precise: '精确',
balance: '平衡', balance: '平衡',
freedomTip: `“精确”意味着法学硕士会保守并谨慎地回答你的问题。 “即兴发挥”意味着你希望法学硕士能够自由地畅所欲言。 “平衡”是谨慎与自由之间的平衡。`, freedomTip: `“精确”意味着大语言模型会保守并谨慎地回答你的问题。 “即兴发挥”意味着你希望大语言模型能够自由地畅所欲言。 “平衡”是谨慎与自由之间的平衡。`,
temperature: '温度', temperature: '温度',
temperatureMessage: '温度是必填项', temperatureMessage: '温度是必填项',
temperatureTip: temperatureTip:
@ -441,6 +443,7 @@ export default {
renamed: '重命名成功', renamed: '重命名成功',
operated: '操作成功', operated: '操作成功',
updated: '更新成功', updated: '更新成功',
uploaded: '上传成功',
200: '服务器成功返回请求的数据。', 200: '服务器成功返回请求的数据。',
201: '新建或修改数据成功。', 201: '新建或修改数据成功。',
202: '一个请求已经进入后台排队(异步任务)。', 202: '一个请求已经进入后台排队(异步任务)。',
@ -461,6 +464,24 @@ export default {
networkAnomaly: '网络异常', networkAnomaly: '网络异常',
hint: '提示', hint: '提示',
}, },
fileManager: {
name: '名称',
uploadDate: '上传日期',
knowledgeBase: '知识库',
size: '大小',
action: '操作',
addToKnowledge: '添加到知识库',
pleaseSelect: '请选择',
newFolder: '新建文件夹',
uploadFile: '上传文件',
uploadTitle: '点击或拖拽文件至此区域即可上传',
uploadDescription:
'支持单次或批量上传。 严禁上传公司数据或其他违禁文件。',
file: '文件',
directory: '文件夹',
local: '本地上传',
s3: 'S3 上传',
},
footer: { footer: {
profile: 'All rights reserved @ React', profile: 'All rights reserved @ React',
}, },

View File

@ -80,9 +80,7 @@ const DocumentToolbar = ({ selectedRowKeys, showCreateModal }: IProps) => {
const handleDelete = useCallback(() => { const handleDelete = useCallback(() => {
showDeleteConfirm({ showDeleteConfirm({
onOk: () => { onOk: () => {
selectedRowKeys.forEach((id) => { removeDocument(selectedRowKeys);
removeDocument(id);
});
}, },
}); });
}, [removeDocument, showDeleteConfirm, selectedRowKeys]); }, [removeDocument, showDeleteConfirm, selectedRowKeys]);

View File

@ -35,7 +35,7 @@ const ParsingActionCell = ({
const onRmDocument = () => { const onRmDocument = () => {
if (!isRunning) { if (!isRunning) {
showDeleteConfirm({ onOk: () => removeDocument(documentId) }); showDeleteConfirm({ onOk: () => removeDocument([documentId]) });
} }
}; };

View File

@ -38,7 +38,7 @@ const ActionCell = ({
const onDownloadDocument = () => { const onDownloadDocument = () => {
downloadFile({ downloadFile({
url: `${api_host}/document/get/${documentId}`, url: `${api_host}/file/get/${documentId}`,
filename: record.name, filename: record.name,
}); });
}; };

View File

@ -1,3 +1,4 @@
import { useTranslate } from '@/hooks/commonHooks';
import { useFetchKnowledgeList } from '@/hooks/knowledgeHook'; import { useFetchKnowledgeList } from '@/hooks/knowledgeHook';
import { IModalProps } from '@/interfaces/common'; import { IModalProps } from '@/interfaces/common';
import { Form, Modal, Select, SelectProps } from 'antd'; import { Form, Modal, Select, SelectProps } from 'antd';
@ -8,9 +9,11 @@ const ConnectToKnowledgeModal = ({
hideModal, hideModal,
onOk, onOk,
initialValue, initialValue,
loading,
}: IModalProps<string[]> & { initialValue: string[] }) => { }: IModalProps<string[]> & { initialValue: string[] }) => {
const [form] = Form.useForm(); const [form] = Form.useForm();
const { list, fetchList } = useFetchKnowledgeList(); const { list, fetchList } = useFetchKnowledgeList();
const { t } = useTranslate('fileManager');
const options: SelectProps['options'] = list?.map((item) => ({ const options: SelectProps['options'] = list?.map((item) => ({
label: item.name, label: item.name,
@ -32,10 +35,11 @@ const ConnectToKnowledgeModal = ({
return ( return (
<Modal <Modal
title="Add to Knowledge Base" title={t('addToKnowledge')}
open={visible} open={visible}
onOk={handleOk} onOk={handleOk}
onCancel={hideModal} onCancel={hideModal}
confirmLoading={loading}
> >
<Form form={form}> <Form form={form}>
<Form.Item name="knowledgeIds" noStyle> <Form.Item name="knowledgeIds" noStyle>
@ -43,7 +47,7 @@ const ConnectToKnowledgeModal = ({
mode="multiple" mode="multiple"
allowClear allowClear
style={{ width: '100%' }} style={{ width: '100%' }}
placeholder="Please select" placeholder={t('pleaseSelect')}
options={options} options={options}
/> />
</Form.Item> </Form.Item>

View File

@ -20,12 +20,12 @@ import {
import { useMemo } from 'react'; import { useMemo } from 'react';
import { import {
useFetchDocumentListOnMount, useFetchDocumentListOnMount,
useHandleBreadcrumbClick,
useHandleDeleteFile, useHandleDeleteFile,
useHandleSearchChange, useHandleSearchChange,
useSelectBreadcrumbItems, useSelectBreadcrumbItems,
} from './hooks'; } from './hooks';
import { Link } from 'umi';
import styles from './index.less'; import styles from './index.less';
interface IProps { interface IProps {
@ -35,20 +35,6 @@ interface IProps {
setSelectedRowKeys: (keys: string[]) => void; setSelectedRowKeys: (keys: string[]) => void;
} }
const itemRender: BreadcrumbProps['itemRender'] = (
currentRoute,
params,
items,
) => {
const isLast = currentRoute?.path === items[items.length - 1]?.path;
return isLast ? (
<span>{currentRoute.title}</span>
) : (
<Link to={`${currentRoute.path}`}>{currentRoute.title}</Link>
);
};
const FileToolbar = ({ const FileToolbar = ({
selectedRowKeys, selectedRowKeys,
showFolderCreateModal, showFolderCreateModal,
@ -59,6 +45,26 @@ const FileToolbar = ({
useFetchDocumentListOnMount(); useFetchDocumentListOnMount();
const { handleInputChange, searchString } = useHandleSearchChange(); const { handleInputChange, searchString } = useHandleSearchChange();
const breadcrumbItems = useSelectBreadcrumbItems(); const breadcrumbItems = useSelectBreadcrumbItems();
const { handleBreadcrumbClick } = useHandleBreadcrumbClick();
const itemRender: BreadcrumbProps['itemRender'] = (
currentRoute,
params,
items,
) => {
const isLast = currentRoute?.path === items[items.length - 1]?.path;
return isLast ? (
<span>{currentRoute.title}</span>
) : (
<span
className={styles.breadcrumbItemButton}
onClick={() => handleBreadcrumbClick(currentRoute.path)}
>
{currentRoute.title}
</span>
);
};
const actionItems: MenuProps['items'] = useMemo(() => { const actionItems: MenuProps['items'] = useMemo(() => {
return [ return [
@ -70,7 +76,7 @@ const FileToolbar = ({
<Button type="link"> <Button type="link">
<Space> <Space>
<FileTextOutlined /> <FileTextOutlined />
{t('localFiles')} {t('uploadFile', { keyPrefix: 'fileManager' })}
</Space> </Space>
</Button> </Button>
</div> </div>
@ -83,12 +89,13 @@ const FileToolbar = ({
label: ( label: (
<div> <div>
<Button type="link"> <Button type="link">
<FolderOpenOutlined /> <Space>
New Folder <FolderOpenOutlined />
{t('newFolder', { keyPrefix: 'fileManager' })}
</Space>
</Button> </Button>
</div> </div>
), ),
// disabled: true,
}, },
]; ];
}, [t, showFolderCreateModal, showFileUploadModal]); }, [t, showFolderCreateModal, showFileUploadModal]);

View File

@ -0,0 +1,8 @@
.uploader {
:global {
.ant-upload-list {
max-height: 40vh;
overflow-y: auto;
}
}
}

View File

@ -1,3 +1,4 @@
import { useTranslate } from '@/hooks/commonHooks';
import { IModalProps } from '@/interfaces/common'; import { IModalProps } from '@/interfaces/common';
import { InboxOutlined } from '@ant-design/icons'; import { InboxOutlined } from '@ant-design/icons';
import { import {
@ -12,6 +13,8 @@ import {
} from 'antd'; } from 'antd';
import { Dispatch, SetStateAction, useState } from 'react'; import { Dispatch, SetStateAction, useState } from 'react';
import styles from './index.less';
const { Dragger } = Upload; const { Dragger } = Upload;
const FileUpload = ({ const FileUpload = ({
@ -23,6 +26,7 @@ const FileUpload = ({
fileList: UploadFile[]; fileList: UploadFile[];
setFileList: Dispatch<SetStateAction<UploadFile[]>>; setFileList: Dispatch<SetStateAction<UploadFile[]>>;
}) => { }) => {
const { t } = useTranslate('fileManager');
const props: UploadProps = { const props: UploadProps = {
multiple: true, multiple: true,
onRemove: (file) => { onRemove: (file) => {
@ -43,17 +47,12 @@ const FileUpload = ({
}; };
return ( return (
<Dragger {...props}> <Dragger {...props} className={styles.uploader}>
<p className="ant-upload-drag-icon"> <p className="ant-upload-drag-icon">
<InboxOutlined /> <InboxOutlined />
</p> </p>
<p className="ant-upload-text"> <p className="ant-upload-text">{t('uploadTitle')}</p>
Click or drag file to this area to upload <p className="ant-upload-hint">{t('uploadDescription')}</p>
</p>
<p className="ant-upload-hint">
Support for a single or bulk upload. Strictly prohibited from uploading
company data or other banned files.
</p>
</Dragger> </Dragger>
); );
}; };
@ -64,18 +63,25 @@ const FileUploadModal = ({
loading, loading,
onOk: onFileUploadOk, onOk: onFileUploadOk,
}: IModalProps<UploadFile[]>) => { }: IModalProps<UploadFile[]>) => {
const { t } = useTranslate('fileManager');
const [value, setValue] = useState<string | number>('local'); const [value, setValue] = useState<string | number>('local');
const [fileList, setFileList] = useState<UploadFile[]>([]); const [fileList, setFileList] = useState<UploadFile[]>([]);
const [directoryFileList, setDirectoryFileList] = useState<UploadFile[]>([]); const [directoryFileList, setDirectoryFileList] = useState<UploadFile[]>([]);
const onOk = () => { const onOk = async () => {
return onFileUploadOk?.([...fileList, ...directoryFileList]); const ret = await onFileUploadOk?.([...fileList, ...directoryFileList]);
console.info(ret);
if (ret !== undefined && ret === 0) {
setFileList([]);
setDirectoryFileList([]);
}
return ret;
}; };
const items: TabsProps['items'] = [ const items: TabsProps['items'] = [
{ {
key: '1', key: '1',
label: 'File', label: t('file'),
children: ( children: (
<FileUpload <FileUpload
directory={false} directory={false}
@ -86,7 +92,7 @@ const FileUploadModal = ({
}, },
{ {
key: '2', key: '2',
label: 'Directory', label: t('directory'),
children: ( children: (
<FileUpload <FileUpload
directory directory
@ -100,7 +106,7 @@ const FileUploadModal = ({
return ( return (
<> <>
<Modal <Modal
title="File upload" title={t('uploadFile')}
open={visible} open={visible}
onOk={onOk} onOk={onOk}
onCancel={hideModal} onCancel={hideModal}
@ -109,8 +115,8 @@ const FileUploadModal = ({
<Flex gap={'large'} vertical> <Flex gap={'large'} vertical>
<Segmented <Segmented
options={[ options={[
{ label: 'Local uploads', value: 'local' }, { label: t('local'), value: 'local' },
{ label: 'S3 uploads', value: 's3' }, { label: t('s3'), value: 's3' },
]} ]}
block block
value={value} value={value}
@ -119,7 +125,7 @@ const FileUploadModal = ({
{value === 'local' ? ( {value === 'local' ? (
<Tabs defaultActiveKey="1" items={items} /> <Tabs defaultActiveKey="1" items={items} />
) : ( ) : (
'coming soon' t('comingSoon', { keyPrefix: 'common' })
)} )}
</Flex> </Flex>
</Modal> </Modal>

View File

@ -35,7 +35,7 @@ const FolderCreateModal = ({ visible, hideModal, loading, onOk }: IProps) => {
return ( return (
<Modal <Modal
title={'New Folder'} title={t('newFolder', { keyPrefix: 'fileManager' })}
open={visible} open={visible}
onOk={handleOk} onOk={handleOk}
onCancel={handleCancel} onCancel={handleCancel}

View File

@ -244,14 +244,14 @@ export const useHandleUploadFile = () => {
const id = useGetFolderId(); const id = useGetFolderId();
const onFileUploadOk = useCallback( const onFileUploadOk = useCallback(
async (fileList: UploadFile[]) => { async (fileList: UploadFile[]): Promise<number | undefined> => {
console.info('fileList', fileList);
if (fileList.length > 0) { if (fileList.length > 0) {
const ret = await uploadFile(fileList, id); const ret: number = await uploadFile(fileList, id);
console.info(ret); console.info(ret);
if (ret === 0) { if (ret === 0) {
hideFileUploadModal(); hideFileUploadModal();
} }
return ret;
} }
}, },
[uploadFile, hideFileUploadModal, id], [uploadFile, hideFileUploadModal, id],
@ -295,6 +295,7 @@ export const useHandleConnectToKnowledge = () => {
if (ret === 0) { if (ret === 0) {
hideConnectToKnowledgeModal(); hideConnectToKnowledgeModal();
} }
return ret;
}, },
[connectToKnowledge, hideConnectToKnowledgeModal, id, record.id], [connectToKnowledge, hideConnectToKnowledgeModal, id, record.id],
); );
@ -320,3 +321,20 @@ export const useHandleConnectToKnowledge = () => {
showConnectToKnowledgeModal: handleShowConnectToKnowledgeModal, showConnectToKnowledgeModal: handleShowConnectToKnowledgeModal,
}; };
}; };
export const useHandleBreadcrumbClick = () => {
const navigate = useNavigate();
const setPagination = useSetPagination('fileManager');
const handleBreadcrumbClick = useCallback(
(path?: string) => {
if (path) {
setPagination();
navigate(path);
}
},
[setPagination, navigate],
);
return { handleBreadcrumbClick };
};

View File

@ -20,3 +20,10 @@
.linkButton { .linkButton {
padding: 0; padding: 0;
} }
.breadcrumbItemButton {
cursor: pointer;
color: #1677ff;
padding: 0;
height: auto;
}

View File

@ -1,7 +1,7 @@
import { useSelectFileList } from '@/hooks/fileManagerHooks'; import { useSelectFileList } from '@/hooks/fileManagerHooks';
import { IFile } from '@/interfaces/database/file-manager'; import { IFile } from '@/interfaces/database/file-manager';
import { formatDate } from '@/utils/date'; import { formatDate } from '@/utils/date';
import { Button, Flex, Table } from 'antd'; import { Button, Flex, Space, Table, Tag } from 'antd';
import { ColumnsType } from 'antd/es/table'; import { ColumnsType } from 'antd/es/table';
import ActionCell from './action-cell'; import ActionCell from './action-cell';
import FileToolbar from './file-toolbar'; import FileToolbar from './file-toolbar';
@ -18,6 +18,8 @@ import {
import RenameModal from '@/components/rename-modal'; import RenameModal from '@/components/rename-modal';
import SvgIcon from '@/components/svg-icon'; import SvgIcon from '@/components/svg-icon';
import { useTranslate } from '@/hooks/commonHooks';
import { formatNumberWithThousandsSeparator } from '@/utils/commonUtil';
import { getExtension } from '@/utils/documentUtils'; import { getExtension } from '@/utils/documentUtils';
import ConnectToKnowledgeModal from './connect-to-knowledge-modal'; import ConnectToKnowledgeModal from './connect-to-knowledge-modal';
import FileUploadModal from './file-upload-modal'; import FileUploadModal from './file-upload-modal';
@ -25,6 +27,7 @@ import FolderCreateModal from './folder-create-modal';
import styles from './index.less'; import styles from './index.less';
const FileManager = () => { const FileManager = () => {
const { t } = useTranslate('fileManager');
const fileList = useSelectFileList(); const fileList = useSelectFileList();
const { rowSelection, setSelectedRowKeys } = useGetRowSelection(); const { rowSelection, setSelectedRowKeys } = useGetRowSelection();
const loading = useSelectFileListLoading(); const loading = useSelectFileListLoading();
@ -57,12 +60,13 @@ const FileManager = () => {
showConnectToKnowledgeModal, showConnectToKnowledgeModal,
onConnectToKnowledgeOk, onConnectToKnowledgeOk,
initialValue, initialValue,
connectToKnowledgeLoading,
} = useHandleConnectToKnowledge(); } = useHandleConnectToKnowledge();
const { pagination } = useGetFilesPagination(); const { pagination } = useGetFilesPagination();
const columns: ColumnsType<IFile> = [ const columns: ColumnsType<IFile> = [
{ {
title: 'Name', title: t('name'),
dataIndex: 'name', dataIndex: 'name',
key: 'name', key: 'name',
render(value, record) { render(value, record) {
@ -88,7 +92,7 @@ const FileManager = () => {
}, },
}, },
{ {
title: 'Upload Date', title: t('uploadDate'),
dataIndex: 'create_date', dataIndex: 'create_date',
key: 'create_date', key: 'create_date',
render(text) { render(text) {
@ -96,22 +100,35 @@ const FileManager = () => {
}, },
}, },
{ {
title: 'Knowledge Base', title: t('size'),
dataIndex: 'kbs_info', dataIndex: 'size',
key: 'kbs_info', key: 'size',
render(value) { render(value) {
return Array.isArray(value) return (
? value?.map((x) => x.kb_name).join(',') formatNumberWithThousandsSeparator((value / 1024).toFixed(2)) + ' KB'
: ''; );
}, },
}, },
{ {
title: 'Location', title: t('knowledgeBase'),
dataIndex: 'location', dataIndex: 'kbs_info',
key: 'location', key: 'kbs_info',
render(value) {
return Array.isArray(value) ? (
<Space wrap>
{value?.map((x) => (
<Tag color="blue" key={x.kb_id}>
{x.kb_name}
</Tag>
))}
</Space>
) : (
''
);
},
}, },
{ {
title: 'Action', title: t('action'),
dataIndex: 'action', dataIndex: 'action',
key: 'action', key: 'action',
render: (text, record) => ( render: (text, record) => (
@ -168,6 +185,7 @@ const FileManager = () => {
visible={connectToKnowledgeVisible} visible={connectToKnowledgeVisible}
hideModal={hideConnectToKnowledgeModal} hideModal={hideConnectToKnowledgeModal}
onOk={onConnectToKnowledgeOk} onOk={onConnectToKnowledgeOk}
loading={connectToKnowledgeLoading}
></ConnectToKnowledgeModal> ></ConnectToKnowledgeModal>
</section> </section>
); );

View File

@ -1,7 +1,9 @@
import { paginationModel } from '@/base'; import { paginationModel } from '@/base';
import { BaseState } from '@/interfaces/common'; import { BaseState } from '@/interfaces/common';
import { IFile, IFolder } from '@/interfaces/database/file-manager'; import { IFile, IFolder } from '@/interfaces/database/file-manager';
import i18n from '@/locales/config';
import fileManagerService from '@/services/fileManagerService'; import fileManagerService from '@/services/fileManagerService';
import { message } from 'antd';
import omit from 'lodash/omit'; import omit from 'lodash/omit';
import { DvaModel } from 'umi'; import { DvaModel } from 'umi';
@ -33,6 +35,7 @@ const model: DvaModel<FileManagerModelState> = {
}); });
const { retcode } = data; const { retcode } = data;
if (retcode === 0) { if (retcode === 0) {
message.success(i18n.t('message.deleted'));
yield put({ yield put({
type: 'listFile', type: 'listFile',
payload: { parentId: payload.parentId }, payload: { parentId: payload.parentId },
@ -69,6 +72,7 @@ const model: DvaModel<FileManagerModelState> = {
omit(payload, ['parentId']), omit(payload, ['parentId']),
); );
if (data.retcode === 0) { if (data.retcode === 0) {
message.success(i18n.t('message.renamed'));
yield put({ yield put({
type: 'listFile', type: 'listFile',
payload: { parentId: payload.parentId }, payload: { parentId: payload.parentId },
@ -89,6 +93,8 @@ const model: DvaModel<FileManagerModelState> = {
}); });
const { data } = yield call(fileManagerService.uploadFile, formData); const { data } = yield call(fileManagerService.uploadFile, formData);
if (data.retcode === 0) { if (data.retcode === 0) {
message.success(i18n.t('message.uploaded'));
yield put({ yield put({
type: 'listFile', type: 'listFile',
payload: { parentId: payload.parentId }, payload: { parentId: payload.parentId },
@ -99,6 +105,8 @@ const model: DvaModel<FileManagerModelState> = {
*createFolder({ payload = {} }, { call, put }) { *createFolder({ payload = {} }, { call, put }) {
const { data } = yield call(fileManagerService.createFolder, payload); const { data } = yield call(fileManagerService.createFolder, payload);
if (data.retcode === 0) { if (data.retcode === 0) {
message.success(i18n.t('message.created'));
yield put({ yield put({
type: 'listFile', type: 'listFile',
payload: { parentId: payload.parentId }, payload: { parentId: payload.parentId },
@ -125,6 +133,7 @@ const model: DvaModel<FileManagerModelState> = {
omit(payload, 'parentId'), omit(payload, 'parentId'),
); );
if (data.retcode === 0) { if (data.retcode === 0) {
message.success(i18n.t('message.operated'));
yield put({ yield put({
type: 'listFile', type: 'listFile',
payload: { parentId: payload.parentId }, payload: { parentId: payload.parentId },

View File

@ -27,3 +27,9 @@ export const getSearchValue = (key: string) => {
const params = new URL(document.location as any).searchParams; const params = new URL(document.location as any).searchParams;
return params.get(key); return params.get(key);
}; };
// Formatize numbers, add thousands of separators
export const formatNumberWithThousandsSeparator = (numberStr: string) => {
const formattedNumber = numberStr.replace(/\B(?=(\d{3})+(?!\d))/g, ',');
return formattedNumber;
};