wsk/deerflow-code
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dhk-1' into 'master'

Browse Source 
代码修改

See merge request knowledge-base-bj/deerflow-server!117
This commit is contained in:
董宏凯 committed 2026-06-12 11:33:18 +00:00
2 parents 6a71272b79 1214ea0d91
commit c66c359432
5 files changed
+168 -107
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

frontend-web/src/components/page-sdebar.css
+44 -8
View File
@@ -43,8 +43,8 @@
width: 100%;
height: 75px;
margin-top: 13px;
font-family: Noto Sans S Chinese;
font-weight: 500;
font-family: "Source Han Sans SC", "Noto Sans SC", "Noto Sans S Chinese", "Microsoft YaHei", sans-serif;
font-weight: 700;
color: #fff;
font-size: 20px;
display: flex;
@@ -111,6 +111,42 @@
word-break: break-all;
}
.sidebar-contnet--top-submenu .sidebar-contents {
overflow-y: auto;
overflow-x: hidden;
}
.sidebar-contnet--top-submenu .item-nav {
height: auto;
min-height: 75px;
padding: 10px 2px;
font-size: 19px;
line-height: 1.35;
}
.sidebar-contnet--top-submenu .item-nav__label {
width: 3.1em;
max-width: 100%;
padding-left: 0;
letter-spacing: 0;
line-height: 1.35;
text-align: center;
word-break: normal;
overflow-wrap: normal;
white-space: normal;
}
.sidebar-contnet--top-submenu .item-nav__label--four-char {
width: 2.2em;
}
.sidebar-contnet--top-submenu .item-nav:hover::after,
.sidebar-contnet--top-submenu .item-nav-active::after,
.sidebar-contnet--top-submenu .item-nav-hovered::after {
top: auto;
bottom: 0;
}
.item-nav-content {
width: 155px;
height: calc(100vh - 4rem - 20px);
@@ -194,10 +230,10 @@
border: 0;
background: transparent;
padding: 3px 0;
font-family: Noto Sans S Chinese;
font-family: "Source Han Sans SC", "Noto Sans SC", "Noto Sans S Chinese", "Microsoft YaHei", sans-serif;
font-size: 18px;
line-height: 16px;
font-weight: 500;
font-weight: 700;
letter-spacing: 0;
color: rgba(255, 255, 255, 0.8);
text-align: left;
@@ -363,10 +399,10 @@
padding: 0 18px;
background: transparent;
color: rgba(224, 242, 255, 0.9);
font-family: Noto Sans S Chinese;
font-family: "Source Han Sans SC", "Noto Sans SC", "Noto Sans S Chinese", "Microsoft YaHei", sans-serif;
font-size: 16px;
line-height: 1;
font-weight: 500;
font-weight: 700;
letter-spacing: 0;
white-space: nowrap;
cursor: pointer;
@@ -443,10 +479,10 @@
padding: 0 16px;
background: rgba(2, 28, 65, 0.36);
color: rgba(221, 242, 255, 0.78);
font-family: Noto Sans S Chinese;
font-family: "Source Han Sans SC", "Noto Sans SC", "Noto Sans S Chinese", "Microsoft YaHei", sans-serif;
font-size: 14px;
line-height: 1;
font-weight: 500;
font-weight: 700;
letter-spacing: 0;
white-space: nowrap;
cursor: pointer;
frontend-web/src/components/page-sidebar-dark.tsx
+40 -4
View File
@@ -124,6 +124,13 @@ export function PageSidebarDark({ collapsed, onToggleCollapsed }: PageSidebarDar
}
};
const handleSecondItemClick = (item: MenuItem) => {
const path = item.path ?? findFirstRoutePath(item.children);
if (path) {
navigate(path);
}
};
const handleMenuItemClick = (item: MenuItem) => {
if (item.children?.length) {
toggleExpanded(item.id);
@@ -135,6 +142,35 @@ export function PageSidebarDark({ collapsed, onToggleCollapsed }: PageSidebarDar
}
};
const activeTopItem =
visibleMenuItems.find((item) => item.id === activeTopId) ??
visibleMenuItems.find(hasActiveChild) ??
visibleMenuItems[0];
const sidebarMenuItemsToRender = inWujieEnv
? visibleMenuItems
: activeTopItem?.children ?? [];
const isSidebarItemActive = (item: MenuItem) =>
inWujieEnv
? item.id === activeTopId
: item.path
? pathname === item.path
: hasActiveChild(item);
const handleSidebarItemClick = (item: MenuItem) => {
if (inWujieEnv) {
handleTopItemClick(item);
return;
}
handleSecondItemClick(item);
};
const getSidebarLabelClassName = (label: string) => {
if (!inWujieEnv && Array.from(label.trim()).length === 4) {
return "item-nav__label item-nav__label--four-char";
}
return "item-nav__label";
};
const renderFlyoutMenu = (items: MenuItem[], level = 0) => (
<div className={`sidebar-flyout-list sidebar-flyout-list--level-${level}`}>
{items.map((item) => {
@@ -181,7 +217,7 @@ export function PageSidebarDark({ collapsed, onToggleCollapsed }: PageSidebarDar
return (
<aside className={`sidebar-contnet ${inWujieEnv ? "" : "sidebar-contnet--top-submenu"}`}>
<div className="sidebar-contents">
{visibleMenuItems.map((item) => (
{sidebarMenuItemsToRender.map((item) => (
<div
key={item.id}
className="item-nav-group"
@@ -198,10 +234,10 @@ export function PageSidebarDark({ collapsed, onToggleCollapsed }: PageSidebarDar
<div className="item-nav-wrap">
<button
type="button"
className={`item-nav ${item.id === activeTopId ? "item-nav-active" : ""} ${hoveredTopId === item.id ? "item-nav-hovered" : ""}`}
onClick={() => handleTopItemClick(item)}
className={`item-nav ${isSidebarItemActive(item) ? "item-nav-active" : ""} ${hoveredTopId === item.id ? "item-nav-hovered" : ""}`}
onClick={() => handleSidebarItemClick(item)}
>
<span className="item-nav__label">{item.label}</span>
<span className={getSidebarLabelClassName(item.label)}>{item.label}</span>
</button>
{inWujieEnv && item.children?.length && hoveredTopId === item.id ? (
<span className="item-nav-hover-bridge" aria-hidden="true" />
frontend-web/src/core/page-layout/sidebar-menu.ts
+70 -80
View File
@@ -1,11 +1,11 @@
/**
* ?????????????????
* 全局侧边栏菜单数据与权限过滤逻辑。
*
* ?? ``PageSidebar`` ??? ``PageSidebarDark`` ?????? ?? ?????
* adminOnly ??????????????UI ???icon ??/????/hover flyout?
* ?????????
* 浅色 ``PageSidebar`` 和深色 ``PageSidebarDark`` 共用这份数据 —— 菜单结构与
* adminOnly 权限策略对两种皮肤完全一致；UI 渲染（icon 显示/折叠样式/hover flyout）
* 在各自组件里实现。
*
* ????????????? sidebar ?????
* 修改菜单只需改这一处，两个 sidebar 自动同步。
*/
import type { ElementType } from "react";
import {
@@ -24,13 +24,11 @@ import {
History,
Layers,
Layout,
Library,
List,
ListChecks,
ListTodo,
MessageSquareCode,
Network,
NotebookPen,
Plus,
Settings,
Sparkles,
Target,
@@ -50,80 +48,46 @@ export type MenuItem = {
export const sidebarMenuItems: MenuItem[] = [
{
id: "qa-center",
label: "????",
label: "问答中心",
icon: HelpCircle,
children: [
{ id: "general-qa", label: "????", icon: CircleHelp, path: "/page/workspace/chats/new" },
{ id: "general-qa", label: "通用问答", icon: CircleHelp, path: "/page/workspace/chats/new" },
{
id: "multi-agent-roundtable",
label: "??????",
label: "多智能体会商",
icon: Users,
path: "/page/strategy/qa/multi-agent-roundtable",
},
// { id: "expert-qa", label: "????", icon: Brain, path: "/page/strategy/qa/expert-qa" },
// { id: "expert-qa", label: "专家问答", icon: Brain, path: "/page/strategy/qa/expert-qa" },
{
id: "qa-zzjc",
label: "zzjc??",
label: "zzJC支持",
icon: Bot,
path: "/page/strategy/agents/6bf/chats/new",
},
{ id: "qa-zzxd", label: "zzXD??", icon: Layout, path: "/page/strategy/agents/10d69686718349688e58a8790cb61024/chats/new", },
{ id: "qa-research", label: "????", icon: FileText, path: "/page/canvas/ai-writing" },
{ id: "qa-zzxd", label: "zzXD应用", icon: Layout, path: "/page/strategy/agents/10d69686718349688e58a8790cb61024/chats/new", },
{ id: "qa-research", label: "课题研究", icon: FileText, path: "/page/canvas/ai-writing" },
],
},
// {
// id: "light-app-center",
// label: "???",
// icon: Grid3X3,
// children: [
// {
// id: "light-app-note-management",
// label: "????",
// icon: NotebookPen,
// children: [
// {
// id: "light-app-new-note",
// label: "????",
// icon: Plus,
// path: "/page/strategy/light-app/new-note",
// },
// {
// id: "light-app-note-list",
// label: "????",
// icon: List,
// path: "/page/strategy/light-app/notes",
// },
// {
// id: "light-app-note-qa",
// label: "????",
// icon: MessageSquareCode,
// path: "/page/strategy/light-app/note-qa",
// },
// ],
// },
// { id: "light-app-square", label: "????", icon: Layout },
// { id: "light-app-records", label: "????", icon: History },
// ],
// },
{
id: "task-management",
label: "????",
label: "任务管理",
icon: Target,
children: [
{
id: "xk-center-task",
label: "XK???",
label: "XK中任务",
icon: Folder,
children: [
{
id: "xk-task-jc",
label: "??JC",
label: "任务JC",
icon: ListTodo,
path: "/page/strategy/task-management/xk-task-jc",
},
{
id: "xk-task-dispatch",
label: "????",
label: "任务调度",
icon: ListTodo,
path: "/page/strategy/task-management/xk-task-dispatch",
},
@@ -131,7 +95,7 @@ export const sidebarMenuItems: MenuItem[] = [
},
{
id: "coh-center-task",
label: "COH???",
label: "COH中任务",
icon: Folder,
children: [
{
@@ -142,7 +106,7 @@ export const sidebarMenuItems: MenuItem[] = [
},
{
id: "coh-task-fx",
label: "??FX",
label: "任务FX",
icon: ListTodo,
path: "/page/strategy/task-management/plan-task/plan-task-fx",
},
@@ -156,12 +120,12 @@ export const sidebarMenuItems: MenuItem[] = [
},
{
id: "pg-center-task",
label: "PG???",
label: "PG中任务",
icon: Folder,
children: [
{
id: "pg-task-pg",
label: "??PG",
label: "任务PG",
icon: ListTodo,
path: "/page/strategy/task-management/effect-task-pg",
},
@@ -173,7 +137,7 @@ export const sidebarMenuItems: MenuItem[] = [
},
{
id: "pg-task-info-pg",
label: "??PG",
label: "信息PG",
icon: ListTodo,
path: "/page/strategy/task-management/effect-info-pg",
},
@@ -181,24 +145,24 @@ export const sidebarMenuItems: MenuItem[] = [
},
{
id: "ty-center-task",
label: "TY???",
label: "TY中任务",
icon: Folder,
children: [
{
id: "ty-task-xdty",
label: "XDTY??",
label: "XDTY任务",
icon: ListTodo,
path: "/page/strategy/task-management/mnty-task-mechanism",
},
{
id: "ty-task-plan",
label: "??TY??",
label: "方案TY任务",
icon: ListTodo,
path: "/page/strategy/task-management/mnty-task-plan",
},
{
id: "ty-task-xxty",
label: "XXTY??",
label: "XXTY任务",
icon: ListTodo,
path: "/page/strategy/task-management/mnty-task-zsty",
},
@@ -206,63 +170,83 @@ export const sidebarMenuItems: MenuItem[] = [
},
],
},
{
id: "light-app-center",
label: "应用中心",
icon: Grid3X3,
children: [
{
id: "light-app-management",
label: "应用管理",
icon: Layout,
path: "/page/strategy/light-app/management",
adminOnly: true,
},
{
id: "light-app-apps",
label: "应用列表",
icon: List,
path: "/page/strategy/light-app/apps",
},
],
},
{
id: "comprehensive-management",
label: "????",
label: "综合管理",
icon: Settings,
children: [
{ id: "mgmt-agents", label: "?????", icon: Bot, path: "/page/strategy/agents" },
{ id: "mgmt-agents", label: "智能体管理", icon: Bot, path: "/page/strategy/agents" },
{
id: "mgmt-business-chain-mapping",
label: "????",
label: "配置管理",
icon: Network,
path: "/page/strategy/business-chain-mapping",
},
{
id: "mgmt-business-chains",
label: "??????",
label: "业务链条配置",
icon: Layers,
path: "/page/strategy/business-chains",
},
{ id: "mgmt-skills", label: "????", icon: Sparkles, path: "/page/strategy/skills" },
{ id: "mgmt-memory", label: "????", icon: Brain, path: "/page/strategy/memory" },
{ id: "mgmt-skills", label: "技能管理", icon: Sparkles, path: "/page/strategy/skills" },
{ id: "mgmt-memory", label: "记忆管理", icon: Brain, path: "/page/strategy/memory" },
{
id: "mgmt-tasks",
label: "????",
label: "定时任务",
icon: ListChecks,
path: "/page/strategy/scheduled/tasks",
},
{
id: "mgmt-llm-metrics",
label: "???????",
label: "大模型调用统计",
icon: Gauge,
path: "/page/strategy/settings/llm-metrics",
adminOnly: true,
},
{
id: "mgmt-users",
label: "????",
label: "用户管理",
icon: Users,
path: "/page/strategy/admin/users",
adminOnly: true,
},
{
id: "mgmt-user-leaderboard",
label: "?????",
label: "用户排行榜",
icon: Trophy,
path: "/page/strategy/admin/user-leaderboard",
adminOnly: true,
},
{
id: "mgmt-admin-scheduled-tasks",
label: "??????",
label: "定时任务管理",
icon: CalendarClock,
path: "/page/strategy/admin/scheduled-tasks",
adminOnly: true,
},
{
id: "mgmt-user-activity",
label: "??????",
label: "用户活动审计",
icon: History,
path: "/page/strategy/admin/user-activity",
adminOnly: true,
@@ -271,24 +255,30 @@ export const sidebarMenuItems: MenuItem[] = [
},
{
id: "resource-management",
label: "????",
label: "资源管理",
icon: Database,
children: [
{
id: "resource-network-xwt",
label: "??xwt????",
label: "网络xwt资源管理",
icon: Network,
path: "/page/strategy/resource-management/resource-network-actor",
},
{
id: "resource-knowledge-native",
label: "????",
label: "问答梳理",
icon: BookOpen,
path: "/page/workspace/knowledge",
},
{
id: "resource-knowledge-base",
label: "知识库资源管理",
icon: Library,
path: "/page/strategy/resource-management/resource-knowledge-base",
},
{
id: "resource-evaluation-index",
label: "??????",
label: "作战资源管理",
icon: FileBox,
path: "/page/strategy/resource-management/resource-evaluation-index",
},
@@ -296,7 +286,7 @@ export const sidebarMenuItems: MenuItem[] = [
},
];
/** ??????? id ????????????????? */
/** 默认展开的菜单 id 集合（浅色版可折叠交互的初始状态） */
export const defaultExpandedIds: ReadonlySet<string> = new Set([
"qa-center",
"light-app-center",
@@ -306,7 +296,7 @@ export const defaultExpandedIds: ReadonlySet<string> = new Set([
"comprehensive-management",
]);
/** ? admin ???????? admin ??? ``adminOnly: true`` ?????? */
/** 按 admin 角色过滤菜单：非 admin 不展示 ``adminOnly: true`` 的项及其子项 */
export function filterMenuItemsByRole(items: MenuItem[], isAdmin: boolean): MenuItem[] {
return items
.filter((item) => !item.adminOnly || isAdmin)
frontend-web/src/pages/StrategyRoutes.tsx
+2 -2
View File
@@ -78,11 +78,11 @@ export default function StrategyRoutes() {
<Route index element={<Navigate to="xk-task-jc" replace />} />
<Route
path="xk-task-jc"
element={<TaskXkFrom gopath="#/pageIndie/pageHome/pageSwrw" />}
element={<TaskXkFrom gopath="/#/pageIndie/pageHome/pageSwrw" />}
/>
<Route
path="xk-task-dispatch"
element={<TaskXkFrom gopath="#/pageIndie/pageJczl" />}
element={<TaskXkFrom gopath="/#/pageIndie/pageJczl" />}
/>
<Route
path="effect-task-pg"
frontend-web/src/strategy-components/Header.tsx
+12 -13
View File
@@ -2,8 +2,9 @@ import { Bell, ChevronDown, FileText, Moon, Palette, User } from "lucide-react";
import { useState } from "react";
import { useLocation, useNavigate } from "react-router-dom";
import { NotificationDialog } from "@/components/workspace/notification-dialog";
import { Button } from "@/components/ui/button";
import "@/components/page-sdebar.css";
import { NotificationDialog } from "@/components/workspace/notification-dialog";
import { getStoredAuth } from "@/core/auth";
import { isWujieEnv } from "@/core/embed/wujie";
import { useUnreadCount } from "@/core/notifications";
@@ -12,7 +13,6 @@ import { useSidebarMenuItems } from "@/core/page-layout/use-sidebar-menu";
import { cn } from "@/lib/utils";
import { useTheme } from "../contexts/ThemeContext";
import "@/components/page-sdebar.css";
const iconButtonClass = (isDark: boolean) =>
cn(
@@ -35,7 +35,7 @@ const Header = ({ collapsed }: HeaderProps) => {
const { pathname } = useLocation();
const isAdmin = getStoredAuth()?.system_role === "admin";
const visibleMenuItems = useSidebarMenuItems(!!isAdmin);
const showTopSubmenu = isDark && !collapsed && !isWujieEnv();
const showTopNav = isDark && !collapsed && !isWujieEnv();
const hasActiveChild = (item: MenuItem): boolean => {
if (item.path && pathname === item.path) {
@@ -64,11 +64,10 @@ const Header = ({ collapsed }: HeaderProps) => {
};
const activeTopItem = visibleMenuItems.find(hasActiveChild);
const topSubNavItems = activeTopItem?.children ?? [];
const activeSecondItem = topSubNavItems.find(hasActiveChild);
const activeSecondItem = activeTopItem?.children?.find(hasActiveChild);
const thirdSubNavItems = activeSecondItem?.children ?? [];
const handleTopSubNavClick = (item: MenuItem) => {
const handleNavItemClick = (item: MenuItem) => {
const path = item.path ?? findFirstRoutePath(item.children);
if (path) {
navigate(path);
@@ -99,14 +98,14 @@ const Header = ({ collapsed }: HeaderProps) => {
<FileText className="h-4 w-4 text-white" />
</div>
{!collapsed && (
<span className={cn("text-sm font-semibold", isDark ? "text-white" : "text-white")}>
<span className="text-sm font-semibold text-white">
CM助手
</span>
)}
{showTopSubmenu && topSubNavItems.length ? (
<nav className="top-submenu-bar" aria-label="二级菜单">
{showTopNav && visibleMenuItems.length ? (
<nav className="top-submenu-bar" aria-label="一级菜单">
<div className="top-submenu-list">
{topSubNavItems.map((item) => {
{visibleMenuItems.map((item) => {
const isSelected = item.path ? pathname === item.path : hasActiveChild(item);
return (
@@ -114,7 +113,7 @@ const Header = ({ collapsed }: HeaderProps) => {
key={item.id}
type="button"
className={`top-submenu-item ${isSelected ? "top-submenu-item--active" : ""}`}
onClick={() => handleTopSubNavClick(item)}
onClick={() => handleNavItemClick(item)}
>
{item.label}
</button>
@@ -219,7 +218,7 @@ const Header = ({ collapsed }: HeaderProps) => {
</Button>
</div>
</header>
{showTopSubmenu && thirdSubNavItems.length ? (
{showTopNav && thirdSubNavItems.length ? (
<nav className="third-submenu-bar" aria-label="三级菜单">
<div className="third-submenu-list">
{thirdSubNavItems.map((item) => {
@@ -230,7 +229,7 @@ const Header = ({ collapsed }: HeaderProps) => {
key={item.id}
type="button"
className={`third-submenu-item ${isSelected ? "third-submenu-item--active" : ""}`}
onClick={() => handleTopSubNavClick(item)}
onClick={() => handleNavItemClick(item)}
>
{item.label}
</button>