Merge remote-tracking branch 'origin/dhk-1' into dhk-1,保留本地应用中心菜单配置。
Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
commit
3f2aef2925
1 file changed
+4
-4
@@ -2,8 +2,9 @@ import { Bell, ChevronDown, FileText, Moon, Palette, User } from "lucide-react";
|
|||||||
import { useState } from "react";
|
import { useState } from "react";
|
||||||
import { useLocation, useNavigate } from "react-router-dom";
|
import { useLocation, useNavigate } from "react-router-dom";
|
||||||
|
|
||||||
import { NotificationDialog } from "@/components/workspace/notification-dialog";
|
|
||||||
import { Button } from "@/components/ui/button";
|
import { Button } from "@/components/ui/button";
|
||||||
|
import "@/components/page-sdebar.css";
|
||||||
|
import { NotificationDialog } from "@/components/workspace/notification-dialog";
|
||||||
import { getStoredAuth } from "@/core/auth";
|
import { getStoredAuth } from "@/core/auth";
|
||||||
import { isWujieEnv } from "@/core/embed/wujie";
|
import { isWujieEnv } from "@/core/embed/wujie";
|
||||||
import { useUnreadCount } from "@/core/notifications";
|
import { useUnreadCount } from "@/core/notifications";
|
||||||
@@ -12,7 +13,6 @@ import { useSidebarMenuItems } from "@/core/page-layout/use-sidebar-menu";
|
|||||||
import { cn } from "@/lib/utils";
|
import { cn } from "@/lib/utils";
|
||||||
|
|
||||||
import { useTheme } from "../contexts/ThemeContext";
|
import { useTheme } from "../contexts/ThemeContext";
|
||||||
import "@/components/page-sdebar.css";
|
|
||||||
|
|
||||||
const iconButtonClass = (isDark: boolean) =>
|
const iconButtonClass = (isDark: boolean) =>
|
||||||
cn(
|
cn(
|
||||||
@@ -98,12 +98,12 @@ const Header = ({ collapsed }: HeaderProps) => {
|
|||||||
<FileText className="h-4 w-4 text-white" />
|
<FileText className="h-4 w-4 text-white" />
|
||||||
</div>
|
</div>
|
||||||
{!collapsed && (
|
{!collapsed && (
|
||||||
<span className={cn("text-sm font-semibold", isDark ? "text-white" : "text-white")}>
|
<span className="text-sm font-semibold text-white">
|
||||||
CM助手
|
CM助手
|
||||||
</span>
|
</span>
|
||||||
)}
|
)}
|
||||||
{showTopNav && visibleMenuItems.length ? (
|
{showTopNav && visibleMenuItems.length ? (
|
||||||
<nav className="top-submenu-bar" aria-label="二级菜单">
|
<nav className="top-submenu-bar" aria-label="一级菜单">
|
||||||
<div className="top-submenu-list">
|
<div className="top-submenu-list">
|
||||||
{visibleMenuItems.map((item) => {
|
{visibleMenuItems.map((item) => {
|
||||||
const isSelected = item.path ? pathname === item.path : hasActiveChild(item);
|
const isSelected = item.path ? pathname === item.path : hasActiveChild(item);
|
||||||
|
|||||||
Reference in new issue
Block a user