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

10.10.19

Browse Source
This commit is contained in:
2248356998 qq.com
2025-08-14 05:47:54 +08:00
parent 02ad494a26
commit 21b4695683
3 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Directory.Build.props
View File

@@ -3,7 +3,7 @@
<PropertyGroup> <PropertyGroup>
<PluginVersion>10.10.18</PluginVersion> <PluginVersion>10.10.18</PluginVersion>
<ProPluginVersion>10.10.18</ProPluginVersion> <ProPluginVersion>10.10.18</ProPluginVersion>
<DefaultVersion>10.10.18</DefaultVersion> <DefaultVersion>10.10.19</DefaultVersion>
<AuthenticationVersion>10.10.1</AuthenticationVersion> <AuthenticationVersion>10.10.1</AuthenticationVersion>
<SourceGeneratorVersion>10.10.1</SourceGeneratorVersion> <SourceGeneratorVersion>10.10.1</SourceGeneratorVersion>
<NET8Version>8.0.19</NET8Version> <NET8Version>8.0.19</NET8Version>

2
src/Gateway/ThingsGateway.Gateway.Application/Driver/Collect/CollectBase.cs
View File

@@ -736,10 +736,10 @@ public abstract partial class CollectBase : DriverBase
protected override async Task DisposeAsync(bool disposing) protected override async Task DisposeAsync(bool disposing)
{ {
await base.DisposeAsync(disposing).ConfigureAwait(false);
_linkedCtsCache?.SafeDispose(); _linkedCtsCache?.SafeDispose();
if (ReadWriteLock != null) if (ReadWriteLock != null)
await ReadWriteLock.SafeDisposeAsync().ConfigureAwait(false); await ReadWriteLock.SafeDisposeAsync().ConfigureAwait(false);
await base.DisposeAsync(disposing).ConfigureAwait(false);
} }
#endif #endif

9
src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/Device/DeviceRuntimeInfo1.razor
View File

@@ -58,7 +58,6 @@
</Tooltip> </Tooltip>
} }
}
@if (DeviceRuntime.IsCollect == false && AuthorizeButton("删除缓存")) @if (DeviceRuntime.IsCollect == false && AuthorizeButton("删除缓存"))
{ {
@@ -125,15 +124,7 @@
<EditorItem Field=@context.SourceVariableCount FieldExpression=@(() => context.SourceVariableCount) /> <EditorItem Field=@context.SourceVariableCount FieldExpression=@(() => context.SourceVariableCount) />
<EditorItem Field=@context.MethodVariableCount FieldExpression=@(() => context.MethodVariableCount) /> <EditorItem Field=@context.MethodVariableCount FieldExpression=@(() => context.MethodVariableCount) />
} }
@*<EditorItem ComponentParameters=@(new Dictionary<string,object>(){
["class"]="red--text",
}
) Field=@context.LastErrorMessage FieldExpression=@(()=> context.LastErrorMessage ) Rows="1" ShowLabelTooltip="false">
<EditTemplate Context="value">
<Display Value=@value.LastErrorMessage ValueExpression=@(()=> context.LastErrorMessage ) ShowTooltip class="red--text" ShowLabel="true" />
</EditTemplate>
</EditorItem> *@
<EditorItem Field=@context.LastErrorMessage FieldExpression=@(() => context.LastErrorMessage) ShowLabelTooltip="true"> <EditorItem Field=@context.LastErrorMessage FieldExpression=@(() => context.LastErrorMessage) ShowLabelTooltip="true">
<EditTemplate Context="value"> <EditTemplate Context="value">
<div class="col-12"> <div class="col-12">