Merge #1 into develop from web

update web
2025-12-15 07:16:19 +00:00
parent a4e276ab27
commit ea0a445d5b
65 changed files with 842 additions and 408 deletions
--- a/web/src/views/KnowledgeBase/[knowledgeBaseId]/CreateDataset.tsx
+++ b/web/src/views/KnowledgeBase/[knowledgeBaseId]/CreateDataset.tsx
@@ -4,11 +4,11 @@ import { useTranslation } from 'react-i18next';
 import { useLocation, useNavigate, useParams } from 'react-router-dom';
 import Table, { type TableRef } from '@/components/Table'
 import type { AnyObject } from 'antd/es/_util/type';
-import type { UploadFileResponse,KnowledgeBaseDocumentData } from '../types';
+import type { UploadFileResponse,KnowledgeBaseDocumentData } from '@/views/KnowledgeBase/types';
 import type { ColumnsType } from 'antd/es/table';
 import UploadFiles from '@/components/Upload/UploadFiles';
 import type { UploadRequestOption } from 'rc-upload/lib/interface';
-import { uploadFile, getDocumentList, previewDocumentChunk, parseDocument, updateDocument, deleteDocument } from '../service';
+import { uploadFile, getDocumentList, previewDocumentChunk, parseDocument, updateDocument, deleteDocument } from '@/api/knowledgeBase';
 import exitIcon from '@/assets/images/knowledgeBase/exit.png';
 import { NoData } from '../components/noData';
 import noDataIcon from '@/assets/images/knowledgeBase/noData.png';
@@ -227,7 +227,7 @@ const CreateDataset = () => {
        return (
          <span className="rb:text-xs rb:border rb:border-[#DFE4ED] rb:bg-[#FBFDFF] rb:rounded rb:items-center rb:text-[#212332] rb:py-1 rb:px-2">
            <span className="rb:inline-block rb:w-[5px] rb:h-[5px] rb:mr-2 rb:rounded-full" style={{ backgroundColor: value === 1 ? '#369F21' : '#FF8A4C' }}></span>
-            <span>{value === 1 ? 'Completed' : 'Processing'}</span>
+            <span>{value === 1 ? t('knowledgeBase.completed') : value === 0 ? t('knowledgeBase.pending') : t('knowledgeBase.processing')}</span>
          </span>
        );
      }
--- a/web/src/views/KnowledgeBase/[knowledgeBaseId]/DocumentDetails.tsx
+++ b/web/src/views/KnowledgeBase/[knowledgeBaseId]/DocumentDetails.tsx
@@ -10,8 +10,8 @@ import { useEffect, useState, useRef, type FC } from 'react';
 import { useNavigate, useParams, useLocation } from 'react-router-dom';
 import { useTranslation } from 'react-i18next';
 import { Button, Spin, message, Switch } from 'antd';
-import { getDocumentDetail, getDocumentChunkList, downloadFile, updateDocument, updateDocumentChunk, createDocumentChunk } from '../service';
-import type { KnowledgeBaseDocumentData, RecallTestData } from '../types';
+import { getDocumentDetail, getDocumentChunkList, downloadFile, updateDocument, updateDocumentChunk, createDocumentChunk } from '@/api/knowledgeBase';
+import type { KnowledgeBaseDocumentData, RecallTestData } from '@/views/KnowledgeBase/types';
 import { formatDateTime } from '@/utils/format';
 import InfoPanel, { type InfoItem } from '../components/InfoPanel';
 import RecallTestResult from '../components/RecallTestResult';
--- a/web/src/views/KnowledgeBase/[knowledgeBaseId]/Private.tsx
+++ b/web/src/views/KnowledgeBase/[knowledgeBaseId]/Private.tsx
@@ -12,7 +12,7 @@ import { MoreOutlined } from '@ant-design/icons';
 import folderIcon from '@/assets/images/knowledgeBase/folder.png';
 import textIcon from '@/assets/images/knowledgeBase/text.png';
 import editIcon from '@/assets/images/knowledgeBase/edit.png';
