This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking-rocketbot-ui.git
The following commit(s) were added to refs/heads/master by this push:
new 98040b4 Fix language chinese & span error status (#146)
98040b4 is described below
commit 98040b4fa4504745d6de31687244b66a2793851a
Author: Allen Wang <[email protected]>
AuthorDate: Sat Aug 31 20:48:01 2019 +0800
Fix language chinese & span error status (#146)
1. Fix language chinese => english.
2. fix span error status display.
---
src/views/components/trace/d3-trace-tree.js | 11 ++---------
src/views/components/trace/trace-detail-chart-list.vue | 4 ++--
src/views/components/trace/trace-detail-chart-table.vue | 4 ++--
src/views/components/trace/trace-detail-chart-tree.vue | 4 ++--
4 files changed, 8 insertions(+), 15 deletions(-)
diff --git a/src/views/components/trace/d3-trace-tree.js
b/src/views/components/trace/d3-trace-tree.js
index 01ae7d3..fde9695 100644
--- a/src/views/components/trace/d3-trace-tree.js
+++ b/src/views/components/trace/d3-trace-tree.js
@@ -146,15 +146,8 @@ export default class TraceMap {
.attr("text-anchor", function(d) {
return d.children || d._children ? "end" : "start";
})
- .text(d => d.data.label.length > 19 ? d.data.label.slice(0, 19) + '...'
: d.data.label)
- .style("fill", '#3d444f');
- nodeEnter
- .append('text')
- .attr('x', -110)
- .attr("dy", "-0.5em")
- .attr('fill', '#E54C17')
- .attr('font-size', 10)
- .html(d => d.data.isError?'◉': '')
+ .text(d => d.data.label.length > 19 ? (d.data.isError?'◉ ': '') +
d.data.label.slice(0, 19) + '...' : (d.data.isError?'◉ ': '') + d.data.label)
+ .style("fill", d => !d.data.isError? '#3d444f': '#E54C17');
nodeEnter.append('text')
.attr('class','node-text')
.attr("x", function(d) {
diff --git a/src/views/components/trace/trace-detail-chart-list.vue
b/src/views/components/trace/trace-detail-chart-list.vue
index 72d745a..e36c788 100644
--- a/src/views/components/trace/trace-detail-chart-list.vue
+++ b/src/views/components/trace/trace-detail-chart-list.vue
@@ -147,7 +147,7 @@ export default {
if (index === -1) {
fixSpans.push(
{
- traceId: span.traceId, segmentId: span.segmentId, spanId:
span.spanId - 1, parentSpanId: span.spanId - 2, refs: [], endpointName:
`${span.segmentId}`, serviceCode: 'VirtualNode', type: 'Broken', peer: '',
component: `VirtualNode: #${span.spanId - 1}`, isError: true, isBroken: true,
layer: 'Broken', tags: [], logs: [],
+ traceId: span.traceId, segmentId: span.segmentId, spanId:
span.spanId - 1, parentSpanId: span.spanId - 2, refs: [], endpointName: `VNode:
${span.segmentId}`, serviceCode: 'VirtualNode', type: 'Broken', peer: '',
component: `VirtualNode: #${span.spanId - 1}`, isError: true, isBroken: true,
layer: 'Broken', tags: [], logs: [],
},
);
}
@@ -161,7 +161,7 @@ export default {
for (let i = 0; i <= ref.parentSpanId; i += 1) {
fixSpans.push(
{
- traceId: ref.traceId, segmentId: ref.parentSegmentId,
spanId: i, parentSpanId: i - 1, refs: [], endpointName:
`${ref.parentSegmentId}`, serviceCode: 'VirtualNode', type: 'Broken', peer: '',
component: `VirtualNode: #${i}`, isError: true, isBroken: true, layer:
'Broken', tags: [], logs: [],
+ traceId: ref.traceId, segmentId: ref.parentSegmentId,
spanId: i, parentSpanId: i - 1, refs: [], endpointName: `VNode:
${ref.parentSegmentId}`, serviceCode: 'VirtualNode', type: 'Broken', peer: '',
component: `VirtualNode: #${i}`, isError: true, isBroken: true, layer:
'Broken', tags: [], logs: [],
},
);
}
diff --git a/src/views/components/trace/trace-detail-chart-table.vue
b/src/views/components/trace/trace-detail-chart-table.vue
index d973d3a..59e95fb 100644
--- a/src/views/components/trace/trace-detail-chart-table.vue
+++ b/src/views/components/trace/trace-detail-chart-table.vue
@@ -151,7 +151,7 @@ export default {
if (index === -1) {
fixSpans.push(
{
- traceId: span.traceId, segmentId: span.segmentId, spanId:
span.spanId - 1, parentSpanId: span.spanId - 2, refs: [], endpointName:
`${span.segmentId}`, serviceCode: '虚拟节点', type: 'Broken', peer: '', component:
`虚拟节点: #${span.spanId - 1}`, isError: true, isBroken: true, layer: '断链', tags:
[], logs: [],
+ traceId: span.traceId, segmentId: span.segmentId, spanId:
span.spanId - 1, parentSpanId: span.spanId - 2, refs: [], endpointName: `VNode:
${span.segmentId}`, serviceCode: 'VirtualNode', type: 'Broken', peer: '',
component: `VirtualNode: #${span.spanId - 1}`, isError: true, isBroken: true,
layer: 'Broken', tags: [], logs: [],
},
);
}
@@ -165,7 +165,7 @@ export default {
for (let i = 0; i <= ref.parentSpanId; i += 1) {
fixSpans.push(
{
- traceId: ref.traceId, segmentId: ref.parentSegmentId,
spanId: i, parentSpanId: i - 1, refs: [], endpointName:
`${ref.parentSegmentId}`, serviceCode: '虚拟节点', type: 'Broken', peer: '',
component: `虚拟节点: #${i}`, isError: true, isBroken: true, layer: '断链', tags: [],
logs: [],
+ traceId: ref.traceId, segmentId: ref.parentSegmentId,
spanId: i, parentSpanId: i - 1, refs: [], endpointName: `VNode:
${ref.parentSegmentId}`, serviceCode: 'VirtualNode', type: 'Broken', peer: '',
component: `VirtualNode: #${i}`, isError: true, isBroken: true, layer:
'Broken', tags: [], logs: [],
},
);
}
diff --git a/src/views/components/trace/trace-detail-chart-tree.vue
b/src/views/components/trace/trace-detail-chart-tree.vue
index ac085f1..3ff4dd2 100644
--- a/src/views/components/trace/trace-detail-chart-tree.vue
+++ b/src/views/components/trace/trace-detail-chart-tree.vue
@@ -128,7 +128,7 @@ export default {
if (index === -1) {
fixSpans.push(
{
- traceId: span.traceId, segmentId: span.segmentId, spanId:
span.spanId - 1, parentSpanId: span.spanId - 2, refs: [], endpointName:
`${span.segmentId}`, serviceCode: '虚拟节点', type: 'Broken', peer: '', component:
`虚拟节点: #${span.spanId - 1}`, isError: true, isBroken: true, layer: '断链', tags:
[], logs: [],
+ traceId: span.traceId, segmentId: span.segmentId, spanId:
span.spanId - 1, parentSpanId: span.spanId - 2, refs: [], endpointName:
`${span.segmentId}`, serviceCode: 'VirtualNode', type: 'Broken', peer: '',
component: `VirtualNode: #${span.spanId - 1}`, isError: true, isBroken: true,
layer: 'Broken', tags: [], logs: [],
},
);
}
@@ -142,7 +142,7 @@ export default {
for (let i = 0; i <= ref.parentSpanId; i += 1) {
fixSpans.push(
{
- traceId: ref.traceId, segmentId: ref.parentSegmentId,
spanId: i, parentSpanId: i - 1, refs: [], endpointName:
`${ref.parentSegmentId}`, serviceCode: '虚拟节点', type: 'Broken', peer: '',
component: `虚拟节点: #${i}`, isError: true, isBroken: true, layer: '断链', tags: [],
logs: [],
+ traceId: ref.traceId, segmentId: ref.parentSegmentId,
spanId: i, parentSpanId: i - 1, refs: [], endpointName:
`${ref.parentSegmentId}`, serviceCode: 'VirtualNode', type: 'Broken', peer: '',
component: `VirtualNode: #${i}`, isError: true, isBroken: true, layer:
'Broken', tags: [], logs: [],
},
);
}
