添加 CodeSpanControl 及相关功能改进

在 `CodeSpanControl.xaml` 中添加了用户控件,包含可选择的文本块和复制按钮,按钮样式在鼠标悬停时改变透明度。
在 `CodeSpanControl.xaml.cs` 中实现了 `Text` 属性的依赖属性支持,并添加了空的 `Copy_Click` 方法。
修改了 `MarkdownWpfRenderer.cs` 中的代码块渲染逻辑,移除进度条并在特定条件下使用 `CodeSpanControl`。
在 `PromptUtil.cs` 中更新提示文本,增加对 WPS 的支持,并调整思考过程格式。
移除 `ExcelHelper.csproj` 中与 Web 相关的项目项。
在 `Excel2Prompt.cs` 中修改 `ConverterToPrompt` 方法,增加 `sheetName` 参数并调整提示文本格式。
更新 `ImportViewModel.cs` 中对 `Excel2Prompt.ConverterToPrompt` 方法的调用,传递新参数并修改测试 AI 内容格式。
This commit is contained in:
Ling 2025-03-04 23:39:58 +08:00
parent b85080c2ce
commit 67d7e93217
7 changed files with 151 additions and 39 deletions

View File

@ -0,0 +1,32 @@
<UserControl x:Class="EleCho.MdViewer.Controls.CodeSpanControl"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:EleCho.MdViewer.Controls"
mc:Ignorable="d"
d:DesignHeight="30" d:DesignWidth="160">
<StackPanel Orientation="Horizontal" Margin="5">
<local:SelectableTextBlock Text="{Binding Text}" VerticalAlignment="Center"/>
<Button x:Name="Copy"
Content="复制"
Click="Copy_Click"
VerticalAlignment="Top"
HorizontalAlignment="Right"
Padding="4,0"
Opacity="1"
Height="20"
Background="#AAFFFFFF"
BorderThickness="1">
<Button.Style>
<Style TargetType="Button">
<Style.Triggers>
<DataTrigger Binding="{Binding IsMouseOver, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}" Value="True">
<Setter Property="Opacity" Value="0.8"/>
</DataTrigger>
</Style.Triggers>
</Style>
</Button.Style>
</Button>
</StackPanel>
</UserControl>

View File

@ -0,0 +1,51 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
namespace EleCho.MdViewer.Controls
{
/// <summary>
/// CodeSpanControl.xaml 的交互逻辑
/// </summary>
public partial class CodeSpanControl : UserControl
{
/// <summary>
/// Text
/// </summary>
public string Text
{
get => (string)GetValue(TextProperty);
set => SetValue(TextProperty, value);
}
/// <summary>
/// Text property
/// </summary>
public static readonly DependencyProperty TextProperty =
DependencyProperty.Register("Text", typeof(string), typeof(CodeSpanControl), new PropertyMetadata(string.Empty));
public CodeSpanControl()
{
InitializeComponent();
this.DataContext = this;
}
private void Copy_Click(object sender, RoutedEventArgs e)
{
}
}
}

View File

