临时提交

DMS.WPF/ViewModels/Dialogs/ConfrimDialogViewModel.cs

@@ -13,7 +13,7 @@ public partial class ConfrimDialogViewModel : DialogViewModelBase<Boolean>
     {
         Message = message;
         Title = title;
-        PrimaryButContent = primaryButText;
+        PrimaryButText = primaryButText;
     }
 
 

DMS.WPF/ViewModels/Dialogs/DialogViewModelBase.cs

@@ -11,7 +11,7 @@ namespace DMS.WPF.ViewModels.Dialogs
         private string _title;
         
         [ObservableProperty]
-        private string _primaryButContent;
+        private string _primaryButText;
 
         public event Func<TResult, Task> CloseRequested;
 

DMS.WPF/ViewModels/Dialogs/VarDataDialogViewModel.cs

@@ -1,14 +0,0 @@
-using CommunityToolkit.Mvvm.ComponentModel;
-using DMS.WPF.ViewModels.Items;
-
-namespace DMS.WPF.ViewModels.Dialogs;
-
-public partial class VarDataDialogViewModel : ObservableObject
-{
-    [ObservableProperty]
-    private VariableItemViewModel _variable;
-    [ObservableProperty]
-    private string title;
-    [ObservableProperty]
-    private string primaryButtonText;
-}

DMS.WPF/ViewModels/Dialogs/VariableDialogViewModel.cs

@@ -0,0 +1,37 @@
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
+using DMS.WPF.ViewModels.Items;
+
+namespace DMS.WPF.ViewModels.Dialogs;
+
+public partial class VariableDialogViewModel : DialogViewModelBase<VariableItemViewModel>
+{
+    [ObservableProperty]
+    private VariableItemViewModel _variable;
+
+    public VariableDialogViewModel(string title,string primaryButText,VariableItemViewModel variable=null)
+    {
+        if (variable==null)
+        {
+            Variable=new VariableItemViewModel();
+        }
+        else
+        {
+            Variable=variable;
+        }
+        
+        Title=title;
+        PrimaryButText=primaryButText;
+    }
+    
+    [RelayCommand]
+    private void PrimaryButton()
+    {
+        Close(Variable);
+    }
+    [RelayCommand]
+    private void CancleButton()
+    {
+        Close(null);
+    }
+}