Fix export rule order issue

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
+9 -9
View File
@@ -1248,15 +1248,6 @@ namespace ServiceLib.Resx {
}
}
/// <summary>
/// 查找类似 Russia 的本地化字符串。
/// </summary>
public static string menuRegionalPresetsRussia {
get {
return ResourceManager.GetString("menuRegionalPresetsRussia", resourceCulture);
}
}
/// <summary>
/// 查找类似 Iran 的本地化字符串。
/// </summary>
@@ -1266,6 +1257,15 @@ namespace ServiceLib.Resx {
}
}
/// <summary>
/// 查找类似 Russia 的本地化字符串。
/// </summary>
public static string menuRegionalPresetsRussia {
get {
return ResourceManager.GetString("menuRegionalPresetsRussia", resourceCulture);
}
}
/// <summary>
/// 查找类似 Reload 的本地化字符串。
/// </summary>
@@ -177,12 +177,12 @@ namespace ServiceLib.ViewModels
}
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 (item != null)
if (sources.Any(t => t.Id == it?.Id))
{
var item2 = JsonUtils.DeepCopy(item); //JsonUtils.Deserialize<RulesItem4Ray>(JsonUtils.Serialize(item));
var item2 = JsonUtils.DeepCopy(it);
item2.Id = null;
lst.Add(item2 ?? new());
}