Merge branch 'dev' into feature/yj-layoutSetup

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 <components.SingleValue {...props}>{props.data.clRefChr3}</components.SingleValue>
+                                          return <components.SingleValue {...props}>{(item.itemTpCd === 'M12')? item.itemName : props.data.clRefChr3}</components.SingleValue>
                                         },
                                       }}
                                       isClearable={false}
                                       isDisabled={true}
                                       value={cableItemList.filter(function (option) {
-                                        return option.clRefChr1 === item.itemId
+                                        return (item.itemTpCd === 'M12')? item.itemId : option.clRefChr1 === item.itemId
                                       })}
                                     />
                                   )}

src/hooks/floorPlan/estimate/useEstimateController.js

@@ -130,6 +130,7 @@ export const useEstimateController = (planNo, flag) => {
           addFlg: true,
           paDispOrder: null,
           dispCableFlg: '0',
+          itemTpCd: '',
         },
       ],
     })
@@ -321,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' })
       }

src/hooks/roofcover/useRoofShapeSetting.js

@@ -231,6 +231,21 @@ export function useRoofShapeSetting(id) {
                 pitch: pitchRef.current,
                 onlyOffset: true,
               }
+
+              switch (line.direction) {
+                case 'bottom':
+                  direction = 'east'
+                  break
+                case 'top':
+                  direction = 'west'
+                  break
+                case 'left':
+                  direction = 'south'
+                  break
+                case 'right':
+                  direction = 'north'
+                  break
+              }
             }
           })
         }
@@ -716,6 +731,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)

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.eaves": "軒側",
-  "modal.module.basic.setting.module.placement.arrangement.standard.ridge": "龍丸側",
+  "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": "南向きに設置す",
@@ -852,7 +852,7 @@
   "has.not.sleeve": "袖なし",
   "jerkinhead.width": "半切妻幅",
   "jerkinhead.slope": "半切妻傾斜",
-  "shed.width": "片流幅",
+  "shed.width": "片流れの出幅",
   "windage": "片流れ",
   "windage.width": "片流れの出幅",
   "write": "作成",