From 648dfd3f41c13fcdf1e2824eaae05053e75c5354 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BE=89=E9=B8=AD=E8=9B=8B?= Date: Sun, 10 Nov 2024 13:22:56 +0800 Subject: [PATCH] ensure that the 'settings' object passed into JS is not empty --- BetterGenshinImpact/Core/Script/Group/ScriptGroupProject.cs | 1 + BetterGenshinImpact/ViewModel/Pages/JsListViewModel.cs | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/BetterGenshinImpact/Core/Script/Group/ScriptGroupProject.cs b/BetterGenshinImpact/Core/Script/Group/ScriptGroupProject.cs index 63d15434..977f084b 100644 --- a/BetterGenshinImpact/Core/Script/Group/ScriptGroupProject.cs +++ b/BetterGenshinImpact/Core/Script/Group/ScriptGroupProject.cs @@ -130,6 +130,7 @@ public partial class ScriptGroupProject : ObservableObject { throw new Exception("JS脚本未初始化"); } + JsScriptSettingsObject ??= new ExpandoObject(); await Project.ExecuteAsync(JsScriptSettingsObject); } if (Type == "KeyMouse") diff --git a/BetterGenshinImpact/ViewModel/Pages/JsListViewModel.cs b/BetterGenshinImpact/ViewModel/Pages/JsListViewModel.cs index a85655b7..03b05e36 100644 --- a/BetterGenshinImpact/ViewModel/Pages/JsListViewModel.cs +++ b/BetterGenshinImpact/ViewModel/Pages/JsListViewModel.cs @@ -100,6 +100,12 @@ public partial class JsListViewModel : ObservableObject, INavigationAware, IView return; } + if (!string.IsNullOrEmpty(item.Manifest.SettingsUi)) + { + Toast.Warning("此脚本存在配置，请添加至【调度器】，并右键修改配置后使用！"); + return; + } + await _scriptService.RunMulti([new ScriptGroupProject(item)]); }