Merge 4301415b4c into f76fd364a2

v2rayN/Directory.Packages.props

@@ -12,8 +12,8 @@
     <PackageVersion Include="Avalonia.ReactiveUI" Version="11.3.7" />
     <PackageVersion Include="CliWrap" Version="3.9.0" />
     <PackageVersion Include="Downloader" Version="4.0.3" />
-    <PackageVersion Include="H.NotifyIcon.Wpf" Version="2.3.1" />
-    <PackageVersion Include="MaterialDesignThemes" Version="5.3.0" />
+    <PackageVersion Include="H.NotifyIcon.Wpf" Version="2.3.0" />
+    <PackageVersion Include="MaterialDesignThemes" Version="5.2.1" />
     <PackageVersion Include="MessageBox.Avalonia" Version="3.2.0" />
     <PackageVersion Include="QRCoder" Version="1.6.0" />
     <PackageVersion Include="ReactiveUI" Version="20.4.1" />

v2rayN/ServiceLib/Enums/ERuleType.cs

@@ -1,8 +0,0 @@
-namespace ServiceLib.Enums;
-
-public enum ERuleType
-{
-    ALL = 0,
-    Routing = 1,
-    DNS = 2,
-}

v2rayN/ServiceLib/Global.cs

@@ -88,6 +88,8 @@ public class Global
     public const string SingboxFinalResolverTag = "final_resolver";
     public const string SingboxHostsDNSTag = "hosts_dns";
     public const string SingboxFakeDNSTag = "fake_dns";
+    public const string RoutingRuleType = "Routing";
+    public const string DNSRuleType = "DNS";
 
     public static readonly List<string> IEProxyProtocols =
     [
@@ -480,6 +482,12 @@ public class Global
             "tcp,udp"
     ];
 
+    public static readonly List<string> RuleTypes =
+    [
+        RoutingRuleType,
+            DNSRuleType
+    ];
+
     public static readonly List<string> destOverrideProtocols =
     [
         "http",

v2rayN/ServiceLib/Models/RulesItem.cs

@@ -15,5 +15,5 @@ public class RulesItem
     public List<string>? Process { get; set; }
     public bool Enabled { get; set; } = true;
     public string? Remarks { get; set; }
-    public ERuleType? RuleType { get; set; }
+    public List<string>? RuleTypes { get; set; }
 }

v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxDnsService.cs

@@ -253,7 +253,7 @@ public partial class CoreConfigSingboxService
                 continue;
             }
 
-            if (item.RuleType == ERuleType.Routing)
+            if ((item.RuleTypes?.Count ?? 0) > 0 && !item.RuleTypes.Contains(Global.DNSRuleType))
             {
                 continue;
             }

v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxRoutingService.cs

@@ -141,7 +141,7 @@ public partial class CoreConfigSingboxService
                         continue;
                     }
 
-                    if (item1.RuleType == ERuleType.DNS)
+                    if ((item1.RuleTypes?.Count ?? 0) > 0 && !item1.RuleTypes.Contains(Global.RoutingRuleType))
                     {
                         continue;
                     }

v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayDnsService.cs

@@ -142,7 +142,7 @@ public partial class CoreConfigV2rayService
                     continue;
                 }
 
-                if (item.RuleType == ERuleType.Routing)
+                if ((item.RuleTypes?.Count ?? 0) > 0 && !item.RuleTypes.Contains(Global.DNSRuleType))
                 {
                     continue;
                 }

v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayRoutingService.cs

@@ -25,7 +25,7 @@ public partial class CoreConfigV2rayService
                             continue;
                         }
 
-                        if (item.RuleType == ERuleType.DNS)
+                        if ((item.RuleTypes?.Count ?? 0) > 0 && !item.RuleTypes.Contains(Global.RoutingRuleType))
                         {
                             continue;
                         }

v2rayN/ServiceLib/ViewModels/RoutingRuleDetailsViewModel.cs

@@ -21,8 +21,7 @@ public class RoutingRuleDetailsViewModel : MyReactiveObject
     [Reactive]
     public string Process { get; set; }
 
-    [Reactive]
-    public string? RuleType { get; set; }
+    public IList<string> Types { get; set; }
 
     [Reactive]
     public bool AutoSort { get; set; }
@@ -54,7 +53,11 @@ public class RoutingRuleDetailsViewModel : MyReactiveObject
         Domain = Utils.List2String(SelectedSource.Domain, true);
         IP = Utils.List2String(SelectedSource.Ip, true);
         Process = Utils.List2String(SelectedSource.Process, true);
-        RuleType = SelectedSource.RuleType?.ToString();
+        Types = SelectedSource.RuleTypes?.ToList();
+        if (Types == null || Types.Count == 0)
+        {
+            Types = Global.RuleTypes;
+        }
     }
 
     private async Task SaveRulesAsync()
@@ -77,7 +80,7 @@ public class RoutingRuleDetailsViewModel : MyReactiveObject
         }
         SelectedSource.Protocol = ProtocolItems?.ToList();
         SelectedSource.InboundTag = InboundTagItems?.ToList();
-        SelectedSource.RuleType = RuleType.IsNullOrEmpty() ? null : (ERuleType)Enum.Parse(typeof(ERuleType), RuleType);
+        SelectedSource.RuleTypes = Types?.ToList();
 
         var hasRule = SelectedSource.Domain?.Count > 0
           || SelectedSource.Ip?.Count > 0

