From 61f1036a248dbc64294185d50e8e0118ab43edc6 Mon Sep 17 00:00:00 2001 From: "hyojun.choi" Date: Fri, 11 Apr 2025 10:58:04 +0900 Subject: [PATCH 1/6] =?UTF-8?q?=EB=B3=80=EB=B3=84=EB=A1=9C=20=EC=84=A4?= =?UTF-8?q?=EC=A0=95=20-=20=ED=95=9C=EC=AA=BD=ED=9D=90=EB=A6=84=20?= =?UTF-8?q?=EC=B6=9C=ED=8F=AD=20=EC=A0=81=EC=9A=A9=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/hooks/roofcover/useRoofShapeSetting.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/hooks/roofcover/useRoofShapeSetting.js b/src/hooks/roofcover/useRoofShapeSetting.js index 1881b184..b6fc5036 100644 --- a/src/hooks/roofcover/useRoofShapeSetting.js +++ b/src/hooks/roofcover/useRoofShapeSetting.js @@ -716,6 +716,7 @@ export function useRoofShapeSetting(id) { type: LINE_TYPE.WALLLINE.SHED, pitch: shedPitchRef.current, width: shedWidth / 10, + offset: shedWidth / 10, } selectedLine.attributes = { ...attributes, isFixed: true } addPitchText(currentObject) From ed69943dc6386b8c203cd3c23d35aee906828aff Mon Sep 17 00:00:00 2001 From: ysCha Date: Mon, 14 Apr 2025 15:01:18 +0900 Subject: [PATCH 2/6] =?UTF-8?q?975-=20=EC=95=84=EC=9D=B4=ED=85=9C(?= =?UTF-8?q?=EC=96=91=EB=8B=A8=EC=BC=80=EC=9D=B4=EB=B8=94)=20=ED=83=80?= =?UTF-8?q?=EC=9E=85=20=EC=BD=94=EB=93=9C=20=EC=B6=94=EA=B0=80=EC=97=90=20?= =?UTF-8?q?=EB=94=B0=EB=A5=B8=20=EC=95=84=EC=9D=B4=ED=85=9C=20=EB=AA=A9?= =?UTF-8?q?=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/estimate/Estimate.jsx | 8 ++++---- src/hooks/floorPlan/estimate/useEstimateController.js | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/components/estimate/Estimate.jsx b/src/components/estimate/Estimate.jsx index e2c6c088..aa11943e 100644 --- a/src/components/estimate/Estimate.jsx +++ b/src/components/estimate/Estimate.jsx @@ -717,7 +717,7 @@ export default function Estimate({}) { /* 케이블 select 변경시 */ const onChangeDisplayCableItem = (value, itemList) => { itemList.map((item, index) => { - if (item.dispCableFlg === '1') { + if (item.dispCableFlg === '1' && item.itemTpCd !== 'M12') { if (value !== '') { onChangeDisplayItem(value, item.dispOrder, index, true) } @@ -1146,7 +1146,7 @@ export default function Estimate({}) { dispCableFlgCnt++ } - if (item.dispCableFlg === '1') { + if (item.dispCableFlg === '1' && item.itemTpCd !== 'M12') { setCableItem(item.itemId) } } @@ -1968,13 +1968,13 @@ export default function Estimate({}) { getOptionValue={(x) => x.clRefChr1} components={{ SingleValue: ({ children, ...props }) => { - return {props.data.clRefChr3} + return {(item.itemTpCd === 'M12')? item.itemName : props.data.clRefChr3} }, }} isClearable={false} isDisabled={true} value={cableItemList.filter(function (option) { - return option.clRefChr1 === item.itemId + return (item.itemTpCd === 'M12')? item.itemId : option.clRefChr1 === item.itemId })} /> )} diff --git a/src/hooks/floorPlan/estimate/useEstimateController.js b/src/hooks/floorPlan/estimate/useEstimateController.js index 2e0bbe1a..34ac80fb 100644 --- a/src/hooks/floorPlan/estimate/useEstimateController.js +++ b/src/hooks/floorPlan/estimate/useEstimateController.js @@ -130,6 +130,7 @@ export const useEstimateController = (planNo, flag) => { addFlg: true, paDispOrder: null, dispCableFlg: '0', + itemTpCd:'', }, ], }) From 8f4e53c759d07ffece55f8e26ae1948780717a53 Mon Sep 17 00:00:00 2001 From: "hyojun.choi" Date: Mon, 14 Apr 2025 18:14:49 +0900 Subject: [PATCH 3/6] =?UTF-8?q?#982=20=ED=91=9C=EC=8B=9C=20=EB=AC=B8?= =?UTF-8?q?=EC=9E=90=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/locales/ja.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/locales/ja.json b/src/locales/ja.json index 86a76864..0b3f5b52 100644 --- a/src/locales/ja.json +++ b/src/locales/ja.json @@ -37,7 +37,7 @@ "modal.roof.shape.setting.ridge": "棟", "modal.roof.shape.setting.patten.a": "Aパターン", "modal.roof.shape.setting.patten.b": "Bパターン", - "modal.roof.shape.setting.side": "別に設定", + "modal.roof.shape.setting.side": "個別に設定", "plan.menu.roof.cover": "伏せ図入力", "plan.menu.roof.cover.outline.drawing": "外壁線を描く", "plan.menu.roof.cover.roof.shape.setting": "屋根形状の設定", @@ -125,8 +125,8 @@ "modal.module.basic.setting.module.placement.do.not": "しない", "modal.module.basic.setting.module.placement.arrangement.standard": "配置基準", "modal.module.basic.setting.module.placement.arrangement.standard.center": "中央", - "modal.module.basic.setting.module.placement.arrangement.standard.eaves": "軒の側", - "modal.module.basic.setting.module.placement.arrangement.standard.ridge": "龍丸側", + "modal.module.basic.setting.module.placement.arrangement.standard.eaves": "軒側", + "modal.module.basic.setting.module.placement.arrangement.standard.ridge": "棟側", "modal.module.basic.setting.module.placement.maximum": "最大配置", "modal.module.basic.setting.pitch.module.placement.standard.setting": "配置基準設定", "modal.module.basic.setting.pitch.module.placement.standard.setting.south": "南向き設置", @@ -851,7 +851,7 @@ "has.not.sleeve": "袖なし", "jerkinhead.width": "半切妻幅", "jerkinhead.slope": "半切妻傾斜", - "shed.width": "片流幅", + "shed.width": "片流れの出幅", "windage": "片流れ", "windage.width": "片流れの出幅", "write": "作成", From 3c14f5de52aa9a6689b408976ad2ed4dc2d5419a Mon Sep 17 00:00:00 2001 From: basssy Date: Tue, 15 Apr 2025 18:08:05 +0900 Subject: [PATCH 4/6] =?UTF-8?q?=EA=B2=AC=EC=A0=81=EC=84=9C=20=EC=A0=80?= =?UTF-8?q?=EC=9E=A5=EC=8B=9C=20=EC=B2=B4=ED=81=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/hooks/floorPlan/estimate/useEstimateController.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/hooks/floorPlan/estimate/useEstimateController.js b/src/hooks/floorPlan/estimate/useEstimateController.js index 34ac80fb..a0765766 100644 --- a/src/hooks/floorPlan/estimate/useEstimateController.js +++ b/src/hooks/floorPlan/estimate/useEstimateController.js @@ -130,7 +130,7 @@ export const useEstimateController = (planNo, flag) => { addFlg: true, paDispOrder: null, dispCableFlg: '0', - itemTpCd:'', + itemTpCd: '', }, ], }) @@ -322,6 +322,7 @@ export const useEstimateController = (planNo, flag) => { } }) if (delCnt === estimateData.itemList.length) { + itemFlg = false setIsGlobalLoading(false) return swalFire({ text: getMessage('estimate.detail.save.requiredItem'), type: 'alert', icon: 'warning' }) } From bdcacd554252c0cc7dd977edc0db4fc9f4469a53 Mon Sep 17 00:00:00 2001 From: "hyojun.choi" Date: Wed, 16 Apr 2025 15:39:48 +0900 Subject: [PATCH 5/6] =?UTF-8?q?=EB=B3=80=EB=B3=84=EB=A1=9C=20=EC=84=A4?= =?UTF-8?q?=EC=A0=95=20=ED=9B=84=20=ED=95=9C=EC=AA=BD=ED=9D=90=EB=A6=84?= =?UTF-8?q?=EA=B3=BC=20=EA=B0=99=EC=9D=B4=20=EB=B3=80=20=EC=86=8D=EC=84=B1?= =?UTF-8?q?=EC=9D=84=20=EC=84=A0=ED=83=9D=ED=95=A0=20=EA=B2=BD=EC=9A=B0=20?= =?UTF-8?q?=EC=B2=98=EB=A6=AC=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/hooks/roofcover/useRoofShapeSetting.js | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/hooks/roofcover/useRoofShapeSetting.js b/src/hooks/roofcover/useRoofShapeSetting.js index b6fc5036..e36dbd08 100644 --- a/src/hooks/roofcover/useRoofShapeSetting.js +++ b/src/hooks/roofcover/useRoofShapeSetting.js @@ -231,6 +231,21 @@ export function useRoofShapeSetting(id) { pitch: pitchRef.current, onlyOffset: true, } + + switch (line.direction) { + case 'bottom': + direction = 'west' + break + case 'top': + direction = 'east' + break + case 'left': + direction = 'north' + break + case 'right': + direction = 'south' + break + } } }) } From bcc91e76097015becae943bae5ae9c0629af7e3c Mon Sep 17 00:00:00 2001 From: "hyojun.choi" Date: Wed, 16 Apr 2025 15:53:54 +0900 Subject: [PATCH 6/6] =?UTF-8?q?=EB=B0=98=EB=8C=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/hooks/roofcover/useRoofShapeSetting.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/hooks/roofcover/useRoofShapeSetting.js b/src/hooks/roofcover/useRoofShapeSetting.js index e36dbd08..192d8cc0 100644 --- a/src/hooks/roofcover/useRoofShapeSetting.js +++ b/src/hooks/roofcover/useRoofShapeSetting.js @@ -234,16 +234,16 @@ export function useRoofShapeSetting(id) { switch (line.direction) { case 'bottom': - direction = 'west' - break - case 'top': direction = 'east' break + case 'top': + direction = 'west' + break case 'left': - direction = 'north' + direction = 'south' break case 'right': - direction = 'south' + direction = 'north' break } }