CAN配置下拉框选择配置信息

CapMachine.Wpf/Dtos/ComboBoxModel.cs

@@ -0,0 +1,36 @@
+using Prism.Mvvm;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CapMachine.Wpf.Dtos
+{
+    /// <summary>
+    /// 下拉框的模型
+    /// </summary>
+    public class CbxItems : BindableBase
+    {
+        private string _Key;
+        /// <summary>
+        /// Key值
+        /// </summary>
+        public string Key
+        {
+            get { return _Key; }
+            set { _Key = value; RaisePropertyChanged(); }
+        }
+
+
+        private string _Text;
+        /// <summary>
+        /// Text 值
+        /// </summary>
+        public string Text
+        {
+            get { return _Text; }
+            set { _Text = value; RaisePropertyChanged(); }
+        }
+    }
+}

CapMachine.Wpf/ViewModels/CANConfigViewModel.cs

@@ -49,6 +49,15 @@ namespace CapMachine.Wpf.ViewModels
             //MachineDataService = machineDataService;
             DialogService = dialogService;
 
+            WriteNameCbxItems = new ObservableCollection<CbxItems>()
+            {
+                new CbxItems(){ Key="转速",Text="转速"},
+                new CbxItems(){ Key="阿斯顿发",Text="阿斯顿发"},
+                new CbxItems(){ Key="都尴尬的",Text="都尴尬的"},
+                new CbxItems(){ Key="1212",Text="1212"},
+                new CbxItems(){ Key="112",Text="ADSFADSF"},
+            };
+
             InitLoadCanConfigPro();
 
         }
@@ -716,6 +725,48 @@ namespace CapMachine.Wpf.ViewModels
 
         #region 写入和读取操作
                
+        private ObservableCollection<CbxItems> _WriteNameCbxItems;
+        /// <summary>
+        /// 写入的Name
+        /// </summary>
+        public ObservableCollection<CbxItems> WriteNameCbxItems
+        {
+            get { return _WriteNameCbxItems; }
+            set { _WriteNameCbxItems = value; RaisePropertyChanged(); }
+        }
+
+
+        private ObservableCollection<CbxItems> _ReadNameCbxItems;
+        /// <summary>
+        /// 写入的Name
+        /// </summary>
+        public ObservableCollection<CbxItems> ReadNameCbxItems
+        {
+            get { return _ReadNameCbxItems; }
+            set { _ReadNameCbxItems = value; RaisePropertyChanged(); }
+        }
+
+
+        //private string _SelectedWriteName;
+        ///// <summary>
+        ///// 选中的写入的Name
+        ///// </summary>
+        //public string SelectedWriteName
+        //{
+        //    get { return _SelectedWriteName; }
+        //    set { _SelectedWriteName = value; RaisePropertyChanged(); }
+        //}
+
+        //private string _SelectedReadName;
+        ///// <summary>
+        ///// 选中的读取的Name
+        ///// </summary>
+        //public string SelectedReadName
+        //{
+        //    get { return _SelectedReadName; }
+        //    set { _SelectedReadName = value; RaisePropertyChanged(); }
+        //}
+
 
         private ObservableCollection<CanLinRWConfigDto> _ListWriteCanLinRWConfigDto;
         /// <summary>

CapMachine.Wpf/Views/CANConfigView.xaml

@@ -519,11 +519,23 @@
                             SelectionMode="Extended"
                             SelectionUnit="FullRow">
                             <DataGrid.Columns>
-                                <DataGridTextColumn Width="200" Binding="{Binding Name}">
+                                <DataGridTemplateColumn Width="200" Header="名称">
+                                    <DataGridTemplateColumn.CellTemplate>
+                                        <DataTemplate>
+                                            <ComboBox
+                                                DisplayMemberPath="Text"
+                                                ItemsSource="{Binding Source={StaticResource Proxy}, Path=Data.WriteNameCbxItems}"
+                                                SelectedValue="{Binding Name, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                                                SelectedValuePath="Text" />
+                                        </DataTemplate>
+                                    </DataGridTemplateColumn.CellTemplate>
+                                </DataGridTemplateColumn>
+
+                                <!--<DataGridTextColumn Width="200" Binding="{Binding Name}">
                                     <DataGridTextColumn.Header>
                                         <TextBlock FontWeight="Bold" Text="名称" />
                                     </DataGridTextColumn.Header>
-                                </DataGridTextColumn>
+                                </DataGridTextColumn>-->
                                 <DataGridTextColumn Binding="{Binding Content}" IsReadOnly="True">
                                     <DataGridTextColumn.Header>
                                         <TextBlock FontWeight="Bold" Text="配置内容" />
@@ -648,6 +660,18 @@
                             SelectionMode="Extended"
                             SelectionUnit="FullRow">
                             <DataGrid.Columns>
+                                <DataGridTemplateColumn Width="200" Header="名称">
+                                    <DataGridTemplateColumn.CellTemplate>
+                                        <DataTemplate>
+                                            <ComboBox
+                                                DisplayMemberPath="Text"
+                                                ItemsSource="{Binding Source={StaticResource Proxy}, Path=Data.ReadNameCbxItems}"
+                                                SelectedValue="{Binding Name, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                                                SelectedValuePath="Text" />
+                                        </DataTemplate>
+                                    </DataGridTemplateColumn.CellTemplate>
+                                </DataGridTemplateColumn>
+
                                 <DataGridTextColumn Width="200" Binding="{Binding Name}">
                                     <DataGridTextColumn.Header>
                                         <TextBlock FontWeight="Bold" Text="名称" />