-import { getKnowledgeBaseDetail, deleteDocument, downloadFile, updateKnowledgeBase } from '../service';
+import { getKnowledgeBaseDetail, deleteDocument, downloadFile, updateKnowledgeBase } from '@/api/knowledgeBase';
 import type { 
  CreateModalRef, 
  KnowledgeBaseListItem, 
@@ -22,7 +22,7 @@ import type {
  ShareModalRef,
  CreateDatasetModalRef,FolderFormData, 
  KnowledgeBaseDocumentData 
-} from '../types';
+} from '@/views/KnowledgeBase/types';
 import RecallTestDrawer from '../components/RecallTestDrawer';
 import CreateFolderModal from '../components/CreateFolderModal';
 import CreateModal from '../components/CreateModal';
@@ -64,6 +64,7 @@ const Private: FC = () => {
  const [folderTreeRefreshKey, setFolderTreeRefreshKey] = useState(0);
  const { allBreadcrumbs, setCustomBreadcrumbs } = useMenu();
  const [folderPath, setFolderPath] = useState<Array<{ id: string; name: string }>>([]);
+  const [selectedKeys, setSelectedKeys] = useState<React.Key[]>([]);
  useEffect(() => {
    if (knowledgeBaseId) {
      let url = `/documents/${knowledgeBaseId}/${parentId}/documents`;
@@ -143,8 +144,23 @@ const Private: FC = () => {
        disposable: false,
        appSystem: null,
        subs: [],
+        onClick: (e?: React.MouseEvent) => {
+          // 阻止默认行为和事件冒泡
+          e?.preventDefault();
+          e?.stopPropagation();
+          // 点击知识库名称，回到根目录
+          setParentId(knowledgeBaseId);
+          setFolder({
+            kb_id: knowledgeBaseId ?? '',
+            parent_id: knowledgeBaseId ?? ''
+          });
+          setTableApi(`/documents/${knowledgeBaseId}/${knowledgeBaseId}/documents`);
+          setFolderPath([]);
+          setSelectedKeys([knowledgeBaseId ?? '']);
+          return false;
+        },
      },
-      ...folderPath.map((folder) => ({
+      ...folderPath.map((folder, index) => ({
        id: 0,
        parent: 0,
        code: null,
@@ -166,6 +182,22 @@ const Private: FC = () => {
        disposable: false,
        appSystem: null,
        subs: [],
+        onClick: (e?: React.MouseEvent) => {
+          // 阻止默认行为和事件冒泡
+          e?.preventDefault();
+          e?.stopPropagation();
+          // 点击文件夹，回到该文件夹层级
+          setParentId(folder.id);
+          setFolder({
+            kb_id: knowledgeBaseId ?? '',
+            parent_id: folder.id
+          });
+          setTableApi(`/documents/${knowledgeBaseId}/${folder.id}/documents`);
+          // 更新文件夹路径，只保留到当前点击的文件夹
+          setFolderPath(folderPath.slice(0, index + 1));
+          setSelectedKeys([folder.id]);
+          return false;
+        },
      })),
    ];

@@ -173,17 +205,18 @@ const Private: FC = () => {
  };

  // 处理树节点选择
-  const onSelect = (selectedKeys: React.Key[]) => {
-    if (!selectedKeys.length) return;
+  const onSelect = (keys: React.Key[]) => {
+    if (!keys.length) return;
    if (!folder) return;
    const f = {
      ...folder,
-      parent_id: String(selectedKeys[0]),
+      parent_id: String(keys[0]),
    }
-    let url = `/documents/${knowledgeBaseId}/${String(selectedKeys[0])}/documents`;
+    let url = `/documents/${knowledgeBaseId}/${String(keys[0])}/documents`;
    setTableApi(url);
-    setParentId(String(selectedKeys[0]))
+    setParentId(String(keys[0]))
    setFolder(f)
+    setSelectedKeys(keys)
  };

  // 处理文件夹路径变化
@@ -511,6 +544,7 @@ const Private: FC = () => {
              refreshKey={folderTreeRefreshKey}
              onRootLoad={handleRootTreeLoad}
              onFolderPathChange={handleFolderPathChange}
+              selectedKeys={selectedKeys}
            />
        </div>
      )}
--- a/web/src/views/KnowledgeBase/[knowledgeBaseId]/Share.tsx
+++ b/web/src/views/KnowledgeBase/[knowledgeBaseId]/Share.tsx
@@ -1,7 +1,7 @@
 import { useEffect, useState, useRef, type FC } from 'react';
 import { useParams } from 'react-router-dom';
 import { useTranslation } from 'react-i18next';
-import type { KnowledgeBaseListItem, RecallTestDrawerRef } from '../types';
+import type { KnowledgeBaseListItem, RecallTestDrawerRef } from '@/views/KnowledgeBase/types';
 import RecallTest from '../components/RecallTest';
 import InfoPanel, { type InfoItem } from '../components/InfoPanel';
 import shareUserIcon from '@/assets/images/knowledgeBase/share-user.png';
@@ -13,8 +13,9 @@ import kbSizeIcon from '@/assets/images/knowledgeBase/kb-size.png';
 import kbModelIcon from '@/assets/images/knowledgeBase/kb-model.png';

 import kbHistoryIcon from '@/assets/images/knowledgeBase/kb-history.png';
-import { getKnowledgeBaseDetail } from '../service';
+import { getKnowledgeBaseDetail } from '@/api/knowledgeBase';
 import { formatDateTime } from '@/utils/format';
+import { useMenu } from '@/store/menu';

 const Share: FC = () => {
  const { t } = useTranslation();
@@ -24,6 +25,7 @@ const Share: FC = () => {
  const [knowledgeBase, setKnowledgeBase] = useState<KnowledgeBaseListItem | null>(null);
  const recallTestRef = useRef<RecallTestDrawerRef>(null);
  const [infoItems, setInfoItems] = useState<InfoItem[]>([]);
+  const { allBreadcrumbs, setCustomBreadcrumbs } = useMenu();
  useEffect(() => {
    console.log('Share.tsx - useParams result:', params);
    console.log('Share.tsx - knowledgeBaseId:', knowledgeBaseId);
@@ -40,6 +42,13 @@ const Share: FC = () => {
      console.warn('Share.tsx - knowledgeBaseId is undefined or empty');
    }
  }, [knowledgeBaseId]);
+
+  // 更新面包屑
+  useEffect(() => {
+    if (knowledgeBase) {
+      updateBreadcrumbs();
+    }
+  }, [knowledgeBase]);
  const formatInfoItems = (data: KnowledgeBaseListItem): InfoItem[] => {
    const items: InfoItem[] = [
      { 
@@ -103,6 +112,47 @@ const Share: FC = () => {
      });
  };

+  // 更新面包屑，包含知识库名称
+  const updateBreadcrumbs = () => {
+    if (!knowledgeBase) return;
+    
+    const baseBreadcrumbs = allBreadcrumbs['space'] || [];
+    // 只保留知识库菜单项之前的面包屑
+    const knowledgeBaseMenuIndex = baseBreadcrumbs.findIndex(item => item.path === '/knowledge-base');
+    const filteredBaseBreadcrumbs = knowledgeBaseMenuIndex >= 0 
+      ? baseBreadcrumbs.slice(0, knowledgeBaseMenuIndex + 1)
+      : baseBreadcrumbs;
+    
+    const customBreadcrumbs = [
+      ...filteredBaseBreadcrumbs,
+      {
+        id: 0,
+        parent: 0,
+        code: null,
+        label: knowledgeBase.name,
+        i18nKey: null,
+        path: null,
+        enable: true,
+        display: true,
+        level: 0,
+        sort: 0,
+        icon: null,
+        iconActive: null,
+        menuDesc: null,
+        deleted: null,
+        updateTime: 0,
+        new_: null,
+        keepAlive: false,
+        master: null,
+        disposable: false,
+        appSystem: null,
+        subs: [],
+      },
+    ];
+
+    setCustomBreadcrumbs(customBreadcrumbs, 'space');
+  };
+
  // const handleBack = () => {
  //   navigate('/knowledge-base');
  // };