1.IOListeditview显示优化

2.waferrobotparameter事件触发优化

Furnace/FurnaceUI/Views/Maintenances/IOListEditView.xaml

@@ -18,6 +18,12 @@
     mc:Ignorable="d" >
     <UserControl.Resources>
         <local:DisplayNameConvert x:Key="DisplayNameConvert" />
+        <Style TargetType="{x:Type ListBoxItem}">
+            <Setter Property="Margin" Value="0,-2,0,-2"/>
+            <Style.Triggers>
+                <Trigger Property="IsSelected" Value="True"/>
+            </Style.Triggers>
+        </Style>
         <DataTemplate x:Key="CommonTemplate">
             <TabControl SelectedIndex="{Binding DataContext.SelectedIndexData,RelativeSource={RelativeSource AncestorType=UserControl},UpdateSourceTrigger=PropertyChanged}" Background="{StaticResource Color_BG_Dialog_Inner}"   HorizontalContentAlignment="Stretch">
                 <TabItem Width="180" Header="DI-DO"   Visibility="{Binding DataContext.DIDOVisibility,RelativeSource={RelativeSource AncestorType=UserControl},UpdateSourceTrigger=PropertyChanged,Converter={StaticResource bool2VisibilityConverter}}">
@@ -39,7 +45,7 @@
      VerticalContentAlignment="Stretch"
      ScrollViewer.HorizontalScrollBarVisibility="Hidden"
      ScrollViewer.VerticalScrollBarVisibility="Hidden"
-     IsManipulationEnabled="True"  Foreground="Black" ItemsSource="{Binding DataContext.INViewSource, RelativeSource={RelativeSource AncestorType=UserControl}}">
+     Foreground="Black" ItemsSource="{Binding DataContext.INViewSource, RelativeSource={RelativeSource AncestorType=UserControl}}">
                                 <ListBox.ItemTemplate>
                                     <DataTemplate>
                                         <Grid Height="40">
@@ -85,7 +91,7 @@
                              VerticalContentAlignment="Stretch"
                              ScrollViewer.HorizontalScrollBarVisibility="Hidden"
                              ScrollViewer.VerticalScrollBarVisibility="Hidden"
-                             IsManipulationEnabled="True"   Foreground="Black" 
+                               Foreground="Black" 
                              ItemsSource="{Binding DataContext.OutViewSource, RelativeSource={RelativeSource AncestorType=UserControl}}">
                                 <ListBox.ItemTemplate>
                                     <DataTemplate>
@@ -156,7 +162,7 @@
       VerticalContentAlignment="Stretch"
       ScrollViewer.HorizontalScrollBarVisibility="Hidden"
       ScrollViewer.VerticalScrollBarVisibility="Hidden"
-      IsManipulationEnabled="True" Foreground="Black" ItemsSource="{Binding DataContext.AIViewSource, RelativeSource={RelativeSource AncestorType=UserControl}}">
+      Foreground="Black" ItemsSource="{Binding DataContext.AIViewSource, RelativeSource={RelativeSource AncestorType=UserControl}}">
                                 <ListBox.ItemTemplate>
                                     <DataTemplate>
                                         <Grid Height="40">
@@ -199,7 +205,7 @@
  VerticalContentAlignment="Stretch"
  ScrollViewer.HorizontalScrollBarVisibility="Hidden"
  ScrollViewer.VerticalScrollBarVisibility="Hidden"
- IsManipulationEnabled="True"  Foreground="Black" ItemsSource="{Binding DataContext.AOViewSource, RelativeSource={RelativeSource AncestorType=UserControl}}">
+  Foreground="Black" ItemsSource="{Binding DataContext.AOViewSource, RelativeSource={RelativeSource AncestorType=UserControl}}">
                                 <ListBox.ItemTemplate>
                                     <DataTemplate>
                                         <Grid Height="40">
