test

src/AppModels/AppModels.csproj

@@ -95,6 +95,7 @@
     <Compile Include="MinerStudio\Vms\CpuDataViewModel.cs" />
     <Compile Include="MinerStudio\Vms\GpuNameCountsViewModel.cs" />
     <Compile Include="MinerStudio\Vms\GpuNameCountViewModel.cs" />
+    <Compile Include="MinerStudio\Vms\GpuNamePageViewModel.cs" />
     <Compile Include="MinerStudio\Vms\GpuNamesViewModel.cs" />
     <Compile Include="MinerStudio\Vms\IWsStateViewModel.cs" />
     <Compile Include="Messages.cs" />

src/AppModels/MinerStudio/Vms/GpuNamePageViewModel.cs

@@ -0,0 +1,12 @@
+namespace NTMiner.MinerStudio.Vms {
+    public class GpuNamePageViewModel {
+        public GpuNamePageViewModel() {
+            this.GpuNamesVm = new GpuNamesViewModel();
+            this.GpuNameCountsVm = new GpuNameCountsViewModel();
+        }
+
+        public GpuNamesViewModel GpuNamesVm { get; private set; }
+
+        public GpuNameCountsViewModel GpuNameCountsVm { get; private set; }
+    }
+}

src/AppViews0/AppViews0.csproj

@@ -414,6 +414,10 @@
     <Compile Include="Views\Ucs\CoinPage.xaml.cs">
       <DependentUpon>CoinPage.xaml</DependentUpon>
     </Compile>
+    <Page Include="MinerStudio\Views\Design\GpuNamePageViewModel.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="MinerStudio\Views\Design\GpuNameViewModel.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>

src/AppViews0/MinerStudio/Views/Design/GpuNamePageViewModel.xaml

@@ -0,0 +1,2 @@
+<vm:GpuNamePageViewModel xmlns:vm="clr-namespace:NTMiner.MinerStudio.Vms;assembly=AppModels">
+</vm:GpuNamePageViewModel>

src/AppViews0/MinerStudio/Views/Ucs/GpuNameCounts.xaml.cs

@@ -5,24 +5,20 @@ using System.Windows.Input;
 
 namespace NTMiner.MinerStudio.Views.Ucs {
     public partial class GpuNameCounts : UserControl {
-        public GpuNameCountsViewModel Vm { get; private set; }
-
         public GpuNameCounts() {
             if (WpfUtil.IsInDesignMode) {
                 return;
             }
-            this.Vm = new GpuNameCountsViewModel();
-            this.DataContext = this.Vm;
             InitializeComponent();
         }
 
         private void TbKeyword_LostFocus(object sender, RoutedEventArgs e) {
-            Vm.Search.Execute(null);
+            ((GpuNameCountsViewModel)this.DataContext).Search.Execute(null);
         }
 
         private void TbKeyword_KeyUp(object sender, KeyEventArgs e) {
             if (e.Key == Key.Enter) {
-                Vm.Keyword = this.TbKeyword.Text;
+                ((GpuNameCountsViewModel)this.DataContext).Keyword = this.TbKeyword.Text;
             }
         }
     }

src/AppViews0/MinerStudio/Views/Ucs/GpuNamePage.xaml

@@ -13,20 +13,20 @@
     Background="White"
 	mc:Ignorable="d" 
     d:DesignHeight="700" 
-    d:DesignWidth="1000">
+    d:DesignWidth="1400"
+    d:DataContext="{d:DesignData Source=../Design/GpuNamePageViewModel.xaml}">
     <Grid Background="{StaticResource ToolbarBackground}">
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="4*"></ColumnDefinition>
-            <ColumnDefinition Width="10"></ColumnDefinition>
-            <ColumnDefinition Width="6*"></ColumnDefinition>
+            <ColumnDefinition Width="3*"></ColumnDefinition>
+            <ColumnDefinition Width="7*"></ColumnDefinition>
         </Grid.ColumnDefinitions>
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto"></RowDefinition>
             <RowDefinition Height="*"></RowDefinition>
         </Grid.RowDefinitions>
         <TextBlock Padding="4" Text="显卡特征名"></TextBlock>
-        <TextBlock Padding="4" Grid.Column="2" Text="显卡名统计"></TextBlock>
-        <uc:GpuNames Grid.Row="1"></uc:GpuNames>
-        <uc:GpuNameCounts Grid.Row="1" Grid.Column="2"></uc:GpuNameCounts>
+        <TextBlock Padding="4" Grid.Column="1" Text="显卡名统计"></TextBlock>
+        <uc:GpuNames Grid.Row="1" DataContext="{Binding GpuNamesVm}"></uc:GpuNames>
+        <uc:GpuNameCounts Grid.Row="1" Grid.Column="1" DataContext="{Binding GpuNameCountsVm}"></uc:GpuNameCounts>
     </Grid>
 </UserControl>

src/AppViews0/MinerStudio/Views/Ucs/GpuNamePage.xaml.cs

@@ -1,4 +1,5 @@
-using NTMiner.Views;
+using NTMiner.MinerStudio.Vms;
+using NTMiner.Views;
 using NTMiner.Vms;
 using System.Windows;
 using System.Windows.Controls;
@@ -9,7 +10,7 @@ namespace NTMiner.MinerStudio.Views.Ucs {
             ContainerWindow.ShowWindow(new ContainerWindowViewModel {
                 Title = "Gpu名",
                 IconName = "Icon_Gpu",
-                Width = 1000,
+                Width = 1400,
                 Height = 700,
                 IsMaskTheParent = false,
                 IsChildWindow = true,
@@ -18,10 +19,14 @@ namespace NTMiner.MinerStudio.Views.Ucs {
             }, ucFactory: (window) => new GpuNamePage());
         }
 
+        public GpuNamePageViewModel Vm { get; private set; }
+
         public GpuNamePage() {
             if (WpfUtil.IsInDesignMode) {
                 return;
             }
+            this.Vm = new GpuNamePageViewModel();
+            this.DataContext = this.Vm;
             InitializeComponent();
         }
     }

src/AppViews0/MinerStudio/Views/Ucs/GpuNames.xaml.cs

@@ -5,29 +5,27 @@ using System.Windows.Input;
 
 namespace NTMiner.MinerStudio.Views.Ucs {
     public partial class GpuNames : UserControl {
-        public GpuNamesViewModel Vm { get; private set; }
-
         public GpuNames() {
             if (WpfUtil.IsInDesignMode) {
                 return;
             }
-            this.Vm = new GpuNamesViewModel();
-            this.DataContext = this.Vm;
             InitializeComponent();
             this.OnLoaded(onLoad: window => {
                 window.AddEventPath<GpuNameAddedEvent>("添加了显卡特征名后刷新显卡特征名列表", LogEnum.DevConsole, action: message => {
-                    this.Vm.Query();
+                    UIThread.Execute(() => {
+                        ((GpuNamesViewModel)this.DataContext).Query();
+                    });
                 }, typeof(GpuNames));
             });
         }
 
         private void TbKeyword_LostFocus(object sender, RoutedEventArgs e) {
-            Vm.Search.Execute(null);
+            ((GpuNamesViewModel)this.DataContext).Search.Execute(null);
         }
 
         private void TbKeyword_KeyUp(object sender, KeyEventArgs e) {
             if (e.Key == Key.Enter) {
-                Vm.Keyword = this.TbKeyword.Text;
+                ((GpuNamesViewModel)this.DataContext).Keyword = this.TbKeyword.Text;
             }
         }
     }