修复 变量删除时错误的处理

新增 变量添加按钮可执行变化

Author: Maklith

KitopiaAvalonia/Windows/TaskEditors/TaskEditorValueNodeShow.axaml.cs

@@ -64,19 +64,41 @@ static TaskEditorValueNodeShow()
             x.AddCommand = new RelayCommand(() =>
             {
                 if (values1.ContainsKey(x.ValueNameToAdd)) return;
-
+                if (x.ValueType != ValueType.TempValue && x.ValueTypeToAdd == null)
+                {
+                    return;
+                }
 
                 values1.Add(x.ValueNameToAdd,
                     new CustomScenarioValue(x.ValueTypeToAdd == null ? typeof(object) : x.ValueTypeToAdd.Type, null!));
 
                 x.ValueNameToAdd = null!;
+            }, () =>
+            {
+                if (x.ValueType != ValueType.TempValue && x.ValueTypeToAdd == null)
+                {
+                    return false;
+                }
+
+                return !string.IsNullOrWhiteSpace(x.ValueNameToAdd) && !values1.ContainsKey(x.ValueNameToAdd);
             });
+
             x.DelCommand = new RelayCommand<object>((s) =>
             {
                 if (s is not KeyValuePair<string, CustomScenarioValue> str) return;
                 values1.Remove(str.Key);
             });
         });
+        ValueTypeToAddProperty.Changed.AddClassHandler<TaskEditorValueNodeShow>((x, e) =>
+        {
+            if (x.AddCommand is RelayCommand cmd)
+                cmd.NotifyCanExecuteChanged();
+        });
+        ValueNameToAddProperty.Changed.AddClassHandler<TaskEditorValueNodeShow>((x, e) =>
+        {
+            if (x.AddCommand is RelayCommand cmd)
+                cmd.NotifyCanExecuteChanged();
+        });
     }
 
     public TaskEditorValueNodeShow()

KitopiaAvalonia/Windows/TaskEditors/TaskEditorValueToScenarioMethodNode.axaml.cs

@@ -71,6 +71,12 @@ public KeyValuePair<string, CustomScenarioValue> Source
 
     private static void Action(TaskEditorValueToScenarioMethodNode x, AvaloniaPropertyChangedEventArgs e)
     {
+        // ReSharper disable once ConditionIsAlwaysTrueOrFalseAccordingToNullableAPIContract
+        if (x.Source.Key == null || x.Source.Value == null)
+        {
+            return;
+        }
+
         switch (x.ValueType)
         {
             case ValueType.None: