mirror of
				https://github.com/nsnail/FreeSql.git
				synced 2025-11-04 17:20:49 +08:00 
			
		
		
		
	- 增加 AuditValueEventArgs Object 参数;#1128
This commit is contained in:
		@@ -9,7 +9,7 @@
 | 
				
			|||||||
	</PropertyGroup>
 | 
						</PropertyGroup>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	<PropertyGroup>
 | 
						<PropertyGroup>
 | 
				
			||||||
		<Version>3.2.660-preview22020526</Version>
 | 
							<Version>3.2.660-preview22020528</Version>
 | 
				
			||||||
	</PropertyGroup>
 | 
						</PropertyGroup>
 | 
				
			||||||
	
 | 
						
 | 
				
			||||||
	<ItemGroup>
 | 
						<ItemGroup>
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -795,5 +795,14 @@
 | 
				
			|||||||
            <param name="that"></param>
 | 
					            <param name="that"></param>
 | 
				
			||||||
            <returns></returns>
 | 
					            <returns></returns>
 | 
				
			||||||
        </member>
 | 
					        </member>
 | 
				
			||||||
 | 
					        <member name="M:Microsoft.Extensions.DependencyInjection.FreeSqlRepositoryDependencyInjection.AddFreeRepository(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action{FreeSql.FluentDataFilter},System.Reflection.Assembly[])">
 | 
				
			||||||
 | 
					            <summary>
 | 
				
			||||||
 | 
					            批量注入 Repository,可以参考代码自行调整
 | 
				
			||||||
 | 
					            </summary>
 | 
				
			||||||
 | 
					            <param name="services"></param>
 | 
				
			||||||
 | 
					            <param name="globalDataFilter"></param>
 | 
				
			||||||
 | 
					            <param name="assemblies"></param>
 | 
				
			||||||
 | 
					            <returns></returns>
 | 
				
			||||||
 | 
					        </member>
 | 
				
			||||||
    </members>
 | 
					    </members>
 | 
				
			||||||
