From c3a01c8636ef85bb828f06a26ec27471583c7d18 Mon Sep 17 00:00:00 2001
From: ascrutae <ascrutae@gmail.com>
Date: Fri, 27 May 2016 10:24:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=B8=E5=9E=8B=E8=B0=83=E7=94=A8=E9=93=BE?=
 =?UTF-8?q?=E8=8A=82=E7=82=B9=E7=82=B9=E5=87=BB=E5=87=BA=E7=8E=B0=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../js/analysisResultViewResovler.js          |  7 +-
 .../pages/anls-result/analysisResult.ftl      | 78 +++++++++++++------
 .../src/main/webapp/pages/main.ftl            |  1 +
 3 files changed, 63 insertions(+), 23 deletions(-)

diff --git a/skywalking-webui/src/main/webapp/bower_components/skywalking/js/analysisResultViewResovler.js b/skywalking-webui/src/main/webapp/bower_components/skywalking/js/analysisResultViewResovler.js
index d98b4ed21..71dc27d28 100644
--- a/skywalking-webui/src/main/webapp/bower_components/skywalking/js/analysisResultViewResovler.js
+++ b/skywalking-webui/src/main/webapp/bower_components/skywalking/js/analysisResultViewResovler.js
@@ -81,7 +81,7 @@ AnalysisResultViewResolver.prototype.showTypicalCallTree = function (nodeToken)
             var tmpNode = node.treeNodes[key];
             var analyResultStr = $("#" + key).text();
             if (analyResultStr == undefined || analyResultStr == "") {
-                analyResultStr = "{\"totalCall\":0,\"totalCostTime\":0,\"correctNumber\":0,\"humanInterruptionNumber\":0,\"correctRate\":\"0.00\",\"averageCost\":\"0.00\"}";
+                continue;
             }
             tmpNode.anlyResult = JSON.parse(analyResultStr);
             tmpTypicalCallChain.push(tmpNode);
@@ -205,6 +205,11 @@ function pickUpViewPoint(nodeToken) {
     $("#viewPointPickupModal").modal('show');
 }
 
