From 73ad1cd3086ab2490465b0f6a1aa91888831454b Mon Sep 17 00:00:00 2001
From: lihanbo <lihanbo@sinvo.cn>
Date: Wed, 5 Mar 2025 09:00:44 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=E5=B8=83=E5=B1=80=E5=92=8C=E5=8A=9F=E8=83=BD=E5=A2=9E=E5=BC=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

在 `AiMessageControll.xaml` 中添加了 `hc:Divider` 控件，调整输入区域布局为 `DockPanel`，并简化发送消息界面。
在 `ImportExcelPage.xaml` 中新增 `DataGridContextMenu` 数据模板，优化 `DataGrid` 的右键菜单功能，并调整 `VirtualizingPanel` 属性。
使用 `hc:Card` 替代 `GridSplitter`，重新组织参数配置布局。
在 `ImportExcelPage.xaml.cs` 中添加按钮事件处理程序以切换配置面板显示状态。
在 `ImportViewModel.cs` 中新增 `_showConfig` 属性以控制配置信息的显示状态。
---
 .../Views/Components/AiMessageControll.xaml   |  64 ++++---
 .../Views/Pages/ImportExcelPage.xaml          | 166 ++++++++++--------
 .../Views/Pages/ImportExcelPage.xaml.cs       |   5 +
 .../Views/ViewModels/ImportViewModel.cs       |   7 +
 4 files changed, 143 insertions(+), 99 deletions(-)

diff --git a/src/ExcelHelper/Views/Components/AiMessageControll.xaml b/src/ExcelHelper/Views/Components/AiMessageControll.xaml
index 9bbf889..f6fb8b7 100644
--- a/src/ExcelHelper/Views/Components/AiMessageControll.xaml
+++ b/src/ExcelHelper/Views/Components/AiMessageControll.xaml
@@ -3,6 +3,7 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:hc="https://handyorg.github.io/handycontrol"
     xmlns:local="clr-namespace:ExcelHelper.Views.Components"
     xmlns:local1="clr-namespace:ExcelHelper.Converter"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -99,6 +100,12 @@
                                         Foreground="#99000000"
                                         Text="{Binding Timestamp, StringFormat='{}{0:HH:mm}'}" />
                                 </StackPanel>
+                                <hc:Divider
+                                    Height="10"
+                                    Margin="0,3"
+                                    LineStroke="#000"
+                                    LineStrokeThickness="2"
+                                    Visibility="{Binding IsUser, Converter={StaticResource Boolean2VisibilityReConverter}}" />
                             </StackPanel>
                         </Border>
                     </DataTemplate>
@@ -107,46 +114,53 @@
         </ScrollViewer>
 
         <!--  输入区  -->
-        <Grid Grid.Row="1" Margin="5">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="*" />
-                <ColumnDefinition Width="Auto" />
-            </Grid.ColumnDefinitions>
-
-            <Border
-                Grid.Column="0"
-                BorderBrush="#CCCCCC"
-                BorderThickness="1"
-                CornerRadius="5">
+        <Border
+            Grid.Row="1"
+            Margin="8"
+            Padding="5"
+            Background="Transparent"
+            BorderBrush="#000"
+            BorderThickness="2"
+            CornerRadius="3">
 
+            <StackPanel Grid.Row="1" Background="White">
                 <TextBox
                     x:Name="MessageInput"
                     MinHeight="40"
                     MaxHeight="120"
                     Padding="8"
                     AcceptsReturn="True"
+                    Background="Transparent"
                     BorderThickness="0"
                     IsEnabled="{Binding IsWaiting, Converter={StaticResource InverseBoolConverter}, UpdateSourceTrigger=PropertyChanged, ElementName=userControl}"
                     KeyDown="MessageInput_KeyDown"
                     Text="{Binding CurrentMessage, UpdateSourceTrigger=PropertyChanged, ElementName=userControl}"
                     TextWrapping="Wrap"
                     VerticalScrollBarVisibility="Auto" />
