From 139f629483c2fa65d6ac4c6ad3ae847a87964858 Mon Sep 17 00:00:00 2001
From: ascrutae <ascrutae@gmail.com>
Date: Sun, 22 May 2016 23:25:51 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E5=88=86=E9=A1=B5=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E4=B8=8B=E4=B8=80=E9=A1=B5=E6=8A=A5=E9=94=99=E7=9A=84?=
 =?UTF-8?q?bug=202.=20=E4=BF=AE=E5=A4=8D=E7=82=B9=E5=87=BBmore=E4=B8=8D?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../skywalking/web/util/ViewPointBeautiUtil.java   |  4 +++-
 .../skywalking/js/analysisSearchResult.js          | 14 ++++++++++++--
 .../pages/anls-result/analysisSearchResult.ftl     |  2 +-
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/skywalking-webui/src/main/java/com/ai/cloud/skywalking/web/util/ViewPointBeautiUtil.java b/skywalking-webui/src/main/java/com/ai/cloud/skywalking/web/util/ViewPointBeautiUtil.java
index 640ce4304c..5ca2f1034d 100644
--- a/skywalking-webui/src/main/java/com/ai/cloud/skywalking/web/util/ViewPointBeautiUtil.java
+++ b/skywalking-webui/src/main/java/com/ai/cloud/skywalking/web/util/ViewPointBeautiUtil.java
@@ -58,7 +58,9 @@ public class ViewPointBeautiUtil {
             result.append(viewPoint.substring(viewPoint.length() - 40, viewPoint.length() - 20));
             result.append("....");
         } else {
-            result.append(viewPoint.substring(startSize, viewPoint.length() - 10));
+            if (viewPoint.length() - 10 >=  startSize) {
+                result.append(viewPoint.substring(startSize, viewPoint.length() - 10));
+            }
         }
         return result.toString();
     }
diff --git a/skywalking-webui/src/main/webapp/bower_components/skywalking/js/analysisSearchResult.js b/skywalking-webui/src/main/webapp/bower_components/skywalking/js/analysisSearchResult.js
index 005c15537f..601ac32175 100644
--- a/skywalking-webui/src/main/webapp/bower_components/skywalking/js/analysisSearchResult.js
+++ b/skywalking-webui/src/main/webapp/bower_components/skywalking/js/analysisSearchResult.js
@@ -4,15 +4,25 @@ function toSearchAnlyResult(searchKey) {
 
 function bindPagerBtn() {
     $("#doPreviousPageBtn").click(function () {
+        var searchKey = $("#searchKey").val();
+        var index = searchKey.indexOf(':');
+        if (index != -1) {
+            searchKey = searchKey.substr(index + 1);
+        }
         var pageSize = $("#pageSize").val();
         $("#anlyResultmPanel").empty();
-        loadAnalyResult(parseInt(pageSize) - 1);
+        loadAnalyResult(searchKey,parseInt(pageSize) - 1);
     });
 
     $("#doNextPageBtn").click(function () {
+        var searchKey = $("#searchKey").val();
+        var index = searchKey.indexOf(':');
+        if (index != -1) {
+            searchKey = searchKey.substr(index + 1);
+        }
         var pageSize = $("#pageSize").val();
         $("#anlyResultmPanel").empty();
-        loadAnalyResult(parseInt(pageSize) + 1);
+        loadAnalyResult(searchKey,parseInt(pageSize) + 1);
     });
 }
 
diff --git a/skywalking-webui/src/main/webapp/pages/anls-result/analysisSearchResult.ftl b/skywalking-webui/src/main/webapp/pages/anls-result/analysisSearchResult.ftl
index 98e82133e5..ce4acf0046 100644
--- a/skywalking-webui/src/main/webapp/pages/anls-result/analysisSearchResult.ftl
+++ b/skywalking-webui/src/main/webapp/pages/anls-result/analysisSearchResult.ftl
@@ -35,7 +35,7 @@
          text-danger
          {{/if}}
          "><strong>{{>correctRate}}%</strong></span>
-         <a class="pull-right"><ins>more</ins></a></p>
+         <a class="pull-right" href="${_base}/mainPage?loadType=showAnalysisResult&key=analysisresult:{{>treeId}}"><ins>more</ins></a></p>
          <hr/>
     </div>
 </script>
-- 
GitLab