</doc>
 | 
					</doc>
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -308,12 +308,13 @@ namespace FreeSql.Aop
 | 
				
			|||||||
    #region AuditValue
 | 
					    #region AuditValue
 | 
				
			||||||
    public class AuditValueEventArgs : EventArgs
 | 
					    public class AuditValueEventArgs : EventArgs
 | 
				
			||||||
    {
 | 
					    {
 | 
				
			||||||
        public AuditValueEventArgs(AuditValueType autoValueType, ColumnInfo column, PropertyInfo property, object value)
 | 
					        public AuditValueEventArgs(AuditValueType autoValueType, ColumnInfo column, PropertyInfo property, object value, object obj)
 | 
				
			||||||
        {
 | 
					        {
 | 
				
			||||||
            this.AuditValueType = autoValueType;
 | 
					            this.AuditValueType = autoValueType;
 | 
				
			||||||
            this.Column = column;
 | 
					            this.Column = column;
 | 
				
			||||||
            this.Property = property;
 | 
					            this.Property = property;
 | 
				
			||||||
            this._value = value;
 | 
					            this._value = value;
 | 
				
			||||||
 | 
					            this.Object = obj;
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        /// <summary>
 | 
					        /// <summary>
 | 
				
			||||||
@@ -342,6 +343,7 @@ namespace FreeSql.Aop
 | 
				
			|||||||
        }
 | 
					        }
 | 
				
			||||||
        private object _value;
 | 
					        private object _value;
 | 
				
			||||||
        public bool ValueIsChanged { get; private set; }
 | 
					        public bool ValueIsChanged { get; private set; }
 | 
				
			||||||
 | 
					        public object Object { get; }
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
    public enum AuditValueType { Update, Insert, InsertOrUpdate }
 | 
					    public enum AuditValueType { Update, Insert, InsertOrUpdate }
 | 
				
			||||||
    #endregion
 | 
					    #endregion
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -93,7 +93,7 @@ namespace FreeSql.Internal.CommonProvider
 | 
				
			|||||||
            foreach (var col in table.Columns.Values)
 | 
					            foreach (var col in table.Columns.Values)
 | 
				
			||||||
            {
 | 
					            {
 | 
				
			||||||
                object val = col.GetValue(data);
 | 
					                object val = col.GetValue(data);
 | 
				
			||||||
                var auditArgs = new Aop.AuditValueEventArgs(Aop.AuditValueType.InsertOrUpdate, col, table.Properties.TryGetValue(col.CsName, out var tryprop) ? tryprop : null, val);
 | 
					                var auditArgs = new Aop.AuditValueEventArgs(Aop.AuditValueType.InsertOrUpdate, col, table.Properties.TryGetValue(col.CsName, out var tryprop) ? tryprop : null, val, data);
 | 
				
			||||||
                orm.Aop.AuditValueHandler(sender, auditArgs);
 | 
					                orm.Aop.AuditValueHandler(sender, auditArgs);
 | 
				
			||||||
                if (auditArgs.ValueIsChanged)
 | 
					                if (auditArgs.ValueIsChanged)
 | 
				
			||||||
                {
 | 
					                {
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -167,7 +167,7 @@ namespace FreeSql.Internal.CommonProvider
 | 
				
			|||||||
                object val = col.GetValue(data);
 | 
					                object val = col.GetValue(data);
 | 
				
			||||||
                if (orm.Aop.AuditValueHandler != null)
 | 
					                if (orm.Aop.AuditValueHandler != null)
 | 
				
			||||||
                {
 | 
					                {
 | 
				
			||||||
                    var auditArgs = new Aop.AuditValueEventArgs(Aop.AuditValueType.Insert, col, table.Properties.TryGetValue(col.CsName, out var tryprop) ? tryprop : null, val);
 | 
					                    var auditArgs = new Aop.AuditValueEventArgs(Aop.AuditValueType.Insert, col, table.Properties.TryGetValue(col.CsName, out var tryprop) ? tryprop : null, val, data);
 | 
				
			||||||
                    orm.Aop.AuditValueHandler(sender, auditArgs);
 | 
					                    orm.Aop.AuditValueHandler(sender, auditArgs);
 | 
				
			||||||
                    if (auditArgs.ValueIsChanged)
 | 
					                    if (auditArgs.ValueIsChanged)
 | 
				
			||||||
                    {
 | 
					                    {
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -410,7 +410,7 @@ namespace FreeSql.Internal.CommonProvider
 | 
				
			|||||||
                foreach (var col in table.Columns.Values)
 | 
					                foreach (var col in table.Columns.Values)
 | 
				
			||||||
                {
 | 
					                {
 | 
				
			||||||
                    object val = col.GetValue(d);
 | 
					                    object val = col.GetValue(d);
 | 
				
			||||||
                    var auditArgs = new Aop.AuditValueEventArgs(Aop.AuditValueType.Update, col, table.Properties.TryGetValue(col.CsName, out var tryprop) ? tryprop : null, val);
 | 
					                    var auditArgs = new Aop.AuditValueEventArgs(Aop.AuditValueType.Update, col, table.Properties.TryGetValue(col.CsName, out var tryprop) ? tryprop : null, val, d);
 | 
				
			||||||
                    orm.Aop.AuditValueHandler(sender, auditArgs);
 | 
					                    orm.Aop.AuditValueHandler(sender, auditArgs);
 | 
				
			||||||
                    if (auditArgs.ValueIsChanged)
 | 
					                    if (auditArgs.ValueIsChanged)
 | 
				
			||||||
                    {
 | 
					                    {
 | 
				
			||||||
@@ -432,7 +432,7 @@ namespace FreeSql.Internal.CommonProvider
 | 
				
			|||||||
            foreach (var col in table.Columns.Values)
 | 
					            foreach (var col in table.Columns.Values)
 | 
				
			||||||
            {
 | 
					            {
 | 
				
			||||||
                object val = col.GetValue(data);
 | 
					                object val = col.GetValue(data);
 | 
				
			||||||
                var auditArgs = new Aop.AuditValueEventArgs(Aop.AuditValueType.Update, col, table.Properties.TryGetValue(col.CsName, out var tryprop) ? tryprop : null, val);
 | 
					                var auditArgs = new Aop.AuditValueEventArgs(Aop.AuditValueType.Update, col, table.Properties.TryGetValue(col.CsName, out var tryprop) ? tryprop : null, val, data);
 | 
				
			||||||
                orm.Aop.AuditValueHandler(sender, auditArgs);
 | 
					                orm.Aop.AuditValueHandler(sender, auditArgs);
 | 
				
			||||||
                if (auditArgs.ValueIsChanged)
 | 
					                if (auditArgs.ValueIsChanged)
 | 
				
			||||||
                {
 | 
					                {
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user