Compare commits

..

No commits in common. "48cee9bd3f3790f7c7fcbe954f8ab17b85ac05d0" and "518c71b859134db761ddbc19374bac2d0ad8534b" have entirely different histories.

6 changed files with 73 additions and 284 deletions

View File

@ -316,7 +316,7 @@ export default function DatasetTab({ knowledgeBase }) {
</div> </div>
)} )}
</div> </div>
<div className='w-25 d-none'> <div className='w-25'>
<input <input
type='text' type='text'
className='form-control' className='form-control'
@ -338,7 +338,7 @@ export default function DatasetTab({ knowledgeBase }) {
onDeleteDocument={handleDeleteDocument} onDeleteDocument={handleDeleteDocument}
/> />
{/* Pagination */} {/* Pagination */}
{/* <div className='d-flex justify-content-between align-items-center mt-3'> <div className='d-flex justify-content-between align-items-center mt-3'>
<div> <div>
每页行数: 每页行数:
<select className='form-select form-select d-inline-block ms-2' style={{ width: '70px' }}> <select className='form-select form-select d-inline-block ms-2' style={{ width: '70px' }}>
@ -364,7 +364,7 @@ export default function DatasetTab({ knowledgeBase }) {
</ul> </ul>
</nav> </nav>
</div> </div>
</div> */} </div>
{/* File upload modal */} {/* File upload modal */}
<FileUploadModal <FileUploadModal

View File

@ -1,4 +1,4 @@
import React, { useState, useEffect } from 'react'; import React, { useState } from 'react';
import { useDispatch, useSelector } from 'react-redux'; import { useDispatch, useSelector } from 'react-redux';
import { formatDate } from '../../../../utils/dateUtils'; import { formatDate } from '../../../../utils/dateUtils';
import { deleteKnowledgeBaseDocument } from '../../../../store/knowledgeBase/knowledgeBase.thunks'; import { deleteKnowledgeBaseDocument } from '../../../../store/knowledgeBase/knowledgeBase.thunks';
@ -9,67 +9,10 @@ import DocumentPreviewModal from './DocumentPreviewModal';
*/ */
const DocumentList = ({ knowledgeBaseId }) => { const DocumentList = ({ knowledgeBaseId }) => {
const dispatch = useDispatch(); const dispatch = useDispatch();
const { items, loading, error } = useSelector((state) => state.knowledgeBase.documents); const { items, loading, pagination } = useSelector((state) => state.knowledgeBase.documents);
const [previewModalVisible, setPreviewModalVisible] = useState(false); const [previewModalVisible, setPreviewModalVisible] = useState(false);
const [selectedDocumentId, setSelectedDocumentId] = useState(null); const [selectedDocumentId, setSelectedDocumentId] = useState(null);
//
const [currentPage, setCurrentPage] = useState(1);
const [pageSize, setPageSize] = useState(10);
const [displayedItems, setDisplayedItems] = useState([]);
const [totalPages, setTotalPages] = useState(1);
//
useEffect(() => {
if (!items || items.length === 0) {
setDisplayedItems([]);
setTotalPages(1);
return;
}
//
const total = Math.ceil(items.length / pageSize);
setTotalPages(total);
//
let page = currentPage;
if (page > total) {
page = total;
setCurrentPage(page);
}
//
const startIndex = (page - 1) * pageSize;
const endIndex = Math.min(startIndex + pageSize, items.length);
setDisplayedItems(items.slice(startIndex, endIndex));
console.log(`前端分页: 总项目 ${items.length}, 当前页 ${page}/${total}, 显示 ${startIndex + 1}-${endIndex}`);
}, [items, currentPage, pageSize]);
//
const handlePageChange = (page) => {
setCurrentPage(page);
};
const handlePrevPage = () => {
if (currentPage > 1) {
setCurrentPage(currentPage - 1);
}
};
const handleNextPage = () => {
if (currentPage < totalPages) {
setCurrentPage(currentPage + 1);
}
};
//
useEffect(() => {
console.log('DocumentList 渲染 - 知识库ID:', knowledgeBaseId);
console.log('文档列表状态:', { items, loading, error });
console.log('文档列表项数:', items ? items.length : 0);
}, [knowledgeBaseId, items, loading, error]);
const handleDeleteDocument = (documentId) => { const handleDeleteDocument = (documentId) => {
if (window.confirm('确定要删除此文档吗?')) { if (window.confirm('确定要删除此文档吗?')) {
dispatch( dispatch(
@ -92,7 +35,6 @@ const DocumentList = ({ knowledgeBaseId }) => {
}; };
if (loading) { if (loading) {
console.log('DocumentList - 加载中...');
return ( return (
<div className='text-center py-4'> <div className='text-center py-4'>
<div className='spinner-border text-primary' role='status'> <div className='spinner-border text-primary' role='status'>
@ -102,8 +44,7 @@ const DocumentList = ({ knowledgeBaseId }) => {
); );
} }
if (!items || items.length === 0) { if (items.length === 0) {
console.log('DocumentList - 暂无文档');
return ( return (
<div className='text-center py-4 text-muted'> <div className='text-center py-4 text-muted'>
<p>暂无文档请上传文档</p> <p>暂无文档请上传文档</p>
@ -111,7 +52,6 @@ const DocumentList = ({ knowledgeBaseId }) => {
); );
} }
console.log('DocumentList - 渲染文档列表', displayedItems);
return ( return (
<> <>
<div className='table-responsive'> <div className='table-responsive'>
@ -125,30 +65,22 @@ const DocumentList = ({ knowledgeBaseId }) => {
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
{displayedItems.map((doc) => ( {items.map((doc) => (
<tr key={doc.id || doc.document_id}> <tr key={doc.id}>
<td> <td>{doc.document_name}</td>
<div <td>{formatDateTime(doc.create_time)}</td>
className='text-truncate' <td>{formatDateTime(doc.update_time)}</td>
style={{ maxWidth: '250px' }}
title={doc.document_name || doc.name}
>
{doc.document_name || doc.name}
</div>
</td>
<td className='text-nowrap'>{formatDateTime(doc.create_time || doc.created_at)}</td>
<td className='text-nowrap'>{formatDateTime(doc.update_time || doc.updated_at)}</td>
<td> <td>
<div className='btn-group' role='group'> <div className='btn-group' role='group'>
<button <button
className='btn btn-sm btn-outline-dark me-2' className='btn btn-sm btn-outline-dark me-2'
onClick={() => handlePreviewDocument(doc.document_id || doc.id)} onClick={() => handlePreviewDocument(doc.document_id)}
> >
预览 预览
</button> </button>
<button <button
className='btn btn-sm btn-outline-danger' className='btn btn-sm btn-outline-danger'
onClick={() => handleDeleteDocument(doc.document_id || doc.id)} onClick={() => handleDeleteDocument(doc.document_id)}
> >
删除 删除
</button> </button>
@ -159,33 +91,9 @@ const DocumentList = ({ knowledgeBaseId }) => {
</tbody> </tbody>
</table> </table>
{/* 分页控件 */} {pagination.total > 0 && (
{items.length > 0 && (
<div className='d-flex justify-content-between align-items-center mt-3'> <div className='d-flex justify-content-between align-items-center mt-3'>
<div className='text-muted mb-0'> <p className='text-muted mb-0'> {pagination.total} 条记录</p>
{items.length} 条记录 {currentPage}/{totalPages}
</div>
<nav aria-label='文档列表分页'>
<ul className='pagination dark-pagination pagination-sm mb-0'>
<li className={`page-item ${currentPage === 1 ? 'disabled' : ''}`}>
<button className='page-link' onClick={handlePrevPage}>
上一页
</button>
</li>
{Array.from({ length: totalPages }, (_, i) => i + 1).map((page) => (
<li key={page} className={`page-item ${page === currentPage ? 'active' : ''}`}>
<button className='page-link' onClick={() => handlePageChange(page)}>
{page}
</button>
</li>
))}
<li className={`page-item ${currentPage === totalPages ? 'disabled' : ''}`}>
<button className='page-link' onClick={handleNextPage}>
下一页
</button>
</li>
</ul>
</nav>
</div> </div>
)} )}
</div> </div>

View File

@ -34,8 +34,6 @@ const DocumentPreviewModal = ({ show, documentId, knowledgeBaseId, onClose }) =>
// //
setDocumentContent(response); setDocumentContent(response);
} }
console.log(documentContent);
} catch (error) { } catch (error) {
console.error('获取文档内容失败:', error); console.error('获取文档内容失败:', error);
dispatch( dispatch(
@ -90,8 +88,8 @@ const DocumentPreviewModal = ({ show, documentId, knowledgeBaseId, onClose }) =>
</div> </div>
) : documentContent ? ( ) : documentContent ? (
<div className='document-content'> <div className='document-content'>
{documentContent?.paragraphs.length > 0 && {documentContent.content &&
documentContent.paragraphs.map((section, index) => { documentContent.content.map((section, index) => {
let contentDisplay; let contentDisplay;
try { try {
// JSON // JSON

View File

@ -9,10 +9,9 @@ const FileUploadModal = ({ show, knowledgeBaseId, onClose }) => {
const dispatch = useDispatch(); const dispatch = useDispatch();
const fileInputRef = useRef(null); const fileInputRef = useRef(null);
const modalRef = useRef(null); const modalRef = useRef(null);
const [selectedFiles, setSelectedFiles] = useState([]); const [selectedFile, setSelectedFile] = useState(null);
const [isUploading, setIsUploading] = useState(false); const [isUploading, setIsUploading] = useState(false);
const [fileError, setFileError] = useState(''); const [fileError, setFileError] = useState('');
const [uploadResults, setUploadResults] = useState(null);
// //
const handleUploadAreaClick = () => { const handleUploadAreaClick = () => {
@ -30,68 +29,59 @@ const FileUploadModal = ({ show, knowledgeBaseId, onClose }) => {
e.stopPropagation(); e.stopPropagation();
if (e.dataTransfer.files && e.dataTransfer.files.length > 0) { if (e.dataTransfer.files && e.dataTransfer.files.length > 0) {
handleFilesSelected(e.dataTransfer.files); handleFileSelected(e.dataTransfer.files[0]);
} }
}; };
const handleFileChange = (e) => { const handleFileChange = (e) => {
if (e.target.files && e.target.files.length > 0) { if (e.target.files && e.target.files.length > 0) {
handleFilesSelected(e.target.files); handleFileSelected(e.target.files[0]);
} }
}; };
const handleFilesSelected = (files) => { const handleFileSelected = (file) => {
setFileError(''); setFileError('');
// FileList setSelectedFile(file);
const filesArray = Array.from(files);
setSelectedFiles((prev) => [...prev, ...filesArray]);
};
const removeFile = (index) => {
setSelectedFiles((prev) => prev.filter((_, i) => i !== index));
}; };
const resetFileInput = () => { const resetFileInput = () => {
setSelectedFiles([]); setSelectedFile(null);
setFileError(''); setFileError('');
setUploadResults(null);
if (fileInputRef.current) { if (fileInputRef.current) {
fileInputRef.current.value = ''; fileInputRef.current.value = '';
} }
}; };
const handleUpload = async () => { const handleUpload = async () => {
if (selectedFiles.length === 0) { if (!selectedFile) {
setFileError('请至少选择一个要上传的文件'); setFileError('请选择要上传的文件');
return; return;
} }
setIsUploading(true); setIsUploading(true);
setUploadResults(null);
try { try {
const result = await dispatch( await dispatch(
uploadDocument({ uploadDocument({
knowledge_base_id: knowledgeBaseId, knowledge_base_id: knowledgeBaseId,
files: selectedFiles, file: selectedFile,
}) })
).unwrap(); ).unwrap();
// //
dispatch(getKnowledgeBaseDocuments({ knowledge_base_id: knowledgeBaseId })); dispatch(getKnowledgeBaseDocuments({ knowledge_base_id: knowledgeBaseId }));
// // Reset the file input
setUploadResults(result); resetFileInput();
// 3 //
if (result.failed_count === 0) { onClose();
setTimeout(() => {
handleClose();
}, 3000);
}
} catch (error) { } catch (error) {
console.error('Upload failed:', error); console.error('Upload failed:', error);
setFileError('文件上传失败: ' + (error?.message || '未知错误')); setFileError('文件上传失败: ' + (error?.message || '未知错误'));
//
resetFileInput();
} finally { } finally {
setIsUploading(false); setIsUploading(false);
} }
@ -140,11 +130,9 @@ const FileUploadModal = ({ show, knowledgeBaseId, onClose }) => {
<div <div
className='modal-content bg-white rounded shadow' className='modal-content bg-white rounded shadow'
style={{ style={{
width: '600px', width: '500px',
maxWidth: '90%', maxWidth: '90%',
padding: '20px', padding: '20px',
maxHeight: '90vh',
overflowY: 'auto',
}} }}
> >
<div className='modal-header d-flex justify-content-between align-items-center mb-3'> <div className='modal-header d-flex justify-content-between align-items-center mb-3'>
@ -174,92 +162,22 @@ const FileUploadModal = ({ show, knowledgeBaseId, onClose }) => {
onChange={handleFileChange} onChange={handleFileChange}
accept='.pdf,.doc,.docx,.txt,.md,.csv,.xlsx,.xls' accept='.pdf,.doc,.docx,.txt,.md,.csv,.xlsx,.xls'
disabled={isUploading} disabled={isUploading}
multiple
/> />
<div> {selectedFile ? (
<p className='mb-1'>点击或拖拽文件到此处上传</p> <div>
<p className='text-muted small mb-0'>支持 PDF, Word, Excel, TXT, Markdown, CSV 等格式</p> <p className='mb-1'>已选择文件</p>
</div> <p className='fw-bold mb-0'>{selectedFile.name}</p>
</div>
) : (
<div>
<p className='mb-1'>点击或拖拽文件到此处上传</p>
<p className='text-muted small mb-0'>
支持 PDF, Word, Excel, TXT, Markdown, CSV 等格式
</p>
</div>
)}
{fileError && <div className='text-danger mt-2'>{fileError}</div>} {fileError && <div className='text-danger mt-2'>{fileError}</div>}
</div> </div>
{/* 选择的文件列表 */}
{selectedFiles.length > 0 && (
<div className='mb-3'>
<p className='fw-bold mb-2'>已选择 {selectedFiles.length} 个文件</p>
<ul className='list-group'>
{selectedFiles.map((file, index) => (
<li
key={index}
className='list-group-item d-flex justify-content-between align-items-center'
>
<div
className='d-flex align-items-center'
style={{ maxWidth: 'calc(100% - 70px)' }}
>
<div className='text-truncate'>{file.name}</div>
<div className='text-nowrap ms-2 text-muted' style={{ flexShrink: 0 }}>
({(file.size / 1024).toFixed(0)} KB)
</div>
</div>
{!isUploading && (
<button
className='btn btn-sm btn-outline-danger'
onClick={() => removeFile(index)}
style={{ minWidth: '60px' }}
>
移除
</button>
)}
</li>
))}
</ul>
</div>
)}
{/* 上传结果显示 */}
{uploadResults && (
<div className='mt-3 border rounded p-3'>
<h6 className='mb-2'>上传结果</h6>
<p className='mb-2'>
总文件: {uploadResults.total_files}, 成功: {uploadResults.uploaded_count}, 失败:{' '}
{uploadResults.failed_count}
</p>
{uploadResults.documents && uploadResults.documents.length > 0 && (
<>
<p className='mb-1 fw-bold text-success'>上传成功:</p>
<ul className='list-group mb-2'>
{uploadResults.documents.map((doc) => (
<li key={doc.id} className='list-group-item py-2 d-flex align-items-center'>
<span className='badge bg-success me-2'></span>
<span className='text-truncate'>{doc.name}</span>
</li>
))}
</ul>
</>
)}
{uploadResults.failed_documents && uploadResults.failed_documents.length > 0 && (
<>
<p className='mb-1 fw-bold text-danger'>上传失败:</p>
<ul className='list-group'>
{uploadResults.failed_documents.map((doc, index) => (
<li key={index} className='list-group-item py-2 d-flex align-items-center'>
<span className='badge bg-danger me-2'></span>
<div className='text-truncate'>
{doc.name}
{doc.reason && (
<small className='ms-2 text-danger'>({doc.reason})</small>
)}
</div>
</li>
))}
</ul>
</>
)}
</div>
)}
</div> </div>
<div className='modal-footer gap-2'> <div className='modal-footer gap-2'>
<button type='button' className='btn btn-secondary' onClick={handleClose} disabled={isUploading}> <button type='button' className='btn btn-secondary' onClick={handleClose} disabled={isUploading}>
@ -269,7 +187,7 @@ const FileUploadModal = ({ show, knowledgeBaseId, onClose }) => {
type='button' type='button'
className='btn btn-dark' className='btn btn-dark'
onClick={handleUpload} onClick={handleUpload}
disabled={selectedFiles.length === 0 || isUploading} disabled={!selectedFile || isUploading}
> >
{isUploading ? ( {isUploading ? (
<> <>
@ -281,7 +199,7 @@ const FileUploadModal = ({ show, knowledgeBaseId, onClose }) => {
上传中... 上传中...
</> </>
) : ( ) : (
`上传文档${selectedFiles.length > 0 ? ` (${selectedFiles.length})` : ''}` '上传文档'
)} )}
</button> </button>
</div> </div>

View File

@ -218,13 +218,9 @@ const knowledgeBaseSlice = createSlice({
state.documents.items = action.payload.items || []; state.documents.items = action.payload.items || [];
state.documents.pagination = { state.documents.pagination = {
total: action.payload.total || 0, total: action.payload.total || 0,
page: 1, page: action.payload.page || 1,
page_size: 10, page_size: action.payload.page_size || 10,
}; };
console.log('文档数据已更新到store:', {
itemsCount: state.documents.items.length,
items: state.documents.items,
});
}) })
.addCase(getKnowledgeBaseDocuments.rejected, (state, action) => { .addCase(getKnowledgeBaseDocuments.rejected, (state, action) => {
state.documents.loading = false; state.documents.loading = false;

View File

@ -200,54 +200,32 @@ export const requestKnowledgeBaseAccess = createAsyncThunk(
); );
/** /**
* Upload documents to a knowledge base * Upload a document to a knowledge base
* @param {Object} params - Upload parameters * @param {Object} params - Upload parameters
* @param {string} params.knowledge_base_id - Knowledge base ID * @param {string} params.knowledge_base_id - Knowledge base ID
* @param {File[]} params.files - Files to upload * @param {File} params.file - File to upload
*/ */
export const uploadDocument = createAsyncThunk( export const uploadDocument = createAsyncThunk(
'knowledgeBase/uploadDocument', 'knowledgeBase/uploadDocument',
async ({ knowledge_base_id, files }, { rejectWithValue, dispatch }) => { async ({ knowledge_base_id, file }, { rejectWithValue, dispatch }) => {
try { try {
const formData = new FormData(); const formData = new FormData();
formData.append('file', file);
// 支持单文件和多文件上传
if (Array.isArray(files)) {
// 多文件上传
files.forEach(file => {
formData.append('files', file);
});
} else {
// 单文件上传(向后兼容)
formData.append('files', files);
}
const response = await post(`/knowledge-bases/${knowledge_base_id}/upload_document/`, formData, true); const response = await post(`/knowledge-bases/${knowledge_base_id}/upload_document/`, formData, true);
// 处理新的返回格式
if (response.data && response.data.code === 200) {
const result = response.data.data;
// 使用API返回的消息作为通知
dispatch(
showNotification({
type: 'success',
message: response.data.message || `文档上传完成,成功: ${result.uploaded_count},失败: ${result.failed_count}`,
})
);
return result;
}
dispatch( dispatch(
showNotification({ showNotification({
type: 'success', type: 'success',
message: Array.isArray(files) message: `文档 ${file.name} 上传成功`,
? `${files.length} 个文档上传成功`
: `文档 ${files.name} 上传成功`,
}) })
); );
// 处理新的返回格式
if (response.data && response.data.code === 200) {
return response.data.data;
}
return response.data; return response.data;
} catch (error) { } catch (error) {
const errorMessage = error.response?.data?.message || error.message || '文档上传失败'; const errorMessage = error.response?.data?.message || error.message || '文档上传失败';
@ -266,33 +244,24 @@ export const uploadDocument = createAsyncThunk(
* Get documents list for a knowledge base * Get documents list for a knowledge base
* @param {Object} params - Parameters * @param {Object} params - Parameters
* @param {string} params.knowledge_base_id - Knowledge base ID * @param {string} params.knowledge_base_id - Knowledge base ID
* @param {number} params.page - Page number (default: 1)
* @param {number} params.page_size - Page size (default: 10)
*/ */
export const getKnowledgeBaseDocuments = createAsyncThunk( export const getKnowledgeBaseDocuments = createAsyncThunk(
'knowledgeBase/getDocuments', 'knowledgeBase/getDocuments',
async ({ knowledge_base_id }, { rejectWithValue }) => { async ({ knowledge_base_id, page = 1, page_size = 10 }, { rejectWithValue }) => {
try { try {
console.log('获取知识库文档列表:', knowledge_base_id); const response = await get(`/knowledge-bases/${knowledge_base_id}/documents/`, {
const { data, code } = await get(`/knowledge-bases/${knowledge_base_id}/documents`); params: { page, page_size },
console.log('文档列表API响应:', { data, code }); });
// 处理返回格式 // 处理返回格式
if (code === 200) { if (response.data && response.data.code === 200) {
console.log('API返回数据:', data); return response.data.data;
return {
items: data || [],
total: (data || []).length
};
} else {
// 未知格式,尝试提取数据
const items = data?.items || data || [];
console.log('未识别格式,提取数据:', items);
return {
items: items,
total: items.length
};
} }
return response.data;
} catch (error) { } catch (error) {
console.error('获取知识库文档失败:', error);
return rejectWithValue(error.response?.data?.message || '获取文档列表失败'); return rejectWithValue(error.response?.data?.message || '获取文档列表失败');
} }
} }