Alex-Devera/v2rayN
1
0
Fork 0
mirror of https://github.com/2dust/v2rayN.git synced 2025-04-19 21:52:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix export rule order issue

Browse source 
https://github.com/2dust/v2rayN/issues/6377
This commit is contained in:
2dust 2024-12-31 14:15:09 +08:00
parent ff642fd1ac
commit 37cba5ee34
6 changed files with 17 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
v2rayN/ServiceLib/Resx/ResUI.Designer.cs generated
View file

@ -1248,15 +1248,6 @@ namespace ServiceLib.Resx {
} }
} }
/// <summary>
/// 查找类似 Russia 的本地化字符串。
/// </summary>
public static string menuRegionalPresetsRussia {
get {
return ResourceManager.GetString("menuRegionalPresetsRussia", resourceCulture);
}
}
/// <summary> /// <summary>
/// 查找类似 Iran 的本地化字符串。 /// 查找类似 Iran 的本地化字符串。
/// </summary> /// </summary>
@ -1266,6 +1257,15 @@ namespace ServiceLib.Resx {
} }
} }
/// <summary>
/// 查找类似 Russia 的本地化字符串。
/// </summary>
public static string menuRegionalPresetsRussia {
get {
return ResourceManager.GetString("menuRegionalPresetsRussia", resourceCulture);
}
}
/// <summary> /// <summary>
/// 查找类似 Reload 的本地化字符串。 /// 查找类似 Reload 的本地化字符串。
/// </summary> /// </summary>

8
v2rayN/ServiceLib/ViewModels/RoutingRuleSettingViewModel.cs
View file

@ -177,12 +177,12 @@ namespace ServiceLib.ViewModels
} }
var lst = new List<RulesItem>(); var lst = new List<RulesItem>();
foreach (var it in SelectedSources ?? [SelectedSource]) var sources = SelectedSources ?? [SelectedSource];
foreach (var it in _rules)
{ {
var item = _rules.FirstOrDefault(t => t.Id == it?.Id); if (sources.Any(t => t.Id == it?.Id))
if (item != null)
{ {
var item2 = JsonUtils.DeepCopy(item); //JsonUtils.Deserialize<RulesItem4Ray>(JsonUtils.Serialize(item)); var item2 = JsonUtils.DeepCopy(it);
item2.Id = null; item2.Id = null;
lst.Add(item2 ?? new()); lst.Add(item2 ?? new());
} }

7
v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml.cs
View file

@ -187,12 +187,7 @@ namespace v2rayN.Desktop.Views
private void lstProfiles_SelectionChanged(object? sender, SelectionChangedEventArgs e) private void lstProfiles_SelectionChanged(object? sender, SelectionChangedEventArgs e)
{ {
List<ProfileItemModel> lst = []; ViewModel.SelectedProfiles = lstProfiles.SelectedItems.Cast<ProfileItemModel>().ToList();
foreach (var item in lstProfiles.SelectedItems)
{
lst.Add((ProfileItemModel)item);
}
ViewModel.SelectedProfiles = lst;
} }
private void LstProfiles_DoubleTapped(object? sender, Avalonia.Input.TappedEventArgs e) private void LstProfiles_DoubleTapped(object? sender, Avalonia.Input.TappedEventArgs e)

7
v2rayN/v2rayN.Desktop/Views/RoutingRuleSettingWindow.axaml.cs
View file

@ -166,12 +166,7 @@ namespace v2rayN.Desktop.Views
private void lstRules_SelectionChanged(object? sender, SelectionChangedEventArgs e) private void lstRules_SelectionChanged(object? sender, SelectionChangedEventArgs e)
{ {
List<RulesItemModel> lst = []; ViewModel.SelectedSources = lstRules.SelectedItems.Cast<RulesItemModel>().ToList();
foreach (var item in lstRules.SelectedItems)
{
lst.Add((RulesItemModel)item);
}
ViewModel.SelectedSources = lst;
} }
private void LstRules_DoubleTapped(object? sender, Avalonia.Input.TappedEventArgs e) private void LstRules_DoubleTapped(object? sender, Avalonia.Input.TappedEventArgs e)

7
v2rayN/v2rayN.Desktop/Views/RoutingSettingWindow.axaml.cs
View file

@ -107,12 +107,7 @@ namespace v2rayN.Desktop.Views
private void lstRoutings_SelectionChanged(object? sender, SelectionChangedEventArgs e) private void lstRoutings_SelectionChanged(object? sender, SelectionChangedEventArgs e)
{ {
List<RoutingItemModel> lst = []; ViewModel.SelectedSources = lstRoutings.SelectedItems.Cast<RoutingItemModel>().ToList();
foreach (var item in lstRoutings.SelectedItems)
{
lst.Add((RoutingItemModel)item);
}
ViewModel.SelectedSources = lst;
} }
private void LstRoutings_DoubleTapped(object? sender, TappedEventArgs e) private void LstRoutings_DoubleTapped(object? sender, TappedEventArgs e)

7
v2rayN/v2rayN.Desktop/Views/SubSettingWindow.axaml.cs
View file

@ -82,12 +82,7 @@ namespace v2rayN.Desktop.Views
private void LstSubscription_SelectionChanged(object? sender, SelectionChangedEventArgs e) private void LstSubscription_SelectionChanged(object? sender, SelectionChangedEventArgs e)
{ {
List<SubItem> lst = []; ViewModel.SelectedSources = lstSubscription.SelectedItems.Cast<SubItem>().ToList();
foreach (var item in lstSubscription.SelectedItems)
{
lst.Add((SubItem)item);
}
ViewModel.SelectedSources = lst;
} }
private void menuClose_Click(object? sender, RoutedEventArgs e) private void menuClose_Click(object? sender, RoutedEventArgs e)