@ -371,8 +371,12 @@ public class MarkdownWpfRenderer
htmlText.Text = text; htmlText.Text = text;
var expander = new Expander(); var expander = new Expander();
var header = new StackPanel(); var header = new StackPanel();
header.Children.Add(new ProgressBar() { IsIndeterminate = true,Width = 30 }); 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.Header = header;
expander.IsExpanded = false;
expander.Content = htmlText; expander.Content = htmlText;
return expander; return expander;
@ -408,38 +412,49 @@ public class MarkdownWpfRenderer
CornerRadius = new CornerRadius(8), CornerRadius = new CornerRadius(8),
Margin = new Thickness(0, 0, 0, NormalSize) Margin = new Thickness(0, 0, 0, NormalSize)
}; };
if (!fencedCodeBlock.Info.StartsWith("Excel", StringComparison.CurrentCultureIgnoreCase))
var codeContentElement = new SelectableTextBlock()
{ {
TextWrapping = TextWrapping.Wrap, var codeContentElement = new SelectableTextBlock()
Padding = new Thickness(NormalSize / 2), {
TextWrapping = TextWrapping.Wrap,
Padding = new Thickness(NormalSize / 2),
FontSize = NormalSize, FontSize = NormalSize,
FontFamily = GetCodeTextFontFamily(), FontFamily = GetCodeTextFontFamily(),
}; };
codeElement.Child = codeElement.Child =
codeContentElement; codeContentElement;
codeElement.BindCodeBlockBackground(); codeElement.BindCodeBlockBackground();
codeContentElement.BindCodeBlockForeground(); codeContentElement.BindCodeBlockForeground();
var language = ColorCode.Languages.FindById(fencedCodeBlock.Info); var language = ColorCode.Languages.FindById(fencedCodeBlock.Info);
/*StyleDictionary styleDict = ColorMode switch /*StyleDictionary styleDict = ColorMode switch
{
ColorMode.Light => StyleDictionary.DefaultLight,
ColorMode.Dark => StyleDictionary.DefaultDark,
_ => StyleDictionary.DefaultLight
};*/
StyleDictionary styleDict = StyleDictionary.DefaultDark;
WpfSyntaxHighLighting writer = new(styleDict);
writer.FormatTextBlock(fencedCodeBlock.Lines.ToString(), language, codeContentElement);
}
else
{ {
ColorMode.Light => StyleDictionary.DefaultLight, var codeSpanControl = new CodeSpanControl();
ColorMode.Dark => StyleDictionary.DefaultDark, codeSpanControl.SetResourceReference(Control.ForegroundProperty, MarkdownResKey.MainForeground);
codeSpanControl.SetResourceReference(Control.BackgroundProperty, MarkdownResKey.CodeBlockBackground);
_ => StyleDictionary.DefaultLight codeSpanControl.Text = fencedCodeBlock.Lines.ToString();
};*/ codeElement.Child = codeSpanControl;
StyleDictionary styleDict = StyleDictionary.DefaultDark; }
WpfSyntaxHighLighting writer = new(styleDict);
writer.FormatTextBlock(fencedCodeBlock.Lines.ToString(), language, codeContentElement);
return codeElement; return codeElement;
} }
public FrameworkElement RenderCodeBlock(CodeBlock codeBlock, CancellationToken cancellationToken) public FrameworkElement RenderCodeBlock(CodeBlock codeBlock, CancellationToken cancellationToken)
@ -546,7 +561,7 @@ public class MarkdownWpfRenderer
SelectableTextBlock paragraphElement = new SelectableTextBlock() SelectableTextBlock paragraphElement = new SelectableTextBlock()
{ {
TextWrapping = TextWrapping.Wrap, TextWrapping = TextWrapping.Wrap,
Margin = new Thickness(0, 0, 0, NormalSize), Margin = new Thickness(0, NormalSize, 0, NormalSize),
FontSize = NormalSize, FontSize = NormalSize,
}; };

View File

