diff --git a/src/components/floor-plan/modal/basic/BasicSetting.jsx b/src/components/floor-plan/modal/basic/BasicSetting.jsx index a70b9a22..ac2b3ca4 100644 --- a/src/components/floor-plan/modal/basic/BasicSetting.jsx +++ b/src/components/floor-plan/modal/basic/BasicSetting.jsx @@ -1,4 +1,4 @@ -import { POLYGON_TYPE, MODULE_SETUP_TYPE } from '@/common/common' +import { MODULE_SETUP_TYPE, POLYGON_TYPE } from '@/common/common' import WithDraggable from '@/components/common/draggable/WithDraggable' import { Orientation } from '@/components/floor-plan/modal/basic/step/Orientation' import PitchPlacement from '@/components/floor-plan/modal/basic/step/pitch/PitchPlacement' @@ -74,6 +74,7 @@ export default function BasicSetting({ id, pos = { x: 50, y: 230 } }) { const { trigger: trestleTrigger } = useCanvasPopupStatusController(2) const { trigger: placementTrigger } = useCanvasPopupStatusController(3) const [roofsStore, setRoofsStore] = useRecoilState(roofsState) + const [isFold, setIsFold] = useState(false) // const { initEvent } = useContext(EventContext) const { manualModuleSetup, autoModuleSetup, manualFlatroofModuleSetup, autoFlatroofModuleSetup, manualModuleLayoutSetup, restoreModuleInstArea } = @@ -282,35 +283,42 @@ export default function BasicSetting({ id, pos = { x: 50, y: 230 } }) { return ( - handleClosePopup(id)} /> + handleClosePopup(id)} + onFold={() => setIsFold(!isFold)} + /> -
-
{getMessage('modal.module.basic.setting.orientation.setting')}
- - {basicSetting.roofSizeSet && basicSetting.roofSizeSet != '3' && ( - <> -
{getMessage('modal.module.basic.setting.module.setting')}
- -
{getMessage('modal.module.basic.setting.module.placement')}
- +
+
+
{getMessage('modal.module.basic.setting.orientation.setting')}
+ + {basicSetting.roofSizeSet && basicSetting.roofSizeSet != '3' && ( + <> +
{getMessage('modal.module.basic.setting.module.setting')}
+ +
{getMessage('modal.module.basic.setting.module.placement')}
+ + )} + {basicSetting.roofSizeSet && basicSetting.roofSizeSet == '3' && ( + <> +
{getMessage('modal.module.basic.setting.module.placement')}
+ + )} +
+ {tabNum === 1 && } + {/*배치면 초기설정 - 입력방법: 복시도 입력 || 실측값 입력*/} + {basicSetting.roofSizeSet && basicSetting.roofSizeSet != '3' && tabNum === 2 && } + {basicSetting.roofSizeSet && basicSetting.roofSizeSet != '3' && tabNum === 3 && ( + )} - {basicSetting.roofSizeSet && basicSetting.roofSizeSet == '3' && ( - <> -
{getMessage('modal.module.basic.setting.module.placement')}
- + {/*배치면 초기설정 - 입력방법: 육지붕*/} + {/* {basicSetting.roofSizeSet && basicSetting.roofSizeSet == '3' && tabNum === 3 && } */} + {basicSetting.roofSizeSet && basicSetting.roofSizeSet == '3' && tabNum === 2 && ( + )}
- {tabNum === 1 && } - {/*배치면 초기설정 - 입력방법: 복시도 입력 || 실측값 입력*/} - {basicSetting.roofSizeSet && basicSetting.roofSizeSet != '3' && tabNum === 2 && } - {basicSetting.roofSizeSet && basicSetting.roofSizeSet != '3' && tabNum === 3 && ( - - )} - {/*배치면 초기설정 - 입력방법: 육지붕*/} - {/* {basicSetting.roofSizeSet && basicSetting.roofSizeSet == '3' && tabNum === 3 && } */} - {basicSetting.roofSizeSet && basicSetting.roofSizeSet == '3' && tabNum === 2 && ( - - )}
{/* {tabNum === 1 && } */} diff --git a/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx b/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx index 68893c23..3827e116 100644 --- a/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx +++ b/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx @@ -20,8 +20,8 @@ import { useEstimate } from '@/hooks/useEstimate' import { useCircuitTrestle } from '@/hooks/useCirCuitTrestle' import { useImgLoader } from '@/hooks/floorPlan/useImgLoader' import { QcastContext } from '@/app/QcastProvider' -import { fabric } from 'fabric' import { fontSelector } from '@/store/fontAtom' +import { fabric } from 'fabric' const ALLOCATION_TYPE = { AUTO: 'auto', @@ -59,6 +59,9 @@ export default function CircuitTrestleSetting({ id }) { const passivityCircuitAllocationRef = useRef() const { setIsGlobalLoading } = useContext(QcastContext) + const originCanvasViewPortTransform = useRef([]) + const [isFold, setIsFold] = useState(false) + const { makers, setMakers, @@ -83,6 +86,7 @@ export default function CircuitTrestleSetting({ id }) { } = useCircuitTrestle() // const { trigger: moduleSelectedDataTrigger } = useCanvasPopupStatusController(2) useEffect(() => { + originCanvasViewPortTransform.current = [...canvas.viewportTransform] if (!managementState) { } // setCircuitData({ @@ -171,15 +175,12 @@ export default function CircuitTrestleSetting({ id }) { }) } - canvas.renderAll() - - // roof polygon들의 중간점 계산 - const roofPolygons = canvas.getObjects().filter((obj) => obj.name === POLYGON_TYPE.ROOF) let x, y x = canvas.width / 2 y = canvas.height / 2 - + canvas.zoomToPoint(new fabric.Point(x, y), 0.4) + changeFontSize('lengthText', '28') changeFontSize('circuitNumber', '28') changeFontSize('flowText', '28') @@ -188,9 +189,12 @@ export default function CircuitTrestleSetting({ id }) { // 캡쳐 후 처리 const afterCapture = (type) => { - setCanvasZoom(100) - canvas.set({ zoom: 1 }) - canvas.viewportTransform = [1, 0, 0, 1, 0, 0] + if (originCanvasViewPortTransform.current[0] !== 1) { + setCanvasZoom(Number((originCanvasViewPortTransform.current[0] * 100).toFixed(0))) + } + canvas.viewportTransform = [...originCanvasViewPortTransform.current] + canvas.renderAll() + changeFontSize('lengthText', lengthText.fontSize.value) changeFontSize('circuitNumber', circuitNumberText.fontSize.value) changeFontSize('flowText', flowText.fontSize.value) @@ -788,20 +792,30 @@ export default function CircuitTrestleSetting({ id }) { return ( - handleClose()} /> + handleClose()} + isFold={isFold} + 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 && }
- {tabNum === 1 && allocationType === ALLOCATION_TYPE.AUTO && } - {tabNum === 1 && allocationType === ALLOCATION_TYPE.PASSIVITY && ( - - )} - {tabNum === 2 && } + {tabNum === 1 && allocationType === ALLOCATION_TYPE.AUTO && (