[incubator-skywalking-ui] branch fix/resources updated: Amend Topology map

[ha...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

hanahmily pushed a commit to branch fix/resources
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking-ui.git


The following commit(s) were added to refs/heads/fix/resources by this push:
     new e21cea9  Amend Topology map
e21cea9 is described below

commit e21cea9b8fefcdeec8febda22b724d7cbe172b93
Author: gaohongtao <ha...@gmail.com>
AuthorDate: Fri Mar 2 15:44:21 2018 +0800

    Amend Topology map
---
 mock/application.js                    |  2 +-
 src/components/Topology/AppTopology.js | 14 ++++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/mock/application.js b/mock/application.js
index 53e8699..a78d693 100644
--- a/mock/application.js
+++ b/mock/application.js
@@ -23,7 +23,7 @@ export default {
                   id: 1,
                   name: '@name',
                   'type|1': ['DUBBO', 'tomcat', 'SPRINGMVC'],
-                  'calls|1000-2000': 1,
+                  'callsPerSec|1000-2000': 1,
                   'sla|1-100.1-2': 1,
                   'apdex|0.2': 1,
                   'numOfServer|1-100': 1,
diff --git a/src/components/Topology/AppTopology.js b/src/components/Topology/AppTopology.js
index f960810..53b6ace 100644
--- a/src/components/Topology/AppTopology.js
+++ b/src/components/Topology/AppTopology.js
@@ -12,10 +12,11 @@ export default class AppTopology extends Base {
           'text-valign': 'bottom',
           'text-halign': 'center',
           'background-color': '#fff',
-          'border-width': 3,
-          'border-color': ele => (ele.data('isAlarm') ? 'red' : 'rgb(99, 160, 167)'),
+          'border-width': 10,
+          'border-color': ele => (ele.data('isAlarm') ? 'rgb(204, 0, 51)' : 'rgb(99, 160, 167)'),
           'font-family': 'Microsoft YaHei',
           label: 'data(name)',
+          'text-margin-y': 10,
         },
       },
       {
@@ -26,12 +27,13 @@ export default class AppTopology extends Base {
           'text-valign': 'bottom',
           'text-halign': 'center',
           'background-color': '#fff',
-          'background-image': ele => `img/node/${ele.data('type') ? ele.data('type') : 'UNDEFINED'}.png`,
+          'background-image': ele => `img/node/${ele.data('type') ? ele.data('type').toUpperCase() : 'UNDEFINED'}.png`,
           'background-width': '60%',
           'background-height': '60%',
-          'border-width': 1,
+          'border-width': 3,
           'font-family': 'Microsoft YaHei',
           label: 'data(name)',
+          'text-margin-y': 5,
         },
       },
       {
@@ -40,8 +42,8 @@ export default class AppTopology extends Base {
           'curve-style': 'bezier',
           'control-point-step-size': 100,
           'target-arrow-shape': 'triangle',
-          'target-arrow-color': ele => (ele.data('isAlarm') ? 'red' : 'rgb(147, 198, 174)'),
-          'line-color': ele => (ele.data('isAlarm') ? 'red' : 'rgb(147, 198, 174)'),
+          'target-arrow-color': ele => (ele.data('isAlarm') ? 'rgb(204, 0, 51)' : 'rgb(147, 198, 174)'),
+          'line-color': ele => (ele.data('isAlarm') ? 'rgb(204, 0, 51)' : 'rgb(147, 198, 174)'),
           width: 2,
           label: ele => `${ele.data('callType')} \n ${ele.data('callsPerSec')} tps / ${ele.data('avgResponseTime')} ms`,
           'text-wrap': 'wrap',

-- 
To stop receiving notification emails like this one, please contact
hanahmily@apache.org.