Merge branch 'dev' into dev-yj

src/components/floor-plan/CanvasMenu.jsx

@@ -521,8 +521,12 @@ export default function CanvasMenu(props) {
                 <div className="select-box">
                   {
                     <QSelectBox
-                      showKey={'roofMatlNm'}
-                      options={addedRoofs}
+                      //options={addedRoofs}
+                      options={addedRoofs.map((roof) => {
+                        return { ...roof, name: globalLocale === 'ko' ? roof.roofMatlNm : roof.roofMatlNmJp }
+                      })}
+                      //showKey={'roofMatlNm'}
+                      showKey={'name'}
                       value={selectedRoofMaterial}
                       onChange={changeSelectedRoofMaterial}
                       sourceKey={'index'}

src/components/floor-plan/modal/placementShape/PlacementShapeSetting.jsx

@@ -258,7 +258,11 @@ export default function PlacementShapeSetting({ id, pos = { x: 50, y: 180 }, set
                       <div className="grid-select no-flx" style={{ width: '171px' }}>
                         <QSelectBox
                           title={
-                            currentRoof?.roofSizeSet === '3' ? getMessage('modal.placement.initial.setting.size.none.pitch') : currentRoof?.roofMatlNm
+                            currentRoof?.roofSizeSet === '3'
+                              ? getMessage('modal.placement.initial.setting.size.none.pitch')
+                              : globalLocale === 'ko'
+                                ? currentRoof?.roofMatlNm
+                                : currentRoof?.roofMatlNmJp
                           }
                           //ref={roofRef.roofCd}
                           options={roofMaterials.map((roof) => {

src/hooks/module/useTrestle.js

@@ -534,6 +534,11 @@ export const useTrestle = () => {
 
     // circuitItemList 중복제거
     circuitItemList = circuitItemList.filter((item, index) => circuitItemList.indexOf(item) === index)
+    circuitItemList = circuitItemList.map((circuitId) => {
+      return {
+        itemId: circuitId,
+      }
+    })
 
     setEstimateParam({ ...estimateParam, itemList, northArrangement, roofSurfaceList, circuitItemList })
 

src/hooks/roofcover/useRoofAllocationSetting.js

@@ -274,6 +274,7 @@ export function useRoofAllocationSetting(id) {
     setRoofList(newRoofList)
     const selectedRoofMaterial = newRoofList.find((roof) => roof.selected)
     setSurfaceShapePattern(currentObject, roofDisplay.column, false, selectedRoofMaterial, true)
+    drawDirectionArrow(currentObject)
     modifyModuleSelectionData()
     closeAll()
   }

src/locales/ja.json

@@ -515,9 +515,9 @@
   "common.finish": "完了",
   "common.ok": "確認",
   "common.cancel": "キャンセル",
-  "commons.west": "立つ",
-  "commons.east": "ドン",
-  "commons.south": "M",
+  "commons.west": "西",
+  "commons.east": "東",
+  "commons.south": "南",
   "commons.north": "北",
   "commons.none": "選択しない",
   "common.type": "分類",