From 30cbcd1b9549111f1435e5a3bdad64550067e486 Mon Sep 17 00:00:00 2001 From: Fine Date: Mon, 22 Aug 2022 10:16:16 +0800 Subject: [PATCH] fix selector --- src/views/dashboard/panel/Tool.vue | 63 +++++++++++------------------- 1 file changed, 22 insertions(+), 41 deletions(-) diff --git a/src/views/dashboard/panel/Tool.vue b/src/views/dashboard/panel/Tool.vue index 814d38f3..b0e72cbc 100644 --- a/src/views/dashboard/panel/Tool.vue +++ b/src/views/dashboard/panel/Tool.vue @@ -295,15 +295,12 @@ async function setSourceSelector() { return; } const pod = params.podId || selectorStore.pods[0].id; - let currentPod; - if (states.currentPod) { - currentPod = selectorStore.pods.find( - (d: { label: string }) => d.label === states.currentPod - ); - } else { - currentPod = selectorStore.pods.find((d: { id: string }) => d.id === pod); - } + const currentPod = selectorStore.pods.find( + (d: { id: string }) => d.id === pod + ); if (!currentPod) { + selectorStore.setCurrentProcess(null); + states.currentProcess = ""; return; } selectorStore.setCurrentPod(currentPod); @@ -314,16 +311,9 @@ async function setSourceSelector() { return; } const process = params.processId || selectorStore.processes[0].id; - let currentProcess; - if (states.currentProcess) { - currentProcess = selectorStore.processes.find( - (d: { label: string }) => d.label === states.currentProcess - ); - } else { - currentProcess = selectorStore.processes.find( - (d: { id: string }) => d.id === process - ); - } + const currentProcess = selectorStore.processes.find( + (d: { id: string }) => d.id === process + ); if (currentProcess) { selectorStore.setCurrentProcess(currentProcess); states.currentProcess = currentProcess.label; @@ -344,36 +334,27 @@ async function setDestSelector() { return; } const destPod = params.destPodId || selectorStore.destPods[0].id; - let currentDestPod = { label: "" }; - if (states.currentDestPod) { - currentDestPod = selectorStore.pods.find( - (d: { label: string }) => d.label === states.currentDestPod - ); - } else { - currentDestPod = selectorStore.destPods.find( - (d: { id: string }) => d.id === destPod - ); - } + const currentDestPod = selectorStore.destPods.find( + (d: { id: string }) => d.id === destPod + ); if (!currentDestPod) { + states.currentDestProcess = ""; + selectorStore.setCurrentProcess(null); return; } selectorStore.setCurrentDestPod(currentDestPod); states.currentDestPod = currentDestPod.label; const destProcess = params.destProcessId || selectorStore.destProcesses[0].id; - let currentDestProcess; - if (states.currentDestProcess) { - currentDestProcess = selectorStore.destProcesses.find( - (d: { label: string }) => d.label === states.currentProcess - ); - } else { - currentDestProcess = selectorStore.destProcesses.find( - (d: { id: string }) => d.id === destProcess - ); - } - if (currentDestProcess) { - selectorStore.setCurrentProcess(currentDestProcess); - states.currentProcess = currentDestProcess.label; + const currentDestProcess = selectorStore.destProcesses.find( + (d: { id: string }) => d.id === destProcess + ); + if (!currentDestProcess) { + states.currentDestProcess = ""; + selectorStore.setCurrentProcess(null); + return; } + selectorStore.setCurrentProcess(currentDestProcess); + states.currentDestProcess = currentDestProcess.label; } async function getServices() {