From d1d2bebcd1c7a14f109f3c3e2a86f1f4a90382c4 Mon Sep 17 00:00:00 2001
From: lihanbo <lihanbo@sinvo.cn>
Date: Thu, 13 Feb 2025 19:46:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0UI=E5=92=8C=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E5=A4=84=E7=90=86=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

在 MainWindow.xaml 中，<Border> 元素增加 MinWidth="300" 属性。
在 Excel2Prompt.cs 中，增加提示列的代码。
在 ImportExcelPage.xaml 中，更新 <TextBlock> 的 Text 属性。
在 ImportExcelPage.xaml 中，<hc:TabControl> 增加 ShowCloseButton 和 ShowContextMenu 属性。
在 ImportExcelPage.xaml 中，增加 <ToolBar> 元素，包含 Button 和 Label。
在 ImportExcelPage.xaml.cs 中，Grid_DragEnter 方法增加可见性设置。
在 ImportExcelPage.xaml.cs 中，调整 Grid_Drop 和 Grid_DragLeave 方法的缩进。
在 ImportViewModel.cs 中，FileDrop 方法改为 Task，并增加文件扩展名检查。
---
 MainWindow.xaml                     |  1 +
 Utils/Excel2Prompt.cs               |  1 +
 Views/Pages/ImportExcelPage.xaml    | 17 +++++++++++++++--
 Views/Pages/ImportExcelPage.xaml.cs |  6 ++++--
 Views/ViewModels/ImportViewModel.cs |  9 ++++++++-
 5 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/MainWindow.xaml b/MainWindow.xaml
index 3407973..b860c05 100644
--- a/MainWindow.xaml
+++ b/MainWindow.xaml
@@ -54,6 +54,7 @@
                         </Grid.RowDefinitions>
                         <Border
                             Grid.Row="0"
+                            MinWidth="300"
                             Margin="0,0,0,10"
                             Padding="2"
                             Background="#fff"
diff --git a/Utils/Excel2Prompt.cs b/Utils/Excel2Prompt.cs
index 5362893..3350b25 100644
--- a/Utils/Excel2Prompt.cs
+++ b/Utils/Excel2Prompt.cs
@@ -36,6 +36,7 @@ public class Excel2Prompt
                 - Missing values: 7007
         */
         var prompts = new List<string>();
+        prompts.Add("This Excel file contains the following columns:" );
         var dataList = excelData.ToList();
 
         foreach (var column in columns)
diff --git a/Views/Pages/ImportExcelPage.xaml b/Views/Pages/ImportExcelPage.xaml
index e5c5e76..e2bded5 100644
--- a/Views/Pages/ImportExcelPage.xaml
+++ b/Views/Pages/ImportExcelPage.xaml
@@ -24,7 +24,7 @@
                     VerticalAlignment="Center"
                     FontSize="20"
                     Foreground="White"
-                    Text="拖拽到此处放开" />
+                    Text="拖拽Excel文件(.xls)到此处放开" />
 
             </Grid>
         </DataTemplate>
@@ -69,7 +69,11 @@
             Content="{Binding}"
             ContentTemplate="{StaticResource LoadingMask}"
             Visibility="{Binding IsLoading, Converter={StaticResource Boolean2VisibilityConverter}}" />
-        <hc:TabControl Grid.Column="0" Margin="5,5,7,5">
+        <hc:TabControl
+            Grid.Column="0"
+            Margin="5,5,7,5"
+            ShowCloseButton="False"
+            ShowContextMenu="False">
             <hc:TabItem Header="预览">
                 <DataGrid
                     x:Name="ExcelDataPreviewGrid"
@@ -91,6 +95,15 @@
                         <RowDefinition Height="50" />
                         <RowDefinition Height="*" />
                     </Grid.RowDefinitions>
+                    <ToolBar
+                        Grid.Row="0"
+                        AllowDrop="False"
+                        Header="操作">
+                        <Button Content="导出文件" />
+                        <Label>
+                            <CheckBox Content="示例数据" />
+                        </Label>
+                    </ToolBar>
                     <hc:TextBox
                         Grid.Row="1"
                         Padding="5"
diff --git a/Views/Pages/ImportExcelPage.xaml.cs b/Views/Pages/ImportExcelPage.xaml.cs
index 735b1de..2946fe8 100644
--- a/Views/Pages/ImportExcelPage.xaml.cs
+++ b/Views/Pages/ImportExcelPage.xaml.cs
@@ -28,6 +28,7 @@ public partial class ImportExcelPage : Page, IView, IRecipient<UpdateDataGridCol
                 }
             }
         });
+        DropFileMask.Visibility = System.Windows.Visibility.Visible;
     }
     private void Grid_DragEnter(object sender, System.Windows.DragEventArgs e)
     {
@@ -44,7 +45,7 @@ public partial class ImportExcelPage : Page, IView, IRecipient<UpdateDataGridCol
 
     private void Grid_Drop(object sender, System.Windows.DragEventArgs e)
     {
-        DropFileMask.Visibility = System.Windows.Visibility.Collapsed;
+        DropFileMask.Visibility = System.Windows.Visibility.Collapsed; 
         if (e.Data.GetDataPresent(System.Windows.DataFormats.FileDrop))
         {
             var files = (string[])e.Data.GetData(System.Windows.DataFormats.FileDrop);
@@ -53,11 +54,12 @@ public partial class ImportExcelPage : Page, IView, IRecipient<UpdateDataGridCol
                 ViewModel.FileDrop(files);
             }
         }
+        
     }
 
     private void Grid_DragLeave(object sender, System.Windows.DragEventArgs e)
     {
-        DropFileMask.Visibility = System.Windows.Visibility.Collapsed;
+        DropFileMask.Visibility = System.Windows.Visibility.Collapsed; 
     }
 
     void IRecipient<UpdateDataGridColumnsMessage>.Receive(UpdateDataGridColumnsMessage message)
diff --git a/Views/ViewModels/ImportViewModel.cs b/Views/ViewModels/ImportViewModel.cs
index 18b1401..41c9935 100644
--- a/Views/ViewModels/ImportViewModel.cs
+++ b/Views/ViewModels/ImportViewModel.cs
@@ -20,7 +20,7 @@ namespace ExcelHelper.Views.ViewModels;
 public partial class ImportViewModel : ObservableRecipient, IViewModel
 {
 
-    public void FileDrop(string[] files)
+    public Task FileDrop(string[] files)
     {
         IsLoading = true;
         ExcelFiles.Clear();
@@ -29,11 +29,18 @@ public partial class ImportViewModel : ObservableRecipient, IViewModel
         MaxRow = 0;
         foreach (var item in files)
         {
+            if(!item.EndsWith(".xlsx") && !item.EndsWith(".xls"))
+            {
+                WeakReferenceMessenger.Default.Send(new ErrorDialogMessage("请拖入Excel文件!"));
+                IsLoading = false;
+                return Task.CompletedTask;
+            }
             ExcelFiles.Add(item);
         }
         //ReadForExcel(ExcelFiles.First());
         CurrentFilePath = ExcelFiles.FirstOrDefault();
         IsLoading = false;
+        return Task.CompletedTask;
     }
 
     public async void ReadForExcel(string path, bool isReload = false)