From 41216893a1666efac2b2b795336e99971be78f15 Mon Sep 17 00:00:00 2001 From: Hide_D Date: Sun, 23 Apr 2023 16:53:17 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20=EA=B0=90=EC=B0=B0=EB=B6=80=20=EB=8C=80?= =?UTF-8?q?=EC=83=81=20API=20=EC=88=9C=EC=84=9C=EC=97=90=20=EB=94=B0?= =?UTF-8?q?=EB=9D=BC=20=EC=9E=98=EB=AA=BB=20=ED=91=9C=EA=B8=B0=20=EB=90=98?= =?UTF-8?q?=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20-=20API=20=EA=B2=B0=EA=B3=BC?= =?UTF-8?q?=EA=B0=92=EA=B3=BC=20=ED=98=84=EC=9E=AC=20=EB=8C=80=EC=83=81=20?= =?UTF-8?q?=EB=B9=84=EA=B5=90=ED=95=98=EB=8A=94=20=EC=BD=94=EB=93=9C=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hwe/ts/PageBattleCenter.vue | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/hwe/ts/PageBattleCenter.vue b/hwe/ts/PageBattleCenter.vue index 8e462e67..527636be 100644 --- a/hwe/ts/PageBattleCenter.vue +++ b/hwe/ts/PageBattleCenter.vue @@ -130,12 +130,12 @@ const targetGeneralLogs = ref(); const nationInfo = ref(); -watch([generalList, targetGeneralID], async ([generalList, targetGeneralID]) => { - if (targetGeneralID === undefined) { +watch([generalList, targetGeneralID], async ([generalList, generalID]) => { + if (!generalID) { targetGeneral.value = undefined; return; } - targetGeneral.value = generalList.get(targetGeneralID); + targetGeneral.value = generalList.get(generalID); const logs: GeneralLogs = { generalHistory: new Map(), @@ -148,8 +148,12 @@ watch([generalList, targetGeneralID], async ([generalList, targetGeneralID]) => for (const reqType of ["generalHistory", "battleResult", "battleDetail", "generalAction"] as const) { waiter.push( - SammoAPI.Nation.GetGeneralLog({ generalID: targetGeneralID, reqType }).then( + SammoAPI.Nation.GetGeneralLog({ generalID: generalID, reqType }).then( (res) => { + if(res.generalID !== targetGeneralID.value){ + return; + } + const rawLogs: [number, string][] = Object.entries(res.log).map(([key, value]) => [ Number(key), formatLog(value),