From e8231db43ace360a1ea129148c530e454e33fc46 Mon Sep 17 00:00:00 2001 From: gil zhang Date: Fri, 22 Nov 2024 00:09:10 +0800 Subject: [PATCH] update chat --- .../Controls/Chat/ChatModuleHeader.xaml | 27 ++++++++++++++----- .../Strings/en-us/Resources.resw | 3 +++ .../Strings/ko-kr/Resources.resw | 3 +++ .../Strings/zh-cn/Resources.resw | 3 +++ .../ViewModels/Chat/ChatViewModel.Command.cs | 10 +++++-- .../Strings/en-us/Resources.resw | 3 +++ .../Strings/ko-kr/Resources.resw | 3 +++ .../Strings/zh-cn/Resources.resw | 3 +++ 8 files changed, 47 insertions(+), 8 deletions(-) diff --git a/src/Modules/Verdure.Braincase.Copilot/Controls/Chat/ChatModuleHeader.xaml b/src/Modules/Verdure.Braincase.Copilot/Controls/Chat/ChatModuleHeader.xaml index 7244870..e3d6b88 100644 --- a/src/Modules/Verdure.Braincase.Copilot/Controls/Chat/ChatModuleHeader.xaml +++ b/src/Modules/Verdure.Braincase.Copilot/Controls/Chat/ChatModuleHeader.xaml @@ -4,14 +4,14 @@ 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:i="using:Microsoft.Xaml.Interactivity" + xmlns:ic="using:Microsoft.Xaml.Interactions.Core" xmlns:local="using:Verdure.Braincase.Copilot.Controls.Chat" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:model="using:Verdure.Braincase.Copilot.ViewModels" xmlns:models="using:BotSharp.Abstraction.Conversations.Models" xmlns:myconverters="using:Verdure.Braincase.WinUI.Common.Converters" mc:Ignorable="d"> - - @@ -29,7 +29,7 @@ VerticalAlignment="Center" Foreground="{ThemeResource TextFillColorTertiaryBrush}" Style="{StaticResource CaptionTextBlockStyle}" - Text="{x:Bind CreatedTime, Converter={StaticResource UtcToLocalTimeConverter}, ConverterParameter='MM-dd'}" /> + Text="{x:Bind CreatedTime, Converter={StaticResource UtcToLocalTimeConverter}, ConverterParameter='MM-dd HH:mm:ss'}" /> @@ -46,7 +46,8 @@ HorizontalAlignment="Left" VerticalAlignment="Center" FontSize="20" - Text="{x:Bind ViewModel.SelectedConversation.Title, Mode=OneWay}" /> + Text="{x:Bind ViewModel.SelectedConversation.Title, Mode=OneWay}" + TextTrimming="CharacterEllipsis" /> + ItemsSource="{x:Bind ViewModel.ConvList, Mode=OneWay}"> + + + + + + + + + + + + - diff --git a/src/Modules/Verdure.Braincase.Copilot/Strings/en-us/Resources.resw b/src/Modules/Verdure.Braincase.Copilot/Strings/en-us/Resources.resw index acd6e61..405bb9a 100644 --- a/src/Modules/Verdure.Braincase.Copilot/Strings/en-us/Resources.resw +++ b/src/Modules/Verdure.Braincase.Copilot/Strings/en-us/Resources.resw @@ -936,4 +936,7 @@ 请在输入框愉快的和我聊天吧！ + + Delete + \ No newline at end of file diff --git a/src/Modules/Verdure.Braincase.Copilot/Strings/ko-kr/Resources.resw b/src/Modules/Verdure.Braincase.Copilot/Strings/ko-kr/Resources.resw index 569c0bc..0106bdb 100644 --- a/src/Modules/Verdure.Braincase.Copilot/Strings/ko-kr/Resources.resw +++ b/src/Modules/Verdure.Braincase.Copilot/Strings/ko-kr/Resources.resw @@ -912,4 +912,7 @@ 请在输入框愉快的和我聊天吧！ + + Delete + \ No newline at end of file diff --git a/src/Modules/Verdure.Braincase.Copilot/Strings/zh-cn/Resources.resw b/src/Modules/Verdure.Braincase.Copilot/Strings/zh-cn/Resources.resw index ad9b970..d5e9174 100644 --- a/src/Modules/Verdure.Braincase.Copilot/Strings/zh-cn/Resources.resw +++ b/src/Modules/Verdure.Braincase.Copilot/Strings/zh-cn/Resources.resw @@ -967,4 +967,7 @@ 请在输入框输入消息愉快的和我聊天吧！ + + 删除 + \ No newline at end of file diff --git a/src/Modules/Verdure.Braincase.Copilot/ViewModels/Chat/ChatViewModel.Command.cs b/src/Modules/Verdure.Braincase.Copilot/ViewModels/Chat/ChatViewModel.Command.cs index 7db5c93..88c2c02 100644 --- a/src/Modules/Verdure.Braincase.Copilot/ViewModels/Chat/ChatViewModel.Command.cs +++ b/src/Modules/Verdure.Braincase.Copilot/ViewModels/Chat/ChatViewModel.Command.cs @@ -184,7 +184,7 @@ public partial class ChatViewModel SelectedConv = new ConversationViewModel(convList.FirstOrDefault() ?? new Conversation(), null, null); //ConversationList = new ObservableCollection(convList); - if (SelectedConv == null) return; + if (SelectedConv == null || string.IsNullOrEmpty(SelectedConv.Id)) return; _conversationService.SetConversationId(SelectedConv.Id, new List()); var historys = _conversationService.GetDialogHistory(fromBreakpoint: false); foreach (var history in historys) @@ -216,7 +216,13 @@ public partial class ChatViewModel } [RelayCommand] - private void Delete() + private async Task DeleteConvAsync(ConversationViewModel? conv) { + if (conv != null) + { + ConvList.Remove(conv); + MessageList.Clear(); + await _conversationService.DeleteConversations(new List { conv.Id }); + } } } diff --git a/src/Verdure.Braincase/Strings/en-us/Resources.resw b/src/Verdure.Braincase/Strings/en-us/Resources.resw index acd6e61..405bb9a 100644 --- a/src/Verdure.Braincase/Strings/en-us/Resources.resw +++ b/src/Verdure.Braincase/Strings/en-us/Resources.resw @@ -936,4 +936,7 @@ 请在输入框愉快的和我聊天吧！ + + Delete + \ No newline at end of file diff --git a/src/Verdure.Braincase/Strings/ko-kr/Resources.resw b/src/Verdure.Braincase/Strings/ko-kr/Resources.resw index 569c0bc..0106bdb 100644 --- a/src/Verdure.Braincase/Strings/ko-kr/Resources.resw +++ b/src/Verdure.Braincase/Strings/ko-kr/Resources.resw @@ -912,4 +912,7 @@ 请在输入框愉快的和我聊天吧！ + + Delete + \ No newline at end of file diff --git a/src/Verdure.Braincase/Strings/zh-cn/Resources.resw b/src/Verdure.Braincase/Strings/zh-cn/Resources.resw index ad9b970..d5e9174 100644 --- a/src/Verdure.Braincase/Strings/zh-cn/Resources.resw +++ b/src/Verdure.Braincase/Strings/zh-cn/Resources.resw @@ -967,4 +967,7 @@ 请在输入框输入消息愉快的和我聊天吧！ + + 删除 + \ No newline at end of file