v2rayN/v2rayN.Desktop/Views/RoutingRuleDetailsWindow.axaml

@@ -44,12 +44,12 @@
                     Margin="{StaticResource Margin4}"
                     HorizontalAlignment="Left"
                     VerticalAlignment="Center" />
-                <ComboBox
-                    x:Name="cmbRuleType"
-                    Width="300"
+                <ListBox
+                    x:Name="clbRuleTypes"
                     Margin="{StaticResource Margin4}"
-                    MaxDropDownHeight="1000" />
-
+                    HorizontalAlignment="Left"
+                    SelectionMode="Multiple,Toggle"
+                    Theme="{DynamicResource CardCheckGroupListBox}" />
             </StackPanel>
 
             <TextBlock

v2rayN/v2rayN.Desktop/Views/RoutingRuleDetailsWindow.axaml.cs

@@ -28,7 +28,16 @@ public partial class RoutingRuleDetailsWindow : WindowBase<RoutingRuleDetailsVie
         clbProtocol.ItemsSource = Global.RuleProtocols;
         clbInboundTag.ItemsSource = Global.InboundTags;
         cmbNetwork.ItemsSource = Global.RuleNetworks;
-        cmbRuleType.ItemsSource = Utils.GetEnumNames<ERuleType>();
+
+        clbRuleTypes.SelectionChanged += ClbRuleTypes_SelectionChanged;
+        clbRuleTypes.ItemsSource = Global.RuleTypes;
+        if (ViewModel.Types != null)
+        {
+            foreach (var it in ViewModel.Types)
+            {
+                clbRuleTypes.SelectedItems.Add(it);
+            }
+        }
 
         if (!rulesItem.Id.IsNullOrEmpty())
         {
@@ -54,7 +63,6 @@ public partial class RoutingRuleDetailsWindow : WindowBase<RoutingRuleDetailsVie
             this.Bind(ViewModel, vm => vm.IP, v => v.txtIP.Text).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.Process, v => v.txtProcess.Text).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.AutoSort, v => v.chkAutoSort.IsChecked).DisposeWith(disposables);
-            this.Bind(ViewModel, vm => vm.RuleType, v => v.cmbRuleType.SelectedValue).DisposeWith(disposables);
 
             this.BindCommand(ViewModel, vm => vm.SaveCmd, v => v.btnSave).DisposeWith(disposables);
         });
@@ -111,4 +119,12 @@ public partial class RoutingRuleDetailsWindow : WindowBase<RoutingRuleDetailsVie
             }
         }
     }
+
+    private void ClbRuleTypes_SelectionChanged(object? sender, SelectionChangedEventArgs e)
+    {
+        if (ViewModel != null)
+        {
+            ViewModel.Types = clbRuleTypes.SelectedItems.Cast<string>().ToList();
+        }
+    }
 }

v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml

@@ -60,12 +60,12 @@
                     Margin="{StaticResource Margin4}"
                     HorizontalAlignment="Left"
                     VerticalAlignment="Center" />
-                <ComboBox
-                    x:Name="cmbRuleType"
-                    Width="200"
+                <ListBox
+                    x:Name="clbRuleTypes"
                     Margin="{StaticResource Margin4}"
-                    MaxDropDownHeight="1000"
-                    Style="{StaticResource DefComboBox}" />
+                    HorizontalAlignment="Left"
+                    FontSize="{DynamicResource StdFontSize}"
+                    Style="{StaticResource MaterialDesignFilterChipPrimaryListBox}" />
             </StackPanel>
 
             <TextBlock

v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml.cs

@@ -21,7 +21,16 @@ public partial class RoutingRuleDetailsWindow
         clbProtocol.ItemsSource = Global.RuleProtocols;
         clbInboundTag.ItemsSource = Global.InboundTags;
         cmbNetwork.ItemsSource = Global.RuleNetworks;
-        cmbRuleType.ItemsSource = Utils.GetEnumNames<ERuleType>();
+
+        clbRuleTypes.SelectionChanged += ClbRuleTypes_SelectionChanged;
+        clbRuleTypes.ItemsSource = Global.RuleTypes;
+        if (ViewModel.Types != null)
+        {
+            foreach (var it in ViewModel.Types)
+            {
+                clbRuleTypes.SelectedItems.Add(it);
+            }
+        }
 
         if (!rulesItem.Id.IsNullOrEmpty())
         {
@@ -46,7 +55,6 @@ public partial class RoutingRuleDetailsWindow
             this.Bind(ViewModel, vm => vm.IP, v => v.txtIP.Text).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.Process, v => v.txtProcess.Text).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.AutoSort, v => v.chkAutoSort.IsChecked).DisposeWith(disposables);
-            this.Bind(ViewModel, vm => vm.RuleType, v => v.cmbRuleType.Text).DisposeWith(disposables);
 
             this.BindCommand(ViewModel, vm => vm.SaveCmd, v => v.btnSave).DisposeWith(disposables);
         });
@@ -103,4 +111,12 @@ public partial class RoutingRuleDetailsWindow
             }
         }
     }
+
+    private void ClbRuleTypes_SelectionChanged(object sender, System.Windows.Controls.SelectionChangedEventArgs e)
+    {
+        if (ViewModel != null)
+        {
+            ViewModel.Types = clbRuleTypes.SelectedItems.Cast<string>().ToList();
+        }
+    }
 }