Fix UI interaction bug

Author: CodingOctocat

IPConfig/Models/EditableIPConfigModel.cs

@@ -13,7 +13,9 @@
 
 namespace IPConfig.Models;
 
-public partial class EditableIPConfigModel : IPConfigModel, IDeepCloneTo<EditableIPConfigModel>, IEditableObject, IRevertibleChangeTracking
+public partial class EditableIPConfigModel : IPConfigModel,
+    IDeepCloneTo<EditableIPConfigModel>,
+    IEditableObject, IRevertibleChangeTracking
 {
     private IPConfigModel _backup = IPConfigModel.Empty;
 
@@ -24,7 +26,9 @@ public partial class EditableIPConfigModel : IPConfigModel, IDeepCloneTo<Editabl
     [JsonIgnore]
     public int Order { get; set; } = -1;
 
-    public event PropertyChangedEventHandler? EditableChanged;
+    public event EventHandler<bool>? EditableChanged;
+
+    public event PropertyChangedEventHandler? EditablePropertyChanged;
 
     [BsonCtor]
     public EditableIPConfigModel(string name) : base(name)
@@ -37,18 +41,20 @@ public bool IsPropertyChanged<T>(Func<IPConfigModel, T> property) where T : notn
 
     public bool IsPropertyChanged<T>(Func<IPConfigModel, T> property, [NotNullWhen(true)] out T? oldValue) where T : notnull
     {
+        var prop = property(this);
+
         if (!_inTxn)
         {
-            oldValue = default;
+            oldValue = prop;
 
             return false;
         }
 
         var backup = property(_backup);
 
-        if (EqualityComparer<T>.Default.Equals(property(this), backup))
+        if (EqualityComparer<T>.Default.Equals(prop, backup))
         {
-            oldValue = default;
+            oldValue = prop;
 
             return false;
         }
@@ -86,7 +92,11 @@ protected override void OnPropertyChanged(PropertyChangedEventArgs e)
         if (e.PropertyName != nameof(IsChanged))
         {
             OnPropertyChanged(nameof(IsChanged));
-            EditableChanged?.Invoke(this, e);
+            EditablePropertyChanged?.Invoke(this, e);
+        }
+        else
+        {
+            EditableChanged?.Invoke(this, IsChanged);
         }
     }
 

IPConfig/ViewModels/IPConfigDetailViewModel.cs

@@ -90,10 +90,6 @@ public partial class IPConfigDetailViewModel : ObservableRecipient, IEditableObj
     private EditableIPConfigModel _editingIPConfig = IPConfigModel.Empty.AsEditable();
 
     [ObservableProperty]
-    [NotifyPropertyChangedFor(nameof(PrimarySaveOrApplyString),
-        nameof(SecondarySaveOrApplyString),
-        nameof(PrimarySaveOrApplyCommand),
-        nameof(SecondarySaveOrApplyCommand))]
     private object _editingIPConfigSender = null!;
 
     [ObservableProperty]
@@ -297,6 +293,7 @@ public void Receive(PropertyChangedMessage<EditableIPConfigModel?> message)
         EditingIPConfig.EditableChanged += EditingIPConfig_EditableChanged;
 
         // 初始化页面状态。
+        RaisePropertyChanged();
         CanShowChangedIndicator = false;
         CanShowUnchangedIndicator = false;
     }
@@ -658,12 +655,9 @@ partial void OnEditingIPConfigChanged([DisallowNull] EditableIPConfigModel? oldV
 
     #region Event Handlers
 
-    private void EditingIPConfig_EditableChanged(object? sender, PropertyChangedEventArgs e)
+    private void EditingIPConfig_EditableChanged(object? sender, bool e)
     {
-        OnPropertyChanged(nameof(PrimarySaveOrApplyCommand));
-        OnPropertyChanged(nameof(PrimarySaveOrApplyString));
-        OnPropertyChanged(nameof(SecondarySaveOrApplyCommand));
-        OnPropertyChanged(nameof(SecondarySaveOrApplyString));
+        RaisePropertyChanged();
     }
 
     private void EditingIPConfig_PropertyChanged(object? sender, PropertyChangedEventArgs e)
@@ -687,6 +681,14 @@ private void EditingIPConfig_PropertyChanged(object? sender, PropertyChangedEven
         }
     }
 
+    private void RaisePropertyChanged()
+    {
+        OnPropertyChanged(nameof(PrimarySaveOrApplyCommand));
+        OnPropertyChanged(nameof(PrimarySaveOrApplyString));
+        OnPropertyChanged(nameof(SecondarySaveOrApplyCommand));
+        OnPropertyChanged(nameof(SecondarySaveOrApplyString));
+    }
+
     #endregion Event Handlers
 
     #region Private Methods