From 18efc69d0dd27cded233ef48aee26a2f41d7bbda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=BA=81=E5=8A=A8=E7=9A=84=E6=B0=A8=E6=B0=94?=
 <131591012+zaodonganqi@users.noreply.github.com>
Date: Sun, 30 Nov 2025 19:35:46 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=BC=B9=E7=AA=97UI=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=EF=BC=8C=E6=9B=B4=E6=96=B0=E6=88=AA=E5=8F=96=E7=89=A9?=
 =?UTF-8?q?=E5=93=81=E5=9B=BE=E6=A0=87=E5=AF=BC=E8=88=AA=E5=9C=B0=E5=9D=80?=
 =?UTF-8?q?=20(#2499)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BetterGenshinImpact/Model/SettingItem.cs      |  10 +-
 .../Editable/ScriptGroupProjectEditor.xaml    | 120 +++++++++---------
 .../Pages/TaskSettingsPageViewModel.cs        |   2 +-
 .../ScriptGroupProjectEditorViewModel.cs      |  14 ++
 4 files changed, 82 insertions(+), 64 deletions(-)

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<UIElement>();
 
-        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 @@
         <BooleanToVisibilityConverter x:Key="BoolToVisConverter"/>
     </UserControl.Resources>
     <Grid>
-        <StackPanel>
+        <ScrollViewer MaxHeight="350" VerticalScrollBarVisibility="Auto">
+            <StackPanel Margin="0,0,20,0">
 
-            <!--<TextBlock Margin="0,0,0,10" Text="执行周期" />
+                <!--<TextBlock Margin="0,0,0,10" Text="执行周期" />
             <ComboBox Margin="0,0,0,20"
                       DisplayMemberPath="Value"
                       ItemsSource="{Binding Source={StaticResource ScheduleDescriptionsProvider}}"
@@ -33,64 +34,65 @@
             <TextBlock Margin="0,0,0,10" Text="执行次数" />
             <TextBox Margin="0,0,0,20" Text="{Binding RunNum, Mode=TwoWay}" />-->
 
-            <TextBlock Margin="0,0,0,10" Text="状态" />
-            <ComboBox DisplayMemberPath="Value"
-                      ItemsSource="{Binding Source={StaticResource StatusDescriptionsProvider}}"
-                      SelectedValue="{Binding Status, Mode=TwoWay}"
-                      SelectedValuePath="Key" />
-            <TextBlock Margin="0,10,0,5" Text="JS 通知权限"
-                       Visibility="{Binding IsJsScript, Converter={StaticResource BoolToVisConverter}}"/>
-            <ComboBox Margin="0,0,0,10"
-                      ItemsSource="{Binding JsNotificationOptions}"
-                      DisplayMemberPath="Value"
-                      SelectedValuePath="Key"
-                      IsEnabled="{Binding GlobalJsNotificationEnabled}"
-                      ToolTip="{Binding JsNotificationToolTip}"
-                      SelectedValue="{Binding AllowJsNotification, Mode=TwoWay}"
-                      Visibility="{Binding IsJsScript, Converter={StaticResource BoolToVisConverter}}">
-            </ComboBox>
-
-            <TextBlock Margin="0,10,0,5" Text="JS HTTP权限"
-                       Visibility="{Binding IsJsScript, Converter={StaticResource BoolToVisConverter}}"/>
-            <TextBlock Margin="0,0,0,5"
-                       Text="允许脚本发送HTTP请求，可能会带来安全风险，请谨慎开启。"
-                       Foreground="Orange"
-                       Visibility="{Binding IsJsScript, Converter={StaticResource BoolToVisConverter}}"/>
-            <TextBlock Margin="0,0,0,5"
-                       Text="注意：脚本更新http_allowed_urls后，需手动重新启用权限。"
-                       Foreground="Orange"
-                       Visibility="{Binding IsJsScript, Converter={StaticResource BoolToVisConverter}}"/>
-            <ItemsControl Margin="0,0,0,0" ItemsSource="{Binding JsHTTPInfoText}"
+                <TextBlock Margin="0,0,0,10" Text="状态" />
+                <ComboBox DisplayMemberPath="Value"
+                          ItemsSource="{Binding Source={StaticResource StatusDescriptionsProvider}}"
+                          SelectedValue="{Binding Status, Mode=TwoWay}"
+                          SelectedValuePath="Key" />
+                <TextBlock Margin="0,10,0,5" Text="JS 通知权限"
+                           Visibility="{Binding IsJsScript, Converter={StaticResource BoolToVisConverter}}"/>
+                <ComboBox Margin="0,0,0,10"
+                          ItemsSource="{Binding JsNotificationOptions}"
+                          DisplayMemberPath="Value"
+                          SelectedValuePath="Key"
+                          IsEnabled="{Binding GlobalJsNotificationEnabled}"
+                          ToolTip="{Binding JsNotificationToolTip}"
+                          SelectedValue="{Binding AllowJsNotification, Mode=TwoWay}"
                           Visibility="{Binding IsJsScript, Converter={StaticResource BoolToVisConverter}}">
-                <ItemsControl.ItemTemplate>
-                    <DataTemplate>
-                        <TextBlock Text="{Binding Text}"
-                                Foreground="{Binding Color}"
-                                FontSize="11"
-                                TextWrapping="NoWrap"/>
-                    </DataTemplate>
-                </ItemsControl.ItemTemplate>
-            </ItemsControl>
-            <ItemsControl Margin="0,0,0,10" ItemsSource="{Binding JsHTTPInfo}"
-                          Visibility="{Binding IsJsScript, Converter={StaticResource BoolToVisConverter}}">
-                <ItemsControl.ItemTemplate>
-                    <DataTemplate>
-                        <TextBox Text="{Binding Text}"
-                                IsReadOnly="True"
-                                Foreground="{Binding Color}"
-                                FontSize="11"
-                                FontFamily="Consolas"
-                                TextWrapping="NoWrap"/>
-                    </DataTemplate>
-                </ItemsControl.ItemTemplate>
-            </ItemsControl>
-            <ComboBox DisplayMemberPath="Value"
-                      ItemsSource="{Binding JsNotificationOptions}"
-                      SelectedValue="{Binding AllowJsHTTP, Mode=TwoWay}"
-                      SelectedValuePath="Key"
-                      Visibility="{Binding IsJsScript, Converter={StaticResource BoolToVisConverter}}">
-            </ComboBox>
+                </ComboBox>
 
-        </StackPanel>
+                <TextBlock Margin="0,10,0,5" Text="JS HTTP权限"
+                           Visibility="{Binding IsJsScript, Converter={StaticResource BoolToVisConverter}}"/>
+                <TextBlock Margin="0,0,0,5"
+                           Text="允许脚本发送HTTP请求，可能会带来安全风险，请谨慎开启。"
+                           Foreground="Orange"
+                           Visibility="{Binding IsJsScript, Converter={StaticResource BoolToVisConverter}}"/>
+                <TextBlock Margin="0,0,0,5"
+                           Text="注意：脚本更新http_allowed_urls后，需手动重新启用权限。"
+                           Foreground="Orange"
+                           Visibility="{Binding IsJsScript, Converter={StaticResource BoolToVisConverter}}"/>
+                <ItemsControl Margin="0,0,0,0" ItemsSource="{Binding JsHTTPInfoText}"
+                              Visibility="{Binding IsJsScript, Converter={StaticResource BoolToVisConverter}}">
+                    <ItemsControl.ItemTemplate>
+                        <DataTemplate>
+                            <TextBlock Text="{Binding Text}"
+                                    Foreground="{Binding Color}"
+                                    FontSize="11"
+                                    TextWrapping="NoWrap"/>
+                        </DataTemplate>
+                    </ItemsControl.ItemTemplate>
+                </ItemsControl>
+                <ItemsControl Margin="0,0,0,10" ItemsSource="{Binding JsHTTPInfo}"
+                              Visibility="{Binding IsJsScript, Converter={StaticResource BoolToVisConverter}}">
+                    <ItemsControl.ItemTemplate>
+                        <DataTemplate>
+                            <TextBox Text="{Binding Text}"
+                                    IsReadOnly="True"
+                                    Foreground="{Binding Color}"
+                                    FontSize="11"
+                                    FontFamily="Consolas"
+                                    TextWrapping="NoWrap"/>
+                        </DataTemplate>
+                    </ItemsControl.ItemTemplate>
+                </ItemsControl>
+                <ComboBox DisplayMemberPath="Value"
+                          ItemsSource="{Binding JsNotificationOptions}"
+                          SelectedValue="{Binding AllowJsHTTP, Mode=TwoWay}"
+                          SelectedValuePath="Key"
+                          Visibility="{Binding IsJsScript, Converter={StaticResource BoolToVisConverter}}">
+                </ComboBox>
+
+            </StackPanel>
+        </ScrollViewer>
     </Grid>
 </UserControl>
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) =>