diff --git a/BetterGenshinImpact/Model/SettingItem.cs b/BetterGenshinImpact/Model/SettingItem.cs index 9350112e..685460ff 100644 --- a/BetterGenshinImpact/Model/SettingItem.cs +++ b/BetterGenshinImpact/Model/SettingItem.cs @@ -22,10 +22,11 @@ public class SettingItem { var list = new List(); - var label = new Label + var label = new TextBlock { - Content = Label, - Margin = new Thickness(0, 0, 0, 5) + Text = Label, + Margin = new Thickness(0, 0, 0, 5), + TextWrapping = TextWrapping.Wrap }; list.Add(label); @@ -40,7 +41,8 @@ public class SettingItem var textBox = new TextBox { Name = Name, - Margin = new Thickness(0, 0, 0, 10) + Margin = new Thickness(0, 0, 0, 10), + TextWrapping = TextWrapping.Wrap }; if (Default != null) { diff --git a/BetterGenshinImpact/View/Windows/Editable/ScriptGroupProjectEditor.xaml b/BetterGenshinImpact/View/Windows/Editable/ScriptGroupProjectEditor.xaml index abd8394e..c1ad45de 100644 --- a/BetterGenshinImpact/View/Windows/Editable/ScriptGroupProjectEditor.xaml +++ b/BetterGenshinImpact/View/Windows/Editable/ScriptGroupProjectEditor.xaml @@ -21,9 +21,10 @@ - + + - - - - - - - - - - - + + + - - - - - - - - - - - - - - - + - + + + + + + + + + + + + + + + + + + + + + + diff --git a/BetterGenshinImpact/ViewModel/Pages/TaskSettingsPageViewModel.cs b/BetterGenshinImpact/ViewModel/Pages/TaskSettingsPageViewModel.cs index e23841bd..4029d6de 100644 --- a/BetterGenshinImpact/ViewModel/Pages/TaskSettingsPageViewModel.cs +++ b/BetterGenshinImpact/ViewModel/Pages/TaskSettingsPageViewModel.cs @@ -633,7 +633,7 @@ public partial class TaskSettingsPageViewModel : ViewModel [RelayCommand] private async Task OnGoToGetGridIconsUrlAsync() { - await Launcher.LaunchUriAsync(new Uri("https://bettergi.com/feats/task/getGridIcons.html")); + await Launcher.LaunchUriAsync(new Uri("https://bettergi.com/dev/getGridIcons.html")); } [RelayCommand] diff --git a/BetterGenshinImpact/ViewModel/Windows/Editable/ScriptGroupProjectEditorViewModel.cs b/BetterGenshinImpact/ViewModel/Windows/Editable/ScriptGroupProjectEditorViewModel.cs index c3c42124..5ee70e12 100644 --- a/BetterGenshinImpact/ViewModel/Windows/Editable/ScriptGroupProjectEditorViewModel.cs +++ b/BetterGenshinImpact/ViewModel/Windows/Editable/ScriptGroupProjectEditorViewModel.cs @@ -125,6 +125,20 @@ public class ScriptGroupProjectEditorViewModel : ObservableObject public ScriptGroupProjectEditorViewModel(ScriptGroupProject project) { _project = project ?? throw new ArgumentNullException(nameof(project)); + + // 如果是JS脚本,每次打开配置窗口时强制重新加载项目信息,以读取最新的manifest.json + if (_project.Type == "Javascript") + { + try + { + _project.BuildScriptProjectRelation(); + } + catch + { + // 忽略加载失败,避免无法打开窗口,界面上会显示相关错误或为空 + } + } + _globalNotificationConfig = TaskContext.Instance().Config.NotificationConfig; // 监听全局配置变更 _project.PropertyChanged += (s, e) =>