From 977c91db1a627e2499a9a96263890b3bd24007fc Mon Sep 17 00:00:00 2001
From: cye2 <cye2@leqee.com>
Date: Thu, 9 Apr 2026 18:02:56 +0800
Subject: [PATCH] =?UTF-8?q?feat(editor):=20=E6=94=AF=E6=8C=81=E4=B8=80?=
 =?UTF-8?q?=E9=94=AE=E5=85=B3=E9=97=AD=E5=B7=B2=E4=BF=9D=E5=AD=98=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

在编辑区标签动作菜单与标签页右键菜单中新增「关闭已保存」入口，并补充相关中英文文案。
---
 .../components/files/CurrentFilePanel.tsx     |  8 +++
 src/renderer/components/files/EditorArea.tsx  | 56 ++++++++++++++++++-
 src/renderer/components/files/EditorTabs.tsx  | 15 ++++-
 src/renderer/components/files/FilePanel.tsx   |  8 +++
 src/shared/i18n.ts                            |  2 +
 5 files changed, 85 insertions(+), 4 deletions(-)

diff --git a/src/renderer/components/files/CurrentFilePanel.tsx b/src/renderer/components/files/CurrentFilePanel.tsx
index c910c8f7..81d6a9fb 100644
--- a/src/renderer/components/files/CurrentFilePanel.tsx
+++ b/src/renderer/components/files/CurrentFilePanel.tsx
@@ -200,6 +200,13 @@ export function CurrentFilePanel({ rootPath, isActive = false }: CurrentFilePane
     [tabs, promptUnsaved, saveFile, closeFile, t]
   );
 
