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

10.11.73

Browse Source
This commit is contained in:
2248356998 qq.com
2025-09-27 20:18:56 +08:00
parent 31d6b2a9e6
commit 20c44f10ca
5 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Admin/ThingsGateway.Common/ThingsGateway.Common.csproj
View File

@@ -14,7 +14,7 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="BootstrapBlazor.TableExport" Version="9.2.6" /> <PackageReference Include="BootstrapBlazor.TableExport" Version="9.2.6" />
<PackageReference Include="Yitter.IdGenerator" Version="1.0.14" /> <PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />
<PackageReference Include="BootstrapBlazor" Version="9.10.2" /> <PackageReference Include="BootstrapBlazor" Version="9.10.3" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

2
src/Admin/ThingsGateway.SqlSugar/ThingsGateway.SqlSugar.csproj
View File

@@ -32,7 +32,7 @@
<PackageReference Include="CsvHelper" Version="33.1.0" /> <PackageReference Include="CsvHelper" Version="33.1.0" />
<PackageReference Include="TDengine.Connector" Version="3.1.9" /> <PackageReference Include="TDengine.Connector" Version="3.1.9" />
<PackageReference Include="Oracle.ManagedDataAccess.Core" Version="23.9.1" /> <PackageReference Include="Oracle.ManagedDataAccess.Core" Version="23.9.1" />
<PackageReference Include="Oscar.Data.SqlClient" Version="4.2.26" /> <PackageReference Include="Oscar.Data.SqlClient" Version="4.2.27" />
<PackageReference Include="System.Data.Common" Version="4.3.0" /> <PackageReference Include="System.Data.Common" Version="4.3.0" />
<PackageReference Include="Microsoft.Data.SqlClient" Version="6.1.1" /> <PackageReference Include="Microsoft.Data.SqlClient" Version="6.1.1" />
<PackageReference Include="System.Reflection.Emit.Lightweight" Version="4.7.0" /> <PackageReference Include="System.Reflection.Emit.Lightweight" Version="4.7.0" />

6
src/Directory.Build.props
View File

@@ -1,9 +1,9 @@
<Project> <Project>
<PropertyGroup> <PropertyGroup>
<PluginVersion>10.11.72</PluginVersion> <PluginVersion>10.11.73</PluginVersion>
<ProPluginVersion>10.11.72</ProPluginVersion> <ProPluginVersion>10.11.73</ProPluginVersion>
<DefaultVersion>10.11.72</DefaultVersion> <DefaultVersion>10.11.73</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>

3
src/Gateway/ThingsGateway.Gateway.Razor/Pages/RulesEngine/DragAndDrop.razor
View File

@@ -6,12 +6,13 @@
<div class="rule-t text-end row g-0 pb-2"> <div class="rule-t text-end row g-0 pb-2">
<ButtonUpload class="col-auto ms-auto me-2" Size="Size.Small" ShowUploadFileList="false" BrowserButtonText=@(Localizer["Load"]) IsMultiple="false" OnChange="@Load" TValue="string" Accept=".json" /> <ButtonUpload class="col-auto ms-auto me-2" Size="Size.Small" ShowUploadFileList="false" BrowserButtonText=@(Localizer["Load"]) IsMultiple="true" OnChange="@Load" TValue="string" Accept=".json" />
<Button class="col-auto me-2" Size="Size.Small" Text=@(Localizer["Download"]) OnClick="Download" /> <Button class="col-auto me-2" Size="Size.Small" Text=@(Localizer["Download"]) OnClick="Download" />
<Button class="col-auto me-2" Size="Size.Small" Text=@(Localizer["Save"]) OnClick="OnSave" /> <Button class="col-auto me-2" Size="Size.Small" Text=@(Localizer["Save"]) OnClick="OnSave" />
<Button class="col-auto me-2" Size="Size.Small" Text=@(Localizer["Cancel"]) OnClick="OnCancel" /> <Button class="col-auto me-2" Size="Size.Small" Text=@(Localizer["Cancel"]) OnClick="OnCancel" />
</div> </div>
<div class="row g-0 rule-b rulesengine"> <div class="row g-0 rule-b rulesengine">

22
src/Gateway/ThingsGateway.Gateway.Razor/Pages/RulesEngine/DragAndDrop.razor.cs
View File

@@ -84,7 +84,8 @@ public partial class DragAndDrop
{ {
var data = await upload.GetBytesAsync(1024 * 1024); var data = await upload.GetBytesAsync(1024 * 1024);
var str = Encoding.UTF8.GetString(data); var str = Encoding.UTF8.GetString(data);
await Load(str.FromJsonNetString<RulesJson>()); Load(str.FromJsonNetString<RulesJson>());
Load(Value);
} }
catch (Exception ex) catch (Exception ex)
{ {
@@ -92,21 +93,16 @@ public partial class DragAndDrop
} }
} }
protected override async Task OnParametersSetAsync() protected override void OnParametersSet()
{ {
await Load(Value); Load(Value);
} }
public async Task Load(RulesJson value) private void Load(RulesJson value)
{ {
try
{ Value = value;
Value = value; RuleHelpers.Load(_blazorDiagram, Value);
RuleHelpers.Load(_blazorDiagram, Value);
}
catch (Exception ex)
{
await ToastService.Warn(ex);
}
} }
[Inject] [Inject]