-            </Border>
+                <DockPanel>
+                    <hc:ComboBox Height="30" SelectedIndex="1">
+                        <ComboBoxItem Content="DeepSeek-V3" />
+                        <ComboBoxItem Content="DeepSeek-V3" />
+                        <ComboBoxItem Content="DeepSeek-V3" />
+                    </hc:ComboBox>
+                    <Button
+                        Height="30"
+                        Margin="5"
+                        Padding="15,0"
+                        HorizontalAlignment="Right"
+                        Background="#000"
+                        BorderBrush="Transparent"
+                        BorderThickness="0"
+                        Click="SendButton_Click"
+                        Content="发送 ✈"
+                        Foreground="White"
+                        IsEnabled="{Binding IsWaiting, Converter={StaticResource InverseBoolConverter}, UpdateSourceTrigger=PropertyChanged, ElementName=userControl}" />
 
-            <Button
-                Grid.Column="1"
-                Height="40"
-                Margin="5,0,0,0"
-                Padding="15,0"
-                Background="#000"
-                BorderBrush="Transparent"
-                BorderThickness="0"
-                Click="SendButton_Click"
-                Content="发送"
-                Foreground="White"
-                IsEnabled="{Binding IsWaiting, Converter={StaticResource InverseBoolConverter}, UpdateSourceTrigger=PropertyChanged, ElementName=userControl}" />
-        </Grid>
+                </DockPanel>
 
+            </StackPanel>
+
+        </Border>
         <!--  等待指示器  -->
         <Border
             Grid.Row="1"
diff --git a/src/ExcelHelper/Views/Pages/ImportExcelPage.xaml b/src/ExcelHelper/Views/Pages/ImportExcelPage.xaml
index 27833b4..99ee187 100644
--- a/src/ExcelHelper/Views/Pages/ImportExcelPage.xaml
+++ b/src/ExcelHelper/Views/Pages/ImportExcelPage.xaml
@@ -46,6 +46,11 @@
 
             </Grid>
         </DataTemplate>
+        <DataTemplate x:Key="DataGridContextMenu">
+            <Menu>
+                <MenuItem Header="问这一行数据" />
+            </Menu>
+        </DataTemplate>
     </Page.Resources>
     <Grid
         AllowDrop="True"
@@ -82,22 +87,25 @@
             Visibility="{Binding IsLoading, Converter={StaticResource BooleanToVisibilityConverter}}" />
         <hc:TabControl
             Grid.Column="0"
+            Grid.ColumnSpan="2"
             Margin="5,5,7,5"
             ShowCloseButton="False"
             ShowContextMenu="False">
             <hc:TabItem Header="预览">
                 <DataGrid
                     x:Name="ExcelDataPreviewGrid"
+                    hc:DataGridAttach.CanUnselectAllWithBlankArea="True"
+                    hc:DataGridAttach.ShowRowNumber="True"
+                    hc:DataGridAttach.ShowSelectAllButton="True"
                     AutoGenerateColumns="False"
+                    ContextMenu="{StaticResource DataGridContextMenu}"
                     EnableColumnVirtualization="True"
                     EnableRowVirtualization="True"
                     IsReadOnly="True"
                     ItemsSource="{Binding ExcelData, IsAsync=True}"
                     RowHeight="NaN"
                     ScrollViewer.CanContentScroll="True"
-                    VirtualizingPanel.IsContainerVirtualizable="True"
-                    VirtualizingPanel.IsVirtualizing="True"
-                    VirtualizingPanel.VirtualizationMode="Recycling" />
+                    VirtualizingPanel.ScrollUnit="Pixel" />
             </hc:TabItem>
 
             <hc:TabItem Header="Columns2Prompt">
@@ -126,92 +134,102 @@
                 </Grid>
             </hc:TabItem>
         </hc:TabControl>
-        <GridSplitter
-            Grid.Column="0"
-            Width="2"
-            Margin="0,5" />
+
         <hc:Card
+            x:Name="ConfigCard"
             Grid.Column="1"
             Width="Auto"
+            Height="Auto"
             Margin="5"
-            HorizontalAlignment="Stretch">
+            HorizontalAlignment="Right"
+            VerticalAlignment="Bottom"
+            Opacity="0.95">
             <hc:Card.Header>
-                <hc:SimpleStackPanel
-                    Margin="5"
-                    HorizontalAlignment="Center"
-                    Orientation="Horizontal">
+                <DockPanel Margin="5">
                     <TextBlock
                         Margin="5,0"
+                        HorizontalAlignment="Center"
                         VerticalAlignment="Center"
                         Text="参数配置" />
+
                     <Button
