|
|
@@ -129,10 +129,6 @@ public class PropertyChangedSaveEventTrigger<T> : IEventTrigger<SaveEvent<T>, Sa
|
|
|
{
|
|
|
public IProperty? TriggerProperty { get; set; }
|
|
|
|
|
|
- public object? OldValue { get; set; }
|
|
|
-
|
|
|
- public object? NewValue { get; set; }
|
|
|
-
|
|
|
public bool Check(SaveEventDataModel<T> dataModel)
|
|
|
{
|
|
|
if(TriggerProperty is null)
|
|
|
@@ -143,14 +139,6 @@ public class PropertyChangedSaveEventTrigger<T> : IEventTrigger<SaveEvent<T>, Sa
|
|
|
{
|
|
|
return false;
|
|
|
}
|
|
|
- if(OldValue is not null && !object.Equals(dataModel.Entity.OriginalValueList[TriggerProperty.Name], OldValue))
|
|
|
- {
|
|
|
- return false;
|
|
|
- }
|
|
|
- if(NewValue is not null && !object.Equals(TriggerProperty.Getter()(dataModel.Entity), NewValue))
|
|
|
- {
|
|
|
- return false;
|
|
|
- }
|
|
|
return true;
|
|
|
}
|
|
|
|
|
|
@@ -170,7 +158,7 @@ public class PropertyChangedSaveEventTrigger<T> : IEventTrigger<SaveEvent<T>, Sa
|
|
|
{
|
|
|
if(reader.ReadBoolean())
|
|
|
{
|
|
|
- TriggerProperty = DatabaseSchema.Property(typeof(T), reader.ReadString());
|
|
|
+ TriggerProperty = DatabaseSchema.PropertyStrict(typeof(T), reader.ReadString());
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
@@ -184,21 +172,9 @@ public class PropertyChangedSaveEventTrigger<T> : IEventTrigger<SaveEvent<T>, Sa
|
|
|
{
|
|
|
return $"{typeof(T).GetCaption()} changed";
|
|
|
}
|
|
|
- else if(OldValue is null && NewValue is null)
|
|
|
- {
|
|
|
- return $"{typeof(T).GetCaption()}.{TriggerProperty.Name} changed";
|
|
|
- }
|
|
|
- else if (OldValue is null)
|
|
|
- {
|
|
|
- return $"{typeof(T).GetCaption()}.{TriggerProperty.Name} changed to {NewValue}";
|
|
|
- }
|
|
|
- else if (NewValue is null)
|
|
|
- {
|
|
|
- return $"{typeof(T).GetCaption()}.{TriggerProperty.Name} changed from {OldValue}";
|
|
|
- }
|
|
|
else
|
|
|
{
|
|
|
- return $"{typeof(T).GetCaption()}.{TriggerProperty.Name} changed from {OldValue} to {NewValue}";
|
|
|
+ return $"{typeof(T).GetCaption()}.{TriggerProperty.Name} changed";
|
|
|
}
|
|
|
}
|
|
|
}
|