From 28bd751d44bf9b5e42ea956b34a8ba338112db08 Mon Sep 17 00:00:00 2001
From: Diego <2248356998@qq.com>
Date: Wed, 11 Jun 2025 22:57:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0tab=E5=8F=B3=E9=94=AE?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ThingsGateway.Razor/wwwroot/css/site.css  |  4 +++
 src/Directory.Build.props                     |  4 +--
 .../Pages/PluginPage/PluginDebugPage.razor.cs |  7 ++--
 .../Layout/MainLayout.razor                   |  8 ++++-
 .../Layout/MainLayout.razor.cs                | 33 +++++++++++++++++++
 .../Layout/MainLayout.razor.css               |  8 ++++-
 src/ThingsGateway.Server/Locales/en-US.json   |  1 +
 src/ThingsGateway.Server/Locales/zh-CN.json   |  1 +
 src/Version.props                             |  2 +-
 9 files changed, 60 insertions(+), 8 deletions(-)

diff --git a/src/Admin/ThingsGateway.Razor/wwwroot/css/site.css b/src/Admin/ThingsGateway.Razor/wwwroot/css/site.css
index f756671c6..ce59df4aa 100644
--- a/src/Admin/ThingsGateway.Razor/wwwroot/css/site.css
+++ b/src/Admin/ThingsGateway.Razor/wwwroot/css/site.css
@@ -26,6 +26,10 @@
     height: var(--line-chart-table-height);
 }
 
+.wb-control .wb-full {
+    display: none;
+}
+
 .dialog-table {
     height: calc(100vh - 200px);
 }
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 801b1d5cf..8f6af53b0 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -1,8 +1,8 @@
 <Project>
 
 	<PropertyGroup>
-		<PluginVersion>10.7.50</PluginVersion>
-		<ProPluginVersion>10.7.50</ProPluginVersion>
+		<PluginVersion>10.7.51</PluginVersion>
+		<ProPluginVersion>10.7.51</ProPluginVersion>
 		<AuthenticationVersion>2.5.0</AuthenticationVersion>
 		<NET8Version>8.0.17</NET8Version>
 		<NET9Version>9.0.6</NET9Version>
diff --git a/src/Gateway/ThingsGateway.Gateway.Razor/Pages/PluginPage/PluginDebugPage.razor.cs b/src/Gateway/ThingsGateway.Gateway.Razor/Pages/PluginPage/PluginDebugPage.razor.cs
index 36a38f1fe..6f158191b 100644
--- a/src/Gateway/ThingsGateway.Gateway.Razor/Pages/PluginPage/PluginDebugPage.razor.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Razor/Pages/PluginPage/PluginDebugPage.razor.cs
@@ -104,9 +104,10 @@ public partial class PluginDebugPage
                 {
                     Title = pluginInfo.Name,
                     ContentTemplate = debugRender,
-                    Width = "1200px",
-                    Height = "800px",
-                    Top = "100px",
+                    Max = false,
+                    Width = "1440px",
+                    Height = "810px",
+                    Top = "70px",
                     Left = "220px",
                     Background = "var(--bb-primary-color)",
                 };
diff --git a/src/ThingsGateway.Server/Layout/MainLayout.razor b/src/ThingsGateway.Server/Layout/MainLayout.razor
index 2a835a194..ac1256dfd 100644
--- a/src/ThingsGateway.Server/Layout/MainLayout.razor
+++ b/src/ThingsGateway.Server/Layout/MainLayout.razor
@@ -86,12 +86,18 @@
                     </div>
                 </Side>
                 <Main>
-                    <Tab @ref=_tab ClickTabToNavigation="true" ShowToolbar="true" ShowContextMenu="true" ShowContextMenuFullScreen="true" ShowExtendButtons="false" ShowClose="true" AllowDrag=true
+                    <Tab @ref=_tab  ClickTabToNavigation="true" ShowToolbar="true" ShowContextMenu="true" ShowContextMenuFullScreen="true" ShowExtendButtons="false" ShowClose="true" AllowDrag=true
                              AdditionalAssemblies="@App.RazorAssemblies" Menus="@MenuService.AllOwnMenuItems"
                              DefaultUrl=@("/") Body=@(Body!) OnCloseTabItemAsync=@((a)=>
                              {
                              return Task.FromResult(!(a.Url=="/"||a.Url.IsNullOrEmpty()));
                              })>
