From f04f7570cc7d468cc586d0a8d5a5c03b611d42c6 Mon Sep 17 00:00:00 2001 From: "hyojun.choi" Date: Thu, 13 Mar 2025 13:53:21 +0900 Subject: [PATCH 1/4] =?UTF-8?q?=EB=8F=99=EC=84=9C=EB=82=A8=EB=B6=81=20?= =?UTF-8?q?=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/hooks/module/useTrestle.js | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/hooks/module/useTrestle.js b/src/hooks/module/useTrestle.js index 50d11cb9..4f0bb116 100644 --- a/src/hooks/module/useTrestle.js +++ b/src/hooks/module/useTrestle.js @@ -1662,11 +1662,11 @@ export const useTrestle = () => { break } case 'west': { - startPointX += 5 + startPointX -= 5 break } case 'north': { - startPointY += 5 + startPointY -= 5 break } } @@ -1686,14 +1686,15 @@ export const useTrestle = () => { }) canvas.add(bracket) canvas.renderAll() + const maxIntvl = Math.max(moduleIntvlHor, moduleIntvlVer) if (direction === 'south') { - startPointY -= height + moduleIntvlVer / 10 + startPointY -= height + maxIntvl / 10 } else if (direction === 'north') { - startPointY += height + moduleIntvlVer / 10 + startPointY += height + maxIntvl / 10 } else if (direction === 'east') { - startPointX -= width - moduleIntvlHor / 10 + startPointX -= width + maxIntvl / 10 } else if (direction === 'west') { - startPointX += width + moduleIntvlHor / 10 + startPointX += width + maxIntvl / 10 } } } From 2dc590cbee570734fe4508f2eb28ae13981b4c89 Mon Sep 17 00:00:00 2001 From: basssy Date: Thu, 13 Mar 2025 14:45:14 +0900 Subject: [PATCH 2/4] =?UTF-8?q?#746=20=EA=B2=AC=EC=A0=81=EC=84=9C=20?= =?UTF-8?q?=EC=BC=80=EC=9D=B4=EB=B8=94=20=EC=A0=9C=ED=92=88=20=EA=B4=80?= =?UTF-8?q?=EB=A0=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/estimate/Estimate.jsx | 126 ++++++++++++++---- src/hooks/common/useCommonCode.js | 2 + .../estimate/useEstimateController.js | 1 + 3 files changed, 102 insertions(+), 27 deletions(-) diff --git a/src/components/estimate/Estimate.jsx b/src/components/estimate/Estimate.jsx index 3126f5bc..bd2c202a 100644 --- a/src/components/estimate/Estimate.jsx +++ b/src/components/estimate/Estimate.jsx @@ -58,6 +58,9 @@ export default function Estimate({}) { const [storePriceList, setStorePriceList] = useState([]) //가격표시 option + const [cableItemList, setCableItemList] = useState([]) //케이블 리스트 + const [cableItem, setCableItem] = useState('') //케이블 선택값 + const [startDate, setStartDate] = useState(new Date()) const singleDatePickerProps = { startDate, @@ -96,6 +99,7 @@ export default function Estimate({}) { const initEstimate = (currPid = currentPid) => { console.log('🚀 ~ initEstimate ~ currPid:', currPid) + setCableItem('') closeAll() setObjectNo(objectRecoil.floorPlanObjectNo) @@ -107,6 +111,16 @@ export default function Estimate({}) { setHonorificCodeList(code1) } + // 케이블제품 공통코드 + const code2 = findCommonCode(117900) + if (code2 != null) { + code2.map((item) => { + item.value = item.clRefChr1 + item.label = item.clRefChr2 + }) + setCableItemList(code2) + } + //아이템 자동완성 목록 가져오기 const param = { saleStoreId: session.storeId, @@ -551,7 +565,7 @@ export default function Estimate({}) { } const getAbledItems = (items) => { - return items.filter((items) => items.paDispOrder === null) + return items.filter((items) => items.dispCableFlg !== '1' && items.paDispOrder === null) } const onChangeSelectAll = (e) => { @@ -684,6 +698,22 @@ export default function Estimate({}) { setItemChangeYn(true) } + /* 케이블 select 변경시 */ + const onChangeDisplayCableItem = (value, itemList) => { + //todo: 추후 YJSS가 다시 나타날 경우 아래 swalFire 제거 필요 + if (estimateContextState.estimateType === 'YJSS') { + return swalFire({ text: getMessage('estimate.detail.save.requiredEstimateType'), type: 'alert', icon: 'warning' }) + } + itemList.map((item, index) => { + if (item.dispCableFlg === '1') { + if (value !== '') { + onChangeDisplayItem(value, item.dispOrder, index) + } + } + }) + setCableItem(value) + } + // 아이템 자동완성 검색시 아이템 추가/변경시 const onChangeDisplayItem = (itemId, dispOrder, index) => { //todo: 추후 YJSS가 다시 나타날 경우 아래 swalFire 제거 필요 @@ -1679,6 +1709,25 @@ export default function Estimate({}) { {getMessage('estimate.detail.showPrice.pricingBtn')} +
+
+ +
+
  • @@ -1758,7 +1807,7 @@ export default function Estimate({}) { onChangeSelect(item.dispOrder)} checked={!!selection.has(item.dispOrder)} /> @@ -1769,31 +1818,54 @@ export default function Estimate({}) {
    - { + if (isObjectNotEmpty(e)) { + onChangeDisplayItem(e.itemId, item.dispOrder, index) + } + }} + menuPlacement={'auto'} + getOptionLabel={(x) => x.itemName} + getOptionValue={(x) => x.itemNo} + isClearable={false} + isDisabled={!!item?.paDispOrder} + value={displayItemList.filter(function (option) { + if (item.itemNo === '') { + return false + } else { + return option.itemId === item.itemId + } + })} + /> + ) : ( + setFloorPlanState({ ...floorPlanState, toggleRotate: e.target.checked })} + /> + +
    -
    -
    -
    -
    - {getMessage('modal.image.load.size.rotate')} - -
    -
    -
    -
    - handleRefFileMethod(e)} checked={refFileMethod === '1'} /> - -
    -
    -
    - - handleRefFile(e.target.files[0]) : () => {}} - /> -
    -
    - - {refImage && } -
    -
    +
    +
    +
    + handleRefFileMethod(e)} checked={refFileMethod === '1'} /> +
    -
    -
    - handleRefFileMethod(e)} checked={refFileMethod === '2'} /> - +
    +
    + + handleRefFile(e.target.files[0]) : () => {}} + />
    -
    +
    setMapPositionAddress(e.target.value)} + className="input-origin al-l" + value={refImage ? (refImage?.name ?? '') : (currentCanvasPlan?.bgImageName ?? '')} + readOnly /> -
    - -
    - {mapPositionAddress && } - {/* */} + {refImage && }
    -
    - - {/* */} +
    +
    + handleRefFileMethod(e)} checked={refFileMethod === '2'} /> + +
    +
    + setMapPositionAddress(e.target.value)} + /> +
    + +
    + {mapPositionAddress && } + {/* */} +
    -
    -
    +
    + + {/* */} +
    + ) } diff --git a/src/components/floor-plan/modal/Slope.jsx b/src/components/floor-plan/modal/Slope.jsx index e867dcab..df4a25d7 100644 --- a/src/components/floor-plan/modal/Slope.jsx +++ b/src/components/floor-plan/modal/Slope.jsx @@ -13,42 +13,32 @@ export default function Slope({ id, pos = { x: 50, y: 230 } }) { const inputRef = useRef() return ( - -
    -
    -

    {getMessage('plan.menu.placement.surface.slope.setting')}

    -
    -
    -
    -
    -
    -
    - - {getMessage('slope')} - -
    - -
    - {pitchText} -
    -
    -
    - -
    -
    -
    -
    +     ) } diff --git a/src/components/floor-plan/modal/auxiliary/AuxiliaryDrawing.jsx b/src/components/floor-plan/modal/auxiliary/AuxiliaryDrawing.jsx index 3a9d64d6..1417b501 100644 --- a/src/components/floor-plan/modal/auxiliary/AuxiliaryDrawing.jsx +++ b/src/components/floor-plan/modal/auxiliary/AuxiliaryDrawing.jsx @@ -124,46 +124,36 @@ export default function AuxiliaryDrawing({ id, pos = { x: 50, y: 230 } }) { setType(button.type) } return ( - -
    -
    -

    {getMessage('modal.auxiliary.drawing')}

    - + ))} +
    +
    +
    {getMessage('setting')}
    + {buttonAct === 1 && } + {buttonAct === 2 && } + {buttonAct === 3 && } + {buttonAct === 4 && } + {buttonAct === 5 && } +
    +
    + + +
    -
    -
    -
    -
    - {types.map((type, idx) => ( - - ))} -
    -
    -
    {getMessage('setting')}
    - {buttonAct === 1 && } - {buttonAct === 2 && } - {buttonAct === 3 && } - {buttonAct === 4 && } - {buttonAct === 5 && } -
    -
    - - - -
    -
    -
    -
    +     ) } diff --git a/src/components/floor-plan/modal/auxiliary/AuxiliaryEdit.jsx b/src/components/floor-plan/modal/auxiliary/AuxiliaryEdit.jsx index c8e7b95a..744b3387 100644 --- a/src/components/floor-plan/modal/auxiliary/AuxiliaryEdit.jsx +++ b/src/components/floor-plan/modal/auxiliary/AuxiliaryEdit.jsx @@ -55,77 +55,67 @@ export default function AuxiliaryEdit(props) { closePopup(id) } return ( - -
    -
    -

    {getMessage(type === 'copy' ? 'modal.auxiliary.copy' : 'modal.auxiliary.move')}

    - -
    -
    -
    -
    -
    {getMessage(type === 'copy' ? 'modal.auxiliary.copy.info' : 'modal.auxiliary.move.info')}
    -
    -
    -
    -

    {getMessage('length')}

    -
    -
    - setVerticalSize(e.target.value)} /> -
    - mm -
    - - -
    + + closePopup(id)} /> + +
    {getMessage(type === 'copy' ? 'modal.auxiliary.copy.info' : 'modal.auxiliary.move.info')}
    +
    +
    +
    +

    {getMessage('length')}

    +
    +
    + setVerticalSize(e.target.value)} />
    -
    -
    - setHorizonSize(e.target.value)} /> -
    - mm -
    - - -
    + mm +
    + + +
    +
    +
    +
    + setHorizonSize(e.target.value)} /> +
    + mm +
    + +
    -
    - -
    -
    -
    +
    + +
    +     ) } diff --git a/src/components/floor-plan/modal/auxiliary/AuxiliarySize.jsx b/src/components/floor-plan/modal/auxiliary/AuxiliarySize.jsx index a9f7fc82..3bb94a4f 100644 --- a/src/components/floor-plan/modal/auxiliary/AuxiliarySize.jsx +++ b/src/components/floor-plan/modal/auxiliary/AuxiliarySize.jsx @@ -111,63 +111,53 @@ export default function AuxiliarySize(props) { closePopup(id) } return ( - -
    -
    -

    {getMessage('modal.auxiliary.size.edit')}

    -
    -
    -
    -
    -
    -
    - setCheckedRadio(1)} /> - -
    -
    -
    - -
    - mm -
    -
    - {getMessage('length')} -
    - -
    - mm -
    -
    -
    -
    - setCheckedRadio(2)} /> - -
    -
    -
    - -
    - mm -
    -
    - {getMessage('length')} -
    - -
    - mm -
    -
    -
    - -
    -
    -
    -
    +     ) } diff --git a/src/components/floor-plan/modal/basic/BasicSetting.jsx b/src/components/floor-plan/modal/basic/BasicSetting.jsx index 291ef086..ada6acba 100644 --- a/src/components/floor-plan/modal/basic/BasicSetting.jsx +++ b/src/components/floor-plan/modal/basic/BasicSetting.jsx @@ -135,76 +135,66 @@ export default function BasicSetting({ id, pos = { x: 50, y: 230 } }) { }, [isManualModuleSetup, isClosePopup]) return ( - -
    -
    -

    {getMessage('plan.menu.module.circuit.setting.default')}

    - + + handleClosePopup(id)} /> + +
    +
    {getMessage('modal.module.basic.setting.orientation.setting')}
    + +
    {getMessage('modal.module.basic.setting.module.setting')}
    + +
    {getMessage('modal.module.basic.setting.module.placement')}
    -
    -
    -
    -
    -
    {getMessage('modal.module.basic.setting.orientation.setting')}
    - -
    {getMessage('modal.module.basic.setting.module.setting')}
    - -
    {getMessage('modal.module.basic.setting.module.placement')}
    -
    - {tabNum === 1 && } - {/*배치면 초기설정 - 입력방법: 복시도 입력 || 실측값 입력*/} - {basicSetting.roofSizeSet && basicSetting.roofSizeSet != '3' && tabNum === 2 && } - {basicSetting.roofSizeSet && basicSetting.roofSizeSet != '3' && tabNum === 3 && } + {tabNum === 1 && } + {/*배치면 초기설정 - 입력방법: 복시도 입력 || 실측값 입력*/} + {basicSetting.roofSizeSet && basicSetting.roofSizeSet != '3' && tabNum === 2 && } + {basicSetting.roofSizeSet && basicSetting.roofSizeSet != '3' && tabNum === 3 && } - {/*배치면 초기설정 - 입력방법: 육지붕*/} - {basicSetting.roofSizeSet && basicSetting.roofSizeSet == '3' && tabNum === 2 && } - {basicSetting.roofSizeSet && basicSetting.roofSizeSet == '3' && tabNum === 3 && ( - + {/*배치면 초기설정 - 입력방법: 육지붕*/} + {basicSetting.roofSizeSet && basicSetting.roofSizeSet == '3' && tabNum === 2 && } + {basicSetting.roofSizeSet && basicSetting.roofSizeSet == '3' && tabNum === 3 && ( + + )} + +
    + {tabNum !== 1 && ( + + )} + {/*{tabNum !== 3 && }*/} + {tabNum !== 3 && ( + )} -
    - {tabNum !== 1 && ( - - )} - {/*{tabNum !== 3 && }*/} - {tabNum !== 3 && ( - - )} - - {tabNum === 3 && ( - <> - {basicSetting.roofSizeSet && basicSetting.roofSizeSet != '3' && ( - <> - - - - )} - {basicSetting.roofSizeSet && basicSetting.roofSizeSet == '3' && ( - <> - - - - )} - - )} -
    + {tabNum === 3 && ( + <> + {basicSetting.roofSizeSet && basicSetting.roofSizeSet != '3' && ( + <> + + + + )} + {basicSetting.roofSizeSet && basicSetting.roofSizeSet == '3' && ( + <> + + + + )} + + )}
    -
    -
    +     ) } diff --git a/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx b/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx index f9f97833..53461f77 100644 --- a/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx +++ b/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx @@ -612,64 +612,53 @@ export default function CircuitTrestleSetting({ id }) { } return ( - -
    -
    -

    {getMessage('modal.circuit.trestle.setting')}

    - {/* -
    -
    -
    -
    -
    -
    {getMessage('modal.circuit.trestle.setting.power.conditional.select')}
    - -
    - {getMessage('modal.circuit.trestle.setting.circuit.allocation')}({getMessage('modal.circuit.trestle.setting.step.up.allocation')}) -
    + + handleClose()} /> + +
    +
    {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 && } + {tabNum === 1 && allocationType === ALLOCATION_TYPE.PASSIVITY && ( + + )} + {tabNum === 2 && } + {tabNum === 1 && allocationType === ALLOCATION_TYPE.AUTO && ( +
    + + +
    + )} + {tabNum === 1 && allocationType === ALLOCATION_TYPE.PASSIVITY && ( +
    + + +
    + )} + {tabNum === 2 && ( +
    + + {/* +
    + )} + ) } diff --git a/src/components/floor-plan/modal/dimensionLine/DimensionLineSetting.jsx b/src/components/floor-plan/modal/dimensionLine/DimensionLineSetting.jsx index e4807c36..c2acc12d 100644 --- a/src/components/floor-plan/modal/dimensionLine/DimensionLineSetting.jsx +++ b/src/components/floor-plan/modal/dimensionLine/DimensionLineSetting.jsx @@ -122,95 +122,85 @@ export default function DimensionLineSetting(props) { } return ( - -
    -
    -

    {getMessage('contextmenu.display.edit')}

    -
    -
    -
    -
    -
    {getMessage('modal.display.edit.info')}
    -
    -
    -
    - {getMessage('modal.display.edit.before.length')} -
    - -
    -
    -
    -
    - {getMessage('modal.display.edit.after.length')} -
    - { - console.log(e.target) - setChangeLength(e.target.value) - }} - /> -
    -
    -
    -
    - setSlopeAble(!slopeAble)} /> - -
    -
    -
    -
    -
    {getMessage('modal.display.edit.input.slope')}
    -
    -
    - {getMessage('slope')} -
    - setSelectedSlope1(e)} - showKey={'name'} - sourceKey={'value'} - targetKey={'value'} - /> -
    - {pitchText} -
    -
    - {getMessage('slope')} -
    - setSelectedSlope2(e)} - showKey={'name'} - sourceKey={'value'} - targetKey={'value'} - /> -
    - {pitchText} -
    -
    -
    {getMessage('modal.display.edit.input.slope.info')}
    -
    -
    - -
    -
    -
    -
    +     ) } diff --git a/src/components/floor-plan/modal/distance/Distance.jsx b/src/components/floor-plan/modal/distance/Distance.jsx index e9c175d3..8ec3aed2 100644 --- a/src/components/floor-plan/modal/distance/Distance.jsx +++ b/src/components/floor-plan/modal/distance/Distance.jsx @@ -16,62 +16,52 @@ export default function Distance(props) { } return ( - -
    -
    -

    {getMessage('modal.distance')}

    - -
    -
    -
    -
    -
    -
    -
    -
    {getMessage('modal.distance.dual.point')}
    -
    -
    -
    - -
    - mm + + closePopup(id)} /> + +
    +
    +
    +
    {getMessage('modal.distance.dual.point')}
    +
    +
    +
    +
    + mm
    -
    -
    {getMessage('modal.distance.horizon')}
    -
    -
    -
    - -
    - mm +
    +
    +
    {getMessage('modal.distance.horizon')}
    +
    +
    +
    +
    + mm
    -
    -
    {getMessage('modal.distance.vertical')}
    -
    -
    -
    - -
    - mm +
    +
    +
    {getMessage('modal.distance.vertical')}
    +
    +
    +
    +
    + mm
    -
    - -
    -
    -
    +
    + +
    + ) } diff --git a/src/components/floor-plan/modal/eavesGable/EavesGableEdit.jsx b/src/components/floor-plan/modal/eavesGable/EavesGableEdit.jsx index c3975543..a59f8f27 100644 --- a/src/components/floor-plan/modal/eavesGable/EavesGableEdit.jsx +++ b/src/components/floor-plan/modal/eavesGable/EavesGableEdit.jsx @@ -38,34 +38,24 @@ export default function EavesGableEdit({ id, pos = { x: 50, y: 230 } }) { } return ( - -
    -
    -

    {getMessage('modal.eaves.gable.edit')}

    - + + closePopup(id)} /> + +
    + {buttonMenu.map((item) => ( + + ))}
    -
    -
    -
    -
    - {buttonMenu.map((item) => ( - - ))} -
    -
    -
    {getMessage('setting')}
    - {type === TYPES.EAVES && } - {type === TYPES.GABLE && } - {type === TYPES.WALL_MERGE && } - {type === TYPES.SHED && } -
    +
    +
    {getMessage('setting')}
    + {type === TYPES.EAVES && } + {type === TYPES.GABLE && } + {type === TYPES.WALL_MERGE && } + {type === TYPES.SHED && }
    -
    -
    +     ) } diff --git a/src/components/floor-plan/modal/flowDirection/FlowDirectionSetting.jsx b/src/components/floor-plan/modal/flowDirection/FlowDirectionSetting.jsx index df8525cc..910a2f02 100644 --- a/src/components/floor-plan/modal/flowDirection/FlowDirectionSetting.jsx +++ b/src/components/floor-plan/modal/flowDirection/FlowDirectionSetting.jsx @@ -63,123 +63,113 @@ export default function FlowDirectionSetting(props) { ) return ( - -
    -
    -

    {getMessage('modal.shape.flow.direction.setting')}

    - -
    -
    -
    -
    -
    -
    -
    {getMessage('modal.flow.direction.setting')}
    -
    {getMessage('modal.flow.direction.setting.info')}
    -
    -
    - {getMessage('commons.north')} - - {getMessage('commons.east')} - - {getMessage('commons.south')} - - {getMessage('commons.west')} - -
    + + closePopup(id)} /> + +
    +
    +
    {getMessage('modal.flow.direction.setting')}
    +
    {getMessage('modal.flow.direction.setting.info')}
    +
    +
    + {getMessage('commons.north')} + + {getMessage('commons.east')} + + {getMessage('commons.south')} + + {getMessage('commons.west')} +
    -
    -
    {getMessage('modal.module.basic.setting.orientation.setting')}
    -
    {getMessage('modal.shape.flow.direction.setting.orientation.setting.info')}
    -
    -
    - { - setCompasDeg(0) - setType(FLOW_DIRECTION_TYPE.EIGHT_AZIMUTH) - }} - /> - -
    -
    - { - setType(FLOW_DIRECTION_TYPE.EIGHT_AZIMUTH) - setSelectedOrientation(e) - setCompasDeg(e.value) - }} - showKey={'name'} - targetKey={'value'} - sourceKey={'value'} - /> -
    +
    +
    +
    {getMessage('modal.module.basic.setting.orientation.setting')}
    +
    {getMessage('modal.shape.flow.direction.setting.orientation.setting.info')}
    +
    +
    + { + setCompasDeg(0) + setType(FLOW_DIRECTION_TYPE.EIGHT_AZIMUTH) + }} + /> +
    -
    -
    - { - setType(FLOW_DIRECTION_TYPE.TWENTY_FOUR_AZIMUTH) - }} - /> - -
    +
    + { + setType(FLOW_DIRECTION_TYPE.EIGHT_AZIMUTH) + setSelectedOrientation(e) + setCompasDeg(e.value) + }} + showKey={'name'} + targetKey={'value'} + sourceKey={'value'} + />
    -
    -
    -
    - {Array.from({ length: 180 / 15 + 1 }).map((dot, index) => ( -
    { - setType(FLOW_DIRECTION_TYPE.TWENTY_FOUR_AZIMUTH) - setCompasDeg(15 * (12 + index)) - }} - >
    - ))} - {Array.from({ length: 180 / 15 - 1 }).map((dot, index) => ( -
    { - setType(FLOW_DIRECTION_TYPE.TWENTY_FOUR_AZIMUTH) - setCompasDeg(15 * (index + 1)) - }} - >
    - ))} -
    -
    -
    +
    +
    +
    + { + setType(FLOW_DIRECTION_TYPE.TWENTY_FOUR_AZIMUTH) + }} + /> + +
    +
    +
    +
    +
    + {Array.from({ length: 180 / 15 + 1 }).map((dot, index) => ( +
    { + setType(FLOW_DIRECTION_TYPE.TWENTY_FOUR_AZIMUTH) + setCompasDeg(15 * (12 + index)) + }} + >
    + ))} + {Array.from({ length: 180 / 15 - 1 }).map((dot, index) => ( +
    { + setType(FLOW_DIRECTION_TYPE.TWENTY_FOUR_AZIMUTH) + setCompasDeg(15 * (index + 1)) + }} + >
    + ))} +
    +
    -
    - -
    -
    -
    +
    + +
    + ) } diff --git a/src/components/floor-plan/modal/grid/DotLineGrid.jsx b/src/components/floor-plan/modal/grid/DotLineGrid.jsx index 853d27c1..d118188d 100644 --- a/src/components/floor-plan/modal/grid/DotLineGrid.jsx +++ b/src/components/floor-plan/modal/grid/DotLineGrid.jsx @@ -177,125 +177,115 @@ export default function DotLineGrid(props) { } return ( - -
    -
    -

    {getMessage('modal.canvas.setting.grid.dot.line.setting')}

    - +
    -
    -
    -
    -
    -
    - - -
    -
    - - -
    -
    -
    -
    -
    - - -
    -
    - {getMessage('modal.canvas.setting.grid.dot.line.setting.horizon')} -
    - onlyNumberInputChange(e, changeInput)} - /> -
    - mm -
    -
    - {getMessage('modal.canvas.setting.grid.dot.line.setting.vertical')} -
    - onlyNumberInputChange(e, changeInput)} - /> -
    - mm -
    -
    -
    -
    - - -
    -
    - {getMessage('modal.canvas.setting.grid.dot.line.setting.ratio')} -
    - onlyNumberInputChange(e, changeInput)} - /> -
    - mm -
    -
    - {selectOption && ( - - )} -
    -
    -
    -
    - - -
    -
    -
    -
    +     ) } diff --git a/src/components/floor-plan/modal/grid/GridCopy.jsx b/src/components/floor-plan/modal/grid/GridCopy.jsx index fa0b0ba8..e1a6f9f9 100644 --- a/src/components/floor-plan/modal/grid/GridCopy.jsx +++ b/src/components/floor-plan/modal/grid/GridCopy.jsx @@ -20,67 +20,57 @@ export default function GridCopy(props) { copy(currentObject, ['↑', '←'].includes(arrow) ? +length * -1 : +length) } return ( - -
    -
    -

    {getMessage('modal.grid.copy')}

    - -
    -
    -
    -
    -
    {getMessage('modal.grid.copy.info')}
    -
    -
    -
    - {getMessage('modal.grid.copy.length')} -
    - setLength(e.target.value)} /> -
    - mm -
    -
    - - - - + + closePopup(id)} /> + +
    {getMessage('modal.grid.copy.info')}
    +
    +
    +
    + {getMessage('modal.grid.copy.length')} +
    + setLength(e.target.value)} />
    + mm +
    +
    + + + +
    -
    - -
    -
    -
    +
    + +
    + ) } diff --git a/src/components/floor-plan/modal/grid/GridMove.jsx b/src/components/floor-plan/modal/grid/GridMove.jsx index dbf15206..4aa27851 100644 --- a/src/components/floor-plan/modal/grid/GridMove.jsx +++ b/src/components/floor-plan/modal/grid/GridMove.jsx @@ -73,93 +73,83 @@ export default function GridMove(props) { closePopup(id) } return ( - -
    -
    -

    {getMessage('modal.grid.move')}

    - -
    -
    -
    -
    -
    {getMessage('modal.grid.move.info')}
    -
    -
    - setIsAll(!isAll)} /> - -
    -
    -
    -

    {getMessage('modal.grid.move.length')}

    -
    -
    - setVerticalSize(e.target.value)} - readOnly={!isAll && currentObject?.direction === 'vertical'} - /> -
    - mm -
    - - -
    + + handleClose()} /> + +
    {getMessage('modal.grid.move.info')}
    +
    +
    + setIsAll(!isAll)} /> + +
    +
    +
    +

    {getMessage('modal.grid.move.length')}

    +
    +
    + setVerticalSize(e.target.value)} + readOnly={!isAll && currentObject?.direction === 'vertical'} + />
    -
    -
    - setHorizonSize(e.target.value)} - readOnly={!isAll && currentObject?.direction === 'horizontal'} - /> -
    - mm -
    - - -
    + mm +
    + + +
    +
    +
    +
    + setHorizonSize(e.target.value)} + readOnly={!isAll && currentObject?.direction === 'horizontal'} + /> +
    + mm +
    + +
    -
    - -
    -
    -
    +
    + +
    +     ) } diff --git a/src/components/floor-plan/modal/lineProperty/LinePropertySetting.jsx b/src/components/floor-plan/modal/lineProperty/LinePropertySetting.jsx index e309646a..049c2e40 100644 --- a/src/components/floor-plan/modal/lineProperty/LinePropertySetting.jsx +++ b/src/components/floor-plan/modal/lineProperty/LinePropertySetting.jsx @@ -50,51 +50,41 @@ export default function LinePropertySetting(props) { } return ( - -
    -
    -

    {getMessage('contextmenu.line.property.edit')}

    - + + handleClosePopup()} /> + +
    + {getMessage('modal.line.property.edit.info')} + + {getMessage('modal.line.property.edit.selected')} [ {selectedProperty?.name} ] +
    -
    -
    -
    -
    - {getMessage('modal.line.property.edit.info')} - - {getMessage('modal.line.property.edit.selected')} [ {selectedProperty?.name} ] - -
    -
    -
    {getMessage('setting')}
    -
    -
    - {properties.map((property, index) => { - return ( -
    - = 10 ? index + 1 : `0${index + 1}`)} - onChange={(e) => setSelectedProperty(property)} - /> - -
    - ) - })} -
    +
    +
    {getMessage('setting')}
    +
    +
    + {properties.map((property, index) => { + return ( +
    + = 10 ? index + 1 : `0${index + 1}`)} + onChange={(e) => setSelectedProperty(property)} + /> + +
    + ) + })}
    -
    - -
    -
    -
    +
    + +
    + ) } diff --git a/src/components/floor-plan/modal/module/CircuitNumberEdit.jsx b/src/components/floor-plan/modal/module/CircuitNumberEdit.jsx index 50c819ed..1e1b2f2f 100644 --- a/src/components/floor-plan/modal/module/CircuitNumberEdit.jsx +++ b/src/components/floor-plan/modal/module/CircuitNumberEdit.jsx @@ -14,38 +14,28 @@ export default function CircuitNumberEdit(props) { closePopup(id) } return ( - -
    -
    -

    {getMessage('modal.module.circuit.number.edit')}

    - -
    -
    -
    -
    -
    {getMessage('modal.module.circuit.number.edit.info')}
    -
    -
    -
    - - {getMessage('modal.module.circuit.number')} - -
    - -
    + + closePopup(id)} /> + +
    {getMessage('modal.module.circuit.number.edit.info')}
    +
    +
    +
    + + {getMessage('modal.module.circuit.number')} + +
    +
    -
    - -
    -
    -
    +
    + +
    + ) } diff --git a/src/components/floor-plan/modal/module/PanelEdit.jsx b/src/components/floor-plan/modal/module/PanelEdit.jsx index ea671881..2a06e062 100644 --- a/src/components/floor-plan/modal/module/PanelEdit.jsx +++ b/src/components/floor-plan/modal/module/PanelEdit.jsx @@ -91,75 +91,64 @@ export default function PanelEdit(props) { } return ( - -
    -
    -

    - {getMessage( - [PANEL_EDIT_TYPE.MOVE, PANEL_EDIT_TYPE.MOVE_ALL, PANEL_EDIT_TYPE.COLUMN_MOVE].includes(type) - ? 'modal.move.setting' - : 'modal.copy.setting', - )}{' '} -

    - + + closePopup(id)} + /> + +
    + {getMessage( + [PANEL_EDIT_TYPE.MOVE, PANEL_EDIT_TYPE.MOVE_ALL, PANEL_EDIT_TYPE.COLUMN_MOVE].includes(type) + ? 'modal.move.setting.info' + : 'modal.copy.setting.info', + )}
    -
    -
    -
    -
    - {getMessage( - [PANEL_EDIT_TYPE.MOVE, PANEL_EDIT_TYPE.MOVE_ALL, PANEL_EDIT_TYPE.COLUMN_MOVE].includes(type) - ? 'modal.move.setting.info' - : 'modal.copy.setting.info', - )} -
    -
    -
    -
    - {getMessage('margin')} -
    - setLength(e.target.value)} /> -
    - mm -
    -
    - - - - +
    +
    +
    + {getMessage('margin')} +
    + setLength(e.target.value)} />
    + mm +
    +
    + + + +
    -
    - -
    -
    -
    +
    + +
    + ) } diff --git a/src/components/floor-plan/modal/module/column/ColumnInsert.jsx b/src/components/floor-plan/modal/module/column/ColumnInsert.jsx index e42d2ca3..0c160656 100644 --- a/src/components/floor-plan/modal/module/column/ColumnInsert.jsx +++ b/src/components/floor-plan/modal/module/column/ColumnInsert.jsx @@ -24,91 +24,69 @@ export default function ColumnInsert(props) { } return ( - -
    -
    -

    {getMessage('modal.panel.column.insert')}

    -
    -
    -
    -
    -
    -
    {getMessage('modal.panel.column.insert.info')}
    -
    -
    -
    - - -
    -
    - - -
    -
    -
    - {selectedType === MODULE_INSERT_TYPE.LEFT && ( - react - )} - {selectedType === MODULE_INSERT_TYPE.RIGHT && ( - react - )} -
    -
    -
    -
    -
    {getMessage('legend')}
    -
    -
    -
    -
    - - {getMessage('modal.panel.select.column')} -
    -
    - - {getMessage('modal.panel.insert.column')} -
    -
    -
    -
    -
    -
    - -
    -
    -
    -
    +     ) } diff --git a/src/components/floor-plan/modal/module/column/ColumnRemove.jsx b/src/components/floor-plan/modal/module/column/ColumnRemove.jsx index 66351d35..b9079642 100644 --- a/src/components/floor-plan/modal/module/column/ColumnRemove.jsx +++ b/src/components/floor-plan/modal/module/column/ColumnRemove.jsx @@ -26,98 +26,64 @@ export default function ColumnRemove(props) { } return ( - -
    -
    -

    {getMessage('modal.panel.column.remove')}

    - -
    -
    -
    -
    -
    -
    {getMessage('modal.panel.column.remove.info')}
    -
    -
    - {types.map((type, index) => { - return ( -
    - setSelectedType(e.target.value)} - value={type.value} - checked={selectedType === type.value} - /> - -
    - ) - })} -
    -
    - {selectedType === MODULE_REMOVE_TYPE.LEFT && ( - react - )} - {selectedType === MODULE_REMOVE_TYPE.RIGHT && ( - react - )} - {selectedType === MODULE_REMOVE_TYPE.HORIZONTAL_SIDE && ( - react - )} - {selectedType === MODULE_REMOVE_TYPE.NONE && ( - react - )} -
    + + closePopup(id)} /> + +
    +
    {getMessage('modal.panel.column.remove.info')}
    +
    +
    + {types.map((type, index) => { + return ( +
    + setSelectedType(e.target.value)} + value={type.value} + checked={selectedType === type.value} + /> + +
    + ) + })} +
    +
    + {selectedType === MODULE_REMOVE_TYPE.LEFT && ( + react + )} + {selectedType === MODULE_REMOVE_TYPE.RIGHT && ( + react + )} + {selectedType === MODULE_REMOVE_TYPE.HORIZONTAL_SIDE && ( + react + )} + {selectedType === MODULE_REMOVE_TYPE.NONE && ( + react + )}
    -
    -
    {getMessage('legend')}
    -
    -
    -
    -
    - - {getMessage('modal.panel.select.column')} -
    +
    +
    +
    {getMessage('legend')}
    +
    +
    +
    +
    + + {getMessage('modal.panel.select.column')}
    -
    - -
    -
    -
    +
    + +
    + ) } diff --git a/src/components/floor-plan/modal/module/row/RowInsert.jsx b/src/components/floor-plan/modal/module/row/RowInsert.jsx index 9b558706..e9fb799c 100644 --- a/src/components/floor-plan/modal/module/row/RowInsert.jsx +++ b/src/components/floor-plan/modal/module/row/RowInsert.jsx @@ -24,91 +24,82 @@ export default function RowInsert(props) { } return ( - -
    -
    -

    {getMessage('modal.row.insert')}

    -
    -
    -
    -
    -
    -
    {getMessage('modal.row.insert.info')}
    -
    -
    -
    - - -
    -
    - - -
    -
    -
    - {selectedType === MODULE_INSERT_TYPE.TOP && ( - react - )} - {selectedType === MODULE_INSERT_TYPE.BOTTOM && ( - react - )} -
    -
    -
    -
    -
    {getMessage('legend')}
    -
    -
    -
    -
    - - {getMessage('modal.panel.select.row')} -
    -
    - - {getMessage('modal.panel.insert.row')} -
    -
    -
    -
    -
    -
    - -
    -
    -
    +     ) } diff --git a/src/components/floor-plan/modal/module/row/RowRemove.jsx b/src/components/floor-plan/modal/module/row/RowRemove.jsx index 500fbfb3..5cf95b3f 100644 --- a/src/components/floor-plan/modal/module/row/RowRemove.jsx +++ b/src/components/floor-plan/modal/module/row/RowRemove.jsx @@ -27,98 +27,88 @@ export default function RowRemove(props) { } return ( - -
    -
    -

    {getMessage('modal.row.remove')}

    - -
    -
    -
    -
    -
    -
    {getMessage('modal.row.remove.info')}
    -
    -
    - {types.map((type, index) => { - return ( -
    - setSelectedType(e.target.value)} - value={type.value} - checked={selectedType === type.value} - /> - -
    - ) - })} -
    -
    - {selectedType === MODULE_REMOVE_TYPE.TOP && ( - react - )} - {selectedType === MODULE_REMOVE_TYPE.BOTTOM && ( - react - )} - {selectedType === MODULE_REMOVE_TYPE.VERTICAL_SIDE && ( - react - )} - {selectedType === MODULE_REMOVE_TYPE.NONE && ( - react - )} -
    + + closePopup(id)} /> + +
    +
    {getMessage('modal.row.remove.info')}
    +
    +
    + {types.map((type, index) => { + return ( +
    + setSelectedType(e.target.value)} + value={type.value} + checked={selectedType === type.value} + /> + +
    + ) + })} +
    +
    + {selectedType === MODULE_REMOVE_TYPE.TOP && ( + react + )} + {selectedType === MODULE_REMOVE_TYPE.BOTTOM && ( + react + )} + {selectedType === MODULE_REMOVE_TYPE.VERTICAL_SIDE && ( + react + )} + {selectedType === MODULE_REMOVE_TYPE.NONE && ( + react + )}
    -
    -
    {getMessage('legend')}
    -
    -
    -
    -
    - - {getMessage('modal.panel.select.row')} -
    +
    +
    +
    {getMessage('legend')}
    +
    +
    +
    +
    + + {getMessage('modal.panel.select.row')}
    -
    - -
    -
    -
    +
    + +
    + ) } diff --git a/src/components/floor-plan/modal/movement/MovementSetting.jsx b/src/components/floor-plan/modal/movement/MovementSetting.jsx index 916a40bd..46464538 100644 --- a/src/components/floor-plan/modal/movement/MovementSetting.jsx +++ b/src/components/floor-plan/modal/movement/MovementSetting.jsx @@ -16,36 +16,26 @@ export default function MovementSetting({ id, pos = { x: 50, y: 230 } }) { } return ( - -
    -
    -

    {getMessage('plan.menu.roof.cover.movement.shape.updown')}

    - + ))} +
    +
    + {type === TYPE.FLOW_LINE && } + {type === TYPE.UP_DOWN && } +
    +
    +
    -
    -
    -
    -
    - {buttonType.map((item) => ( - - ))} -
    -
    - {type === TYPE.FLOW_LINE && } - {type === TYPE.UP_DOWN && } -
    -
    - -
    -
    -
    -
    +     ) } diff --git a/src/components/floor-plan/modal/object/DormerOffset.jsx b/src/components/floor-plan/modal/object/DormerOffset.jsx index d13533f9..af0ee8e0 100644 --- a/src/components/floor-plan/modal/object/DormerOffset.jsx +++ b/src/components/floor-plan/modal/object/DormerOffset.jsx @@ -40,73 +40,63 @@ export default function DormerOffset(props) { // closePopup(id) } return ( - -
    -
    -

    {title}

    - -
    -
    -
    -
    -
    {getMessage('modal.dormer.offset.info')}
    -
    -
    -
    -

    {getMessage('length')}

    -
    -
    - -
    - mm -
    - - -
    + + closePopup(id)} /> + +
    {getMessage('modal.dormer.offset.info')}
    +
    +
    +
    +

    {getMessage('length')}

    +
    +
    +
    -
    -
    - -
    - mm -
    - - -
    + mm +
    + + +
    +
    +
    +
    + +
    + mm +
    + +
    -
    - -
    -
    -
    +
    + +
    +     ) } diff --git a/src/components/floor-plan/modal/object/ObjectSetting.jsx b/src/components/floor-plan/modal/object/ObjectSetting.jsx index b602f163..1bbddfe6 100644 --- a/src/components/floor-plan/modal/object/ObjectSetting.jsx +++ b/src/components/floor-plan/modal/object/ObjectSetting.jsx @@ -100,43 +100,33 @@ export default function ObjectSetting({ id, pos = { x: 50, y: 230 } }) { ] return ( - -
    -
    -

    {getMessage('plan.menu.placement.surface.object')}

    - + ))} +
    +
    + {buttonAct === 1 && } + {buttonAct === 2 && } + {buttonAct === 3 && } + {buttonAct === 4 && } +
    +
    +
    -
    -
    -
    -
    - {buttonMenu.map((item) => ( - - ))} -
    -
    - {buttonAct === 1 && } - {buttonAct === 2 && } - {buttonAct === 3 && } - {buttonAct === 4 && } -
    -
    - -
    -
    -
    -
    +     ) } diff --git a/src/components/floor-plan/modal/object/RoofMaterialSetting.jsx b/src/components/floor-plan/modal/object/RoofMaterialSetting.jsx index fdca3518..27c06593 100644 --- a/src/components/floor-plan/modal/object/RoofMaterialSetting.jsx +++ b/src/components/floor-plan/modal/object/RoofMaterialSetting.jsx @@ -21,28 +21,18 @@ export default function RoofMaterialSetting(props) { ] return ( - -
    -
    -

    {getMessage('modal.roof.material.edit')}

    - -
    -
    -
    -
    -
    -
    - -
    -
    -
    - + + closePopup(id)} /> + +
    +
    +
    -
    -
    +
    + +
    + ) } diff --git a/src/components/floor-plan/modal/object/SizeSetting.jsx b/src/components/floor-plan/modal/object/SizeSetting.jsx index 34e86ed8..c5873006 100644 --- a/src/components/floor-plan/modal/object/SizeSetting.jsx +++ b/src/components/floor-plan/modal/object/SizeSetting.jsx @@ -40,60 +40,50 @@ export default function SizeSetting(props) { } return ( - -
    -
    -

    {getMessage('modal.size.setting')}

    - -
    -
    -
    -
    -
    -
    + + closePopup(id)} /> + +
    +
    +
    +
    + + mm +
    +
    + + mm +
    +
    +
    +
    +
    - + mm
    - + mm
    -
    -
    -
    -
    - - mm -
    -
    - - mm -
    -
    -
    -
    - - - - -
    -
    +
    + + + + +
    -
    - -
    -
    -
    +
    + +
    +     ) } diff --git a/src/components/floor-plan/modal/outerlinesetting/PropertiesSetting.jsx b/src/components/floor-plan/modal/outerlinesetting/PropertiesSetting.jsx index c57eabfa..18b82edf 100644 --- a/src/components/floor-plan/modal/outerlinesetting/PropertiesSetting.jsx +++ b/src/components/floor-plan/modal/outerlinesetting/PropertiesSetting.jsx @@ -8,40 +8,30 @@ export default function PropertiesSetting(props) { const { handleSetEaves, handleSetGable, handleRollback, handleFix, closeModal } = usePropertiesSetting(id) return ( - -
    -
    -

    {getMessage('modal.canvas.setting.wallline.properties.setting')}

    - + +
    +
    +
    + +
    -
    -
    -
    -
    {getMessage('modal.canvas.setting.wallline.properties.setting.info')}
    -
    -
    {getMessage('setting')}
    -
    - - -
    -
    -
    - - -
    -
    -
    -
    + ) } diff --git a/src/components/floor-plan/modal/outerlinesetting/WallLineSetting.jsx b/src/components/floor-plan/modal/outerlinesetting/WallLineSetting.jsx index 409d7550..36d79cb6 100644 --- a/src/components/floor-plan/modal/outerlinesetting/WallLineSetting.jsx +++ b/src/components/floor-plan/modal/outerlinesetting/WallLineSetting.jsx @@ -114,24 +114,18 @@ export default function WallLineSetting(props) { } return ( - -
    -
    -

    {getMessage('modal.cover.outline.drawing')}

    - -
    -
    -
    -
    -
    - {/**/} - {/* */} -
    -
    - {type === OUTER_LINE_TYPE.OUTER_LINE ? ( - - ) : type === OUTER_LINE_TYPE.RIGHT_ANGLE ? ( - - ) : type === OUTER_LINE_TYPE.DOUBLE_PITCH ? ( - - ) : type === OUTER_LINE_TYPE.ANGLE ? ( - - ) : type === OUTER_LINE_TYPE.DIAGONAL_LINE ? ( - - ) : ( - <> - )} -
    -
    - - -
    -
    -
    +
    + {type === OUTER_LINE_TYPE.OUTER_LINE ? ( + + ) : type === OUTER_LINE_TYPE.RIGHT_ANGLE ? ( + + ) : type === OUTER_LINE_TYPE.DOUBLE_PITCH ? ( + + ) : type === OUTER_LINE_TYPE.ANGLE ? ( + + ) : type === OUTER_LINE_TYPE.DIAGONAL_LINE ? ( + + ) : ( + <> + )} +
    +
    + + +
    +     ) } diff --git a/src/components/floor-plan/modal/panelBatch/PanelBatchStatistics.jsx b/src/components/floor-plan/modal/panelBatch/PanelBatchStatistics.jsx index 67b5efd0..e789bc4a 100644 --- a/src/components/floor-plan/modal/panelBatch/PanelBatchStatistics.jsx +++ b/src/components/floor-plan/modal/panelBatch/PanelBatchStatistics.jsx @@ -29,40 +29,42 @@ export default function PanelBatchStatistics() { }, []) return ( - -
    -

    {getMessage('modal.panel.batch.statistic')}

    - -
    - - - - {header.map((item, index) => ( - - ))} - - - - {rows.map((row, index) => ( - - {header.map((item, i) => ( - + + +
    +

    {getMessage('modal.panel.batch.statistic')}

    + +
    +
    {item.name}
    {row[item.prop] ?? 0}
    + + + {header.map((item, index) => ( + ))} - ))} - - {header.map((header, index) => ( - + + + {rows.map((row, index) => ( + + {header.map((item, i) => ( + + ))} + ))} - - -
    {item.name}
    - {typeof footer[header.prop] === 'number' - ? footer[header.prop].toLocaleString('ko-KR', { maximumFractionDigits: 4 }) - : footer[header.prop]} -
    {row[item.prop] ?? 0}
    + + {header.map((header, index) => ( + + {typeof footer[header.prop] === 'number' + ? footer[header.prop].toLocaleString('ko-KR', { maximumFractionDigits: 4 }) + : footer[header.prop]} + + ))} + + + +
    -
    + ) } diff --git a/src/components/floor-plan/modal/placementShape/PlacementShapeDrawing.jsx b/src/components/floor-plan/modal/placementShape/PlacementShapeDrawing.jsx index 72cf2c21..04b63f1d 100644 --- a/src/components/floor-plan/modal/placementShape/PlacementShapeDrawing.jsx +++ b/src/components/floor-plan/modal/placementShape/PlacementShapeDrawing.jsx @@ -121,47 +121,33 @@ export default function PlacementShapeDrawing({ id, pos = { x: 50, y: 230 } }) { setType(button.type) } return ( - -
    -
    -

    {getMessage('plan.menu.placement.surface.drawing')}

    - + ))} +
    +
    + {buttonAct === 1 && } + {buttonAct === 2 && } + {buttonAct === 3 && } + {buttonAct === 4 && } + {buttonAct === 5 && } +
    + +
    + +
    -
    -
    -
    -
    - {types.map((type, idx) => ( - - ))} -
    -
    - {buttonAct === 1 && } - {buttonAct === 2 && } - {buttonAct === 3 && } - {buttonAct === 4 && } - {buttonAct === 5 && } -
    - -
    - - -
    -
    -
    -
    +     ) } diff --git a/src/components/floor-plan/modal/placementShape/PlacementShapeSetting.jsx b/src/components/floor-plan/modal/placementShape/PlacementShapeSetting.jsx index 127e7742..a70a8c65 100644 --- a/src/components/floor-plan/modal/placementShape/PlacementShapeSetting.jsx +++ b/src/components/floor-plan/modal/placementShape/PlacementShapeSetting.jsx @@ -257,194 +257,191 @@ export default function PlacementShapeSetting({ id, pos = { x: 50, y: 180 }, pla } return ( - -
    -
    -

    {getMessage('plan.menu.placement.surface.initial.setting')}

    -
    -
    -
    -
    -
    - - - - - - - - - - - - - - - - - + + +
    {getMessage('modal.placement.initial.setting.plan.drawing')}{getMessage('modal.placement.initial.setting.plan.drawing.size.stuff')}
    -
    - {getMessage('modal.placement.initial.setting.size')} - -
    -     		-
    - {currentRoof && - roofSizeSetArray.map((item) => ( -
    - setCurrentRoof({ ...currentRoof, roofSizeSet: e.target.value })} - /> - -
    - ))} -
    -
    {getMessage('modal.placement.initial.setting.roof.angle.setting')} -
    - {currentRoof && - roofAngleSetArray.map((item, index) => ( -
    - -
    - setCurrentRoof({ ...currentRoof, roofAngleSet: e.target.value })} - /> - -
    -     -
    + + + +
    +
    +
    + + + + + + + + + + + + + + + + + + + + + - - - - - - -
    {getMessage('modal.placement.initial.setting.plan.drawing')}{getMessage('modal.placement.initial.setting.plan.drawing.size.stuff')}
    +
    + {getMessage('modal.placement.initial.setting.size')} + +
    +     		+
    + {currentRoof && + roofSizeSetArray.map((item) => ( +
    + setCurrentRoof({ ...currentRoof, roofSizeSet: e.target.value })} + /> + +
    + ))} +
    +
    {getMessage('modal.placement.initial.setting.roof.angle.setting')} +
    + {currentRoof && + roofAngleSetArray.map((item, index) => ( +
    + +
    - index === 0 - ? setCurrentRoof({ ...currentRoof, pitch: e.target.value, angle: getDegreeByChon(e.target.value) }) - : setCurrentRoof({ ...currentRoof, pitch: getChonByDegree(e.target.value), angle: e.target.value }) - } + type="radio" + id={item.id} + name={item.name} + value={item.value} + checked={String(currentRoof?.roofAngleSet) === item.value} + onChange={(e) => setCurrentRoof({ ...currentRoof, roofAngleSet: e.target.value })} /> +
    - {index === 0 ? '寸' : '度'} +     +
    + + index === 0 + ? setCurrentRoof({ ...currentRoof, pitch: e.target.value, angle: getDegreeByChon(e.target.value) }) + : setCurrentRoof({ ...currentRoof, pitch: getChonByDegree(e.target.value), angle: e.target.value }) + } + />
    - ))} + {index === 0 ? '寸' : '度'} +
    + ))} +
    +
    +
    + {getMessage('modal.placement.initial.setting.roof.material')} + +
    +     		+
    +
    + { + return { ...roof, name: globalLocale === 'ko' ? roof.roofMatlNm : roof.roofMatlNmJp } + })} + value={currentRoof?.roofSizeSet === '3' ? null : currentRoof?.roofMatlCd} + onChange={(e) => handleRoofTypeChange(e.roofMatlCd)} + sourceKey="id" + targetKey="id" + showKey="name" + disabled={currentRoof?.roofSizeSet === '3'} + />
    -
    -
    - {getMessage('modal.placement.initial.setting.roof.material')} - -
    -     		-
    -
    - { - return { ...roof, name: globalLocale === 'ko' ? roof.roofMatlNm : roof.roofMatlNmJp } - })} - value={currentRoof?.roofSizeSet === '3' ? null : currentRoof?.roofMatlCd} - onChange={(e) => handleRoofTypeChange(e.roofMatlCd)} - sourceKey="id" - targetKey="id" - showKey="name" - disabled={currentRoof?.roofSizeSet === '3'} - /> + {currentRoof && ['R', 'C'].includes(currentRoof.widAuth) && ( +
    + W +
    + onlyNumberInputChange(e, changeInput)} + readOnly={currentRoof?.widAuth === 'R'} + disabled={currentRoof?.roofSizeSet === '3'} + /> +
    - {currentRoof && ['R', 'C'].includes(currentRoof.widAuth) && ( -
    - W -
    - onlyNumberInputChange(e, changeInput)} - readOnly={currentRoof?.widAuth === 'R'} + )} + {currentRoof && ['R', 'C'].includes(currentRoof.lenAuth) && ( +
    + L +
    + onlyNumberInputChange(e, changeInput)} + readOnly={currentRoof?.lenAuth === 'R'} + disabled={currentRoof?.roofSizeSet === '3'} + /> +
    +
    + )} + {currentRoof && ['C', 'R'].includes(currentRoof.raftAuth) && ( +
    + {getMessage('modal.placement.initial.setting.rafter')} + {raftCodes?.length > 0 && ( +
    + r.clCode === (currentRoof?.raft === undefined ? currentRoof?.raftBaseCd : currentRoof?.raft)) + .clCodeNm + } + value={currentRoof?.raft === undefined ? currentRoof?.raftBaseCd : currentRoof?.raft} + onChange={(e) => handleRafterChange(e.clCode)} + sourceKey="clCode" + targetKey={currentRoof?.raft ? 'raft' : 'raftBaseCd'} + showKey="clCodeNm" disabled={currentRoof?.roofSizeSet === '3'} />
    + )} +
    + )} + {currentRoof && ['C', 'R'].includes(currentRoof?.roofPchAuth) && ( +
    + {getMessage('hajebichi')} +
    + onlyNumberInputChange(e, changeInput)} + readOnly={currentRoof?.roofPchAuth === 'R'} + disabled={currentRoof?.roofSizeSet === '3'} + />
    - )} - {currentRoof && ['R', 'C'].includes(currentRoof.lenAuth) && ( -
    - L -
    - onlyNumberInputChange(e, changeInput)} - readOnly={currentRoof?.lenAuth === 'R'} - disabled={currentRoof?.roofSizeSet === '3'} - /> -
    -
    - )} - {currentRoof && ['C', 'R'].includes(currentRoof.raftAuth) && ( -
    - {getMessage('modal.placement.initial.setting.rafter')} - {raftCodes?.length > 0 && ( -
    - r.clCode === (currentRoof?.raft === undefined ? currentRoof?.raftBaseCd : currentRoof?.raft)) - .clCodeNm - } - value={currentRoof?.raft === undefined ? currentRoof?.raftBaseCd : currentRoof?.raft} - onChange={(e) => handleRafterChange(e.clCode)} - sourceKey="clCode" - targetKey={currentRoof?.raft ? 'raft' : 'raftBaseCd'} - showKey="clCodeNm" - disabled={currentRoof?.roofSizeSet === '3'} - /> -
    - )} -
    - )} - {currentRoof && ['C', 'R'].includes(currentRoof?.roofPchAuth) && ( -
    - {getMessage('hajebichi')} -
    - onlyNumberInputChange(e, changeInput)} - readOnly={currentRoof?.roofPchAuth === 'R'} - disabled={currentRoof?.roofSizeSet === '3'} - /> -
    -
    - )} -
    - {/* {currentRoof && ( +
    + )} +
    + {/* {currentRoof && (
    )} */} -
    -
    -
    - -
    +
    - {showSizeGuideModal && } - {showMaterialGuideModal && } -
    -
    +
    + +
    + + {showSizeGuideModal && } + {showMaterialGuideModal && } ) } diff --git a/src/components/floor-plan/modal/placementShape/PlacementSurfaceLineProperty.jsx b/src/components/floor-plan/modal/placementShape/PlacementSurfaceLineProperty.jsx index bc532242..34cf8c1e 100644 --- a/src/components/floor-plan/modal/placementShape/PlacementSurfaceLineProperty.jsx +++ b/src/components/floor-plan/modal/placementShape/PlacementSurfaceLineProperty.jsx @@ -41,43 +41,33 @@ export default function PlacementSurfaceLineProperty(props) { } return ( - -
    -
    -

    {getMessage('modal.canvas.setting.roofline.properties.setting')}

    - + + +
    +
    +
    + +
    -
    -
    -
    -
    {getMessage('modal.canvas.setting.roofline.properties.setting.info')}
    -
    -
    {getMessage('setting')}
    -
    - - - -
    -
    -
    - - -
    -
    -
    -
    +     ) } diff --git a/src/components/floor-plan/modal/placementSurface/PlacementSurfaceSetting.jsx b/src/components/floor-plan/modal/placementSurface/PlacementSurfaceSetting.jsx index 967d849e..ae29b778 100644 --- a/src/components/floor-plan/modal/placementSurface/PlacementSurfaceSetting.jsx +++ b/src/components/floor-plan/modal/placementSurface/PlacementSurfaceSetting.jsx @@ -256,63 +256,49 @@ export default function PlacementSurfaceSetting({ id, pos = { x: 50, y: 230 } }) }, []) return ( - -
    -
    -

    {getMessage('plan.menu.placement.surface.arrangement')}

    - -
    -
    -
    -
    -
    -
    -
    - {types.map((type) => ( - - ))} -
    -
    - - {/* */} - {/* - */} - - -
    -
    -
    - -
    - -
    + ))} +
    +
    + + {/* */} + {/* + */} + + +
    +
    +
    + +
    +
    -
    -
    +     ) } diff --git a/src/components/floor-plan/modal/roofAllocation/ActualSizeSetting.jsx b/src/components/floor-plan/modal/roofAllocation/ActualSizeSetting.jsx index 0af71db1..c91325c0 100644 --- a/src/components/floor-plan/modal/roofAllocation/ActualSizeSetting.jsx +++ b/src/components/floor-plan/modal/roofAllocation/ActualSizeSetting.jsx @@ -61,65 +61,50 @@ export default function ActualSizeSetting(props) { } return ( - -
    -
    -

    {getMessage('modal.actual.size.setting')}

    - + + closePopup(id)} /> + +
    + {getMessage('modal.actual.size.setting.info')}
    -
    -
    -
    -
    - {getMessage('modal.actual.size.setting.info')} -
    -
    -
    {getMessage('setting')}
    -
    -
    -
    -
    {getMessage('modal.actual.size.setting.plane.size.length')}
    -
    -
    -
    - -
    - mm +
    +
    {getMessage('setting')}
    +
    +
    +
    +
    {getMessage('modal.actual.size.setting.plane.size.length')}
    +
    +
    +
    +
    + mm
    -
    -
    {getMessage('modal.actual.size.setting.actual.size.length')}
    -
    -
    -
    - setActualSize(Number(e.target.value))} - /> -
    - mm +
    +
    +
    {getMessage('modal.actual.size.setting.actual.size.length')}
    +
    +
    +
    + setActualSize(Number(e.target.value))} />
    + mm
    -
    - - -
    -
    -
    +
    + + +
    + ) } diff --git a/src/components/floor-plan/modal/roofAllocation/ContextRoofAllocationSetting.jsx b/src/components/floor-plan/modal/roofAllocation/ContextRoofAllocationSetting.jsx index 30e56c0e..dd8b7003 100644 --- a/src/components/floor-plan/modal/roofAllocation/ContextRoofAllocationSetting.jsx +++ b/src/components/floor-plan/modal/roofAllocation/ContextRoofAllocationSetting.jsx @@ -47,22 +47,13 @@ export default function ContextRoofAllocationSetting(props) { }, []) return ( - -
    - {currentRoofList && ( - <> -
    -

    {getMessage('plan.menu.estimate.roof.alloc')}

    - -
    -
    -
    -
    -
    {getMessage('modal.roof.alloc.info')}
    -
    - {/* {getMessage('modal.roof.alloc.select.roof.material')} + + closePopup(id)} /> + {currentRoofList && ( + +
    {getMessage('modal.roof.alloc.info')}
    +
    + {/* {getMessage('modal.roof.alloc.select.roof.material')}
    { @@ -78,165 +69,162 @@ export default function ContextRoofAllocationSetting(props) { targetKey={'roofMatlCd'} />
    */} - -
    -
    -
    - {currentRoofList.map((roof, index) => { - return ( -
    -
    - - + +
    +
    +
    + {currentRoofList.map((roof, index) => { + return ( +
    +
    + + +
    +
    +
    +
    +
    + { + return { ...roof2, name: globalLocale === 'ko' ? roof2.roofMatlNm : roof2.roofMatlNmJp } + })} + value={roof} + //showKey={'roofMatlNm'} + showKey="name" + sourceKey={'roofMatlCd'} + targetKey={'roofMatlCd'} + onChange={(e) => handleChangeRoofMaterial(e, index)} + /> +
    + {index === 0 && {getMessage('modal.roof.alloc.default.roof.material')}} + {index !== 0 && ( + + + + )}
    -
    -
    -
    +
    + {roof.raftAuth && ( +
    +
    + {getMessage('modal.placement.initial.setting.rafter')} + {raftCodes.length > 0 && (
    { - return { ...roof2, name: globalLocale === 'ko' ? roof2.roofMatlNm : roof2.roofMatlNmJp } - })} + options={raftCodes} value={roof} - //showKey={'roofMatlNm'} - showKey="name" - sourceKey={'roofMatlCd'} - targetKey={'roofMatlCd'} - onChange={(e) => handleChangeRoofMaterial(e, index)} + showKey={'clCodeNm'} + sourceKey={'clCode'} + targetKey={roof.raft ? 'raft' : 'raftBaseCd'} + onChange={(e) => handleChangeRaft(e, index)} />
    - {index === 0 && {getMessage('modal.roof.alloc.default.roof.material')}} - {index !== 0 && ( - - - - )} -
    + )}
    - {roof.raftAuth && ( -
    -
    - {getMessage('modal.placement.initial.setting.rafter')} - {raftCodes.length > 0 && ( -
    - handleChangeRaft(e, index)} - /> -
    - )} -
    -
    - )} +
    + )} - {(roof.widAuth || roof.lenAuth) && ( - <> - {roof.widAuth && ( -
    -
    - W -
    - { - handleChangeInput(e, 'width', index) - }} - /> -
    -
    -
    - )} - {roof.lenAuth && ( -
    -
    - L -
    - { - handleChangeInput(e, 'length', index) - }} - /> -
    -
    -
    - )} - - )} - {roof.roofPchAuth && ( + {(roof.widAuth || roof.lenAuth) && ( + <> + {roof.widAuth && (
    - {getMessage('hajebichi')} + W
    handleChangeInput(e, 'hajebichi', index)} + defaultValue={roof.width} + readOnly={roof.widAuth === 'R'} + onChange={(e) => { + handleChangeInput(e, 'width', index) + }} />
    )} -
    -
    - {getMessage('modal.object.setting.offset.slope')} -
    - { - // handleChangeInput(e, currentAngleType === 'slope' ? 'pitch' : 'angle', index) - handleChangePitch(e, index) - }} - value={currentAngleType === 'slope' ? roof.pitch : roof.angle} - defaultValue={currentAngleType === 'slope' ? roof.pitch : roof.angle} - /> + {roof.lenAuth && ( +
    +
    + L +
    + { + handleChangeInput(e, 'length', index) + }} + /> +
    - {pitchText} +
    + )} + + )} + {roof.roofPchAuth && ( +
    +
    + {getMessage('hajebichi')} +
    + handleChangeInput(e, 'hajebichi', index)} + />
    + )} +
    +
    + {getMessage('modal.object.setting.offset.slope')} +
    + { + // handleChangeInput(e, currentAngleType === 'slope' ? 'pitch' : 'angle', index) + handleChangePitch(e, index) + }} + value={currentAngleType === 'slope' ? roof.pitch : roof.angle} + defaultValue={currentAngleType === 'slope' ? roof.pitch : roof.angle} + /> +
    + {pitchText} +
    - ) - })} -
    -
    -
    - -
    +
    +
    + ) + })}
    - - )} -
    -
    +
    +
    + +
    + + )} ) } diff --git a/src/components/floor-plan/modal/roofAllocation/RoofAllocationSetting.jsx b/src/components/floor-plan/modal/roofAllocation/RoofAllocationSetting.jsx index 3dd03385..0603ed96 100644 --- a/src/components/floor-plan/modal/roofAllocation/RoofAllocationSetting.jsx +++ b/src/components/floor-plan/modal/roofAllocation/RoofAllocationSetting.jsx @@ -47,22 +47,14 @@ export default function RoofAllocationSetting(props) { }, []) return ( - -
    + + closePopup(id)} /> + {currentRoofList && ( <> -
    -

    {getMessage('plan.menu.estimate.roof.alloc')}

    - -
    -
    -
    -
    -
    {getMessage('modal.roof.alloc.info')}
    -
    - {/* {getMessage('modal.roof.alloc.select.roof.material')} +
    {getMessage('modal.roof.alloc.info')}
    +
    + {/* {getMessage('modal.roof.alloc.select.roof.material')}
    { @@ -78,146 +70,146 @@ export default function RoofAllocationSetting(props) { targetKey={'roofMatlCd'} />
    */} - -
    -
    -
    - {currentRoofList.map((roof, index) => { - return ( -
    -
    - - + +
    +
    +
    + {currentRoofList.map((roof, index) => { + return ( +
    +
    + + +
    +
    +
    +
    +
    + { + return { ...roof2, name: globalLocale === 'ko' ? roof2.roofMatlNm : roof2.roofMatlNmJp } + })} + value={roof} + //showKey={'roofMatlNm'} + showKey="name" + sourceKey={'roofMatlCd'} + targetKey={'roofMatlCd'} + onChange={(e) => handleChangeRoofMaterial(e, index)} + /> +
    + {index === 0 && {getMessage('modal.roof.alloc.default.roof.material')}} + {index !== 0 && ( + + + + )} +
    -
    + + {roof.raftAuth && (
    -
    - { - return { ...roof2, name: globalLocale === 'ko' ? roof2.roofMatlNm : roof2.roofMatlNmJp } - })} - value={roof} - //showKey={'roofMatlNm'} - showKey="name" - sourceKey={'roofMatlCd'} - targetKey={'roofMatlCd'} - onChange={(e) => handleChangeRoofMaterial(e, index)} - /> -
    - {index === 0 && {getMessage('modal.roof.alloc.default.roof.material')}} - {index !== 0 && ( - - - + {getMessage('modal.placement.initial.setting.rafter')} + {raftCodes.length > 0 && ( +
    + handleChangeRaft(e, index)} + /> +
    )}
    + )} - {roof.raftAuth && ( -
    -
    - {getMessage('modal.placement.initial.setting.rafter')} - {raftCodes.length > 0 && ( -
    - handleChangeRaft(e, index)} + {(roof.widAuth || roof.lenAuth) && ( + <> + {roof.widAuth && ( +
    +
    + W +
    + handleChangeInput(e, 'width', index)} + readOnly={roof.widAuth === 'R'} />
    - )} -
    -
    - )} - - {(roof.widAuth || roof.lenAuth) && ( - <> - {roof.widAuth && ( -
    -
    - W -
    - handleChangeInput(e, 'width', index)} - readOnly={roof.widAuth === 'R'} - /> -
    -
    -
    - )} - {roof.lenAuth && ( -
    -
    - L -
    - handleChangeInput(e, 'length', index)} - readOnly={roof.lenAuth === 'R'} - /> -
    -
    -
    - )} - - )} - {roof.roofPchAuth && ( -
    -
    - {getMessage('hajebichi')} -
    - handleChangeInput(e, 'hajebichi', index)} - value={parseInt(roof.hajebichi)} - readOnly={roof.roofPchAuth === 'R'} - />
    -
    - )} + )} + {roof.lenAuth && ( +
    +
    + L +
    + handleChangeInput(e, 'length', index)} + readOnly={roof.lenAuth === 'R'} + /> +
    +
    +
    + )} + + )} + {roof.roofPchAuth && (
    - {getMessage('modal.object.setting.offset.slope')} + {getMessage('hajebichi')}
    { - handleChangePitch(e, index) - }} - value={currentAngleType === 'slope' ? roof.pitch : roof.angle} - defaultValue={currentAngleType === 'slope' ? roof.pitch : roof.angle} + onChange={(e) => handleChangeInput(e, 'hajebichi', index)} + value={parseInt(roof.hajebichi)} + readOnly={roof.roofPchAuth === 'R'} />
    - {pitchText}
    - {/*
    + )} +
    +
    + {getMessage('modal.object.setting.offset.slope')} +
    + { + handleChangePitch(e, index) + }} + value={currentAngleType === 'slope' ? roof.pitch : roof.angle} + defaultValue={currentAngleType === 'slope' ? roof.pitch : roof.angle} + /> +
    + {pitchText} +
    +
    + {/*
    */} -
    - ) - })} -
    -
    -
    - +
    + ) + })}
    +
    + +
    )} -
    -
    + ) } diff --git a/src/components/floor-plan/modal/roofShape/RoofShapePassivitySetting.jsx b/src/components/floor-plan/modal/roofShape/RoofShapePassivitySetting.jsx index 44152cf8..7530bcdd 100644 --- a/src/components/floor-plan/modal/roofShape/RoofShapePassivitySetting.jsx +++ b/src/components/floor-plan/modal/roofShape/RoofShapePassivitySetting.jsx @@ -29,48 +29,38 @@ export default function RoofShapePassivitySetting({ id, pos = { x: 50, y: 230 } } return ( - -
    -
    -

    {getMessage('plan.menu.roof.cover.roof.shape.passivity.setting')}

    - + + closePopup(id)} /> + +
    + {buttons.map((button) => ( + + ))}
    -
    -
    -
    -
    - {buttons.map((button) => ( - - ))} -
    -
    -
    {getMessage('setting')}
    -
    - {type === TYPES.EAVES && } - {type === TYPES.GABLE && } - {type === TYPES.SHED && } -
    -
    - - -
    +
    +
    {getMessage('setting')}
    +
    + {type === TYPES.EAVES && } + {type === TYPES.GABLE && } + {type === TYPES.SHED && }
    - +
    -
    -
    +
    + +
    + ) } diff --git a/src/components/floor-plan/modal/roofShape/RoofShapeSetting.jsx b/src/components/floor-plan/modal/roofShape/RoofShapeSetting.jsx index 64ac905c..73ccc348 100644 --- a/src/components/floor-plan/modal/roofShape/RoofShapeSetting.jsx +++ b/src/components/floor-plan/modal/roofShape/RoofShapeSetting.jsx @@ -88,41 +88,31 @@ export default function RoofShapeSetting({ id, pos = { x: 50, y: 230 } }) { } return ( - -
    -
    -

    {getMessage('modal.roof.shape.setting')}

    - + ))} +
    +
    + {shapeNum === 1 && } + {(shapeNum === 2 || shapeNum === 3) && } + {shapeNum === 4 && } + {(shapeNum === 5 || shapeNum === 6 || shapeNum === 7 || shapeNum === 8) && } +
    +
    +
    -
    -
    -
    -
    - {shapeMenu.map((item) => ( - - ))} -
    -
    - {shapeNum === 1 && } - {(shapeNum === 2 || shapeNum === 3) && } - {shapeNum === 4 && } - {(shapeNum === 5 || shapeNum === 6 || shapeNum === 7 || shapeNum === 8) && } -
    -
    - -
    -
    -
    -
    +     ) } diff --git a/src/components/floor-plan/modal/setting01/SettingModal01.jsx b/src/components/floor-plan/modal/setting01/SettingModal01.jsx index 36691d62..4e6f91ea 100644 --- a/src/components/floor-plan/modal/setting01/SettingModal01.jsx +++ b/src/components/floor-plan/modal/setting01/SettingModal01.jsx @@ -72,39 +72,27 @@ export default function SettingModal01(props) { } return ( - <> - -
    -
    -

    {getMessage('modal.canvas.setting')}

    - -
    -
    -
    -
    -
    - + + closePopup(id, true)} /> + +
    + - - {canGridOptionSeletorValue && ( - - )} -
    - {buttonAct === 1 && } - {buttonAct === 2 && } - {buttonAct === 3 && } -
    -
    + + {canGridOptionSeletorValue && ( + + )}
    - - + {buttonAct === 1 && } + {buttonAct === 2 && } + {buttonAct === 3 && } + + ) } diff --git a/src/components/floor-plan/modal/setting01/dimensionLine/DimensionLineSetting.jsx b/src/components/floor-plan/modal/setting01/dimensionLine/DimensionLineSetting.jsx index 7fcbe45a..8bdecff8 100644 --- a/src/components/floor-plan/modal/setting01/dimensionLine/DimensionLineSetting.jsx +++ b/src/components/floor-plan/modal/setting01/dimensionLine/DimensionLineSetting.jsx @@ -190,78 +190,68 @@ export default function DimensionLineSetting(props) { } return ( - -
    -
    -

    {getMessage('modal.canvas.setting.font.plan.absorption.dimension.line')}

    -
    -
    -
    -
    -
    - -
    -
    -
    - {getMessage('modal.canvas.setting.font.plan.absorption.dimension.line.font.size')} -
    - setOriginPixel(e)} /> -
    - pixel -
    -
    - {getMessage('modal.canvas.setting.font.plan.absorption.dimension.line.color')} - +
    +
    + {getMessage('modal.canvas.setting.font.plan.absorption.dimension.line.font.size')} +
    + setOriginPixel(e)} />
    + pixel
    -
    -
    {getMessage('modal.canvas.setting.font.plan.absorption.dimension.display')}
    -
    -
    -
    - - 9,999 - - -
    -
    -
    -
    -
    - +
    + {getMessage('modal.canvas.setting.font.plan.absorption.dimension.line.color')} +
    -
    -
    +
    +
    {getMessage('modal.canvas.setting.font.plan.absorption.dimension.display')}
    +
    +
    +
    + + 9,999 + + +
    +
    +
    +
    +
    + +
    + ) } diff --git a/src/components/floor-plan/modal/setting01/planSize/PlanSizeSetting.jsx b/src/components/floor-plan/modal/setting01/planSize/PlanSizeSetting.jsx index 7bdf05ba..1d4b1e58 100644 --- a/src/components/floor-plan/modal/setting01/planSize/PlanSizeSetting.jsx +++ b/src/components/floor-plan/modal/setting01/planSize/PlanSizeSetting.jsx @@ -55,59 +55,49 @@ export default function PlanSizeSetting(props) { } return ( - -
    -
    -

    {getMessage('modal.canvas.setting.font.plan.absorption.plan.size.setting')}

    -
    -
    -
    -
    -
    -
    - {getMessage('common.horizon')} -
    - onlyNumberInputChange(e, changeInput)} - /> -
    - mm -
    -
    - {getMessage('common.vertical')} -
    - onlyNumberInputChange(e, changeInput)} - /> -
    - mm -
    -
    -
    - -
    -
    -
    -
    +     ) } diff --git a/src/components/floor-plan/modal/wallLineOffset/WallLineOffsetSetting.jsx b/src/components/floor-plan/modal/wallLineOffset/WallLineOffsetSetting.jsx index 60bab5b7..09c847e7 100644 --- a/src/components/floor-plan/modal/wallLineOffset/WallLineOffsetSetting.jsx +++ b/src/components/floor-plan/modal/wallLineOffset/WallLineOffsetSetting.jsx @@ -39,37 +39,27 @@ export default function WallLineOffsetSetting({ id, pos = { x: 50, y: 230 } }) { } return ( - -
    -
    -

    {getMessage('modal.wallline.offset.setting')}

    - + ))} +
    +
    +
    {getMessage('setting')}
    + {type === TYPES.WALL_LINE_EDIT && } + {type === TYPES.OFFSET && } +
    +
    +
    -
    -
    -
    -
    - {buttonMenu.map((item) => ( - - ))} -
    -
    -
    {getMessage('setting')}
    - {type === TYPES.WALL_LINE_EDIT && } - {type === TYPES.OFFSET && } -
    -
    - -
    -
    -
    -
    +     ) } From e17f0e0dba354ac420c0deba092080470e66993c Mon Sep 17 00:00:00 2001 From: basssy Date: Thu, 13 Mar 2025 16:14:16 +0900 Subject: [PATCH 4/4] =?UTF-8?q?=EA=B2=AC=EC=A0=81=EC=84=9C=20=EC=BC=80?= =?UTF-8?q?=EC=9D=B4=EB=B8=94=20=EA=B4=80=EB=A0=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/estimate/Estimate.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/estimate/Estimate.jsx b/src/components/estimate/Estimate.jsx index bd2c202a..8b8b38bc 100644 --- a/src/components/estimate/Estimate.jsx +++ b/src/components/estimate/Estimate.jsx @@ -1718,7 +1718,7 @@ export default function Estimate({}) { }} value={cableItem} > - + {/* */} {cableItemList.length > 0 && cableItemList.map((row) => (