+                        HorizontalAlignment="Right"
+                        Click="Button_Click_1"
+                        Content="▼"
+                        DockPanel.Dock="Left" />
+                </DockPanel>
+            </hc:Card.Header>
+            <hc:TransitioningContentControl TransitionMode="Bottom2Top" Visibility="{Binding ShowConfig, Converter={StaticResource BooleanToVisibilityConverter}}">
+                <hc:SimpleStackPanel SnapsToDevicePixels="True">
+                    <hc:SimpleStackPanel.Resources>
+                        <Style TargetType="{x:Type hc:SimpleStackPanel}">
+                            <Setter Property="Margin" Value="5,5" />
+                        </Style>
+                    </hc:SimpleStackPanel.Resources>
+                    <hc:SimpleStackPanel Orientation="Horizontal">
+                        <Label Content="指定的Sheet：" />
+                        <hc:ComboBox
+                            MinWidth="60"
+                            MaxWidth="180"
+                            Margin="0"
+                            ItemsSource="{Binding Sheets}"
+                            SelectedValue="{Binding SelectedSheetName}" />
+                        <Button
+                            Margin="0"
+                            VerticalAlignment="Center"
+                            Command="{Binding ReadSheetsCommand}"
+                            Content="刷新" />
+                    </hc:SimpleStackPanel>
+                    <hc:SimpleStackPanel Height="Auto" Orientation="Horizontal">
+                        <Label Content="起始位置：" />
+                        <hc:TextBox MinWidth="40" Text="{Binding StartCell}" />
+                        <CheckBox Content="包含列头" IsChecked="{Binding UseHeaderRow}" />
+                    </hc:SimpleStackPanel>
+                    <hc:SimpleStackPanel Orientation="Horizontal">
+                        <Label Content="结束位置：" />
+                        <hc:TextBox MinWidth="40" Text="{Binding EndCell}" />
+                    </hc:SimpleStackPanel>
+                    <hc:SimpleStackPanel Orientation="Horizontal">
+                        <Label>
+                            <CheckBox Content="合并的单元格进行填充" IsChecked="{Binding FillMergedCells}" />
+                        </Label>
+                    </hc:SimpleStackPanel>
+                    <hc:SimpleStackPanel Orientation="Horizontal">
+                        <Label Content="最大读取行数：" />
+                        <hc:NumericUpDown
+                            MinWidth="40"
+                            Maximum="300"
+                            Minimum="0"
+                            Value="{Binding MaxRow}" />
+                        <TextBlock
+                            Margin="5,0"
+                            VerticalAlignment="Center"
+                            Text="预览时最大读取300行" />
+                    </hc:SimpleStackPanel>
+                    <hc:SimpleStackPanel Width="Auto" Orientation="Horizontal">
+                        <Label Content="当前文件路径：" />
+                        <!--<hc:TextBox MinWidth="200" />-->
+                        <hc:ComboBox
+                            MaxWidth="200"
+                            ItemsSource="{Binding ExcelFiles}"
+                            SelectedValue="{Binding CurrentFilePath}" />
+                    </hc:SimpleStackPanel>
+                    <hc:SimpleStackPanel
+                        IsEnabled="False"
+                        Orientation="Horizontal"
+                        ToolTip="暂不支持加密的Excel">
+                        <Label Content="Excel密码：" />
+                        <PasswordBox MinWidth="60" utils:PasswordBoxHelper.Password="{Binding ExcelPassword, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+                        <Button Content="?" ToolTip="未加密留空，多个Excel如果不同密码请分批次导入" />
+                    </hc:SimpleStackPanel>
+                    <Button
+                        HorizontalAlignment="Center"
                         VerticalAlignment="Center"
                         Command="{Binding ReLoadExcelCommand}"
                         Content="重新读取Excel"
                         Style="{StaticResource ButtonPrimary}" />
                 </hc:SimpleStackPanel>
