增加tab右键菜单

src/Admin/ThingsGateway.Admin.Application/Entity/SysDict.cs

@@ -10,10 +10,10 @@
 
 using BootstrapBlazor.Components;
 
-using SqlSugar;
-
 using System.ComponentModel.DataAnnotations;
 
+using ThingsGateway.SqlSugar;
+
 namespace ThingsGateway.Admin.Application;
 
 [SugarTable("sys_dict", TableDescription = "字典表")]

src/Admin/ThingsGateway.Admin.Application/Entity/SysOperateLog.cs

@@ -10,7 +10,7 @@
 
 using BootstrapBlazor.Components;
 
-using SqlSugar;
+using ThingsGateway.SqlSugar;
 
 namespace ThingsGateway.Admin.Application;
 

src/Admin/ThingsGateway.Admin.Application/Entity/SysOrg.cs

@@ -10,10 +10,10 @@
 
 using BootstrapBlazor.Components;
 
-using SqlSugar;
-
 using System.ComponentModel.DataAnnotations;
 
+using ThingsGateway.SqlSugar;
+
 namespace ThingsGateway.Admin.Application;
 
 /// <summary>

src/Admin/ThingsGateway.Admin.Application/Entity/SysPosition.cs

@@ -10,10 +10,10 @@
 
 using BootstrapBlazor.Components;
 
-using SqlSugar;
-
 using System.ComponentModel.DataAnnotations;
 
+using ThingsGateway.SqlSugar;
+
 namespace ThingsGateway.Admin.Application;
 
 /// <summary>

src/Admin/ThingsGateway.Admin.Application/Entity/SysRelation.cs

@@ -8,7 +8,7 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-using SqlSugar;
+using ThingsGateway.SqlSugar;
 
 namespace ThingsGateway.Admin.Application;
 

src/Admin/ThingsGateway.Admin.Application/Entity/SysResource.cs

@@ -14,10 +14,10 @@ using Microsoft.AspNetCore.Components.Routing;
 
 using Newtonsoft.Json;
 
-using SqlSugar;
-
 using System.ComponentModel.DataAnnotations;
 
+using ThingsGateway.SqlSugar;
+
 namespace ThingsGateway.Admin.Application;
 
 /// <summary>

src/Admin/ThingsGateway.Admin.Application/Entity/SysRole.cs

@@ -10,10 +10,10 @@
 
 using BootstrapBlazor.Components;
 
-using SqlSugar;
-
 using System.ComponentModel.DataAnnotations;
 
+using ThingsGateway.SqlSugar;
+
 namespace ThingsGateway.Admin.Application;
 
 /// <summary>

src/Admin/ThingsGateway.Admin.Application/Entity/SysUser.cs

@@ -12,11 +12,11 @@ using BootstrapBlazor.Components;
 
 using Mapster;
 
-using SqlSugar;
-
 using System.ComponentModel.DataAnnotations;
 using System.Diagnostics.CodeAnalysis;
 
+using ThingsGateway.SqlSugar;
+
 namespace ThingsGateway.Admin.Application;
 
 /// <summary>

src/Admin/ThingsGateway.Admin.Application/Entity/VerificatInfo.cs

@@ -10,9 +10,8 @@
 
 using BootstrapBlazor.Components;
 
-using SqlSugar;
-
 using ThingsGateway.List;
+using ThingsGateway.SqlSugar;
 
 namespace ThingsGateway.Admin.Application;
 

src/Admin/ThingsGateway.Admin.Application/Job/Hardware/HistoryHardwareInfo.cs

@@ -8,7 +8,7 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-using SqlSugar;
+using ThingsGateway.SqlSugar;
 
 namespace ThingsGateway.Admin.Application;
 

src/Admin/ThingsGateway.Admin.Application/Logging/DatabaseLoggingWriter.cs

@@ -8,8 +8,6 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-using SqlSugar;
-
 using System.Collections.Concurrent;
 using System.Reflection;
 
@@ -18,6 +16,7 @@ using ThingsGateway.FriendlyException;
 using ThingsGateway.Logging;
 using ThingsGateway.NewLife.Json.Extension;
 using ThingsGateway.Razor;
+using ThingsGateway.SqlSugar;
 
 namespace ThingsGateway.Admin.Application;
 

src/Admin/ThingsGateway.Admin.Application/Services/OperateLog/SysOperateLogService.cs

@@ -10,10 +10,10 @@
 
 using BootstrapBlazor.Components;
 
-using SqlSugar;
-
 using System.Data;
 
+using ThingsGateway.SqlSugar;
+
 namespace ThingsGateway.Admin.Application;
 
 internal sealed class SysOperateLogService : BaseService<SysOperateLog>, ISysOperateLogService

src/Admin/ThingsGateway.Admin.Application/Services/Org/ISysOrgService.cs

@@ -10,7 +10,7 @@
 
 using BootstrapBlazor.Components;
 
-using SqlSugar;
+using ThingsGateway.SqlSugar;
 
 namespace ThingsGateway.Admin.Application;
 

src/Admin/ThingsGateway.Admin.Application/Services/Org/SysOrgService.cs

@@ -10,10 +10,9 @@
 
 using BootstrapBlazor.Components;
 
-using SqlSugar;
-
 using ThingsGateway.Extension.Generic;
 using ThingsGateway.FriendlyException;
+using ThingsGateway.SqlSugar;
 
 namespace ThingsGateway.Admin.Application;
 

src/Admin/ThingsGateway.Admin.Application/Services/Pos/ISysPositionService.cs

@@ -10,7 +10,7 @@
 
 using BootstrapBlazor.Components;
 
-using SqlSugar;
+using ThingsGateway.SqlSugar;
 
 namespace ThingsGateway.Admin.Application;
 

src/Admin/ThingsGateway.Admin.Application/Services/Pos/SysPositionService.cs

@@ -10,9 +10,8 @@
 
 using BootstrapBlazor.Components;
 
