Compare commits

..

No commits in common. "735fbfb83dc59c085df176cdb954254b4c167835" and "3f9d3b3399d50c42df20f28cb5b98a30283431ab" have entirely different histories.

5 changed files with 35 additions and 41 deletions

View File

@ -379,22 +379,15 @@ 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 });
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)

View File

@ -50,6 +50,17 @@ class PromptUtil
5. 使
<><>
<think>
[在此详细说明你的思考过程]
</think>
[在此给出你的回答]
";
}
}

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 />
<mu:ThemeDictionary ColorMode="Light" />
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>

View File

@ -88,15 +88,6 @@
</TabItem>
</TabControl>
<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"
@ -109,7 +100,6 @@
Foreground="#99000000"
Text="{Binding Timestamp, StringFormat='{}{0:HH:mm}'}" />
</StackPanel>
</DockPanel>
<hc:Divider
Height="10"
Margin="0,3"

View File

@ -321,9 +321,8 @@ public partial class ImportViewModel : ObservableRecipient, IViewModel
};
Messages.Add(aiChat);
var promptedMsg = PromptUtil.UsePrompt(message,ExcelPromptString);
#if DEBUG
var results = promptedMsg.Split('\n');
#if !DEBUG
var results = TEST_AI_CONTENT.Split('\n');
foreach(var result in results)
{
aiChat.Content += result;
@ -331,6 +330,7 @@ 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,