-            </hc:Card.Header>
-            <hc:SimpleStackPanel SnapsToDevicePixels="True">
-                <hc:SimpleStackPanel.Resources>
-                    <Style TargetType="{x:Type hc:SimpleStackPanel}">
-                        <Setter Property="Margin" Value="5,5" />
-                    </Style>
-                </hc:SimpleStackPanel.Resources>
-
-                <hc:SimpleStackPanel Orientation="Horizontal">
-                    <Label Content="指定的Sheet：" />
-                    <hc:ComboBox
-                        MinWidth="60"
-                        MaxWidth="180"
-                        Margin="0"
-                        ItemsSource="{Binding Sheets}"
-                        SelectedValue="{Binding SelectedSheetName}" />
-                    <Button
-                        Margin="0"
-                        VerticalAlignment="Center"
-                        Command="{Binding ReadSheetsCommand}"
-                        Content="刷新" />
-                </hc:SimpleStackPanel>
-                <hc:SimpleStackPanel Height="Auto" Orientation="Horizontal">
-                    <Label Content="起始位置：" />
-                    <hc:TextBox MinWidth="40" Text="{Binding StartCell}" />
-                    <CheckBox Content="包含列头" IsChecked="{Binding UseHeaderRow}" />
-                </hc:SimpleStackPanel>
-                <hc:SimpleStackPanel Orientation="Horizontal">
-                    <Label Content="结束位置：" />
-                    <hc:TextBox MinWidth="40" Text="{Binding EndCell}" />
-                </hc:SimpleStackPanel>
-                <hc:SimpleStackPanel Orientation="Horizontal">
-                    <Label>
-                        <CheckBox Content="合并的单元格进行填充" IsChecked="{Binding FillMergedCells}" />
-                    </Label>
-                </hc:SimpleStackPanel>
-                <hc:SimpleStackPanel Orientation="Horizontal">
-                    <Label Content="最大读取行数：" />
-                    <hc:NumericUpDown
-                        MinWidth="40"
-                        Maximum="300"
-                        Minimum="0"
-                        Value="{Binding MaxRow}" />
-                    <TextBlock
-                        Margin="5,0"
-                        VerticalAlignment="Center"
-                        Text="预览时最大读取300行" />
-                </hc:SimpleStackPanel>
-                <hc:SimpleStackPanel Width="Auto" Orientation="Horizontal">
-                    <Label Content="当前文件路径：" />
-                    <!--<hc:TextBox MinWidth="200" />-->
-                    <hc:ComboBox
-                        MaxWidth="200"
-                        ItemsSource="{Binding ExcelFiles}"
-                        SelectedValue="{Binding CurrentFilePath}" />
-                </hc:SimpleStackPanel>
-                <hc:SimpleStackPanel IsEnabled="False" Orientation="Horizontal">
-                    <Label Content="Excel密码：" />
-                    <PasswordBox MinWidth="60" utils:PasswordBoxHelper.Password="{Binding ExcelPassword, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
-                    <Button Content="?" ToolTip="未加密留空，多个Excel如果不同密码请分批次导入" />
-                </hc:SimpleStackPanel>
-            </hc:SimpleStackPanel>
+            </hc:TransitioningContentControl>
         </hc:Card>
         <hc:Card Grid.Column="2">
             <!--  Fix: Added Mode=OneWay  -->
diff --git a/src/ExcelHelper/Views/Pages/ImportExcelPage.xaml.cs b/src/ExcelHelper/Views/Pages/ImportExcelPage.xaml.cs
index ffdf9bc..860a064 100644
--- a/src/ExcelHelper/Views/Pages/ImportExcelPage.xaml.cs
+++ b/src/ExcelHelper/Views/Pages/ImportExcelPage.xaml.cs
@@ -117,4 +117,9 @@ public partial class ImportExcelPage : Page, IView, IRecipient<UpdateDataGridCol
         // 标记事件已处理，防止冒泡
         e.Handled = true;
     }
+
+    private void Button_Click_1(object sender, System.Windows.RoutedEventArgs e)
+    {
+        ViewModel.ShowConfig = !ViewModel.ShowConfig;
+    }
 }
diff --git a/src/ExcelHelper/Views/ViewModels/ImportViewModel.cs b/src/ExcelHelper/Views/ViewModels/ImportViewModel.cs
index cdcd307..896ca76 100644
--- a/src/ExcelHelper/Views/ViewModels/ImportViewModel.cs
+++ b/src/ExcelHelper/Views/ViewModels/ImportViewModel.cs
@@ -443,6 +443,13 @@ public partial class ImportViewModel : ObservableRecipient, IViewModel
     [ObservableProperty]
     private string _dbType;
 
+
+    /// <summary>
+    /// 是否显示配置信息
+    /// </summary>
+    [ObservableProperty]
+    private bool _showConfig = false;
+
     /// <summary>
     /// 加密连接
     /// </summary>

