表内容变化记录(add/edit/remove)

Author: 2881099

Diff for: Extensions/FreeSql.Extensions.AggregateRoot/AggregateRootRepository/AggregateRootUtils.cs

@@ -356,14 +356,15 @@ void LocalNavigateReader(Type entityType, object entity)
 
         public static void MapEntityValue(string boundaryName, IFreeSql fsql, Type rootEntityType, object rootEntityFrom, object rootEntityTo)
         {
+            var isDict = rootEntityTo?.GetType() == typeof(Dictionary<string, object>);
             Dictionary<Type, Dictionary<string, bool>> ignores = new Dictionary<Type, Dictionary<string, bool>>();
             LocalMapEntityValue(rootEntityType, rootEntityFrom, rootEntityTo, true);
             ignores.Clear();
 
             void LocalMapEntityValue(Type entityType, object entityFrom, object entityTo, bool cascade)
             {
                 if (entityFrom == null || entityTo == null) return;
-                if (entityType == null) entityType = entityFrom?.GetType() ?? entityTo?.GetType();
+                if (entityType == null) entityType = entityFrom.GetType();
                 var table = fsql.CodeFirst.GetTableByEntity(entityType);
                 if (table == null) return;
 
@@ -377,7 +378,8 @@ void LocalMapEntityValue(Type entityType, object entityFrom, object entityTo, bo
                     if (table.ColumnsByCsIgnore.ContainsKey(prop.Name)) continue;
                     if (table.ColumnsByCs.ContainsKey(prop.Name))
                     {
-                        table.SetPropertyValue(entityTo, prop.Name, table.GetPropertyValue(entityFrom, prop.Name));
+                        if (isDict) (entityTo as Dictionary<string, object>)[prop.Name] = table.GetPropertyValue(entityFrom, prop.Name);
+                        else table.SetPropertyValue(entityTo, prop.Name, table.GetPropertyValue(entityFrom, prop.Name));
                         continue;
                     }
                     if (cascade == false) continue;
@@ -388,16 +390,18 @@ void LocalMapEntityValue(Type entityType, object entityFrom, object entityTo, bo
                     var propvalFrom = EntityUtilExtensions.GetEntityValueWithPropertyName(fsql, entityType, entityFrom, prop.Name);
                     if (propvalFrom == null)
                     {
-                        EntityUtilExtensions.SetEntityValueWithPropertyName(fsql, entityType, entityTo, prop.Name, null);
+                        if (isDict) (entityTo as Dictionary<string, object>)[prop.Name] = null;
+                        else EntityUtilExtensions.SetEntityValueWithPropertyName(fsql, entityType, entityTo, prop.Name, null);
                         continue;
                     }
                     switch (tbref.RefType)
                     {
                         case TableRefType.OneToOne:
-                            var propvalTo = tbref.RefEntityType.CreateInstanceGetDefaultValue();
+                            var propvalTo = isDict ? new Dictionary<string, object>() : tbref.RefEntityType.CreateInstanceGetDefaultValue();
                             SetNavigateRelationshipValue(fsql, tbref, table.Type, entityFrom, propvalFrom);
                             LocalMapEntityValue(tbref.RefEntityType, propvalFrom, propvalTo, boundaryAttr?.BreakThen != true);
-                            EntityUtilExtensions.SetEntityValueWithPropertyName(fsql, entityType, entityTo, prop.Name, propvalTo);
+                            if (isDict) (entityTo as Dictionary<string, object>)[prop.Name] = null;
+                            else EntityUtilExtensions.SetEntityValueWithPropertyName(fsql, entityType, entityTo, prop.Name, propvalTo);
                             break;
                         case TableRefType.OneToMany:
                             SetNavigateRelationshipValue(fsql, tbref, table.Type, entityFrom, propvalFrom);
@@ -414,22 +418,36 @@ void LocalMapEntityValue(Type entityType, object entityFrom, object entityTo, bo
             }
             void LocalMapEntityValueCollection(Type entityType, object entityFrom, object entityTo, TableRef tbref, IEnumerable propvalFrom, PropertyInfo prop, bool cascade)
             {
-                var propvalTo = typeof(List<>).MakeGenericType(tbref.RefEntityType).CreateInstanceGetDefaultValue();
-                var propvalToIList = propvalTo as IList;
-                foreach (var fromItem in propvalFrom)
+                if (isDict)
                 {
-                    var toItem = tbref.RefEntityType.CreateInstanceGetDefaultValue();
-                    LocalMapEntityValue(tbref.RefEntityType, fromItem, toItem, cascade);
-                    propvalToIList.Add(toItem);
+                    var propvalTo = new List<Dictionary<string,object>>();
+                    foreach (var fromItem in propvalFrom)
+                    {
+                        var toItem = new Dictionary<string, object>();
+                        LocalMapEntityValue(tbref.RefEntityType, fromItem, toItem, cascade);
+                        propvalTo.Add(toItem);
+                    }
+                    (entityTo as Dictionary<string, object>)[prop.Name] = propvalTo;
                 }
-                var propvalType = prop.PropertyType.GetGenericTypeDefinition();
-                if (propvalType == typeof(List<>) || propvalType == typeof(ICollection<>))
-                    EntityUtilExtensions.SetEntityValueWithPropertyName(fsql, entityType, entityTo, prop.Name, propvalTo);
-                else if (propvalType == typeof(ObservableCollection<>))
+                else
                 {
-                    //var propvalTypeOcCtor = typeof(ObservableCollection<>).MakeGenericType(tbref.RefEntityType).GetConstructor(new[] { typeof(List<>).MakeGenericType(tbref.RefEntityType) });
-                    var propvalTypeOc = Activator.CreateInstance(typeof(ObservableCollection<>).MakeGenericType(tbref.RefEntityType), new object[] { propvalTo });
-                    EntityUtilExtensions.SetEntityValueWithPropertyName(fsql, entityType, entityTo, prop.Name, propvalTypeOc);
+                    var propvalTo = typeof(List<>).MakeGenericType(tbref.RefEntityType).CreateInstanceGetDefaultValue();
+                    var propvalToIList = propvalTo as IList;
+                    foreach (var fromItem in propvalFrom)
+                    {
+                        var toItem = tbref.RefEntityType.CreateInstanceGetDefaultValue();
+                        LocalMapEntityValue(tbref.RefEntityType, fromItem, toItem, cascade);
+                        propvalToIList.Add(toItem);
+                    }
+                    var propvalType = prop.PropertyType.GetGenericTypeDefinition();
+                    if (propvalType == typeof(List<>) || propvalType == typeof(ICollection<>))
+                        EntityUtilExtensions.SetEntityValueWithPropertyName(fsql, entityType, entityTo, prop.Name, propvalTo);
+                    else if (propvalType == typeof(ObservableCollection<>))
+                    {
+                        //var propvalTypeOcCtor = typeof(ObservableCollection<>).MakeGenericType(tbref.RefEntityType).GetConstructor(new[] { typeof(List<>).MakeGenericType(tbref.RefEntityType) });
+                        var propvalTypeOc = Activator.CreateInstance(typeof(ObservableCollection<>).MakeGenericType(tbref.RefEntityType), new object[] { propvalTo });
+                        EntityUtilExtensions.SetEntityValueWithPropertyName(fsql, entityType, entityTo, prop.Name, propvalTypeOc);
+                    }
                 }
             }
         }