g82tt/ThingsGateway
1
0
Fork 0
mirror of https://gitee.com/ThingsGateway/ThingsGateway.git synced 2025-10-20 10:50:48 +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,
"Title": "权限管理",
"Code": "System",
"NavLinkMatch": "All",
"NavLinkMatch": "Prefix",
"Category": "MENU",
"Target": "_self",
"Href": null,
@@ -47,7 +47,7 @@
"ParentId": 0,
"Module": 2,
"Title": "系统运维",
"NavLinkMatch": "All",
"NavLinkMatch": "Prefix",
"Code": "System",
"Category": "MENU",
"Target": "_self",

21
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);
OwnMenuItems = 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,
Text = item.Title,
Icon = item.Icon,
Url = item.Href,
Target = item.Target.ToString(),
var menu = new MenuItem()
{
Match = item.NavLinkMatch ?? Microsoft.AspNetCore.Components.Routing.NavLinkMatch.Prefix,
Text = item.Title,
Icon = item.Icon,
Url = item.Href,
Target = item.Target.ToString(),
};
if (menu.Url.IsNullOrEmpty())
{
menu.Match = Microsoft.AspNetCore.Components.Routing.NavLinkMatch.Prefix;
}
return menu;
}).ToList();
UserWorkbenchOutputs = AllMenus.Where(it => UserWorkBench.Shortcuts.Contains(it.Id)).ToList();
}

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

@@ -41,15 +41,22 @@ public static class AdminResourceUtil
return items
.Where(it => it.ParentId == parentId)
.Select((item, index) =>
new MenuItem()
{
var menu = new MenuItem()
{
Match = item.NavLinkMatch ?? Microsoft.AspNetCore.Components.Routing.NavLinkMatch.All,
Match = item.NavLinkMatch ?? Microsoft.AspNetCore.Components.Routing.NavLinkMatch.Prefix,
Text = item.Title,
Icon = item.Icon,
Url = item.Href,
Target = item.Target.ToString(),
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>
<PropertyGroup>
<PluginVersion>10.11.80</PluginVersion>
<ProPluginVersion>10.11.80</ProPluginVersion>
<DefaultVersion>10.11.80</DefaultVersion>
<PluginVersion>10.11.81</PluginVersion>
<ProPluginVersion>10.11.81</ProPluginVersion>
<DefaultVersion>10.11.81</DefaultVersion>
<AuthenticationVersion>10.11.6</AuthenticationVersion>
<SourceGeneratorVersion>10.11.6</SourceGeneratorVersion>
<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",
"Category": "1",
"Target": "0",
"NavLinkMatch": "1",
"NavLinkMatch": "0",
"CreateTime": "2025-01-14 20:16:18.362",
"CreateUserId": "0",
"IsDelete": "0",
@@ -248,7 +248,7 @@
"Code": "System",
"Category": "1",
"Target": "0",
"NavLinkMatch": "1",
"NavLinkMatch": "0",
"CreateTime": "2025-01-14 20:16:18.362",
"CreateUserId": "0",
"IsDelete": "0",

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

@@ -1412,29 +1412,20 @@ EventCallback.Factory.Create<MouseEventArgs>(this, async e =>
await base.OnInitializedAsync();
}
WaitLock WaitLock = new(nameof(ChannelDeviceTree));
private async Task Notify(CancellationToken cancellationToken)
{
if (cancellationToken.IsCancellationRequested) return;
if (Disposed) return;
try
await OnClickSearch(SearchText);
Value = GetValue(Value);
if (ChannelDeviceChanged != null)
{
await WaitLock.WaitAsync(cancellationToken);
await OnClickSearch(SearchText);
Value = GetValue(Value);
if (ChannelDeviceChanged != null)
{
await ChannelDeviceChanged.Invoke(Value);
}
await InvokeAsync(StateHasChanged);
}
finally
{
WaitLock.Release();
await ChannelDeviceChanged.Invoke(Value);
}
await InvokeAsync(StateHasChanged);
}
private static ChannelDeviceTreeItem GetValue(ChannelDeviceTreeItem channelDeviceTreeItem)