From 3f9d3b3399d50c42df20f28cb5b98a30283431ab Mon Sep 17 00:00:00 2001
From: lihanbo <lihanbo@sinvo.cn>
Date: Wed, 5 Mar 2025 09:11:38 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E5=A2=9E=E5=BC=BA=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=B9=B6=E6=9B=B4=E6=96=B0=E4=B8=8A=E4=B8=8B?=
 =?UTF-8?q?=E6=96=87=E8=8F=9C=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

在 `PromptUtil.cs` 文件中，修改了提示信息的内容，增强了对用户的指导性和结构化，增加了当前时间和用户提问的Excel文件列信息的输出格式。同时，增加了思考过程和最终回答的标签，以便更好地组织和展示回答内容。

在 `ImportExcelPage.xaml` 文件中，将原有的 `DataTemplate` 替换为 `ContextMenu`，并保留了“问这一行数据”的菜单项，确保用户在右键菜单中可以询问相关数据。
---
 src/ExcelHelper/AI/PromptUtil.cs              | 57 +++++++++++++++----
 .../Views/Pages/ImportExcelPage.xaml          |  9 ++-
 2 files changed, 50 insertions(+), 16 deletions(-)

diff --git a/src/ExcelHelper/AI/PromptUtil.cs b/src/ExcelHelper/AI/PromptUtil.cs
index 338dec7..71b3de9 100644
--- a/src/ExcelHelper/AI/PromptUtil.cs
+++ b/src/ExcelHelper/AI/PromptUtil.cs
@@ -11,21 +11,56 @@ class PromptUtil
     public static string UsePrompt(string msg,string excelPrompt)
     {
         return $@"
-你是一个Excel公式大师，你需要帮助用户解答Excel公式相关的问题。
+你将扮演一位Excel公式大师，帮助用户解答Excel公式相关的问题。
 
-你在回复用户的问题时，需要遵守以下规则：
- 1. 优先保证答案的准确性，其次是简洁明了。
- 2. 需要保证你的回答是有逻辑性的，不要让用户感到困惑。
- 3. 可以例举1到2个例子来帮助用户更好地理解你的回答中的Excel公式。
- 4. 一定要保证文档格式的正确性，避免出现无法显示的内容。
- 5. 尽量使用比较简短与易懂的公式来回答用户的问题，避免用户无法理解。
- 6. 你不能跳过你的思考过程。
+当前时间是：
 
-现在的时间是{DateTime.Now}。
+<current_time>
 
-当前用户提问的excel文件列信息为：{excelPrompt}
+{DateTime.Now}
+
+</current_time>
+
+当前用户提问的excel文件列信息为：
+
+<excel_columns>
+
+{excelPrompt}
+
+</excel_columns>
+
+用户的问题是：
+
+<question>
+
+{msg}
+
+</question>
+
+在回复用户的问题时，你需要遵守以下规则：
+
+1. 优先保证答案的准确性，其次是简洁明了。
+
+2. 需要保证你的回答是有逻辑性的，不要让用户感到困惑。
+
+3. 可以例举1到2个例子来帮助用户更好地理解你的回答中的Excel公式。
+
+4. 一定要保证文档格式的正确性，避免出现无法显示的内容。
+
+5. 尽量使用比较简短与易懂的公式来回答用户的问题，避免用户无法理解。
+
+
+
+首先，在<思考>标签中详细说明你解答此问题的思考过程。然后，在<回答>标签中给出最终的回答。
+
+<think>
+
+[在此详细说明你的思考过程]
+
+</think>
+
+[在此给出你的回答]
 
-用户的问题是：{msg}
 ";
     }
 }
diff --git a/src/ExcelHelper/Views/Pages/ImportExcelPage.xaml b/src/ExcelHelper/Views/Pages/ImportExcelPage.xaml
index 99ee187..acd5c4f 100644
--- a/src/ExcelHelper/Views/Pages/ImportExcelPage.xaml
+++ b/src/ExcelHelper/Views/Pages/ImportExcelPage.xaml
@@ -46,11 +46,10 @@
 
             </Grid>
         </DataTemplate>
