diff --git a/backend/blueprints/main.py b/backend/blueprints/main.py index 3f69361a..2bc6769f 100644 --- a/backend/blueprints/main.py +++ b/backend/blueprints/main.py @@ -2,7 +2,7 @@ 主页面蓝图：首页、管理后台页、静态文件 """ import os -from flask import Blueprint, redirect, url_for, send_file, session +from flask import Blueprint, current_app, redirect, url_for, send_file, session from werkzeug.utils import safe_join from utils.auth import login_required, is_session_user_valid @@ -24,7 +24,25 @@ def index(): @main.route('/admin') @login_required def admin_page(): - return render_html('admin.html') + """管理后台页：服务端直接渲染当前用户有权限的菜单，避免客户端二次渲染造成闪烁。""" + context = {} + try: + # 复用权限菜单加载逻辑；Java 权限接口不可用时降级为无菜单（JS 侧会走 API 兜底） + from blueprints.admin_api import _load_current_backend_menu_items + _, _, items, denied = _load_current_backend_menu_items() + if denied is None and items: + context['admin_menu_items'] = items + context['admin_menu_rendered'] = True + else: + # 权限接口失败：真实页面同样会失败，服务端不渲染菜单，避免展示越权菜单 + context['admin_menu_rendered'] = False + current_app.logger.warning('[admin] 服务端菜单渲染失败，降级为客户端加载: %s', + (denied[0].get_json() if denied and len(denied) > 0 else None)) + except Exception as exc: + # 兜底：任何异常都不得阻断管理页打开，JS 会自行请求菜单接口 + current_app.logger.exception('[admin] 服务端渲染菜单异常: %s', exc) + context['admin_menu_rendered'] = False + return render_html('admin.html', **context) @main.route('/static/') diff --git a/backend/static/admin.js b/backend/static/admin.js index 8de1a3d8..7d92af73 100644 --- a/backend/static/admin.js +++ b/backend/static/admin.js @@ -268,8 +268,43 @@ group.style.display = visible ? '' : 'none'; }); } + function bindAdminMenuTabs(serverRendered) { + adminMenuByRoute = {}; + var routes = []; + adminMenuEl.querySelectorAll('#adminMenu .tab').forEach(function (tab) { + var route = tab.dataset.tab; + if (!route) return; + routes.push(route); + if (!adminMenuByRoute[route]) { + adminMenuByRoute[route] = { route_path: route, name: tab.getAttribute('title') || route }; + } + tab.onclick = function () { + activateAdminTab(tab.dataset.tab); + }; + }); + return routes; + } function loadAdminMenus(preferredTab) { if (preferredTab) activeAdminTabName = preferredTab; + // 服务端已按权限渲染菜单（data-server-rendered=true）：直接绑定事件并激活， + // 不再请求接口重渲染，避免"全量菜单→折叠"的闪烁。 + if (!adminMenuEl || adminMenuEl.getAttribute('data-server-rendered') !== 'true') { + renderAdminTabsFromApi(); + return; + } + var serverRoutes = bindAdminMenuTabs(true); + if (!serverRoutes.length) { + activeAdminTabName = ''; + hideAllAdminPanels(); + return; + } + if (window.__initAdminMenuCollapse) window.__initAdminMenuCollapse(); + var fallbackTab = activeAdminTabName && serverRoutes.indexOf(activeAdminTabName) >= 0 + ? activeAdminTabName + : serverRoutes[0]; + activateAdminTab(fallbackTab); + } + function renderAdminTabsFromApi() { fetch('/api/admin/current-user/menus') .then(function (r) { return r.json(); }) .then(function (res) { diff --git a/backend/web_source/admin.html b/backend/web_source/admin.html index 1ae0489d..619ecf02 100644 --- a/backend/web_source/admin.html +++ b/backend/web_source/admin.html @@ -4756,56 +4756,60 @@ 电商运营管理后台 -