g82tt/ThingsGateway
1
0
Fork 0
mirror of https://gitee.com/ThingsGateway/ThingsGateway.git synced 2025-10-21 19:14:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

适配net10

Browse Source
This commit is contained in:
2248356998 qq.com
2025-09-29 17:47:24 +08:00
parent 156ed88bd6
commit bd4ce7c09b
6 changed files with 39 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Admin/ThingsGateway.Admin.Application/SeedData/Admin/seed_sys_resource.json
View File

@@ -26,7 +26,7 @@
"Module": 2, "Module": 2,
"Title": "权限管理", "Title": "权限管理",
"Code": "System", "Code": "System",
"NavLinkMatch": "All", "NavLinkMatch": "Prefix",
"Category": "MENU", "Category": "MENU",
"Target": "_self", "Target": "_self",
"Href": null, "Href": null,
@@ -47,7 +47,7 @@
"ParentId": 0, "ParentId": 0,
"Module": 2, "Module": 2,
"Title": "系统运维", "Title": "系统运维",
"NavLinkMatch": "All", "NavLinkMatch": "Prefix",
"Code": "System", "Code": "System",
"Category": "MENU", "Category": "MENU",
"Target": "_self", "Target": "_self",

13
src/Admin/ThingsGateway.Admin.Razor/Context/BlazorAppContext.cs
View File

@@ -125,13 +125,22 @@ public class BlazorAppContext
var ownMenus = OwnMenus.Where(a => a.Module == CurrentModuleId); var ownMenus = OwnMenus.Where(a => a.Module == CurrentModuleId);
OwnMenuItems = AdminResourceUtil.BuildMenuTrees(ownMenus).ToList(); OwnMenuItems = AdminResourceUtil.BuildMenuTrees(ownMenus).ToList();
AllOwnMenuItems = AdminResourceUtil.BuildMenuTrees(OwnMenus).ToList(); AllOwnMenuItems = AdminResourceUtil.BuildMenuTrees(OwnMenus).ToList();
OwnSameLevelMenuItems = ownMenus.Where(a => !a.Href.IsNullOrWhiteSpace()).Select(item => new MenuItem() OwnSameLevelMenuItems = ownMenus.Where(a => !a.Href.IsNullOrWhiteSpace()).Select(item =>
{ {
Match = item.NavLinkMatch ?? Microsoft.AspNetCore.Components.Routing.NavLinkMatch.All, var menu = new MenuItem()
{
Match = item.NavLinkMatch ?? Microsoft.AspNetCore.Components.Routing.NavLinkMatch.Prefix,
Text = item.Title, Text = item.Title,
Icon = item.Icon, Icon = item.Icon,
Url = item.Href, Url = item.Href,
Target = item.Target.ToString(), Target = item.Target.ToString(),
};
if (menu.Url.IsNullOrEmpty())
{
menu.Match = Microsoft.AspNetCore.Components.Routing.NavLinkMatch.Prefix;
}
return menu;
}).ToList(); }).ToList();
UserWorkbenchOutputs = AllMenus.Where(it => UserWorkBench.Shortcuts.Contains(it.Id)).ToList(); UserWorkbenchOutputs = AllMenus.Where(it => UserWorkBench.Shortcuts.Contains(it.Id)).ToList();
} }

11
src/Admin/ThingsGateway.Admin.Razor/Util/AdminResourceUtil.cs
View File

@@ -41,14 +41,21 @@ public static class AdminResourceUtil
return items return items
.Where(it => it.ParentId == parentId) .Where(it => it.ParentId == parentId)
.Select((item, index) => .Select((item, index) =>
new MenuItem()
{ {
Match = item.NavLinkMatch ?? Microsoft.AspNetCore.Components.Routing.NavLinkMatch.All, var menu = new MenuItem()
{
Match = item.NavLinkMatch ?? Microsoft.AspNetCore.Components.Routing.NavLinkMatch.Prefix,
Text = item.Title, Text = item.Title,
Icon = item.Icon, Icon = item.Icon,
Url = item.Href, Url = item.Href,
Target = item.Target.ToString(), Target = item.Target.ToString(),
Items = BuildMenuTrees(items, item.Id).ToList() Items = BuildMenuTrees(items, item.Id).ToList()
};
if(menu.Url.IsNullOrEmpty())
{
menu.Match = Microsoft.AspNetCore.Components.Routing.NavLinkMatch.Prefix;
}
return menu;
} }
); );
} }

6
src/Directory.Build.props
View File

@@ -1,9 +1,9 @@
<Project> <Project>
<PropertyGroup> <PropertyGroup>
<PluginVersion>10.11.80</PluginVersion> <PluginVersion>10.11.81</PluginVersion>
<ProPluginVersion>10.11.80</ProPluginVersion> <ProPluginVersion>10.11.81</ProPluginVersion>
<DefaultVersion>10.11.80</DefaultVersion> <DefaultVersion>10.11.81</DefaultVersion>
<AuthenticationVersion>10.11.6</AuthenticationVersion> <AuthenticationVersion>10.11.6</AuthenticationVersion>
<SourceGeneratorVersion>10.11.6</SourceGeneratorVersion> <SourceGeneratorVersion>10.11.6</SourceGeneratorVersion>
<NET8Version>8.0.20</NET8Version> <NET8Version>8.0.20</NET8Version>

4
src/Gateway/ThingsGateway.Gateway.Application/SeedData/Gateway/seed_gateway_resource.json
View File

@@ -233,7 +233,7 @@
"Code": "System", "Code": "System",
"Category": "1", "Category": "1",
"Target": "0", "Target": "0",
"NavLinkMatch": "1", "NavLinkMatch": "0",
"CreateTime": "2025-01-14 20:16:18.362", "CreateTime": "2025-01-14 20:16:18.362",
"CreateUserId": "0", "CreateUserId": "0",
"IsDelete": "0", "IsDelete": "0",
@@ -248,7 +248,7 @@
"Code": "System", "Code": "System",
"Category": "1", "Category": "1",
"Target": "0", "Target": "0",
"NavLinkMatch": "1", "NavLinkMatch": "0",
"CreateTime": "2025-01-14 20:16:18.362", "CreateTime": "2025-01-14 20:16:18.362",
"CreateUserId": "0", "CreateUserId": "0",
"IsDelete": "0", "IsDelete": "0",

9
src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/ChannelDeviceTree.razor.cs
View File

@@ -1412,14 +1412,10 @@ EventCallback.Factory.Create<MouseEventArgs>(this, async e =>
await base.OnInitializedAsync(); await base.OnInitializedAsync();
} }
WaitLock WaitLock = new(nameof(ChannelDeviceTree));
private async Task Notify(CancellationToken cancellationToken) private async Task Notify(CancellationToken cancellationToken)
{ {
if (cancellationToken.IsCancellationRequested) return; if (cancellationToken.IsCancellationRequested) return;
if (Disposed) return; if (Disposed) return;
try
{
await WaitLock.WaitAsync(cancellationToken);
await OnClickSearch(SearchText); await OnClickSearch(SearchText);
@@ -1431,11 +1427,6 @@ EventCallback.Factory.Create<MouseEventArgs>(this, async e =>
await InvokeAsync(StateHasChanged); await InvokeAsync(StateHasChanged);
} }
finally
{
WaitLock.Release();
}
}
private static ChannelDeviceTreeItem GetValue(ChannelDeviceTreeItem channelDeviceTreeItem) private static ChannelDeviceTreeItem GetValue(ChannelDeviceTreeItem channelDeviceTreeItem)
{ {