feat: 菜单管理(侧边栏覆盖层)
管理员可对一/二/三级菜单(含注入的 iframe 轻应用节点)改名、停用/启用、 排序、跨层级移动。静态菜单仍是图标/路由来源,后端只存每节点覆盖项。 后端: /api/menu-overrides(全局共享;开放读、admin 原子替换;≤3 级校验), 新增 persistence/menu_overrides 持久化层(create_all 自动建表)。 前端: 合并逻辑 menu-overrides.ts、MenuManagementPage(@dnd-kit 拖拽+移动到 父级选择器+上下箭头+改名/停用)、左下角设置入口、Header/侧边栏自动生效。 Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
1 parent
8d0759123a
commit
1c8b5b23a1
19 files changed
+1480
-8
No files matched your search
@@ -45,6 +45,7 @@ from app.gateway.routers import (
|
||||
llm_metrics,
|
||||
mcp,
|
||||
memory,
|
||||
menu_overrides,
|
||||
models,
|
||||
multi_agent,
|
||||
notifications,
|
||||
@@ -1339,6 +1340,9 @@ This gateway provides custom endpoints for models, MCP configuration, skills, an
|
||||
# Light-app registry (?????) at /api/light-apps
|
||||
app.include_router(light_apps.router)
|
||||
|
||||
# Sidebar-menu overrides (菜单管理) at /api/menu-overrides
|
||||
app.include_router(menu_overrides.router)
|
||||
|
||||
# Standalone parallel multi-agent panel: fan-out streaming + saved tasks
|
||||
app.include_router(parallel_agents.router)
|
||||
app.include_router(parallel_agent_tasks.router)
|
||||
|
||||
@@ -239,6 +239,10 @@ async def langgraph_runtime(app: FastAPI) -> AsyncGenerator[None, None]:
|
||||
|
||||
app.state.light_app_store = make_light_app_store(sf)
|
||||
|
||||
from deerflow.persistence.menu_overrides import make_menu_override_store
|
||||
|
||||
app.state.menu_override_store = make_menu_override_store(sf)
|
||||
|
||||
from deerflow.persistence.parallel_agent_tasks import make_parallel_agent_task_store
|
||||
|
||||
app.state.parallel_agent_task_store = make_parallel_agent_task_store(sf)
|
||||
|
||||
@@ -0,0 +1,123 @@
|
||||
"""Sidebar-menu override API (菜单管理).
|
||||
|
||||
The static sidebar menu tree (icons / routes / adminOnly) is defined in the
|
||||
frontend code; iframe light-apps are injected into it at render time. This
|
||||
router persists a **global / shared** set of per-node overrides that the
|
||||
frontend merges onto that tree: rename (``label``), 停用/启用 (``disabled``),
|
||||
reorder (``sort_order``) and re-parent (``parent_id``, moving a node's whole
|
||||
subtree). A node with no override renders exactly as the code defines it.
|
||||
|
||||
Reads are open to any authenticated user (the sidebar needs them); the whole
|
||||
override set is replaced atomically and only by an admin.
|
||||
|
||||
Routes (prefix ``/api/menu-overrides``):
|
||||
GET "" list all overrides
|
||||
PUT "" replace the entire override set (admin)
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from datetime import datetime
|
||||
|
||||
from fastapi import APIRouter, HTTPException, Request
|
||||
from pydantic import BaseModel, Field
|
||||
|
||||
from app.gateway.deps import get_current_user, get_optional_user_from_request
|
||||
from deerflow.persistence.menu_overrides import MenuOverrideStore
|
||||
|
||||
router = APIRouter(prefix="/api/menu-overrides", tags=["menu-overrides"])
|
||||
|
||||
# Hard cap mirroring the sidebar's 一级 → 二级 → 三级 rendering depth.
|
||||
_MAX_DEPTH = 3
|
||||
|
||||
|
||||
# ── schemas ──────────────────────────────────────────────────────────────
|
||||
|
||||
|
||||
class MenuOverride(BaseModel):
|
||||
node_id: str = Field(..., min_length=1, max_length=128)
|
||||
parent_id: str | None = Field(default=None, max_length=128)
|
||||
sort_order: int = 0
|
||||
label: str | None = Field(default=None, max_length=255)
|
||||
disabled: bool = False
|
||||
|
||||
|
||||
class MenuOverrideResponse(MenuOverride):
|
||||
updated_by: str | None = None
|
||||
updated_at: datetime | str | None = None
|
||||
|
||||
|
||||
class MenuOverrideListResponse(BaseModel):
|
||||
overrides: list[MenuOverrideResponse]
|
||||
|
||||
|
||||
class MenuOverrideReplaceRequest(BaseModel):
|
||||
overrides: list[MenuOverride] = Field(default_factory=list)
|
||||
|
||||
|
||||
# ── helpers ──────────────────────────────────────────────────────────────
|
||||
|
||||
|
||||
def _get_store(request: Request) -> MenuOverrideStore:
|
||||
store = getattr(request.app.state, "menu_override_store", None)
|
||||
if store is None:
|
||||
raise HTTPException(status_code=503, detail="Menu override store not available")
|
||||
return store
|
||||
|
||||
|
||||
async def _require_admin(request: Request) -> None:
|
||||
"""Reject non-admins. Lets the call through when auth is disabled."""
|
||||
user = await get_optional_user_from_request(request)
|
||||
if user is None:
|
||||
return
|
||||
if getattr(user, "system_role", None) != "admin":
|
||||
raise HTTPException(status_code=403, detail="菜单管理仅限管理员")
|
||||
|
||||
|
||||
def _validate_depth(overrides: list[MenuOverride]) -> None:
|
||||
"""Reject cycles and any node whose effective depth exceeds 3 levels.
|
||||
|
||||
Only nodes that appear in the override set carry an explicit ``parent_id``;
|
||||
a node absent from the set keeps its code-defined parent (which is at most
|
||||
3 levels deep by construction). So validating the override graph alone is
|
||||
sufficient to stop an admin from pushing a 4th level via re-parenting.
|
||||
"""
|
||||
parent_of = {o.node_id: o.parent_id for o in overrides}
|
||||
|
||||
for node_id in parent_of:
|
||||
depth = 1
|
||||
seen = {node_id}
|
||||
cursor = parent_of[node_id]
|
||||
while cursor:
|
||||
depth += 1
|
||||
if depth > _MAX_DEPTH:
|
||||
raise HTTPException(status_code=400, detail=f"菜单「{node_id}」层级超过 {_MAX_DEPTH} 级")
|
||||
if cursor in seen:
|
||||
raise HTTPException(status_code=400, detail=f"菜单「{node_id}」存在循环引用")
|
||||
seen.add(cursor)
|
||||
# A parent that is not itself in the override set is a code node at a
|
||||
# known depth ≤ 3, so the chain terminates there.
|
||||
cursor = parent_of.get(cursor)
|
||||
|
||||
|
||||
# ── routes ───────────────────────────────────────────────────────────────
|
||||
|
||||
|
||||
@router.get("", response_model=MenuOverrideListResponse)
|
||||
async def list_menu_overrides(request: Request) -> MenuOverrideListResponse:
|
||||
store = _get_store(request)
|
||||
rows = await store.list_overrides()
|
||||
return MenuOverrideListResponse(overrides=[MenuOverrideResponse(**r) for r in rows])
|
||||
|
||||
|
||||
@router.put("", response_model=MenuOverrideListResponse)
|
||||
async def replace_menu_overrides(request: Request, body: MenuOverrideReplaceRequest) -> MenuOverrideListResponse:
|
||||
await _require_admin(request)
|
||||
_validate_depth(body.overrides)
|
||||
store = _get_store(request)
|
||||
user_id = await get_current_user(request)
|
||||
rows = await store.replace_all(
|
||||
[o.model_dump() for o in body.overrides],
|
||||
updated_by=user_id,
|
||||
)
|
||||
return MenuOverrideListResponse(overrides=[MenuOverrideResponse(**r) for r in rows])
|
||||
Reference in new issue
Block a user