From 554ba9ef74453b60ebf5ab79456acdbc42479d19 Mon Sep 17 00:00:00 2001 From: wizardchen Date: Sun, 24 May 2026 22:07:50 +0800 Subject: [PATCH] feat(settings): refactor system settings management and UI enhancements - Consolidated global system settings into the standard Settings modal, improving accessibility and user experience. - Updated routing to redirect system settings to the new modal structure, ensuring a seamless transition for users. - Enhanced UI components for better responsiveness and visual clarity, including adjustments to layout and styling. - Added visibility controls for system admin-specific settings, ensuring proper access management. - Refactored related comments and documentation for improved clarity on the new settings structure. --- frontend/src/components/UserMenu.vue | 16 ++-- frontend/src/router/index.ts | 10 +-- frontend/src/views/settings/Settings.vue | 45 ++++++++++- frontend/src/views/system/SystemLayout.vue | 8 +- frontend/src/views/system/SystemSettings.vue | 84 +++++++++++--------- 5 files changed, 104 insertions(+), 59 deletions(-) diff --git a/frontend/src/components/UserMenu.vue b/frontend/src/components/UserMenu.vue index ea9e3b6e..9fd204b5 100644 --- a/frontend/src/components/UserMenu.vue +++ b/frontend/src/components/UserMenu.vue @@ -116,11 +116,7 @@ including tenant Owners. Real authorisation lives server-side (RequireSystemAdmin middleware); this is UI gating only. --> -
+
系统管理
@@ -357,13 +353,13 @@ const handleSettings = () => { router.push('/platform/settings') } -// Open the platform-wide system administration area. Mirrors the -// existing handleSettings flow: dismiss the menu, then route. There is -// no UI store flag for system-admin (settings.vue uses one for its -// modal-overlay pattern; system area is a regular routed page). +// Open platform-wide settings inside the standard Settings modal. +// Administrator-table workflows still live under /platform/system/admins, +// but global tunables belong with the rest of the configuration surface. const handleSystemAdmin = () => { menuVisible.value = false - router.push('/platform/system') + uiStore.openSettings('system-global') + router.push({ path: '/platform/settings', query: { section: 'system-global' } }) } // Hover-driven submenu controls. A small hide delay tolerates the pointer diff --git a/frontend/src/router/index.ts b/frontend/src/router/index.ts index 98984732..3e49ff16 100644 --- a/frontend/src/router/index.ts +++ b/frontend/src/router/index.ts @@ -148,15 +148,15 @@ const router = createRouter({ path: "system", component: () => import("../views/system/SystemLayout.vue"), meta: { requiresInit: true, requiresAuth: true, requiresSystemAdmin: true }, - redirect: "/platform/system/settings", + redirect: "/platform/system/admins", children: [ { - // P1 default landing page — the SystemAdmin lands here - // because most platform-level operations involve tweaking - // a setting, not promoting another admin. + // Kept as a compatibility URL. Global settings now live in + // the standard settings modal rather than a standalone + // routed page. path: "settings", name: "systemSettings", - component: () => import("../views/system/SystemSettings.vue"), + redirect: { path: "/platform/settings", query: { section: "system-global" } }, meta: { requiresInit: true, requiresAuth: true, requiresSystemAdmin: true } }, { diff --git a/frontend/src/views/settings/Settings.vue b/frontend/src/views/settings/Settings.vue index fed5efbf..43267e61 100644 --- a/frontend/src/views/settings/Settings.vue +++ b/frontend/src/views/settings/Settings.vue @@ -68,7 +68,13 @@
-
+
@@ -130,6 +136,11 @@
+ +
+ +
+ @@ -187,6 +198,7 @@ import ParserEngineSettings from './ParserEngineSettings.vue' import StorageEngineSettings from './StorageEngineSettings.vue' import WeKnoraCloudSettings from './WeKnoraCloudSettings.vue' import TenantMembers from './TenantMembers.vue' +import SystemSettings from '@/views/system/SystemSettings.vue' const route = useRoute() const router = useRouter() @@ -244,7 +256,12 @@ const SECTION_MIN_ROLE: Record = { api: 'owner', } +const SYSTEM_ADMIN_SECTIONS = new Set(['system-global']) + const canSeeSection = (key: string): boolean => { + if (SYSTEM_ADMIN_SECTIONS.has(key)) { + return authStore.isSystemAdmin + } const min = SECTION_MIN_ROLE[key] ?? 'viewer' // canAccessAllTenants（superuser）和路由层一样必须 bypass，否则 cross-tenant // 管理员看不到自己有权操作的入口（参考 TenantMembers.vue 的 canManage）。 @@ -268,6 +285,7 @@ const navItems = computed(() => { { key: 'storage', icon: 'cloud', label: t('settings.storageEngine') }, { key: 'mcp', icon: 'tools', label: t('settings.mcpService') }, { key: 'system', icon: 'info-circle', label: t('settings.systemSettings') }, + { key: 'system-global', icon: 'server', label: '全局设置' }, { key: 'userprofile', icon: 'user', label: t('userProfile.title') }, { key: 'tenant', icon: 'user-circle', label: t('settings.tenantInfo') }, { key: 'members', icon: 'usergroup', label: t('tenantMember.title') }, @@ -310,7 +328,7 @@ const navGroups = computed(() => { { key: 'platform', label: t('settings.navGroups.platform'), - items: pickItems(['chathistory', 'system', 'api']), + items: pickItems(['chathistory', 'system-global', 'system', 'api']), }, ].filter((group) => group.items.length > 0) }) @@ -358,7 +376,11 @@ const handleClose = () => { uiStore.closeSettings() // 如果当前路由是设置页，返回上一页 if (route.path === '/platform/settings') { - router.back() + if (route.query.section === 'system-global') { + router.push('/platform/knowledge-bases') + } else { + router.back() + } } } @@ -386,6 +408,16 @@ watch(() => uiStore.settingsInitialSection, (section) => { } }, { immediate: true }) +watch( + () => [visible.value, route.query.section], + ([isVisible, section]) => { + if (!isVisible || typeof section !== 'string') return + currentSection.value = section + currentSubSection.value = '' + }, + { immediate: true }, +) + // 切换租户后角色可能变化，原本可见的 admin-only 面板可能消失。 // 如果 currentSection 落到了不再显示的 key 上，就回退到第一个可见项。 watch(navItems, (items) => { @@ -646,6 +678,13 @@ onUnmounted(() => { padding: 32px 36px 40px; box-sizing: border-box; } + + &--full { + max-width: none; + width: 100%; + padding: 30px 34px 40px; + box-sizing: border-box; + } } .section { diff --git a/frontend/src/views/system/SystemLayout.vue b/frontend/src/views/system/SystemLayout.vue index 751688d4..5b135a9d 100644 --- a/frontend/src/views/system/SystemLayout.vue +++ b/frontend/src/views/system/SystemLayout.vue @@ -5,10 +5,9 @@ router; reaching this component means the caller is an authenticated SystemAdmin. - Sidebar is intentionally simple for the P0 milestone: only the - "Administrators" page is wired. Future P1+ pages (global settings, - built-in models, audit log, tenants overview) plug in here as new - sidebar items + child routes. + Sidebar is intentionally simple: global system settings live inside + the standard Settings modal, while this routed area keeps workflows + that need a table-oriented management surface. -->
- +
@@ -350,7 +346,7 @@ onMounted(() => {