From 77cdeede15944c888ec066306af6a6ea4e7208ab Mon Sep 17 00:00:00 2001 From: zlwu <704541015@qq.com> Date: Fri, 20 Nov 2026 14:33:31 +0800 Subject: [PATCH] =?UTF-8?q?fix(web-admin):=20=E4=B8=8B=E7=BA=BF=E5=B8=82?= =?UTF-8?q?=E5=9C=BA=E4=BE=A7=E6=A0=8F=E4=B8=AD=E8=AF=95=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E8=8F=9C=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 超管在 frontend 模式下走静态路由全量展示,仅解绑 sys_role_menu 无效;同步移除 sqxp/STATIC_MENU_TREE 并软删对应 sys_menu。 Co-authored-by: Cursor --- backend/app/api/menu.py | 32 +---- .../test_hide_market_pilot_service_menus.py | 53 +++++++ ...-11-20-hide-market-pilot-service-menus.sql | 129 ++++++++++++++++++ web-admin/src/router/modules/sqxp.ts | 68 +-------- 4 files changed, 184 insertions(+), 98 deletions(-) create mode 100644 backend/tests/test_hide_market_pilot_service_menus.py create mode 100644 docs/sql/migrations/2026-11-20-hide-market-pilot-service-menus.sql diff --git a/backend/app/api/menu.py b/backend/app/api/menu.py index addd45b5..f7ea89b1 100644 --- a/backend/app/api/menu.py +++ b/backend/app/api/menu.py @@ -7,7 +7,7 @@ from app.core.response import success_response router = APIRouter(prefix="/web/menu", tags=["菜单管理"]) # 与 web-admin/src/router/modules/sqxp.ts 一致:6 个一级菜单分组 -# 市场二级顺序:存储服务、科研捐赠、市场基础信息、中试服务、基础实验、器械销售 +# 市场二级顺序:存储服务、科研捐赠、市场基础信息、基础实验、器械销售 STATIC_MENU_TREE = [ { "id": "TOP00000000000000000000000000006", @@ -298,36 +298,6 @@ STATIC_MENU_TREE = [ ], }, - # 中试服务 - { - "id": "PIL00000000000000000000000000001", - "name": "PilotService", - "path": "pilot-service", - "component": "", - "meta": { - "title": "中试服务", - "icon": "ri:flask-line", - "keepAlive": False, - "roles": ["admin"], - }, - "children": [ - { - "id": "80000000000000000000000000000010", - "name": "PilotApplication", - "path": "pilot-application", - "component": "/pilot-service/pilot-application/index", - "meta": {"title": "中试服务申请单", "keepAlive": True, "menuCode": "pilot-service:pilot-application:list"}, - }, - { - "id": "PIL00000000000000000000000000004", - "name": "PilotOutboundRelease", - "path": "outbound-release-review", - "component": "/pilot-service/outbound-release-review/index", - "meta": {"title": "出库放行审核", "keepAlive": True, "menuCode": "pilot-service:outbound-release-review:list"}, - }, - ], - }, - # 基础实验 { "id": "BEX00000000000000000000000000001", diff --git a/backend/tests/test_hide_market_pilot_service_menus.py b/backend/tests/test_hide_market_pilot_service_menus.py new file mode 100644 index 00000000..d9700352 --- /dev/null +++ b/backend/tests/test_hide_market_pilot_service_menus.py @@ -0,0 +1,53 @@ +"""市场下「中试服务」已从静态菜单树下线(Issue #158)。""" +import ast +import re +from pathlib import Path + + +ROOT = Path(__file__).resolve().parents[2] +MENU_PY = ROOT / "backend/app/api/menu.py" +SQXP_TS = ROOT / "web-admin/src/router/modules/sqxp.ts" +HIDE_SQL = ROOT / "docs/sql/migrations/2026-11-20-hide-market-pilot-service-menus.sql" + + +def _market_children_titles_from_menu_py() -> list[str]: + source = MENU_PY.read_text(encoding="utf-8") + tree_match = re.search(r"STATIC_MENU_TREE\s*=\s*(\[[\s\S]*?\n\])\s*\n", source) + assert tree_match, "STATIC_MENU_TREE not found" + tree = ast.literal_eval(tree_match.group(1)) + market = next( + node + for node in tree + if isinstance(node, dict) and (node.get("meta") or {}).get("menuCode") == "menu:market" + ) + titles = [] + for child in market.get("children") or []: + meta = child.get("meta") or {} + titles.append(str(meta.get("title") or "")) + return titles + + +def test_backend_static_menu_has_no_market_pilot_service(): + titles = _market_children_titles_from_menu_py() + assert "中试服务" not in titles + assert "中试服务申请单" not in titles + + +def test_frontend_sqxp_has_no_market_pilot_service_block(): + text = SQXP_TS.read_text(encoding="utf-8") + assert "name: 'PilotService'" not in text + assert "id: 'PIL00000000000000000000000000001'" not in text + assert "pilot-service:pilot-application:list" not in text + # 基础实验 / 临床仍可复用出库放行组件与权限码前缀 + assert "basic-experiment:outbound-release-review:list" in text + assert "clinical-application:outbound-release-review:list" in text + + +def test_hide_sql_soft_deletes_sys_menu_only_under_market_pilot(): + sql = HIDE_SQL.read_text(encoding="utf-8") + compact = re.sub(r"\s+", " ", re.sub(r"--[^\n]*", "", sql)) + assert re.search(r"UPDATE\s+sys_menu", compact, re.IGNORECASE) + assert re.search(r"SET\s+m\.del_flag\s*=\s*1", compact, re.IGNORECASE) + assert "menu:market" in compact + assert "中试服务" in compact + assert not re.search(r"DELETE\s+FROM\s+sys_menu", compact, re.IGNORECASE) diff --git a/docs/sql/migrations/2026-11-20-hide-market-pilot-service-menus.sql b/docs/sql/migrations/2026-11-20-hide-market-pilot-service-menus.sql new file mode 100644 index 00000000..96ab7f44 --- /dev/null +++ b/docs/sql/migrations/2026-11-20-hide-market-pilot-service-menus.sql @@ -0,0 +1,129 @@ +-- 软删【市场】下【中试服务】目录及其子菜单(含按钮),与前端静态路由下线对齐。 +-- Issue #158(承接 #156:仅解绑角色对超管侧栏无效) +-- MySQL 5.7,可重复执行;不影响基础实验/临床应用下同名菜单。 + +-- 0) 预览目标菜单 +SELECT + m.tenant_no, + m.id AS menu_id, + m.menu_name, + m.menu_type, + m.perms, + m.parent_id, + m.del_flag +FROM sys_menu m +JOIN ( + SELECT pilot.id AS menu_id, pilot.tenant_no + FROM sys_menu market + JOIN sys_menu pilot + ON pilot.parent_id = market.id + AND pilot.tenant_no = market.tenant_no + AND pilot.del_flag = 0 + AND pilot.menu_name = '中试服务' + WHERE market.del_flag = 0 + AND market.perms = 'menu:market' + UNION + SELECT child.id, child.tenant_no + FROM sys_menu market + JOIN sys_menu pilot + ON pilot.parent_id = market.id + AND pilot.tenant_no = market.tenant_no + AND pilot.del_flag = 0 + AND pilot.menu_name = '中试服务' + JOIN sys_menu child + ON child.parent_id = pilot.id + AND child.tenant_no = market.tenant_no + AND child.del_flag = 0 + WHERE market.del_flag = 0 + AND market.perms = 'menu:market' + UNION + SELECT btn.id, btn.tenant_no + FROM sys_menu market + JOIN sys_menu pilot + ON pilot.parent_id = market.id + AND pilot.tenant_no = market.tenant_no + AND pilot.del_flag = 0 + AND pilot.menu_name = '中试服务' + JOIN sys_menu child + ON child.parent_id = pilot.id + AND child.tenant_no = market.tenant_no + AND child.del_flag = 0 + JOIN sys_menu btn + ON btn.parent_id = child.id + AND btn.tenant_no = market.tenant_no + AND btn.del_flag = 0 + WHERE market.del_flag = 0 + AND market.perms = 'menu:market' +) tgt + ON tgt.menu_id = m.id + AND tgt.tenant_no = m.tenant_no +WHERE m.del_flag = 0 +ORDER BY m.tenant_no, m.menu_type, m.order_num, m.menu_name; + +-- 1) 软删目标菜单 +UPDATE sys_menu m +JOIN ( + SELECT pilot.id AS menu_id, pilot.tenant_no + FROM sys_menu market + JOIN sys_menu pilot + ON pilot.parent_id = market.id + AND pilot.tenant_no = market.tenant_no + AND pilot.del_flag = 0 + AND pilot.menu_name = '中试服务' + WHERE market.del_flag = 0 + AND market.perms = 'menu:market' + UNION + SELECT child.id, child.tenant_no + FROM sys_menu market + JOIN sys_menu pilot + ON pilot.parent_id = market.id + AND pilot.tenant_no = market.tenant_no + AND pilot.del_flag = 0 + AND pilot.menu_name = '中试服务' + JOIN sys_menu child + ON child.parent_id = pilot.id + AND child.tenant_no = market.tenant_no + AND child.del_flag = 0 + WHERE market.del_flag = 0 + AND market.perms = 'menu:market' + UNION + SELECT btn.id, btn.tenant_no + FROM sys_menu market + JOIN sys_menu pilot + ON pilot.parent_id = market.id + AND pilot.tenant_no = market.tenant_no + AND pilot.del_flag = 0 + AND pilot.menu_name = '中试服务' + JOIN sys_menu child + ON child.parent_id = pilot.id + AND child.tenant_no = market.tenant_no + AND child.del_flag = 0 + JOIN sys_menu btn + ON btn.parent_id = child.id + AND btn.tenant_no = market.tenant_no + AND btn.del_flag = 0 + WHERE market.del_flag = 0 + AND market.perms = 'menu:market' +) tgt + ON tgt.menu_id = m.id + AND tgt.tenant_no = m.tenant_no +SET + m.del_flag = 1, + m.update_by = 'migration', + m.update_time = NOW() +WHERE m.del_flag = 0; + +-- 2) 核对:市场下不应再有有效「中试服务」目录(期望 0 行) +SELECT + market.tenant_no, + pilot.id, + pilot.menu_name, + pilot.del_flag +FROM sys_menu market +JOIN sys_menu pilot + ON pilot.parent_id = market.id + AND pilot.tenant_no = market.tenant_no + AND pilot.del_flag = 0 + AND pilot.menu_name = '中试服务' +WHERE market.del_flag = 0 + AND market.perms = 'menu:market'; diff --git a/web-admin/src/router/modules/sqxp.ts b/web-admin/src/router/modules/sqxp.ts index 09ad146b..aa7c11c4 100644 --- a/web-admin/src/router/modules/sqxp.ts +++ b/web-admin/src/router/modules/sqxp.ts @@ -60,7 +60,7 @@ export const sqxpAdminRoutes: AppRouteRecord[] = [ }, // ═══════════════════════════════════════════════════════════════════════════ // 1. 市场 (menu:market) - // 二级菜单:存储服务、科研捐赠、市场基础信息、中试服务、基础实验、器械销售 + // 二级菜单:存储服务、科研捐赠、市场基础信息、基础实验、器械销售 // (主推存储/捐赠在前;中试/基础实验及关联基础信息后置;器械销售在末位) // ═══════════════════════════════════════════════════════════════════════════ { @@ -553,72 +553,6 @@ export const sqxpAdminRoutes: AppRouteRecord[] = [ ] }, - // ── 中试服务 ────────────────────────────────────────────────────────── - { - id: 'PIL00000000000000000000000000001', - name: 'PilotService', - path: 'pilot-service', - component: '', - meta: { - title: '中试服务', - icon: 'ri:flask-line', - keepAlive: false, - roles: ['admin'] - }, - children: [ - { - id: '80000000000000000000000000000010', - name: 'PilotApplication', - path: 'pilot-application', - component: '/pilot-service/pilot-application/index', - meta: { - title: '中试服务申请单', - keepAlive: true, - menuCode: 'pilot-service:pilot-application:list' - }, - props: { bizType: 'pilot_service' } - }, - { - id: 'PIL00000000000000000000000000002', - name: 'PilotCheckupManagement', - path: 'checkup-management', - component: '/pilot-service/checkup-management/index', - meta: { - title: '体检管理', - keepAlive: false, - isHide: true, - menuCode: 'pilot-service:checkup-management:list' - }, - props: { bizType: 'pilot_service' } - }, - { - id: 'PIL00000000000000000000000000003', - name: 'PilotInfusionSchedule', - path: 'infusion-schedule-management', - component: '/pilot-service/infusion-schedule-management/index', - meta: { - title: '输注计划管理', - keepAlive: false, - isHide: true, - menuCode: 'pilot-service:infusion-schedule-management:list' - }, - props: { bizType: 'pilot_service' } - }, - { - id: 'PIL00000000000000000000000000004', - name: 'PilotOutboundRelease', - path: 'outbound-release-review', - component: '/pilot-service/outbound-release-review/index', - meta: { - title: '出库放行审核', - keepAlive: true, - menuCode: 'pilot-service:outbound-release-review:list' - }, - props: { bizType: 'pilot_service' } - } - ] - }, - // ── 基础实验 ────────────────────────────────────────────────────────── { id: 'BEX00000000000000000000000000001',