From 0e08b3ae85eab73823cc88b973066139b0b9f404 Mon Sep 17 00:00:00 2001
From: zyxucp <286513187@qq.com>
Date: Sun, 28 Apr 2024 15:37:51 +0800
Subject: [PATCH 1/2] =?UTF-8?q?add=20=E6=B0=B4=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Pages/ChatPage/Components/ChatView.razor  | 145 +++++++++---------
 1 file changed, 73 insertions(+), 72 deletions(-)

diff --git a/src/AntSK/Pages/ChatPage/Components/ChatView.razor b/src/AntSK/Pages/ChatPage/Components/ChatView.razor
index d6f8131..cbb86e8 100644
--- a/src/AntSK/Pages/ChatPage/Components/ChatView.razor
+++ b/src/AntSK/Pages/ChatPage/Components/ChatView.razor
@@ -5,81 +5,82 @@
 @layout OpenLayout
 @inherits AntDomComponentBase
 
-<div id="chat">
-    @if (ShowTitle)
-    {
-        <PageHeader Class="site-page-header" Title="@app.Name" Subtitle="@app.Describe" />
-    }
-    <div id="scrollDiv" style="flex:1; width:100%; overflow-y:auto; overflow-x:hidden;padding:10px;">
-        <Virtualize Items="@(MessageList.OrderBy(o => o.CreateTime).ToList())" Context="item">
-            @if (item.IsSend)
-            {
-                <GridRow>
-                    <GridCol Span="23">
-                        <div class="chat-bubble sent">
-                            <Popover Title="@item.CreateTime.ToString()">
-                                <Unbound>
-                                    <Flex Vertical RefBack="context">
-                                        @if (item.FileName != null)
-                                        {
-                                            <p class="message-file">
-                                                <Upload DefaultFileList="[new(){ FileName= item.FileName }]" />
-                                            </p>
-                                        }
-                                        <p>@(item.Context)</p>
-                                    </Flex>
-                                </Unbound>
-                            </Popover>
-                        </div>
-                        <Icon Style="float:right;margin-top:10px;" Type="copy" Theme="outline" OnClick="async () =>await OnCopyAsync(item)" />
-                    </GridCol>
-                    <GridCol Span="1">
-                        <Image Width="25px" Height="25px" Style="margin-top:10px;" Src="https://gw.alipayobjects.com/zos/rmsportal/KDpgvguMpGfqaHPjicRK.svg" />
-                    </GridCol>
-                </GridRow>
-            }
-            else
-            {
-                <GridRow>
-                    <GridCol Span="1">
-                        <Image Width="25px" Height="25px" Style="margin-top:10px;" Src="https://gw.alipayobjects.com/zos/antfincdn/aPkFc8Sj7n/method-draw-image.svg" />
-                    </GridCol>
-                    <GridCol Span="23">
-                        <div class="chat-bubble received">
-                            @((MarkupString)(item.Context))
-                        </div>
-
-                    </GridCol>
-                </GridRow>
-            }
-        </Virtualize>
-    </div>
-
-    @if (fileList.Count > 0)
-    {
-        <Flex Vertical>
-            <Upload DefaultFileList="fileList" OnRemove="HandleFileRemove" />
-        </Flex>
-    }
-    <Flex Justify="end">
-
-        <AntDesign.Input @bind-Value="@(_messageInput)" DebounceMilliseconds="@(-1)" Placeholder="输入消息回车发送" OnPressEnter="@(async () => await OnSendAsync())" Disabled="@Sendding"></AntDesign.Input>
-        @if (app.EmbeddingModelID!=null)
+<Watermark Content="AntSK">
+    <div id="chat">
+        @if (ShowTitle)
         {
-            <Upload Action="@("api/File/UploadFile")"
-                    Name="file"
-                    Accept="*/*"
-                    ShowUploadList="false"
-                    BeforeUpload="_kMService.BeforeUpload"
-                    OnSingleCompleted="OnSingleCompleted">
-                <Button Icon="@IconType.Outline.Upload" Type="@(ButtonType.Link)" Disabled="@Sendding" />
-            </Upload>
+            <PageHeader Class="site-page-header" Title="@app.Name" Subtitle="@app.Describe" />
         }