@@ -402,7 +408,7 @@ IsManipulationEnabled="True"   Foreground="Black" ItemsSource="{Binding DataCont
           VerticalContentAlignment="Stretch"
           ScrollViewer.HorizontalScrollBarVisibility="Hidden"
           ScrollViewer.VerticalScrollBarVisibility="Hidden"
-          IsManipulationEnabled="True" Foreground="Black" ItemsSource="{Binding DataContext.INViewSource, RelativeSource={RelativeSource AncestorType=UserControl}}">
+          Foreground="Black" ItemsSource="{Binding DataContext.INViewSource, RelativeSource={RelativeSource AncestorType=UserControl}}">
                                 <ListBox.ItemTemplate>
                                     <DataTemplate>
                                         <Grid Height="40">
@@ -453,7 +459,7 @@ IsManipulationEnabled="True"   Foreground="Black" ItemsSource="{Binding DataCont
      VerticalContentAlignment="Stretch"
      ScrollViewer.HorizontalScrollBarVisibility="Hidden"
      ScrollViewer.VerticalScrollBarVisibility="Hidden"
-     IsManipulationEnabled="True"  Foreground="Black" ItemsSource="{Binding DataContext.OutViewSource, RelativeSource={RelativeSource AncestorType=UserControl}}">
+      Foreground="Black" ItemsSource="{Binding DataContext.OutViewSource, RelativeSource={RelativeSource AncestorType=UserControl}}">
                                 <ListBox.ItemTemplate>
                                     <DataTemplate>
                                         <Grid Height="40">
@@ -524,7 +530,7 @@ IsManipulationEnabled="True"   Foreground="Black" ItemsSource="{Binding DataCont
       VerticalContentAlignment="Stretch"
       ScrollViewer.HorizontalScrollBarVisibility="Hidden"
       ScrollViewer.VerticalScrollBarVisibility="Hidden"
-      IsManipulationEnabled="True" Foreground="Black" ItemsSource="{Binding DataContext.AIViewSource, RelativeSource={RelativeSource AncestorType=UserControl}}">
+      Foreground="Black" ItemsSource="{Binding DataContext.AIViewSource, RelativeSource={RelativeSource AncestorType=UserControl}}">
                                 <ListBox.ItemTemplate>
                                     <DataTemplate>
                                         <Grid Height="40">
@@ -574,7 +580,7 @@ Source="/FurnaceUI;component/Resources/Images/Controls3/bg1.png" />-->
  VerticalContentAlignment="Stretch"
  ScrollViewer.HorizontalScrollBarVisibility="Hidden"
  ScrollViewer.VerticalScrollBarVisibility="Hidden"
- IsManipulationEnabled="True"  Foreground="Black" ItemsSource="{Binding DataContext.AOViewSource, RelativeSource={RelativeSource AncestorType=UserControl}}">
+  Foreground="Black" ItemsSource="{Binding DataContext.AOViewSource, RelativeSource={RelativeSource AncestorType=UserControl}}">
                                 <ListBox.ItemTemplate>
                                     <DataTemplate>
                                         <Grid Height="40">
@@ -647,7 +653,7 @@ Source="/FurnaceUI;component/Resources/Images/Controls3/bg1.png" />-->
      VerticalContentAlignment="Stretch"
      ScrollViewer.HorizontalScrollBarVisibility="Hidden"
      ScrollViewer.VerticalScrollBarVisibility="Hidden"
-     IsManipulationEnabled="True" Foreground="Black" ItemsSource="{Binding DataContext.INViewSource, RelativeSource={RelativeSource AncestorType=UserControl}}">
+     Foreground="Black" ItemsSource="{Binding DataContext.INViewSource, RelativeSource={RelativeSource AncestorType=UserControl}}">
                                 <ListBox.ItemTemplate>
                                     <DataTemplate>
                                         <Grid Height="40">