-        <DataTemplate x:Key="DataGridContextMenu">
-            <Menu>
-                <MenuItem Header="问这一行数据" />
-            </Menu>
-        </DataTemplate>
+        <ContextMenu x:Key="DataGridContextMenu">
+            <MenuItem Header="问这一行数据" />
+            <MenuItem Header="问这一行数据" />
+        </ContextMenu>
     </Page.Resources>
     <Grid
         AllowDrop="True"

From 0ab9b35fdee908a8c57a0e375a46f73271073065 Mon Sep 17 00:00:00 2001
From: lihanbo <lihanbo@sinvo.cn>
Date: Wed, 5 Mar 2025 09:24:17 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=9B=9E=E7=AD=94?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E8=AF=B4=E6=98=8E=EF=BC=8C=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BA=A4=E4=BA=92=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

删除了关于如何在<思考>和<回答>标签中提供用户问题解答的说明。这一变更可能会影响代码的逻辑和输出格式，从而改变用户的交互方式。
---
 src/ExcelHelper/AI/PromptUtil.cs | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/src/ExcelHelper/AI/PromptUtil.cs b/src/ExcelHelper/AI/PromptUtil.cs
index 71b3de9..2646496 100644
--- a/src/ExcelHelper/AI/PromptUtil.cs
+++ b/src/ExcelHelper/AI/PromptUtil.cs
@@ -50,17 +50,6 @@ class PromptUtil
 5. 尽量使用比较简短与易懂的公式来回答用户的问题，避免用户无法理解。
 
 
-
-首先，在<思考>标签中详细说明你解答此问题的思考过程。然后，在<回答>标签中给出最终的回答。
-
-<think>
-
-[在此详细说明你的思考过程]
-
-</think>
-
-[在此给出你的回答]
-
 ";
     }
 }

From 735fbfb83dc59c085df176cdb954254b4c167835 Mon Sep 17 00:00:00 2001
From: lihanbo <lihanbo@sinvo.cn>
Date: Wed, 5 Mar 2025 09:41:15 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B8=B2=E6=9F=93?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E5=92=8C=E7=95=8C=E9=9D=A2=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

在 `MarkdownWpfRenderer.cs` 中，更新了 `RenderHtmlBlock` 方法以处理以 `<think>` 开头的文本，返回包含进度条和可选择文本块的 `Expander` 控件。更新了 `App.xaml`，移除了 `mu:ThemeDictionary` 的 `ColorMode` 属性。修改了 `AiMessageControll.xaml`，将布局从 `StackPanel` 更改为 `DockPanel`，并添加了 `ButtonGroup`。在 `ImportViewModel.cs` 中，调整了调试模式下的消息处理逻辑，确保正确处理用户输入的消息。
---
 .../Markdown/MarkdownWpfRenderer.cs           | 23 ++++++++-----
 src/ExcelHelper/App.xaml                      |  2 +-
 .../Views/Components/AiMessageControll.xaml   | 34 ++++++++++++-------
 .../Views/ViewModels/ImportViewModel.cs       |  6 ++--
 4 files changed, 41 insertions(+), 24 deletions(-)

diff --git a/src/EleCho.MdViewer/src/EleCho.MdViewer/Markdown/MarkdownWpfRenderer.cs b/src/EleCho.MdViewer/src/EleCho.MdViewer/Markdown/MarkdownWpfRenderer.cs
index 56d8b8a..79d9ea9 100644
--- a/src/EleCho.MdViewer/src/EleCho.MdViewer/Markdown/MarkdownWpfRenderer.cs
+++ b/src/EleCho.MdViewer/src/EleCho.MdViewer/Markdown/MarkdownWpfRenderer.cs
@@ -379,15 +379,22 @@ public class MarkdownWpfRenderer
         if (text.StartsWith("<think>"))
         {
             text = text.Replace("<think>", "").Replace("</think>", "");
+            var htmlText = new SelectableTextBlock();
+            htmlText.Text = text;
+            var expander = new Expander();
+            var header = new StackPanel();
+            header.Children.Add(new ProgressBar() { IsIndeterminate = true, Width = 30 });
+            expander.Header = header;
+            expander.Content = htmlText;
+            return expander;
         }
