diff --git a/src/components/Graph.vue b/src/components/Graph.vue index 217831b7..a694cdeb 100644 --- a/src/components/Graph.vue +++ b/src/components/Graph.vue @@ -53,6 +53,9 @@ const available = computed( (Array.isArray(props.option.series.data) && props.option.series.data[0]) ); onMounted(async () => { + if (!available.value) { + return; + } await setOptions(props.option); chartRef.value && addResizeListener(unref(chartRef), resize); setTimeout(() => { @@ -70,6 +73,9 @@ onMounted(async () => { watch( () => props.option, (newVal, oldVal) => { + if (!available.value) { + return; + } if (JSON.stringify(newVal) === JSON.stringify(oldVal)) { return; } diff --git a/src/views/dashboard/panel/Tool.vue b/src/views/dashboard/panel/Tool.vue index ab91a37e..6d5f84af 100644 --- a/src/views/dashboard/panel/Tool.vue +++ b/src/views/dashboard/panel/Tool.vue @@ -169,7 +169,6 @@ const key = computed(() => { const type = EntityType.find( (d: Option) => d.value === dashboardStore.entity ); - return (type && type.key) || 0; }); @@ -268,9 +267,9 @@ async function setDestSelector() { return; } const destPod = params.destPodId || selectorStore.destPods[0].id; - const currentDestPod = selectorStore.destPods.filter( + const currentDestPod = selectorStore.destPods.find( (d: { id: string }) => d.id === destPod - )[0]; + ); if (currentDestPod) { selectorStore.setCurrentDestPod(currentDestPod); states.currentDestPod = currentDestPod.label; @@ -278,7 +277,7 @@ async function setDestSelector() { } async function getServices() { - if (key.value === 10 || key.value === 0) { + if (key.value === 10) { return; } if (!dashboardStore.layerId) {