diff --git a/src/Admin/ThingsGateway.Common/ThingsGateway.Common.csproj b/src/Admin/ThingsGateway.Common/ThingsGateway.Common.csproj index 110c200a1..7f24b5a53 100644 --- a/src/Admin/ThingsGateway.Common/ThingsGateway.Common.csproj +++ b/src/Admin/ThingsGateway.Common/ThingsGateway.Common.csproj @@ -14,7 +14,7 @@ - + diff --git a/src/Admin/ThingsGateway.SqlSugar/ThingsGateway.SqlSugar.csproj b/src/Admin/ThingsGateway.SqlSugar/ThingsGateway.SqlSugar.csproj index 645b0fd10..2738988ef 100644 --- a/src/Admin/ThingsGateway.SqlSugar/ThingsGateway.SqlSugar.csproj +++ b/src/Admin/ThingsGateway.SqlSugar/ThingsGateway.SqlSugar.csproj @@ -32,7 +32,7 @@ - + diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 23edeacd6..2936b855a 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -1,9 +1,9 @@ - 10.11.72 - 10.11.72 - 10.11.72 + 10.11.73 + 10.11.73 + 10.11.73 10.11.6 10.11.6 8.0.20 diff --git a/src/Gateway/ThingsGateway.Gateway.Razor/Pages/RulesEngine/DragAndDrop.razor b/src/Gateway/ThingsGateway.Gateway.Razor/Pages/RulesEngine/DragAndDrop.razor index b38edef9a..3164ea85c 100644 --- a/src/Gateway/ThingsGateway.Gateway.Razor/Pages/RulesEngine/DragAndDrop.razor +++ b/src/Gateway/ThingsGateway.Gateway.Razor/Pages/RulesEngine/DragAndDrop.razor @@ -6,12 +6,13 @@
- +
diff --git a/src/Gateway/ThingsGateway.Gateway.Razor/Pages/RulesEngine/DragAndDrop.razor.cs b/src/Gateway/ThingsGateway.Gateway.Razor/Pages/RulesEngine/DragAndDrop.razor.cs index 5cb67fee9..16a1c6fc7 100644 --- a/src/Gateway/ThingsGateway.Gateway.Razor/Pages/RulesEngine/DragAndDrop.razor.cs +++ b/src/Gateway/ThingsGateway.Gateway.Razor/Pages/RulesEngine/DragAndDrop.razor.cs @@ -84,7 +84,8 @@ public partial class DragAndDrop { var data = await upload.GetBytesAsync(1024 * 1024); var str = Encoding.UTF8.GetString(data); - await Load(str.FromJsonNetString()); + Load(str.FromJsonNetString()); + Load(Value); } 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; - RuleHelpers.Load(_blazorDiagram, Value); - } - catch (Exception ex) - { - await ToastService.Warn(ex); - } + + Value = value; + RuleHelpers.Load(_blazorDiagram, Value); + } [Inject]