-        <Button Icon="clear" Type="@(ButtonType.Link)" OnClick="@(async () => await OnClearAsync())" Disabled="@Sendding"></Button>
-        <Button Icon="send" Type="@(ButtonType.Link)" OnClick="@(async () => await OnSendAsync())" Disabled="@Sendding"></Button>
-    </Flex>
-</div>
+        <div id="scrollDiv" style="flex:1; width:100%; overflow-y:auto; overflow-x:hidden;padding:10px;">
+            <Virtualize Items="@(MessageList.OrderBy(o => o.CreateTime).ToList())" Context="item">
+                @if (item.IsSend)
+                {
+                    <GridRow>
+                        <GridCol Span="23">
+                            <div class="chat-bubble sent">
+                                <Popover Title="@item.CreateTime.ToString()">
+                                    <Unbound>
+                                        <Flex Vertical RefBack="context">
+                                            @if (item.FileName != null)
+                                            {
+                                                <p class="message-file">
+                                                    <Upload DefaultFileList="[new(){ FileName= item.FileName }]" />
+                                                </p>
+                                            }
+                                            <p>@(item.Context)</p>
+                                        </Flex>
+                                    </Unbound>
+                                </Popover>
+                            </div>
+                            <Icon Style="float:right;margin-top:10px;" Type="copy" Theme="outline" OnClick="async () =>await OnCopyAsync(item)" />
+                        </GridCol>
+                        <GridCol Span="1">
+                            <Image Width="25px" Height="25px" Style="margin-top:10px;" Src="https://gw.alipayobjects.com/zos/rmsportal/KDpgvguMpGfqaHPjicRK.svg" />
+                        </GridCol>
+                    </GridRow>
+                }
+                else
+                {
+                    <GridRow>
+                        <GridCol Span="1">
+                            <Image Width="25px" Height="25px" Style="margin-top:10px;" Src="https://gw.alipayobjects.com/zos/antfincdn/aPkFc8Sj7n/method-draw-image.svg" />
+                        </GridCol>
+                        <GridCol Span="23">
+                            <div class="chat-bubble received">
+                                @((MarkupString)(item.Context))
+                            </div>
 
+                        </GridCol>
+                    </GridRow>
+                }
+            </Virtualize>
+        </div>
+
+        @if (fileList.Count > 0)
+        {
+            <Flex Vertical>
+                <Upload DefaultFileList="fileList" OnRemove="HandleFileRemove" />
+            </Flex>
+        }
+        <Flex Justify="end">
+
+            <AntDesign.Input @bind-Value="@(_messageInput)" DebounceMilliseconds="@(-1)" Placeholder="输入消息回车发送" OnPressEnter="@(async () => await OnSendAsync())" Disabled="@Sendding"></AntDesign.Input>
+            @if (app.EmbeddingModelID != null)
+            {
+                <Upload Action="@("api/File/UploadFile")"
+                        Name="file"
+                        Accept="*/*"
+                        ShowUploadList="false"
+                        BeforeUpload="_kMService.BeforeUpload"
+                        OnSingleCompleted="OnSingleCompleted">
+                    <Button Icon="@IconType.Outline.Upload" Type="@(ButtonType.Link)" Disabled="@Sendding" />
+                </Upload>
+            }
+            <Button Icon="clear" Type="@(ButtonType.Link)" OnClick="@(async () => await OnClearAsync())" Disabled="@Sendding"></Button>
+            <Button Icon="send" Type="@(ButtonType.Link)" OnClick="@(async () => await OnSendAsync())" Disabled="@Sendding"></Button>
+        </Flex>
+    </div>
+</Watermark>
 <style>
 
     body {

From 125695665b0384e860b19404d017341b78d80c65 Mon Sep 17 00:00:00 2001
From: zyxucp <286513187@qq.com>
Date: Sun, 28 Apr 2024 16:53:10 +0800
Subject: [PATCH 2/2] =?UTF-8?q?add=20=E4=BF=AE=E6=94=B9=E6=B0=B4=E5=8D=B0?=
 =?UTF-8?q?=E5=BD=B1=E5=93=8D=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/AntSK/Pages/ChatPage/Chat.razor           |   8 +-
 .../Pages/ChatPage/Components/ChatView.razor  | 144 +++++++++---------
 src/AntSK/Pages/ChatPage/OpenChat.razor       |  10 +-
 3 files changed, 83 insertions(+), 79 deletions(-)

diff --git a/src/AntSK/Pages/ChatPage/Chat.razor b/src/AntSK/Pages/ChatPage/Chat.razor
index 3400165..4a1718f 100644
--- a/src/AntSK/Pages/ChatPage/Chat.razor
+++ b/src/AntSK/Pages/ChatPage/Chat.razor
@@ -25,7 +25,9 @@
             <Body>
                 @if (!string.IsNullOrEmpty(AppId))
                 {
-                    <ChatView AppId="@AppId" ShowTitle=false OnRelevantSources="OnRelevantSources"></ChatView>
+                    <Watermark Content="AntSK">
+                        <ChatView AppId="@AppId" ShowTitle=false OnRelevantSources="OnRelevantSources"></ChatView>
+                    </Watermark>
                 }
             </Body>
         </Card>
@@ -42,11 +44,11 @@
                 <AntList Bordered DataSource="@_relevantSources" Style="padding:10px;">
                     <ChildContent Context="item">
                         <span> <b>@item.SourceName </b>  </span>
-                        <br/>
+                        <br />
                         <span>相似度：<Text Mark> @item.Relevance</Text></span>
                         @if (@item.RerankScore != 0)
                         {
-                            <br/>
+                            <br />
                             <span> Rerank相关性：<Text Mark> @item.RerankScore</Text></span>
                         }
                         <Body>
diff --git a/src/AntSK/Pages/ChatPage/Components/ChatView.razor b/src/AntSK/Pages/ChatPage/Components/ChatView.razor
index cbb86e8..f0be228 100644
--- a/src/AntSK/Pages/ChatPage/Components/ChatView.razor
+++ b/src/AntSK/Pages/ChatPage/Components/ChatView.razor
@@ -5,82 +5,82 @@
 @layout OpenLayout
 @inherits AntDomComponentBase
 
-<Watermark Content="AntSK">
-    <div id="chat">
-        @if (ShowTitle)
-        {
-            <PageHeader Class="site-page-header" Title="@app.Name" Subtitle="@app.Describe" />
-        }
-        <div id="scrollDiv" style="flex:1; width:100%; overflow-y:auto; overflow-x:hidden;padding:10px;">
-            <Virtualize Items="@(MessageList.OrderBy(o => o.CreateTime).ToList())" Context="item">
-                @if (item.IsSend)
-                {
-                    <GridRow>
-                        <GridCol Span="23">
-                            <div class="chat-bubble sent">
-                                <Popover Title="@item.CreateTime.ToString()">
-                                    <Unbound>
-                                        <Flex Vertical RefBack="context">
-                                            @if (item.FileName != null)
-                                            {
-                                                <p class="message-file">
-                                                    <Upload DefaultFileList="[new(){ FileName= item.FileName }]" />
-                                                </p>
-                                            }
-                                            <p>@(item.Context)</p>
-                                        </Flex>
-                                    </Unbound>
-                                </Popover>
-                            </div>
-                            <Icon Style="float:right;margin-top:10px;" Type="copy" Theme="outline" OnClick="async () =>await OnCopyAsync(item)" />
-                        </GridCol>
-                        <GridCol Span="1">
-                            <Image Width="25px" Height="25px" Style="margin-top:10px;" Src="https://gw.alipayobjects.com/zos/rmsportal/KDpgvguMpGfqaHPjicRK.svg" />
-                        </GridCol>
-                    </GridRow>
-                }
-                else
-                {
-                    <GridRow>
-                        <GridCol Span="1">
-                            <Image Width="25px" Height="25px" Style="margin-top:10px;" Src="https://gw.alipayobjects.com/zos/antfincdn/aPkFc8Sj7n/method-draw-image.svg" />
-                        </GridCol>
-                        <GridCol Span="23">
-                            <div class="chat-bubble received">
-                                @((MarkupString)(item.Context))
-                            </div>
 
-                        </GridCol>
-                    </GridRow>
-                }
-            </Virtualize>
-        </div>
-
-        @if (fileList.Count > 0)
-        {
-            <Flex Vertical>
-                <Upload DefaultFileList="fileList" OnRemove="HandleFileRemove" />
-            </Flex>
-        }
-        <Flex Justify="end">
-
-            <AntDesign.Input @bind-Value="@(_messageInput)" DebounceMilliseconds="@(-1)" Placeholder="输入消息回车发送" OnPressEnter="@(async () => await OnSendAsync())" Disabled="@Sendding"></AntDesign.Input>
-            @if (app.EmbeddingModelID != null)
+<div id="chat">
+    @if (ShowTitle)
+    {
+        <PageHeader Class="site-page-header" Title="@app.Name" Subtitle="@app.Describe" />
+    }
+    <div id="scrollDiv" style="flex:1; width:100%; overflow-y:auto; overflow-x:hidden;padding:10px;">
+        <Virtualize Items="@(MessageList.OrderBy(o => o.CreateTime).ToList())" Context="item">
+            @if (item.IsSend)
             {
-                <Upload Action="@("api/File/UploadFile")"
-                        Name="file"
-                        Accept="*/*"
-                        ShowUploadList="false"
-                        BeforeUpload="_kMService.BeforeUpload"
-                        OnSingleCompleted="OnSingleCompleted">
-                    <Button Icon="@IconType.Outline.Upload" Type="@(ButtonType.Link)" Disabled="@Sendding" />
-                </Upload>
+                <GridRow>
+                    <GridCol Span="23">
+                        <div class="chat-bubble sent">
+                            <Popover Title="@item.CreateTime.ToString()">
+                                <Unbound>
+                                    <Flex Vertical RefBack="context">
+                                        @if (item.FileName != null)
+                                        {
+                                            <p class="message-file">
+                                                <Upload DefaultFileList="[new(){ FileName= item.FileName }]" />
+                                            </p>
+                                        }
+                                        <p>@(item.Context)</p>
+                                    </Flex>
+                                </Unbound>
+                            </Popover>
+                        </div>
+                        <Icon Style="float:right;margin-top:10px;" Type="copy" Theme="outline" OnClick="async () =>await OnCopyAsync(item)" />
+                    </GridCol>
+                    <GridCol Span="1">
+                        <Image Width="25px" Height="25px" Style="margin-top:10px;" Src="https://gw.alipayobjects.com/zos/rmsportal/KDpgvguMpGfqaHPjicRK.svg" />
+                    </GridCol>
+                </GridRow>
             }
-            <Button Icon="clear" Type="@(ButtonType.Link)" OnClick="@(async () => await OnClearAsync())" Disabled="@Sendding"></Button>
-            <Button Icon="send" Type="@(ButtonType.Link)" OnClick="@(async () => await OnSendAsync())" Disabled="@Sendding"></Button>
-        </Flex>
+            else
+            {
+                <GridRow>
+                    <GridCol Span="1">
+                        <Image Width="25px" Height="25px" Style="margin-top:10px;" Src="https://gw.alipayobjects.com/zos/antfincdn/aPkFc8Sj7n/method-draw-image.svg" />
+                    </GridCol>
+                    <GridCol Span="23">
+                        <div class="chat-bubble received">
+                            @((MarkupString)(item.Context))
+                        </div>
+
+                    </GridCol>
+                </GridRow>
+            }
+        </Virtualize>
     </div>
-</Watermark>
+
+    @if (fileList.Count > 0)
+    {
+        <Flex Vertical>
+            <Upload DefaultFileList="fileList" OnRemove="HandleFileRemove" />
+        </Flex>
+    }
+    <Flex Justify="end">
+
+        <AntDesign.Input @bind-Value="@(_messageInput)" DebounceMilliseconds="@(-1)" Placeholder="输入消息回车发送" OnPressEnter="@(async () => await OnSendAsync())" Disabled="@Sendding"></AntDesign.Input>
+        @if (app.EmbeddingModelID != null)
+        {
+            <Upload Action="@("api/File/UploadFile")"
+                    Name="file"
+                    Accept="*/*"
+                    ShowUploadList="false"
+                    BeforeUpload="_kMService.BeforeUpload"
+                    OnSingleCompleted="OnSingleCompleted">
+                <Button Icon="@IconType.Outline.Upload" Type="@(ButtonType.Link)" Disabled="@Sendding" />
+            </Upload>
+        }
+        <Button Icon="clear" Type="@(ButtonType.Link)" OnClick="@(async () => await OnClearAsync())" Disabled="@Sendding"></Button>
+        <Button Icon="send" Type="@(ButtonType.Link)" OnClick="@(async () => await OnSendAsync())" Disabled="@Sendding"></Button>
+    </Flex>
+</div>
+
 <style>
 
     body {
diff --git a/src/AntSK/Pages/ChatPage/OpenChat.razor b/src/AntSK/Pages/ChatPage/OpenChat.razor
index 70edc41..0eb93ca 100644
--- a/src/AntSK/Pages/ChatPage/OpenChat.razor
+++ b/src/AntSK/Pages/ChatPage/OpenChat.razor
@@ -6,14 +6,16 @@
 @page "/OpenChat/{AppId}"
 @layout OpenLayout
 
+
 <ChatView AppId="@AppId" ShowTitle=true>
 
 </ChatView>
 
+
 <style>
-    #chat{
-        height:100% ;
-        display:flex;
+    #chat {
+        height: 100%;
+        display: flex;
         flex-direction: column;
         overflow-x: hidden;
         font-family: Arial, sans-serif;
@@ -21,7 +23,7 @@
         padding: 10px;
     }
 </style>
-@code{
+@code {
     [Parameter]
     public string AppId { get; set; }
 }
\ No newline at end of file