From ce585d6e08b513c2019f9760ffb3323a8c3ead50 Mon Sep 17 00:00:00 2001 From: Fine0830 Date: Fri, 14 Apr 2023 10:35:30 +0800 Subject: [PATCH] feat: set default value for `showSymbol` in the line graph (#258) --- .../dashboard/configuration/widget/graph-styles/Line.vue | 3 ++- src/views/dashboard/data.ts | 2 +- src/views/dashboard/graphs/Line.vue | 6 +++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/views/dashboard/configuration/widget/graph-styles/Line.vue b/src/views/dashboard/configuration/widget/graph-styles/Line.vue index ff92b8ce..5f421eb3 100644 --- a/src/views/dashboard/configuration/widget/graph-styles/Line.vue +++ b/src/views/dashboard/configuration/widget/graph-styles/Line.vue @@ -50,12 +50,13 @@ limitations under the License. --> import { useI18n } from "vue-i18n"; import { useDashboardStore } from "@/store/modules/dashboard"; import Legend from "./components/Legend.vue"; + import { isDef } from "@/utils/is"; const { t } = useI18n(); const dashboardStore = useDashboardStore(); const graph = computed(() => dashboardStore.selectedGrid.graph || {}); const smooth = ref(graph.value.smooth); - const showSymbol = ref(graph.value.showSymbol); + const showSymbol = ref(isDef(graph.value.showSymbol) ? graph.value.showSymbol : true); const step = ref(graph.value.step); function updateConfig(param: { [key: string]: unknown }) { diff --git a/src/views/dashboard/data.ts b/src/views/dashboard/data.ts index 2ab85dce..3e68f50e 100644 --- a/src/views/dashboard/data.ts +++ b/src/views/dashboard/data.ts @@ -65,7 +65,7 @@ export const DefaultGraphConfig: { [key: string]: any } = { type: "Line", step: false, smooth: false, - showSymbol: false, + showSymbol: true, showXAxis: true, showYAxis: true, }, diff --git a/src/views/dashboard/graphs/Line.vue b/src/views/dashboard/graphs/Line.vue index 7df33dc7..b35e142a 100644 --- a/src/views/dashboard/graphs/Line.vue +++ b/src/views/dashboard/graphs/Line.vue @@ -30,6 +30,7 @@ limitations under the License. --> import type { LineConfig, EventParams, RelatedTrace, Filters } from "@/types/dashboard"; import Legend from "./components/Legend.vue"; import useLegendProcess from "@/hooks/useLegendProcessor"; + import { isDef } from "@/utils/is"; /*global defineProps, defineEmits */ const emits = defineEmits(["click"]); @@ -72,9 +73,8 @@ limitations under the License. --> data: props.data[i].map((item: any, itemIndex: number) => [props.intervalTime[itemIndex], item]), name: i, type: "line", - symbol: "circle", - symbolSize: 8, - showSymbol: props.config.showSymbol, + symbolSize: 5, + showSymbol: isDef(props.config.showSymbol) ? props.config.showSymbol : true, step: props.config.step, smooth: props.config.smooth, lineStyle: {