+                             <BeforeContextMenuTemplate>
+
+                                                     <ContextMenuItem Icon="fa fa-window-restore" Text="@Localizer["WindowRestore"]" OnClick="WinboxRender"></ContextMenuItem>
+                                                     <ContextMenuDivider></ContextMenuDivider>
+
+                             </BeforeContextMenuTemplate>
                         </Tab>
                 </Main>
                 <NotAuthorized>
diff --git a/src/ThingsGateway.Server/Layout/MainLayout.razor.cs b/src/ThingsGateway.Server/Layout/MainLayout.razor.cs
index db70bc087..a149acc56 100644
--- a/src/ThingsGateway.Server/Layout/MainLayout.razor.cs
+++ b/src/ThingsGateway.Server/Layout/MainLayout.razor.cs
@@ -124,6 +124,39 @@ public partial class MainLayout : IDisposable
 
     #endregion 注销
 
+
+    private async Task WinboxRender(ContextMenuItem item, object? context)
+    {
+        if (context is TabItem tabItem)
+        {
+            await WinboxRender(tabItem.ChildContent, tabItem.Text);
+            await _tab.RemoveTab(tabItem);
+        }
+    }
+    [Inject]
+    [NotNull]
+    private WinBoxService? WinBoxService { get; set; }
+
+    private async Task WinboxRender(RenderFragment item, string title)
+    {
+        if (item != null)
+        {
+            var option = new WinBoxOption()
+            {
+                Title = title,
+                ContentTemplate = item,
+                Max = false,
+                Width = "1440px",
+                Height = "810px",
+                Top = "70px",
+                Left = "220px",
+                Background = "var(--bb-primary-color)",
+            };
+            await WinBoxService.Show(option);
+        }
+
+    }
+
     private string _versionString = string.Empty;
     [Inject]
     [NotNull]
diff --git a/src/ThingsGateway.Server/Layout/MainLayout.razor.css b/src/ThingsGateway.Server/Layout/MainLayout.razor.css
index 5ef0302d0..4bd2633ce 100644
--- a/src/ThingsGateway.Server/Layout/MainLayout.razor.css
+++ b/src/ThingsGateway.Server/Layout/MainLayout.razor.css
@@ -1,4 +1,10 @@
-::deep .avatar {
+
+.mainlayout ::deep .menu-icon {
+    width: 16px;
+}
+
+
+::deep .avatar {
     border-radius: 1.5rem;
     width: 28px;
     height: 28px;
diff --git a/src/ThingsGateway.Server/Locales/en-US.json b/src/ThingsGateway.Server/Locales/en-US.json
index a9ec60305..f10e3391e 100644
--- a/src/ThingsGateway.Server/Locales/en-US.json
+++ b/src/ThingsGateway.Server/Locales/en-US.json
@@ -46,6 +46,7 @@
     "Welcome": "Welcome"
   },
   "ThingsGateway.Server.MainLayout": {
+    "WindowRestore": "FloatingWindow",
     "变量管理": "Variable",
     "采集设备": "CollectionDevices",
     "菜单管理": "Menu",
diff --git a/src/ThingsGateway.Server/Locales/zh-CN.json b/src/ThingsGateway.Server/Locales/zh-CN.json
index ccd6ad224..434809fcc 100644
--- a/src/ThingsGateway.Server/Locales/zh-CN.json
+++ b/src/ThingsGateway.Server/Locales/zh-CN.json
@@ -46,6 +46,7 @@
     "Welcome": "欢迎使用"
   },
   "ThingsGateway.Server.MainLayout": {
+    "WindowRestore": "浮动小窗",
     "变量管理": "变量管理",
     "采集设备": "采集设备",
     "菜单管理": "菜单管理",
diff --git a/src/Version.props b/src/Version.props
index 3f4fd1669..c4d8ffa05 100644
--- a/src/Version.props
+++ b/src/Version.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <Version>10.7.50</Version>
+    <Version>10.7.51</Version>
   </PropertyGroup>
 
   <ItemGroup>