From 61d924a4fab8a080a61b515f1496bd74d46787f1 Mon Sep 17 00:00:00 2001 From: zstar <65890619+zstar1003@users.noreply.github.com> Date: Fri, 18 Apr 2025 10:18:07 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E7=BB=93=E6=9E=84=E5=92=8CUI=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=EF=BC=8C=E7=A7=BB=E9=99=A4=E5=89=8D=E5=8F=B0=E5=92=8C=E5=90=8E?= =?UTF-8?q?=E5=8F=B0=E5=8A=9F=E8=83=BD=E5=86=B2=E7=AA=81=E7=9A=84=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=20(#34)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 本次提交主要对代码进行了重构，移除了未使用的代码和注释，优化了部分UI组件的布局和样式。具体包括： 1. 移除了多个文件中的未使用代码和注释。 2. 调整了部分UI组件的布局，使其更加简洁和一致。 3. 更新了logo.svg文件，优化了图标的设计。 4. 修复了部分组件中的样式问题，提升了用户体验。 --- api/ragflow_server.py | 14 +- .../knowledgebases/document_parser.py | 10 +- web/public/logo.svg | 39 ++- .../chat-overview-modal/api-content.tsx | 7 +- web/src/locales/zh.ts | 2 +- .../knowledge-file/document-toolbar.tsx | 324 +++++++++--------- .../components/knowledge-file/index.tsx | 27 +- .../parsing-action-cell/index.tsx | 170 ++++----- .../parsing-status-cell/index.tsx | 15 +- .../knowledge-setting/category-panel.tsx | 2 +- .../knowledge-setting/configuration/index.tsx | 2 +- .../testing-control/index.tsx | 3 +- .../assistant-setting.tsx | 11 +- .../prompt-engine.tsx | 40 +-- web/src/pages/chat/hooks.ts | 2 +- .../pages/file-manager/action-cell/index.tsx | 96 +++--- web/src/pages/file-manager/file-toolbar.tsx | 189 +++++----- .../setting-model/bedrock-modal/index.tsx | 4 +- .../setting-model/ollama-modal/index.tsx | 6 +- .../system-model-setting-modal/index.tsx | 8 +- .../setting-model/volcengine-modal/index.tsx | 4 +- 21 files changed, 495 insertions(+), 480 deletions(-) diff --git a/api/ragflow_server.py b/api/ragflow_server.py index 0ea6cfa..6d73c07 100644 --- a/api/ragflow_server.py +++ b/api/ragflow_server.py @@ -45,15 +45,15 @@ def signal_handler(sig, frame): if __name__ == '__main__': logging.info(r""" - ____ ___ ______ ______ __ - / __ \ / | / ____// ____// /____ _ __ - / /_/ // /| | / / __ / /_ / // __ \| | /| / / - / _, _// ___ |/ /_/ // __/ / // /_/ /| |/ |/ / - /_/ |_|/_/ |_|\____//_/ /_/ \____/ |__/|__/ - + _____ ___ _____ _____ _ _____ _ __ _____ _ _ _ _____ + | _ \ / | / ___| | ___| | | / _ \ | | / / | _ \ | | | | | | / ___/ + | |_| | / /| | | | | |__ | | | | | | | | __ / / | |_| | | | | | | | | |___ + | _ / / / | | | | _ | __| | | | | | | | | / | / / | ___/ | | | | | | \___ \ + | | \ \ / / | | | |_| | | | | |___ | |_| | | |/ |/ / | | | |___ | |_| | ___| | + |_| \_\ /_/ |_| \_____/ |_| |_____| \_____/ |___/|___/ |_| |_____| \_____/ /_____/ """) logging.info( - f'RAGFlow version: {get_ragflow_version()}' + f'RAGFlow base version: {get_ragflow_version()}' ) logging.info( f'project base: {utils.file_utils.get_project_base_directory()}' diff --git a/management/server/services/knowledgebases/document_parser.py b/management/server/services/knowledgebases/document_parser.py index 3a1e4dc..3f1695c 100644 --- a/management/server/services/knowledgebases/document_parser.py +++ b/management/server/services/knowledgebases/document_parser.py @@ -162,7 +162,7 @@ def _create_task_record(doc_id, chunk_ids_list): def get_text_from_block(block): - """从 preproc_blocks 中的一个块提取所有文本内容 (简化版)""" + """从 preproc_blocks 中的一个块提取所有文本内容""" block_text = "" if "lines" in block: for line in block.get("lines", []): @@ -352,7 +352,7 @@ def perform_parse(doc_id, doc_info, file_info): page_idx = 0 # 默认页面索引 bbox = [0, 0, 0, 0] # 默认 bbox - # -- 尝试匹配并获取 page_idx 和 bbox -- + # 匹配并获取 page_idx 和 bbox if middle_block_idx < len(block_info_list): block_info = block_info_list[middle_block_idx] page_idx = block_info.get("page_idx", 0) @@ -362,7 +362,7 @@ def perform_parse(doc_id, doc_info, file_info): # 如果 block_info_list 耗尽，打印警告 if processed_text_chunks == len(block_info_list) + 1: # 只在第一次耗尽时警告一次 print(f"[Parser-WARNING] middle_data 提供的块信息少于 content_list 中的文本块数量。后续文本块将使用默认 page/bbox。") - # -- 匹配结束 -- + try: # 上传文本块到 MinIO @@ -393,8 +393,8 @@ def perform_parse(doc_id, doc_info, file_info): "content_ltks": content_tokens, "content_sm_ltks": content_tokens, "page_num_int": [page_idx + 1], - "position_int": [[page_idx + 1] + bbox_reordered], # 格式: [[page, x1, y1, x2, y2]] - "top_int": [1], # 简化处理 + "position_int": [[page_idx + 1] + bbox_reordered], # 格式: [[page, x1, x2, y1, y2]] + "top_int": [1], "create_time": current_time_es, "create_timestamp_flt": current_timestamp_es, "img_id": "", diff --git a/web/public/logo.svg b/web/public/logo.svg index 5d0c31e..414bbb9 100644 --- a/web/public/logo.svg +++ b/web/public/logo.svg @@ -1,5 +1,38 @@ - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/web/src/components/api-service/chat-overview-modal/api-content.tsx b/web/src/components/api-service/chat-overview-modal/api-content.tsx index c218999..35f40d4 100644 --- a/web/src/components/api-service/chat-overview-modal/api-content.tsx +++ b/web/src/components/api-service/chat-overview-modal/api-content.tsx @@ -1,11 +1,8 @@ import { useSetModalState, useTranslate } from '@/hooks/common-hooks'; -import apiDoc from '@parent/docs/references/http_api_reference.md'; -import MarkdownPreview from '@uiw/react-markdown-preview'; import { Button, Card, Flex, Space } from 'antd'; import ChatApiKeyModal from '../chat-api-key-modal'; import { usePreviewChat } from '../hooks'; import BackendServiceApi from './backend-service-api'; -import MarkdownToc from './markdown-toc'; const ApiContent = ({ id, @@ -43,10 +40,10 @@ const ApiContent = ({ )} -
+ {/*
- + */} {apiKeyVisible && ( { const { t } = useTranslate('knowledgeDetails'); - const { removeDocument } = useRemoveNextDocument(); - const showDeleteConfirm = useShowDeleteConfirm(); - const { runDocumentByIds } = useRunNextDocument(); - const { setDocumentStatus } = useSetNextDocumentStatus(); + // const { removeDocument } = useRemoveNextDocument(); + // const showDeleteConfirm = useShowDeleteConfirm(); + // const { runDocumentByIds } = useRunNextDocument(); + // const { setDocumentStatus } = useSetNextDocumentStatus(); - const actionItems: MenuProps['items'] = useMemo(() => { - return [ - { - key: '1', - onClick: showDocumentUploadModal, - label: ( -
- -
- ), - }, - { type: 'divider' }, - { - key: '3', - onClick: showCreateModal, - label: ( -
- -
- ), - }, - ]; - }, [showDocumentUploadModal, showCreateModal, t]); + // const actionItems: MenuProps['items'] = useMemo(() => { + // return [ + // { + // key: '1', + // onClick: showDocumentUploadModal, + // label: ( + //
+ // + //
+ // ), + // }, + // { type: 'divider' }, + // { + // key: '3', + // onClick: showCreateModal, + // label: ( + //
+ // + //
+ // ), + // }, + // ]; + // }, [showDocumentUploadModal, showCreateModal, t]); - const handleDelete = useCallback(() => { - showDeleteConfirm({ - onOk: () => { - removeDocument(selectedRowKeys); - }, - }); - }, [removeDocument, showDeleteConfirm, selectedRowKeys]); + // const handleDelete = useCallback(() => { + // showDeleteConfirm({ + // onOk: () => { + // removeDocument(selectedRowKeys); + // }, + // }); + // }, [removeDocument, showDeleteConfirm, selectedRowKeys]); - const runDocument = useCallback( - (run: number) => { - runDocumentByIds({ - documentIds: selectedRowKeys, - run, - }); - }, - [runDocumentByIds, selectedRowKeys], - ); + // const runDocument = useCallback( + // (run: number) => { + // runDocumentByIds({ + // documentIds: selectedRowKeys, + // run, + // }); + // }, + // [runDocumentByIds, selectedRowKeys], + // ); - const handleRunClick = useCallback(() => { - runDocument(1); - }, [runDocument]); + // const handleRunClick = useCallback(() => { + // runDocument(1); + // }, [runDocument]); - const handleCancelClick = useCallback(() => { - runDocument(2); - }, [runDocument]); + // const handleCancelClick = useCallback(() => { + // runDocument(2); + // }, [runDocument]); - const onChangeStatus = useCallback( - (enabled: boolean) => { - selectedRowKeys.forEach((id) => { - setDocumentStatus({ status: enabled, documentId: id }); - }); - }, - [selectedRowKeys, setDocumentStatus], - ); + // const onChangeStatus = useCallback( + // (enabled: boolean) => { + // selectedRowKeys.forEach((id) => { + // setDocumentStatus({ status: enabled, documentId: id }); + // }); + // }, + // [selectedRowKeys, setDocumentStatus], + // ); - const handleEnableClick = useCallback(() => { - onChangeStatus(true); - }, [onChangeStatus]); + // const handleEnableClick = useCallback(() => { + // onChangeStatus(true); + // }, [onChangeStatus]); - const handleDisableClick = useCallback(() => { - onChangeStatus(false); - }, [onChangeStatus]); + // const handleDisableClick = useCallback(() => { + // onChangeStatus(false); + // }, [onChangeStatus]); - const disabled = selectedRowKeys.length === 0; + // const disabled = selectedRowKeys.length === 0; - const items: MenuProps['items'] = useMemo(() => { - return [ - { - key: '0', - onClick: handleEnableClick, - label: ( - - - {t('enabled')} - - ), - }, - { - key: '1', - onClick: handleDisableClick, - label: ( - - - {t('disabled')} - - ), - }, - { type: 'divider' }, - { - key: '2', - onClick: handleRunClick, - label: ( - - - {t('run')} - - ), - }, - { - key: '3', - onClick: handleCancelClick, - label: ( - - - {t('cancel')} - - ), - }, - { type: 'divider' }, - { - key: '4', - onClick: handleDelete, - label: ( - - - - - {t('delete', { keyPrefix: 'common' })} - - ), - }, - ]; - }, [ - handleDelete, - handleRunClick, - handleCancelClick, - t, - handleDisableClick, - handleEnableClick, - ]); + // const items: MenuProps['items'] = useMemo(() => { + // return [ + // { + // key: '0', + // onClick: handleEnableClick, + // label: ( + // + // + // {t('enabled')} + // + // ), + // }, + // { + // key: '1', + // onClick: handleDisableClick, + // label: ( + // + // + // {t('disabled')} + // + // ), + // }, + // { type: 'divider' }, + // { + // key: '2', + // onClick: handleRunClick, + // label: ( + // + // + // {t('run')} + // + // ), + // }, + // { + // key: '3', + // onClick: handleCancelClick, + // label: ( + // + // + // {t('cancel')} + // + // ), + // }, + // { type: 'divider' }, + // { + // key: '4', + // onClick: handleDelete, + // label: ( + // + // + // + // + // {t('delete', { keyPrefix: 'common' })} + // + // ), + // }, + // ]; + // }, [ + // handleDelete, + // handleRunClick, + // handleCancelClick, + // t, + // handleDisableClick, + // handleEnableClick, + // ]); return (
- - - + */} + } /> - + {/* - + */}
); diff --git a/web/src/pages/add-knowledge/components/knowledge-file/index.tsx b/web/src/pages/add-knowledge/components/knowledge-file/index.tsx index 1ce7df8..25229c1 100644 --- a/web/src/pages/add-knowledge/components/knowledge-file/index.tsx +++ b/web/src/pages/add-knowledge/components/knowledge-file/index.tsx @@ -22,7 +22,6 @@ import { useRenameDocument, useShowMetaModal, } from './hooks'; -import ParsingActionCell from './parsing-action-cell'; import ParsingStatusCell from './parsing-status-cell'; import RenameModal from './rename-modal'; import WebCrawlModal from './web-crawl-modal'; @@ -163,19 +162,19 @@ const KnowledgeFile = () => { return ; }, }, - { - title: t('action'), - key: 'action', - render: (_, record) => ( - - ), - }, + // { + // title: t('action'), + // key: 'action', + // render: (_, record) => ( + // + // ), + // }, ]; const finalColumns = columns.map((x) => ({ diff --git a/web/src/pages/add-knowledge/components/knowledge-file/parsing-action-cell/index.tsx b/web/src/pages/add-knowledge/components/knowledge-file/parsing-action-cell/index.tsx index ac5f1ee..5cd16ca 100644 --- a/web/src/pages/add-knowledge/components/knowledge-file/parsing-action-cell/index.tsx +++ b/web/src/pages/add-knowledge/components/knowledge-file/parsing-action-cell/index.tsx @@ -1,19 +1,19 @@ -import { useShowDeleteConfirm, useTranslate } from '@/hooks/common-hooks'; -import { useRemoveNextDocument } from '@/hooks/document-hooks'; -import { IDocumentInfo } from '@/interfaces/database/document'; -import { downloadDocument } from '@/utils/file-util'; -import { - DeleteOutlined, - DownloadOutlined, - EditOutlined, - ToolOutlined, -} from '@ant-design/icons'; -import { Button, Dropdown, MenuProps, Space, Tooltip } from 'antd'; -import { isParserRunning } from '../utils'; +// import { useShowDeleteConfirm, useTranslate } from '@/hooks/common-hooks'; +// import { useRemoveNextDocument } from '@/hooks/document-hooks'; +// import { IDocumentInfo } from '@/interfaces/database/document'; +// import { downloadDocument } from '@/utils/file-util'; +// import { +// DeleteOutlined, +// DownloadOutlined, +// EditOutlined, +// ToolOutlined, +// } from '@ant-design/icons'; +import { Space } from 'antd'; +// import { isParserRunning } from '../utils'; -import { useCallback } from 'react'; -import { DocumentType } from '../constant'; -import styles from './index.less'; +// import { useCallback } from 'react'; +// import { DocumentType } from '../constant'; +// import styles from './index.less'; interface IProps { record: IDocumentInfo; @@ -23,83 +23,85 @@ interface IProps { showSetMetaModal: () => void; } -const ParsingActionCell = ({ - record, - setCurrentRecord, - showRenameModal, - showChangeParserModal, - showSetMetaModal, -}: IProps) => { - const documentId = record.id; - const isRunning = isParserRunning(record.run); - const { t } = useTranslate('knowledgeDetails'); - const { removeDocument } = useRemoveNextDocument(); - const showDeleteConfirm = useShowDeleteConfirm(); - const isVirtualDocument = record.type === DocumentType.Virtual; +const ParsingActionCell = ( + { + // record, + // setCurrentRecord, + // showRenameModal, + // showChangeParserModal, + // showSetMetaModal, + }: IProps, +) => { + // const documentId = record.id; + // const isRunning = isParserRunning(record.run); + // const { t } = useTranslate('knowledgeDetails'); + // const { removeDocument } = useRemoveNextDocument(); + // const showDeleteConfirm = useShowDeleteConfirm(); + // const isVirtualDocument = record.type === DocumentType.Virtual; - const onRmDocument = () => { - if (!isRunning) { - showDeleteConfirm({ - onOk: () => removeDocument([documentId]), - content: record?.parser_config?.graphrag?.use_graphrag - ? t('deleteDocumentConfirmContent') - : '', - }); - } - }; + // const onRmDocument = () => { + // if (!isRunning) { + // showDeleteConfirm({ + // onOk: () => removeDocument([documentId]), + // content: record?.parser_config?.graphrag?.use_graphrag + // ? t('deleteDocumentConfirmContent') + // : '', + // }); + // } + // }; - const onDownloadDocument = () => { - downloadDocument({ - id: documentId, - filename: record.name, - }); - }; + // const onDownloadDocument = () => { + // downloadDocument({ + // id: documentId, + // filename: record.name, + // }); + // }; - const setRecord = useCallback(() => { - setCurrentRecord(record); - }, [record, setCurrentRecord]); + // const setRecord = useCallback(() => { + // setCurrentRecord(record); + // }, [record, setCurrentRecord]); - const onShowRenameModal = () => { - setRecord(); - showRenameModal(); - }; - const onShowChangeParserModal = () => { - setRecord(); - showChangeParserModal(); - }; + // const onShowRenameModal = () => { + // setRecord(); + // showRenameModal(); + // }; + // const onShowChangeParserModal = () => { + // setRecord(); + // showChangeParserModal(); + // }; - const onShowSetMetaModal = useCallback(() => { - setRecord(); - showSetMetaModal(); - }, [setRecord, showSetMetaModal]); + // const onShowSetMetaModal = useCallback(() => { + // setRecord(); + // showSetMetaModal(); + // }, [setRecord, showSetMetaModal]); - const chunkItems: MenuProps['items'] = [ - { - key: '1', - label: ( -
- -
- ), - }, - { type: 'divider' }, - { - key: '2', - label: ( -
- -
- ), - }, - ]; + // const chunkItems: MenuProps['items'] = [ + // { + // key: '1', + // label: ( + //
+ // + //
+ // ), + // }, + // { type: 'divider' }, + // { + // key: '2', + // label: ( + //
+ // + //
+ // ), + // }, + // ]; return ( - {isVirtualDocument || ( + {/* {isVirtualDocument || ( - )} + )} */} ); }; diff --git a/web/src/pages/add-knowledge/components/knowledge-file/parsing-status-cell/index.tsx b/web/src/pages/add-knowledge/components/knowledge-file/parsing-status-cell/index.tsx index 0de71d4..ec7d144 100644 --- a/web/src/pages/add-knowledge/components/knowledge-file/parsing-status-cell/index.tsx +++ b/web/src/pages/add-knowledge/components/knowledge-file/parsing-status-cell/index.tsx @@ -3,16 +3,7 @@ import { ReactComponent as RefreshIcon } from '@/assets/svg/refresh.svg'; import { ReactComponent as RunIcon } from '@/assets/svg/run.svg'; import { useTranslate } from '@/hooks/common-hooks'; import { IDocumentInfo } from '@/interfaces/database/document'; -import { - Badge, - DescriptionsProps, - Flex, - Popconfirm, - Popover, - Space, - Tag, -} from 'antd'; -import classNames from 'classnames'; +import { Badge, DescriptionsProps, Flex, Popover, Space, Tag } from 'antd'; import { useTranslation } from 'react-i18next'; import reactStringReplace from 'react-string-replace'; import { DocumentType, RunningStatus, RunningStatusMap } from '../constant'; @@ -121,7 +112,7 @@ export const ParsingStatusCell = ({ record }: IProps) => { )} - { >
- + */} ); }; diff --git a/web/src/pages/add-knowledge/components/knowledge-setting/category-panel.tsx b/web/src/pages/add-knowledge/components/knowledge-setting/category-panel.tsx index 4e96fef..742fa24 100644 --- a/web/src/pages/add-knowledge/components/knowledge-setting/category-panel.tsx +++ b/web/src/pages/add-knowledge/components/knowledge-setting/category-panel.tsx @@ -65,7 +65,7 @@ const CategoryPanel = ({ chunkMethod }: { chunkMethod: string }) => { ) : ( -

{t('methodEmpty')}

+ {/*

{t('methodEmpty')}

*/} )} diff --git a/web/src/pages/add-knowledge/components/knowledge-setting/configuration/index.tsx b/web/src/pages/add-knowledge/components/knowledge-setting/configuration/index.tsx index 4d142cd..b069daf 100644 --- a/web/src/pages/add-knowledge/components/knowledge-setting/configuration/index.tsx +++ b/web/src/pages/add-knowledge/components/knowledge-setting/configuration/index.tsx @@ -109,7 +109,7 @@ export const ConfigurationForm = ({ form }: { form: FormInstance }) => { - + {/* */}
diff --git a/web/src/pages/add-knowledge/components/knowledge-testing/testing-control/index.tsx b/web/src/pages/add-knowledge/components/knowledge-testing/testing-control/index.tsx index 345b46d..3d89bb7 100644 --- a/web/src/pages/add-knowledge/components/knowledge-testing/testing-control/index.tsx +++ b/web/src/pages/add-knowledge/components/knowledge-testing/testing-control/index.tsx @@ -6,7 +6,6 @@ import { Button, Card, Divider, Flex, Form, Input } from 'antd'; import { FormInstance } from 'antd/lib'; import { LabelWordCloud } from './label-word-cloud'; -import { UseKnowledgeGraphItem } from '@/components/use-knowledge-graph-item'; import styles from './index.less'; type FieldType = { @@ -39,7 +38,7 @@ const TestingControl = ({ form, handleTesting }: IProps) => {
- + {/* */} name={'question'} diff --git a/web/src/pages/chat/chat-configuration-modal/assistant-setting.tsx b/web/src/pages/chat/chat-configuration-modal/assistant-setting.tsx index cabbb28..bccedec 100644 --- a/web/src/pages/chat/chat-configuration-modal/assistant-setting.tsx +++ b/web/src/pages/chat/chat-configuration-modal/assistant-setting.tsx @@ -1,5 +1,4 @@ import KnowledgeBaseItem from '@/components/knowledge-base-item'; -import { TavilyItem } from '@/components/tavily-item'; import { useTranslate } from '@/hooks/common-hooks'; import { useFetchTenantInfo } from '@/hooks/user-setting-hooks'; import { PlusOutlined } from '@ant-design/icons'; @@ -130,7 +129,7 @@ const AssistantSetting = ({ > - - - */} + {/* - - + */} + {/* */} { - setDataSource((state) => [ - ...state, - { - key: uuid(), - variable: '', - optional: true, - }, - ]); - }; + // const handleAdd = () => { + // setDataSource((state) => [ + // ...state, + // { + // key: uuid(), + // variable: '', + // optional: true, + // }, + // ]); + // }; const handleOptionalChange = (row: DataType) => (checked: boolean) => { const newData = [...dataSource]; @@ -157,25 +155,25 @@ const PromptEngine = ( - - - */} + {/* - */} + {/* - + */}
@@ -188,9 +186,9 @@ const PromptEngine = ( - + */} {dataSource.length > 0 && ( diff --git a/web/src/pages/chat/hooks.ts b/web/src/pages/chat/hooks.ts index a65a9ec..ce3b621 100644 --- a/web/src/pages/chat/hooks.ts +++ b/web/src/pages/chat/hooks.ts @@ -103,7 +103,7 @@ export const useSelectPromptConfigParameters = (): VariableTableDataType[] => { const parameters = currentDialog?.prompt_config?.parameters ?? []; if (!currentDialog.id) { // The newly created chat has a default parameter - return [{ key: uuid(), variable: 'knowledge', optional: false }]; + return [{ key: uuid(), variable: 'knowledge', optional: true }]; } return parameters.map((x) => ({ key: uuid(), diff --git a/web/src/pages/file-manager/action-cell/index.tsx b/web/src/pages/file-manager/action-cell/index.tsx index 7280b59..62eec56 100644 --- a/web/src/pages/file-manager/action-cell/index.tsx +++ b/web/src/pages/file-manager/action-cell/index.tsx @@ -1,20 +1,19 @@ import NewDocumentLink from '@/components/new-document-link'; import { useTranslate } from '@/hooks/common-hooks'; -import { useDownloadFile } from '@/hooks/file-manager-hooks'; +// import { useDownloadFile } from '@/hooks/file-manager-hooks'; import { IFile } from '@/interfaces/database/file-manager'; import { getExtension, isSupportedPreviewDocumentType, } from '@/utils/document-util'; import { - DownloadOutlined, - EditOutlined, + // DownloadOutlined, + // EditOutlined, EyeOutlined, - LinkOutlined, } from '@ant-design/icons'; import { Button, Space, Tooltip } from 'antd'; -import { FolderInput, Trash2 } from 'lucide-react'; -import { useHandleDeleteFile } from '../hooks'; +// import { FolderInput, Trash2 } from 'lucide-react'; +// import { useHandleDeleteFile } from '../hooks'; interface IProps { record: IFile; @@ -27,65 +26,64 @@ interface IProps { const ActionCell = ({ record, - setCurrentRecord, - showRenameModal, - showConnectToKnowledgeModal, - setSelectedRowKeys, - showMoveFileModal, + // setCurrentRecord, + // showRenameModal, + // showConnectToKnowledgeModal, + // setSelectedRowKeys, + // showMoveFileModal, }: IProps) => { const documentId = record.id; - const beingUsed = false; + // const beingUsed = false; const { t } = useTranslate('fileManager'); - const { handleRemoveFile } = useHandleDeleteFile( - [documentId], - setSelectedRowKeys, - ); - const { downloadFile, loading } = useDownloadFile(); + // const { handleRemoveFile } = useHandleDeleteFile( + // [documentId], + // setSelectedRowKeys, + // ); + // const { downloadFile, loading } = useDownloadFile(); const extension = getExtension(record.name); - const isKnowledgeBase = record.source_type === 'knowledgebase'; + // const isKnowledgeBase = record.source_type === 'knowledgebase'; - const onDownloadDocument = () => { - downloadFile({ - id: documentId, - filename: record.name, - }); - }; + // const onDownloadDocument = () => { + // downloadFile({ + // id: documentId, + // filename: record.name, + // }); + // }; - const setRecord = () => { - setCurrentRecord(record); - }; + // const setRecord = () => { + // setCurrentRecord(record); + // }; - const onShowRenameModal = () => { - setRecord(); - showRenameModal(record); - }; + // const onShowRenameModal = () => { + // setRecord(); + // showRenameModal(record); + // }; - const onShowConnectToKnowledgeModal = () => { - showConnectToKnowledgeModal(record); - }; + // const onShowConnectToKnowledgeModal = () => { + // showConnectToKnowledgeModal(record); + // }; - const onShowMoveFileModal = () => { - showMoveFileModal([documentId]); - }; + // const onShowMoveFileModal = () => { + // showMoveFileModal([documentId]); + // }; return ( - {isKnowledgeBase || ( + {/* {isKnowledgeBase || ( - )} - - {isKnowledgeBase || ( + )} */} + {/* { {isKnowledgeBase || ( - )} - {isKnowledgeBase || ( + )} } + { {isKnowledgeBase || ( - )} - {isKnowledgeBase || ( + )} } + { {isKnowledgeBase || ( - )} - {record.type !== 'folder' && ( + )} } + { {record.type !== 'folder' && ( - )} + )} } + */} + {isSupportedPreviewDocumentType(extension) && ( { const { t } = useTranslate('knowledgeDetails'); const breadcrumbItems = useSelectBreadcrumbItems(); const { handleBreadcrumbClick } = useHandleBreadcrumbClick(); - const parentFolderList = useFetchParentFolderList(); - const isKnowledgeBase = - parentFolderList.at(-1)?.source_type === 'knowledgebase'; + // const parentFolderList = useFetchParentFolderList(); + // const isKnowledgeBase = + // parentFolderList.at(-1)?.source_type === 'knowledgebase'; const itemRender: BreadcrumbProps['itemRender'] = ( currentRoute, @@ -74,85 +71,85 @@ const FileToolbar = ({ ); }; - const actionItems: MenuProps['items'] = useMemo(() => { - return [ - { - key: '1', - onClick: showFileUploadModal, - label: ( -
- -
- ), - }, - { type: 'divider' }, - { - key: '2', - onClick: showFolderCreateModal, - label: ( -
- -
- ), - }, - ]; - }, [t, showFolderCreateModal, showFileUploadModal]); + // const actionItems: MenuProps['items'] = useMemo(() => { + // return [ + // { + // key: '1', + // onClick: showFileUploadModal, + // label: ( + //
+ // + //
+ // ), + // }, + // { type: 'divider' }, + // { + // key: '2', + // onClick: showFolderCreateModal, + // label: ( + //
+ // + //
+ // ), + // }, + // ]; + // }, [t, showFolderCreateModal, showFileUploadModal]); - const { handleRemoveFile } = useHandleDeleteFile( - selectedRowKeys, - setSelectedRowKeys, - ); + // const { handleRemoveFile } = useHandleDeleteFile( + // selectedRowKeys, + // setSelectedRowKeys, + // ); - const handleShowMoveFileModal = useCallback(() => { - showMoveFileModal(selectedRowKeys); - }, [selectedRowKeys, showMoveFileModal]); + // const handleShowMoveFileModal = useCallback(() => { + // showMoveFileModal(selectedRowKeys); + // }, [selectedRowKeys, showMoveFileModal]); - const disabled = selectedRowKeys.length === 0; + // const disabled = selectedRowKeys.length === 0; - const items: MenuProps['items'] = useMemo(() => { - return [ - { - key: '4', - onClick: handleRemoveFile, - label: ( - - - - - {t('delete', { keyPrefix: 'common' })} - - ), - }, - { - key: '5', - onClick: handleShowMoveFileModal, - label: ( - - - - - {t('move', { keyPrefix: 'common' })} - - ), - }, - ]; - }, [handleShowMoveFileModal, t, handleRemoveFile]); + // const items: MenuProps['items'] = useMemo(() => { + // return [ + // { + // key: '4', + // onClick: handleRemoveFile, + // label: ( + // + // + // + // + // {t('delete', { keyPrefix: 'common' })} + // + // ), + // }, + // { + // key: '5', + // onClick: handleShowMoveFileModal, + // label: ( + // + // + // + // + // {t('move', { keyPrefix: 'common' })} + // + // ), + // }, + // ]; + // }, [handleShowMoveFileModal, t, handleRemoveFile]); return (
- {isKnowledgeBase || ( + {/* {isKnowledgeBase || ( - )} + )} */} } /> - {isKnowledgeBase || ( + {/* {isKnowledgeBase || ( - )} + )} */}
); diff --git a/web/src/pages/user-setting/setting-model/bedrock-modal/index.tsx b/web/src/pages/user-setting/setting-model/bedrock-modal/index.tsx index 4786667..b3e80f3 100644 --- a/web/src/pages/user-setting/setting-model/bedrock-modal/index.tsx +++ b/web/src/pages/user-setting/setting-model/bedrock-modal/index.tsx @@ -50,13 +50,13 @@ const BedrockModal = ({ footer={(originNode: React.ReactNode) => { return ( - {t('ollamaLink', { name: llmFactory })} - + */} {originNode} ); diff --git a/web/src/pages/user-setting/setting-model/ollama-modal/index.tsx b/web/src/pages/user-setting/setting-model/ollama-modal/index.tsx index 1728be4..4a5bf3b 100644 --- a/web/src/pages/user-setting/setting-model/ollama-modal/index.tsx +++ b/web/src/pages/user-setting/setting-model/ollama-modal/index.tsx @@ -111,10 +111,10 @@ const OllamaModal = ({ okButtonProps={{ loading }} footer={(originNode: React.ReactNode) => { return ( - - + + {/* {t('ollamaLink', { name: llmFactory })} - + */} {originNode} ); diff --git a/web/src/pages/user-setting/setting-model/system-model-setting-modal/index.tsx b/web/src/pages/user-setting/setting-model/system-model-setting-modal/index.tsx index 2146630..51833f0 100644 --- a/web/src/pages/user-setting/setting-model/system-model-setting-modal/index.tsx +++ b/web/src/pages/user-setting/setting-model/system-model-setting-modal/index.tsx @@ -81,13 +81,13 @@ const SystemModelSettingModal = ({ - + */} - + */} ); diff --git a/web/src/pages/user-setting/setting-model/volcengine-modal/index.tsx b/web/src/pages/user-setting/setting-model/volcengine-modal/index.tsx index fef688e..9047714 100644 --- a/web/src/pages/user-setting/setting-model/volcengine-modal/index.tsx +++ b/web/src/pages/user-setting/setting-model/volcengine-modal/index.tsx @@ -53,13 +53,13 @@ const VolcEngineModal = ({ footer={(originNode: React.ReactNode) => { return ( - {t('ollamaLink', { name: llmFactory })} - + */} {originNode} );