diff --git a/EX/Exchange.xaml b/EX/Exchange.xaml index 5c49016..3b89496 100644 --- a/EX/Exchange.xaml +++ b/EX/Exchange.xaml @@ -5,6 +5,7 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:local="clr-namespace:formula_manage.EX" mc:Ignorable="d" + DataContext="{Binding Source={StaticResource Locator}, Path=Exchange}" Title="Exchange" Height="720" Width="1280" MinHeight="720" MinWidth="1280" Background="#FFE0E0E0"> (); SimpleIoc.Default.Register(); + SimpleIoc.Default.Register(); } public MainWindowViewModel Main @@ -46,5 +47,13 @@ namespace formula_manage.ViewModel } } + + public ExchangeViewModel Exchange + { + get + { + return ServiceLocator.Current.GetInstance(); + } + } } } diff --git a/formula_manage.csproj b/formula_manage.csproj index d5f0409..9b2898e 100644 --- a/formula_manage.csproj +++ b/formula_manage.csproj @@ -271,6 +271,7 @@ +