github/skywalking-booster-ui
3
0
Fork 1
mirror of https://github.com/apache/skywalking-booster-ui.git synced 2025-10-15 04:09:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: enhance the legend of metrics graph widget with the summary table (#181)

Browse Source
This commit is contained in:
Fine0830
2022-11-10 14:55:19 +08:00
committed by GitHub
parent fd46211a37
commit b37d65eaac
29 changed files with 595 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/views/dashboard/graphs/Area.vue
View File

@@ -44,7 +44,8 @@ defineProps({
AreaConfig & {
filters: Filters;
relatedTrace: RelatedTrace;
} & { id: string }
id: string;
}
>,
default: () => ({}),
},

50
src/views/dashboard/graphs/Bar.vue
View File

@@ -13,7 +13,10 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License. -->
<template>
<Graph :option="option" @select="clickEvent" :filters="config.filters" />
<div class="graph" :class="isRight ? 'flex-h' : 'flex-v'">
<Graph :option="option" @select="clickEvent" :filters="config.filters" />
<Legend :config="config.legend" :data="data" :intervalTime="intervalTime" />
</div>
</template>
<script lang="ts" setup>
import { computed } from "vue";
@@ -24,6 +27,7 @@ import {
RelatedTrace,
Filters,
} from "@/types/dashboard";
import useLegendProcess from "@/hooks/useLegendProcessor";
/*global defineProps, defineEmits */
const emits = defineEmits(["click"]);
@@ -39,11 +43,15 @@ const props = defineProps({
BarConfig & {
filters: Filters;
relatedTrace: RelatedTrace;
} & { id: string }
id: string;
}
>,
default: () => ({}),
},
});
const { showEchartsLegend, isRight, chartColors } = useLegendProcess(
props.config.legend
);
const option = computed(() => getOption());
function getOption() {
@@ -73,35 +81,7 @@ function getOption() {
},
};
});
let color: string[] = [];
switch (keys.length) {
case 2:
color = ["#FF6A84", "#a0b1e6"];
break;
case 1:
color = ["#3f96e3"];
break;
default:
color = [
"#30A4EB",
"#45BFC0",
"#FFCC55",
"#FF6A84",
"#a0a7e6",
"#c23531",
"#2f4554",
"#61a0a8",
"#d48265",
"#91c7ae",
"#749f83",
"#ca8622",
"#bda29a",
"#6e7074",
"#546570",
"#c4ccd3",
];
break;
}
const color: string[] = chartColors(keys);
return {
color,
tooltip: {
@@ -114,7 +94,7 @@ function getOption() {
},
legend: {
type: "scroll",
show: keys.length === 1 ? false : true,
show: showEchartsLegend(keys),
icon: "circle",
top: 0,
left: 0,
@@ -160,3 +140,9 @@ function clickEvent(params: EventParams) {
emits("click", params);
}
</script>
<style lang="scss" scoped>
.graph {
width: 100%;
height: 100%;
}
</style>

5
src/views/dashboard/graphs/EndpointList.vue
View File

@@ -66,7 +66,10 @@ import type { PropType } from "vue";
import { EndpointListConfig } from "@/types/dashboard";
import { Endpoint } from "@/types/selector";
import { useDashboardStore } from "@/store/modules/dashboard";
import { useQueryPodsMetrics, usePodsSource } from "@/hooks/useProcessor";
import {
useQueryPodsMetrics,
usePodsSource,
} from "@/hooks/useMetricsProcessor";
import { EntityType } from "../data";
import router from "@/router";
import getDashboard from "@/hooks/useDashboardsSession";

5
src/views/dashboard/graphs/InstanceList.vue
View File

@@ -95,7 +95,10 @@ import { useSelectorStore } from "@/store/modules/selectors";
import { useDashboardStore } from "@/store/modules/dashboard";
import { InstanceListConfig } from "@/types/dashboard";
import { Instance } from "@/types/selector";
import { useQueryPodsMetrics, usePodsSource } from "@/hooks/useProcessor";
import {
useQueryPodsMetrics,
usePodsSource,
} from "@/hooks/useMetricsProcessor";
import { EntityType } from "../data";
import router from "@/router";
import getDashboard from "@/hooks/useDashboardsSession";

67
src/views/dashboard/graphs/Line.vue
View File

@@ -13,15 +13,18 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License. -->
<template>
<Graph
:option="option"
@select="clickEvent"
:filters="config.filters"
:relatedTrace="config.relatedTrace"
/>
<div class="graph flex-v" :class="setRight ? 'flex-h' : 'flex-v'">
<Graph
:option="option"
@select="clickEvent"
:filters="config.filters"
:relatedTrace="config.relatedTrace"
/>
<Legend :config="config.legend" :data="data" :intervalTime="intervalTime" />
</div>
</template>
<script lang="ts" setup>
import { computed } from "vue";
import { computed, ref } from "vue";
import type { PropType } from "vue";
import {
LineConfig,
@@ -29,6 +32,8 @@ import {
RelatedTrace,
Filters,
} from "@/types/dashboard";
import Legend from "./components/Legend.vue";
import useLegendProcess from "@/hooks/useLegendProcessor";
/*global defineProps, defineEmits */
const emits = defineEmits(["click"]);
@@ -44,7 +49,8 @@ const props = defineProps({
LineConfig & {
filters?: Filters;
relatedTrace?: RelatedTrace;
} & { id?: string }
id?: string;
}
>,
default: () => ({
step: false,
@@ -58,8 +64,13 @@ const props = defineProps({
}),
},
});
const setRight = ref<boolean>(false);
const option = computed(() => getOption());
function getOption() {
const { showEchartsLegend, isRight, chartColors } = useLegendProcess(
props.config.legend
);
setRight.value = isRight;
const keys = Object.keys(props.data || {}).filter(
(i: any) => Array.isArray(props.data[i]) && props.data[i].length
);
@@ -88,35 +99,7 @@ function getOption() {
}
return serie;
});
let color: string[] = [];
switch (keys.length) {
case 2:
color = ["#FF6A84", "#a0b1e6"];
break;
case 1:
color = ["#3f96e3"];
break;
default:
color = [
"#30A4EB",
"#45BFC0",
"#FFCC55",
"#FF6A84",
"#a0a7e6",
"#c23531",
"#2f4554",
"#61a0a8",
"#d48265",
"#91c7ae",
"#749f83",
"#ca8622",
"#bda29a",
"#6e7074",
"#546570",
"#c4ccd3",
];
break;
}
const color: string[] = chartColors(keys);
const tooltip = {
trigger: "none",
axisPointer: {
@@ -151,7 +134,7 @@ function getOption() {
tooltip: props.config.smallTips ? tips : tooltip,
legend: {
type: "scroll",
show: keys.length === 1 ? false : true,
show: showEchartsLegend(keys),
icon: "circle",
top: 0,
left: 0,
@@ -167,7 +150,7 @@ function getOption() {
},
},
grid: {
top: keys.length === 1 ? 15 : 55,
top: showEchartsLegend(keys) ? 35 : 10,
left: 0,
right: 10,
bottom: 5,
@@ -205,3 +188,9 @@ function clickEvent(params: EventParams) {
emits("click", params);
}
</script>
<style lang="scss" scoped>
.graph {
width: 100%;
height: 100%;
}
</style>

5
src/views/dashboard/graphs/ServiceList.vue
View File

@@ -93,7 +93,10 @@ import { useSelectorStore } from "@/store/modules/selectors";
import { useDashboardStore } from "@/store/modules/dashboard";
import { useAppStoreWithOut } from "@/store/modules/app";
import { Service } from "@/types/selector";
import { useQueryPodsMetrics, usePodsSource } from "@/hooks/useProcessor";
import {
useQueryPodsMetrics,
usePodsSource,
} from "@/hooks/useMetricsProcessor";
import { EntityType } from "../data";
import router from "@/router";
import getDashboard from "@/hooks/useDashboardsSession";

175
src/views/dashboard/graphs/components/Legend.vue Normal file
View File

@@ -0,0 +1,175 @@
<!-- Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License. -->
<template>
<div
v-if="tableData.length && config.asTable"
role="region"
aria-labelledby="caption"
tabindex="0"
:style="`width: ${width}; maxHeight:${isRight ? '100%' : 130}`"
class="scroll_bar_style"
>
<table>
<thead>
<tr>
<th></th>
<th v-for="h in headerRow" :key="h.value">
{{ h.label }}
</th>
</tr>
</thead>
<tbody>
<tr v-for="(item, index) in tableData" :key="index">
<th>
<el-popover placement="bottom" :width="230" trigger="click">
<template #reference>
<div class="name">
<Icon iconName="circle" :style="`color: ${colors[index]};`" />
<i>{{ item.name }}</i>
</div>
</template>
<div class="list">
<div class="value">
<span>{{ t("key") }}</span>
<span>{{ t("value") }}</span>
</div>
<div class="value" v-for="(d, index) in item.topN" :key="index">
<span>{{ d.key }}</span>
<span>{{ d.value }}</span>
</div>
</div>
</el-popover>
</th>
<td v-for="h in headerRow" :key="h.value">
{{ item[h.value] }}
</td>
</tr>
</tbody>
</table>
</div>
</template>
<script lang="ts" setup>
import { computed } from "vue";
import type { PropType } from "vue";
import { useI18n } from "vue-i18n";
import { LegendOptions } from "@/types/dashboard";
import useLegendProcess from "@/hooks/useLegendProcessor";
/*global defineProps */
const props = defineProps({
data: {
type: Object as PropType<{ [key: string]: number[] }>,
default: () => ({}),
},
config: {
type: Object as PropType<LegendOptions>,
default: () => ({}),
},
intervalTime: { type: Array as PropType<string[]>, default: () => [] },
});
const { t } = useI18n();
const tableData: any = computed(() => {
const { aggregations } = useLegendProcess(props.config);
return aggregations(props.data, props.intervalTime).source;
});
const headerRow = computed(() => {
const { aggregations } = useLegendProcess(props.config);
return aggregations(props.data, props.intervalTime).headers;
});
const isRight = computed(() => useLegendProcess(props.config).isRight);
const width = computed(() =>
props.config.width
? props.config.width + "px"
: isRight.value
? "150px"
: "100%"
);
const colors = computed(() => {
const keys = Object.keys(props.data || {}).filter(
(i: any) => Array.isArray(props.data[i]) && props.data[i].length
);
const { chartColors } = useLegendProcess(props.config);
return chartColors(keys);
});
</script>
<style lang="scss" scoped>
table {
font-size: 12px;
white-space: nowrap;
margin: 0;
border: none;
border-collapse: separate;
border-spacing: 0;
table-layout: fixed;
}
table th {
padding: 5px;
}
table thead th {
position: sticky;
top: 0;
z-index: 1;
width: 25vw;
background: #fff;
}
.name {
cursor: pointer;
}
table td {
padding: 5px;
text-align: center;
}
table thead th:first-child {
position: sticky;
left: 0;
z-index: 2;
}
table tbody th {
font-weight: bold;
font-style: italic;
text-align: left;
background: #fff;
position: sticky;
left: 0;
z-index: 1;
}
[role="region"][aria-labelledby][tabindex] {
overflow: auto;
}
i {
font-style: normal;
}
.value {
span {
display: inline-block;
padding: 5px;
width: 80px;
}
}
.list {
height: 360px;
overflow: auto;
}
</style>