diff --git a/CapMachine.Wpf/Models/Tag/QuickTag.cs b/CapMachine.Wpf/Models/Tag/QuickTag.cs index 2ddce24..f77941b 100644 --- a/CapMachine.Wpf/Models/Tag/QuickTag.cs +++ b/CapMachine.Wpf/Models/Tag/QuickTag.cs @@ -72,6 +72,8 @@ namespace CapMachine.Wpf.Models.Tag get { return _OperateResultSource; } set { + if (value!.Content == null) return; + switch (ValueType) { case DataType.Short: diff --git a/CapMachine.Wpf/ViewModels/ProConfigViewModel.cs b/CapMachine.Wpf/ViewModels/ProConfigViewModel.cs index 59f81d1..0e8f32d 100644 --- a/CapMachine.Wpf/ViewModels/ProConfigViewModel.cs +++ b/CapMachine.Wpf/ViewModels/ProConfigViewModel.cs @@ -17,6 +17,7 @@ using System.Collections.ObjectModel; using System.Data; using System.Text; using System.Windows; +using System.Windows.Controls; namespace CapMachine.Wpf.ViewModels { @@ -1759,7 +1760,16 @@ namespace CapMachine.Wpf.ViewModels // cr.EndEdit(); //} - var dd = par; + //if (par is DataGrid dataGrid && dataGrid.SelectedCells.Count > 0) + //{ + // var selectedCell = dataGrid.SelectedCells[0]; + // string columnHeader = selectedCell.Column.Header?.ToString(); + // // 处理列头信息 + //} + + //var dd = par; + + //var dd = new SelectedCellsCollection(); //if (par is SelectedCellCo selectedCells) //{ diff --git a/CapMachine.Wpf/Views/ProConfigView.xaml b/CapMachine.Wpf/Views/ProConfigView.xaml index 5446fd1..398706a 100644 --- a/CapMachine.Wpf/Views/ProConfigView.xaml +++ b/CapMachine.Wpf/Views/ProConfigView.xaml @@ -833,9 +833,11 @@ - + + + + + + + + + + + + @@ -1668,7 +1704,6 @@ TotalSlopTime="{Binding MeterHVVolExDto.SlopTime}" /> - --> - - - - - - - - + - - - - - - - - - + + + + + + + + +