From 43093302902af2fe70bbee337c5249cafb6f5e8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=8B=9D?= <43837214+Minsiki@users.noreply.github.com> Date: Tue, 21 Jan 2025 16:29:35 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=EC=9E=90=EB=8F=99=20=ED=9A=8C=EB=A1=9C?= =?UTF-8?q?=ED=95=A0=EB=8B=B9=20=EA=B0=9C=EB=B0=9C=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/common/select/QSelectBox.jsx | 6 +- .../circuitTrestle/CircuitTrestleSetting.jsx | 16 +- .../step/PowerConditionalSelect.jsx | 20 +- .../modal/circuitTrestle/step/StepUp.jsx | 28 ++- .../step/type/PassivityCircuitAllocation.jsx | 208 ++++++++++-------- .../modal/panelBatch/PanelBatchStatistics.jsx | 5 +- src/hooks/module/useModuleBasicSetting.js | 12 +- src/hooks/module/useModulePlace.js | 1 + src/locales/ja.json | 6 + src/locales/ko.json | 1 + src/store/circuitTrestleAtom.js | 1 + src/util/common-utils.js | 4 + 12 files changed, 186 insertions(+), 122 deletions(-) diff --git a/src/components/common/select/QSelectBox.jsx b/src/components/common/select/QSelectBox.jsx index bd888ac3..12c72b5e 100644 --- a/src/components/common/select/QSelectBox.jsx +++ b/src/components/common/select/QSelectBox.jsx @@ -75,7 +75,11 @@ export default function QSelectBox({ useOnClickOutside(ref, handleClose) return ( -
{} : () => setOpenSelect(!openSelect)}> +
{} : () => setOpenSelect(!openSelect)} + >

{selected}

{tabNum === 1 && allocationType === ALLOCATION_TYPE.AUTO && } - {tabNum === 1 && allocationType === ALLOCATION_TYPE.PASSIVITY && } - {tabNum === 2 && } + {tabNum === 1 && allocationType === ALLOCATION_TYPE.PASSIVITY && } + {tabNum === 2 && } {tabNum === 1 && allocationType === ALLOCATION_TYPE.AUTO && (