From 3d1e3d2abd0d47d6403be984057b76f1100ee59f Mon Sep 17 00:00:00 2001 From: "hyojun.choi" Date: Fri, 28 Nov 2025 11:22:46 +0900 Subject: [PATCH] =?UTF-8?q?=ED=9A=8C=EB=A1=9C=EC=84=A4=EC=A0=95=20?= =?UTF-8?q?=EC=88=98=EB=8F=99=EC=84=A4=EC=A0=95=20=EC=B0=BD=ED=81=AC?= =?UTF-8?q?=EA=B8=B0=20=EC=A1=B0=EC=A0=88=20=EA=B4=80=EB=A0=A8=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../circuitTrestle/CircuitTrestleSetting.jsx | 16 ++- .../step/type/PassivityCircuitAllocation.jsx | 126 +++++++++--------- 2 files changed, 74 insertions(+), 68 deletions(-) diff --git a/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx b/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx index 002a2932..3827e116 100644 --- a/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx +++ b/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx @@ -799,17 +799,19 @@ export default function CircuitTrestleSetting({ id }) { onFold={() => setIsFold(!isFold)} /> -
-
-
{getMessage('modal.circuit.trestle.setting.power.conditional.select')}
- -
- {getMessage('modal.circuit.trestle.setting.circuit.allocation')}({getMessage('modal.circuit.trestle.setting.step.up.allocation')}) +
+
+
+
{getMessage('modal.circuit.trestle.setting.power.conditional.select')}
+ +
+ {getMessage('modal.circuit.trestle.setting.circuit.allocation')}({getMessage('modal.circuit.trestle.setting.step.up.allocation')}) +
{tabNum === 1 && allocationType === ALLOCATION_TYPE.AUTO && } {tabNum === 1 && allocationType === ALLOCATION_TYPE.PASSIVITY && ( - + )} {tabNum === 2 && }
diff --git a/src/components/floor-plan/modal/circuitTrestle/step/type/PassivityCircuitAllocation.jsx b/src/components/floor-plan/modal/circuitTrestle/step/type/PassivityCircuitAllocation.jsx index 8b880336..049efe10 100644 --- a/src/components/floor-plan/modal/circuitTrestle/step/type/PassivityCircuitAllocation.jsx +++ b/src/components/floor-plan/modal/circuitTrestle/step/type/PassivityCircuitAllocation.jsx @@ -1,7 +1,6 @@ import { GlobalDataContext } from '@/app/GlobalDataProvider' import { POLYGON_TYPE } from '@/common/common' import { useMasterController } from '@/hooks/common/useMasterController' -import { useModule } from '@/hooks/module/useModule' import { useCircuitTrestle } from '@/hooks/useCirCuitTrestle' import { useMessage } from '@/hooks/useMessage' import { useSwal } from '@/hooks/useSwal' @@ -11,7 +10,7 @@ import { fontSelector } from '@/store/fontAtom' import { selectedModuleState } from '@/store/selectedModuleOptions' import { circuitNumDisplaySelector } from '@/store/settingAtom' import { useContext, useEffect, useState } from 'react' -import { useRecoilState, useRecoilValue } from 'recoil' +import { useRecoilValue } from 'recoil' import { normalizeDigits } from '@/util/input-utils' export default function PassivityCircuitAllocation(props) { @@ -22,6 +21,7 @@ export default function PassivityCircuitAllocation(props) { getOptYn: getApiProps, getUseModuleItemList: getSelectedModuleList, getSelectModelList: getSelectModelList, + isFold, } = props const { swalFire } = useSwal() const { getMessage } = useMessage() @@ -497,73 +497,77 @@ export default function PassivityCircuitAllocation(props) { return ( <>
-
{getMessage('modal.circuit.trestle.setting.circuit.allocation')}
-
-
-
{getMessage('modal.circuit.trestle.setting.circuit.allocation.passivity')}
-
{getMessage('modal.circuit.trestle.setting.circuit.allocation.passivity.info')}
-
- {header && ( - - - - {header.map((header, index) => ( - +
+
{getMessage('modal.circuit.trestle.setting.circuit.allocation')}
+
+
+
{getMessage('modal.circuit.trestle.setting.circuit.allocation.passivity')}
+
{getMessage('modal.circuit.trestle.setting.circuit.allocation.passivity.info')}
+
+ {header && ( +
{header.name}
+ + + {header.map((header, index) => ( + + ))} + + + + {rows.map((row, index) => ( + + {header.map((header, i) => ( + + ))} + ))} - - - - {rows.map((row, index) => ( - + {header.map((header, i) => ( - ))} - ))} - - {header.map((header, i) => ( - - ))} - - -
{header.name}
+ {typeof row[header.prop] === 'number' + ? (row[header.prop] ?? 0).toLocaleString('ko-KR', { maximumFractionDigits: 4 }) + : (row[header.prop] ?? 0)} +
- {typeof row[header.prop] === 'number' - ? (row[header.prop] ?? 0).toLocaleString('ko-KR', { maximumFractionDigits: 4 }) - : (row[header.prop] ?? 0)} + + {footer[header.prop]}
- {footer[header.prop]} -
- )} + + + )} +
-
-
-
-
-
-
{getMessage('modal.circuit.trestle.setting.circuit.allocation.passivity.selected.power.conditional')}
-
-
- {selectedModels.map((model, index) => ( -
- setSelectedPcs(model)} - /> - +
+
+
+
+
+ {getMessage('modal.circuit.trestle.setting.circuit.allocation.passivity.selected.power.conditional')}
- ))} +
+
+ {selectedModels.map((model, index) => ( +
+ setSelectedPcs(model)} + /> + +
+ ))} +