+  const closeSavedTabs = useCallback(async () => {
+    const paths = tabs.filter((tab) => !tab.isDirty).map((tab) => tab.path);
+    for (const path of paths) {
+      await closeFile(path);
+    }
+  }, [tabs, closeFile]);
+
   // Handle tab click
   const handleTabClick = useCallback(
     (path: string) => {
@@ -266,6 +273,7 @@ export function CurrentFilePanel({ rootPath, isActive = false }: CurrentFilePane
             const paths = tabs.map((t) => t.path);
             await requestCloseTabs(paths);
           }}
+          onCloseSaved={closeSavedTabs}
           onCloseLeft={async (path) => {
             const index = tabs.findIndex((t) => t.path === path);
             if (index <= 0) return;
diff --git a/src/renderer/components/files/EditorArea.tsx b/src/renderer/components/files/EditorArea.tsx
index 68b4e27d..65920ff2 100644
--- a/src/renderer/components/files/EditorArea.tsx
+++ b/src/renderer/components/files/EditorArea.tsx
@@ -1,5 +1,14 @@
 import Editor, { type OnMount } from '@monaco-editor/react';
-import { ChevronRight, Eye, EyeOff, FileCode, FileX, Maximize2, MessageSquare } from 'lucide-react';
+import {
+  ChevronRight,
+  Eye,
+  EyeOff,
+  FileCode,
+  FileX,
+  Maximize2,
+  MessageSquare,
+  MoreVertical,
+} from 'lucide-react';
 import type * as monaco from 'monaco-editor';
 import {
   forwardRef,
@@ -18,6 +27,7 @@ import {
   BreadcrumbList,
   BreadcrumbSeparator,
 } from '@/components/ui/breadcrumb';
+import { Button } from '@/components/ui/button';
 import {
   Empty,
   EmptyDescription,
@@ -25,6 +35,7 @@ import {
   EmptyMedia,
   EmptyTitle,
 } from '@/components/ui/empty';
+import { Menu, MenuItem, MenuPopup, MenuTrigger } from '@/components/ui/menu';
 import { addToast } from '@/components/ui/toast';
 import { useDebouncedSave } from '@/hooks/useDebouncedSave';
 import { useI18n } from '@/i18n';
@@ -139,6 +150,7 @@ interface EditorAreaProps {
   onTabClose: (path: string) => void | Promise<void>;
   onCloseOthers?: (keepPath: string) => void | Promise<void>;
   onCloseAll?: () => void | Promise<void>;
+  onCloseSaved?: () => void | Promise<void>;
   onCloseLeft?: (path: string) => void | Promise<void>;
   onCloseRight?: (path: string) => void | Promise<void>;
   onTabReorder: (fromIndex: number, toIndex: number) => void;
@@ -163,6 +175,7 @@ export const EditorArea = forwardRef<EditorAreaRef, EditorAreaProps>(function Ed
     onTabClose,
     onCloseOthers,
     onCloseAll,
+    onCloseSaved,
     onCloseLeft,
     onCloseRight,
     onTabReorder,
@@ -1287,7 +1300,7 @@ export const EditorArea = forwardRef<EditorAreaRef, EditorAreaProps>(function Ed
   return (
     <div className="flex h-full flex-col">
       {/* Tabs */}
-      <div className="flex items-center">
+      <div className="flex h-10 items-center border-b">
         {isFileTreeCollapsed && onToggleFileTree && (
           <button
             type="button"
@@ -1307,6 +1320,7 @@ export const EditorArea = forwardRef<EditorAreaRef, EditorAreaProps>(function Ed
             onClose={onTabClose}
             onCloseOthers={onCloseOthers}
             onCloseAll={onCloseAll}
+            onCloseSaved={onCloseSaved}
             onCloseLeft={onCloseLeft}
             onCloseRight={onCloseRight}
             onTabReorder={onTabReorder}
@@ -1314,12 +1328,48 @@ export const EditorArea = forwardRef<EditorAreaRef, EditorAreaProps>(function Ed
             sessionId={sessionId}
           />
         </div>
+        {tabs.length > 0 && (onCloseSaved || onCloseAll) && (
+          <Menu>
+            <MenuTrigger
+              render={
+                <Button
+                  type="button"
+                  variant="ghost"
+                  size="sm"
+                  className="h-9 w-9 shrink-0 rounded-none p-0 text-muted-foreground hover:bg-accent/50 hover:text-foreground"
+                  title={t('Tab actions')}
+                >
+                  <MoreVertical className="h-4 w-4" />
+                </Button>
+              }
+            />
+            <MenuPopup align="end" side="bottom" sideOffset={4}>
+              <MenuItem
+                disabled={!onCloseSaved || !tabs.some((tab) => !tab.isDirty)}
+                onClick={async () => {
+                  if (onCloseSaved) await onCloseSaved();
+                }}
+              >
+                {t('Close Saved Tabs')}
+              </MenuItem>
+              <MenuItem
+                disabled={!onCloseAll}
+                onClick={async () => {
+                  if (!onCloseAll) return;
+                  await onCloseAll();
+                }}
+              >
+                {t('Close All Tabs')}
+              </MenuItem>
+            </MenuPopup>
+          </Menu>
+        )}
         {/* Markdown Preview Toggle */}
         {isMarkdown && (
           <button
             type="button"
             onClick={cyclePreviewMode}
-            className="flex h-10 w-10 shrink-0 items-center justify-center border-b text-muted-foreground hover:text-foreground transition-colors"
+            className="flex h-9 w-9 shrink-0 items-center justify-center text-muted-foreground transition-colors hover:text-foreground"
             title={
               previewMode === 'off'
                 ? t('Show split preview')
diff --git a/src/renderer/components/files/EditorTabs.tsx b/src/renderer/components/files/EditorTabs.tsx
index 20a6a0c6..732fdab4 100644
--- a/src/renderer/components/files/EditorTabs.tsx
+++ b/src/renderer/components/files/EditorTabs.tsx
@@ -19,6 +19,7 @@ interface EditorTabsProps {
   onClose?: (path: string) => void | Promise<void>;
   onCloseOthers?: (keepPath: string) => void | Promise<void>;
   onCloseAll?: () => void | Promise<void>;
+  onCloseSaved?: () => void | Promise<void>;
   onCloseLeft?: (path: string) => void | Promise<void>;
   onCloseRight?: (path: string) => void | Promise<void>;
   onTabReorder?: (fromIndex: number, toIndex: number) => void;
@@ -34,6 +35,7 @@ export function EditorTabs({
   onClose,
   onCloseOthers,
   onCloseAll,
+  onCloseSaved,
   onCloseLeft,
   onCloseRight,
   onTabReorder,
@@ -86,6 +88,7 @@ export function EditorTabs({
 
   const canCloseOthers = !!onCloseOthers && !!menuTabPath && tabs.length > 1;
   const canCloseAll = !!onCloseAll && tabs.length > 0;
+  const canCloseSaved = !!onCloseSaved && tabs.some((tab) => !tab.isDirty);
   const canCloseLeft = !!onCloseLeft && menuTabIndex > 0;
   const canCloseRight = !!onCloseRight && menuTabIndex >= 0 && menuTabIndex < tabs.length - 1;
 
@@ -116,7 +119,7 @@ export function EditorTabs({
   }
 
   return (
-    <div className="h-10 shrink-0 overflow-hidden border-b">
+    <div className="h-10 shrink-0 overflow-hidden">
       <ScrollArea className="h-full">
         <div className="flex h-9 w-max pb-1">
           {tabs.map((tab, index) => {
@@ -239,6 +242,16 @@ export function EditorTabs({
             {t('Close Tabs to the Right')}
           </MenuItem>
           <MenuSeparator />
+          <MenuItem
+            disabled={!canCloseSaved}
+            onClick={async () => {
+              if (!onCloseSaved) return;
+              await onCloseSaved();
+              setMenuOpen(false);
+            }}
+          >
+            {t('Close Saved Tabs')}
+          </MenuItem>
           <MenuItem
             disabled={!canCloseAll}
             onClick={async () => {
diff --git a/src/renderer/components/files/FilePanel.tsx b/src/renderer/components/files/FilePanel.tsx
index 728fa5fd..d6374bf4 100644
--- a/src/renderer/components/files/FilePanel.tsx
+++ b/src/renderer/components/files/FilePanel.tsx
@@ -413,6 +413,13 @@ export function FilePanel({ rootPath, isActive = false }: FilePanelProps) {
     [tabs, promptUnsaved, saveFile, closeFile, t]
   );
 
+  const closeSavedTabs = useCallback(async () => {
+    const paths = tabs.filter((tab) => !tab.isDirty).map((tab) => tab.path);
+    for (const path of paths) {
+      await closeFile(path);
+    }
+  }, [tabs, closeFile]);
+
   // Handle file click (single click = open in editor)
   const handleFileClick = useCallback(
     (path: string) => {
@@ -795,6 +802,7 @@ export function FilePanel({ rootPath, isActive = false }: FilePanelProps) {
             const paths = tabs.map((t) => t.path);
             await requestCloseTabs(paths);
           }}
+          onCloseSaved={closeSavedTabs}
           onCloseLeft={async (path) => {
             const index = tabs.findIndex((t) => t.path === path);
             if (index <= 0) return;
diff --git a/src/shared/i18n.ts b/src/shared/i18n.ts
index c840ff07..6a37f3ec 100644
--- a/src/shared/i18n.ts
+++ b/src/shared/i18n.ts
@@ -130,6 +130,8 @@ export const zhTranslations: Record<string, string> = {
   'Close Tabs to the Left': '关闭左侧所有',
   'Close Tabs to the Right': '关闭右侧所有',
   'Close All Tabs': '关闭所有',
+  'Close Saved Tabs': '关闭已保存',
+  'Tab actions': '标签页操作',
   Collapse: '折叠',
   'Collapse all': '折叠所有',
   'Collapse all folders': '折叠所有文件夹',