- 增加 IUpdate.SetDto 根据 dto 更新的方法；#218

Author: 28810

FreeSql.DbContext/FreeSql.DbContext.xml

@@ -56,6 +56,7 @@ public interface IUpdate<T1> where T1 : class
         /// <param name="source">实体集合</param>
         /// <returns></returns>
         IUpdate<T1> SetSource(IEnumerable<T1> source);
+        
         /// <summary>
         /// 忽略的列，IgnoreColumns(a => a.Name) | IgnoreColumns(a => new{a.Name,a.Time}) | IgnoreColumns(a => new[]{"name","time"})
         /// </summary>
@@ -107,6 +108,17 @@ public interface IUpdate<T1> where T1 : class
         /// <returns></returns>
         IUpdate<T1> SetRaw(string sql, object parms = null);
 
+        /// <summary>
+        /// 设置更新的列
+        /// <para></para>
+        /// SetDto(new { title = "xxx", clicks = 2 })
+        /// <para></para>
+        /// SetDto(new Dictionary&lt;string, object&gt; { ["title"] = "xxx", ["clicks"] = 2 })
+        /// </summary>
+        /// <param name="dto">dto 或 Dictionary&lt;string, object&gt;</param>
+        /// <returns></returns>
+        IUpdate<T1> SetDto(object dto);
+
         /// <summary>
         /// lambda表达式条件，仅支持实体基础成员（不包含导航对象）<para></para>
         /// 若想使用导航对象，请使用 ISelect.ToUpdate() 方法

FreeSql/FreeSql.xml

@@ -334,26 +334,31 @@ public IUpdate<T1> SetSource(IEnumerable<T1> source)
             return this;
         }
 
-        public IUpdate<T1> Set<TMember>(Expression<Func<T1, TMember>> column, TMember value)
+        protected void SetPriv(ColumnInfo col, object value)
         {
-            var cols = new List<SelectColumnInfo>();
-            _commonExpression.ExpressionSelectColumn_MemberAccess(null, cols, SelectTableInfoType.From, column?.Body, true, null);
-            if (cols.Count != 1) return this;
-            var col = cols.First();
             object paramVal = null;
-            if (col.Column.Attribute.MapType == typeof(TMember)) paramVal = value;
-            else paramVal = Utils.GetDataReaderValue(col.Column.Attribute.MapType, value);
-            _set.Append(", ").Append(_commonUtils.QuoteSqlName(col.Column.Attribute.Name)).Append(" = ");
+            if (value != null)
+            {
+                if (col.Attribute.MapType == value.GetType()) paramVal = value;
+                else paramVal = Utils.GetDataReaderValue(col.Attribute.MapType, value);
+            }
+            _set.Append(", ").Append(_commonUtils.QuoteSqlName(col.Attribute.Name)).Append(" = ");
             if (_noneParameter)
             {
-                _set.Append(_commonUtils.GetNoneParamaterSqlValue(_params, col.Column.Attribute.MapType, paramVal));
+                _set.Append(_commonUtils.GetNoneParamaterSqlValue(_params, col.Attribute.MapType, paramVal));
             }
             else
             {
-                _set.Append(_commonUtils.QuoteWriteParamter(col.Column.Attribute.MapType, $"{_commonUtils.QuoteParamterName("p_")}{_params.Count}"));
-                _commonUtils.AppendParamter(_params, null, col.Column, col.Column.Attribute.MapType, paramVal);
+                _set.Append(_commonUtils.QuoteWriteParamter(col.Attribute.MapType, $"{_commonUtils.QuoteParamterName("p_")}{_params.Count}"));
+                _commonUtils.AppendParamter(_params, null, col, col.Attribute.MapType, paramVal);
             }
-            //foreach (var t in _source) Utils.FillPropertyValue(t, tryf.CsName, value);
+        }
+        public IUpdate<T1> Set<TMember>(Expression<Func<T1, TMember>> column, TMember value)
+        {
+            var cols = new List<SelectColumnInfo>();
+            _commonExpression.ExpressionSelectColumn_MemberAccess(null, cols, SelectTableInfoType.From, column?.Body, true, null);
+            if (cols.Count != 1) return this;
+            SetPriv(cols.First().Column, value);
             return this;
         }
         public IUpdate<T1> Set<TMember>(Expression<Func<T1, TMember>> exp)
@@ -424,6 +429,27 @@ public IUpdate<T1> SetRaw(string sql, object parms = null)
             return this;
         }
 
+        public IUpdate<T1> SetDto(object dto)
+        {
+            if (dto == null) return this;
+            if (dto is Dictionary<string, object>)
+            {
+                var dic = dto as Dictionary<string, object>;
+                foreach (var kv in dic)
+                {
+                    if (_table.ColumnsByCs.TryGetValue(kv.Key, out var trycol) == false) continue;
+                    SetPriv(trycol, kv.Value);
+                }
+            }
+            var dtoProps = dto.GetType().GetProperties();
+            foreach (var dtoProp in dtoProps)
+            {
+                if (_table.ColumnsByCs.TryGetValue(dtoProp.Name, out var trycol) == false) continue;
+                SetPriv(trycol, dtoProp.GetValue(dto, null));
+            }
+            return this;
+        }
+
         public IUpdate<T1> Where(Expression<Func<T1, bool>> expression) => this.Where(_commonExpression.ExpressionWhereLambdaNoneForeignObject(null, _table, null, expression?.Body, null, _params));
         public IUpdate<T1> Where(string sql, object parms = null)
         {