-
- 产品分类列表
-
-
-
- {loading ? (
-
- 加载中...
-
- ) : categories.length === 0 ? (
-
- 暂无分类，点击右上角添加
-
- ) : (
-
- {categories.map((category) => (
-
-
-
= {
+ SUPER_ADMIN: '超级管理员',
+ ADMIN: '管理员',
+}
+
// ============ 主组件 ============
export default function ThemeManagementClient() {
- const router = useRouter()
const toast = useToast()
- const { user } = useAuthStore()
+ const { user } = useAuth()
+ const canManageThemes = user?.role === 'SUPER_ADMIN'
// 状态
const [themes, setThemes] = useState([])
- const [loading, setLoading] = useState(true)
+ const [loading, setLoading] = useState(false)
const [isModalOpen, setIsModalOpen] = useState(false)
const [editingTheme, setEditingTheme] = useState(null)
const [formData, setFormData] = useState(initialFormData)
const [submitting, setSubmitting] = useState(false)
- // 权限检查
- useEffect(() => {
- if (user && user.role !== 'SUPER_ADMIN') {
- toast.error('只有超级管理员可以访问此页面')
- router.push('/')
- }
- }, [user, router, toast])
-
const fetchThemes = useCallback(async () => {
try {
setLoading(true)
@@ -94,8 +97,10 @@ export default function ThemeManagementClient() {
// 加载主题列表
useEffect(() => {
- fetchThemes()
- }, [fetchThemes])
+ if (canManageThemes) {
+ fetchThemes()
+ }
+ }, [canManageThemes, fetchThemes])
// 打开创建/编辑模态框
const openModal = async (themeId?: string) => {
@@ -246,133 +251,155 @@ export default function ThemeManagementClient() {
// ============ 渲染 ============
- if (user?.role !== 'SUPER_ADMIN') {
- return null
+ if (!canManageThemes) {
+ return (
+
+
+
+
+ }
+ inspector={
+
+
+
{/* 添加/编辑弹窗 */}
+
+ category.productCount > 0).length}`} />
+
+
+ }
+ inspector={
+
+
+ sum + category.productCount, 0)}`} />
+ category.productCount === 0).length}`} />
+
+
+
+
+ }
+ >
+
+
+
+
+
+ 产品分类
+
+
+ {loading ? (
+
+ )}
+
+ 加载中...
+ ) : categories.length === 0 ? (
+ 暂无分类，点击右上角添加
+ ) : (
+
+ {categories.map((category) => (
+
- )}
-
-
+ ))}
+
+
- ))}
-
{category.icon || category.name.charAt(0)}
-
-
- {category.name}
-
- {category.description && (
-
- {category.description}
-
- )}
+
- {category.productCount} 个产品
-
-
-
+
+ {category.name}
+ {category.description ?{category.description}
: null} +
+
+ {category.productCount} 个产品
+
+
+
+
+
-
-
-
-
-
-
+
确定要删除分类 "{deletingCategory?.name}" 吗？
{deletingCategory && deletingCategory.productCount > 0 && (
@@ -381,6 +377,6 @@ export default function CategoriesPage() {
+
)
}
diff --git a/furniture-3d-system/src/app/admin/page.tsx b/furniture-3d-system/src/app/admin/page.tsx
index 1e7a1eba..146bd3df 100644
--- a/furniture-3d-system/src/app/admin/page.tsx
+++ b/furniture-3d-system/src/app/admin/page.tsx
@@ -1,60 +1,10 @@
-import Link from 'next/link'
import { cookies } from 'next/headers'
import { redirect } from 'next/navigation'
-import {
- Users, Palette, SwatchBook, Grid, ArrowLeft, ArrowRight,
- ShieldCheck, Activity, Database, Zap, Clock,
- Cpu, Terminal, ShieldAlert, BarChart3
-} from 'lucide-react'
-import { cn } from '@/lib/utils'
import { verifyToken } from '@/lib/jwt'
-import Button from '@/components/ui/Button'
-
-const adminModules = [
- {
- title: '用户权限中心',
- subtitle: 'IDENTITY & ACCESS',
- description: '管理系统访问权限、组织架构及账号生命周期，确保数据访问的安全合规。',
- href: '/users',
- icon: Users,
- color: 'text-blue-600',
- bgColor: 'bg-blue-50',
- stats: '1,248 Users Active',
- },
- {
- title: '主题视觉管理',
- subtitle: 'THEME ENGINE',
- description: '配置系统全局视觉变量、品牌色、间距及 UI 调性，实现动态化品牌表达。',
- href: '/admin/themes',
- icon: Palette,
- color: 'text-indigo-600',
- bgColor: 'bg-indigo-50',
- stats: '12 Active Themes',
- },
- {
- title: '材质物理库',
- subtitle: 'PHYSICAL MATERIALS',
- description: '维护 3D 渲染核心材质球、PBR 物理参数及纹理资产，打造极致视觉还原。',
- href: '/admin/materials',
- icon: SwatchBook,
- color: 'text-emerald-600',
- bgColor: 'bg-emerald-50',
- stats: '450+ Materials',
- },
- {
- title: '分类体系定义',
- subtitle: 'TAXONOMY SYSTEM',
- description: '定义产品资产的标准化层级、标签规则与归类逻辑，支撑多维检索需求。',
- href: '/admin/categories',
- icon: Grid,
- color: 'text-amber-600',
- bgColor: 'bg-amber-50',
- stats: '32 Categories',
- },
-]
+import { AdminPortalClient } from './AdminPortalClient'
export const metadata = {
- title: '系统总控制台 | Precision Atelier',
+ title: '系统总控制台 | White Obsidian Atelier',
}
export default async function AdminPortalPage() {
@@ -68,192 +18,5 @@ export default async function AdminPortalPage() {
const allowedRoles = ['SUPER_ADMIN', 'ADMIN']
if (!allowedRoles.includes(payload.role)) redirect('/?error=unauthorized')
- return (
-
- {/* 沉浸式背景背景 */}
-
- {/* Header Section */}
-
-
-
-
-
- )
-}
-
-function QuickMetric({ icon: Icon, label, value, color }: { icon: any, label: string, value: string, color?: string }) {
- return (
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Precision Master Console
-
-
-
- - 系统总控制台 -
-- 集成式基础设施管理中心 · 实时监控系统运行状态与核心资产分发 -
-
-
-
- {/* Left: Core Modules (8 Columns) */}
-
-
-
-
-
-
- {/* Right: System Health & Logs (4 Columns) */}
-
- {adminModules.map((module, idx) => (
-
-
-
-
-
-
-
-
-
-
-
- {module.subtitle}
-
-
-
- {/* Footer Stats inside card */}
- - {module.title} -
-- {module.description} -
-
- {module.stats}
- ENTER CENTER
-
-
-
- {module.href.split('/').pop()}
-
-
- ))}
-
-
-
-
-
-
-
-
- System Health
-
-
-
-
-
-
-
-
- 安全提示
- 发现 2 个未挂载的材质分区
-
-
-
-
-
- Live Logs
-
-
-
-
- )
-}
-
-function HealthBar({ label, progress, color = "bg-emerald-500" }: { label: string, progress: number, color?: string }) {
- return (
-
-
-
- {label}
- {value}
-
-
-
- )
-}
-
-function LogItem({ time, user, action }: { time: string, user: string, action: string }) {
- return (
-
- {label}
- {progress}%
-
-
-
-
-
- {time}
-
- )
+ return
- {user}
- {action}
-
-
+
+
+
+ }
+ >
+
+
+
+
+
+ )
}
return (
-
+
+ 当前账号不能管理主题
+请使用超级管理员账号操作主题。
+
- {/* 顶部导航 */}
-
-
-
+ openModal()} className="obsidian-control-action rounded-md border">
+
+ {title || eyebrow ? (
+
+ {eyebrow ? (
+
+ ) : null}
+ {children}
+
+ )
+}
+
+export function ObsidianInspectorSection({
+ title,
+ children,
+}: {
+ title: string
+ children: ReactNode
+}) {
+ return (
+
+
+ )
+}
+
+export function ObsidianDataRow({
+ label,
+ value,
+ tone = 'default',
+}: {
+ label: string
+ value: ReactNode
+ tone?: 'default' | 'success' | 'warning'
+}) {
+ return (
+
+
+ theme.isActive).length}`} />
+ theme.isDefault).length}`} />
+
+
+ }
+ inspector={
+
+
+ theme.isActive).length}`} tone="success" />
+ theme.isDefault).length}`} />
+
+
+
+
+ }
+ >
+
+
+
- {/* 主内容 */}
-
- {loading ? (
-
-
- ) : (
- = {
+ SUPER_ADMIN: '超级管理员',
+ ADMIN: '管理员',
+ SUPERVISOR: '主管',
+ SUPERVISOR_DEPARTMENT: '部门主管',
+ SUPERVISOR_TEAM: '小组主管',
+ DESIGNER: '设计师',
+ USER: '普通用户',
+}
+
+const statusLabels: Record = {
+ ACTIVE: '运行中',
+ PENDING: '待激活',
+ INACTIVE: '已离职',
+ SUSPENDED: '已锁定',
+}
export default function UsersPage() {
return (
@@ -54,283 +78,259 @@ export default function UsersPage() {
- );
+ )
}
function UsersPageContent() {
- const { user: currentUser } = useAuth();
- const [searchQuery, setSearchQuery] = useState('');
- const [roleFilter, setRoleFilter] = useState('');
- const [statusFilter, setStatusFilter] = useState('');
- const [refreshToken, setRefreshToken] = useState(0);
- const [showCreateModal, setShowCreateModal] = useState(false);
- const [selectedUser, setSelectedUser] = useState(null);
- const [activationUser, setActivationUser] = useState(null);
- const [handoverUser, setHandoverUser] = useState(null);
- const [actionError, setActionError] = useState(null);
+ const { user: currentUser } = useAuth()
+ const [searchQuery, setSearchQuery] = useState('')
+ const [roleFilter, setRoleFilter] = useState('')
+ const [statusFilter, setStatusFilter] = useState('')
+ const [refreshToken, setRefreshToken] = useState(0)
+ const [showCreateModal, setShowCreateModal] = useState(false)
+ const [selectedUser, setSelectedUser] = useState(null)
+ const [editingUser, setEditingUser] = useState(null)
+ const [activationUser, setActivationUser] = useState(null)
+ const [handoverUser, setHandoverUser] = useState(null)
+ const [actionError, setActionError] = useState(null)
- const debouncedSearchQuery = useDebounce(searchQuery, 300);
+ const debouncedSearchQuery = useDebounce(searchQuery, 300)
const assignableRoles = useMemo(
() => (currentUser ? (getAssignableRolesForRole(currentUser.role) as Role[]) : []),
- [currentUser]
- );
+ [currentUser],
+ )
const canEditManagedUser = useCallback(
(user: UserTreeItem) => {
- if (!currentUser) return false;
- if (user.id === currentUser.id) return true;
- if (currentUser.role === 'SUPER_ADMIN') return true;
- return canAssignRoleByHierarchy(currentUser.role, user.role as Role);
+ if (!currentUser) return false
+ if (user.id === currentUser.id) return true
+ if (currentUser.role === 'SUPER_ADMIN') return true
+ return canAssignRoleByHierarchy(currentUser.role, user.role as Role)
},
- [currentUser]
- );
+ [currentUser],
+ )
const canActivatePendingUser = useCallback(
(user: UserTreeItem) => {
- if (!currentUser) return false;
- if (user.id === currentUser.id) return false;
- if (!['SUPERVISOR', 'ADMIN', 'SUPER_ADMIN'].includes(currentUser.role)) return false;
- if (currentUser.role === 'SUPER_ADMIN') return true;
- return canAssignRoleByHierarchy(currentUser.role, user.role as Role);
+ if (!currentUser) return false
+ if (user.id === currentUser.id) return false
+ if (!['SUPERVISOR', 'ADMIN', 'SUPER_ADMIN'].includes(currentUser.role)) return false
+ if (currentUser.role === 'SUPER_ADMIN') return true
+ return canAssignRoleByHierarchy(currentUser.role, user.role as Role)
},
- [currentUser]
- );
+ [currentUser],
+ )
const triggerRefresh = useCallback(() => {
- setRefreshToken((current) => current + 1);
- }, []);
+ setRefreshToken((current) => current + 1)
+ }, [])
- const closeCreateModal = useCallback(() => setShowCreateModal(false), []);
- const closeEditModal = useCallback(() => setSelectedUser(null), []);
- const closeActivateModal = useCallback(() => setActivationUser(null), []);
- const closeHandoverModal = useCallback(() => setHandoverUser(null), []);
+ const closeCreateModal = useCallback(() => setShowCreateModal(false), [])
+ const closeEditModal = useCallback(() => setEditingUser(null), [])
+ const closeActivateModal = useCallback(() => setActivationUser(null), [])
+ const closeHandoverModal = useCallback(() => setHandoverUser(null), [])
const handleCreateSuccess = useCallback(() => {
- closeCreateModal();
- triggerRefresh();
- }, [closeCreateModal, triggerRefresh]);
+ closeCreateModal()
+ triggerRefresh()
+ }, [closeCreateModal, triggerRefresh])
const handleEditSuccess = useCallback(() => {
- closeEditModal();
- triggerRefresh();
- }, [closeEditModal, triggerRefresh]);
+ closeEditModal()
+ triggerRefresh()
+ }, [closeEditModal, triggerRefresh])
const handleActivateSuccess = useCallback(() => {
- closeActivateModal();
- triggerRefresh();
- }, [closeActivateModal, triggerRefresh]);
+ closeActivateModal()
+ triggerRefresh()
+ }, [closeActivateModal, triggerRefresh])
const handleHandoverSuccess = useCallback(() => {
- closeHandoverModal();
- triggerRefresh();
- }, [closeHandoverModal, triggerRefresh]);
+ closeHandoverModal()
+ triggerRefresh()
+ }, [closeHandoverModal, triggerRefresh])
- const handleEditUser = useCallback((user: UserTreeItem) => {
- if (!canEditManagedUser(user)) {
- setActionError('当前账号不能编辑同级或更高权限用户');
- return;
- }
- setActionError(null);
- setSelectedUser(user);
- }, [canEditManagedUser]);
-
- const handleDeleteUser = useCallback(async (userId: string) => {
- try {
- setActionError(null);
- if (!window.confirm('确定要移除此访问权限吗？此操作不可撤销。')) return;
- const response = await fetch(`/api/users/${userId}`, { method: 'DELETE', credentials: 'include' });
- if (!response.ok) throw new Error('删除用户失败');
- triggerRefresh();
- } catch (error) {
- setActionError(error instanceof Error ? error.message : '删除失败');
- }
- }, [triggerRefresh]);
-
- const handleActivateUser = useCallback((user: UserTreeItem) => {
- if (!canActivatePendingUser(user)) {
- setActionError('当前账号不能激活该用户');
- return;
- }
- setActionError(null);
- setActivationUser(user);
- }, [canActivatePendingUser]);
-
- const selectedUserAllowedRoles = useMemo(
- () => {
- if (!selectedUser || !currentUser) return [];
- if (selectedUser.id === currentUser.id) {
- return [selectedUser.role as Role];
+ const handleEditUser = useCallback(
+ (user: UserTreeItem) => {
+ if (!canEditManagedUser(user)) {
+ setActionError('当前账号不能编辑同级或更高权限用户')
+ return
}
- return assignableRoles;
+ setActionError(null)
+ setSelectedUser(user)
+ setEditingUser(user)
},
- [assignableRoles, currentUser, selectedUser]
- );
+ [canEditManagedUser],
+ )
+
+ const handleSelectUser = useCallback((user: UserTreeItem) => {
+ setActionError(null)
+ setSelectedUser(user)
+ }, [])
+
+ const handleDeleteUser = useCallback(
+ async (userId: string) => {
+ try {
+ setActionError(null)
+ if (!window.confirm('确定要移除此访问权限吗？此操作不可撤销。')) return
+ const response = await fetch(`/api/users/${userId}`, { method: 'DELETE', credentials: 'include' })
+ if (!response.ok) throw new Error('删除用户失败')
+ if (selectedUser?.id === userId) setSelectedUser(null)
+ if (editingUser?.id === userId) setEditingUser(null)
+ triggerRefresh()
+ } catch (error) {
+ setActionError(error instanceof Error ? error.message : '删除失败')
+ }
+ },
+ [editingUser?.id, selectedUser?.id, triggerRefresh],
+ )
+
+ const handleActivateUser = useCallback(
+ (user: UserTreeItem) => {
+ if (!canActivatePendingUser(user)) {
+ setActionError('当前账号不能激活该用户')
+ return
+ }
+ setActionError(null)
+ setActivationUser(user)
+ },
+ [canActivatePendingUser],
+ )
+
+ const selectedUserAllowedRoles = useMemo(() => {
+ if (!editingUser || !currentUser) return []
+ if (editingUser.id === currentUser.id) {
+ return [editingUser.role as Role]
+ }
+ return assignableRoles
+ }, [assignableRoles, currentUser, editingUser])
return (
-
diff --git a/furniture-3d-system/src/components/platform/ObsidianControlShell.tsx b/furniture-3d-system/src/components/platform/ObsidianControlShell.tsx
new file mode 100644
index 00000000..a7492c90
--- /dev/null
+++ b/furniture-3d-system/src/components/platform/ObsidianControlShell.tsx
@@ -0,0 +1,242 @@
+'use client'
+
+import Link from 'next/link'
+import type { ComponentType, ReactNode } from 'react'
+import { ArrowLeft } from 'lucide-react'
+import { cn } from '@/lib/utils'
+
+interface ObsidianControlShellProps {
+ eyebrow: string
+ title: string
+ description?: string
+ backHref?: string
+ backLabel?: string
+ icon?: ComponentType<{ className?: string }>
+ actions?: ReactNode
+ rail?: ReactNode
+ children: ReactNode
+ inspector?: ReactNode
+ statusBar?: ReactNode
+ className?: string
+ contentClassName?: string
+ inspectorClassName?: string
+}
+
+export function ObsidianControlShell({
+ eyebrow,
+ title,
+ backHref,
+ backLabel = '返回',
+ icon: Icon,
+ actions,
+ rail,
+ children,
+ inspector,
+ className,
+ contentClassName,
+ inspectorClassName,
+}: ObsidianControlShellProps) {
+ return (
+ 主题配置
+
-
- ) : themes.length === 0 ? (
- 加载中...
- 暂无主题配置
- -
- {themes.map((theme) => (
-
-
-
+
diff --git a/furniture-3d-system/src/app/users/page.tsx b/furniture-3d-system/src/app/users/page.tsx
index 4f66aad5..229bf40f 100644
--- a/furniture-3d-system/src/app/users/page.tsx
+++ b/furniture-3d-system/src/app/users/page.tsx
@@ -1,49 +1,73 @@
-'use client';
+'use client'
-/**
- * 身份控制中心 (Identity Control Center)
- * Precision Atelier - 三栏式管理工作台重构版
- */
-
-import { useCallback, useState, useMemo } from 'react';
-import type { Role } from '@prisma/client';
-import type { LucideIcon } from 'lucide-react';
-import {
- Search, ShieldCheck, UserPlus,
- Fingerprint, Mail, Phone, Briefcase, Calendar, Shield
-} from 'lucide-react';
-import { AuthProvider, useAuth } from '@/hooks/useAuth';
-import { RequireAuth } from '@/components/auth/RequireAuth';
-import { PermissionGuard } from '@/components/auth/PermissionGuard';
-import Button from '@/components/ui/Button';
-import { Select } from '@/components/ui/Select';
-import { Alert } from '@/components/ui/Alert';
-import { ActivateUserModal } from '@/components/users/ActivateUserModal';
-import { CreateUserModal } from '@/components/users/CreateUserModal';
-import { EditUserModal } from '@/components/users/EditUserModal';
-import { HandoverModal } from '@/components/users/HandoverModal';
-import { DepartmentAccessTree, type UserTreeItem } from '@/components/users/DepartmentAccessTree';
-import { PlatformSplitLayout } from '@/components/platform/PlatformSplitLayout';
-import { canAssignRoleByHierarchy, getAssignableRolesForRole } from '@/lib/role-scope';
-import { cn } from '@/lib/utils';
-import { useDebounce } from '@/hooks/usePerformance';
+import { useCallback, useMemo, useState } from 'react'
+import type { Role } from '@prisma/client'
+import type { LucideIcon } from 'lucide-react'
+import {
+ Activity,
+ Briefcase,
+ Fingerprint,
+ KeyRound,
+ Mail,
+ Phone,
+ Search,
+ ShieldCheck,
+ UserPlus,
+ Users,
+} from 'lucide-react'
+import { AuthProvider, useAuth } from '@/hooks/useAuth'
+import { RequireAuth } from '@/components/auth/RequireAuth'
+import { PermissionGuard } from '@/components/auth/PermissionGuard'
+import Button from '@/components/ui/Button'
+import { Alert } from '@/components/ui/Alert'
+import { ActivateUserModal } from '@/components/users/ActivateUserModal'
+import { CreateUserModal } from '@/components/users/CreateUserModal'
+import { EditUserModal } from '@/components/users/EditUserModal'
+import { HandoverModal } from '@/components/users/HandoverModal'
+import { DepartmentAccessTree, type UserTreeItem } from '@/components/users/DepartmentAccessTree'
+import {
+ ObsidianControlShell,
+ ObsidianDataRow,
+ ObsidianInspectorSection,
+ ObsidianRailButton,
+ ObsidianRailGroup,
+} from '@/components/platform/ObsidianControlShell'
+import { canAssignRoleByHierarchy, getAssignableRolesForRole } from '@/lib/role-scope'
+import { useDebounce } from '@/hooks/usePerformance'
const ROLE_OPTIONS = [
- { value: '', label: '所有权限角色' },
- { value: 'SUPER_ADMIN', label: '超级管理员' },
- { value: 'ADMIN', label: '管理员' },
- { value: 'SUPERVISOR', label: '主管' },
- { value: 'DESIGNER', label: '设计师' },
- { value: 'USER', label: '普通用户' },
-];
+ { value: '', label: '所有权限角色', icon: Users },
+ { value: 'SUPER_ADMIN', label: '超级管理员', icon: KeyRound },
+ { value: 'ADMIN', label: '管理员', icon: ShieldCheck },
+ { value: 'SUPERVISOR', label: '主管', icon: Briefcase },
+ { value: 'DESIGNER', label: '设计师', icon: Fingerprint },
+ { value: 'USER', label: '普通用户', icon: Users },
+] as const
const STATUS_OPTIONS = [
{ value: '', label: '全状态' },
- { value: 'ACTIVE', label: '运行中 / ACTIVE' },
- { value: 'PENDING', label: '待激活 / PENDING' },
- { value: 'INACTIVE', label: '已离职 / INACTIVE' },
- { value: 'SUSPENDED', label: '已锁定 / LOCKED' },
-];
+ { value: 'ACTIVE', label: '运行中' },
+ { value: 'PENDING', label: '待激活' },
+ { value: 'INACTIVE', label: '已离职' },
+ { value: 'SUSPENDED', label: '已锁定' },
+] as const
+
+const roleLabels: Record
-
{/* 编辑模态框 */}
-
+
-
-
- )}
- {theme.isActive && (
-
-
- )}
- {theme.startDate && theme.endDate && (
-
-
+
+ )}
+
+ - {theme.name} -
- {theme.isDefault && ( -
+
+ {loading ? (
+
- )}
-
+ ))}
+ 加载中...
+ ) : themes.length === 0 ? (
+
+
+ ) : (
+ 暂无主题配置
+ +
+ {themes.map((theme) => (
+
-
- ))}
-
+
-
+
- {theme.description && (
-
+
+
+ )}
+ {theme.isActive && (
+
+
+ )}
+ {theme.startDate && theme.endDate && (
+
+
+ )}
+
+ {theme.description ? {theme.name}
+ {theme.isDefault && ( +{theme.description}
: null} + {(theme.startDate || theme.endDate) && ( ++ {theme.startDate && `开始: ${new Date(theme.startDate).toLocaleString('zh-CN')}`} + {theme.startDate && theme.endDate && ' | '} + {theme.endDate && `结束: ${new Date(theme.endDate).toLocaleString('zh-CN')}`} +
)}- {theme.description} -
- )} - {(theme.startDate || theme.endDate) && ( -- {theme.startDate && `开始: ${new Date(theme.startDate).toLocaleString('zh-CN')}`} - {theme.startDate && theme.endDate && ' | '} - {theme.endDate && `结束: ${new Date(theme.endDate).toLocaleString('zh-CN')}`} -
- )} -
-
-
- {!theme.isDefault && (
-
-
+
定时发布（可选）
@@ -421,7 +448,7 @@ export default function ThemeManagementClient() {
{/* 首页背景 */}
-
+
@@ -457,7 +484,7 @@ export default function ThemeManagementClient() {
{/* 登录页面板 */}
-
+
登录页右侧面板
@@ -488,7 +515,7 @@ export default function ThemeManagementClient() {
{/* 操作按钮 */}
-
+
@@ -498,6 +525,6 @@ export default function ThemeManagementClient() {
-
+
)
}
diff --git a/furniture-3d-system/src/app/admin/themes/page.tsx b/furniture-3d-system/src/app/admin/themes/page.tsx
index aee1d181..758734aa 100644
--- a/furniture-3d-system/src/app/admin/themes/page.tsx
+++ b/furniture-3d-system/src/app/admin/themes/page.tsx
@@ -7,13 +7,21 @@
*/
import { Metadata } from 'next'
+import { AuthProvider } from '@/hooks/useAuth'
+import { RequireAuth } from '@/components/auth/RequireAuth'
import ThemeManagementClient from './ThemeManagementClient'
export const metadata: Metadata = {
- title: '主题管理 - 3D 家具系统',
+ title: '主题视觉管理 | White Obsidian Atelier',
description: '管理系统主题和背景配置',
}
export default function ThemeManagementPage() {
- return
+
+
+
+ )
}
diff --git a/furniture-3d-system/src/app/asset-center/material-library/MaterialLibraryClient.tsx b/furniture-3d-system/src/app/asset-center/material-library/MaterialLibraryClient.tsx
index 74a02444..b4027a19 100644
--- a/furniture-3d-system/src/app/asset-center/material-library/MaterialLibraryClient.tsx
+++ b/furniture-3d-system/src/app/asset-center/material-library/MaterialLibraryClient.tsx
@@ -2,7 +2,7 @@
/**
* 基础资料库 (Material Library)
- * Obsidian Atelier - 元组件资料工作台
+ * White Obsidian Atelier - 元组件资料工作台
* 布局标准：资料索引 - 材质/基材工作台 - 实体 Inspector
*/
diff --git a/furniture-3d-system/src/app/debug-theme/page.tsx b/furniture-3d-system/src/app/debug-theme/page.tsx
index eeff1038..df7fdcc7 100644
--- a/furniture-3d-system/src/app/debug-theme/page.tsx
+++ b/furniture-3d-system/src/app/debug-theme/page.tsx
@@ -2,7 +2,6 @@
import { useEffect, useState } from 'react'
import Button from '@/components/ui/Button'
-import ThemeToggle from '@/components/ui/ThemeToggle'
export default function DebugThemePage() {
const [themeInfo, setThemeInfo] = useState({
@@ -45,12 +44,8 @@ export default function DebugThemePage() {
attributeFilter: ['data-theme', 'class'],
})
- // 监听自定义事件
- window.addEventListener('theme-change', updateInfo)
-
return () => {
observer.disconnect()
- window.removeEventListener('theme-change', updateInfo)
}
}, [])
@@ -59,9 +54,8 @@ export default function DebugThemePage() {
- 主题系统调试页面
+ 浅色主题调试页面
- 1. 打开浏览器开发者工具（F12）
2. 查看 Console 标签页，应该能看到详细的主题信息
- 3. 切换主题后，信息会自动更新
- 4. 检查 Elements 标签页，查看 <html> 标签的 data-theme 属性
+ 3. 当前系统固定为浅色主题，不再提供深浅色切换
+ 4. 检查 Elements 标签页，查看 <html> 标签的 data-theme 属性应为 light
diff --git a/furniture-3d-system/src/app/globals.css b/furniture-3d-system/src/app/globals.css
index 9834931c..a25222e7 100644
--- a/furniture-3d-system/src/app/globals.css
+++ b/furniture-3d-system/src/app/globals.css
@@ -514,8 +514,8 @@
}
}
-/* ===== Obsidian Material Library Theme Bridge =====
- 基础资料库使用黑曜石工作台结构，但必须跟随全局 light/dark 主题。 */
+/* ===== White Obsidian Material Library Theme Bridge =====
+ 基础资料库使用白曜石工作台结构；全局产品主题固定浅色。 */
@layer components {
:root,
[data-theme='light'] {
@@ -630,6 +630,288 @@
border-color: var(--ml-border) !important;
}
+ :root,
+ [data-theme='light'] {
+ --obs-shell-bg: #eef2f3;
+ --obs-shell-text: #263033;
+ --obs-shell-panel-bg: #ffffff;
+ --obs-shell-content-bg: #f4f7f7;
+ --obs-shell-header-bg: #f8faf9;
+ --obs-shell-surface-bg: #ffffff;
+ --obs-shell-muted-bg: #edf2f2;
+ --obs-shell-rail-bg: #e5ebeb;
+ --obs-shell-border: rgba(17, 23, 25, 0.12);
+ --obs-shell-title: #101719;
+ --obs-shell-muted: #5f6d70;
+ --obs-shell-subtle: #7a878a;
+ --obs-shell-hover-bg: rgba(17, 23, 25, 0.045);
+ --obs-shell-control-bg: rgba(17, 23, 25, 0.045);
+ --obs-shell-control-hover-bg: rgba(17, 23, 25, 0.08);
+ --obs-shell-control-text: #4f5c5f;
+ --obs-shell-control-hover-text: #101719;
+ --obs-shell-icon-bg: rgba(17, 23, 25, 0.06);
+ --obs-shell-icon-text: #2d393c;
+ --obs-shell-rail-title: #687477;
+ --obs-shell-rail-text: #3f4a4d;
+ --obs-shell-rail-hover-bg: rgba(17, 23, 25, 0.06);
+ --obs-shell-rail-hover-text: #101719;
+ --obs-shell-rail-active-bg: #101719;
+ --obs-shell-rail-active-text: #f7f9f9;
+ --obs-shell-status-text: #566265;
+ --obs-shell-status-muted: #6d787b;
+ --obs-shell-status-strong: #101719;
+ --obs-shell-status-pill-bg: rgba(17, 23, 25, 0.055);
+ --obs-shell-action-bg: #101719;
+ --obs-shell-action-text: #f7f9f9;
+ --obs-shell-action-border: rgba(17, 23, 25, 0.16);
+ --obs-shell-action-hover-bg: #263033;
+ --obs-shell-rail-card-bg: rgba(17, 23, 25, 0.045);
+ --obs-shell-rail-card-text: #101719;
+ --obs-shell-rail-card-muted: #687477;
+ --obs-shell-success: #1f7a56;
+ --obs-shell-warning: #9a6a16;
+ --obs-shell-danger: #b3453d;
+ }
+
+ [data-theme='dark'] {
+ --obs-shell-bg: #111719;
+ --obs-shell-text: #e8edef;
+ --obs-shell-panel-bg: #111719;
+ --obs-shell-content-bg: #0f1416;
+ --obs-shell-header-bg: #101719;
+ --obs-shell-surface-bg: #151d1f;
+ --obs-shell-muted-bg: #202a2d;
+ --obs-shell-rail-bg: #111719;
+ --obs-shell-border: rgba(255, 255, 255, 0.10);
+ --obs-shell-title: #f4f7f6;
+ --obs-shell-muted: #aeb8bb;
+ --obs-shell-subtle: #8f9a9d;
+ --obs-shell-hover-bg: rgba(255, 255, 255, 0.055);
+ --obs-shell-control-bg: rgba(255, 255, 255, 0.04);
+ --obs-shell-control-hover-bg: rgba(255, 255, 255, 0.08);
+ --obs-shell-control-text: #aeb8bb;
+ --obs-shell-control-hover-text: #ffffff;
+ --obs-shell-icon-bg: rgba(255, 255, 255, 0.06);
+ --obs-shell-icon-text: #dfe6e8;
+ --obs-shell-rail-bg: #171d1f;
+ --obs-shell-rail-title: #748083;
+ --obs-shell-rail-text: #c4cccf;
+ --obs-shell-rail-hover-bg: rgba(255, 255, 255, 0.06);
+ --obs-shell-rail-hover-text: #ffffff;
+ --obs-shell-rail-active-bg: #ffffff;
+ --obs-shell-rail-active-text: #111719;
+ --obs-shell-status-text: #aeb8bb;
+ --obs-shell-status-muted: #748083;
+ --obs-shell-status-strong: #ffffff;
+ --obs-shell-status-pill-bg: rgba(255, 255, 255, 0.04);
+ --obs-shell-action-bg: #ffffff;
+ --obs-shell-action-text: #111719;
+ --obs-shell-action-border: rgba(255, 255, 255, 0.10);
+ --obs-shell-action-hover-bg: #e8edef;
+ --obs-shell-rail-card-bg: rgba(255, 255, 255, 0.04);
+ --obs-shell-rail-card-text: #ffffff;
+ --obs-shell-rail-card-muted: #748083;
+ --obs-shell-success: #9bdcc5;
+ --obs-shell-warning: #e5bd72;
+ --obs-shell-danger: #f3a29c;
+ }
+
+ .obsidian-control-grid {
+ background-image: var(--obs-shell-grid);
+ background-size: 28px 28px;
+ opacity: var(--obs-shell-grid-opacity);
+ }
+
+ .obsidian-control-vignette {
+ background: var(--obs-shell-vignette);
+ }
+
+ .obsidian-control-action {
+ border-color: var(--obs-shell-action-border) !important;
+ background: var(--obs-shell-action-bg) !important;
+ color: var(--obs-shell-action-text) !important;
+ }
+
+ .obsidian-control-action:hover {
+ background: var(--obs-shell-action-hover-bg) !important;
+ }
+
+ .obsidian-control-rail-card {
+ border-color: var(--obs-shell-border);
+ background: var(--obs-shell-rail-card-bg);
+ color: var(--obs-shell-rail-card-text);
+ }
+
+ .obsidian-control-rail-card-muted {
+ color: var(--obs-shell-rail-card-muted);
+ }
+
+ .obsidian-control-shell {
+ background: var(--obs-shell-bg) !important;
+ color: var(--obs-shell-text) !important;
+ }
+
+ .obsidian-control-shell > div > aside:first-of-type {
+ background: var(--obs-shell-rail-bg) !important;
+ border-color: var(--obs-shell-border) !important;
+ }
+
+ .obsidian-control-shell > div > section {
+ background: var(--obs-shell-panel-bg) !important;
+ border-color: var(--obs-shell-border) !important;
+ }
+
+ .obsidian-control-shell > div > aside:last-child {
+ background: var(--obs-shell-panel-bg) !important;
+ border-color: var(--obs-shell-border) !important;
+ }
+
+ .obsidian-control-shell > div > section > header,
+ .obsidian-control-shell > div > aside > div:first-child,
+ .obsidian-control-shell [class*="bg-[#101719]"] {
+ background: var(--obs-shell-header-bg) !important;
+ border-color: var(--obs-shell-border) !important;
+ }
+
+ .obsidian-control-shell [class*="bg-[#0d1113]"],
+ .obsidian-control-shell [class*="bg-[#0f1416]"],
+ .obsidian-control-shell [class*="bg-[#101517]"] {
+ background-color: var(--obs-shell-content-bg) !important;
+ }
+
+ .obsidian-control-shell [class*="bg-[#111719]"] {
+ background-color: var(--obs-shell-panel-bg) !important;
+ }
+
+ .obsidian-control-shell [class*="bg-[#151d1f]"] {
+ background-color: var(--obs-shell-surface-bg) !important;
+ }
+
+ .obsidian-control-shell [class*="bg-[#202a2d]"],
+ .obsidian-control-shell [class*="bg-white/[0.03]"],
+ .obsidian-control-shell [class*="bg-white/[0.04]"],
+ .obsidian-control-shell [class*="bg-white/[0.06]"] {
+ background-color: var(--obs-shell-muted-bg) !important;
+ }
+
+ .obsidian-control-shell [class*="bg-[#e7eeec]"] {
+ background-color: var(--obs-shell-rail-active-bg) !important;
+ }
+
+ .obsidian-control-shell [class*="border-white/10"],
+ .obsidian-control-shell [class*="border-red-400/25"],
+ .obsidian-control-shell [class*="border-amber-400/30"] {
+ border-color: var(--obs-shell-border) !important;
+ }
+
+ .obsidian-control-shell [class*="divide-white/10"] > :not([hidden]) ~ :not([hidden]) {
+ border-color: var(--obs-shell-border) !important;
+ }
+
+ .obsidian-control-shell [class*="text-[#f4f7f6]"],
+ .obsidian-control-shell [class*="text-[#edf4f2]"],
+ .obsidian-control-shell [class*="text-[#e7eeec]"],
+ .obsidian-control-shell [class*="text-[#dce7e4]"],
+ .obsidian-control-shell [class*="text-[#cbd8d5]"] {
+ color: var(--obs-shell-title) !important;
+ }
+
+ .obsidian-control-shell [class*="text-[#aeb8bb]"],
+ .obsidian-control-shell [class*="text-[#c0ccca]"],
+ .obsidian-control-shell [class*="text-[#9ba8a8]"],
+ .obsidian-control-shell [class*="text-[#8f9c9d]"],
+ .obsidian-control-shell [class*="text-[#7f8d8e]"],
+ .obsidian-control-shell [class*="text-[#788586]"],
+ .obsidian-control-shell [class*="text-[#748083]"] {
+ color: var(--obs-shell-muted) !important;
+ }
+
+ .obsidian-control-shell [class*="text-[#101517]"],
+ .obsidian-control-shell [class*="text-[#101719]"] {
+ color: var(--obs-shell-rail-active-text) !important;
+ }
+
+ .obsidian-control-shell [class*="text-white"] {
+ color: var(--obs-shell-title) !important;
+ }
+
+ .obsidian-control-shell [class*="hover:text-white"]:hover {
+ color: var(--obs-shell-rail-hover-text) !important;
+ }
+
+ .obsidian-control-shell [class*="text-emerald-200"],
+ .obsidian-control-shell [class*="text-[#9bdcc5]"] {
+ color: var(--obs-shell-success) !important;
+ }
+
+ .obsidian-control-shell [class*="text-amber-200"],
+ .obsidian-control-shell [class*="text-[#e5bd72]"] {
+ color: var(--obs-shell-warning) !important;
+ }
+
+ .obsidian-control-shell [class*="text-red-200"] {
+ color: var(--obs-shell-danger) !important;
+ }
+
+ .obsidian-control-shell [class*="hover:bg-white/[0.04]"]:hover,
+ .obsidian-control-shell [class*="hover:bg-white/[0.06]"]:hover,
+ .obsidian-control-shell [class*="hover:bg-red-400/10"]:hover,
+ .obsidian-control-shell [class*="hover:bg-amber-400/10"]:hover {
+ background-color: var(--obs-shell-hover-bg) !important;
+ }
+
+ .obsidian-modal-panel label,
+ .obsidian-modal-panel .text-apple-label-primary,
+ .obsidian-modal-panel .text-apple-label-secondary,
+ .obsidian-modal-panel .text-apple-label-tertiary {
+ color: var(--obs-shell-muted) !important;
+ }
+
+ .obsidian-modal-panel input,
+ .obsidian-modal-panel textarea,
+ .obsidian-modal-panel select {
+ border-color: var(--obs-shell-border) !important;
+ background: var(--obs-shell-surface-bg) !important;
+ color: var(--obs-shell-title) !important;
+ }
+
+ .obsidian-modal-panel input:focus,
+ .obsidian-modal-panel textarea:focus,
+ .obsidian-modal-panel select:focus {
+ border-color: var(--obs-shell-title) !important;
+ background: var(--obs-shell-surface-bg) !important;
+ }
+
+ .obsidian-modal-panel input::placeholder,
+ .obsidian-modal-panel textarea::placeholder {
+ color: var(--obs-shell-subtle) !important;
+ }
+
+ .obsidian-modal-panel [class*="bg-white"],
+ .obsidian-modal-panel [class*="bg-[#fbfcfc]"],
+ .obsidian-modal-panel [class*="bg-[#f7f8f8]"],
+ .obsidian-modal-panel [class*="bg-apple-bg-secondary"],
+ .obsidian-modal-panel [class*="bg-apple-bg-tertiary"] {
+ background-color: var(--obs-shell-surface-bg) !important;
+ }
+
+ .obsidian-modal-panel [class*="border-[#dde3e5]"],
+ .obsidian-modal-panel [class*="border-apple-separator"] {
+ border-color: var(--obs-shell-border) !important;
+ }
+
+ .obsidian-modal-panel [class*="text-[#2d3335]"],
+ .obsidian-modal-panel [class*="text-apple-label-primary"] {
+ color: var(--obs-shell-title) !important;
+ }
+
+ .obsidian-modal-panel [class*="text-[#6b7679]"],
+ .obsidian-modal-panel [class*="text-[#7a8588]"],
+ .obsidian-modal-panel [class*="text-apple-label-secondary"],
+ .obsidian-modal-panel [class*="text-apple-label-tertiary"] {
+ color: var(--obs-shell-muted) !important;
+ }
+
.material-library-obsidian [class*="ring-white/10"],
.material-library-obsidian [class*="ring-[#8fb6b0]"],
.material-library-obsidian [class*="ring-[#48686b]"] {
diff --git a/furniture-3d-system/src/app/layout.tsx b/furniture-3d-system/src/app/layout.tsx
index b898b54d..7f8fc0d9 100644
--- a/furniture-3d-system/src/app/layout.tsx
+++ b/furniture-3d-system/src/app/layout.tsx
@@ -46,16 +46,10 @@ export default function RootLayout({
return (
- {/* 防止主题闪烁 - 必须在页面渲染前执行 */}
+ {/* 固定浅色主题，避免旧本地偏好把工作台切回深色 */}
@@ -64,7 +58,7 @@ export default function RootLayout({
{/* 移动端优化 */}
-
+
diff --git a/furniture-3d-system/src/app/login/page.tsx b/furniture-3d-system/src/app/login/page.tsx
index 58fb06ff..a341a7ae 100644
--- a/furniture-3d-system/src/app/login/page.tsx
+++ b/furniture-3d-system/src/app/login/page.tsx
@@ -17,7 +17,6 @@ import { useRouter } from 'next/navigation';
import { Button } from '@/components/ui/Button';
import { Input } from '@/components/ui/Input';
import { LargeTitle, Body, Footnote, Caption2 } from '@/components/ui/Typography';
-import ThemeToggle from '@/components/ui/ThemeToggle';
import { useToast, ToastContainer } from '@/components/ui/Toast';
import { getApiErrorMessage } from '@/lib/utils';
import type { ApiResponse } from '@/lib/api';
@@ -177,11 +176,6 @@ export default function LoginPage() {
{/* Toast 容器 - 居中显示，类似系统通知 */}
= {
+ SUPER_ADMIN: '超级管理员',
+ ADMIN: '管理员',
+ SUPERVISOR: '主管',
+ SUPERVISOR_DEPARTMENT: '部门主管',
+ SUPERVISOR_TEAM: '小组主管',
+ DESIGNER: '设计师',
+ USER: '普通用户',
+}
+
+const statusLabels: Record = {
+ ACTIVE: '运行中',
+ PENDING: '待激活',
+ INACTIVE: '已离职',
+ SUSPENDED: '已锁定',
+}
+
+export default function ProfilePage() {
+ return (
+
+
+
+
+ )
+}
+
+function ProfileContent() {
+ const { user, logout } = useAuth()
+ const canManageUsers = Boolean(user && ['SUPER_ADMIN', 'ADMIN', 'SUPERVISOR_DEPARTMENT', 'SUPERVISOR_TEAM'].includes(user.role))
+ const canAccessAdmin = Boolean(user && ['SUPER_ADMIN', 'ADMIN'].includes(user.role))
+ const roleLabel = user ? roleLabels[user.role] ?? user.role : '-'
+ const statusLabel = user ? statusLabels[user.status] ?? user.status : '-'
+ const lastLoginText = user?.lastLoginAt ? new Date(user.lastLoginAt).toLocaleString('zh-CN') : '暂无记录'
+
+ return (
+ void logout()}
+ className="obsidian-control-action rounded-md border px-4"
+ >
+
+
+
+
+ 会话
+ {statusLabel}
+
+
+ }
+ inspector={
+
+
+
+
+
+
+
+
+ }
+ >
+
+
+
+
+ {user?.name || '当前用户'}
+ {user?.email}
+
+
+ 角色
+ {roleLabel}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {canManageUsers ? (
+
+ )
+}
+
+function ProfileMetric({ icon: Icon, label, value }: { icon: typeof Fingerprint; label: string; value: string }) {
+ return (
+
+ {label}
+ {value}
+
+ )
+}
+
+function ProfileLine({ icon: Icon, label, value }: { icon: typeof Building2; label: string; value: string }) {
+ return (
+
+ {label}
+ {value}
+
+
+ )
+}
+
+function ProfileAction({ href, title }: { href: string; title: string }) {
+ return (
+
+ {title}
+
+ )
+}
diff --git a/furniture-3d-system/src/app/register/page.tsx b/furniture-3d-system/src/app/register/page.tsx
index ded023fd..ad1b2c37 100644
--- a/furniture-3d-system/src/app/register/page.tsx
+++ b/furniture-3d-system/src/app/register/page.tsx
@@ -6,7 +6,6 @@ import { useRouter } from 'next/navigation';
import { Button } from '@/components/ui/Button';
import { Input } from '@/components/ui/Input';
import { LargeTitle, Body, Footnote, Caption2 } from '@/components/ui/Typography';
-import ThemeToggle from '@/components/ui/ThemeToggle';
import { useToast, ToastContainer } from '@/components/ui/Toast';
import { getApiErrorMessage } from '@/lib/utils';
import type { ApiResponse } from '@/lib/api';
@@ -92,10 +91,6 @@ export default function RegisterPage() {
-
-
+
+
)
}
diff --git a/furniture-3d-system/src/app/admin/themes/page.tsx b/furniture-3d-system/src/app/admin/themes/page.tsx
index aee1d181..758734aa 100644
--- a/furniture-3d-system/src/app/admin/themes/page.tsx
+++ b/furniture-3d-system/src/app/admin/themes/page.tsx
@@ -7,13 +7,21 @@
*/
import { Metadata } from 'next'
+import { AuthProvider } from '@/hooks/useAuth'
+import { RequireAuth } from '@/components/auth/RequireAuth'
import ThemeManagementClient from './ThemeManagementClient'
export const metadata: Metadata = {
- title: '主题管理 - 3D 家具系统',
+ title: '主题视觉管理 | White Obsidian Atelier',
description: '管理系统主题和背景配置',
}
export default function ThemeManagementPage() {
- return
+
@@ -457,7 +484,7 @@ export default function ThemeManagementClient() {
{/* 登录页面板 */}
-
+
登录页右侧面板
@@ -488,7 +515,7 @@ export default function ThemeManagementClient() {
{/* 操作按钮 */}
-
+
@@ -498,6 +525,6 @@ export default function ThemeManagementClient() {
-
+
登录页右侧面板
@@ -488,7 +515,7 @@ export default function ThemeManagementClient() {
@@ -498,6 +525,6 @@ export default function ThemeManagementClient() {
- 主题系统调试页面 + 浅色主题调试页面
-1. 打开浏览器开发者工具（F12）
2. 查看 Console 标签页，应该能看到详细的主题信息
-3. 切换主题后，信息会自动更新
-4. 检查 Elements 标签页，查看 <html> 标签的 data-theme 属性
+3. 当前系统固定为浅色主题，不再提供深浅色切换
+4. 检查 Elements 标签页，查看 <html> 标签的 data-theme 属性应为 light
+
+
+
+
+ }
+ inspector={
+
+
+ 会话
+{statusLabel}
+
+
+
+
+
+
+
+
+ }
+ >
+
+
+
+
+
+
+
+
+
+ {user?.name || '当前用户'}
+{user?.email}
+
+
+ 角色
+{roleLabel}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {canManageUsers ? (
+
+
+
+ )
+}
+
+function ProfileLine({ icon: Icon, label, value }: { icon: typeof Building2; label: string; value: string }) {
+ return (
+ {label}
+{value}
+
+
+ )
+}
+
+function ProfileAction({ href, title }: { href: string; title: string }) {
+ return (
+
+
+
+ {label}
+{value}
+{title}
+ + ) +} diff --git a/furniture-3d-system/src/app/register/page.tsx b/furniture-3d-system/src/app/register/page.tsx index ded023fd..ad1b2c37 100644 --- a/furniture-3d-system/src/app/register/page.tsx +++ b/furniture-3d-system/src/app/register/page.tsx @@ -6,7 +6,6 @@ import { useRouter } from 'next/navigation'; import { Button } from '@/components/ui/Button'; import { Input } from '@/components/ui/Input'; import { LargeTitle, Body, Footnote, Caption2 } from '@/components/ui/Typography'; -import ThemeToggle from '@/components/ui/ThemeToggle'; import { useToast, ToastContainer } from '@/components/ui/Toast'; import { getApiErrorMessage } from '@/lib/utils'; import type { ApiResponse } from '@/lib/api'; @@ -92,10 +91,6 @@ export default function RegisterPage() {
-
-
-
-
- );
+ ) : null}
+
+ )
}
-function SecurityMetric({ label, value, color }: { label: string, value: string, color?: string }) {
+function InspectorItem({ icon: Icon, label, value }: { icon: LucideIcon; label: string; value: string }) {
return (
-
-
+
+
+
+
+
+
+ ) : (
+
+ }
+ >
+ Quick Filters
-
- {ROLE_OPTIONS.map(opt => (
-
- ))}
+ setShowCreateModal(true)}
+ className="obsidian-control-action rounded-md border"
+ >
+
+
+
+ {ROLE_OPTIONS.map((option) => (
+ setRoleFilter(option.value)}
+ />
+ ))}
+
+
+ {STATUS_OPTIONS.map((option) => (
+ setStatusFilter(option.value)}
+ />
+ ))}
+
+
+ }
+ inspector={
+
+ {selectedUser ? (
+ <>
+
- }
- mainContent={
-
+
-
-
+
-
-
-
-
-
-
-
- {/* 精密搜索栏 */}
-
- }
- rightContent={
- selectedUser ? (
-
-
-
- {actionError &&
-
-
-
-
-
-
-
-
- {/* User Header Profile */}
-
- ) : (
-
-
-
-
- {/* Details Inspector */}
-
-
-
-
- {selectedUser.name}
-{selectedUser.role}
-
-
-
-
-
-
- Identity Inspector
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- - 该账户已绑定硬件指纹令牌，最近一次成功登录发生在 2 小时前。 -
-
-
-
-
-
- )
- }
- />
+
-
- Identity Inspector
-等待选择用户
-- 从左侧列表中选择一名员工，即可在此处查看详细的权限矩阵与安全审计报告。 +
{selectedUser.name}
++ {roleLabels[selectedUser.role] ?? selectedUser.role}
-
+
+ )}
+ 未选择账号
+点击中间列表中的人员后查看权限和组织信息
+
+
+
- {showCreateModal &&
+
+ {showCreateModal ? (
+
+
+
+ {actionError ? (
+
+
+
+
- {label}
- {value}
+
{children}
diff --git a/furniture-3d-system/src/components/layout/AppTopNav.tsx b/furniture-3d-system/src/components/layout/AppTopNav.tsx
index 944c2749..8dc9cf61 100644
--- a/furniture-3d-system/src/components/layout/AppTopNav.tsx
+++ b/furniture-3d-system/src/components/layout/AppTopNav.tsx
@@ -12,7 +12,6 @@ import {
Search,
Warehouse,
} from 'lucide-react'
-import ThemeToggle from '@/components/ui/ThemeToggle'
import UserMenu from '@/components/ui/UserMenu'
import { APP_BRAND_LOGO_SRC, APP_BRAND_NAME } from '@/lib/branding'
@@ -25,6 +24,12 @@ const WORKBENCH_NAV_ITEMS = [
{ href: '/warehouse', icon: Warehouse, label: '仓库管理' },
]
+const AUXILIARY_ROUTE_LABELS = [
+ { href: '/profile', label: '个人中心' },
+ { href: '/users', label: '用户权限' },
+ { href: '/admin', label: '后台设置' },
+] as const
+
const WORKBENCH_BRAND_NAME =
APP_BRAND_NAME === '由壹点「产品开发平台」' ? '壹点产品开发平台' : APP_BRAND_NAME
@@ -45,7 +50,9 @@ export function AppTopNav({ user, variant = 'default' }: AppTopNavProps) {
const currentWorkbenchItem =
WORKBENCH_NAV_ITEMS.find((item) =>
item.href === '/' ? pathname === '/' : pathname.startsWith(item.href),
- ) ?? WORKBENCH_NAV_ITEMS[0]
+ ) ??
+ AUXILIARY_ROUTE_LABELS.find((item) => pathname === item.href || pathname.startsWith(item.href + '/')) ??
+ WORKBENCH_NAV_ITEMS[0]
if (variant === 'workbench') {
return (
@@ -93,7 +100,6 @@ export function AppTopNav({ user, variant = 'default' }: AppTopNavProps) {
@@ -152,8 +158,6 @@ export function AppTopNav({ user, variant = 'default' }: AppTopNavProps) {
+
)
}
-function InspectorGroup({ title, children }: { title: string, children: React.ReactNode }) {
- return (
-
+
{label}
+{value}
+
-
- )
-}
-
-function InspectorItem({ icon: Icon, label, value }: { icon: LucideIcon, label: string, value: string }) {
- return (
- {title}
-{children}
-
-
- )
+function formatDate(value: string) {
+ const date = new Date(value)
+ if (Number.isNaN(date.getTime())) return value
+ return date.toLocaleString('zh-CN')
}
diff --git a/furniture-3d-system/src/components/layout/AppShell.tsx b/furniture-3d-system/src/components/layout/AppShell.tsx
index c793ca57..0d598033 100644
--- a/furniture-3d-system/src/components/layout/AppShell.tsx
+++ b/furniture-3d-system/src/components/layout/AppShell.tsx
@@ -8,6 +8,9 @@ import { AppSideNav } from './AppSideNav'
// AppShell 只服务新平台主链；旧 /products 兼容链和工具页不进入这套全局壳子
export const APP_SHELL_ROOTS = [
'/',
+ '/profile',
+ '/users',
+ '/admin',
'/asset-center',
'/assisted-assembly',
'/draft-groups',
@@ -47,8 +50,14 @@ export function AppShell({ children, user }: AppShellProps) {
const isDraftGroupsRoute = pathname === '/draft-groups' || pathname.startsWith('/draft-groups/')
const isIntakeRoute = pathname === '/intake' || pathname.startsWith('/intake/')
const isWarehouseRoute = pathname === '/warehouse' || pathname.startsWith('/warehouse/')
+ const isProfileRoute = pathname === '/profile' || pathname.startsWith('/profile/')
+ const isUsersRoute = pathname === '/users' || pathname.startsWith('/users/')
+ const isAdminRoute = pathname === '/admin' || pathname.startsWith('/admin/')
const isWorkbenchShellRoute =
isHomeRoute ||
+ isProfileRoute ||
+ isUsersRoute ||
+ isAdminRoute ||
isAssetCenterRoute ||
isAssistedAssemblyRoute ||
isDraftGroupsRoute ||
@@ -96,11 +105,12 @@ export function AppShell({ children, user }: AppShellProps) {
-
-
- {label}
- {value}
-
-
+
+ )
+}
+
+export function ObsidianRailGroup({ title, children }: { title: string; children: ReactNode }) {
+ return (
+
+ {rail ? (
+
+ ) : null}
+
+
+
+
+
+
+ {inspector ? (
+
+ ) : null}
+
+
+ {Icon ? (
+
+ {actions ?
+
+ ) : null}
+
+
+ {eyebrow}
+{title}
+{actions}
: null}
+ {children}
+
+
+ )
+}
+
+export function ObsidianRailButton({
+ active,
+ icon: Icon,
+ label,
+ meta,
+ href,
+ onClick,
+}: {
+ active?: boolean
+ icon?: ComponentType<{ className?: string }>
+ label: string
+ meta?: string
+ href?: string
+ onClick?: () => void
+}) {
+ const className = cn(
+ 'flex w-full items-center gap-3 rounded-md px-3 py-2.5 text-left transition',
+ active
+ ? 'bg-[#e7eeec] text-[#101517]'
+ : 'text-[#c0ccca] hover:bg-white/[0.06] hover:text-white',
+ )
+ const content = (
+ <>
+ {Icon ? {title}
+ {children}
+ {eyebrow}
+ ) : null} + {title ?{title}
: null} ++ {title} +
+{children}
+
+ {label}
+
+ {value}
+
+
+ )
+}
+
+export function ObsidianStatusBar({
+ items,
+}: {
+ items: Array<{ label: string; value: string; tone?: 'default' | 'success' | 'warning' }>
+}) {
+ return (
+
+ {items.map((item) => (
+
+ )
+}
diff --git a/furniture-3d-system/src/components/platform/PlatformHeaderTools.tsx b/furniture-3d-system/src/components/platform/PlatformHeaderTools.tsx
index 41521052..c6ddf7ab 100644
--- a/furniture-3d-system/src/components/platform/PlatformHeaderTools.tsx
+++ b/furniture-3d-system/src/components/platform/PlatformHeaderTools.tsx
@@ -1,4 +1,3 @@
-import ThemeToggle from '@/components/ui/ThemeToggle'
import UserMenu from '@/components/ui/UserMenu'
interface PlatformHeaderToolsProps {
@@ -15,7 +14,6 @@ interface PlatformHeaderToolsProps {
export function PlatformHeaderTools({ user }: PlatformHeaderToolsProps) {
return (
+
+ {item.label}
+ {item.value}
+
+ ))}
+
-
)
diff --git a/furniture-3d-system/src/components/platform/ViewportStageShell.tsx b/furniture-3d-system/src/components/platform/ViewportStageShell.tsx
index ee2cac7c..0316e1dd 100644
--- a/furniture-3d-system/src/components/platform/ViewportStageShell.tsx
+++ b/furniture-3d-system/src/components/platform/ViewportStageShell.tsx
@@ -68,7 +68,7 @@ export function ViewportStageShell({
{/* 3D 内容区 */}
{children}
- {/* Obsidian Atelier vertical viewport tools */}
+ {/* White Obsidian Atelier vertical viewport tools */}
{/* 交互模式 */}
{enableTranslateGizmo && (
diff --git a/furniture-3d-system/src/components/ui/Modal.tsx b/furniture-3d-system/src/components/ui/Modal.tsx
index c0df19b2..2a1ca3ed 100644
--- a/furniture-3d-system/src/components/ui/Modal.tsx
+++ b/furniture-3d-system/src/components/ui/Modal.tsx
@@ -1,5 +1,5 @@
/**
- * Modal 弹窗组件 - Obsidian Atelier 风格
+ * Modal 弹窗组件 - White Obsidian Atelier 风格
*
* 表单弹窗使用实体面板保证可读性，只把暗色遮罩作为轻量玻璃层。
* 交互细节继续保留 ESC 关闭、焦点循环和关闭后焦点恢复。
@@ -158,9 +158,10 @@ export default function Modal({
ref={modalRef}
onKeyDown={handleKeyDown}
data-testid="obsidian-modal-panel"
- className={`relative w-full ${sizeClasses[size]} overflow-hidden ${className ?? ''}`}
+ className={`obsidian-modal-panel relative w-full ${sizeClasses[size]} overflow-hidden ${className ?? ''}`}
style={{
- backgroundColor: '#ffffff',
+ backgroundColor: 'var(--obs-shell-panel-bg)',
+ border: '1px solid var(--obs-shell-border)',
borderRadius: '6px',
maxHeight: '92vh',
display: 'flex',
@@ -173,12 +174,12 @@ export default function Modal({
onClick={(e) => e.stopPropagation()}
>
{(title || showCloseButton) && (
-
+
{title && (
{title}
@@ -188,7 +189,7 @@ export default function Modal({ @@ -197,17 +198,17 @@ export default function Modal({ )}
{children}
{footer && (
-
+
{footer}
)}
diff --git a/furniture-3d-system/src/components/ui/ThemeToggle.tsx b/furniture-3d-system/src/components/ui/ThemeToggle.tsx
index 01363dc7..521d0b0a 100644
--- a/furniture-3d-system/src/components/ui/ThemeToggle.tsx
+++ b/furniture-3d-system/src/components/ui/ThemeToggle.tsx
@@ -1,71 +1,6 @@
-/**
- * 主题切换按钮组件
- *
- * 提供深浅色主题切换功能
- *
- * @created 2025-12-12
- */
-
'use client'
-import React from 'react'
-import { Sun, Moon } from 'lucide-react'
-import { useUserPreferences } from '@/lib/preferences'
-
+// 深浅色切换能力已下线；保留空组件只为兼容旧页面导入。
export default function ThemeToggle() {
- const { preferences } = useUserPreferences()
- const [mounted, setMounted] = React.useState(false)
-
- // 避免服务端渲染不匹配
- React.useEffect(() => {
- setMounted(true)
- }, [])
-
- const toggleTheme = () => {
- const currentTheme =
- (document.documentElement.getAttribute('data-theme') as 'light' | 'dark' | null) ||
- preferences.prefersColorScheme
- const newTheme = currentTheme === 'dark' ? 'light' : 'dark'
- localStorage.setItem('apple-ui-theme', newTheme)
- document.documentElement.setAttribute('data-theme', newTheme)
-
- // 触发存储事件以更新其他组件
- window.dispatchEvent(new CustomEvent('theme-change', { detail: { theme: newTheme } }))
- }
-
- if (!mounted) {
- return (
-
- )
- }
-
- const isDark = preferences.prefersColorScheme === 'dark'
-
- return (
-
- )
+ return null
}
diff --git a/furniture-3d-system/src/components/ui/UserMenu.tsx b/furniture-3d-system/src/components/ui/UserMenu.tsx
index 79f59017..7cd7b02f 100644
--- a/furniture-3d-system/src/components/ui/UserMenu.tsx
+++ b/furniture-3d-system/src/components/ui/UserMenu.tsx
@@ -127,6 +127,8 @@ export default function UserMenu({ user }: UserMenuProps) {
DESIGNER: '设计师',
USER: '普通用户',
}
+ const isAdmin = resolvedUser.role === 'SUPER_ADMIN' || resolvedUser.role === 'ADMIN'
+ const canManageUsers = isAdmin || resolvedUser.role === 'SUPERVISOR'
return (
@@ -250,53 +252,57 @@ export default function UserMenu({ user }: UserMenuProps) {
{/* 菜单项 */}
创建}>
diff --git a/furniture-3d-system/src/components/ui/__tests__/UserMenu.test.tsx b/furniture-3d-system/src/components/ui/__tests__/UserMenu.test.tsx
new file mode 100644
index 00000000..62610694
--- /dev/null
+++ b/furniture-3d-system/src/components/ui/__tests__/UserMenu.test.tsx
@@ -0,0 +1,46 @@
+import { render, screen } from '@testing-library/react'
+import userEvent from '@testing-library/user-event'
+import UserMenu from '../UserMenu'
+
+const pushMock = jest.fn()
+const refreshMock = jest.fn()
+
+jest.mock('next/navigation', () => ({
+ useRouter: () => ({
+ push: pushMock,
+ refresh: refreshMock,
+ }),
+}))
+
+const adminUser = {
+ id: 'user-1',
+ name: '李承豪',
+ email: '222@qq.com',
+ role: 'ADMIN',
+ avatar: null,
+ department: null,
+}
+
+describe('UserMenu', () => {
+ beforeEach(() => {
+ pushMock.mockReset()
+ refreshMock.mockReset()
+ })
+
+ it('管理员菜单入口应指向真实后台页面，不再跳转到缺失路由', async () => {
+ const actor = userEvent.setup()
+
+ render(
+
-
+
{/* 登出按钮 */}
diff --git a/furniture-3d-system/src/components/ui/__tests__/Modal.test.tsx b/furniture-3d-system/src/components/ui/__tests__/Modal.test.tsx
index 5e374131..832c8b28 100644
--- a/furniture-3d-system/src/components/ui/__tests__/Modal.test.tsx
+++ b/furniture-3d-system/src/components/ui/__tests__/Modal.test.tsx
@@ -2,7 +2,7 @@ import { render, screen } from '@testing-library/react'
import Modal from '../Modal'
describe('Modal 组件', () => {
- it('应该使用 Obsidian Atelier 弹窗外壳，而不是 Apple 大圆角样式', async () => {
+ it('应该使用 White Obsidian Atelier 弹窗外壳，而不是 Apple 大圆角样式', async () => {
render(