From 607ac1dc3a004c03fb605c0cdd0b0179d5d77c55 Mon Sep 17 00:00:00 2001
From: Argo Zhang <argo@163.com>
Date: Wed, 2 Oct 2019 17:42:28 +0800
Subject: [PATCH] =?UTF-8?q?fix(#I12XCW):=20=E5=9C=A8=E7=BA=BF=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E8=AE=BF=E9=97=AE=E5=8E=86=E5=8F=B2=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E4=B8=BA=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

#Comment
comment #I12XCW
popover 增加新的属性 sanitize 默认为 true

#Issue
link #I12XCW
---
 .../Bootstrap.Admin/wwwroot/js/online.js      | 24 +++++++++----------
 .../Bootstrap.DataAccess.csproj               |  3 ++-
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/admin/Bootstrap.Admin/wwwroot/js/online.js b/src/admin/Bootstrap.Admin/wwwroot/js/online.js
index d1b8f8d6..6211d190 100644
--- a/src/admin/Bootstrap.Admin/wwwroot/js/online.js
+++ b/src/admin/Bootstrap.Admin/wwwroot/js/online.js
@@ -37,20 +37,18 @@ $(function () {
         var $this = $(this);
         if (!$this.data($.fn.popover.Constructor.DATA_KEY)) {
             var id = $this.attr('data-id');
-            $.bc({
-                id: id, url: apiUrl,
-                callback: function (result) {
-                    if (!result) return;
-                    var content = result.map(function (item) {
-                        return $.format("<tr><td>{0}</td><td>{1}</td></tr>", item.Key, item.Value);
-                    }).join('');
-                    content = content === '' ?
-                        '已断开' :
-                        $.format('<div class="bootstrap-table" style="margin: 4px 0;"><div class="fixed-table-container"><div class="fixed-table-body"><table class="table table-bordered table-hover"><thead><tr><th class="p-1"><b>访问时间</b></th><th class="p-1">访问地址</th></tr></thead><tbody>{0}</tbody></table></div></div></div>', content);
-                    $this.popover({ content: content, placement: $(window).width() < 768 ? 'top' : 'left' });
-                    $this.popover('show');
-                }
+            var data = $table.bootstrapTable('getData');
+            var row = data.filter(function (v) {
+                return v.ConnectionId === id;
             });
+            var content = row[0].RequestUrls.map(function (item) {
+                return $.format("<tr><td>{0}</td><td>{1}</td></tr>", item.Key, item.Value);
+            }).join('');
+            content = content === '' ?
+                '已断开' :
+                $.format("<div class='bootstrap-table' style='margin: 4px 0;'><div class='fixed-table-container'><div class='fixed-table-body'><table class='table table-bordered table-hover'><thead><tr><th class='p-1'><b>访问时间</b></th><th class='p-1'>访问地址</th></tr></thead><tbody>{0}</tbody></table></div></div></div>", content);
+            $this.popover({ content: content, sanitize: false, placement: $(window).width() < 768 ? 'top' : 'left' });
+            $this.popover('show');
         }
     }).on('mouseup', 'button[data-id]', function () {
         $(this).focus();
diff --git a/src/admin/Bootstrap.DataAccess/Bootstrap.DataAccess.csproj b/src/admin/Bootstrap.DataAccess/Bootstrap.DataAccess.csproj
index 13d4e880..13a7775b 100644
--- a/src/admin/Bootstrap.DataAccess/Bootstrap.DataAccess.csproj
+++ b/src/admin/Bootstrap.DataAccess/Bootstrap.DataAccess.csproj
@@ -6,6 +6,7 @@
 
   <ItemGroup>
     <PackageReference Include="Bootstrap.Security.DataAccess" Version="2.2.21" />
+    <PackageReference Include="Longbow" Version="3.0.0-beta1" />
     <PackageReference Include="Longbow.Configuration" Version="2.2.7" />
     <PackageReference Include="Longbow.Data" Version="2.3.8" />
     <PackageReference Include="Longbow.GiteeAuth" Version="2.2.0" />
@@ -14,7 +15,7 @@
     <PackageReference Include="Longbow.PetaPoco" Version="1.0.2" />
     <PackageReference Include="Longbow.Security.Cryptography" Version="1.3.0" />
     <PackageReference Include="Longbow.Tasks" Version="2.2.24" />
-    <PackageReference Include="Longbow.Web" Version="2.2.16" />
+    <PackageReference Include="Longbow.Web" Version="3.0.0-beta1" />
     <PackageReference Include="Longbow.WeChatAuth" Version="2.2.0" />
     <PackageReference Include="Microsoft.Data.Sqlite" Version="3.0.0" />
     <PackageReference Include="PetaPoco.Extensions" Version="1.0.9" />