-using SqlSugar;
-
 using ThingsGateway.FriendlyException;
+using ThingsGateway.SqlSugar;
 
 namespace ThingsGateway.Admin.Application;
 

src/Admin/ThingsGateway.Admin.Application/Services/Resource/SysResourceService.cs

@@ -12,11 +12,10 @@ using BootstrapBlazor.Components;
 
 using Microsoft.Extensions.DependencyInjection;
 
-using SqlSugar;
-
 using System.Globalization;
 
 using ThingsGateway.FriendlyException;
+using ThingsGateway.SqlSugar;
 
 namespace ThingsGateway.Admin.Application;
 

src/Admin/ThingsGateway.Admin.Application/Services/Role/ISysRoleService.cs

@@ -10,7 +10,7 @@
 
 using BootstrapBlazor.Components;
 
-using SqlSugar;
+using ThingsGateway.SqlSugar;
 
 namespace ThingsGateway.Admin.Application;
 

src/Admin/ThingsGateway.Admin.Application/Services/Role/SysRoleService.cs

@@ -10,10 +10,9 @@
 
 using BootstrapBlazor.Components;
 
-using SqlSugar;
-
 using ThingsGateway.FriendlyException;
 using ThingsGateway.NewLife.Json.Extension;
+using ThingsGateway.SqlSugar;
 
 namespace ThingsGateway.Admin.Application;
 

src/Admin/ThingsGateway.Admin.Application/Services/Session/SessionService.cs

@@ -12,7 +12,7 @@ using BootstrapBlazor.Components;
 
 using Mapster;
 
-using SqlSugar;
+using ThingsGateway.SqlSugar;
 
 namespace ThingsGateway.Admin.Application;
 

src/Admin/ThingsGateway.Admin.Application/Services/User/SysUserService.cs

@@ -12,13 +12,12 @@ using BootstrapBlazor.Components;
 
 using Mapster;
 
-using SqlSugar;
-
 using ThingsGateway.DataEncryption;
 using ThingsGateway.Extension;
 using ThingsGateway.Extension.Generic;
 using ThingsGateway.FriendlyException;
 using ThingsGateway.NewLife.Json.Extension;
+using ThingsGateway.SqlSugar;
 
 namespace ThingsGateway.Admin.Application;
 

src/Admin/ThingsGateway.Admin.Application/Services/VerificatInfo/VerificatInfoService.cs

@@ -8,7 +8,7 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-using SqlSugar;
+using ThingsGateway.SqlSugar;
 
 namespace ThingsGateway.Admin.Application;
 

src/Admin/ThingsGateway.Admin.Application/ThingsGateway.Admin.Application.csproj

@@ -27,9 +27,9 @@
 
 	</ItemGroup>
 	<ItemGroup Condition=" '$(TargetFramework)' == 'net9.0' ">
-		<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.5" />
-		<PackageReference Include="System.Formats.Asn1" Version="9.0.5" />
-		<PackageReference Include="System.Threading.RateLimiting" Version="9.0.5" />
+		<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="$(NET9Version)" />
+		<PackageReference Include="System.Formats.Asn1" Version="$(NET9Version)" />
+		<PackageReference Include="System.Threading.RateLimiting" Version="$(NET9Version)" />
 	</ItemGroup>
 	<ItemGroup>
 		<Content Remove="SeedData\Admin\*.json" />

src/Admin/ThingsGateway.Admin.Application/Util/VerificatInfoUtil.cs

@@ -8,9 +8,8 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-using SqlSugar;
-
 using ThingsGateway.Extension.Generic;
+using ThingsGateway.SqlSugar;
 
 namespace ThingsGateway.Admin.Application;
 

src/Admin/ThingsGateway.Admin.Razor/Pages/Org/OrgTree.razor.cs

@@ -8,10 +8,9 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-using SqlSugar;
-
 using ThingsGateway.Admin.Application;
 using ThingsGateway.NewLife.Extension;
+using ThingsGateway.SqlSugar;
 
 namespace ThingsGateway.Admin.Razor;
 

src/Admin/ThingsGateway.Admin.Razor/Pages/Org/SysOrgPage.razor.cs

@@ -8,9 +8,8 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-using SqlSugar;
-
 using ThingsGateway.Admin.Application;
+using ThingsGateway.SqlSugar;
 
 namespace ThingsGateway.Admin.Razor;
 

src/Admin/ThingsGateway.Admin.Razor/Pages/Position/PositionTree.razor.cs

@@ -8,10 +8,9 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-using SqlSugar;
-
 using ThingsGateway.Admin.Application;
 using ThingsGateway.NewLife.Extension;
+using ThingsGateway.SqlSugar;
 
 namespace ThingsGateway.Admin.Razor;
 

src/Admin/ThingsGateway.Admin.Razor/Pages/Role/RoleTree.razor.cs

@@ -8,10 +8,9 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-using SqlSugar;
-
 using ThingsGateway.Admin.Application;
 using ThingsGateway.NewLife.Extension;
+using ThingsGateway.SqlSugar;
 
 namespace ThingsGateway.Admin.Razor;
 

src/Admin/ThingsGateway.Admin.Razor/Pages/User/SysUserAvatarEdit.razor

@@ -1,7 +0,0 @@
-@namespace ThingsGateway.Admin.Razor
-@using ThingsGateway.Admin.Application
-
-    <AvatarUpload @bind-Value="@Picture" DisplayText=@AdminLocalizer["Picture"] IsSingle Accept="image/*" OnChange="OnAvatarUpload" DefaultFileList=PreviewFileList></AvatarUpload>
-
-
-

src/Admin/ThingsGateway.Admin.Razor/Pages/User/SysUserAvatarEdit.razor.cs