+function typicalCallChainTreeViewPointPickUp(nodeToken) {
+    $("#typicalCallTreeViewpointStr").text($("#" + nodeToken + "TypicalCallChainViewPoint").text());
+    $("#typicalCallTreeViewPointPickUpModal").modal('show');
+}
+
 AnalysisResultViewResolver.prototype.bindGotoTypicalPageEvent = function () {
     var self = this;
     $("#showTypicalCallTreeBtn").click(function () {
diff --git a/skywalking-webui/src/main/webapp/pages/anls-result/analysisResult.ftl b/skywalking-webui/src/main/webapp/pages/anls-result/analysisResult.ftl
index 393b407fb..d56883938 100644
--- a/skywalking-webui/src/main/webapp/pages/anls-result/analysisResult.ftl
+++ b/skywalking-webui/src/main/webapp/pages/anls-result/analysisResult.ftl
@@ -46,8 +46,6 @@
             </table>
     </div>
     <hr/>
-
-
 </script>
 </#macro>
 
@@ -59,7 +57,7 @@
             {{/if}}
             <td>
                 <a href="javascript:pickUpViewPoint('{{>nodeToken}}');"> {{>viewPoint}}</a>
-                <span style="display:none" id="{{>nodeToken}}ViewPoint">{{>viewPoint}}</span>
+                <span style="display:none" id="{{>nodeToken}}ViewPoint">{{>viewPointStr}}</span>
                  </div>
             </td>
             <td>{{>anlyResult.totalCall}}</td>
@@ -79,35 +77,40 @@
             <span id="{{>nodeToken}}" style="display:none">{{>anlyResultStr}}</span></td>
 
         </tr>
+
 </script>
 </#macro>
 
 
 <#macro viewPointPickUp>
-    <div class="modal fade" id="viewPointPickupModal" tabindex="-1" role="dialog" aria-labelledby="viewPointPickupModal" aria-hidden="true">
-        <div class="modal-dialog" role="document">
-            <div class="modal-dialog">
-                <div class="modal-content">
-                    <div class="modal-header">
-                        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                        <h4 class="modal-title">节点详情</h4>
-                    </div>
-                    <div class="modal-body">
-                        <div class= "row">
-                            <div  class="col-md-10">
-                                <label>viewpoint：</label><br/>
-                                <span style="word-wrap:break-word;" id="viewpointStr"></span>
-                            </div>
+<div class="modal fade" id="viewPointPickupModal" tabindex="-1" role="dialog" aria-labelledby="viewPointPickupModal"
+     aria-hidden="true">
+    <div class="modal-dialog" role="document">
+        <div class="modal-dialog">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
+                            aria-hidden="true">&times;</span></button>
+                    <h4 class="modal-title">节点详情</h4>
+                </div>
+                <div class="modal-body">
+                    <div class="row">
+                        <div class="col-md-10">
+                            <label>viewpoint：</label><br/>
+                            <span style="word-wrap:break-word;" id="viewpointStr"></span>
                         </div>
                     </div>
-                    <div class="modal-footer">
-                        <button id="showTypicalCallTreeBtn" type="button" class="btn btn-primary" value="{{>nodeToken}}">查看调用链</button>
-                        <button type="button" class="btn btn-default" data-dismiss="modal">取消</button>
-                    </div>
+                </div>
+                <div class="modal-footer">
+                    <button id="showTypicalCallTreeBtn" type="button" class="btn btn-primary" value="{{>nodeToken}}">
+                        查看调用链
+                    </button>
+                    <button type="button" class="btn btn-default" data-dismiss="modal">取消</button>
                 </div>
             </div>
         </div>
     </div>
+</div>
 </#macro>
 
 <#macro typicalCallChainTrees>
@@ -142,6 +145,7 @@
       </div>
     </div>
     <hr/>
+
 </script>
 </#macro>
 
@@ -151,6 +155,7 @@
     {{for typicalTreeIds}}
         <input name="typicalTreeCheckBox" type="checkbox" checked value="{{>callTreeToken}}"/>典型调用链{{: #index}}&nbsp;
     {{/for}}
+
 </script>
 </#macro>
 
@@ -161,7 +166,8 @@
                 <td rowspan="{{>rowSpanCount}}" valign="middle">{{>traceLevelId}}</td>
             {{/if}}
             <td>
-                <span>{{>viewPoint}}</span>
+                <a href="javascript:typicalCallChainTreeViewPointPickUp('{{>nodeToken}}');">{{>viewPoint}}</a>
+                 <span style="display:none" id="{{>nodeToken}}TypicalCallChainViewPoint">{{>viewPointStr}}</span>
             </td>
             <td>{{>anlyResult.totalCall}}</td>
             <td>{{>anlyResult.correctNumber}}</td>
@@ -179,7 +185,35 @@
             <td>{{>anlyResult.averageCost}}ms
             <span id="{{>nodeToken}}" style="display:none">{{>anlyResultStr}}</span></td>
         </tr>
+
 </script>
 </#macro>
 
+<#macro typicalCallTreeViewPointPickUp>
+<div class="modal fade" id="typicalCallTreeViewPointPickUpModal" tabindex="-1" role="dialog" aria-labelledby="typicalCallTreeViewPointPickUpModal"
+     aria-hidden="true">
+    <div class="modal-dialog" role="document">
+        <div class="modal-dialog">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
+                            aria-hidden="true">&times;</span></button>
+                    <h4 class="modal-title">节点详情</h4>
+                </div>
+                <div class="modal-body">
+                    <div class="row">
+                        <div class="col-md-10">
+                            <label>viewpoint：</label><br/>
+                            <span style="word-wrap:break-word;" id="typicalCallTreeViewpointStr"></span>
+                        </div>
+                    </div>
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-primary" data-dismiss="modal">取消</button>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+</#macro>
 
diff --git a/skywalking-webui/src/main/webapp/pages/main.ftl b/skywalking-webui/src/main/webapp/pages/main.ftl
index 18be3eaf2..f9a88d42f 100644
--- a/skywalking-webui/src/main/webapp/pages/main.ftl
+++ b/skywalking-webui/src/main/webapp/pages/main.ftl
@@ -49,6 +49,7 @@
 <@anlyResult.typicalCallChainTreeTable/>
 <@anlyResult.typicalCallChainCheckBox/>
 <@anlyResult.viewPointPickUp/>
+<@anlyResult.typicalCallTreeViewPointPickUp/>
 <p id="baseUrl" style="display: none">${_base}</p>
 <div class="container" id="mainPanel">
     <p id="searchType" style="display: none">${searchType!''}</p>