diff --git a/v2rayN/ServiceLib/ViewModels/ProfilesSelectViewModel.cs b/v2rayN/ServiceLib/ViewModels/ProfilesSelectViewModel.cs index 99eea332..9b26b758 100644 --- a/v2rayN/ServiceLib/ViewModels/ProfilesSelectViewModel.cs +++ b/v2rayN/ServiceLib/ViewModels/ProfilesSelectViewModel.cs @@ -176,7 +176,10 @@ public partial class ProfilesSelectViewModel : MyReactiveObject, ICloseable private async Task?> GetProfileItemsEx(string subid, string filter) { var lstModel = await AppManager.Instance.ProfileModels(_subIndexId, filter); + var lstProfileExs = await ProfileExManager.Instance.GetProfileExs(); lstModel = (from t in lstModel + join t3 in lstProfileExs on t.IndexId equals t3.IndexId into t3b + from t33 in t3b.DefaultIfEmpty() select new ProfileItemModel { IndexId = t.IndexId, @@ -190,6 +193,12 @@ public partial class ProfilesSelectViewModel : MyReactiveObject, ICloseable Subid = t.Subid, SubRemarks = t.SubRemarks, IsActive = t.IndexId == _config.IndexId, + Sort = t33?.Sort ?? 0, + Delay = t33?.Delay ?? 0, + Speed = t33?.Speed ?? 0, + DelayVal = t33?.Delay != 0 ? $"{t33?.Delay}" : string.Empty, + SpeedVal = t33?.Speed > 0 ? $"{t33?.Speed}" : t33?.Message ?? string.Empty, + IpInfo = t33?.IpInfo ?? string.Empty, }).OrderBy(t => t.Sort).ToList(); // Apply ConfigType filter (include or exclude) diff --git a/v2rayN/v2rayN.Desktop/Views/ProfilesSelectWindow.axaml b/v2rayN/v2rayN.Desktop/Views/ProfilesSelectWindow.axaml index 9516a4e8..f94c680a 100644 --- a/v2rayN/v2rayN.Desktop/Views/ProfilesSelectWindow.axaml +++ b/v2rayN/v2rayN.Desktop/Views/ProfilesSelectWindow.axaml @@ -2,6 +2,7 @@ x:Class="v2rayN.Desktop.Views.ProfilesSelectWindow" xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + xmlns:conv="using:v2rayN.Desktop.Converters" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:dd="clr-namespace:v2rayN.Desktop.DesignData" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" @@ -15,6 +16,10 @@ WindowStartupLocation="CenterScreen" mc:Ignorable="d"> + + + + + + + + + + + + + + + diff --git a/v2rayN/v2rayN/Views/ProfilesSelectWindow.xaml b/v2rayN/v2rayN/Views/ProfilesSelectWindow.xaml index 464fd267..829b7376 100644 --- a/v2rayN/v2rayN/Views/ProfilesSelectWindow.xaml +++ b/v2rayN/v2rayN/Views/ProfilesSelectWindow.xaml @@ -3,6 +3,7 @@ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:base="clr-namespace:v2rayN.Base" + xmlns:conv="clr-namespace:v2rayN.Converters" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" @@ -17,6 +18,10 @@ WindowStartupLocation="CenterScreen" mc:Ignorable="d"> + + + + + + + + + + + + + +