From 20c44f10caa8febeda3026b178c34cd801144c08 Mon Sep 17 00:00:00 2001
From: "2248356998 qq.com" <2248356998@qq.com>
Date: Sat, 27 Sep 2025 20:18:56 +0800
Subject: [PATCH] 10.11.73

---
 .../ThingsGateway.Common.csproj               |  2 +-
 .../ThingsGateway.SqlSugar.csproj             |  2 +-
 src/Directory.Build.props                     |  6 ++---
 .../Pages/RulesEngine/DragAndDrop.razor       |  3 ++-
 .../Pages/RulesEngine/DragAndDrop.razor.cs    | 22 ++++++++-----------
 5 files changed, 16 insertions(+), 19 deletions(-)

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 @@
 	<ItemGroup>
 		<PackageReference Include="BootstrapBlazor.TableExport" Version="9.2.6" />
 		<PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />
-		<PackageReference Include="BootstrapBlazor" Version="9.10.2" />
+		<PackageReference Include="BootstrapBlazor" Version="9.10.3" />
 	</ItemGroup>
 
 	<ItemGroup>
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 @@
 		<PackageReference Include="CsvHelper" Version="33.1.0" />
 		<PackageReference Include="TDengine.Connector" Version="3.1.9" />
 		<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="Microsoft.Data.SqlClient" Version="6.1.1" />
 		<PackageReference Include="System.Reflection.Emit.Lightweight" Version="4.7.0" />
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 @@
 <Project>
 
 	<PropertyGroup>
-		<PluginVersion>10.11.72</PluginVersion>
-		<ProPluginVersion>10.11.72</ProPluginVersion>
-		<DefaultVersion>10.11.72</DefaultVersion>
+		<PluginVersion>10.11.73</PluginVersion>
+		<ProPluginVersion>10.11.73</ProPluginVersion>
+		<DefaultVersion>10.11.73</DefaultVersion>
 		<AuthenticationVersion>10.11.6</AuthenticationVersion>
 		<SourceGeneratorVersion>10.11.6</SourceGeneratorVersion>
 		<NET8Version>8.0.20</NET8Version>
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 @@
 
 <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["Save"]) OnClick="OnSave" />
     <Button class="col-auto me-2" Size="Size.Small" Text=@(Localizer["Cancel"]) OnClick="OnCancel" />
+
 </div>
 
 <div class="row g-0 rule-b rulesengine">
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<RulesJson>());
+            Load(str.FromJsonNetString<RulesJson>());
+            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]