mz/video-gen
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改后台菜单逻辑，默认显示用户全部可见菜单

Browse Source
This commit is contained in:
root
2026-06-26 09:09:33 +08:00
parent 9f8aca5f0d
commit 4efb360b93
4 changed files with 80 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
video-gen-api/app/api/v1/menu_configs.py
+28 -1
View File
@@ -25,7 +25,34 @@ async def public_list_menu_configs(
)
.order_by(MenuConfig.sort_order)
)
menus = result.scalars().all()
all_menus = result.scalars().all()
# Filter menus based on user permissions
# If user has allowed_menus set, show only those menus
# Otherwise, show all default menus (is_default=True)
user_allowed_paths = set(current_user.allowed_menus or [])
if user_allowed_paths:
# User has explicit menu permissions - show only allowed menus
allowed_ids = set()
for menu in all_menus:
if menu.path in user_allowed_paths:
allowed_ids.add(menu.id)
if menu.parent_id:
allowed_ids.add(menu.parent_id)
menus = [m for m in all_menus if m.id in allowed_ids]
else:
# No explicit permissions - show default menus
default_ids = set()
for menu in all_menus:
if menu.is_default:
default_ids.add(menu.id)
if menu.parent_id:
default_ids.add(menu.parent_id)
menus = [m for m in all_menus if m.id in default_ids]
return [
{
"id": m.id, "label": m.label, "path": m.path, "icon": m.icon,
video-gen-app/dist/assets/index-C1Aswo8N.js → video-gen-app/dist/assets/index-CV-32V7M.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
video-gen-app/dist/index.html
Vendored
+36 -36
View File
@@ -1,37 +1,37 @@
<!doctype html>
<html lang="zh-CN">
<head>
<meta charset="UTF-8" />
<link rel="icon" type="image/svg+xml" href="/favicon.svg" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<link rel="preconnect" href="https://fonts.googleapis.com" />
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
<link href="https://fonts.googleapis.com/css2?family=Outfit:wght@300;400;500;600;700&display=swap" rel="stylesheet" />
<title>民众智创</title>
<script>
(function() {
var cached = localStorage.getItem('siteInfo');
if (cached) {
try {
var info = JSON.parse(cached);
if (info.siteName) {
document.title = info.siteName;
}
if (info.siteLogo) {
var link = document.querySelector('link[rel="icon"]');
if (link) {
link.href = info.siteLogo;
link.type = 'image/png';
}
}
} catch (e) {}
}
})();
</script>
<script type="module" crossorigin src="/assets/index-C1Aswo8N.js"></script>
<!doctype html>
<html lang="zh-CN">
<head>
<meta charset="UTF-8" />
<link rel="icon" type="image/svg+xml" href="/favicon.svg" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<link rel="preconnect" href="https://fonts.googleapis.com" />
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
<link href="https://fonts.googleapis.com/css2?family=Outfit:wght@300;400;500;600;700&display=swap" rel="stylesheet" />
<title>民众智创</title>
<script>
(function() {
var cached = localStorage.getItem('siteInfo');
if (cached) {
try {
var info = JSON.parse(cached);
if (info.siteName) {
document.title = info.siteName;
}
if (info.siteLogo) {
var link = document.querySelector('link[rel="icon"]');
if (link) {
link.href = info.siteLogo;
link.type = 'image/png';
}
}
} catch (e) {}
}
})();
</script>
<script type="module" crossorigin src="/assets/index-CV-32V7M.js"></script>
<link rel="stylesheet" crossorigin href="/assets/index-eLRg4pQk.css">
</head>
<body>
<div id="root"></div>␍
</body>
</html>
</head>
<body>
<div id="root"></div>
</body>
</html>
video-gen-app/src/components/Layout/AppLayout.tsx
+15 -3
View File
@@ -485,8 +485,16 @@ const AppLayout: React.FC = () => {
};
// Render groups with children
groups.sort((a, b) => (a.sortOrder ?? 0) - (b.sortOrder ?? 0)).forEach(g => {
const children = (childMap[g.id] || []).sort((a, b) => (a.sortOrder ?? 0) - (b.sortOrder ?? 0));
groups.sort((a, b) => {
const orderA = a.sortOrder !== undefined ? a.sortOrder : Infinity;
const orderB = b.sortOrder !== undefined ? b.sortOrder : Infinity;
return orderA - orderB;
}).forEach(g => {
const children = (childMap[g.id] || []).sort((a, b) => {
const orderA = a.sortOrder !== undefined ? a.sortOrder : Infinity;
const orderB = b.sortOrder !== undefined ? b.sortOrder : Infinity;
return orderA - orderB;
});
items.push(
<div key={g.id}>
<div style={{
@@ -501,7 +509,11 @@ const AppLayout: React.FC = () => {
});
// Render top-level pages
topLevel.sort((a, b) => (a.sortOrder ?? 0) - (b.sortOrder ?? 0)).forEach(m => {
topLevel.sort((a, b) => {
const orderA = a.sortOrder !== undefined ? a.sortOrder : Infinity;
const orderB = b.sortOrder !== undefined ? b.sortOrder : Infinity;
return orderA - orderB;
}).forEach(m => {
items.push(renderMenuItem(m));
});