@@ -1,73 +0,0 @@
-//------------------------------------------------------------------------------
-//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
-//  此代码版权（除特别声明外的代码）归作者本人Diego所有
-//  源代码使用协议遵循本仓库的开源协议及附加协议
-//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
-//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
-//  使用文档：https://thingsgateway.cn/
-//  QQ群：605534569
-//------------------------------------------------------------------------------
-
-using Microsoft.AspNetCore.Components.Forms;
-
-using ThingsGateway.Admin.Application;
-
-namespace ThingsGateway.Admin.Razor;
-
-public partial class SysUserAvatarEdit : IDisposable
-{
-    private List<UploadFile> PreviewFileList;
-
-    [Parameter]
-    [NotNull]
-    public SysUser? Model { get; set; }
-
-    [FileValidation(Extensions = [".png", ".jpg", ".jpeg"], FileSize = 200 * 1024)]
-    public IBrowserFile? Picture { get; set; }
-
-    [Inject]
-    private IStringLocalizer<ThingsGateway.Admin.Razor._Imports> AdminLocalizer { get; set; }
-
-    private CancellationTokenSource? ReadAvatarToken { get; set; }
-
-    [Inject]
-    [NotNull]
-    private ToastService ToastService { get; set; }
-
-    public void Dispose()
-    {
-        ReadAvatarToken?.Cancel();
-        GC.SuppressFinalize(this);
-    }
-
-    protected override Task OnParametersSetAsync()
-    {
-        PreviewFileList = new(new[] { new UploadFile { PrevUrl = Model.Avatar } });
-        return base.OnParametersSetAsync();
-    }
-
-    private async Task OnAvatarUpload(UploadFile file)
-    {
-        if (file?.File != null)
-        {
-            var format = file.File.ContentType;
-            ReadAvatarToken ??= new CancellationTokenSource();
-            if (ReadAvatarToken.IsCancellationRequested)
-            {
-                ReadAvatarToken.Dispose();
-                ReadAvatarToken = new CancellationTokenSource();
-            }
-
-            await file.RequestBase64ImageFileAsync(format, 640, 480, 1024 * 200, ReadAvatarToken.Token);
-
-            if (file.Code != 0)
-            {
-                await ToastService.Error($"{file.Error} ");
-            }
-            else
-            {
-                Model.Avatar = file.PrevUrl;
-            }
-        }
-    }
-}

src/Admin/ThingsGateway.Admin.Razor/Pages/User/SysUserEdit.razor

@@ -3,7 +3,7 @@
 <div class="row g-2 mx-1 form-inline">
 
     <div class="col-12  col-md-12">
-        <SysUserAvatarEdit Model="Model"></SysUserAvatarEdit>
+        <AvatarUpload @bind-Value="@Picture" DisplayText=@AdminLocalizer["Picture"] IsMultiple=false Accept="image/*" OnChange="OnAvatarUpload" DefaultFileList=PreviewFileList></AvatarUpload>
     </div>
 
     <div class="col-12  col-md-6">

src/Admin/ThingsGateway.Admin.Razor/Pages/User/SysUserEdit.razor.cs

@@ -8,6 +8,8 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
+using Microsoft.AspNetCore.Components.Forms;
+
 using ThingsGateway.Admin.Application;
 using ThingsGateway.NewLife.Extension;
 
@@ -45,4 +47,55 @@ public partial class SysUserEdit
         Model.OrgId = items.LastOrDefault()?.Parent?.Value?.ToLong() ?? 0;
         return Task.CompletedTask;
     }
+    [Inject]
+    ToastService ToastService { get; set; }
+
+    #region 头像
+
+    private List<UploadFile> PreviewFileList;
+
+    [FileValidation(Extensions = [".png", ".jpg", ".jpeg"], FileSize = 200 * 1024)]
+    public IBrowserFile? Picture { get; set; }
+
+
+    private CancellationTokenSource? ReadAvatarToken { get; set; }
+
+    public void Dispose()
+    {
+        ReadAvatarToken?.Cancel();
+        GC.SuppressFinalize(this);
+    }
+
+    protected override void OnInitialized()
+    {
+        PreviewFileList = new(new[] { new UploadFile { PrevUrl = Model.Avatar } });
+        base.OnInitialized();
+    }
+
+    private async Task OnAvatarUpload(UploadFile file)
+    {
+        if (file?.File != null)
+        {
+            var format = file.File.ContentType;
+            ReadAvatarToken ??= new CancellationTokenSource();
+            if (ReadAvatarToken.IsCancellationRequested)
+            {
+                ReadAvatarToken.Dispose();
+                ReadAvatarToken = new CancellationTokenSource();
+            }
+
+            await file.RequestBase64ImageFileAsync(format, 640, 480, 1024 * 200, token: ReadAvatarToken.Token);
+
+            if (file.Code != 0)
+            {
+                await ToastService.Error($"{file.Error} ");
+            }
+            else
+            {
+                Model.Avatar = file.PrevUrl;
+            }
+        }
+    }
+
+    #endregion 头像
 }

src/Admin/ThingsGateway.Admin.Razor/Pages/UserCenter/UserInfoEditComponent.razor

@@ -4,7 +4,7 @@
 
 <ValidateForm class="p-4" Model="@Model" OnValidSubmit="OnSave">
 
-    <AvatarUpload @bind-Value="@Picture" DisplayText=@AdminLocalizer["Picture"] IsSingle Accept="image/*" OnChange="OnAvatarUpload" DefaultFileList=PreviewFileList></AvatarUpload>
+    <AvatarUpload @bind-Value="@Picture" DisplayText=@AdminLocalizer["Picture"] IsMultiple=false Accept="image/*" OnChange="OnAvatarUpload" DefaultFileList=PreviewFileList></AvatarUpload>
 
     <BootstrapInput @bind-Value=@Model.Phone></BootstrapInput>
     <BootstrapInput @bind-Value=@Model.Email></BootstrapInput>

src/Admin/ThingsGateway.Admin.Razor/Pages/UserCenter/UserInfoEditComponent.razor.cs

