Merge branch 'master' of http://git.51dayu.com.cn/diamond-cut/SparkClient

ViewModel/Grading/DiamondSelectVM.cs

@@ -12,12 +12,12 @@ using System.Windows.Threading;
 using Microsoft.Data.Sqlite;
 using SparkClient.Model.Entity;
 using SparkClient.Model.Services;
-using MessageBox = System.Windows.MessageBox;
 using System.Text;
 using System.IO;
 using System.Windows.Media;
 using SparkClient.Model.Common;
 using Color = System.Windows.Media.Color;
+using MessageBox = SparkClient.Views.Dialog.MessageBox;
 
 namespace SparkClient.ViewModel.Grading;
 
@@ -259,9 +259,10 @@ public class DiamondSelectVM : BaseViewModel
     {
         Application.Current.Dispatcher.Invoke(() =>
         {
-            MsgDialog msgDialog = new MsgDialog();
-            msgDialog.ErrorMessage = errorMessage;
-            msgDialog.ShowDialog();
+            new MessageBox().Show(errorMessage);
+            // MessageBox msgDialog = 
+            // // msgDialog.ErrorMessage = errorMessage;
+            // msgDialog.ShowDialog();
         });
         loading.Dispatcher.Invoke(() => loading.Close());
     }