From ab0805689f11635be45c40e5181ecebfd02871be Mon Sep 17 00:00:00 2001 From: harukin-OneMix4 Date: Thu, 25 Jan 2024 23:05:31 +0900 Subject: [PATCH] =?UTF-8?q?=E3=83=80=E3=82=A4=E3=83=A4=E7=B5=90=E5=90=88?= =?UTF-8?q?=E5=87=A6=E7=90=86=E3=82=92=E5=BC=B7=E5=8C=96=E3=80=81=E4=B8=80?= =?UTF-8?q?=E9=83=A8=E3=81=AE=E5=88=97=E8=BB=8A=E3=81=A7=E7=B5=90=E5=90=88?= =?UTF-8?q?=E3=81=8C=E5=B4=A9=E3=82=8C=E3=81=A6=E3=81=84=E3=81=9F=E5=95=8F?= =?UTF-8?q?=E9=A1=8C=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ActionSheetComponents/EachTrainInfo.js | 69 ++++++++++++++----- 1 file changed, 50 insertions(+), 19 deletions(-) diff --git a/components/ActionSheetComponents/EachTrainInfo.js b/components/ActionSheetComponents/EachTrainInfo.js index 0f2a902..b90b6b2 100644 --- a/components/ActionSheetComponents/EachTrainInfo.js +++ b/components/ActionSheetComponents/EachTrainInfo.js @@ -110,25 +110,56 @@ export const EachTrainInfo = (props) => { ? "tail" : "middle"; console.log(relationSub); - if (relationSub === "head") { - const migrationTrainData = [ - ...trainData.slice(0, currentTrainIndex), - ...showNearTrain, - ]; - setTrainData(migrationTrainData); - } else if (relationSub === "tail") { - const migrationTrainData = [ - ...showNearTrain.slice(0, showNearTrain.length - 1), - ...trainData.slice(currentTrainIndex), - ]; - setTrainData(migrationTrainData); - } else if (relationSub === "middle") { - const migrationTrainData = [ - ...trainData.slice(0, currentTrainIndex), - ...showNearTrain.slice(0, subTrainStationPosition), - ...trainData.slice(currentTrainIndex), - ]; - setTrainData(migrationTrainData); + switch (relationMain) { + case "head": + if (relationSub == "head") { + break; + } else if (relationSub == "tail") { + const migrationTrainData = [ + ...showNearTrain.slice(0, subTrainStationPosition), + ...trainData, + ]; + setTrainData(migrationTrainData); + } else if (relationSub == "middle") { + const migrationTrainData = [ + ...showNearTrain.slice(0, subTrainStationPosition), + ...trainData, + ]; + setTrainData(migrationTrainData); + } + break; + case "tail": + if (relationSub == "head") { + const migrationTrainData = [ + ...trainData.slice(0, mainTrainStationPosition), + ...showNearTrain, + ]; + setTrainData(migrationTrainData); + } else if (relationSub == "tail") { + break; + } else if (relationSub == "middle") { + const migrationTrainData = [ + ...trainData.slice(0, mainTrainStationPosition), + ...showNearTrain.slice(subTrainStationPosition), + ]; + setTrainData(migrationTrainData); + } + break; + case "middle": + if (relationSub == "head") { + const migrationTrainData = [ + ...trainData.slice(0, mainTrainStationPosition), + ...showNearTrain, + ]; + setTrainData(migrationTrainData); + } else if (relationSub == "tail") { + const migrationTrainData = [ + ...showNearTrain.slice(0, subTrainStationPosition), + ...trainData.slice(mainTrainStationPosition), + ]; + setTrainData(migrationTrainData); + } + break; } setIsConcatNear(true); };