@@ -703,7 +709,7 @@ Source="/FurnaceUI;component/Resources/Images/Controls3/bg1.png" />-->
      VerticalContentAlignment="Stretch"
      ScrollViewer.HorizontalScrollBarVisibility="Hidden"
      ScrollViewer.VerticalScrollBarVisibility="Hidden"
-     IsManipulationEnabled="True" Foreground="Black" ItemsSource="{Binding DataContext.OutViewSource, RelativeSource={RelativeSource AncestorType=UserControl}}">
+     Foreground="Black" ItemsSource="{Binding DataContext.OutViewSource, RelativeSource={RelativeSource AncestorType=UserControl}}">
                                 <ListBox.ItemTemplate>
                                     <DataTemplate>
                                         <Grid Height="40">
@@ -773,7 +779,7 @@ Source="/FurnaceUI;component/Resources/Images/Controls3/bg1.png" />-->
       VerticalContentAlignment="Stretch"
       ScrollViewer.HorizontalScrollBarVisibility="Hidden"
       ScrollViewer.VerticalScrollBarVisibility="Hidden"
-      IsManipulationEnabled="True" Foreground="Black" ItemsSource="{Binding DataContext.AIViewSource, RelativeSource={RelativeSource AncestorType=UserControl}}">
+      Foreground="Black" ItemsSource="{Binding DataContext.AIViewSource, RelativeSource={RelativeSource AncestorType=UserControl}}">
                                 <ListBox.ItemTemplate>
                                     <DataTemplate>
                                         <Grid Height="40">
@@ -823,7 +829,7 @@ Source="/FurnaceUI;component/Resources/Images/Controls3/bg1.png" />-->
  VerticalContentAlignment="Stretch"
  ScrollViewer.HorizontalScrollBarVisibility="Hidden"
  ScrollViewer.VerticalScrollBarVisibility="Hidden"
- IsManipulationEnabled="True"  Foreground="Black" ItemsSource="{Binding DataContext.AOViewSource, RelativeSource={RelativeSource AncestorType=UserControl}}">
+  Foreground="Black" ItemsSource="{Binding DataContext.AOViewSource, RelativeSource={RelativeSource AncestorType=UserControl}}">
                                 <ListBox.ItemTemplate>
                                     <DataTemplate>
                                         <Grid Height="40">
@@ -1064,7 +1070,7 @@ Source="/FurnaceUI;component/Resources/Images/Controls3/bg1.png" />-->
      VerticalContentAlignment="Stretch"
      ScrollViewer.HorizontalScrollBarVisibility="Hidden"
      ScrollViewer.VerticalScrollBarVisibility="Hidden"
-     IsManipulationEnabled="True" Foreground="Black" ItemsSource="{Binding DataContext.AIViewSource, RelativeSource={RelativeSource AncestorType=UserControl}}">
+     Foreground="Black" ItemsSource="{Binding DataContext.AIViewSource, RelativeSource={RelativeSource AncestorType=UserControl}}">
                                 <ListBox.ItemTemplate>
                                     <DataTemplate>
                                         <Grid Height="40">

Furnace/FurnaceUI/Views/Maintenances/WaferRobotParameterView.xaml

@@ -290,9 +290,10 @@
                             </GridView>
                         </ListView.View>
                         <i:Interaction.Triggers>
-                            <i:EventTrigger EventName="PreviewMouseUp">
+                            <i:EventTrigger EventName="PreviewMouseDoubleClick">
                                 <cal:ActionMessage MethodName="SelectionChangedHandle">
                                     <cal:Parameter Value="{Binding SelectedItem, ElementName=ParameterTable}"/>
+                                    <cal:Parameter Value="$eventargs"/>
                                 </cal:ActionMessage>
                             </i:EventTrigger>
                         </i:Interaction.Triggers>
@@ -415,9 +416,10 @@
                             </GridView>
                         </ListView.View>
                         <i:Interaction.Triggers>