@@ -40,10 +40,10 @@ public partial class UserInfoEditComponent
         GC.SuppressFinalize(this);
     }
 
-    protected override Task OnParametersSetAsync()
+    protected override void OnInitialized()
     {
         PreviewFileList = new(new[] { new UploadFile { PrevUrl = Model.Avatar } });
-        return base.OnParametersSetAsync();
+        base.OnInitialized();
     }
 
     private async Task OnAvatarUpload(UploadFile file)
@@ -58,7 +58,7 @@ public partial class UserInfoEditComponent
                 ReadAvatarToken = new CancellationTokenSource();
             }
 
-            await file.RequestBase64ImageFileAsync(format, 640, 480, 1024 * 200, ReadAvatarToken.Token);
+            await file.RequestBase64ImageFileAsync(format, 640, 480, 1024 * 200, token: ReadAvatarToken.Token);
 
             if (file.Code != 0)
             {

src/Admin/ThingsGateway.Admin.Razor/ThingsGateway.Admin.Razor.csproj

@@ -9,10 +9,10 @@
 	</ItemGroup>
 
 	<ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
-		<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="8.0.16" />
+		<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="$(NET8Version)" />
 	</ItemGroup>
 	<ItemGroup Condition="'$(TargetFramework)'=='net9.0'">
-		<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="9.0.5" />
+		<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="$(NET9Version)" />
 	</ItemGroup>
 
 	<PropertyGroup>

src/Admin/ThingsGateway.AdminServer/GlobalUsings.cs

@@ -1 +1 @@
-global using ThingsGateway.Admin.Application;
+

src/Admin/ThingsGateway.AdminServer/Index/AdminIndex.razor.cs

@@ -18,6 +18,7 @@ using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Components;
 using Microsoft.Extensions.Localization;
 
+using ThingsGateway.Admin.Application;
 using ThingsGateway.Admin.Razor;
 using ThingsGateway.Extension;
 

src/Admin/ThingsGateway.AdminServer/Layout/AccessDenied.razor.cs

@@ -13,6 +13,8 @@ using Microsoft.Extensions.Localization;
 
 using System.Diagnostics.CodeAnalysis;
 
+using ThingsGateway.Admin.Application;
+
 namespace ThingsGateway.AdminServer;
 
 public partial class AccessDenied

src/Admin/ThingsGateway.AdminServer/Layout/Login.razor.cs

@@ -20,6 +20,7 @@ using Microsoft.Extensions.Options;
 
 using System.Diagnostics.CodeAnalysis;
 
+using ThingsGateway.Admin.Application;
 using ThingsGateway.DataEncryption;
 using ThingsGateway.NewLife.Extension;
 using ThingsGateway.Razor;

src/Admin/ThingsGateway.AdminServer/Layout/MainLayout.razor.cs

@@ -17,6 +17,7 @@ using Microsoft.Extensions.Options;
 
 using System.Diagnostics.CodeAnalysis;
 
+using ThingsGateway.Admin.Application;
 using ThingsGateway.Admin.Razor;
 using ThingsGateway.Razor;
 

src/Admin/ThingsGateway.AdminServer/Program/Startup.cs

@@ -25,6 +25,7 @@ using System.Text;
 using System.Text.Encodings.Web;
 using System.Text.Unicode;
 
+using ThingsGateway.Admin.Application;
 using ThingsGateway.Admin.Razor;
 using ThingsGateway.Extension;
 using ThingsGateway.NewLife.Caching;

src/Admin/ThingsGateway.AdminServer/ThingsGateway.AdminServer.csproj

@@ -45,7 +45,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.Data.Sqlite" Version="9.0.5" />
+		<PackageReference Include="Microsoft.Data.Sqlite" Version="$(NET9Version)" />
 	</ItemGroup>
 	<!--安装服务守护-->
 	<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
@@ -54,8 +54,8 @@
 		<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="8.0.1" />
 	</ItemGroup>
 	<ItemGroup Condition=" '$(TargetFramework)' == 'net9.0' ">
-		<PackageReference Include="Microsoft.Extensions.Hosting.Systemd" Version="9.0.5" />
-		<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="9.0.5" />
+		<PackageReference Include="Microsoft.Extensions.Hosting.Systemd" Version="$(NET9Version)" />
+		<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="$(NET9Version)" />
 	</ItemGroup>
 	
 	<ItemGroup>

src/Admin/ThingsGateway.DB/Entity/BaseEntity.cs

@@ -10,10 +10,10 @@
 
 using BootstrapBlazor.Components;
 
-using SqlSugar;
-
 using System.Diagnostics.CodeAnalysis;
 
+using ThingsGateway.SqlSugar;
+
 namespace ThingsGateway.Admin.Application;
 
 /// <summary>

src/Admin/ThingsGateway.DB/Extensions/QueryPageOptionsExtensions.cs

@@ -10,7 +10,7 @@
 
 using BootstrapBlazor.Components;
 
-using SqlSugar;
+using ThingsGateway.SqlSugar;
 
 namespace ThingsGateway.Admin.Application;
 

src/Admin/ThingsGateway.DB/Extensions/SqlSugarExtensions.cs

@@ -8,11 +8,11 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-using SqlSugar;
-
 using System.Linq.Expressions;
 using System.Reflection;
 
+using ThingsGateway.SqlSugar;
+
 namespace ThingsGateway.Admin.Application;
 
 /// <inheritdoc/>

src/Admin/ThingsGateway.DB/Services/SugarAopService/ISugarAopService.cs

@@ -9,7 +9,7 @@
 //------------------------------------------------------------------------------
 
 
-using SqlSugar;
+using ThingsGateway.SqlSugar;
 
 namespace ThingsGateway.Admin.Application;
 

src/Admin/ThingsGateway.DB/Services/SugarAopService/SugarAopService.cs

@@ -11,7 +11,7 @@
 
 using Microsoft.Extensions.Hosting;
 
-using SqlSugar;
+using ThingsGateway.SqlSugar;
 
 namespace ThingsGateway.Admin.Application;
 

src/Admin/ThingsGateway.DB/Services/SugarService/BaseService.cs

@@ -12,7 +12,7 @@ using BootstrapBlazor.Components;
 
 using Microsoft.Extensions.Localization;
 
-using SqlSugar;
+using ThingsGateway.SqlSugar;
 
 namespace ThingsGateway.Admin.Application;
 

src/Admin/ThingsGateway.DB/SqlSugar/CodeFirstUtils.cs

@@ -8,12 +8,12 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-using SqlSugar;
-
 using System.Collections;
 using System.Data;
 using System.Reflection;
 
+using ThingsGateway.SqlSugar;
+
 namespace ThingsGateway.Admin.Application;
 
 /// <summary>

src/Admin/ThingsGateway.DB/SqlSugar/DbContext.cs

@@ -10,10 +10,9 @@
 
 using Microsoft.Extensions.DependencyInjection;
 
-using SqlSugar;
-
 using ThingsGateway.Extension;
 using ThingsGateway.NewLife.Log;
+using ThingsGateway.SqlSugar;
 
 namespace ThingsGateway.Admin.Application;
 

src/Admin/ThingsGateway.DB/SqlSugar/SeedDataUtil.cs

@@ -13,12 +13,11 @@ using BootstrapBlazor.Components;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
-using SqlSugar;
-
 using System.Reflection;
 using System.Text.RegularExpressions;
 
 using ThingsGateway.NewLife;
+using ThingsGateway.SqlSugar;
 
 namespace ThingsGateway.Admin.Application;
 /// <summary>

src/Admin/ThingsGateway.DB/SqlSugar/SqlSugarOptions.cs

@@ -8,9 +8,8 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-using SqlSugar;
-
 using ThingsGateway.ConfigurableOptions;
+using ThingsGateway.SqlSugar;
 
 namespace ThingsGateway.Admin.Application;
 

src/Admin/ThingsGateway.DB/Startup.cs

@@ -13,7 +13,7 @@ using BootstrapBlazor.Components;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.DependencyInjection;
 
-using SqlSugar;
+using ThingsGateway.SqlSugar;
 
 namespace ThingsGateway.Admin.Application;
 

src/Admin/ThingsGateway.Furion/ThingsGateway.Furion.csproj

@@ -43,18 +43,18 @@
 	</ItemGroup>
 
 	<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
-		<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.16" />
-		<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.16" />
+		<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="$(NET8Version)" />
+		<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="$(NET8Version)" />
 		<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="8.0.2" />
 		<PackageReference Include="System.Reflection.MetadataLoadContext" Version="8.0.1" />
 		<PackageReference Include="System.Text.Json" Version="8.0.5" />
 	</ItemGroup>
 	<ItemGroup Condition=" '$(TargetFramework)' == 'net9.0' ">
-		<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="9.0.5" />
-		<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="9.0.5" />
-		<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="9.0.5" />
-		<PackageReference Include="System.Reflection.MetadataLoadContext" Version="9.0.5" />
-		<PackageReference Include="System.Text.Json" Version="9.0.5" />
+		<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="$(NET9Version)" />
+		<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="$(NET9Version)" />
+		<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="$(NET9Version)" />
+		<PackageReference Include="System.Reflection.MetadataLoadContext" Version="$(NET9Version)" />
+		<PackageReference Include="System.Text.Json" Version="$(NET9Version)" />
 
 	</ItemGroup>
 

src/Admin/ThingsGateway.Photino.Blazor/ThingsGateway.Photino.Blazor.csproj

@@ -13,10 +13,10 @@
 
 	
 	<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
-		<PackageReference Include="Microsoft.AspNetCore.Components.WebView" Version="8.0.16" />
+		<PackageReference Include="Microsoft.AspNetCore.Components.WebView" Version="$(NET8Version)" />
 	</ItemGroup>
 	<ItemGroup Condition=" '$(TargetFramework)' == 'net9.0' ">
-		<PackageReference Include="Microsoft.AspNetCore.Components.WebView" Version="9.0.5" />
+		<PackageReference Include="Microsoft.AspNetCore.Components.WebView" Version="$(NET9Version)" />
 	</ItemGroup>
 
 </Project>

src/Admin/ThingsGateway.Razor/ThingsGateway.Razor.csproj

@@ -7,7 +7,7 @@
 	</PropertyGroup>
 	<ItemGroup>
 		<PackageReference Include="BootstrapBlazor.FontAwesome" Version="9.0.2" />
-		<PackageReference Include="BootstrapBlazor" Version="9.7.0" />
+		<PackageReference Include="BootstrapBlazor" Version="9.7.2" />
 		<PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />
 	</ItemGroup>
 

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);
 }

