逻辑规则和CAN结合的更改

CapMachine.Wpf/Views/DialogLogicRuleView.xaml

@@ -117,7 +117,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/Assets/Fonts/#iconfont"
                         FontSize="18"
-                        Text="" />
+                        Text="" />
                     <TextBlock Style="{StaticResource EditLabelStyle}" Text="规则名称" />
                     <TextBox
                         Width="250"
@@ -135,7 +135,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/Assets/Fonts/#iconfont"
                         FontSize="18"
-                        Text="&#xe67c;" />
+                        Text="&#xe7e4;" />
                     <TextBlock Style="{StaticResource EditLabelStyle}" Text="规则描述" />
                     <TextBox
                         Width="250"
@@ -153,7 +153,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/Assets/Fonts/#iconfont"
                         FontSize="18"
-                        Text="&#xe679;" />
+                        Text="&#xe9c1;" />
                     <TextBlock Style="{StaticResource EditLabelStyle}" Text="参数类型" />
                     <TextBox
                         Width="250"
@@ -211,10 +211,14 @@
                         </RichTextBox>-->
 
                         <TextBox
-                            Height="100"
-                            Margin="10,5"
+                            Height="360"
+                            Margin="0"
                             Padding="5"
                             AcceptsReturn="True"
+                            Background="#404040"
+                            FontSize="16"
+                            FontWeight="Bold"
+                            Foreground="WhiteSmoke"
                             Text="{Binding SelectedRule.Expression, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                             TextWrapping="Wrap"
                             VerticalScrollBarVisibility="Auto" />
@@ -244,7 +248,7 @@
                                 FontFamily="/Assets/Fonts/#iconfont"
                                 FontSize="18"
                                 Foreground="White"
-                                Text="&#xe62f;" />
+                                Text="&#xe8c0;" />
                             <TextBlock
                                 VerticalAlignment="Center"
                                 FontSize="14"
@@ -265,7 +269,7 @@
                                 FontFamily="/Assets/Fonts/#iconfont"
                                 FontSize="18"
                                 Foreground="White"
-                                Text="&#xe63a;" />
+                                Text="&#xe625;" />
                             <TextBlock
                                 VerticalAlignment="Center"
                                 FontSize="14"
@@ -286,7 +290,7 @@
                                 FontFamily="/Assets/Fonts/#iconfont"
                                 FontSize="18"
                                 Foreground="White"
-                                Text="&#xe646;" />
+                                Text="&#xe933;" />
                             <TextBlock
                                 VerticalAlignment="Center"
                                 FontSize="14"
@@ -313,11 +317,11 @@
                 Command="{Binding SaveCmd}"
                 Content="确定"
                 Foreground="White" />
-            <Button
+            <!--<Button
                 Margin="10,0"
                 Command="{Binding CancelCmd}"
                 Content="取消"
-                Foreground="White" />
+                Foreground="White" />-->
         </StackPanel>
     </Grid>
 </UserControl>