добавлено свойство Колонки о принадлежности к индексу

Author: Mr-Rm

src/OneScript.StandardLibrary/Collections/Indexes/CollectionIndex.cs

@@ -18,21 +18,31 @@ namespace OneScript.StandardLibrary.Collections.Indexes
     [ContextClass("ИндексКоллекции", "CollectionIndex")]
     public class CollectionIndex : AutoCollectionContext<CollectionIndex, IValue>
     {
-        private readonly List<IValue> _fields = new List<IValue>();
+        readonly List<IValue> _fields = new List<IValue>();
         private readonly IIndexCollectionSource _source;
 
-        private readonly IDictionary<CollectionIndexKey, HashSet<IValue>> _data =
+        private readonly Dictionary<CollectionIndexKey, HashSet<IValue>> _data =
             new Dictionary<CollectionIndexKey, HashSet<IValue>>();
 
         public CollectionIndex(IIndexCollectionSource source, IEnumerable<IValue> fields)
         {
             _source = source;
-            _fields.AddRange(fields);
+            foreach (var value in _source)
+            {
+                ElementAdded(value);
+            }
+
+            foreach (var field in fields)
+            {
+                if (field is ValueTable.ValueTableColumn column) 
+                    column.IsIndexable = true;
+                _fields.Add(field);
+            }
         }
 
         internal bool CanBeUsedFor(IEnumerable<IValue> searchFields)
         {
-            return _fields.Any() && _fields.ToHashSet().IsSubsetOf(searchFields.ToHashSet());
+            return _fields.Count>0 && _fields.ToHashSet().IsSubsetOf(searchFields);
         }
 
         private CollectionIndexKey IndexKey(PropertyNameIndexAccessor source)
@@ -82,10 +92,7 @@ internal void ElementRemoved(PropertyNameIndexAccessor element)
             }
         }
 
-        internal void Clear()
-        {
-            _data.Clear();
-        }
+        internal void Clear() => _data.Clear();
 
         internal void Rebuild()
         {

src/OneScript.StandardLibrary/Collections/ValueTable/CollectionIndexes.cs

@@ -32,7 +32,6 @@ public CollectionIndexes(IIndexCollectionSource owner)
         public CollectionIndex Add(string columns)
         {
             var newIndex = new CollectionIndex(_owner, BuildFieldList(_owner, columns));
-            newIndex.Rebuild();
             _indexes.Add(newIndex);
             return newIndex;
         }

src/OneScript.StandardLibrary/Collections/ValueTable/ValueTableColumn.cs

@@ -21,17 +21,18 @@ public class ValueTableColumn : AutoContext<ValueTableColumn>
     {
         private string _title;
         private string _name;
-        private TypeDescription _valueType;
+        private readonly TypeDescription _valueType;
         private readonly WeakReference _owner;
-        private readonly int _id;
+
+        public bool IsIndexable { get; set; }
 
-        public ValueTableColumn(ValueTableColumnCollection owner, int id, string name, string title, TypeDescription type, int width)
+        public ValueTableColumn(ValueTableColumnCollection owner, string name, string title, TypeDescription type, int width)
         {
             _name = name;
             _title = title;
             _valueType = type ?? new TypeDescription();
             Width = width;
-            _id = id;
+            IsIndexable = false;
 
             _owner = new WeakReference(owner);
         }
@@ -65,7 +66,6 @@ public string Name
                     _title = value;
 
                 _name = value;
-
             }
         }
         /// <summary>

src/OneScript.StandardLibrary/Collections/ValueTable/ValueTableRow.cs

@@ -89,9 +89,14 @@ public void Set(IValue index, IValue value)
 
         public void Set(ValueTableColumn column, IValue value)
         {
-            _owner.Indexes.ElementRemoved(this);
-            _data[column] = column.ValueType.AdjustValue(value);
-            _owner.Indexes.ElementAdded(this);
+            if (column.IsIndexable)
+            {
+                _owner.Indexes.ElementRemoved(this);
+                _data[column] = column.ValueType.AdjustValue(value);
+                _owner.Indexes.ElementAdded(this);
+            }
+            else
+                _data[column] = column.ValueType.AdjustValue(value);
         }
 
         public void OnOwnerColumnRemoval(ValueTableColumn column)