src/Admin/ThingsGateway.SqlSugar/GlobalUsings.cs

@@ -8,6 +8,5 @@
 //  QQ群：605534569
 //------------------------------------------------------------------------------
 
-global using SqlSugar.TDengineAdo;
-
-global using ThingsGateway.NewLife.Extension;
+global using ThingsGateway.NewLife.Extension;
+global using ThingsGateway.SqlSugar.TDengineAdo;

src/Admin/ThingsGateway.SqlSugar/QuestDb/CsvHelperEnumToIntConverter.cs

@@ -2,7 +2,7 @@
 using CsvHelper.Configuration;
 using CsvHelper.TypeConversion;
 
-namespace SqlSugar
+namespace ThingsGateway.SqlSugar
 {
     public class CsvHelperEnumToIntConverter : ITypeConverter
     {

src/Admin/ThingsGateway.SqlSugar/QuestDb/QuestDbPageSizeBulkCopy.cs

@@ -1,4 +1,4 @@
-namespace SqlSugar
+namespace ThingsGateway.SqlSugar
 {
     public class QuestDbPageSizeBulkCopy
     {

src/Admin/ThingsGateway.SqlSugar/QuestDb/QuestDbRestAPHelper.cs

@@ -1,7 +1,7 @@
 using System.Data.Common;
 using System.Text;
 
-namespace SqlSugar
+namespace ThingsGateway.SqlSugar
 {
     internal static class QuestDbRestAPHelper
     {

src/Admin/ThingsGateway.SqlSugar/QuestDb/QuestDbRestAPI.cs

@@ -10,7 +10,7 @@ using System.Globalization;
 using System.Net.Http.Headers;
 using System.Text;
 using System.Web;
-namespace SqlSugar
+namespace ThingsGateway.SqlSugar
 {
     /// <summary>
     /// QuestDb RestAPI

src/Admin/ThingsGateway.SqlSugar/QuestDb/QuestDbSqlSugarClientExtensions.cs

@@ -1,4 +1,4 @@
-namespace SqlSugar
+namespace ThingsGateway.SqlSugar
 {
     public static class QuestDbSqlSugarClientExtensions
     {

src/Admin/ThingsGateway.SqlSugar/Sugar/Abstract/AdoProvider/AdoAccessory.cs

@@ -1,7 +1,7 @@
 using System.Data;
 using System.Reflection;
 
-namespace SqlSugar
+namespace ThingsGateway.SqlSugar
 {
     public partial class AdoAccessory
     {

src/Admin/ThingsGateway.SqlSugar/Sugar/Abstract/AdoProvider/AdoProvider.cs

@@ -3,7 +3,7 @@ using System.Data;
 using System.Data.Common;
 using System.Reflection;
 using System.Text.RegularExpressions;
-namespace SqlSugar
+namespace ThingsGateway.SqlSugar
 {
     ///<summary>
     /// ** description：ActiveX Data Objects

src/Admin/ThingsGateway.SqlSugar/Sugar/Abstract/AopProvider/AopProvider.cs

@@ -1,6 +1,6 @@
 using System.Data;
 
-namespace SqlSugar
+namespace ThingsGateway.SqlSugar
 {
     public class AopProvider
     {

src/Admin/ThingsGateway.SqlSugar/Sugar/Abstract/CacheProvider/CacheProvider.cs

@@ -1,4 +1,4 @@
-namespace SqlSugar
+namespace ThingsGateway.SqlSugar
 {
     public class SugarCacheProvider
     {

src/Admin/ThingsGateway.SqlSugar/Sugar/Abstract/CodeFirstProvider/CodeFirstProvider.cs

@@ -2,7 +2,7 @@
 using System.Text;
 using System.Text.RegularExpressions;
 
-namespace SqlSugar
+namespace ThingsGateway.SqlSugar
 {
     public partial class CodeFirstProvider : ICodeFirst
     {

src/Admin/ThingsGateway.SqlSugar/Sugar/Abstract/CodeFirstProvider/SplitCodeFirstProvider.cs

@@ -1,6 +1,6 @@
 using System.Reflection;
 
-namespace SqlSugar
+namespace ThingsGateway.SqlSugar
 {
     public class SplitCodeFirstProvider
     {

src/Admin/ThingsGateway.SqlSugar/Sugar/Abstract/CodeFirstProvider/TableDifferenceProvider.cs

@@ -1,5 +1,5 @@
 using System.Text;
-namespace SqlSugar
+namespace ThingsGateway.SqlSugar
 {
     public class TableDifferenceProvider
     {

src/Admin/ThingsGateway.SqlSugar/Sugar/Abstract/DbBindProvider/DbBindAccessory.cs

@@ -2,7 +2,7 @@
 using System.Data.Common;
 using System.Text;
 
-namespace SqlSugar
+namespace ThingsGateway.SqlSugar
 {
     public partial class DbBindAccessory
     {

src/Admin/ThingsGateway.SqlSugar/Sugar/Abstract/DbBindProvider/DbBindProvider.cs

@@ -2,7 +2,7 @@
 using System.Data;
 using System.Reflection;
 
-namespace SqlSugar
+namespace ThingsGateway.SqlSugar
 {
     public abstract partial class DbBindProvider : DbBindAccessory, IDbBind
     {

src/Admin/ThingsGateway.SqlSugar/Sugar/Abstract/DbBindProvider/IDataReaderEntityBuilder.cs

@@ -3,7 +3,7 @@ using System.Reflection;
 using System.Reflection.Emit;
 using System.Xml.Linq;
 
-namespace SqlSugar
+namespace ThingsGateway.SqlSugar
 {
     ///<summary>
     /// ** description：IDataReader Entity Builder

src/Admin/ThingsGateway.SqlSugar/Sugar/Abstract/DbBindProvider/IDataRecordExtensions.cs

@@ -1,7 +1,7 @@
 using System.Data;
 using System.Xml.Linq;
 
-namespace SqlSugar
+namespace ThingsGateway.SqlSugar
 {
     public static partial class IDataRecordExtensions
     {

src/Admin/ThingsGateway.SqlSugar/Sugar/Abstract/DbFirstProvider/DbFirstProvider.cs

@@ -1,7 +1,7 @@
 using System.Text;
 using System.Text.RegularExpressions;
 
-namespace SqlSugar
+namespace ThingsGateway.SqlSugar
 {
     public abstract partial class DbFirstProvider : IDbFirst
     {

src/Admin/ThingsGateway.SqlSugar/Sugar/Abstract/DbFirstProvider/DbFirstTemplate.cs

@@ -1,6 +1,6 @@
 using System.Text;
 
-namespace SqlSugar
+namespace ThingsGateway.SqlSugar
 {
     public static class DbFirstTemplate
     {

src/Admin/ThingsGateway.SqlSugar/Sugar/Abstract/DbFirstProvider/DbRazor.cs

@@ -1,6 +1,6 @@
 using System.Text;
 
-namespace SqlSugar
+namespace ThingsGateway.SqlSugar
 {
     public class RazorFirst
     {
@@ -11,7 +11,7 @@ namespace SqlSugar
 @"using System;
 using System.Linq;
 using System.Text;
-using SqlSugar;
+using ThingsGateway.SqlSugar;
 namespace @Model.Namespace 
 {
     ///<summary>
@@ -31,7 +31,7 @@ namespace @Model.Namespace
          @:/// Default:@item.DefaultValue
          @:/// Nullable:@item.IsNullable
          @:/// </summary>     
-         @:[SqlSugar.SugarColumn(IsPrimaryKey = true, IsIdentity = true)]      
+         @:[ThingsGateway.SqlSugar.SugarColumn(IsPrimaryKey = true, IsIdentity = true)]      
          @:public @item.DataType @item.DbColumnName {get;set;}
          }
         else if(item.IsPrimarykey)
@@ -41,7 +41,7 @@ namespace @Model.Namespace
          @:/// Default:@item.DefaultValue
          @:/// Nullable:@item.IsNullable
          @:/// </summary>    
-         @:[SqlSugar.SugarColumn(IsPrimaryKey = true)]       
+         @:[ThingsGateway.SqlSugar.SugarColumn(IsPrimaryKey = true)]       
          @:public @item.DataType @item.DbColumnName {get;set;}
          } 
         else if(item.IsIdentity)
@@ -51,7 +51,7 @@ namespace @Model.Namespace
          @:/// Default:@item.DefaultValue
          @:/// Nullable:@item.IsNullable
          @:/// </summary>       
-         @:[SqlSugar.SugarColumn(IsIdentity = true)]    
+         @:[ThingsGateway.SqlSugar.SugarColumn(IsIdentity = true)]    
          @:public @item.DataType @item.DbColumnName {get;set;}
          }
          else

src/Admin/ThingsGateway.SqlSugar/Sugar/Abstract/DbMaintenanceProvider/Methods.cs

@@ -1,7 +1,7 @@
 using System.Reflection;
 using System.Text.RegularExpressions;
 
-namespace SqlSugar
+namespace ThingsGateway.SqlSugar
 {
     public abstract partial class DbMaintenanceProvider : IDbMaintenance
     {
@@ -886,20 +886,20 @@ namespace SqlSugar
             var isMax = item.Length > 4000 || item.Length == -1;
             if (isMax)
             {
-                dataSize = item.Length > 0 ? string.Format("({0})", "max") : null;
+                dataSize = item?.Length > 0 ? string.Format("({0})", "max") : null;
             }
             else if (item.Length == 0 && item.DecimalDigits > 0)
             {
                 item.Length = 10;
                 dataSize = string.Format("({0},{1})", item.Length, item.DecimalDigits);
             }
-            else if (item.Length > 0 && item.DecimalDigits == 0)
+            else if (item?.Length > 0 && item.DecimalDigits == 0)
             {
-                dataSize = item.Length > 0 ? string.Format("({0})", item.Length) : null;
+                dataSize = item?.Length > 0 ? string.Format("({0})", item.Length) : null;
             }
-            else if (item.Length > 0 && item.DecimalDigits > 0)
+            else if (item?.Length > 0 && item.DecimalDigits > 0)
             {
-                dataSize = item.Length > 0 ? string.Format("({0},{1})", item.Length, item.DecimalDigits) : null;
+                dataSize = item?.Length > 0 ? string.Format("({0},{1})", item.Length, item.DecimalDigits) : null;
             }
             return dataSize;
         }

src/Admin/ThingsGateway.SqlSugar/Sugar/Abstract/DbMaintenanceProvider/Properties.cs

@@ -1,4 +1,4 @@
-namespace SqlSugar
+namespace ThingsGateway.SqlSugar
 {
     public abstract partial class DbMaintenanceProvider : IDbMaintenance
     {

src/Admin/ThingsGateway.SqlSugar/Sugar/Abstract/DeleteProvider/DeleteMethodInfo.cs

@@ -1,6 +1,6 @@
 using System.Reflection;
 
-namespace SqlSugar
+namespace ThingsGateway.SqlSugar
 {
     public class DeleteMethodInfo
     {

src/Admin/ThingsGateway.SqlSugar/Sugar/Abstract/DeleteProvider/DeleteNavMethodInfo.cs

@@ -1,6 +1,6 @@
 using System.Linq.Expressions;
 
-namespace SqlSugar
+namespace ThingsGateway.SqlSugar
 {
     public class DeleteNavMethodInfo
     {

src/Admin/ThingsGateway.SqlSugar/Sugar/Abstract/DeleteProvider/DeleteablePage.cs

@@ -1,4 +1,4 @@
-namespace SqlSugar
+namespace ThingsGateway.SqlSugar
 {
     public class DeleteablePage<T> where T : class, new()
     {

src/Admin/ThingsGateway.SqlSugar/Sugar/Abstract/DeleteProvider/DeleteableProvider.cs

@@ -4,7 +4,7 @@ using System.Linq.Expressions;
 using System.Text;
 using System.Text.RegularExpressions;
 
-namespace SqlSugar
+namespace ThingsGateway.SqlSugar
 {
     public class DeleteableProvider<T> : IDeleteable<T> where T : class, new()
     {

src/Admin/ThingsGateway.SqlSugar/Sugar/Abstract/DeleteProvider/LogicDeleteProvider.cs

@@ -1,4 +1,4 @@
-namespace SqlSugar
+namespace ThingsGateway.SqlSugar
 {
     public class LogicDeleteProvider<T> where T : class, new()
     {

src/Admin/ThingsGateway.SqlSugar/Sugar/Abstract/DeleteProvider/SplitTableDeleteByObjectProvider.cs

@@ -1,6 +1,6 @@
 using System.Reflection;
 
-namespace SqlSugar
+namespace ThingsGateway.SqlSugar
 {
     public class SplitTableDeleteByObjectProvider<T> where T : class, new()
     {

src/Admin/ThingsGateway.SqlSugar/Sugar/Abstract/DeleteProvider/SplitTableDeleteProvider.cs

@@ -1,6 +1,6 @@
 using System.Text.RegularExpressions;
 
-namespace SqlSugar
+namespace ThingsGateway.SqlSugar
 {
     public class SplitTableDeleteProvider<T> where T : class, new()
     {

src/Admin/ThingsGateway.SqlSugar/Sugar/Abstract/DynamicBuilder/CommonMethodInfo.cs

@@ -1,4 +1,4 @@
-namespace SqlSugar
+namespace ThingsGateway.SqlSugar
 {
     public class CommonMethodInfo
     {

src/Admin/ThingsGateway.SqlSugar/Sugar/Abstract/DynamicBuilder/DynamicBuilderHelper.cs

@@ -1,7 +1,7 @@
 using System.Reflection;
 using System.Reflection.Emit;
 
-namespace SqlSugar
+namespace ThingsGateway.SqlSugar
 {
     public static class DynamicBuilderHelper
     {

src/Admin/ThingsGateway.SqlSugar/Sugar/Abstract/DynamicBuilder/DynamicOneselfType.cs

@@ -1,4 +1,4 @@
-namespace SqlSugar
+namespace ThingsGateway.SqlSugar
 {
     /// <summary>
     /// Dynamically construct Type, the property is self, with this type

src/Admin/ThingsGateway.SqlSugar/Sugar/Abstract/DynamicBuilder/DynamicProperyBuilder.cs

@@ -1,7 +1,7 @@
 using System.Reflection;
 using System.Reflection.Emit;
 
-namespace SqlSugar
+namespace ThingsGateway.SqlSugar
 {
 
     public class DynamicProperyBuilder

src/Admin/ThingsGateway.SqlSugar/Sugar/Abstract/DynamicBuilder/EmitTool.cs

@@ -1,7 +1,7 @@
 using System.Reflection;
 using System.Reflection.Emit;
 
-namespace SqlSugar
+namespace ThingsGateway.SqlSugar
 {
     internal static class EmitTool
     {

src/Admin/ThingsGateway.SqlSugar/Sugar/Abstract/DynamicBuilder/Helper.cs

@@ -1,7 +1,7 @@
 using System.Reflection;
 using System.Reflection.Emit;
 
-namespace SqlSugar
+namespace ThingsGateway.SqlSugar
 {
     public partial class DynamicBuilder
     {

src/Admin/ThingsGateway.SqlSugar/Sugar/Abstract/DynamicBuilder/Master.cs

@@ -1,7 +1,7 @@
 using System.Reflection;
 using System.Reflection.Emit;
 
-namespace SqlSugar
+namespace ThingsGateway.SqlSugar
 {
     public partial class DynamicBuilder
     {

src/Admin/ThingsGateway.SqlSugar/Sugar/Abstract/EntityMaintenance/EntityColumnExtension.cs

@@ -1,6 +1,6 @@
 using System.Linq.Expressions;
 
-namespace SqlSugar
+namespace ThingsGateway.SqlSugar
 {
     public static class EntityColumnExtension
     {

src/Admin/ThingsGateway.SqlSugar/Sugar/Abstract/EntityMaintenance/EntityMaintenance.cs

@@ -1,9 +1,9 @@
-using SqlSugar.DbConvert;
-
-using System.Reflection;
+using System.Reflection;
 using System.Xml.Linq;
 
-namespace SqlSugar
+using ThingsGateway.SqlSugar.DbConvert;
+
+namespace ThingsGateway.SqlSugar
 {
     public class EntityMaintenance
     {
@@ -374,7 +374,7 @@ namespace SqlSugar
                             {
                                 column.DataType = "json";
                             }
-                            else if (column.Length > 0)
+                            else if (column?.Length > 0)
                             {
                                 column.DataType = "varchar";
                             }

src/Admin/ThingsGateway.SqlSugar/Sugar/Abstract/ExecuteNavProvider/DeleteNavManyToMany.cs

@@ -1,4 +1,4 @@
-namespace SqlSugar
+namespace ThingsGateway.SqlSugar
 {
     public partial class DeleteNavProvider<Root, T> where T : class, new() where Root : class, new()
     {

src/Admin/ThingsGateway.SqlSugar/Sugar/Abstract/ExecuteNavProvider/DeleteNavOneToMany.cs

@@ -1,4 +1,4 @@
-namespace SqlSugar
+namespace ThingsGateway.SqlSugar
 {
     public partial class DeleteNavProvider<Root, T> where T : class, new() where Root : class, new()
     {

src/Admin/ThingsGateway.SqlSugar/Sugar/Abstract/ExecuteNavProvider/DeleteNavOneToOne.cs

@@ -1,4 +1,4 @@
-namespace SqlSugar
+namespace ThingsGateway.SqlSugar
 {
     public partial class DeleteNavProvider<Root, T> where T : class, new() where Root : class, new()
     {

src/Admin/ThingsGateway.SqlSugar/Sugar/Abstract/ExecuteNavProvider/DeleteNavProvider.cs

@@ -1,6 +1,6 @@
 using System.Linq.Expressions;
 
-namespace SqlSugar
+namespace ThingsGateway.SqlSugar
 {
     public partial class DeleteNavProvider<Root, T> where T : class, new() where Root : class, new()
     {

src/Admin/ThingsGateway.SqlSugar/Sugar/Abstract/ExecuteNavProvider/DeleteNavTask.cs

@@ -1,6 +1,6 @@
 using System.Linq.Expressions;
 
-namespace SqlSugar
+namespace ThingsGateway.SqlSugar
 {
     public class DeleteNavTaskInit<Root, T> where T : class, new() where Root : class, new()
     {