revert: 恢复部分代码

Author: ArgoZhang

src/BootstrapBlazor/Dynamic/DataTableDynamicContext.cs

@@ -129,9 +129,21 @@ private List<IDynamicObject> BuildItems()
         {
             if (!row.IsDeletedOrDetached())
             {
-                var d = new DataTableDynamicObject(row);
-                _dataCache.TryAdd(d.DynamicObjectPrimaryKey, d);
-                ret.Add(d);
+                var dynamicObject = Activator.CreateInstance(_dynamicObjectType);
+                if (dynamicObject is DataTableDynamicObject d)
+                {
+                    d.Row = row;
+                    foreach (DataColumn col in DataTable.Columns)
+                    {
+                        if (!row.IsNull(col))
+                        {
+                            Utility.SetPropertyValue<object, object?>(d, col.ColumnName, row[col]);
+                        }
+                    }
+
+                    _dataCache.TryAdd(d.DynamicObjectPrimaryKey, d);
+                    ret.Add(d);
+                }
             }
         }
         return ret;
@@ -188,7 +200,7 @@ public override async Task AddAsync(IEnumerable<IDynamicObject> selectedItems)
             DataTable.AcceptChanges();
 
             // 新建动态类型属性赋值
-            var dynamicObject = new DataTableDynamicObject(row);
+            var dynamicObject = new DataTableDynamicObject() { Row = row };
 
             // 触发 Changed 回调
             if (OnChanged != null)

src/BootstrapBlazor/Dynamic/DataTableDynamicObject.cs

@@ -11,30 +11,31 @@ namespace BootstrapBlazor.Components;
 /// <para lang="zh">DataTable 动态类实例</para>
 /// <para lang="en">DataTable dynamic class instance</para>
 /// </summary>
-public class DataTableDynamicObject(DataRow row) : DynamicObject
+public class DataTableDynamicObject : DynamicObject
 {
     /// <summary>
     /// <para lang="zh">获得 其关联 DataRow 实例</para>
     /// <para lang="en">Gets the associated DataRow instance</para>
     /// </summary>
-    public DataRow Row => row;
+    [NotNull]
+    internal DataRow? Row { get; set; }
 
     /// <summary>
     /// <inheritdoc/>
     /// </summary>
     /// <param name="propertyName"></param>
     public override object? GetValue(string propertyName)
     {
-        if (row.IsDeletedOrDetached())
+        if (Row.IsDeletedOrDetached())
         {
             return null;
         }
 
         object? ret = null;
-        var column = row.Table.Columns[propertyName];
+        var column = Row.Table.Columns[propertyName];
         if (column != null)
         {
-            ret = row[propertyName];
+            ret = Row[propertyName];
 
             // 判断 DBNull 情况
             if (ret is DBNull)
@@ -60,14 +61,14 @@ public class DataTableDynamicObject(DataRow row) : DynamicObject
     /// </summary>
     public override void SetValue(string propertyName, object? value)
     {
-        if (row.IsDeletedOrDetached())
+        if (Row.IsDeletedOrDetached())
         {
             return;
         }
 
-        if (row.Table.Columns.Contains(propertyName))
+        if (Row.Table.Columns.Contains(propertyName))
         {
-            row[propertyName] = value;
+            Row[propertyName] = value;
         }
     }