代码合并

This commit is contained in:
董宏凯 committed 2026-05-28 17:49:18 +08:00
1 parent 7548620683
commit 3632b0d726
17 files changed
+279 -25

No files matched your search

@@ -1,4 +1,4 @@
import type { QASingleRagTrace, QAThinkingTrace } from './QACommon';
import type { QASingleRagTrace, QAThinkingTrace } from '../qa/QACommon';
import type { ComparePane, KnowledgeBaseChunk, Message, QAMode, SourceItem } from './GeneralQA.types';
/**
@@ -11,7 +11,7 @@ import {
} from 'lucide-react';
import { Dialog, Select, Slider } from 'tdesign-react';
import { useTheme } from '@/contexts/ThemeContext';
import { ChatMessage, EmptyChatState, QAAvatar, QAComposer, QASingleRagTrace, QAThinkingRound, QAThinkingTrace, RetrievalThinkingTrace, SingleRagAnswer, TypingIndicator } from './QACommon';
import { ChatMessage, EmptyChatState, QAAvatar, QAComposer, QASingleRagTrace, QAThinkingRound, QAThinkingTrace, RetrievalThinkingTrace, SingleRagAnswer, TypingIndicator } from '../qa/QACommon';
import GeneralQAHeader from './GeneralQAHeader';
import GeneralQAConfigSidebar from './GeneralQAConfigSidebar';
import type { ComparePane, CompareResult, KnowledgeBaseChunk, Message, QAMode, SourceItem, ToolCallData, ViewMode } from './GeneralQA.types';
@@ -26,13 +26,21 @@ import {
parseSingleRagStream,
} from './GeneralQA.mock';
type GeneralQAProps = {
pageTitle?: string;
pageSubtitle?: string;
initialMode?: 'general' | 'new';
};
/**
* 通用问答组件
* 通用/专家问答组件
* 支持单轮RAG、多轮RAG、深度检索及结果对比功能
* @param onNavigate - 页面导航函数
* @param initialMode - 初始模式(可选)
*/
const GeneralQA: React.FC = () => {
const GeneralQA: React.FC<GeneralQAProps> = ({
pageTitle = '通用问答',
pageSubtitle = '支持单轮RAG、多轮RAG、深度检索及结果对比',
initialMode: _initialMode = 'general',
}) => {
const { theme } = useTheme();
const isDark = theme === 'dark';
@@ -1390,10 +1398,6 @@ const GeneralQA: React.FC = () => {
runAfterGenerationConfirm(() => setViewMode(mode));
};
const handleSafeNavigate = (page: string) => {
// runAfterGenerationConfirm(() => onNavigate(page));
};
const handleSafeReset = () => {
runAfterGenerationConfirm(() => {
setMessages([]);
@@ -1633,7 +1637,8 @@ const GeneralQA: React.FC = () => {
isDark={isDark}
viewMode={viewMode}
setViewMode={handleSafeViewModeChange}
onNavigate={handleSafeNavigate}
pageTitle={pageTitle}
pageSubtitle={pageSubtitle}
/>
{/* 主体内容区 */}
@@ -1,4 +1,4 @@
import type { QASingleRagTrace, QAThinkingTrace } from './QACommon';
import type { QASingleRagTrace, QAThinkingTrace } from '../qa/QACommon';
export type QAMode = 'single-round' | 'multi-round' | 'deep-search';
export type ViewMode = 'single' | 'compare';
@@ -11,6 +11,8 @@ type Props = {
isDark: boolean; // 当前是否为暗黑主题,用于样式适配
viewMode: ViewMode; // 当前视图模式:'single' 单一模式 或 'compare' 对比模式
setViewMode: (mode: ViewMode) => void; // 设置视图模式回调函数
pageTitle?: string;
pageSubtitle?: string;
};
/**
@@ -20,15 +22,21 @@ type Props = {
* 这样拆分后,顶部导航的样式和交互不会和中间问答流处理逻辑混在一起,后续如果要新增
* “保存模板”“导出记录”等入口,也可以只改这个文件。
*/
export default function GeneralQAHeader({ isDark, viewMode, setViewMode }: Props): JSX.Element {
export default function GeneralQAHeader({
isDark,
viewMode,
setViewMode,
pageTitle = '通用问答',
pageSubtitle = '支持单轮RAG、多轮RAG、深度检索及结果对比',
}: Props): JSX.Element {
return (
<div className={`flex items-center justify-between px-6 py-4 border-b ${isDark ? 'border-slate-700/50' : 'border-red-100'}`}>
<div className="flex items-center gap-4">
<h1 className={`text-lg font-semibold ${isDark ? 'text-white' : 'text-gray-900'}`}>
通用问答
{pageTitle}
</h1>
<span className={`text-sm ${isDark ? 'text-slate-400' : 'text-gray-500'}`}>
支持单轮RAG、多轮RAG、深度检索及结果对比
{pageSubtitle}
</span>
</div>
@@ -0,0 +1,50 @@
import React, { useEffect, useState } from "react";
import {
getKnowledgeIframeApiUrl,
getKnowledgeIframeSkin,
} from "@/core/strategy/external-links";
import { requestCrudService } from "@/service/request-axios-service";
import "@/strategy-components/components/task-components/css/strategy-data.css";
const service = requestCrudService;
const KnowledgeBaseResourceManagement: React.FC = () => {
const [iframeUrl, setIframeUrl] = useState("");
useEffect(() => {
const initIframeUrl = async () => {
const apiUrl = getKnowledgeIframeApiUrl();
if (!apiUrl) return;
const jsonStr = localStorage.getItem("userInfo");
if (!jsonStr) return;
try {
const userInfo = JSON.parse(jsonStr);
const token = userInfo.accessToken;
if (!token) return;
const res = (await service.post(apiUrl, {
token,
skin: getKnowledgeIframeSkin(),
})) as { iframeUrl?: string };
if (res?.iframeUrl) {
setIframeUrl(res.iframeUrl);
}
} catch (error) {
console.error("Failed to load knowledge iframe url:", error);
}
};
void initIframeUrl();
}, []);
return (
<div className="strategy-data iframe-container">
<iframe src={iframeUrl} className="full-size-iframe" title="知识库资源管理" />
</div>
);
};
export default KnowledgeBaseResourceManagement;
@@ -0,0 +1,20 @@
import React, { useEffect, useState } from "react";
import { getNetworkActorIframeUrl } from "@/core/strategy/external-links";
import "@/strategy-components/components/task-components/css/strategy-data.css";
const NetworkActorResourceManagement: React.FC = () => {
const [iframeUrl, setIframeUrl] = useState("");
useEffect(() => {
setIframeUrl(getNetworkActorIframeUrl());
}, []);
return (
<div className="strategy-data iframe-container">
<iframe src={iframeUrl} className="full-size-iframe" title="网络xwt资源管理" />
</div>
);
};
export default NetworkActorResourceManagement;
@@ -175,10 +175,66 @@
}
/* ── TDesign overrides inside task pages ─────────────────────────────── */
.strategy-data .t-loading,
.strategy-data .t-loading__parent {
min-height: 0;
}
.strategy-data .t-loading--full {
position: absolute;
inset: 0;
}
.strategy-data .t-loading__overlay {
background: rgb(255 255 255 / 60%);
}
.dark .strategy-data .t-loading__overlay {
background: rgb(15 23 42 / 45%);
}
.strategy-data .t-pagination {
justify-content: center;
}
.strategy-data .t-date-range-picker,
.strategy-data .t-date-picker,
.strategy-data .t-input {
width: 100%;
max-width: 360px;
}
.strategy-data .t-input__wrap,
.strategy-data .t-range-input {
background: var(--td-bg-color-container, #fff);
}
.dark .strategy-data .t-input__wrap,
.dark .strategy-data .t-range-input {
background: var(--td-bg-color-container, #1e293b);
color: var(--td-text-color-primary, #e2e8f0);
}
.strategy-data .t-row,
.strategy-data .t-col {
min-height: 0;
}
/* Popups are portaled to body — keep panels above app chrome */
.t-popup,
.t-date-picker__panel-container,
.t-date-range-picker__panel-container {
z-index: 6500;
}
/* ── iframe embed pages (resource management, TY tasks, etc.) ─────────── */
.strategy-data .iframe-container {
width: 100%;
height: calc(100vh - 100px);
}
.strategy-data .full-size-iframe {
width: 100%;
height: 100%;
border: none;
}