orga0063
/
BootstrapAdmin
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'dev-Trace'

This commit is contained in:
Argo Zhang 2019-10-02 17:46:12 +08:00
parent 9f1711847b 607ac1dc3a
commit f5c1f4f1e1
No known key found for this signature in database
GPG Key ID: 152E398953DDF19F
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/admin/Bootstrap.Admin/wwwroot/js/online.js
View File

@ -37,20 +37,18 @@ $(function () {
var $this = $(this); var $this = $(this);
if (!$this.data($.fn.popover.Constructor.DATA_KEY)) { if (!$this.data($.fn.popover.Constructor.DATA_KEY)) {
var id = $this.attr('data-id'); var id = $this.attr('data-id');
$.bc({ var data = $table.bootstrapTable('getData');
id: id, url: apiUrl, var row = data.filter(function (v) {
callback: function (result) { return v.ConnectionId === id;
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 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 () { }).on('mouseup', 'button[data-id]', function () {
$(this).focus(); $(this).focus();

3
src/admin/Bootstrap.DataAccess/Bootstrap.DataAccess.csproj
View File

@ -6,6 +6,7 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="Bootstrap.Security.DataAccess" Version="2.2.21" /> <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.Configuration" Version="2.2.7" />
<PackageReference Include="Longbow.Data" Version="2.3.8" /> <PackageReference Include="Longbow.Data" Version="2.3.8" />
<PackageReference Include="Longbow.GiteeAuth" Version="2.2.0" /> <PackageReference Include="Longbow.GiteeAuth" Version="2.2.0" />
@ -14,7 +15,7 @@
<PackageReference Include="Longbow.PetaPoco" Version="1.0.2" /> <PackageReference Include="Longbow.PetaPoco" Version="1.0.2" />
<PackageReference Include="Longbow.Security.Cryptography" Version="1.3.0" /> <PackageReference Include="Longbow.Security.Cryptography" Version="1.3.0" />
<PackageReference Include="Longbow.Tasks" Version="2.2.24" /> <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="Longbow.WeChatAuth" Version="2.2.0" />
<PackageReference Include="Microsoft.Data.Sqlite" Version="3.0.0" /> <PackageReference Include="Microsoft.Data.Sqlite" Version="3.0.0" />
<PackageReference Include="PetaPoco.Extensions" Version="1.0.9" /> <PackageReference Include="PetaPoco.Extensions" Version="1.0.9" />