-        var htmlText = new SelectableTextBlock();
-        htmlText.Text = text;
-        var expander = new Expander();
-        var header = new StackPanel();
-        header.Children.Add(new ProgressBar() { IsIndeterminate = true,Width = 30 });
-        expander.Header = header;
-        expander.Content = htmlText;
-        return expander;
+        else
+        {
+            var htmlText = new SelectableTextBlock();
+            htmlText.Text = text;
+            return htmlText;
+        }
+        
 
     }
     public FrameworkElement RenderMathBlock(MathBlock mathBlock, CancellationToken cancellationToken)
diff --git a/src/ExcelHelper/App.xaml b/src/ExcelHelper/App.xaml
index 880e27a..350e3ed 100644
--- a/src/ExcelHelper/App.xaml
+++ b/src/ExcelHelper/App.xaml
@@ -12,7 +12,7 @@
                 <ResourceDictionary Source="pack://application:,,,/HandyControl;component/Themes/SkinDefault.xaml" />
                 <ResourceDictionary Source="pack://application:,,,/HandyControl;component/Themes/Theme.xaml" />
                 <mu:ControlsDictionary />
-                <mu:ThemeDictionary ColorMode="Light" />
+                <mu:ThemeDictionary />
             </ResourceDictionary.MergedDictionaries>
 
         </ResourceDictionary>
diff --git a/src/ExcelHelper/Views/Components/AiMessageControll.xaml b/src/ExcelHelper/Views/Components/AiMessageControll.xaml
index f6fb8b7..3de91e0 100644
--- a/src/ExcelHelper/Views/Components/AiMessageControll.xaml
+++ b/src/ExcelHelper/Views/Components/AiMessageControll.xaml
@@ -88,18 +88,28 @@
                                     </TabItem>
                                 </TabControl>
 
-                                <StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
-                                    <TextBlock
-                                        Margin="0,5,5,0"
-                                        FontSize="10"
-                                        Foreground="#99000000"
-                                        Text="{Binding Content.Length, StringFormat='字数: {0}'}" />
-                                    <TextBlock
-                                        Margin="0,5,0,0"
-                                        FontSize="10"
-                                        Foreground="#99000000"
-                                        Text="{Binding Timestamp, StringFormat='{}{0:HH:mm}'}" />
-                                </StackPanel>
+                                <DockPanel>
+                                    <hc:ButtonGroup Margin="5,0">
+                                        <Button
+                                            Height="20"
+                                            hc:IconElement.Geometry="{StaticResource WindowRestoreGeometry}"
+                                            Background="Transparent"
+                                            FontSize="10"
+                                            Foreground="#99000000" />
+                                    </hc:ButtonGroup>
+                                    <StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
+                                        <TextBlock
+                                            Margin="0,5,5,0"
+                                            FontSize="10"
+                                            Foreground="#99000000"
+                                            Text="{Binding Content.Length, StringFormat='字数: {0}'}" />
+                                        <TextBlock
+                                            Margin="0,5,0,0"
+                                            FontSize="10"
+                                            Foreground="#99000000"
+                                            Text="{Binding Timestamp, StringFormat='{}{0:HH:mm}'}" />
+                                    </StackPanel>
+                                </DockPanel>
                                 <hc:Divider
                                     Height="10"
                                     Margin="0,3"
diff --git a/src/ExcelHelper/Views/ViewModels/ImportViewModel.cs b/src/ExcelHelper/Views/ViewModels/ImportViewModel.cs
index 896ca76..a0b3ff5 100644
--- a/src/ExcelHelper/Views/ViewModels/ImportViewModel.cs
+++ b/src/ExcelHelper/Views/ViewModels/ImportViewModel.cs
@@ -321,8 +321,9 @@ public partial class ImportViewModel : ObservableRecipient, IViewModel
             };
            
             Messages.Add(aiChat);
-#if !DEBUG
-            var results = TEST_AI_CONTENT.Split('\n');
+            var promptedMsg = PromptUtil.UsePrompt(message,ExcelPromptString);
+#if DEBUG
+            var results = promptedMsg.Split('\n');
             foreach(var result in results)
             {
                 aiChat.Content += result;
@@ -330,7 +331,6 @@ public partial class ImportViewModel : ObservableRecipient, IViewModel
                 await Task.Delay(5);
             }
 #else
-            var promptedMsg = PromptUtil.UsePrompt(message,ExcelPromptString);
             history.Add(new Microsoft.Extensions.AI.ChatMessage
             {
                 Role = Microsoft.Extensions.AI.ChatRole.User,