SV2功能增加

一些功能的修复

CapMachine.Shared/Controls/Meter.xaml

@@ -225,10 +225,9 @@
                         </Grid>
 
                     </TabItem>
+
                 </TabControl>
 
-
-
             </Grid>
 
             <Border
@@ -236,12 +235,23 @@
                 Margin="1,2,1,2"
                 Background="Gray"
                 CornerRadius="3">
+
                 <TextBlock
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center"
                     FontSize="12"
                     Foreground="White"
-                    Text="{Binding ElementName=MeterInstance, Path=MeterName}" />
+                    Text="{Binding ElementName=MeterInstance, Path=MeterName}">
+                    <TextBlock.ContextMenu>
+                        <ContextMenu>
+                            <!--
+                                ContextMenu在WPF中是一个特殊元素，它不在常规视觉树中，而是在独立的窗口中，
+                                这导致ElementName绑定可能无法正常工作,没有使用Command处理，所以用这个方式来获取
+                            -->
+                            <MenuItem Click="ExdMenuClick" Header="更多控制" />
+                        </ContextMenu>
+                    </TextBlock.ContextMenu>
+                </TextBlock>
             </Border>
         </Grid>
     </materialDesign:Card>

CapMachine.Shared/Controls/Meter.xaml.cs

@@ -43,6 +43,22 @@ namespace CapMachine.Shared.Controls
             }
         }
 
+        /// <summary>
+        /// ContextMenu在WPF中是一个特殊元素，它不在常规视觉树中，而是在独立的窗口中，
+        /// 这导致ElementName绑定可能无法正常工作,所以用这个方式来获取
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ExdMenuClick(object sender, RoutedEventArgs e)
+        {
+            if (ExdCommand != null && ExdCommand.CanExecute(ExdCommandParameter))
+            {
+                ExdCommandParameter = this;
+                ExdCommand.Execute(ExdCommandParameter);
+            }
+        }
+
+        
         /// <summary>
         /// 仪表名称
         /// </summary>
@@ -192,6 +208,32 @@ namespace CapMachine.Shared.Controls
 
         //public event PropertyChangedEventHandler? PropertyChanged;
 
+        /// <summary>
+        /// 拓展控制切换 命令
+        /// </summary>
+        public ICommand ExdCommand
+        {
+            get { return (ICommand)GetValue(ExdCommandProperty); }
+            set { SetValue(ExdCommandProperty, value); }
+        }
+        public static readonly DependencyProperty ExdCommandProperty =
+            DependencyProperty.Register("ExdCommand", typeof(ICommand), typeof(Meter), new PropertyMetadata(default(ICommand)));
+
+        /// <summary>
+        /// ExdCommand 参数
+        /// </summary>
+        public object ExdCommandParameter
+        {
+            get
+            {
+                return (object)base.GetValue(Meter.ExdCommandParameterProperty);
+            }
+            set
+            {
+                base.SetValue(Meter.ExdCommandParameterProperty, value);
+            }
+        }
+        public static readonly DependencyProperty ExdCommandParameterProperty = DependencyProperty.Register("ExdCommandParameter", typeof(object), typeof(Meter), new PropertyMetadata());
 
 
 
@@ -376,5 +418,6 @@ namespace CapMachine.Shared.Controls
 
             }
         }
+
     }
 }