Skip to content

Commit 2536b94

Browse files
committed
修复显示原文无法出现淡入淡出的效果
1 parent 042a9e2 commit 2536b94

File tree

3 files changed

+42
-14
lines changed

3 files changed

+42
-14
lines changed

skywalking-webui/src/main/webapp/ftl/index.ftl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
.leaf {
1515
background-color: white;
1616
}
17+
.in{display:block;height:370px;}
1718
</style>
1819
<@common.importJavaScript />
1920
</head>

skywalking-webui/src/main/webapp/ftl/lib/ai.cloud/common.ftl

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,13 @@
55
<script src="${base}/js/jquery/jquery.treetable-3.2.0.js"></script>
66
<script src="${base}/js/jquery/jquery.backstretch.min.js"></script>
77
<script src="${base}/js/jquery/jquery-md5.js"></script>
8-
<script src="${base}/js/bootstrap.min-3.3.5.js"></script>
8+
<#--<script src="${base}/js/bootstrap.min-3.3.5.js"></script>-->
99
<script src="${base}/js/jquery/bootbox.min.js"></script>
1010
<script src="${base}/js/scripts.js"></script>
11+
<style>
12+
13+
.liu{display:none;height:370px;!important}
14+
</style>
1115
</#macro>
1216

1317
<#-- importMenuInfo -->
@@ -85,9 +89,6 @@
8589
<li><a id="regist" name="menuUrl" href="${base}/regist">注册</a></li>
8690
</#if>
8791
</ul>
88-
<script>
89-
$('.dropdown-toggle').dropdown();
90-
</script>
9192
</#macro>
9293

9394
<#-- dealTraceLog -->
@@ -98,7 +99,7 @@
9899
<h5 style="color:white">
99100
${traceId!}</br>
100101
调度入口IP:${(valueList[0].address)!},开始时间:${beginTime?number_to_datetime}${(valueList?size)!}条调用记录,消耗总时长:${(endTime - beginTime)!'0'}
101-
ms。<a id="originLog" href="#">显示原文</a>
102+
ms。<a id="originLog" href="javascript:void(0);">显示原文</a>
102103
</h5>
103104
<div id="tableDiv">
104105
<table id="example-advanced">
@@ -241,7 +242,7 @@
241242
<#macro importOriginLog>
242243
<div id="originRow" style="display:none">
243244
<div class="col-md-12">
244-
<table class="table table-bordered table-hover">
245+
<table class="table table-bordered table-hover" style="color: white;">
245246
<thead>
246247
<tr>
247248
<th style="width:2%">#</th>
@@ -264,15 +265,15 @@
264265
<td>
265266
<div class="accordion-group">
266267
<div class="accordion-heading">
267-
<li class="accordion-toggle list-group-item active" data-toggle="collapse"
268-
style="background-color:rgb(133, 145, 156); border: 0px;cursor:pointer"
269-
href="#collapse${logInfo_index}">
268+
<li class="accordion-toggle list-group-item active testClass"
269+
index="${logInfo_index}"
270+
style="background-color:rgb(133, 145, 156); border: 0px;cursor:pointer">
270271
${logInfo.viewPointId}
271272
</li>
272273
</div>
273-
<div id="collapse${logInfo_index}" class="accordion-body collapse"
274-
style="height: 0px; ">
275-
<ul class="list-group">
274+
<div id="collapse${logInfo_index}"
275+
style="height: 0px;display:none " >
276+
<ul class="list-group" style="color: black;">
276277
<li class="list-group-item" style="word-wrap:break-word">
277278
<strong>服务/方法:</strong>${logInfo.viewPointId!''}</li>
278279
<li class="list-group-item">
@@ -305,6 +306,14 @@
305306
</#if>
306307
</table>
307308
</div>
309+
<script>
310+
// $(".testClass").each(function(){
311+
// var index = $(this).attr("index");
312+
// $('#collapse' + index).collapse({
313+
// toggle: true
314+
// })
315+
// });
316+
</script>
308317
</div>
309318
</#macro>
310319

skywalking-webui/src/main/webapp/js/webui-0.1.js

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
function changeFrameUrl(url) {
22
console.info('showTraceLog iframe url change: ' + url);
33
$("#showTraceLog").attr("src", url);
4-
5-
64
//$("#showTraceLog").attr("height",$("#showTraceLog").contentDocument.scrollHeight + 20);
75
}
86

@@ -13,6 +11,19 @@ function drawData(url) {
1311
success: function (data) {
1412
$("#showTraceLog").empty();
1513
$("#showTraceLog").html(data);
14+
var flag1=true;
15+
$('.testClass').click(function(){
16+
if(flag1){
17+
18+
$(this).parent().siblings('').show();
19+
$(this).parent().siblings('').css('height','370px')
20+
flag1=false;
21+
}else{
22+
$(this).parent().siblings('').hide();
23+
flag1=true;
24+
}
25+
26+
})
1627
}
1728
});
1829
}
@@ -22,6 +33,13 @@ $().ready(function () {
2233
var baseUrl = $("#baseUrl").val();
2334
var traceId = $("#traceId").val();
2435
var uid = $("#uid").val();
36+
var flag1=true;
37+
$('.accordion-toggle').click(function(){
38+
if(flag1){
39+
40+
$('.accordion-toggle').siblings('.collapse').css('display','block')
41+
}
42+
})
2543

2644

2745

0 commit comments

Comments
 (0)