Ling0925
/
ExcelHelper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

优化 UI 组件和提示信息格式 

在 `MarkdownWpfRenderer.cs` 中，修改 `RenderHtmlBlock` 方法以支持 `<think>` 标签，返回包含进度条的 `Expander` 控件或直接返回文本块。更新 `PromptUtil.cs` 中的 `UsePrompt` 方法，增加当前时间和用户提问的 Excel 列信息格式。

在 `App.xaml` 中移除 `ThemeDictionary` 的 `ColorMode` 属性，简化主题定义。重构 `AiMessageControll.xaml` 的 UI，使用 `DockPanel` 和 `ButtonGroup`，并增加分隔线。

在 `ImportExcelPage.xaml` 中添加上下文菜单，调整 `TabControl` 和 `DataGrid` 属性以支持虚拟化，重构参数配置 UI，使用 `hc:Card` 和 `DockPanel` 结构。

在 `ImportExcelPage.xaml.cs` 中添加按钮点击事件处理程序以切换配置显示状态。在 `ImportViewModel.cs` 中更新 AI 消息处理逻辑，使用新提示格式，并添加 `_showConfig` 属性及其文档注释。
This commit is contained in:
Ling 2025-03-05 23:14:54 +08:00
parent 6d6935c84d 735fbfb83d
commit 6d5b4a33b9
7 changed files with 219 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/EleCho.MdViewer/src/EleCho.MdViewer/Markdown/MarkdownWpfRenderer.cs
View File

@ -379,19 +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.Orientation = Orientation.Horizontal;
header.HorizontalAlignment = HorizontalAlignment.Center;
header.Children.Add(new TextBlock() { Text="思考内容",Margin = new Thickness(0,0,5,0) });
//header.Children.Add(new ProgressBar() { IsIndeterminate = true,Width = 30,Height= 5 });
expander.Header = header;
expander.IsExpanded = false;
expander.Content = htmlText;
return expander;
else
{
var htmlText = new SelectableTextBlock();
htmlText.Text = text;
return htmlText;
}
}
public FrameworkElement RenderMathBlock(MathBlock mathBlock, CancellationToken cancellationToken)

51
src/ExcelHelper/AI/PromptUtil.cs
View File

@ -11,24 +11,47 @@ class PromptUtil
public static string UsePrompt(string msg,string excelPrompt)
{
return $@"
你是一个Excel和WPS公式大师，你需要帮助用户解答Excel与WPS公式相关的问题。
你将扮演一位Excel公式大师，帮助用户解答Excel公式相关的问题。
你在回复用户的问题时，需要遵守以下规则：
1. 优先保证答案的准确性，其次是简洁明了。
2. 需要保证你的回答是有逻辑性的，不要让用户感到困惑。
3. 可以例举1到2个例子来帮助用户更好地理解你的回答中的Excel公式。
4. 一定要保证文档格式的正确性，避免出现无法显示的内容。
5. 尽量使用比较简短与易懂的公式来回答用户的问题，避免用户无法理解。
6. 你一定要使用<think>开始告诉用户的思考，并使用</think>结束你的思考。
7. 当你输出公式时，请使用以下格式进行输出：
当前时间是：
<current_time>
{DateTime.Now}
</current_time>
当前用户提问的excel文件列信息为：
<excel_columns>
{excelPrompt}
</excel_columns>
用户的问题是：
<question>
{msg}
</question>
在回复用户的问题时，你需要遵守以下规则：
1. 优先保证答案的准确性，其次是简洁明了。
2. 需要保证你的回答是有逻辑性的，不要让用户感到困惑。
3. 可以例举1到2个例子来帮助用户更好地理解你的回答中的Excel公式。
4. 一定要保证文档格式的正确性，避免出现无法显示的内容。
5. 尽量使用比较简短与易懂的公式来回答用户的问题，避免用户无法理解。
6. 当你输出公式时，请使用以下格式进行输出：
```Excel_{{列}}
=SUM(A1:A100)
```
现在的时间是{DateTime.Now}。
当前用户提问的excel文件列信息为：{excelPrompt}
用户的问题是：{msg}
";
}
}

2
src/ExcelHelper/App.xaml
View File

@ -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>

98
src/ExcelHelper/Views/Components/AiMessageControll.xaml
View File

@ -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"
@ -87,18 +88,34 @@
</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"
LineStroke="#000"
LineStrokeThickness="2"
Visibility="{Binding IsUser, Converter={StaticResource Boolean2VisibilityReConverter}}" />
</StackPanel>
</Border>
</DataTemplate>
@ -107,46 +124,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"

165
src/ExcelHelper/Views/Pages/ImportExcelPage.xaml
View File

@ -46,6 +46,10 @@
</Grid>
</DataTemplate>
<ContextMenu x:Key="DataGridContextMenu">
<MenuItem Header="问这一行数据" />
<MenuItem Header="问这一行数据" />
</ContextMenu>
</Page.Resources>
<Grid
AllowDrop="True"
@ -82,22 +86,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 +133,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 -->

5
src/ExcelHelper/Views/Pages/ImportExcelPage.xaml.cs
View File

@ -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;
}
}

11
src/ExcelHelper/Views/ViewModels/ImportViewModel.cs
View File

@ -321,8 +321,9 @@ public partial class ImportViewModel : ObservableRecipient, IViewModel
};
Messages.Add(aiChat);
var promptedMsg = PromptUtil.UsePrompt(message,ExcelPromptString);
#if DEBUG
var results = TEST_AI_CONTENT.Split('\n');
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,
@ -449,6 +449,13 @@ public partial class ImportViewModel : ObservableRecipient, IViewModel
[ObservableProperty]
private string _dbType;
/// <summary>
/// 是否显示配置信息
/// </summary>
[ObservableProperty]
private bool _showConfig = false;
/// <summary>
/// 加密连接
/// </summary>