@ -11,7 +11,7 @@ class PromptUtil
public static string UsePrompt(string msg,string excelPrompt) public static string UsePrompt(string msg,string excelPrompt)
{ {
return $@" return $@"
Excel公式大师Excel公式相关的问题 Excel和WPS公式大师Excel与WPS公式相关的问题
1. 1.
@ -19,8 +19,11 @@ class PromptUtil
3. 12Excel公式 3. 12Excel公式
4. 4.
5. 使 5. 使
6. 6. 使<think>使</think>
7. 使
```Excel_{{}}
=SUM(A1:A100)
```
{DateTime.Now} {DateTime.Now}
excel文件列信息为{excelPrompt} excel文件列信息为{excelPrompt}

View File

@ -23,6 +23,12 @@
<ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets> <ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
<OptimizationPreference>Size</OptimizationPreference> <OptimizationPreference>Size</OptimizationPreference>
</PropertyGroup> </PropertyGroup>
<ItemGroup>
<Compile Remove="Web\**" />
<EmbeddedResource Remove="Web\**" />
<None Remove="Web\**" />
<Page Remove="Web\**" />
</ItemGroup>
<ItemGroup> <ItemGroup>
<None Remove="HL\SQL.xshd" /> <None Remove="HL\SQL.xshd" />
</ItemGroup> </ItemGroup>
@ -69,9 +75,6 @@
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0-rc.2.24473.5" /> <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0-rc.2.24473.5" />
<PackageReference Include="TinyPinyin" Version="1.1.0" /> <PackageReference Include="TinyPinyin" Version="1.1.0" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<Folder Include="Web\" />
</ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\EleCho.MdViewer\src\EleCho.MdViewer\EleCho.MdViewer.csproj" /> <ProjectReference Include="..\EleCho.MdViewer\src\EleCho.MdViewer\EleCho.MdViewer.csproj" />
</ItemGroup> </ItemGroup>

View File

@ -14,7 +14,7 @@ public class Excel2Prompt
/// <param name="columns"></param> /// <param name="columns"></param>
/// <param name="startCell">A</param> /// <param name="startCell">A</param>
/// <returns></returns> /// <returns></returns>
public static string ConverterToPrompt(IEnumerable<dynamic> excelData, IEnumerable<string> columns, string startCell) public static string ConverterToPrompt(IEnumerable<dynamic> excelData, IEnumerable<string> columns, string startCell,string sheetName)
{ {
/* /*
: :
@ -37,7 +37,7 @@ public class Excel2Prompt
- Missing values: 7007 - Missing values: 7007
*/ */
var prompts = new List<string>(); var prompts = new List<string>();
prompts.Add("This Excel file contains the following columns:"); prompts.Add($"This Excel file contains the following columns:");
var dataList = excelData.ToList(); var dataList = excelData.ToList();
// 解析 startCell获取起始列的索引 // 解析 startCell获取起始列的索引
@ -68,6 +68,8 @@ public class Excel2Prompt
$" - Sample values: ['{string.Join("', '", sampleValues)}']"; $" - Sample values: ['{string.Join("', '", sampleValues)}']";
prompts.Add(prompt); prompts.Add(prompt);
} }
prompts.Add($"Sheet Name: {sheetName}");
prompts.Add($"Max Row: {excelData.Count()}");
return string.Join(Environment.NewLine + Environment.NewLine, prompts); return string.Join(Environment.NewLine + Environment.NewLine, prompts);
} }

View File

@ -92,7 +92,7 @@ public partial class ImportViewModel : ObservableRecipient, IViewModel
} }
MaxRow = ExcelData.Count(); MaxRow = ExcelData.Count();
ExcelPromptString = Excel2Prompt.ConverterToPrompt(ExcelData, columns,StartCell); ExcelPromptString = Excel2Prompt.ConverterToPrompt(excelData, columns,StartCell,currentSheetName);
} }
catch (Exception ex) catch (Exception ex)
{ {
@ -285,7 +285,7 @@ public partial class ImportViewModel : ObservableRecipient, IViewModel
}; };
Messages.Add(aiChat); Messages.Add(aiChat);
#if !DEBUG #if DEBUG
var results = TEST_AI_CONTENT.Split('\n'); var results = TEST_AI_CONTENT.Split('\n');
foreach(var result in results) foreach(var result in results)
{ {
@ -311,10 +311,16 @@ public partial class ImportViewModel : ObservableRecipient, IViewModel
} }
private const string TEST_AI_CONTENT = @" private static string TEST_AI_CONTENT = @"
<think> ```Excel_H
1231231 1231231122222222222222222222
</think> 123
1
23
12
3
12
```
"; ";
#region Props #region Props
[ObservableProperty] [ObservableProperty]