Kenric Nugteren преди 1 година
родител
ревизия
7489277ee8
променени са 1 файла, в които са добавени 10 реда и са изтрити 5 реда
  1. 10 5
      inabox.wpf/DynamicGrid/DynamicGrid.cs

+ 10 - 5
inabox.wpf/DynamicGrid/DynamicGrid.cs

@@ -1992,7 +1992,12 @@ namespace InABox.DynamicGrid
                         //lookupcol.DisplayMemberPath = "Value";
                         //lookupcol.ItemsSource = lookups;
 
-                        var data = lookupEditor.Values(column.ColumnName);
+                        var table = lookupEditor.Values(column.ColumnName).ToDataTable();
+                        //var row = table.NewRow();
+                        //row["Display"] = "";
+                        //table.Rows.InsertAt(row, 0);
+                        
+                        /*var data = lookupEditor.Values(column.ColumnName);
 
                         var items = new List<Tuple<object?, string>>();
                         if (!lookupEditor.IsEnumEditor())
@@ -2002,11 +2007,11 @@ namespace InABox.DynamicGrid
                         foreach(var row in data.Rows)
                         {
                             items.Add(new(row[data.Columns[0].ColumnName], (row["Display"] ?? "").ToString() ?? ""));
-                        }
+                        }*/
 
-                        lookupcol.SelectedValuePath = "Item1";
-                        lookupcol.DisplayMemberPath = "Item2";
-                        lookupcol.ItemsSource = items;
+                        lookupcol.SelectedValuePath = table.Columns[0].ColumnName;
+                        lookupcol.DisplayMemberPath = "Display";
+                        lookupcol.ItemsSource = table.DefaultView;
                         newcol = lookupcol;
                     }
                     else