g82tt/KinginfoGateway
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

release：6.0.5.17

Browse Source 
feat: 添加内存变量插件
refactor:  变量数据页面序列化数据概要json.net
This commit is contained in:
Diego
2024-08-23 14:51:29 +08:00
parent fe61b75d7e
commit 5dfd7c8597
9 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ThingsGateway.Foundation/ThingsGateway.Foundation.csproj
View File

@@ -11,8 +11,8 @@
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="8.0.8" />
<PackageReference Include="TouchSocket" Version="2.1.0-rc.12" />
<PackageReference Include="TouchSocket.SerialPorts" Version="2.1.0-rc.12" />
<PackageReference Include="TouchSocket" Version="2.1.0-rc.13" />
<PackageReference Include="TouchSocket.SerialPorts" Version="2.1.0-rc.13" />
<ProjectReference Include="$(SolutionDir)\tools\ThingsGateway.NewLife.X\ThingsGateway.NewLife.X.csproj" />
</ItemGroup>

2
src/ThingsGateway.Gateway.Application/ThingsGateway.Gateway.Application.csproj
View File

@@ -7,7 +7,7 @@
<PackageReference Include="SqlSugar.TDengineCore" Version="4.18.0" />
<PackageReference Include="Rougamo.Fody" Version="4.0.0" />
<PackageReference Include="CS-Script" Version="4.8.17" />
<PackageReference Include="TouchSocket.Dmtp" Version="2.1.0-rc.12" />
<PackageReference Include="TouchSocket.Dmtp" Version="2.1.0-rc.13" />
</ItemGroup>

2
src/ThingsGateway.Gateway.Razor/Pages/Config/Device/DevicePage.razor
View File

@@ -11,7 +11,7 @@
<AdminTable @ref=table TItem="Device" AutoGenerateColumns="true" ShowAdvancedSearch=false
AllowResizing="true" IsFixedHeader=true IsMultipleSelect=true SearchModel=SearchModel
ShowExtendButtons=true ShowExportButton
ShowExtendButtons=true ShowExportButton ScrollingDialogContent
ShowDefaultButtons=true ExtendButtonColumnWidth=150
OnQueryAsync="OnQueryAsync" IsPagination=true
OnSaveAsync="Save" OnDeleteAsync="Delete">

4
src/ThingsGateway.Gateway.Razor/Pages/Runtime/VariableRuntimePage.razor.cs
View File

@@ -9,7 +9,7 @@
//------------------------------------------------------------------------------
using ThingsGateway.Core.Extension;
using ThingsGateway.Core.Json.Extension;
using ThingsGateway.Foundation.Json.Extension;
using ThingsGateway.Gateway.Application;
using ThingsGateway.NewLife.X.Extension;
using ThingsGateway.Razor;
@@ -63,7 +63,7 @@ public partial class VariableRuntimePage : IDisposable
var ret = "";
if (d is TableColumnContext<VariableRunTime, object?> data && data?.Value != null)
{
ret = data.Value.ToSystemTextJsonString();
ret = data.Value.ToJsonNetString();
}
return Task.FromResult(ret);
}

2
src/ThingsGateway.Photino/ThingsGateway.Photino.csproj
View File

@@ -30,7 +30,7 @@
<ItemGroup>
<FrameworkReference Include="Microsoft.AspNetCore.App" />
<PackageReference Include="Photino.Native" Version="3.1.5" />
<PackageReference Include="Photino.NET" Version="3.1.14" />
<PackageReference Include="Photino.NET" Version="3.1.16" />
<PackageReference Include="Photino.Blazor" Version="3.1.8" />
</ItemGroup>

9
src/ThingsGateway.sln
View File

@@ -103,6 +103,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ThingsGateway.Winform", "Th
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ThingsGateway.Debug.Winform", "debugs\ThingsGateway.Debug.Winform\ThingsGateway.Debug.Winform.csproj", "{FCFE5A19-1AA8-4E5F-BDBE-C9A9CA11758C}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ThingsGateway.Plugin.VariableExpression", "plugin\ThingsGateway.Plugin.VariableExpression\ThingsGateway.Plugin.VariableExpression.csproj", "{4E25CD96-A278-492D-A4E5-DEB5FDB770BF}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -265,6 +267,10 @@ Global
{FCFE5A19-1AA8-4E5F-BDBE-C9A9CA11758C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FCFE5A19-1AA8-4E5F-BDBE-C9A9CA11758C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FCFE5A19-1AA8-4E5F-BDBE-C9A9CA11758C}.Release|Any CPU.Build.0 = Release|Any CPU
{4E25CD96-A278-492D-A4E5-DEB5FDB770BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4E25CD96-A278-492D-A4E5-DEB5FDB770BF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4E25CD96-A278-492D-A4E5-DEB5FDB770BF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4E25CD96-A278-492D-A4E5-DEB5FDB770BF}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -297,10 +303,11 @@ Global
{8DAE2A8C-5E7C-4F11-A035-7DDDFA6D4539} = {B1DC0D3F-AAAE-4B01-A35A-E81409D411FB}
{E6854FB6-FE05-4DA7-90D3-792EEA1F2DD3} = {B1DC0D3F-AAAE-4B01-A35A-E81409D411FB}
{FCFE5A19-1AA8-4E5F-BDBE-C9A9CA11758C} = {0DF0F333-7CEF-4DE7-9108-718EDD5586EE}
{4E25CD96-A278-492D-A4E5-DEB5FDB770BF} = {69E6D9A3-4EA0-488A-AD4A-C179197A8189}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {199B1B96-4F56-4828-9531-813BA02DB282}
RESX_Rules = {"EnabledRules":[]}
RESX_NeutralResourcesLanguage = zh-Hans
RESX_Rules = {"EnabledRules":[]}
EndGlobalSection
EndGlobal

2
src/Version.props
View File

@@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<Version>6.0.5.16</Version>
<Version>6.0.5.17</Version>
</PropertyGroup>
<ItemGroup>

2
src/adapter/ThingsGateway.Foundation.Demo/ThingsGateway.Foundation.Demo.csproj
View File

@@ -8,7 +8,7 @@
<ItemGroup>
<ProjectReference Include="..\ThingsGateway.Foundation.Modbus\ThingsGateway.Foundation.Modbus.csproj" />
<ProjectReference Include="..\ThingsGateway.Foundation.SiemensS7\ThingsGateway.Foundation.SiemensS7.csproj" />
<PackageReference Include="ThingsGateway.Foundation.Variable" Version="8.8.8" />
<PackageReference Include="ThingsGateway.Foundation.Variable" Version="8.8.9" />
</ItemGroup>

2
src/debugs/ThingsGateway.Debug.Photino/ThingsGateway.Debug.Photino.csproj
View File

@@ -10,7 +10,7 @@
<ItemGroup>
<PackageReference Include="Photino.Native" Version="3.1.5" />
<PackageReference Include="Photino.NET" Version="3.1.14" />
<PackageReference Include="Photino.NET" Version="3.1.16" />
<PackageReference Include="Photino.Blazor" Version="3.1.8" />
</ItemGroup>