-                            <i:EventTrigger EventName="PreviewMouseUp">
+                            <i:EventTrigger EventName="PreviewMouseDoubleClick">
                                 <cal:ActionMessage MethodName="SelectionChangedHandle">
                                     <cal:Parameter Value="{Binding SelectedItem, ElementName=PositionConfigTable}"/>
+                                    <cal:Parameter Value="$eventargs"/>
                                 </cal:ActionMessage>
                             </i:EventTrigger>
                         </i:Interaction.Triggers>
@@ -547,9 +549,10 @@
                             </GridView>
                         </ListView.View>
                         <i:Interaction.Triggers>
-                            <i:EventTrigger EventName="PreviewMouseUp">
+                            <i:EventTrigger EventName="PreviewMouseDoubleClick">
                                 <cal:ActionMessage MethodName="SelectionChangedHandle">
                                     <cal:Parameter Value="{Binding SelectedItem, ElementName=PositionAxisTable}"/>
+                                    <cal:Parameter Value="$eventargs"/>
                                 </cal:ActionMessage>
                             </i:EventTrigger>
                         </i:Interaction.Triggers>

Furnace/FurnaceUI/Views/Maintenances/WaferRobotParameterViewModel.cs

@@ -23,6 +23,9 @@ using System.Threading;
 using FurnaceUI.DataModule;
 using System.Text.RegularExpressions;
 using System.Security.Policy;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Controls;
 
 namespace FurnaceUI.Views.Maintenances
 {
@@ -579,11 +582,17 @@ namespace FurnaceUI.Views.Maintenances
 
 
         }
-        public void SelectionChangedHandle(object obj)
+        public void SelectionChangedHandle(object obj, MouseButtonEventArgs e)
         {
+            var source = e.OriginalSource as DependencyObject;
+            while (source != null && !(source is ListViewItem))//只有listViewitem才触发
+            {
+                source = VisualTreeHelper.GetParent(source);
+            }
+            if (source == null) return;
             ConfigNode node = (ConfigNode)obj;
             if (node == null)
-            {
+            {    
                 return;
             }
             var windowManager = IoC.Get<IWindowManager>();
@@ -656,6 +665,7 @@ namespace FurnaceUI.Views.Maintenances
                 }
             }
             GetDataOfConfigItems();
+            e.Handled = true;
         }
         protected override void OnInitialize()
         {

Furnace/FurnaceUI/Views/Operations/Maintenances/ManualSetView.xaml

@@ -81,7 +81,7 @@
                                             </i:Interaction.Triggers>
                                         </Button>
                                         <Border  Grid.Row="0" Canvas.Top="30"  BorderBrush="{DynamicResource Table_BD}" BorderThickness="1,1,0,0" Width="361" Height="429">
-                                            <DataGrid ItemsSource="{Binding  MFCDataList}" AutoGenerateColumns="False" CanUserAddRows="False" ScrollViewer.HorizontalScrollBarVisibility="Disabled">
+                                            <DataGrid ItemsSource="{Binding  MFCDataList}" AutoGenerateColumns="False" CanUserAddRows="False" ScrollViewer.HorizontalScrollBarVisibility="Disabled" SelectionMode="Single">
                                                 <DataGrid.Columns>
                                                     <DataGridTemplateColumn Width="*" Header="Name">
                                                         <DataGridTemplateColumn.CellTemplate>

Furnace/FurnaceUI/Views/Operations/WaferThickView.xaml

@@ -59,7 +59,7 @@
          ScrollViewer.HorizontalScrollBarVisibility="Auto"
          HorizontalAlignment="Left"
          AutoGenerateColumns="False" Name="statusList" ItemsSource="{Binding StatusTableDataSource,Mode=OneWay}"
-         CanUserReorderColumns="False" CanUserAddRows="False"
+         CanUserReorderColumns="False" CanUserAddRows="False" SelectionMode="Single"
          CanUserSortColumns="False" 
          IsReadOnly="True" FontSize="14">
                     <DataGrid.Columns>