From 391823a915a4a161d9bdf97c0d9eea9df632b7f4 Mon Sep 17 00:00:00 2001
From: ryan <ryan@arctel.net>
Date: Thu, 18 Jun 2026 19:59:36 +0800
Subject: [PATCH] =?UTF-8?q?feat(wavelet):=20=E4=BE=A7=E6=A0=8F=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E5=AE=89=E5=85=A8=E6=80=A7=E6=8A=98=E5=8F=A0=E7=BB=84?=
 =?UTF-8?q?=E6=94=B6=E7=BA=B3=20WAF=20=E4=B8=8E=20IP=20=E7=BB=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

移除 WAF / IP 组页面右上角交叉导航，改由侧栏统一入口。
---
 .../frontend/app/(main)/waf/ip-groups/page.tsx   |  9 +--------
 Wavelet/frontend/app/(main)/waf/page.tsx         |  9 +--------
 Wavelet/frontend/lib/navigation/openflare-nav.ts | 16 +++++++++++++---
 docs/changelog/index.md                          |  1 +
 4 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/Wavelet/frontend/app/(main)/waf/ip-groups/page.tsx b/Wavelet/frontend/app/(main)/waf/ip-groups/page.tsx
index 21ecb594..a8156dd5 100644
--- a/Wavelet/frontend/app/(main)/waf/ip-groups/page.tsx
+++ b/Wavelet/frontend/app/(main)/waf/ip-groups/page.tsx
@@ -1,8 +1,7 @@
 'use client';
 
-import Link from 'next/link';
 import {useMutation, useQuery, useQueryClient} from '@tanstack/react-query';
-import {ArrowLeft, Loader2, Network, Plus, RefreshCw} from 'lucide-react';
+import {Loader2, Network, Plus, RefreshCw} from 'lucide-react';
 import {useState} from 'react';
 import {toast} from 'sonner';
 
@@ -157,12 +156,6 @@ export default function WafIPGroupsPage() {
           <h1 className="text-2xl font-semibold tracking-tight">IP 组</h1>
         </div>
         <div className="flex items-center gap-2">
-          <Button variant="outline" size="sm" className="h-7 text-xs" asChild>
-            <Link href="/waf">
-              <ArrowLeft className="size-3.5 mr-1" />
-              返回 WAF
-            </Link>
-          </Button>
           <Button variant="secondary" size="sm" className="h-7 text-xs" onClick={handleCreate}>
             <Plus className="size-3.5 mr-1" />
             新建 IP 组
diff --git a/Wavelet/frontend/app/(main)/waf/page.tsx b/Wavelet/frontend/app/(main)/waf/page.tsx
index 50288910..472fa228 100644
--- a/Wavelet/frontend/app/(main)/waf/page.tsx
+++ b/Wavelet/frontend/app/(main)/waf/page.tsx
@@ -1,8 +1,7 @@
 'use client';
 
-import Link from 'next/link';
 import {useMutation, useQuery, useQueryClient} from '@tanstack/react-query';
-import {Loader2, Network, Plus, RefreshCw, Shield} from 'lucide-react';
+import {Loader2, Plus, RefreshCw, Shield} from 'lucide-react';
 import {useState} from 'react';
 import {toast} from 'sonner';
 
@@ -139,12 +138,6 @@ export default function WafPage() {
           <h1 className="text-2xl font-semibold tracking-tight">WAF</h1>
         </div>
         <div className="flex items-center gap-2">
-          <Button variant="outline" size="sm" className="h-7 text-xs" asChild>
-            <Link href="/waf/ip-groups">
-              <Network className="size-3.5 mr-1" />
-              IP 组
-            </Link>
-          </Button>
           <Button variant="secondary" size="sm" className="h-7 text-xs" onClick={handleCreate}>
             <Plus className="size-3.5 mr-1" />
             新建规则组
diff --git a/Wavelet/frontend/lib/navigation/openflare-nav.ts b/Wavelet/frontend/lib/navigation/openflare-nav.ts
index 8d227406..6749bdf9 100644
--- a/Wavelet/frontend/lib/navigation/openflare-nav.ts
+++ b/Wavelet/frontend/lib/navigation/openflare-nav.ts
@@ -8,7 +8,7 @@ import {
   Route,
   ScrollText,
   Server,
-  Shield,
+  ShieldCheck,
 } from 'lucide-react';
 
 export interface OpenFlareNavItem {
@@ -35,6 +35,16 @@ export type OpenFlareSidebarNavEntry =
   | ({kind: 'item'} & OpenFlareNavItem)
   | ({kind: 'group'} & OpenFlareNavGroup);
 
+/** 安全性折叠组 */
+export const openflareSecurityNavGroup: OpenFlareNavGroup = {
+  title: '安全性',
+  icon: ShieldCheck,
+  items: [
+    {title: 'WAF', url: '/waf'},
+    {title: 'IP 组', url: '/waf/ip-groups'},
+  ],
+};
+
 /** 网站管理折叠组 */
 export const openflareWebsiteNavGroup: OpenFlareNavGroup = {
   title: '网站管理',
@@ -55,8 +65,8 @@ export const openflareSidebarNav: OpenFlareSidebarNavEntry[] = [
   {kind: 'item', title: '数据看板', url: '/', icon: LayoutDashboard},
   {kind: 'item', title: '节点管理', url: '/nodes', icon: Server, childUrls: ['/nodes/detail']},
   {kind: 'item', title: '规则管理', url: '/proxy-routes', icon: Route, childUrls: ['/proxy-routes/detail']},
-  {kind: 'item', title: 'WAF', url: '/waf', icon: Shield, childUrls: ['/waf/ip-groups']},
   {kind: 'group', ...openflareWebsiteNavGroup},
+  {kind: 'group', ...openflareSecurityNavGroup},
   {kind: 'item', title: 'Pages', url: '/pages', icon: FileText, childUrls: ['/pages/detail']},
   {kind: 'item', title: '版本发布', url: '/config-versions', icon: GitBranch},
   {kind: 'item', title: '访问日志', url: '/access-logs', icon: ScrollText},
@@ -112,4 +122,4 @@ export function isOpenFlareConsoleRoute(pathname: string): boolean {
 
     return matchesNavPath(pathname, entry.url, entry.childUrls);
   });
-}
\ No newline at end of file
+}
diff --git a/docs/changelog/index.md b/docs/changelog/index.md
index 1908fa95..f6e84ee3 100644
--- a/docs/changelog/index.md
+++ b/docs/changelog/index.md
@@ -58,6 +58,7 @@ sidebar: false
 - 侧栏新增「网站管理」折叠组（shadcn Collapsible + SidebarMenuSub），收纳网站、证书、DNS、源站入口。
 - 移除网站、证书、DNS 页面右上角互相跳转按钮，改由侧栏折叠组统一导航。
 - 侧栏导航改为 `openflareSidebarNav` 单一配置源，折叠组位置由数组顺序决定，移除 `slice(0, 4)` 硬编码切分。
+- 侧栏新增「安全性」折叠组，收纳 WAF 与 IP 组入口；同步移除两页右上角互相跳转按钮。
 - OpenFlare 前端路由去除 `/openflare` 前缀，业务页面直接挂载于 `/`（如 `/nodes`、`/websites`）；侧栏移除「首页」「我的文件」；旧路径 `/openflare/*`、`/home` 永久重定向至新路径。
 
 ## [v2.3.4] - 2026-06-17